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

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 = {}) {
@@ -54,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.mjs

@@ -43,7 +43,7 @@ export default async function getConfig({ configPath, cwd }) {
             outDir: conf.segmentedClient?.outDir ?? path.join(srcRoot ?? '.', 'client'),
         },
         bundle: {
-            tsClientOutDir: conf.bundle?.tsClientOutDir ?? 'tmp_ts_rpc',
+            tsClientOutDir: conf.bundle?.tsClientOutDir ?? 'tmp_prebundle',
             dontDeleteTsClientOutDirAfter: conf.bundle?.dontDeleteTsClientOutDirAfter ?? false,
             requires: {
                 [BuiltInTemplateName.readme]: '.',

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({

package/dist/types.d.mts

@@ -21,6 +21,7 @@ export interface GenerateOptions {
     openapiGetMethodName?: string[];
     openapiRootUrl?: string[];
     openapiMixinName?: string[];
+    openapiFallback?: string[];
     watch?: boolean | string;
     composedFrom?: string[];
     composedOut?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.301",
+  "version": "0.0.1-draft.302",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,10 +35,10 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.340"
+    "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",