vovk-cli 0.0.1-draft.300 → 0.0.1-draft.302

package/client-templates/cjs/index.cjs.ejs

@@ -5,7 +5,7 @@ const { schema } = require('./schema.cjs');
 const { validateOnClient = null } = <%- t.imports.validateOnClient ? `require('${t.imports.validateOnClient}')` : '{}'%>;
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
     <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhatCommaDivisible, reExportFrom]) => {
-      reExportWhatCommaDivisible.split(',').forEach((reExportWhat) => { %>
+      reExportWhatCommaDivisible.split(/\s*,\s*/).forEach((reExportWhat) => { %>
 exports['<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>'] = require('<%= reExportFrom %>')['<%= reExportWhat.split(/\s+as\s+/)[0] %>'];
     <% })
        }) %>

package/client-templates/mixins/mixins.json.ejs

@@ -1 +1 @@
-<%- JSON.stringify(t._.pickBy(t.schema.segments, (segment) => segment.segmentType === 'mixin'), null, 2) %>
+<%- JSON.stringify(t._.pickBy(t.schema.segments, (segment) => segment.segmentType === 'mixin'), null, 2) %>

package/dist/bundle/index.mjs

@@ -13,11 +13,10 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
     const tsFullClientOutAbsoluteDirInput = path.join(cwd, bundleConfig.tsClientOutDir);
     const tsClientOutDir = cliBundleOptions?.tsClientOutDir ?? bundleConfig.tsClientOutDir;
     const dontDeleteTsClientOutDirAfter = cliBundleOptions?.dontDeleteTsClientOutDirAfter ?? bundleConfig?.dontDeleteTsClientOutDirAfter ?? false;
-    const sourcemap = cliBundleOptions?.sourcemap ?? bundleConfig?.sourcemap;
     if (!tsClientOutDir) {
         throw new Error('No output directory specified for composed client');
     }
-    const outDir = cliBundleOptions?.outDir ?? bundleConfig.outDir;
+    const outDir = cliBundleOptions?.outDir ?? bundleConfig.tsdownBuildOptions.outDir;
     if (!outDir) {
         throw new Error('No output directory specified for bundling');
     }
@@ -39,7 +38,6 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             composedOnly: true,
             composedIncludeSegments: cliBundleOptions.includeSegments ?? bundleConfig.includeSegments,
             composedExcludeSegments: cliBundleOptions.excludeSegments ?? bundleConfig.excludeSegments,
-            forceTsStandalone: cliBundleOptions.forceTsStandalone,
         },
     });
     await build({
@@ -48,7 +46,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         format: ['cjs', 'esm'],
         fixedExtension: true,
         outDir,
-        sourcemap: bundleConfig.sourcemap,
+        ...bundleConfig.tsdownBuildOptions,
     });
     const outDirAbsolute = path.resolve(cwd, outDir);
     log.debug(`Bundled index.ts to ${chalkHighlightThing(outDirAbsolute)}`);
@@ -59,7 +57,6 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         fixedExtension: true,
         outDir,
         clean: false,
-        sourcemap,
     });
     log.debug(`Bundled schema.ts to ${chalkHighlightThing(outDirAbsolute)}`);
     const requiresGroup = groupBy(Object.entries(bundleConfig.requires), ([, relativePath]) => relativePath);

package/dist/generate/generate.mjs

@@ -64,10 +64,12 @@ function logClientGenerationResults({ results, log, isEnsuringClient = false, fo
         logOrDebug(`${clientType} client${isEnsuringClient ? ' placeholder' : ''} is not generated because no files were written (${duration}ms)`);
     }
 }
