vovk-cli 0.0.1-draft.396 → 0.0.1-draft.398

package/client-templates/{cjs → cjsBase}/index.cjs.ejs

@@ -1,7 +1,6 @@
 <%- t.getFirstLineBanner() %>
 const { createRPC } = require('<%= t.commonImports.createRPC %>');
 const { schema } = require('./schema.cjs');
-const { openapi } = require('./openapi.cjs');
 <% Object.entries(t.reExports).forEach(([reExportWhatCommaDivisible, reExportFrom]) => {
     reExportWhatCommaDivisible.split(/\s*,\s*/).forEach((reExportWhat) => { %>
 exports['<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>'] = require('<%= reExportFrom %>')['<%= reExportWhat.split(/\s+as\s+/)[0] %>'];
@@ -17,4 +16,3 @@ exports.<%= rpcModuleName %> = createRPC(
   <% })
 }) %>
 exports.schema = schema;
-exports.openapi = openapi;

package/client-templates/{cjs → cjsBase}/index.d.cts.ejs

@@ -16,7 +16,6 @@ export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segme
   <% }) 
 }) %>
 export { schema } from './schema.cjs';
-export { openapi } from './openapi.cjs';
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

package/client-templates/{mjs → mjsBase}/index.d.mts.ejs

@@ -16,7 +16,6 @@ export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segme
   <% }) 
 }) %>
 export { schema } from './schema.cjs';
-export { openapi } from './openapi.cjs';
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

package/client-templates/{mjs → mjsBase}/index.mjs.ejs

@@ -1,7 +1,6 @@
 <%- t.getFirstLineBanner() %>
 import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema.cjs';
-import { openapi } from './openapi.cjs';
 <% Object.entries(t.reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
 <% }) %>
@@ -16,4 +15,4 @@ export const <%= rpcModuleName %> = createRPC(
   }); 
 });
 %>
-export { schema, openapi };
+export { schema };

package/client-templates/schemaCjs/schema.cjs.ejs

@@ -2,7 +2,7 @@
 <% if(t.isVovkProject) { %>
 const meta = require('./<%= t.schemaOutDir %>/_meta.json');
 <% } else { %>
-const meta = <%- JSON.stringify(t.publicMeta, null, 2) %>;
+const meta = <%- JSON.stringify(t.schema.meta, null, 2) %>;
 <% } %>
 
 <% if(t.hasMixins) { %>

package/client-templates/{ts → tsBase}/index.ts.ejs

@@ -2,13 +2,6 @@
 import type { VovkFetcher } from 'vovk';
 import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema<%= t.nodeNextResolutionExt.ts %>';
-<% if(t.isBundle) { %>
-import { openapi } from './openapi<%= t.nodeNextResolutionExt.ts %>';
-<% } else { %>
-// import { openapi } from './openapi<%= t.nodeNextResolutionExt.ts %>';
-// TODO: This is a temporary fix for https://github.com/rolldown/tsdown/issues/528#issuecomment-3476284358
-import openapi from './openapi.json' with { type: "json" };
-<% } %>
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }
@@ -28,7 +21,7 @@ export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin
 );
 <% }) 
 }) %>
-export { schema, openapi };
+export { schema };
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

package/dist/bundle/index.mjs

@@ -33,7 +33,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             openapiRootUrl: cliBundleOptions?.openapiRootUrl,
             openapiMixinName: cliBundleOptions?.openapiMixinName,
             openapiFallback: cliBundleOptions?.openapiFallback,
-            composedFrom: [BuiltInTemplateName.ts],
+            composedFrom: [BuiltInTemplateName.tsBase],
             composedOut: prebundleOutDirAbsolute,
             composedOnly: true,
             composedIncludeSegments: cliBundleOptions.includeSegments ?? bundleConfig.includeSegments,

package/dist/generate/generate.mjs

@@ -146,7 +146,11 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 config: projectInfo.config,
                 rootEntry: config.rootEntry,
                 schema: fullSchema,
