fix: template resolution order

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [6.2.10](https://github.com/jondot/hygen/compare/v6.2.9...v6.2.10) (2022-09-06)
+## [6.2.11](https://github.com/jondot/hygen/compare/v6.2.10...v6.2.11) (2022-09-07)
 
 
 

dist/config-resolver.js

@@ -39,15 +39,16 @@ const configResolver = new config_1.ConfigResolver('.hygen.js', {
     load: (f) => __awaiter(void 0, void 0, void 0, function* () { return yield Promise.resolve().then(() => __importStar(require(f))); }),
     none: (_) => ({}),
 });
-const resolve = (cwd, templates) => {
+const resolve = (cwd, defaultTemplates, templatesOverride) => {
     return [
-        path_1.default.resolve(cwd, templates),
+        templatesOverride && path_1.default.resolve(cwd, templatesOverride),
         process.env.HYGEN_TMPLS,
         path_1.default.resolve(cwd, '_templates'),
+        path_1.default.resolve(cwd, defaultTemplates),
     ].find((_) => _ && fs_extra_1.default.existsSync(_));
 };
 exports.default = (config) => __awaiter(void 0, void 0, void 0, function* () {
-    const { cwd, templates } = config;
-    const resolvedTemplates = resolve(cwd, templates);
+    const { cwd, templates: defaultTemplates, templatesOverride } = config;
+    const resolvedTemplates = resolve(cwd, defaultTemplates, templatesOverride);
     return Object.assign(Object.assign(Object.assign({}, config), { templates: resolvedTemplates }), (yield configResolver.resolve(cwd)));
 });

dist/types.d.ts

@@ -17,6 +17,7 @@ export interface RenderedAction {
 export interface RunnerConfig {
     exec?: (sh: string, body: string) => void;
     templates?: string;
+    templatesOverride?: string;
     cwd?: string;
     logger?: Logger;
     debug?: boolean;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hygen",
-  "version": "6.2.10",
+  "version": "6.2.11",
   "description": "The scalable code generator that saves you time.",
   "keywords": [
     "template",

src/__tests__/config-resolver.spec.ts

@@ -6,22 +6,38 @@ const fixture = (dir) => path.join(__dirname, 'fixtures/templates', dir)
 const templateParams = ({
   cwd,
   templates,
+  templatesOverride,
 }: {
   cwd: string
   templates: string
+  templatesOverride?: string | undefined
 }) => {
   return {
     cwd,
     templates,
-    // eslint-disable-next-line
+    templatesOverride,
     exec: () => {},
-    logger: new Logger(console.log),
+    logger: new Logger(console.log), // eslint-disable-line no-console
     debug: false,
     helpers: {},
     createPrompter: () => require('enquirer'),
   }
 }
 describe('resolve', () => {
+  it('template overrides takes over all', async () => {
+    expect(
+      (
+        await templateResolver(
+          templateParams({
+            cwd: '/1',
+            templates: fixture('app'),
+            templatesOverride: fixture('app-custom/other-templates'),
+          }),
+        )
+      ).templates,
+    ).toEqual(fixture('app-custom/other-templates'))
+  })
+
   it('templates explicitly given via config, so take it if it exists', async () => {
     expect(
       (

src/config-resolver.ts

@@ -9,18 +9,23 @@ const configResolver = new ConfigResolver('.hygen.js', {
   none: (_) => ({}),
 })
 
-const resolve = (cwd: string, templates: string | undefined) => {
+const resolve = (
+  cwd: string,
+  defaultTemplates: string | undefined,
+  templatesOverride: string | undefined,
+) => {
   return [
-    path.resolve(cwd, templates),
+    templatesOverride && path.resolve(cwd, templatesOverride),
     process.env.HYGEN_TMPLS,
     path.resolve(cwd, '_templates'),
+    path.resolve(cwd, defaultTemplates),
   ].find((_) => _ && fs.existsSync(_))
 }
 
 export default async (config: RunnerConfig): Promise<RunnerConfig> => {
-  const { cwd, templates } = config
+  const { cwd, templates: defaultTemplates, templatesOverride } = config
 
-  const resolvedTemplates = resolve(cwd, templates)
+  const resolvedTemplates = resolve(cwd, defaultTemplates, templatesOverride)
 
   return {
     ...config,

src/types.ts

@@ -17,6 +17,7 @@ export interface RenderedAction {
 export interface RunnerConfig {
   exec?: (sh: string, body: string) => void
   templates?: string
+  templatesOverride?: string
   cwd?: string
   logger?: Logger
   debug?: boolean