vovk-cli 0.0.1-draft.292 → 0.0.1-draft.295

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

@@ -3,8 +3,11 @@ const { fetcher } = require('<%= t.imports.fetcher %>');
 const { createRPC } = require('<%= t.imports.createRPC %>');
 const { schema } = require('./schema.cjs');
 const { validateOnClient = null } = <%- t.imports.validateOnClient ? `require('${t.imports.validateOnClient}')` : '{}'%>;
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { 
-  Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { %>
+    <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+exports[<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>] = require('<%= reExportFrom %>')[<%= reExportWhat.split(/\s+as\s+/)[0] %>];
+  <% }) %>
+  <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 exports.<%= rpcModuleName %> = createRPC(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
   { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }

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

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

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

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

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

@@ -7,8 +7,11 @@ import { validateOnClient } from '<%= t.imports.module.validateOnClient %>';
 <% } else { %>
 const validateOnClient = undefined;
 <% } 
-Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {
-  Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
+Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
+  <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+export { <%= reExportWhat %> } from '<%= reExportFrom %>';
+  <% }) %>
+  <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %> = createRPC(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
   { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }

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

@@ -16,8 +16,11 @@ import { validateOnClient } from '<%= t.imports.validateOnClient %>';
 const validateOnClient = undefined;
 <% } %>
 type Options = typeof fetcher extends VovkClientFetcher<infer U> ? U : never;
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {     
-  Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => {   %>
+  <% Object.entries(t.segmentMeta[segment.segmentName].reExports).forEach(([reExportWhat, reExportFrom]) => { %>
+export { <%= reExportWhat %> } from '<%= reExportFrom %>';
+  <% }) %>   
+  <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin' ? `MixinControllers` : `Controllers${i}` %>["<%= rpcModuleName %>"], Options>(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', fetcher,
   { validateOnClient, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }

package/dist/generate/generate.mjs

@@ -9,7 +9,7 @@ import pickSegmentFullSchema from '../utils/pickSegmentFullSchema.mjs';
 import removeUnlistedDirectories from '../utils/removeUnlistedDirectories.mjs';
 import getTemplateClientImports from './getTemplateClientImports.mjs';
 import mergePackages from './mergePackages.mjs';
-import writeOneClientFile from './writeOneClientFile.mjs';
+import writeOneClientFile, { normalizeOutTemplatePath } from './writeOneClientFile.mjs';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 import { getTsconfig } from 'get-tsconfig';
 import { normalizeOpenAPIMixins } from '../utils/normalizeOpenAPIMixins.mjs';
@@ -46,7 +46,7 @@ function logClientGenerationResults({ results, log, isEnsuringClient = false, fo
     if (writtenResults.length) {
         for (const [outAbsoluteDir, dirResults] of Object.entries(groupedByDir)) {
             const templateNames = _.uniq(dirResults.map(({ templateName }) => templateName));
-            log.info(`${clientType} client${isEnsuringClient ? ' placeholder' : ''} is generated to ${chalkHighlightThing(outAbsoluteDir)} from template${templateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(templateNames.map((s) => `"${s}"`).join(', '))} in ${duration}ms`);
+            log.info(`${clientType} client${isEnsuringClient ? ' placeholder' : ''} is generated to ${chalkHighlightThing(normalizeOutTemplatePath(outAbsoluteDir, dirResults[0].package))} from template${templateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(templateNames.map((s) => `"${s}"`).join(', '))} in ${duration}ms`);
         }
     }
     else if (fromTemplates.length) {
@@ -56,7 +56,7 @@ function logClientGenerationResults({ results, log, isEnsuringClient = false, fo
         else if (!isEnsuringClient) {
             for (const [outAbsoluteDir, dirResults] of Object.entries(groupedByDir)) {
                 const templateNames = _.uniq(dirResults.map(({ templateName }) => templateName));
-                logOrDebug(`${clientType} client that was generated to ${chalkHighlightThing(outAbsoluteDir)} from template${templateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(templateNames.map((s) => `"${s}"`).join(', '))} is up to date and doesn't need to be regenerated (${duration}ms)`);
+                logOrDebug(`${clientType} client that was generated to ${chalkHighlightThing(normalizeOutTemplatePath(outAbsoluteDir, dirResults[0].package))} from template${templateNames.length !== 1 ? 's' : ''} ${chalkHighlightThing(templateNames.map((s) => `"${s}"`).join(', '))} is up to date and doesn't need to be regenerated (${duration}ms)`);
             }
         }
     }
@@ -177,6 +177,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                 written,
                 templateName,
                 outAbsoluteDir,
+                package: packageJson,
             };
         }));
         if (composedClientTemplateFiles.length) {
@@ -210,12 +211,12 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
             const matterResult = templateFilePath.endsWith('.ejs')
                 ? matter(templateContent)
                 : { data: { imports: [] }, content: templateContent };
+            const clientImports = await getTemplateClientImports({
+                config,
+                fullSchema,
+                outCwdRelativeDir,
+            });
             const results = await Promise.all(segmentNames.map(async (segmentName) => {
-                const clientImports = await getTemplateClientImports({
-                    config,
-                    fullSchema,
-                    outCwdRelativeDir,
-                });
                 const packageJson = await mergePackages({
                     log,
                     rootPackageJson,
@@ -256,6 +257,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                 return {
                     written,
                     templateName,
+                    package: packageJson,
                 };
             }));
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
@@ -265,6 +267,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                 written: results.filter((result) => !!result).some(({ written }) => written),
                 templateName,
                 outAbsoluteDir,
+                package: results[0]?.package || {}, // TODO: Might be wrong in Python segmented client (unknown use case)
             };
         }));
         if (segmentedClientTemplateFiles.length) {

package/dist/generate/writeOneClientFile.d.mts

@@ -4,6 +4,7 @@ import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
 import type { ClientImports } from './getTemplateClientImports.mjs';
 import type { Segment } from '../locateSegments.mjs';
+export declare function normalizeOutTemplatePath(out: string, packageJson: PackageJson): string;
 export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, }: {
     cwd: string;
     projectInfo: ProjectInfo;

package/dist/generate/writeOneClientFile.mjs

@@ -8,13 +8,14 @@ import TOML from '@iarna/toml';
 import prettify from '../utils/prettify.mjs';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 import { compileJSONSchemaToTypeScriptType } from '../utils/compileJSONSchemaToTypeScriptType.mjs';
+export function normalizeOutTemplatePath(out, packageJson) {
+    return out.replace('[package_name]', packageJson.name?.replace(/-/g, '_') ?? 'my_package_name');
+}
 export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, isEnsuringClient, outCwdRelativeDir, origin, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
-    const outPath = path
-        .resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '', relativeDir, path.basename(templateFilePath).replace('.ejs', ''))
-        .replace('[package_name]', packageJson.name?.replace(/-/g, '_') ?? 'my_package_name');
+    const outPath = normalizeOutTemplatePath(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '', relativeDir, path.basename(templateFilePath).replace('.ejs', '')), packageJson);
     let placeholder = `// 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`;
