vovk-cli 0.0.1-draft.93 → 0.0.1-draft.95

package/dist/generate/index.mjs

@@ -57,7 +57,6 @@ export default async function generate({ projectInfo, segments, segmentsSchema,
             };
         }));
     const usedTemplateNames = uniq(processedTemplates.filter(({ needsWriting }) => needsWriting).map(({ templateName }) => templateName));
-    const unusedTemplateNames = uniq(processedTemplates.filter(({ needsWriting }) => !needsWriting).map(({ templateName }) => templateName));
     if (fullSchema || usedTemplateNames.length > 0) {
         // Make sure the output directory exists
         await fs.mkdir(clientOutDirAbsolutePath, { recursive: true });
@@ -79,6 +78,6 @@ export default async function generate({ projectInfo, segments, segmentsSchema,
         }
         return null;
     }));
-    log.info(`Client generated from template${usedTemplateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(usedTemplateNames.map((s) => `"${s}"`).join(', '))}${unusedTemplateNames.length ? ` (${chalkHighlightThing(unusedTemplateNames.map((s) => `"${s}"`).join(', '))} ${unusedTemplateNames.length !== 1 ? 'are' : 'is'} up to date)` : ''} at ${clientOutDirAbsolutePath} in ${Date.now() - now}ms`);
+    log.info(`Client generated from template${usedTemplateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(usedTemplateNames.map((s) => `"${s}"`).join(', '))} at ${clientOutDirAbsolutePath} in ${Date.now() - now}ms`);
     return { written: true, path: clientOutDirAbsolutePath };
 }

package/dist/new/newModule.mjs

@@ -65,6 +65,7 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             segmentName,
             moduleName,
             empty,
+            templateFileName: templateAbsolutePath,
         });
         const dir = dirFlag || renderedDir;
         if (!dir) {

package/dist/new/render.d.mts

@@ -1,9 +1,10 @@
 import type { VovkConfig, VovkModuleRenderResult } from '../types.mjs';
-export default function render(codeTemplate: string, { config, withService, segmentName, moduleName, empty, }: {
+export default function render(codeTemplate: string, { config, withService, segmentName, moduleName, empty, templateFileName, }: {
     cwd: string;
     config: VovkConfig;
     withService: boolean;
     segmentName: string;
     moduleName: string;
     empty?: boolean;
+    templateFileName: string;
 }): Promise<VovkModuleRenderResult>;

package/dist/new/render.mjs

@@ -4,7 +4,7 @@ import _ from 'lodash';
 import pluralize from 'pluralize';
 import addCommonTerms from './addCommonTerms.mjs';
 addCommonTerms();
-export default async function render(codeTemplate, { config, withService, segmentName, moduleName, empty, }) {
+export default async function render(codeTemplate, { config, withService, segmentName, moduleName, empty, templateFileName, }) {
     const getModuleDirName = (givenSegmentName, givenModuleName) => [config.modulesDir, givenSegmentName || config.rootSegmentModulesDirName, _.camelCase(givenModuleName)]
         .filter(Boolean)
         .join('/');
@@ -43,7 +43,7 @@ export default async function render(codeTemplate, { config, withService, segmen
         _, // lodash
         pluralize,
     };
-    const parsed = matter((await ejs.render(codeTemplate, { t }, { async: true })).trim());
+    const parsed = matter((await ejs.render(codeTemplate, { t }, { async: true, filename: templateFileName })).trim());
     const { dir, fileName, sourceName, compiledName } = parsed.data;
     const code = empty ? (sourceName ? `export default class ${sourceName} {}` : '') : parsed.content;
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.93",
+  "version": "0.0.1-draft.95",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -36,7 +36,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.76"
+    "vovk": "^3.0.0-draft.78"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.3.1",

package/templates/controller.ejs

@@ -1,6 +1,6 @@
 <% const vars = { 
   ControllerName: t.TheThing + 'Controller',
-  ServiceName = t.TheThing + 'Service',
+  ServiceName: t.TheThing + 'Service',
 }; %>
 ---
 dir: <%= t.defaultDir %>