vovk-cli 0.0.1-draft.390 → 0.0.1-draft.393

package/dist/generate/generate.mjs

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 import matter from 'gray-matter';
 import _ from 'lodash';
-import { resolveGeneratorConfigValues, openAPIToVovkSchema, vovkSchemaToOpenAPI, } from 'vovk';
+import { openAPIToVovkSchema, vovkSchemaToOpenAPI, } from 'vovk';
 import getClientTemplateFiles from './getClientTemplateFiles.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import pickSegmentFullSchema from '../utils/pickSegmentFullSchema.mjs';
@@ -142,18 +142,15 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             const matterResult = templateFilePath.endsWith('.ejs')
                 ? matter(templateContent)
                 : { data: { imports: [] }, content: templateContent };
-            const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
+            const { package: packageJson, readme, origin, samples, reExports, openAPIObject, } = vovkSchemaToOpenAPI({
                 config: projectInfo.config,
+                rootEntry: config.rootEntry,
                 schema: fullSchema,
                 outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
                 projectPackageJson,
                 isBundle,
                 segmentName: null,
             });
-            const openapi = vovkSchemaToOpenAPI({
-                schema: fullSchema,
-                rootEntry: config.rootEntry,
-            });
             const composedFullSchema = pickSegmentFullSchema(fullSchema, segmentNames);
             const hasMixins = Object.values(composedFullSchema.segments).some((segment) => segment.segmentType === 'mixin');
             if (templateName === BuiltInTemplateName.mixins && !hasMixins) {
@@ -168,7 +165,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 segmentName: null,
                 templateContent,
                 matterResult,
-                openapi,
+                openAPIObject,
                 package: packageJson,
                 readme,
                 samples,
@@ -227,23 +224,19 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 ? matter(templateContent)
                 : { data: { imports: [] }, content: templateContent };
             const results = await Promise.all(segmentNames.map(async (segmentName) => {
-                const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
-                    config: projectInfo.config,
-                    schema: fullSchema,
-                    outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
-                    projectPackageJson,
-                    segmentName,
-                    isBundle,
-                });
                 const segmentedFullSchema = pickSegmentFullSchema(fullSchema, [segmentName]);
                 const hasMixins = Object.values(segmentedFullSchema.segments).some((segment) => segment.segmentType === 'mixin');
                 if (templateName === BuiltInTemplateName.mixins && !hasMixins) {
                     return null;
                 }
-                const openapi = vovkSchemaToOpenAPI({
+                const { package: packageJson, readme, origin, samples, reExports, openAPIObject, } = vovkSchemaToOpenAPI({
+                    config: projectInfo.config,
                     schema: fullSchema,
                     rootEntry: config.rootEntry,
                     segmentName,
+                    outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
+                    isBundle,
+                    projectPackageJson,
                 });
                 const { written } = await writeOneClientFile({
                     cwd,
@@ -254,7 +247,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     segmentName,
                     templateContent,
                     matterResult,
-                    openapi,
+                    openAPIObject,
                     package: packageJson,
                     readme,
                     samples,

package/dist/generate/getTemplateClientImports.d.mts

@@ -4,12 +4,13 @@ export type ClientImports = {
     validateOnClient: string | null;
     createRPC: string;
 };
-export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, segmentName, isBundle, }: {
+export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, segmentName, isBundle, outputConfigs, }: {
     config: VovkStrictConfig;
     fullSchema: VovkSchema;
     outCwdRelativeDir: string;
     segmentName: string | null;
     isBundle: boolean;
+    outputConfigs: VovkStrictConfig['outputConfig'][];
 }): {
     composedClient: ClientImports & {
         module: ClientImports;

package/dist/generate/getTemplateClientImports.mjs

@@ -1,12 +1,14 @@
 import path from 'node:path';
 import { resolveGeneratorConfigValues } from 'vovk';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, segmentName, isBundle, }) {
+export default function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, segmentName, isBundle, outputConfigs, }) {
     const { imports: configImports } = resolveGeneratorConfigValues({
         config,
         schema: fullSchema,
         segmentName,
         isBundle,
+        projectPackageJson: undefined,
+        outputConfigs,
     });
     const validateOnClientImport = configImports?.validateOnClient ?? null;
     const fetcherImport = configImports?.fetcher ?? 'vovk';

package/dist/generate/writeOneClientFile.d.mts

@@ -5,7 +5,7 @@ import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
 import type { Segment } from '../locateSegments.mjs';
 import { OpenAPIObject } from 'openapi3-ts/oas31';
 export declare function normalizeOutTemplatePath(out: string, packageJson: PackageJson): string;
-export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, samples, reExports, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, templateContent, matterResult: { data, content }, openAPIObject, package: packageJson, readme, samples, reExports, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -19,7 +19,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
         };
         content: string;
     };
-    openapi: OpenAPIObject;
+    openAPIObject: OpenAPIObject;
     package: PackageJson;
     readme: VovkReadmeConfig;
     samples: VovkSamplesConfig;

package/dist/generate/writeOneClientFile.mjs

@@ -15,9 +15,7 @@ export function normalizeOutTemplatePath(out, packageJson) {
 }
 export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, 
 // imports,
-templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, samples, reExports, isEnsuringClient, outCwdRelativeDir, 
-// templateDef,
-locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }) {
+templateContent, matterResult: { data, content }, openAPIObject, package: packageJson, readme, samples, reExports, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }) {
     const { config } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
@@ -51,7 +49,7 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
         readme,
         samples,
         reExports,
-        openapi,
+        openapi: openAPIObject,
         ROOT_SEGMENT_FILE_NAME,
         apiRoot: origin ? `${origin}/${config.rootEntry}` : undefined,
         imports: {},
@@ -79,6 +77,7 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
             isBundle,
             outCwdRelativeDir,
             segmentName,
+            outputConfigs: [templateDef.outputConfig ?? {}],
         })['composedClient'],
         segmentImports: Object.fromEntries(Object.values(fullSchema.segments).map(({ segmentName: sName }) => {
             const clientImports = getTemplateClientImports({
@@ -87,6 +86,7 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
                 segmentName: sName,
                 isBundle,
                 outCwdRelativeDir,
+                outputConfigs: [templateDef.outputConfig ?? {}],
             });
             const imports = configKey === 'composedClient' ? clientImports['composedClient'] : clientImports['segmentedClient'][sName];
             return [sName, imports];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.390",
+  "version": "0.0.1-draft.393",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.467",
+    "vovk": "^3.0.0-draft.469",
     "vovk-ajv": "^0.0.0-draft.112",
     "vovk-client": "^0.0.4-draft.139",
     "vovk-python": "^0.0.1-draft.81",