vovk-cli 0.0.1-draft.345 → 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/generate/generate.mjs

@@ -135,7 +135,7 @@ 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,
                 configs: [templateDef.generatorConfig ?? {}],
                 projectPackageJson,
@@ -164,6 +164,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 package: packageJson,
                 readme,
                 snippets,
+                reExports,
                 isEnsuringClient,
                 outCwdRelativeDir,
                 templateDef,
@@ -217,7 +218,7 @@ 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,
                     configs: [templateDef.generatorConfig ?? {}],
                     projectPackageJson,
@@ -247,6 +248,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     package: packageJson,
                     readme,
                     snippets,
+                    reExports,
                     isEnsuringClient,
                     outCwdRelativeDir,
                     templateDef,

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,7 +14,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, 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;
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.345",
+  "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"