vovk-cli 0.0.1-draft.341 → 0.0.1-draft.346

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

@@ -3,12 +3,12 @@ const { createRPC } = require('<%= t.commonImports.createRPC %>');
 const { schema } = require('./schema.cjs');
 const { openapi } = require('./openapi.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(/\s*,\s*/).forEach((reExportWhat) => { %>
+<% 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] %>'];
-    <% })
-       }) %>
+  <% })
+}) %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 exports.<%= rpcModuleName %> = createRPC(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', require('<%= t.segmentImports[segment.segmentName].fetcher %>').fetcher,

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

@@ -7,11 +7,10 @@ import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segme
 <% if (t.hasMixins) { %>
 import type { Controllers as MixinControllers, Mixins } from "./mixins";
 <% } %>
-
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
-  <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+<% Object.entries(t.reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
-  <% }) %>
+<% }) %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkClientFetcher<infer U> ? U : never>>;
   <% }) 

package/client-templates/mjs/index.d.mts.ejs

@@ -7,11 +7,10 @@ import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segme
 <% if (t.hasMixins) { %>
 import type { Controllers as MixinControllers, Mixins } from "./mixins";
 <% } %>
-
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
-  <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+<% Object.entries(t.reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
-  <% }) %>
+<% }) %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkClientFetcher<infer U> ? U : never>>;
   <% }) 

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

