vovk-cli 0.0.1-draft.310 → 0.0.1-draft.313

package/dist/bundle/index.mjs

@@ -22,6 +22,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
     }
     await generate({
         isEnsuringClient: false,
+        isBundle: true,
         projectInfo,
         forceNothingWrittenLog: true,
         fullSchema,

package/dist/dev/index.mjs

@@ -18,6 +18,7 @@ import { locateSegments } from '../locateSegments.mjs';
 import debounceWithArgs from '../utils/debounceWithArgs.mjs';
 import formatLoggedSegmentName from '../utils/formatLoggedSegmentName.mjs';
 import writeMetaJson from './writeMetaJson.mjs';
+import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 export class VovkDev {
     #projectInfo;
     #segments = [];
@@ -265,7 +266,7 @@ export class VovkDev {
                 const probableCause = {
                     404: 'The segment did not compile or config.origin is wrong.',
                 }[resp.status];
-                log.warn(`Schema request to ${endpoint} for ${formatLoggedSegmentName(segmentName)} failed with status code ${resp.status} but expected 200.${probableCause ? ` Probable cause: ${probableCause}` : ''}. Response text will be logged below on "debug" level.`);
+                log.warn(`Schema request to ${chalkHighlightThing(endpoint)} for ${formatLoggedSegmentName(segmentName)} failed with status code ${resp.status} but expected 200.${probableCause ? ` Probable cause: ${probableCause}` : ''}. Response text will be logged below on "debug" level.`);
                 log.debug(`Response from ${formatLoggedSegmentName(segmentName)}: ${text}`);
                 return { isError: true };
             }
@@ -288,7 +289,7 @@ export class VovkDev {
     async #handleSegmentSchema(segmentName, segmentSchema) {
         const { log, config, cwd } = this.#projectInfo;
         if (!segmentSchema) {
-            log.warn(`${formatLoggedSegmentName(segmentName)} schema is null`);
+            log.warn(`${formatLoggedSegmentName(segmentName, { upperFirst: true })} schema is null`);
             return;
         }
         log.debug(`Handling received schema from ${formatLoggedSegmentName(segmentName)}`);

package/dist/generate/generate.d.mts

@@ -3,8 +3,9 @@ import type { PackageJson } from 'type-fest';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 import type { GenerateOptions } from '../types.mjs';
 import type { Segment } from '../locateSegments.mjs';
-export declare function generate({ isEnsuringClient, projectInfo, forceNothingWrittenLog, fullSchema, locatedSegments, cliGenerateOptions, package: argPackageJson, readme: argReadme, }: {
+export declare function generate({ isEnsuringClient, isBundle, projectInfo, forceNothingWrittenLog, fullSchema, locatedSegments, cliGenerateOptions, package: argPackageJson, readme: argReadme, }: {
     isEnsuringClient?: boolean;
+    isBundle?: boolean;
     projectInfo: ProjectInfo;
     forceNothingWrittenLog?: boolean;
     fullSchema: VovkSchema;

package/dist/generate/generate.mjs

@@ -86,7 +86,7 @@ const cliOptionsToOpenAPIMixins = ({ openapiGetMethodName, openapiGetModuleName,
         },
     ]));
 };
-export async function generate({ isEnsuringClient = false, projectInfo, forceNothingWrittenLog, fullSchema, locatedSegments, cliGenerateOptions, package: argPackageJson, readme: argReadme, }) {
+export async function generate({ isEnsuringClient = false, isBundle = false, projectInfo, forceNothingWrittenLog, fullSchema, locatedSegments, cliGenerateOptions, package: argPackageJson, readme: argReadme, }) {
     fullSchema = {
         ...fullSchema,
         // sort segments by name to avoid unnecessary rendering
@@ -173,6 +173,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                 hasMixins,
                 isVovkProject,
                 vovkCliPackage,
+                isBundle,
             });
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
             return {
@@ -258,6 +259,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                     hasMixins,
                     isVovkProject,
                     vovkCliPackage,
+                    isBundle,
                 });
                 return {
                     written,

package/dist/generate/writeOneClientFile.d.mts

@@ -5,7 +5,7 @@ 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, }: {
+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, isBundle, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -31,6 +31,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     hasMixins: boolean;
     isVovkProject: boolean;
     vovkCliPackage: PackageJson;
+    isBundle: boolean;
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -11,7 +11,7 @@ import { compileJSONSchemaToTypeScriptType } from '../utils/compileJSONSchemaToT
 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, }) {
+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, isBundle, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
@@ -62,10 +62,12 @@ 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, reExports, } = {
+            const segmentConfig = {
                 ...(config.segmentConfig ? config.segmentConfig[sName] : {}),
                 ...(templateDef.segmentConfig ? templateDef.segmentConfig[sName] : {}),
             };
+            const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride } = segmentConfig;
+            const reExports = { ...segmentConfig.reExports, ...(isBundle ? projectInfo.config.bundle.reExports : {}) };
             return [
                 sName,
                 {

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

@@ -13,7 +13,7 @@ export default function getConfig({ configPath, cwd }: {
         modulesDir?: string;
         rootEntry?: string;
         origin?: string;
-        logLevel?: "error" | "trace" | "debug" | "info" | "warn";
+        logLevel?: "error" | "trace" | "debug" | "info" | "warn" | (string & {});
         prettifyClient?: boolean;
         libs?: {
             ajv: import("vovk").KnownAny;
@@ -60,6 +60,7 @@ export default function getConfig({ configPath, cwd }: {
             readme?: {
                 banner?: string;
             };
+            reExports?: Record<string, string>;
             tsdownBuildOptions?: Parameters<typeof import("tsdown/config-9hj-APNF.mjs").build>[0];
         } & ({
             excludeSegments?: never;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -51,6 +51,7 @@ export default async function getConfig({ configPath, cwd }) {
             },
             package: {},
             readme: {},
+            reExports: {},
             ...conf.bundle,
             tsdownBuildOptions: {
                 outDir: conf.bundle?.tsdownBuildOptions?.outDir ?? 'dist',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.310",
+  "version": "0.0.1-draft.313",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.352"
+    "vovk": "^3.0.0-draft.355"
   },
   "optionalDependencies": {
     "vovk-python": "^0.0.1-draft.58"