vovk-cli 0.0.1-draft.156 → 0.0.1-draft.158

package/dist/bundle/index.mjs

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
 import { build } from 'tsdown';
+import groupBy from 'lodash/groupBy.js';
 import generate from '../generate/index.mjs';
 import { BuiltInTemplateName } from '../getProjectInfo/getConfig/getTemplateDefs.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
@@ -31,7 +32,8 @@ export default async function bundle({ projectInfo, fullSchema, }) {
         outDir,
         sourcemap: bundleConfig.sourcemap,
     });
-    log.debug(`Bundled TypeScript client to ${chalkHighlightThing(outDir)}`);
+    const outDirAbsolute = path.resolve(cwd, outDir);
+    log.info(`Bundled index.ts to ${chalkHighlightThing(outDirAbsolute)}`);
     await build({
         entry: path.join(tsFullClientOutAbsoluteDirInput, './fullSchema.ts'),
         dts: true,
@@ -41,29 +43,20 @@ export default async function bundle({ projectInfo, fullSchema, }) {
         clean: false,
         sourcemap: bundleConfig.sourcemap,
     });
-    log.debug(`Bundled fullSchema.ts to ${chalkHighlightThing(outDir)}`);
-    const fullFrom = [];
-    if (!bundleConfig.noReadme) {
-        fullFrom.push(BuiltInTemplateName.readme);
-    }
-    if (!bundleConfig.noPackage) {
-        fullFrom.push(BuiltInTemplateName.packageJson);
-    }
-    if (fullFrom.length) {
+    log.info(`Bundled fullSchema.ts to ${chalkHighlightThing(outDirAbsolute)}`);
+    const requiresGroup = groupBy(Object.entries(bundleConfig.requires), ([, relativeOutDir]) => relativeOutDir);
+    for (const [relativePath, group] of Object.entries(requiresGroup)) {
         await generate({
             isEnsuringClient: false,
             projectInfo,
             forceNothingWrittenLog: true,
             fullSchema,
             cliGenerateOptions: {
-                fullFrom,
-                fullOut: outDir,
+                fullFrom: group.map(([templateName]) => templateName),
+                fullOut: path.resolve(outDir, relativePath),
             },
         });
     }
-    else {
-        log.debug('No README or package.json generated');
-    }
     if (!bundleConfig.dontDeleteTsClientOutDirAfter) {
         await fs.rm(tsFullClientOutAbsoluteDirInput, { recursive: true, force: true });
         log.debug(`Deleted temporary TypeScript client output directory: ${chalkHighlightThing(tsFullClientOutAbsoluteDirInput)}`);
@@ -71,5 +64,5 @@ export default async function bundle({ projectInfo, fullSchema, }) {
     else {
         log.debug(`Temporary TypeScript client output directory not deleted: ${chalkHighlightThing(tsFullClientOutAbsoluteDirInput)}`);
     }
-    log.info(`Bundled TypeScript client to ${outDir}`);
+    log.info(`Bundled TypeScript client to ${outDirAbsolute}`);
 }

package/dist/getProjectInfo/getConfig/index.mjs

@@ -3,7 +3,7 @@ import camelCase from 'lodash/camelCase.js';
 import getLogger from '../../utils/getLogger.mjs';
 import getUserConfig from '../getUserConfig.mjs';
 import getRelativeSrcRoot from '../getRelativeSrcRoot.mjs';
-import getTemplateDefs from './getTemplateDefs.mjs';
+import getTemplateDefs, { BuiltInTemplateName } from './getTemplateDefs.mjs';
 import { SchemaIdEnum } from '../../enums.mjs';
 export default async function getConfig({ cliGenerateOptions, cliBundleOptions, cwd, }) {
     const { configAbsolutePaths, error, userConfig } = await getUserConfig({
@@ -22,7 +22,7 @@ export default async function getConfig({ cliGenerateOptions, cliBundleOptions,
         validateOnClient: typeof validateOnClientImport === 'string'
             ? [validateOnClientImport]
             : (validateOnClientImport ?? null),
-        createRPC: typeof createRPCImport === 'string' ? [createRPCImport, 'vovk'] : createRPCImport,
+        createRPC: typeof createRPCImport === 'string' ? [createRPCImport, createRPCImport] : createRPCImport,
     };
     const config = {
         $schema: SchemaIdEnum.CONFIG,
@@ -47,9 +47,11 @@ export default async function getConfig({ cliGenerateOptions, cliBundleOptions,
             outDir: cliBundleOptions?.outDir ?? conf.bundle?.outDir ?? 'dist',
             tsClientOutDir: cliBundleOptions?.tsClientOutDir ?? conf.bundle?.tsClientOutDir ?? '.tmp-ts-rpc',
             dontDeleteTsClientOutDirAfter: cliBundleOptions?.dontDeleteTsClientOutDirAfter ?? conf.bundle?.dontDeleteTsClientOutDirAfter ?? false,
-            noReadme: cliBundleOptions?.noReadme ?? conf.bundle?.noReadme ?? false,
-            noPackage: cliBundleOptions?.noPackage ?? conf.bundle?.noPackage ?? false,
             sourcemap: cliBundleOptions?.sourcemap ?? conf.bundle?.sourcemap ?? false,
+            requires: {
+                [BuiltInTemplateName.readme]: '.',
+                [BuiltInTemplateName.packageJson]: '.',
+            },
         },
         modulesDir: env.VOVK_MODULES_DIR ?? conf.modulesDir ?? './' + [srcRoot, 'modules'].filter(Boolean).join('/'),
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',

package/dist/types.d.mts

@@ -21,7 +21,7 @@ export interface GenerateOptions {
     segmentedOut?: string;
     segmentedOnly?: boolean;
 }
-export interface BundleOptions extends Partial<VovkStrictConfig['bundle']> {
+export interface BundleOptions extends Partial<Omit<VovkStrictConfig['bundle'], 'requires'>> {
     config?: string;
 }
 export interface InitOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.156",
+  "version": "0.0.1-draft.158",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,10 +35,10 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.127"
+    "vovk": "^3.0.0-draft.128"
   },
   "optionalDependencies": {
-    "vovk-python-client": "^0.0.1-draft.22"
+    "vovk-python-client": "^0.0.1-draft.24"
   },
   "dependencies": {
     "@inquirer/prompts": "^7.5.1",
@@ -67,7 +67,7 @@
     "tsdown": "^0.11.7",
     "type-fest": "^4.41.0",
     "undici": "^7.9.0",
-    "vovk-openapi": "^0.0.1-draft.72"
+    "vovk-openapi": "^0.0.1-draft.74"
   },
   "devDependencies": {
     "@types/concat-stream": "^2.0.3",