vovk-cli 0.0.1-draft.352 → 0.0.1-draft.355

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

@@ -2,7 +2,6 @@
 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.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] %>'];

package/client-templates/mixins/mixins.d.ts.ejs

@@ -5,10 +5,10 @@ import type { VovkRequest, VovkStreamAsyncIterable, KnownAny } from 'vovk';
 
 export namespace Mixins {
   <% for (const segment of mixins) { %>
-    <% if(segment.meta?.components?.schemas) { %>
+    <% if(segment.meta?.openAPIObject?.components?.schemas) { %>
       export namespace <%= t._.upperFirst(t._.camelCase(segment.segmentName)) %> {
-        <% for (const [componentName, componentSchema] of Object.entries(segment.meta.components.schemas)) { %>
-          <%- t.compileJSONSchemaToTypeScriptType(componentSchema, componentName, segment.meta.components, { dontCreateRefTypes: true }) %>
+        <% for (const [componentName, componentSchema] of Object.entries(segment.meta.openAPIObject.components.schemas)) { %>
+          <%- t.compileJSONSchemaToTypeScriptType(componentSchema, componentName, segment.meta.openAPIObject.components, { dontCreateRefTypes: true }) %>
         <% } %>
       }
     <% } %>
@@ -56,7 +56,7 @@ export type Controllers = {
           <%- getType(segment, controllerSchema, handlerName, 'body') %>, 
           <%- getType(segment, controllerSchema, handlerName, 'query') %>, 
           <%- getType(segment, controllerSchema, handlerName, 'params')  %>
-          >) => <%- handlerSchema.validation?.output ? `Promise<${getType(segment, controllerSchema, handlerName, 'output')}>` : handlerSchema.validation?.iteration ? `Promise<VovkStreamAsyncIterable<${getType(segment, controllerSchema, handlerName, 'iteration')}>` : 'Promise<KnownAny>' %>,
+          >) => <%- handlerSchema.validation?.output ? `Promise<${getType(segment, controllerSchema, handlerName, 'output')}>` : handlerSchema.validation?.iteration ? `Promise<VovkStreamAsyncIterable<${getType(segment, controllerSchema, handlerName, 'iteration')}>>` : 'Promise<KnownAny>' %>,
         <% } %>
       };
      <% } %>

package/client-templates/readme/README.md.ejs

@@ -26,12 +26,12 @@
 `<%= handlerSchema.httpMethod %> <%= [...(forceApiRoot ? [forceApiRoot] : [t.apiRoot, segmentName]), controllerSchema.prefix, handlerSchema.path].map((part, i) => i > 0 ? t._.trim(part, '/') : part).filter(Boolean).join('/') %>`
 
 ```ts
-<%- t.createCodeExamples({
+<%- t.createCodeSamples({
     handlerSchema,
     handlerName,
     controllerSchema,
     package: t.package,
-    config: t.snippets,
+    config: t.samples,
 }).ts %>
 ```
         <% }) %>

package/client-templates/schemaCjs/schema.cjs.ejs

@@ -1,13 +1,16 @@
 <%- t.getFirstLineBanner() %>
 <% if(t.isVovkProject) { %>
 const meta = require('./<%= t.schemaOutDir %>/_meta.json');
+<% } else { %>
+const meta = <%- JSON.stringify(t.publicMeta, null, 2) %>;
 <% } %>
+
 <% if(t.hasMixins) { %>
 const mixins = require('./mixins.json');
 <% } %>
-const segments = {<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment) => { if(segment.segmentType !== 'mixin') { %>
+const segments = {<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema && segment.segmentType !== 'mixin').forEach((segment) => { %>
     '<%= segment.segmentName %>': require('./<%= t.schemaOutDir %>/<%= segment.segmentName || t.ROOT_SEGMENT_FILE_NAME %>.json'),
-<% }}) %>
+<% }) %>
   <% if(t.hasMixins) { %>
   ...mixins,
   <% } %>