@@ -61,7 +62,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
             const segmentImportPath = routeFilePath
                 ? path.relative(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '.'), path.resolve(cwd, routeFilePath))
                 : null;
-            const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride, } = {
+            const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride, reExports, } = {
                 ...(config.segmentConfig ? config.segmentConfig[sName] : {}),
                 ...(templateDef.segmentConfig ? templateDef.segmentConfig[sName] : {}),
             };
@@ -75,6 +76,9 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
                     routeFilePath,
                     segmentImportPath,
                     segmentNameOverride,
+                    reExports: _.mapValues(reExports ?? {}, (p) => p.startsWith('.')
+                        ? path.relative(path.join(outCwdRelativeDir, segmentName || ROOT_SEGMENT_FILE_NAME), path.resolve(cwd, p))
+                        : p),
                 },
             ];
         })),

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

@@ -86,6 +86,7 @@ export default function getConfig({ configPath, cwd }: {
                 origin?: string;
                 rootEntry?: string;
                 segmentNameOverride?: string;
+                reExports?: Record<string, string>;
             };
         };
         openApiMixins?: {

package/dist/init/index.mjs

@@ -231,7 +231,7 @@ export class Init {
                     keys.push('emitDecoratorMetadata');
                 }
                 updateTsConfig = await confirm({
-                    message: `Do you want to add ${keys.map((k) => `"${k}"`).join(' and ')} to tsconfig.json?`,
+                    message: `Do you want to add ${keys.map((k) => `"${k}"`).join(' and ')} to tsconfig.json? (recommended)`,
                 });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.292",
+  "version": "0.0.1-draft.295",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,10 +35,10 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.321"
+    "vovk": "^3.0.0-draft.323"
   },
   "optionalDependencies": {
-    "vovk-python": "^0.0.1-draft.49"
+    "vovk-python": "^0.0.1-draft.52"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",