-                outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
+                outputConfigs: [
+                    config.composedClient.outputConfig ?? {},
+                    templateDef.outputConfig ?? {},
+                    { origin: cliGenerateOptions?.origin },
+                ],
                 projectPackageJson,
                 isBundle,
                 segmentName: null,
@@ -234,7 +238,11 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     schema: fullSchema,
                     rootEntry: config.rootEntry,
                     segmentName,
-                    outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
+                    outputConfigs: [
+                        config.segmentedClient.outputConfig ?? {},
+                        templateDef.outputConfig ?? {},
+                        { origin: cliGenerateOptions?.origin },
+                    ],
                     isBundle,
                     projectPackageJson,
                 });

package/dist/generate/writeOneClientFile.mjs

@@ -84,7 +84,7 @@ templateContent, matterResult: { data, content }, openAPIObject, package: packag
                 segmentName: sName,
                 isBundle,
                 outCwdRelativeDir,
-                outputConfigs: [templateDef.outputConfig ?? {}],
+                outputConfigs: [projectConfig[configKey].outputConfig ?? {}, templateDef.outputConfig ?? {}],
             });
             const imports = configKey === 'composedClient' ? clientImports['composedClient'] : clientImports['segmentedClient'][sName];
             return [sName, imports];

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

@@ -1,5 +1,8 @@
 import type { VovkStrictConfig } from 'vovk';
 export declare enum BuiltInTemplateName {
+    tsBase = "tsBase",
+    cjsBase = "cjsBase",
+    mjsBase = "mjsBase",
     ts = "ts",
     cjs = "cjs",
     mjs = "mjs",

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -1,6 +1,9 @@
 export var BuiltInTemplateName;
 (function (BuiltInTemplateName) {
     // ts/js
+    BuiltInTemplateName["tsBase"] = "tsBase";
+    BuiltInTemplateName["cjsBase"] = "cjsBase";
+    BuiltInTemplateName["mjsBase"] = "mjsBase";
     BuiltInTemplateName["ts"] = "ts";
     BuiltInTemplateName["cjs"] = "cjs";
     BuiltInTemplateName["mjs"] = "mjs";
@@ -44,30 +47,45 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.openapiJson]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiJson}/`,
         },
-        [BuiltInTemplateName.ts]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.ts}/`,
+        [BuiltInTemplateName.tsBase]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.tsBase}/`,
             requires: {
                 [BuiltInTemplateName.schemaTs]: './',
-                [BuiltInTemplateName.openapiTs]: './',
                 [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
-        [BuiltInTemplateName.cjs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.cjs}/`,
+        [BuiltInTemplateName.cjsBase]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.cjsBase}/`,
             requires: {
                 [BuiltInTemplateName.schemaCjs]: './',
-                [BuiltInTemplateName.openapiCjs]: './',
                 [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
-        [BuiltInTemplateName.mjs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mjs}/`,
+        [BuiltInTemplateName.mjsBase]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mjsBase}/`,
             requires: {
                 [BuiltInTemplateName.schemaCjs]: './',
-                [BuiltInTemplateName.openapiCjs]: './',
                 [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
+        [BuiltInTemplateName.ts]: {
+            requires: {
+                [BuiltInTemplateName.tsBase]: './',
+                [BuiltInTemplateName.openapiTs]: './',
+            },
+        },
+        [BuiltInTemplateName.cjs]: {
+            requires: {
+                [BuiltInTemplateName.cjsBase]: './',
+                [BuiltInTemplateName.openapiCjs]: './',
+            },
+        },
+        [BuiltInTemplateName.mjs]: {
+            requires: {
+                [BuiltInTemplateName.mjsBase]: './',
+                [BuiltInTemplateName.openapiCjs]: './',
+            },
+        },
         [BuiltInTemplateName.schemaTs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaTs}/`,
         },

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

