vovk-cli 0.0.1-draft.140 → 0.0.1-draft.142

package/dist/generate/ensureClient.mjs

@@ -39,7 +39,7 @@ export default async function ensureClient({ config, cwd, log, segments }) {
         if (!templatePath)
             return;
         const outPath = path.join(outDir, path.basename(templatePath).replace('.ejs', ''));
-        if (config.emitFullClient) {
+        if (config.generateFullClient) {
             await writeOnePlaceholder({
                 outPath,
                 defaultText,
@@ -47,7 +47,7 @@ export default async function ensureClient({ config, cwd, log, segments }) {
                 usedTemplateNames,
             });
         }
-        if (config.emitSegmentClient) {
+        if (config.generateSegmentClient) {
             // Generate client files for each segment
             await Promise.all(segments.map(async ({ segmentName }) => {
                 const outPath = path.join(outDir, segmentName || ROOT_SEGMENT_SCHEMA_NAME, path.basename(templatePath).replace('.ejs', ''));

package/dist/generate/index.mjs

@@ -97,7 +97,7 @@ export default async function generate({ projectInfo, forceNothingWrittenLog, te
             const matterResult = templatePath.endsWith('.ejs')
                 ? matter(templateContent)
                 : { data: { imports: [] }, content: templateContent };
-            if (config.emitFullClient) {
+            if (config.generateFullClient) {
                 const { written: isWritten } = await writeOneClientFile({
                     projectInfo,
                     clientTemplate,
@@ -113,8 +113,8 @@ export default async function generate({ projectInfo, forceNothingWrittenLog, te
                 }
                 written ||= isWritten;
             }
-            // TODO Remove files if emitFullClient is false ???
-            if (config.emitSegmentClient) {
+            // TODO Remove files if generateFullClient is false ???
+            if (config.generateSegmentClient) {
                 // Generate client files for each segment
                 await Promise.all(segments.map(async ({ segmentName }) => {
                     const segmentFullSchema = {
@@ -142,13 +142,13 @@ export default async function generate({ projectInfo, forceNothingWrittenLog, te
                 await removeUnlistedDirectories(outDir, []);
             }
         }
-        if (config.emitFullClient) {
+        if (config.generateFullClient) {
             const fullSchemaOutAbsolutePath = fullSchemaJSONFileName ? path.resolve(outDir, fullSchemaJSONFileName) : null;
             if (fullSchemaOutAbsolutePath) {
                 fullSchemaOutAbsolutePaths.set(null, fullSchemaOutAbsolutePath);
             }
         }
-        if (config.emitSegmentClient) {
+        if (config.generateSegmentClient) {
             segments.forEach(({ segmentName }) => {
                 const fullSchemaOutAbsolutePath = fullSchemaJSONFileName
                     ? path.resolve(outDir, segmentName || ROOT_SEGMENT_SCHEMA_NAME, fullSchemaJSONFileName)

package/dist/getProjectInfo/getConfig.mjs

@@ -11,8 +11,10 @@ export default async function getConfig({ clientOutDir, configPath, cwd, }) {
     const defaultClientTemplates = ['module', 'main'];
     const config = {
         emitConfig: [],
-        emitFullClient: 'VOVK_EMIT_FULL_CLIENT' in env ? !!env.VOVK_EMIT_FULL_CLIENT : (conf.emitFullClient ?? true),
-        emitSegmentClient: 'VOVK_EMIT_SEGMENT_CLIENT' in env ? !!env.VOVK_EMIT_SEGMENT_CLIENT : (conf.emitSegmentClient ?? false),
+        generateFullClient: 'VOVK_GENERATE_FULL_CLIENT' in env ? !!env.VOVK_GENERATE_FULL_CLIENT : (conf.generateFullClient ?? true),
+        generateSegmentClient: 'VOVK_GENERATE_SEGMENT_CLIENT' in env
+            ? !!env.VOVK_GENERATE_SEGMENT_CLIENT
+            : (conf.generateSegmentClient ?? false),
         modulesDir: env.VOVK_MODULES_DIR ?? conf.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
         imports: {
             fetcher: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,

package/dist/init/getTemplateFilesFromPackage.mjs

@@ -22,8 +22,11 @@ export default async function getTemplateFilesFromPackage(packageName, channel =
     // Extract the tarball in memory and collect template files
     const templateFiles = await extractTemplatesFromTarball(tarballBuffer);
     const entries = templateFiles
-        .filter((fileName) => fileName.startsWith('templates/') && !fileName.endsWith('/') && fileName.endsWith('.ejs'))
-        .map((fileName) => [fileName.substring('templates/'.length).replace(/\.ejs$/, ''), `${packageName}/${fileName}`]);
+        .filter((fileName) => fileName.startsWith('templates/') && !fileName.endsWith('/') && fileName.endsWith('.ts.ejs'))
+        .map((fileName) => [
+        fileName.substring('templates/'.length).replace(/\.ts\.ejs$/, ''),
+        `${packageName}/${fileName}`,
+    ]);
     return Object.fromEntries(entries);
 }
 /**

package/dist/init/index.mjs

@@ -30,7 +30,7 @@ export class Init {
             dependencies.push(validationLibrary, 'vovk-ajv', ...({
                 'vovk-zod': ['zod'],
                 'vovk-yup': ['yup'],
-                'vovk-dto': ['class-validator', 'class-transformer', 'vovk-mapped-types', 'reflect-metadata'],
+                'vovk-dto': ['class-validator', 'class-transformer', 'dto-mapped-types', 'reflect-metadata'],
             }[validationLibrary] ?? []));
         }
         if (reactQuery) {
@@ -168,7 +168,7 @@ export class Init {
                             {
                                 name: 'vovk-dto',
                                 value: 'vovk-dto',
-                                description: 'Use class-validator for data validation. Also installs class-transformer, vovk-mapped-types and reflect-metadata',
+                                description: 'Use class-validator for data validation. Also installs class-transformer, dto-mapped-types and reflect-metadata',
                             },
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],

package/dist/init/updateDependenciesWithoutInstalling.mjs

@@ -5,7 +5,7 @@ import getNPMPackageMetadata from '../utils/getNPMPackageMetadata.mjs';
 async function updateDeps({ packageJson, packageNames, channel, key, }) {
     return Promise.all(packageNames.map(async (packageName) => {
         const metadata = await getNPMPackageMetadata(packageName);
-        const isVovk = packageName.startsWith('vovk') && packageName !== 'vovk-mapped-types';
+        const isVovk = packageName.startsWith('vovk') && packageName !== 'dto-mapped-types';
         const latestVersion = metadata['dist-tags'][isVovk ? (channel ?? 'latest') : 'latest'];
         if (!packageJson[key]) {
             packageJson[key] = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.140",
+  "version": "0.0.1-draft.142",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,13 +35,13 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.114"
+    "vovk": "^3.0.0-draft.115"
   },
   "optionalDependencies": {
-    "vovk-python-client": "^0.0.1-draft.8"
+    "vovk-python-client": "^0.0.1-draft.10"
   },
   "dependencies": {
-    "@inquirer/prompts": "^7.3.1",
+    "@inquirer/prompts": "^7.4.0",
     "@npmcli/package-json": "^6.1.1",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
@@ -56,10 +56,10 @@
     "lodash": "^4.17.21",
     "loglevel": "^1.9.2",
     "pluralize": "^8.0.0",
-    "prettier": "^3.4.2",
+    "prettier": "^3.5.3",
     "tar-stream": "^3.1.7",
-    "ts-morph": "^25.0.0",
-    "undici": "^7.3.0"
+    "ts-morph": "^25.0.1",
+    "undici": "^7.5.0"
   },
   "devDependencies": {
     "@types/concat-stream": "^2.0.3",
@@ -68,8 +68,8 @@
     "@types/pluralize": "^0.0.33",
     "@types/tar-stream": "^3.1.3",
     "concat-stream": "^2.0.0",
-    "create-next-app": "^15.1.6",
+    "create-next-app": "^15.2.4",
     "node-pty": "^1.0.0",
-    "type-fest": "^4.37.0"
+    "type-fest": "^4.38.0"
   }
 }