-const cliOptionsToOpenAPIMixins = ({ openapiGetMethodName, openapiGetModuleName, openapiRootUrl, openapiSpec, openapiMixinName, }) => {
+const cliOptionsToOpenAPIMixins = ({ openapiGetMethodName, openapiGetModuleName, openapiRootUrl, openapiSpec, openapiFallback, openapiMixinName, }) => {
     return Object.fromEntries((openapiSpec?.map((spec, i) => {
         return {
-            source: spec.startsWith('http://') || spec.startsWith('https://') ? { url: spec } : { file: spec },
+            source: spec.startsWith('http://') || spec.startsWith('https://')
+                ? { url: spec, fallback: openapiFallback?.[i] }
+                : { file: spec },
             apiRoot: openapiRootUrl?.[i] ?? '/',
             getModuleName: openapiGetModuleName?.[i] ?? undefined,
             getMethodName: openapiGetMethodName?.[i] ?? 'auto',

package/dist/getProjectInfo/getConfig/getTemplateDefs.d.mts

@@ -10,7 +10,11 @@ export declare enum BuiltInTemplateName {
     readme = "readme",
     packageJson = "packageJson",
     mixins = "mixins",
+    rsSrc = "rsSrc",
+    rsPkg = "rsPkg",
     rs = "rs",
+    pySrc = "pySrc",
+    pyPkg = "pyPkg",
     py = "py"
 }
 export default function getTemplateDefs(userTemplateDefs?: VovkStrictConfig['clientTemplateDefs']): VovkStrictConfig['clientTemplateDefs'];

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -15,7 +15,11 @@ export var BuiltInTemplateName;
     BuiltInTemplateName["packageJson"] = "packageJson";
     BuiltInTemplateName["mixins"] = "mixins";
     // other languages (packages installed separately)
+    BuiltInTemplateName["rsSrc"] = "rsSrc";
+    BuiltInTemplateName["rsPkg"] = "rsPkg";
     BuiltInTemplateName["rs"] = "rs";
+    BuiltInTemplateName["pySrc"] = "pySrc";
+    BuiltInTemplateName["pyPkg"] = "pyPkg";
     BuiltInTemplateName["py"] = "py";
 })(BuiltInTemplateName || (BuiltInTemplateName = {}));
 export default function getTemplateDefs(userTemplateDefs = {}) {
@@ -45,10 +49,6 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.schemaJson]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaJson}/`,
         },
-        [BuiltInTemplateName.standaloneTypesTs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.standaloneTypesTs}/`,
-            requires: { [BuiltInTemplateName.schemaJson]: '.' },
-        },
         [BuiltInTemplateName.readme]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.readme}/`,
         },
@@ -58,22 +58,40 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.mixins]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mixins}/`,
         },
+        [BuiltInTemplateName.rsSrc]: {
+            templatePath: `vovk-rust/client-templates/${BuiltInTemplateName.rsSrc}/`,
+            requires: {
+                [BuiltInTemplateName.schemaJson]: './',
+            },
+        },
+        [BuiltInTemplateName.rsPkg]: {
+            templatePath: `vovk-rust/client-templates/${BuiltInTemplateName.rsPkg}/`,
+        },
         [BuiltInTemplateName.rs]: {
-            templatePath: 'vovk-rust/template/',
             composedClient: {
                 outDir: 'dist_rust',
             },
             requires: {
-                [BuiltInTemplateName.schemaJson]: './data/',
+                [BuiltInTemplateName.rsSrc]: './src/',
+                [BuiltInTemplateName.rsPkg]: './',
             },
         },
+        [BuiltInTemplateName.pySrc]: {
+            templatePath: `vovk-python/client-templates/${BuiltInTemplateName.pySrc}/`,
+            requires: {
+                [BuiltInTemplateName.schemaJson]: '.',
+            },
+        },
+        [BuiltInTemplateName.pyPkg]: {
+            templatePath: `vovk-python/client-templates/${BuiltInTemplateName.pyPkg}/`,
+        },
         [BuiltInTemplateName.py]: {
-            templatePath: 'vovk-python/template/',
             composedClient: {
                 outDir: 'dist_python',
             },
             requires: {
-                [BuiltInTemplateName.schemaJson]: './src/[package_name]/',
+                [BuiltInTemplateName.pySrc]: './src/[package_name]/',
+                [BuiltInTemplateName.pyPkg]: './',
             },
         },
     };

package/dist/getProjectInfo/getConfig/index.d.mts