@@ -2,10 +2,10 @@
 import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema.cjs';
 import { openapi } from './openapi.cjs';
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
-  <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+<% Object.entries(t.reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
-  <% }) %>
+<% }) %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %> = createRPC(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', import('<%- t.segmentImports[segment.segmentName].module.fetcher %>'),

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

@@ -10,10 +10,10 @@ import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segme
 if (t.hasMixins) { %>
 import type { Controllers as MixinControllers, Mixins } from "./mixins.d.ts";
 <% } %>
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {   %>
-  <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+<% Object.entries(t.reExports).forEach(([reExportWhat, reExportFrom]) => { %>
 export { <%= reExportWhat %> } from '<%= reExportFrom %>';
-  <% }) %>   
+<% }) %>   
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {   %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], typeof import('<%- t.segmentImports[segment.segmentName].module.fetcher %>').fetcher extends VovkClientFetcher<infer U> ? U : never>(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', import('<%- t.segmentImports[segment.segmentName].module.fetcher %>'),

package/dist/dev/index.mjs

@@ -285,7 +285,6 @@ export class VovkDev {
             segments: this.#schemaSegments,
             meta: getMetaSchema({
                 config: this.#projectInfo.config,
-                package: this.#projectInfo.packageJson,
             }),
         };
         return generate({

package/dist/dev/writeMetaJson.mjs

@@ -7,7 +7,6 @@ export default async function writeMetaJson(schemaOutAbsolutePath, projectInfo)
     const metaJsonPath = path.join(schemaOutAbsolutePath, META_FILE_NAME + '.json');
     const metaStr = JSON.stringify(getMetaSchema({
         config: projectInfo.config,
-        package: projectInfo.packageJson,
     }), null, 2);
     const existingStr = await fs.readFile(metaJsonPath, 'utf-8').catch(() => null);
     if (existingStr !== metaStr) {

package/dist/generate/ensureClient.mjs

@@ -21,7 +21,7 @@ export default async function ensureClient(projectInfo, locatedSegments) {
         fullSchema: {
             $schema: VovkSchemaIdEnum.SCHEMA,
             segments: getEmptySegmentRecordSchema(locatedSegments.map(({ segmentName }) => segmentName)),
-            meta: getMetaSchema({ config: projectInfo.config, package: projectInfo.packageJson }),
+            meta: getMetaSchema({ config: projectInfo.config }),
         },
         locatedSegments,
     });

package/dist/generate/generate.mjs

@@ -93,7 +93,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             // preserve original object, so segments can be extended
             .map((segment) => ({ ...segment }))),
     };
-    const { config, cwd, log, srcRoot, vovkCliPackage } = projectInfo;
+    const { config, cwd, log, srcRoot, vovkCliPackage, packageJson: projectPackageJson } = projectInfo;
     Object.entries(config.generatorConfig.segments ?? {})
         .filter(([, segmentConfig]) => segmentConfig.openAPIMixin)
         .forEach(([segmentName, segmentConfig]) => {
@@ -135,9 +135,10 @@ 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, snippets, } = getGeneratorConfig({
+            const { package: packageJson, readme, origin, snippets, reExports, } = getGeneratorConfig({
                 schema: fullSchema,
-                config: templateDef.generatorConfig,
+                configs: [templateDef.generatorConfig ?? {}],
+                projectPackageJson,
                 isBundle,
                 segmentName: null,
             });
@@ -163,6 +164,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 package: packageJson,
                 readme,
                 snippets,
+                reExports,
                 isEnsuringClient,
                 outCwdRelativeDir,
                 templateDef,
@@ -216,9 +218,10 @@ 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, snippets, } = getGeneratorConfig({
+                const { package: packageJson, readme, origin, snippets, reExports, } = getGeneratorConfig({
                     schema: fullSchema,
-                    config: templateDef.generatorConfig,
+                    configs: [templateDef.generatorConfig ?? {}],
+                    projectPackageJson,
                     segmentName,
                     isBundle,
                 });
@@ -245,6 +248,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     package: packageJson,
                     readme,
                     snippets,
+                    reExports,
                     isEnsuringClient,
                     outCwdRelativeDir,
                     templateDef,

package/dist/generate/getProjectFullSchema.d.mts

@@ -1,10 +1,8 @@
 import { VovkStrictConfig, type VovkSchema } from 'vovk';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-import type { PackageJson } from 'type-fest';
-export declare function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, package: packageJson, config, }: {
+export declare function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, config, }: {
     schemaOutAbsolutePath: string;
     isNextInstalled: boolean;
     log: ProjectInfo['log'];
-    package: PackageJson;
     config: VovkStrictConfig;
 }): Promise<VovkSchema>;

package/dist/generate/getProjectFullSchema.mjs

@@ -4,13 +4,12 @@ import { glob } from 'glob';
 import { VovkSchemaIdEnum } from 'vovk';
 import { META_FILE_NAME, ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 import getMetaSchema from '../getProjectInfo/getMetaSchema.mjs';
-export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, package: packageJson, config, }) {
+export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, config, }) {
     const result = {
         $schema: VovkSchemaIdEnum.SCHEMA,
         segments: {},
         meta: getMetaSchema({
             config,
-            package: packageJson,
         }),
     };
     const isEmptyLogOrWarn = isNextInstalled ? log.warn : log.debug;

package/dist/generate/index.mjs

@@ -37,13 +37,12 @@ export class VovkGenerate {
         });
     }
     async getFullSchema() {
-        const { log, config, cwd, isNextInstalled, packageJson } = this.#projectInfo;
+        const { log, config, cwd, isNextInstalled } = this.#projectInfo;
         const { schemaPath } = this.#cliGenerateOptions;
         const fullSchema = await getProjectFullSchema({
             schemaOutAbsolutePath: path.resolve(cwd, schemaPath ?? config.schemaOutDir),
             isNextInstalled,
             log,
-            package: packageJson,
             config,
         });
         return fullSchema;

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, snippets, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, reExports, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -23,6 +23,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     package: PackageJson;
     readme: VovkReadmeConfig;
     snippets: VovkSnippetsConfig;
+    reExports: VovkStrictConfig['generatorConfig']['reExports'];
     isEnsuringClient: boolean;
     outCwdRelativeDir: string;
     templateDef: VovkStrictConfig['clientTemplateDefs'][string];

package/dist/generate/writeOneClientFile.mjs

@@ -14,18 +14,18 @@ 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, snippets, isEnsuringClient, outCwdRelativeDir, 
+templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, reExports, isEnsuringClient, outCwdRelativeDir, 
 // templateDef,
 locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
     const outPath = normalizeOutTemplatePath(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '', relativeDir, path.basename(templateFilePath).replace('.ejs', '')), packageJson);
-    let placeholder = !templateFilePath.endsWith('.json.ejs')
-        ? `// This is a temporary placeholder to avoid compilation errors if client is imported before it's generated.
+    let placeholder = templateFilePath.endsWith('.json.ejs')
+        ? ''
+        : `// This is a temporary placeholder to avoid compilation errors if client is imported before it's generated.
 // If you still see this text, the client is not generated yet because of an unknown problem.