@@ -15,9 +18,7 @@ const segments = {<% Object.values(t.schema.segments).filter((segment) => segmen
 const schema = {
   $schema: '<%- t.VovkSchemaIdEnum.SCHEMA %>',
   segments,
-  meta: {
-    <% if(t.isVovkProject) { %>...meta<% } %>
-  }
+  meta,
 };
 
 module.exports.schema = schema;

package/client-templates/schemaTs/schema.ts.ejs

@@ -1,17 +1,17 @@
 <%- t.getFirstLineBanner() %>
-<% if(t.isVovkProject) { %>
-import meta from './<%= t.schemaOutDir %>/_meta.json' with { type: "json" };
-<% } %>
 <% if(t.hasMixins) { %>
 import mixins from './mixins.json' with { type: "json" };
 import type { Mixins } from './mixins.d.ts';
 <% } %>
-<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
+<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema && segment.segmentType !== 'mixin').forEach((segment, i) => { %>
 import segment<%= i %> from './<%= t.schemaOutDir %>/<%= segment.segmentName || t.ROOT_SEGMENT_FILE_NAME %>.json' with { type: "json" };
+<% }); %>
+<% if(t.isVovkProject) { %>
+import meta from './<%= t.schemaOutDir %>/_meta.json' with { type: "json" };
 <% } else { %>
-import segment<%= i %> from './<%= segment.segmentName %>.json' with { type: "json" };
-<% }}) %>
-const segments = {<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { %>
+const meta = <%- JSON.stringify(t.publicMeta, null, 2) %>;
+<% } %>
+const segments = {<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema && segment.segmentType !== 'mixin').forEach((segment, i) => { %>
   '<%= segment.segmentName %>': segment<%= i %>,<% }) %>
   <% if(t.hasMixins) { %>
   ...mixins,
@@ -21,11 +21,8 @@ const segments = {<% Object.values(t.schema.segments).filter((segment) => segmen
 export const schema = {
   $schema: '<%- t.VovkSchemaIdEnum.SCHEMA %>',
   segments,
-  meta: {
-    <% if(t.isVovkProject) { %>...meta,<% } %>
-  }
+  meta,
 };
-
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

package/dist/bundle/index.mjs

@@ -47,6 +47,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         entry: path.join(tsFullClientOutAbsoluteDirInput, './index.ts'),
         dts: true,
         format: ['cjs', 'esm'],
+        hash: false,
         fixedExtension: true,
         clean: true,
         ...bundleConfig.tsdownBuildOptions,

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 { getGeneratorConfig, openAPIToVovkSchema, vovkSchemaToOpenAPI, } from 'vovk';
+import { resolveGeneratorConfigValues, openAPIToVovkSchema, vovkSchemaToOpenAPI, } from 'vovk';
 import getClientTemplateFiles from './getClientTemplateFiles.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import pickSegmentFullSchema from '../utils/pickSegmentFullSchema.mjs';
@@ -68,10 +68,10 @@ const cliOptionsToOpenAPIMixins = ({ openapiGetMethodName, openapiGetModuleName,
             source: spec.startsWith('http://') || spec.startsWith('https://')
                 ? { url: spec, fallback: openapiFallback?.[i] }
                 : { file: spec },
-            apiRoot: openapiRootUrl?.[i] ?? '/',
-            getModuleName: openapiGetModuleName?.[i] ?? undefined,
+            apiRoot: openapiRootUrl?.[i] ?? '',
+            getModuleName: openapiGetModuleName?.[i] ?? 'api',
             getMethodName: openapiGetMethodName?.[i] ?? 'auto',
-            mixinName: openapiMixinName?.[i],
+            mixinName: openapiMixinName?.[i] ?? 'mixin' + (i > 0 ? i + 1 : ''),
         };
     }) || []).map(({ source, apiRoot, getModuleName, getMethodName, mixinName }) => [
         mixinName,
@@ -103,13 +103,20 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
         };
     });
     const cliMixins = cliOptionsToOpenAPIMixins(cliGenerateOptions ?? {});
-    await Promise.all(Object.entries(cliMixins).map(async ([mixinName, mixinModule]) => {
-        fullSchema.segments = {
-            ...fullSchema.segments,
-            [mixinName]: openAPIToVovkSchema(await normalizeOpenAPIMixin({ mixinModule, log })).segments[mixinName],
-        };
-    }));
-    const isNodeNextResolution = ['node16', 'nodenext'].includes((await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase()) ?? '');
+    fullSchema.segments = {
+        ...fullSchema.segments,
+        ...Object.fromEntries(await Promise.all(Object.entries(cliMixins).map(async ([mixinName, mixinModule]) => {
+            return [
+                mixinName,
+                openAPIToVovkSchema({
+                    segmentName: mixinName,
+                    ...(await normalizeOpenAPIMixin({ mixinModule, log })),
+                }).segments[mixinName],
+            ];
+        }))),
+    };
+    const moduleResolution = await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase();
+    const isNodeNextResolution = !moduleResolution || ['node16', 'nodenext'].includes(moduleResolution ?? '');
     const isVovkProject = !!srcRoot;
     const isComposedEnabled = cliGenerateOptions?.composedOnly ||
         !!cliGenerateOptions?.composedFrom ||
@@ -135,13 +142,14 @@ 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, reExports, } = getGeneratorConfig({
+            const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
                 schema: fullSchema,
                 configs: [templateDef.generatorConfig ?? {}],
                 projectPackageJson,
                 isBundle,
                 segmentName: null,
             });