@@ -7,9 +7,19 @@ export default function getConfig({ configPath, cwd }: {
     srcRoot: string | null;
     configAbsolutePaths: string[];
     userConfig: {
-        $schema?: typeof VovkSchemaIdEnum.CONFIG | string;
-        emitConfig?: boolean | (keyof VovkStrictConfig | string)[];
+        $schema?: typeof VovkSchemaIdEnum.CONFIG | (string & {});
+        emitConfig?: boolean | (keyof VovkStrictConfig | (string & {}))[];
         schemaOutDir?: string;
+        modulesDir?: string;
+        rootEntry?: string;
+        origin?: string;
+        logLevel?: "error" | "trace" | "debug" | "info" | "warn";
+        prettifyClient?: boolean;
+        libs?: {
+            ajv: import("vovk").KnownAny;
+            [key: string]: import("vovk").KnownAny;
+        };
+        devHttps?: boolean;
         composedClient?: ({
             enabled?: boolean;
             outDir?: string;
@@ -43,15 +53,14 @@ export default function getConfig({ configPath, cwd }: {
             }>;
         };
         bundle?: {
-            outDir?: string;
             requires?: Record<string, string>;
             tsClientOutDir?: string;
             dontDeleteTsClientOutDirAfter?: boolean;
-            sourcemap?: boolean;
             package?: import("type-fest").PackageJson;
             readme?: {
                 banner?: string;
             };
+            tsdownBuildOptions?: Parameters<typeof import("tsdown/config-9hj-APNF.mjs").build>[0];
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -59,28 +68,18 @@ export default function getConfig({ configPath, cwd }: {
             excludeSegments?: string[];
             includeSegments?: never;
         });
+        clientTemplateDefs?: Record<string, import("vovk/mjs/types").ClientTemplateDef>;
         imports?: {
             fetcher?: string | [string, string] | [string];
             validateOnClient?: string | [string, string] | [string];
             createRPC?: string | [string, string] | [string];
         };
-        modulesDir?: string;
-        rootEntry?: string;
-        origin?: string;
         rootSegmentModulesDirName?: string;
-        logLevel?: "error" | "trace" | "debug" | "info" | "warn";
-        prettifyClient?: boolean;
-        devHttps?: boolean;
-        clientTemplateDefs?: Record<string, import("vovk/mjs/types").ClientTemplateDef>;
         moduleTemplates?: {
             service?: string;
             controller?: string;
             [key: string]: string | undefined;
         };
-        libs?: {
-            ajv: import("vovk").KnownAny;
-            [key: string]: import("vovk").KnownAny;
-        };
         segmentConfig?: false | {
             [x: string]: {
                 origin?: string;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -43,10 +43,8 @@ export default async function getConfig({ configPath, cwd }) {
             outDir: conf.segmentedClient?.outDir ?? path.join(srcRoot ?? '.', 'client'),
         },
         bundle: {
-            outDir: conf.bundle?.outDir ?? 'dist',
-            tsClientOutDir: conf.bundle?.tsClientOutDir ?? 'tmp_ts_rpc',
+            tsClientOutDir: conf.bundle?.tsClientOutDir ?? 'tmp_prebundle',
             dontDeleteTsClientOutDirAfter: conf.bundle?.dontDeleteTsClientOutDirAfter ?? false,
-            sourcemap: conf.bundle?.sourcemap ?? false,
             requires: {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
@@ -54,6 +52,10 @@ export default async function getConfig({ configPath, cwd }) {
             package: {},
             readme: {},
             ...conf.bundle,
+            tsdownBuildOptions: {
+                outDir: conf.bundle?.tsdownBuildOptions?.outDir ?? 'dist',
+                ...conf.bundle?.tsdownBuildOptions,
+            },
         },
         modulesDir: conf.modulesDir ?? path.join(srcRoot ?? '.', 'modules'),
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',

package/dist/index.mjs

@@ -75,11 +75,11 @@ program
     .command('generate')
     .alias('g')
     .description('generate RPC client from schema')
+    .option('--composed-only', 'generate only composed client even if segmented client is enabled')
     .option('--out, --composed-out <path>', 'path to output directory for composed client')
     .option('--from, --composed-from <templates...>', 'client template names for composed client')
     .option('--include, --composed-include-segments <segments...>', 'include segments in composed client')
     .option('--exclude, --composed-exclude-segments <segments...>', 'exclude segments in composed client')
-    .option('--composed-only', 'generate only composed client even if segmented client is enabled')
     .option('--segmented-only', 'generate only segmented client even if composed client is enabled')
     .option('--segmented-out <path>', 'path to output directory for segmented client')
     .option('--segmented-from <templates...>', 'client template names for segmented client')
@@ -90,10 +90,12 @@ program
     .option('--config, --config-path <config>', 'path to config file')
     .option('--force-ts-standalone', 'force TypeScript standalone mode (Next.js environment will be ignored, by default it\'s "true" for non-Next.js directories)')
     .option('--watch <s>', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL')
-    .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema instead of Vovk schema')
+    .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema for client generation')
     .option('--openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
     .option('--openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')
     .option('--openapi-root-url <urls...>', 'root URLs corresponding to the index of --openapi option')
+    .option('--openapi-mixin-name <names...>', 'mixin names corresponding to the index of --openapi option')
+    .option('--openapi-fallback <paths...>', 'save OpenAPI spec and use it as a fallback if URL is not available')
     .action(async (cliGenerateOptions) => {
     const projectInfo = await getProjectInfo({ configPath: cliGenerateOptions.configPath, srcRootRequired: false });
     await new VovkGenerate({
@@ -113,8 +115,6 @@ program
     .option('--dont-delete-ts-client-out-dir-after', 'do not delete TypeScript client output directory after bundling')
     .option('--config <config>', 'path to config file')
     .option('--schema <path>', 'path to schema folder (default: .vovk-schema)')
-    .option('--sourcemap', 'generate sourcemaps')
-    .option('--force-ts-standalone', 'force TypeScript standalone mode (Next.js environment will be ignored, by default it\'s "true" for non-Next.js directories)')
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema instead of Vovk schema')
     .option('--openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
     .option('--openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')

package/dist/types.d.mts

@@ -21,8 +21,8 @@ export interface GenerateOptions {
     openapiGetMethodName?: string[];
     openapiRootUrl?: string[];
     openapiMixinName?: string[];
+    openapiFallback?: string[];
     watch?: boolean | string;
-    forceTsStandalone?: boolean;
     composedFrom?: string[];
     composedOut?: string;
     composedOnly?: boolean;
@@ -34,15 +34,15 @@ export interface GenerateOptions {
     segmentedIncludeSegments?: string[];
     segmentedExcludeSegments?: string[];
 }
-export interface BundleOptions extends Partial<Omit<VovkStrictConfig['bundle'], 'requires'>> {
+export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'], 'tsClientOutDir' | 'dontDeleteTsClientOutDirAfter' | 'includeSegments' | 'excludeSegments'>> {
     config?: string;
     schema?: string;
+    outDir?: string;
     openapiSpec?: string[];
     openapiGetModuleName?: string[];
     openapiGetMethodName?: string[];
     openapiRootUrl?: string[];
     openapiMixinName?: string[];
-    forceTsStandalone?: boolean;
 }
 export interface InitOptions {
     yes?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.300",
+  "version": "0.0.1-draft.302",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,26 +35,22 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.339"
+    "vovk": "^3.0.0-draft.348"
   },
   "optionalDependencies": {
-    "vovk-python": "^0.0.1-draft.54"
+    "vovk-python": "^0.0.1-draft.55"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@inquirer/prompts": "^7.6.0",
+    "@inquirer/prompts": "^7.7.1",
     "@npmcli/package-json": "^6.2.0",
-    "@rollup/plugin-commonjs": "^28.0.6",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-typescript": "^12.1.4",
     "@types/json-schema": "^7.0.15",
     "chalk": "^5.4.1",
     "chokidar": "^4.0.3",
     "clone-deep": "^4.0.1",
     "commander": "^13.1.0",
     "concurrently": "^9.2.0",
-    "dotenv": "^17.2.0",
+    "dotenv": "^17.2.1",
     "ejs": "^3.1.10",
     "get-tsconfig": "^4.10.1",
     "glob": "^11.0.3",
@@ -66,12 +62,11 @@
     "openapi3-ts": "^4.5.0",
     "pluralize": "^8.0.0",
     "prettier": "^3.6.2",
-    "rollup": "^4.44.2",
     "tar-stream": "^3.1.7",
     "ts-morph": "^26.0.0",
-    "tsdown": "^0.12.9",
+    "tsdown": "^0.13.0",
     "type-fest": "^4.41.0",
-    "undici": "^7.11.0",
+    "undici": "^7.12.0",
     "vovk-openapi": "^0.0.1-draft.112",
     "yaml": "^2.8.0"
   },
@@ -83,8 +78,8 @@
     "@types/pluralize": "^0.0.33",
     "@types/tar-stream": "^3.1.4",
     "concat-stream": "^2.0.0",
-    "create-next-app": "^15.3.5",
+    "create-next-app": "^15.4.4",
     "node-pty": "^1.0.0",
-    "zod": "^4.0.5"
+    "zod": "^4.0.10"
   }
 }