vovk-cli 0.0.1-draft.360 → 0.0.1-draft.362

package/dist/index.mjs

@@ -157,7 +157,7 @@ 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, --templates <templates...>', 'override config template; accepts an array of strings that correspond the order of the components')
-    .option('--dir <dirname>', 'override dirName in template file; relative to the root of the project')
+    .option('--out, --out-dir <dirname>', 'override outDir in template file; relative to the root of the project')
     .option('--empty', 'create an empty module')
     .option('--no-segment-update', 'do not update segment files when creating a new module')
     .option('--dry-run', 'do not write files to disk')

package/dist/init/createConfig.mjs

@@ -9,6 +9,7 @@ export default async function createConfig({ root, log, options: { validationLib
     const dir = (await getFileSystemEntryType(dotConfigPath)) === FileSystemEntryType.DIRECTORY ? dotConfigPath : root;
     const isModule = await fs
         .readFile(path.join(root, 'package.json'), 'utf-8')
+        .catch(() => '{}')
         .then((content) => JSON.parse(content).type === 'module');
     const configAbsolutePath = path.join(dir, isModule ? 'vovk.config.mjs' : 'vovk.config.js');
     const typeTemplates = {

package/dist/init/index.mjs

@@ -173,10 +173,11 @@ export class Init {
             });
         }
         if (!(await getFileSystemEntryType(path.join(root, 'package.json')))) {
-            log.warn(`package.json not found at ${root}. Run "npx create-next-app" to create a new Next.js project.`);
+            log.warn(`${chalkHighlightThing('package.json')} not found at ${chalkHighlightThing(root)}. Run "npx create-next-app" to create a new Next.js project
+        .`);
         }
         else if (pkgJson && !(await getFileSystemEntryType(path.join(root, 'tsconfig.json')))) {
-            log.warn(`tsconfig.json not found at ${root}. Run "npx tsc --init" to create a new tsconfig.json file.`);
+            log.warn(`${chalkHighlightThing('tsconfig.json')} not found at ${chalkHighlightThing(root)}. Run "npx tsc --init" to create a new tsconfig.json file.`);
         }
         if (configPaths.length) {
             if (!(await confirm({

package/dist/new/index.d.mts

@@ -1,3 +1,3 @@
 import type { NewOptions } from '../types.mjs';
 import type { ProjectInfo } from '../getProjectInfo/index.mts';
-export declare function newComponents(components: string[], projectInfo: ProjectInfo, { dryRun, dir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }: NewOptions): Promise<void>;
+export declare function newComponents(components: string[], projectInfo: ProjectInfo, { dryRun, outDir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }: NewOptions): Promise<void>;

package/dist/new/index.mjs

@@ -1,6 +1,6 @@
 import newModule from './newModule.mjs';
 import newSegment from './newSegment.mjs';
-export async function newComponents(components, projectInfo, { dryRun, dir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }) {
+export async function newComponents(components, projectInfo, { dryRun, outDir, templates, overwrite, noSegmentUpdate, empty, static: isStaticSegment }) {
     if (components[0] === 'segment' || components[0] === 'segments') {
         // vovk new segment [segmentName]
         let segmentNames = components
@@ -27,7 +27,7 @@ export async function newComponents(components, projectInfo, { dryRun, dir, temp
             projectInfo,
             what,
             moduleNameWithOptionalSegment,
-            dir,
+            outDir,
             templates,
             overwrite,
             noSegmentUpdate,

package/dist/new/newModule.d.mts

@@ -1,10 +1,10 @@
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-export default function newModule({ projectInfo, what, moduleNameWithOptionalSegment, dryRun, dir: dirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }: {
+export default function newModule({ projectInfo, what, moduleNameWithOptionalSegment, dryRun, outDir: outDirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }: {
     projectInfo: ProjectInfo;
     what: string[];
     moduleNameWithOptionalSegment: string;
     dryRun?: boolean;
-    dir?: string;
+    outDir?: string;
     templates?: string[];
     noSegmentUpdate?: boolean;
     overwrite?: boolean;

package/dist/new/newModule.mjs

@@ -19,7 +19,7 @@ function splitByLast(str, delimiter = '/') {
     const after = str.substring(index + delimiter.length);
     return [before, after];
 }
-export default async function newModule({ projectInfo, what, moduleNameWithOptionalSegment, dryRun, dir: dirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }) {
+export default async function newModule({ projectInfo, what, moduleNameWithOptionalSegment, dryRun, outDir: outDirFlag, templates: templatesFlag, noSegmentUpdate, overwrite, empty, }) {
     const { config, log, cwd, apiDirAbsolutePath } = projectInfo;
     const segments = await locateSegments({ dir: apiDirAbsolutePath, config, log });
     const isNodeNextResolution = ['node16', 'nodenext'].includes((await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase()) ?? '');
@@ -58,7 +58,7 @@ export default async function newModule({ projectInfo, what, moduleNameWithOptio
         const templatePath = templates[type];
         const templateAbsolutePath = resolveAbsoluteModulePath(templatePath, cwd);
         const templateCode = await fs.readFile(templateAbsolutePath, 'utf-8');
-        const { dir: renderedDir, fileName, sourceName, compiledName, code, } = await render(templateCode, {
+        const { outDir: renderedOutDir, fileName, sourceName, compiledName, code, } = await render(templateCode, {
             cwd,
             config,
             withService: what.includes('service'),
@@ -68,14 +68,14 @@ export default async function newModule({ projectInfo, what, moduleNameWithOptio
             templateFileName: templateAbsolutePath,
             isNodeNextResolution,
         });
-        const dir = dirFlag || renderedDir;
-        if (!dir) {
-            throw new Error(`The template for "${type}" does not provide a dir`);
+        const outDir = outDirFlag || renderedOutDir;
+        if (!outDir) {
+            throw new Error(`The template for "${type}" does not provide a outDir`);
         }
         if (!fileName) {
             throw new Error(`The template for "${type}" does not provide a fileName`);
         }
-        const absoluteModuleDir = path.join(cwd, dir);
+        const absoluteModuleDir = path.join(cwd, outDir);
         const absoluteModulePath = path.join(absoluteModuleDir, fileName);
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {

package/dist/new/render.mjs

@@ -42,10 +42,10 @@ export default async function render(codeTemplate, { config, withService, segmen
         pluralize,
     };
     const parsed = matter((await ejs.render(codeTemplate, { t }, { async: true, filename: templateFileName })).trim());
-    const { dir, fileName, sourceName, compiledName } = parsed.data;
+    const { outDir, fileName, sourceName, compiledName } = parsed.data;
     const code = empty ? (sourceName ? `export default class ${sourceName} {}` : '') : parsed.content;
     return {
-        dir,
+        outDir,
         fileName,
         sourceName,
         compiledName,

package/dist/types.d.mts

@@ -3,7 +3,7 @@ import type { build } from 'tsdown';
 import type { VovkStrictConfig } from 'vovk';
 export type VovkModuleRenderResult = {
     fileName: string;
-    dir: string;
+    outDir: string;
     sourceName?: string;
     compiledName?: string;
     code: string;
@@ -72,7 +72,7 @@ export interface InitOptions {
 export interface NewOptions {
     dryRun?: boolean;
     templates?: string[];
-    dir?: string;
+    outDir?: string;
     overwrite?: boolean;
     noSegmentUpdate?: boolean;
     empty?: boolean;

package/module-templates/arktype/controller.ts.ejs

@@ -3,7 +3,7 @@
   ServiceName: t.TheThing + 'Service',
 }; %>
 ---
-dir: <%= t.defaultDir %>
+outDir: <%= t.defaultOutDir %>
 fileName: <%= vars.ModuleName + '.ts' %>
 sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>

package/module-templates/type/controller.ts.ejs

@@ -3,7 +3,7 @@
   ServiceName: t.TheThing + 'Service',
 }; %>
 ---
-dir: <%= t.defaultDir %>
+outDir: <%= t.defaultOutDir %>
 fileName: <%= vars.rpcModuleName + '.ts' %>
 sourceName: <%= vars.rpcModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>

package/module-templates/type/service.ts.ejs

@@ -3,7 +3,7 @@
   ServiceName: t.TheThing + 'Service',
 }; %>
 ---
-dir: <%= t.defaultDir %>
+outDir: <%= t.defaultOutDir %>
 fileName: <%= vars.ServiceName + '.ts' %>
 sourceName: <%= vars.ServiceName %>
 ---

package/module-templates/valibot/controller.ts.ejs

@@ -3,7 +3,7 @@
   ServiceName: t.TheThing + 'Service',
 }; %>
 ---
-dir: <%= t.defaultDir %>
+outDir: <%= t.defaultOutDir %>
 fileName: <%= vars.ModuleName + '.ts' %>
 sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.360",
+  "version": "0.0.1-draft.362",
   "bin": {
     "vovk": "./dist/index.mjs"
   },