+            // console.log('reExports', fullSchema.meta)
             const openapi = vovkSchemaToOpenAPI({
                 schema: fullSchema,
                 rootEntry: config.rootEntry,
@@ -156,14 +164,14 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 projectInfo,
                 clientTemplateFile,
                 fullSchema: composedFullSchema,
-                prettifyClient: config.composedClient.prettifyClient,
+                prettifyClient: cliGenerateOptions?.prettify ?? config.composedClient.prettifyClient,
                 segmentName: null,
                 templateContent,
                 matterResult,
                 openapi,
                 package: packageJson,
                 readme,
-                snippets,
+                samples,
                 reExports,
                 isEnsuringClient,
                 outCwdRelativeDir,
@@ -177,6 +185,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 origin: cliGenerateOptions?.origin ?? origin,
                 configKey: 'composedClient',
                 cliSchemaPath: cliGenerateOptions?.schemaPath ?? null,
+                projectConfig: config,
             });
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
             return {
@@ -218,7 +227,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, reExports, } = getGeneratorConfig({
+                const { package: packageJson, readme, origin, samples, reExports, } = resolveGeneratorConfigValues({
                     schema: fullSchema,
                     configs: [templateDef.generatorConfig ?? {}],
                     projectPackageJson,
@@ -240,14 +249,14 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     projectInfo,
                     clientTemplateFile,
                     fullSchema: segmentedFullSchema,
-                    prettifyClient: config.segmentedClient.prettifyClient,
+                    prettifyClient: cliGenerateOptions?.prettify ?? config.segmentedClient.prettifyClient,
                     segmentName,
                     templateContent,
                     matterResult,
                     openapi,
                     package: packageJson,
                     readme,
-                    snippets,
+                    samples,
                     reExports,
                     isEnsuringClient,
                     outCwdRelativeDir,
@@ -261,6 +270,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     origin: cliGenerateOptions?.origin ?? origin,
                     configKey: 'segmentedClient',
                     cliSchemaPath: cliGenerateOptions?.schemaPath ?? null,
+                    projectConfig: config,
                 });
                 return {
                     written,

package/dist/generate/getProjectFullSchema.mjs

@@ -4,6 +4,7 @@ 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';
+import deepExtend from '../utils/deepExtend.mjs';
 export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, config, }) {
     const result = {
         $schema: VovkSchemaIdEnum.SCHEMA,
@@ -19,14 +20,7 @@ export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstal
     try {
         const metaContent = await readFile(metaPath, 'utf-8');
         const fromFileMeta = JSON.parse(metaContent);
-        result.meta = {
-            ...result.meta,
-            ...fromFileMeta,
-            config: {
-                ...result.meta?.config,
-                ...fromFileMeta?.config,
-            },
-        };
+        result.meta = deepExtend({}, result.meta, fromFileMeta);
     }
     catch {
         isEmptyLogOrWarn(`${META_FILE_NAME}.json not found at ${metaPath}. Using empty meta as fallback.`);

package/dist/generate/getTemplateClientImports.mjs

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

package/dist/generate/index.mjs

@@ -115,7 +115,7 @@ export class VovkGenerate {
             .watch(openApiSpecPaths, {
             cwd,
             persistent: true,
-            ignoreInitial: true,
+            ignoreInitial: false,
         })
             .on('all', (event, path) => {
             if (event === 'change' || event === 'add' || event === 'ready' || event === 'unlink') {
@@ -159,10 +159,6 @@ export class VovkGenerate {
                     return;
                 }
                 const content = await response.text();
-                if (lastContent === null) {
-                    lastContent = content;
-                    return;
-                }
                 if (content !== lastContent) {
                     log.info(`Remote OpenAPI spec changed at ${chalkHighlightThing(openApiSpecUrl)}`);
                     lastContent = content;

package/dist/generate/writeOneClientFile.d.mts

@@ -1,11 +1,11 @@
-import { VovkReadmeConfig, VovkSnippetsConfig, type VovkSchema, type VovkStrictConfig } from 'vovk';
+import { VovkReadmeConfig, VovkSamplesConfig, type VovkSchema, type VovkStrictConfig } from 'vovk';
 import type { PackageJson } from 'type-fest';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 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, reExports, 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, samples, reExports, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -22,7 +22,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     openapi: OpenAPIObject;
     package: PackageJson;
     readme: VovkReadmeConfig;
-    snippets: VovkSnippetsConfig;
+    samples: VovkSamplesConfig;
     reExports: VovkStrictConfig['generatorConfig']['reExports'];
     isEnsuringClient: boolean;
     outCwdRelativeDir: string;
@@ -36,6 +36,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     origin: string | null;
     configKey: 'composedClient' | 'segmentedClient';
     cliSchemaPath: string | null;
+    projectConfig: VovkStrictConfig;
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -2,21 +2,22 @@ import fs from 'fs/promises';
 import path from 'node:path';
 import ejs from 'ejs';
 import _ from 'lodash';
-import { createCodeExamples, VovkSchemaIdEnum, } from 'vovk';
+import { createCodeSamples, VovkSchemaIdEnum, } from 'vovk';
 import * as YAML from 'yaml';
 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';
 import getTemplateClientImports from './getTemplateClientImports.mjs';
+import getMetaSchema from '../getProjectInfo/getMetaSchema.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 }, openapi, package: packageJson, readme, snippets, reExports, isEnsuringClient, outCwdRelativeDir, 
+templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, samples, reExports, isEnsuringClient, outCwdRelativeDir, 
 // templateDef,
-locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, }) {
+locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
@@ -48,19 +49,21 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
         isVovkProject,
         package: packageJson,
         readme,
-        snippets,
+        samples,
         reExports,
         openapi,
         ROOT_SEGMENT_FILE_NAME,
         apiRoot: origin ? `${origin}/${config.rootEntry}` : apiRoot,
         imports: {},
         schema: fullSchema,
+        config: projectConfig,
         VovkSchemaIdEnum,
-        createCodeExamples,
+        createCodeSamples,
         compileJSONSchemaToTypeScriptType,
         YAML,
         TOML,
         getFirstLineBanner,
+        publicMeta: getMetaSchema({ config: projectConfig, useEmitConfig: true }),
         nodeNextResolutionExt: {
             ts: isNodeNextResolution ? '.ts' : '',
             js: isNodeNextResolution ? '.js' : '',

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

@@ -48,8 +48,8 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             requires?: Record<string, string>;
             prebundleOutDir?: string;
             keepPrebundleDir?: boolean;
-            tsdownBuildOptions?: Parameters<typeof import("tsdown/config-9hj-APNF.mjs").build>[0];
-            generatorConfig?: import("vovk").VovkGeneratorConfigCommon;
+            tsdownBuildOptions?: Parameters<typeof import("tsdown/index.mjs").build>[0];
+            generatorConfig?: import("vovk").VovkGeneratorConfig;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -64,7 +64,9 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             controller?: string;
             [key: string]: string | undefined;
         };
-        generatorConfig?: import("vovk").VovkGeneratorConfig;
+        generatorConfig?: import("vovk").VovkGeneratorConfig & {
+            segments?: Record<string, import("vovk/types").VovkSegmentConfig>;
+        };
     } | null;
     log: {
         info: (msg: string) => void;

package/dist/index.mjs

@@ -94,10 +94,10 @@ program
     .option('--schema, --schema-path <path>', 'path to schema folder (default: ./.vovk-schema)')
     .option('--config, --config-path <config>', 'path to config file')
     .option('--origin <url>', 'set the origin URL for the generated client')
-    .option('--watch <s>', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL')
+    .option('--watch <s>', 'watch for changes in schema or openapi spec and regenerate client; accepts a number in seconds to throttle the watcher or make an HTTP request to the OpenAPI spec URL', false)
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema for client generation')
-    .option('--openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
-    .option('--openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')
+    .option('--openapi-module-name, --openapi-get-module-name <names...>', 'module names corresponding to the index of --openapi option')
+    .option('--openapi-method-name, --openapi-get-method-name <names...>', 'method names corresponding to the index of --openapi option')
     .option('--openapi-root-url <urls...>', 'root URLs corresponding to the index of --openapi option')
     .option('--openapi-mixin-name <names...>', 'mixin names corresponding to the index of --openapi option')
     .option('--openapi-fallback <paths...>', 'save OpenAPI spec and use it as a fallback if URL is not available')

package/dist/utils/deepExtend.d.mts

@@ -0,0 +1,54 @@
+/*!
+ * @description Recursive object extending
+ * @author Viacheslav Lotsmanov <lotsmanov89@gmail.com>
+ * @license MIT
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Viacheslav Lotsmanov
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+type DeepPartial<T> = {
+    [P in keyof T]?: T[P] extends (infer U)[] ? DeepPartial<U>[] : T[P] extends object ? DeepPartial<T[P]> : T[P];
+};
+type SpecificValue = Buffer | Date | RegExp;
+declare function isSpecificValue(val: any): val is SpecificValue;
+declare function cloneSpecificValue(val: SpecificValue): SpecificValue;
+/**
+ * Recursive cloning array.
+ */
+declare function deepCloneArray<T = any>(arr: T[]): T[];
+declare function safeGetProperty<T extends object>(object: T, property: PropertyKey): any;
+/**
+ * Extending object that entered in first argument.
+ *
+ * Returns extended object or false if have no target object or incorrect type.
+ *
+ * If you wish to clone source object (without modify it), just use empty new
+ * object as first argument, like this:
+ *   deepExtend({}, yourObj_1, [yourObj_N]);
+ */
+declare function deepExtend<T extends object>(...args: [T, ...Partial<T>[]]): T;
+declare function deepExtend<T extends object, U extends object>(target: T, source: U): T & U;
+declare function deepExtend<T extends object, U extends object, V extends object>(target: T, source1: U, source2: V): T & U & V;
+declare function deepExtend<T extends object, U extends object, V extends object, W extends object>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
+declare function deepExtend<T extends object>(target: T, ...sources: any[]): T;
+export default deepExtend;
+export { deepExtend, deepCloneArray, isSpecificValue, cloneSpecificValue, safeGetProperty };
+export type { DeepPartial, SpecificValue };

package/dist/utils/deepExtend.mjs

@@ -0,0 +1,129 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/*!
+ * @description Recursive object extending
+ * @author Viacheslav Lotsmanov <lotsmanov89@gmail.com>
+ * @license MIT
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Viacheslav Lotsmanov
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+'use strict';
+function isSpecificValue(val) {
+    return val instanceof Buffer || val instanceof Date || val instanceof RegExp;
+}
+function cloneSpecificValue(val) {
+    if (val instanceof Buffer) {
+        const x = Buffer.alloc ? Buffer.alloc(val.length) : Buffer.from(val);
+        val.copy(x);
+        return x;
+    }
+    else if (val instanceof Date) {
+        return new Date(val.getTime());
+    }
+    else if (val instanceof RegExp) {
+        return new RegExp(val);
+    }
+    else {
+        throw new Error('Unexpected situation');
+    }
+}
+/**
+ * Recursive cloning array.
+ */
+function deepCloneArray(arr) {
+    const clone = [];
+    arr.forEach((item, index) => {
+        if (typeof item === 'object' && item !== null) {
+            if (Array.isArray(item)) {
+                clone[index] = deepCloneArray(item);
+            }
+            else if (isSpecificValue(item)) {
+                clone[index] = cloneSpecificValue(item);
+            }
+            else {
+                clone[index] = deepExtend({}, item);
+            }
+        }
+        else {
+            clone[index] = item;
+        }
+    });
+    return clone;
+}
+function safeGetProperty(object, property) {
+    return property === '__proto__' ? undefined : object[property];
+}
+function deepExtend(...args) {
+    if (args.length < 1 || typeof args[0] !== 'object') {
+        return false;
+    }
+    if (args.length < 2) {
+        return args[0];
+    }
+    const target = args[0];
+    // convert arguments to array and cut off target object
+    const sources = args.slice(1);
+    sources.forEach((obj) => {
+        // skip argument if isn't an object, is null, or is an array
+        if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
+            return;
+        }
+        Object.keys(obj).forEach((key) => {
+            const src = safeGetProperty(target, key); // source value
+            const val = safeGetProperty(obj, key); // new value
+            // recursion prevention
+            if (val === target) {
+                return;
+            }
+            else if (typeof val !== 'object' || val === null) {
+                /**
+                 * if new value isn't object then just overwrite by new value
+                 * instead of extending.
+                 */
+                target[key] = val;
+                return;
+            }
+            // just clone arrays (and recursive clone objects inside)
+            else if (Array.isArray(val)) {
+                target[key] = deepCloneArray(val);
+                return;
+            }
+            // custom cloning and overwrite for specific objects
+            else if (isSpecificValue(val)) {
+                target[key] = cloneSpecificValue(val);
+                return;
+            }
+            // overwrite by new value if source isn't object or array
+            else if (typeof src !== 'object' || src === null || Array.isArray(src)) {
+                target[key] = deepExtend({}, val);
+                return;
+            }
+            // source value and new value is objects both, extending...
+            else {
+                target[key] = deepExtend(src, val);
+                return;
+            }
+        });
+    });
+    return target;
+}
+export default deepExtend;
+export { deepExtend, deepCloneArray, isSpecificValue, cloneSpecificValue, safeGetProperty };

package/dist/utils/normalizeOpenAPIMixin.d.mts

@@ -11,4 +11,4 @@ export declare function normalizeOpenAPIMixin({ mixinModule, log, cwd, }: {
     mixinModule: NonNullable<NonNullable<NonNullable<NonNullable<VovkConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>;
     log: ProjectInfo['log'];
     cwd?: string;
-}): Promise<NonNullable<NonNullable<NonNullable<VovkStrictConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>;
+}): Promise<NonNullable<NonNullable<NonNullable<NonNullable<VovkStrictConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.352",
+  "version": "0.0.1-draft.355",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,22 +35,22 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.413"
+    "vovk": "^3.0.0-draft.415"
   },
   "optionalDependencies": {
-    "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.31"
+    "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.36"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@inquirer/prompts": "^7.7.1",
-    "@npmcli/package-json": "^6.2.0",
+    "@inquirer/prompts": "^7.8.4",
+    "@npmcli/package-json": "^7.0.0",
     "@types/json-schema": "^7.0.15",
-    "chalk": "^5.4.1",
+    "chalk": "^5.6.2",
     "chokidar": "^4.0.3",
     "clone-deep": "^4.0.1",
     "commander": "^13.1.0",
-    "concurrently": "^9.2.0",
-    "dotenv": "^17.2.1",
+    "concurrently": "^9.2.1",
+    "dotenv": "^17.2.2",
     "ejs": "^3.1.10",
     "get-tsconfig": "^4.10.1",
     "glob": "^11.0.3",
@@ -63,12 +63,12 @@
     "pluralize": "^8.0.0",
     "prettier": "^3.6.2",
     "tar-stream": "^3.1.7",
-    "ts-morph": "^26.0.0",
-    "tsdown": "^0.13.0",
+    "ts-morph": "^27.0.0",
+    "tsdown": "^0.15.0",
     "type-fest": "^4.41.0",
-    "undici": "^7.12.0",
+    "undici": "^7.15.0",
     "vovk-openapi": "^0.0.1-draft.112",
-    "yaml": "^2.8.0"
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
     "@types/concat-stream": "^2.0.3",
@@ -78,8 +78,9 @@
     "@types/pluralize": "^0.0.33",
     "@types/tar-stream": "^3.1.4",
     "concat-stream": "^2.0.0",
-    "create-next-app": "^15.4.4",
+    "create-next-app": "^15.5.2",
+    "http-server": "^14.1.1",
     "node-pty": "^1.0.0",
-    "zod": "^4.0.10"
+    "zod": "^4.1.5"
   }
 }