vovk-cli 0.0.1-draft.370 → 0.0.1-draft.371

package/dist/generate/generate.mjs

@@ -144,7 +144,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 : { data: { imports: [] }, content: templateContent };
             const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
                 schema: fullSchema,
-                configs: [templateDef.generatorConfig ?? {}],
+                configs: [{ origin: cliGenerateOptions?.origin }, templateDef.generatorConfig ?? {}],
                 projectPackageJson,
                 isBundle,
                 segmentName: null,
@@ -182,7 +182,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 isVovkProject,
                 vovkCliPackage,
                 isBundle,
-                origin: cliGenerateOptions?.origin ?? origin,
+                origin,
                 configKey: 'composedClient',
                 cliSchemaPath: cliGenerateOptions?.schemaPath ?? null,
                 projectConfig: config,
@@ -229,7 +229,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             const results = await Promise.all(segmentNames.map(async (segmentName) => {
                 const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
                     schema: fullSchema,
-                    configs: [templateDef.generatorConfig ?? {}],
+                    configs: [{ origin: cliGenerateOptions?.origin }, templateDef.generatorConfig ?? {}],
                     projectPackageJson,
                     segmentName,
                     isBundle,
@@ -267,7 +267,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     isVovkProject,
                     vovkCliPackage,
                     isBundle,
-                    origin: cliGenerateOptions?.origin ?? origin,
+                    origin,
                     configKey: 'segmentedClient',
                     cliSchemaPath: cliGenerateOptions?.schemaPath ?? null,
                     projectConfig: config,

package/dist/new/newModule.mjs

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
+import chalk from 'chalk';
 import { getTsconfig } from 'get-tsconfig';
 import render from './render.mjs';
 import addClassToSegmentCode from './addClassToSegmentCode.mjs';
@@ -80,12 +81,12 @@ export default async function newModule({ projectInfo, what, moduleNameWithOptio
         const prettiedCode = await prettify(code, absoluteModulePath);
         if (!dryRun) {
             if (!overwrite && (await getFileSystemEntryType(absoluteModulePath))) {
-                log.warn(`File ${chalkHighlightThing(absoluteModulePath)} already exists, skipping this "${type}"`);
+                log.warn(`File ${chalkHighlightThing(absoluteModulePath)} already exists, skipping this "${chalkHighlightThing(type)}". You can use --overwrite flag to overwrite it.`);
             }
             else {
                 await fs.mkdir(absoluteModuleDir, { recursive: true });
                 await fs.writeFile(absoluteModulePath, prettiedCode);
-                log.info(`Created${empty ? ' empty' : ''} ${chalkHighlightThing(absoluteModulePath)} using ${chalkHighlightThing(`"${type}"`)} template for ${formatLoggedSegmentName(segmentName)}`);
+                log.info(`${chalk.green('Created')}${empty ? ' empty' : ''} ${chalkHighlightThing(absoluteModulePath)} using ${chalkHighlightThing(`"${type}"`)} template for ${formatLoggedSegmentName(segmentName)}`);
             }
         }
         if (type === 'controller') {
@@ -109,7 +110,7 @@ export default async function newModule({ projectInfo, what, moduleNameWithOptio
                     await fs.writeFile(routeFilePath, newSegmentCode);
                 }
             }
-            log.info(`Added ${chalkHighlightThing(sourceName)} ${type} as ${chalkHighlightThing(compiledName)} to ${formatLoggedSegmentName(segmentName)}`);
+            log.info(`${chalk.green('Added')} ${chalkHighlightThing(sourceName)} ${type} as ${chalkHighlightThing(compiledName)} to ${formatLoggedSegmentName(segmentName)}`);
         }
     }
 }

package/dist/new/newSegment.mjs

@@ -12,7 +12,7 @@ export default async function newSegment({ projectInfo, segmentName, isStaticSeg
     }
     const absoluteSegmentRoutePath = path.join(apiDirAbsolutePath, segmentName, '[[...vovk]]/route.ts');
     if (!overwrite && (await getFileSystemEntryType(absoluteSegmentRoutePath))) {
-        throw new Error(`Unable to create new segment. ${formatLoggedSegmentName(segmentName, { upperFirst: true })} already exists.`);
+        throw new Error(`Unable to create new segment. ${formatLoggedSegmentName(segmentName, { upperFirst: true })} already exists. You can use --overwrite flag to overwrite it.`);
     }
     const code = await prettify(`import { initSegment${isStaticSegment ? ', generateStaticAPI' : ''} } from 'vovk';
 
@@ -35,7 +35,7 @@ ${segmentName ? `  segmentName: '${segmentName}',\n` : ''}  emitSchema: true,
         await fs.mkdir(path.dirname(absoluteSegmentRoutePath), { recursive: true });
         await fs.writeFile(absoluteSegmentRoutePath, code);
     }
-    log.info(`${formatLoggedSegmentName(segmentName, { upperFirst: true, isStatic: isStaticSegment })} created at ${absoluteSegmentRoutePath}.`);
+    log.info(`${chalk.green('Created')} ${formatLoggedSegmentName(segmentName, { isStatic: isStaticSegment })} at ${absoluteSegmentRoutePath}.`);
     const dir = chalk.cyanBright([segmentName, 'thing'].filter(Boolean).join('/'));
     log.info(`Run ${chalkHighlightThing(`npx vovk new service controller ${dir}`)} to create a new controller with a service at ${path.join(config.modulesDir, dir)} folder for this segment`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.370",
+  "version": "0.0.1-draft.371",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,11 +35,11 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.433",
-    "vovk-ajv": "^0.0.0-draft.103",
-    "vovk-client": "^0.0.4-draft.131",
-    "vovk-python": "^0.0.1-draft.73",
-    "vovk-rust": "^0.0.1-draft.59"
+    "vovk": "^3.0.0-draft.441",
+    "vovk-ajv": "^0.0.0-draft.104",
+    "vovk-client": "^0.0.4-draft.132",
+    "vovk-python": "^0.0.1-draft.74",
+    "vovk-rust": "^0.0.1-draft.60"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.36"