-// Feel free to report an issue at https://github.com/finom/vovk/issues`
-        : '{}';
+// Feel free to report an issue at https://github.com/finom/vovk/issues`;
     placeholder = outPath.endsWith('.py') ? placeholder.replace(/\/\//g, '#') : placeholder;
     const getFirstLineBanner = (type = 'c') => {
         const text = `auto-generated by vovk-cli v${vovkCliPackage.version} at ${new Date().toISOString()}`;
@@ -46,6 +46,7 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
         package: packageJson,
         readme,
         snippets,
+        reExports,
         openapi,
         ROOT_SEGMENT_FILE_NAME,
         apiRoot: origin ? `${origin}/${config.rootEntry}` : apiRoot,
@@ -82,10 +83,6 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
                 // ...templateDef.generatorConfig?.segments?.[sName],
             };
             const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride } = segmentConfig;
-            const reExports = {
-                ...segmentConfig.reExports,
-                ...(isBundle ? projectInfo.config.bundle.generatorConfig?.reExports : {}),
-            };
             return [
                 sName,
                 {
@@ -96,9 +93,6 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
                     routeFilePath,
                     segmentImportPath,
                     segmentNameOverride,
-                    reExports: _.mapValues(reExports ?? {}, (p) => p.startsWith('.')
-                        ? path.relative(path.join(outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '.'), path.resolve(cwd, p))
-                        : p),
                 },
             ];
         })),

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -1,36 +1,7 @@
 import { VovkSchemaIdEnum, VovkStrictConfig } from 'vovk';
-import { PackageJson } from 'type-fest';
-export default function getMetaSchema({ config, package: packageJson, }: {
+export default function getMetaSchema({ config }: {
     config: VovkStrictConfig;
-    package: PackageJson;
 }): {
     config: VovkStrictConfig;
     $schema: VovkSchemaIdEnum;
-    package: {
-        main: string;
-        module: string;
-        types: string;
-        exports: {
-            '.': {
-                import: string;
-                require: string;
-                types: string;
-            };
-            './schema': {
-                import: string;
-                require: string;
-                types: string;
-            };
-            './openapi': {
-                import: string;
-                require: string;
-                types: string;
-            };
-        };
-        name?: string | undefined;
-        version?: string | undefined;
-        description?: string | undefined;
-        author?: PackageJson.Person | undefined;
-        license?: string | undefined;
-    };
 };

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -1,31 +1,8 @@
 import { VovkSchemaIdEnum } from 'vovk';
 import pick from 'lodash/pick.js';
-export default function getMetaSchema({ config, package: packageJson, }) {
+export default function getMetaSchema({ config }) {
     return {
         $schema: VovkSchemaIdEnum.META,
-        package: {
-            ...pick(packageJson, ['name', 'version', 'description', 'author', 'license']),
-            main: './index.cjs',
-            module: './index.mjs',
-            types: './index.d.mts',
-            exports: {
-                '.': {
-                    import: './index.mjs',
-                    require: './index.cjs',
-                    types: './index.d.mts',
-                },
-                './schema': {
-                    import: './schema.cjs',
-                    require: './schema.cjs',
-                    types: './schema.d.cts',
-                },
-                './openapi': {
-                    import: './openapi.cjs',
-                    require: './openapi.cjs',
-                    types: './openapi.d.cts',
-                },
-            },
-        },
         ...{
             config: (config
                 ? pick(config, [...config.emitConfig, '$schema'])

package/dist/index.mjs

@@ -138,12 +138,11 @@ program
         srcRootRequired: false,
         logLevel: cliBundleOptions.logLevel,
     });
-    const { cwd, config, log, isNextInstalled, packageJson } = projectInfo;
+    const { cwd, config, log, isNextInstalled } = projectInfo;
     const fullSchema = await getProjectFullSchema({
         schemaOutAbsolutePath: path.resolve(cwd, cliBundleOptions?.schema ?? config.schemaOutDir),
         log,
         isNextInstalled,
-        package: packageJson,
         config,
     });
     await bundle({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.341",
+  "version": "0.0.1-draft.346",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.406"
+    "vovk": "^3.0.0-draft.407"
   },
   "optionalDependencies": {
     "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.31"