@@ -25,6 +25,11 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             outDir?: string;
             fromTemplates?: string[];
             prettifyClient?: boolean;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -37,6 +42,11 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             outDir?: string;
             fromTemplates?: string[];
             prettifyClient?: boolean;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -2,6 +2,90 @@ import { VovkSchemaIdEnum, type VovkStrictConfig } from 'vovk';
 export default function getMetaSchema({ config }: {
     config: VovkStrictConfig;
 }): {
-    config: VovkStrictConfig;
     $schema: VovkSchemaIdEnum;
+    config: Pick<VovkStrictConfig, keyof {
+        $schema?: typeof VovkSchemaIdEnum.CONFIG | (string & {});
+        exposeConfigKeys?: boolean | (keyof VovkStrictConfig | (string & {}))[];
+        schemaOutDir?: string;
+        modulesDir?: string;
+        rootEntry?: string;
+        logLevel?: "error" | "trace" | "debug" | "info" | "warn" | (string & {});
+        libs?: {
+            ajv?: import("vovk").KnownAny;
+            [key: string]: import("vovk").KnownAny;
+        };
+        devHttps?: boolean;
+        composedClient?: {
+            enabled?: boolean;
+            outDir?: string;
+            fromTemplates?: string[];
+            prettifyClient?: boolean;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
+        } & ({
+            excludeSegments?: never;
+            includeSegments?: string[];
+        } | {
+            excludeSegments?: string[];
+            includeSegments?: never;
+        });
+        segmentedClient?: {
+            enabled?: boolean;
+            outDir?: string;
+            fromTemplates?: string[];
+            prettifyClient?: boolean;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
+        } & ({
+            excludeSegments?: never;
+            includeSegments?: string[];
+        } | {
+            excludeSegments?: string[];
+            includeSegments?: never;
+        });
+        bundle?: {
+            requires?: Record<string, string>;
+            prebundleOutDir?: string;
+            keepPrebundleDir?: boolean;
+            outDir?: string;
+            build: (options: {
+                outDir: string;
+                prebundleDir: string;
+                entry: string;
+            }) => Promise<void>;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
+        } & ({
+            excludeSegments?: never;
+            includeSegments?: string[];
+        } | {
+            excludeSegments?: string[];
+            includeSegments?: never;
+        });
+        clientTemplateDefs?: Record<string, import("vovk/types").ClientTemplateDef>;
+        rootSegmentModulesDirName?: string;
+        moduleTemplates?: {
+            service?: string;
+            controller?: string;
+            [key: string]: string | undefined;
+        };
+        outputConfig?: import("vovk").VovkOutputConfig<{
+            fetcher?: string | [string, string] | [string];
+            validateOnClient?: string | [string, string] | [string] | null;
+            createRPC?: string | [string, string] | [string];
+        }> & {
+            segments?: Record<string, import("vovk/types").VovkSegmentConfig>;
+        };
+    }> | {
+        $schema: VovkSchemaIdEnum;
+    };
 };

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -1,25 +1,12 @@
 import { VovkSchemaIdEnum } from 'vovk';
 import pick from 'lodash/pick.js';
-import mapValues from 'lodash/mapValues.js';
-import omit from 'lodash/omit.js';
 export default function getMetaSchema({ config }) {
     return {
         $schema: VovkSchemaIdEnum.META,
-        ...{
-            config: (config
-                ? pick({
-                    ...config,
-                    outputConfig: config.outputConfig
-                        ? {
-                            ...config.outputConfig,
-                            // TODO: Dirty fix! Need to think of a better way to avoid emission of mixins.
-                            segments: config.outputConfig.segments
-                                ? mapValues(config.outputConfig.segments, (segment) => omit(segment, ['openAPIMixin']))
-                                : undefined,
-                        }
-                        : undefined,
-                }, [...config.exposeConfigKeys, '$schema'])
-                : {}),
-        },
+        config: config
+            ? pick(config, [...config.exposeConfigKeys, '$schema'])
+            : {
+                $schema: VovkSchemaIdEnum.CONFIG,
+            },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.396",
+  "version": "0.0.1-draft.398",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.472",
+    "vovk": "^3.0.0-draft.474",
     "vovk-ajv": "^0.0.0-draft.113",
     "vovk-client": "^0.0.4-draft.140",
     "vovk-python": "^0.0.1-draft.82",