vovk-cli 0.0.1-draft.6 → 0.0.1-draft.8

package/dist/index.mjs

@@ -97,10 +97,9 @@ program
     .description('Create new components. "vovk new [...components] [segmentName/]moduleName" to create a new module or "vovk new segment [segmentName]" to create a new segment')
     .option('-O, --overwrite', 'Overwrite existing files')
     .option('--template', 'Override config template')
-    .option('--dir-name', 'Override dirName in template file')
-    .option('--file-name', 'Override fileName in template file')
-    .option('--dry-run', 'Do not write files to disk')
+    .option('--dir-name', 'Override dirName in template file. Relative to the root of the project')
     .option('--no-segment-update', 'Do not update segment files when creating a new module')
+    .option('--dry-run', 'Do not write files to disk')
     .action((components, options) => newComponents(components, options));
 program
     .command('help')

package/dist/new/addClassToSegmentCode.mjs

@@ -1,6 +1,10 @@
-import { Project, SyntaxKind } from 'ts-morph';
+import { Project, QuoteKind, SyntaxKind } from 'ts-morph';
 export default function addClassToSegmentCode(segmentSourceCode, { sourceName, compiledName, type, importPath, }) {
-    const project = new Project();
+    const project = new Project({
+        manipulationSettings: {
+            quoteKind: QuoteKind.Single
+        }
+    });
     const sourceFile = project.createSourceFile('route.ts', segmentSourceCode, { overwrite: true });
     // Add the import if it doesn't exist
     let importDeclaration = sourceFile.getImportDeclaration((imp) => {

package/dist/new/newModule.mjs

@@ -46,6 +46,9 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
     if (!segment) {
         throw new Error(`Segment ${segmentName} not found`);
     }
+    if (noSegmentUpdate && !what.includes('controller')) {
+        log.warn('--no-segment-update flag is ignored because it is only relevant when creating a controller');
+    }
     for (const type of what) {
         const templatePath = templateFlag ?? templates[type];
         const templateAbsolutePath = templatePath.startsWith('/') || templatePath.startsWith('.')
@@ -59,8 +62,7 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             segmentName,
             moduleName,
         });
-        const dirName = dirNameFlag || renderedDirName;
-        const absoluteModuleDir = path.join(cwd, config.modulesDir, dirName);
+        const absoluteModuleDir = path.join(cwd, dirNameFlag || renderedDirName);
         const absoluteModulePath = path.join(absoluteModuleDir, fileName);
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {
@@ -81,7 +83,7 @@ export default async function newModule({ what, moduleNameWithOptionalSegment, d
             }
             const { routeFilePath } = segment;
             const segmentSourceCode = await fs.readFile(routeFilePath, 'utf-8');
-            const importPath = path.relative(absoluteModuleDir, absoluteModulePath).replace(/\.(ts|tsx)$/, '');
+            const importPath = path.relative(path.dirname(routeFilePath), absoluteModulePath).replace(/\.(ts|tsx)$/, '');
             if (!noSegmentUpdate) {
                 const newSegmentCode = addClassToSegmentCode(segmentSourceCode, {
                     sourceName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.6",
+  "version": "0.0.1-draft.8",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -33,7 +33,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.9"
+    "vovk": "^3.0.0-draft.10"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.0.1",

package/templates/controller.ejs

@@ -40,12 +40,12 @@ export default class <%= controllerName %> {
     };
 
     @post()
-    static create<%= modulePascalNamePlural %> = () => {
+    static create<%= modulePascalName %> = () => {
         // ...
     };
 
     @del(':id')
-    static delete<%= modulePascalNamePlural %> = () => {
+    static delete<%= modulePascalName %> = () => {
         // ...
     };
 }