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

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

@@ -1,7 +1,7 @@
 <%- t.getFirstLineBanner() %>
 const { createRPC } = require('<%= t.commonImports.createRPC %>');
 const { schema } = require('./schema.cjs');
-const openapi = require('./openapi.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]) => {
@@ -12,7 +12,7 @@ exports['<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>'] = require('<
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 exports.<%= rpcModuleName %> = createRPC(
   schema, '<%= segment.segmentName %>', '<%= rpcModuleName %>', require('<%= t.segmentImports[segment.segmentName].fetcher %>').fetcher,
-  { validateOnClient: <%= t.segmentImports[segment.segmentName].validateOnClient ? `require('${t.segmentImports[segment.segmentName].validateOnClient}').validateOnClient` : 'undefined' %>, <%- typeof t.segmentMeta[segment.segmentName].segmentNameOverride === 'string' ? `segmentNameOverride: '${t.segmentMeta[segment.segmentName].segmentNameOverride}', ` : '' %><%- segment.segmentType === 'mixin' ? '' : `apiRoot: '${t.segmentMeta[segment.segmentName].forceApiRoot ?? t.apiRoot}'` %> }
+  { validateOnClient: <%- t.segmentImports[segment.segmentName].validateOnClient ? `require('${t.segmentImports[segment.segmentName].validateOnClient}').validateOnClient` : 'undefined' %>, <%- 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

@@ -2,7 +2,7 @@
 import type { VovkClientFetcher } from 'vovk';
 import { createRPC } from '<%= t.commonImports.module.createRPC %>';
 import { schema } from './schema<%= t.nodeNextResolutionExt.ts %>';
-import { openapi } from './openapi<%= t.nodeNextResolutionExt.cjs %>';
+import { openapi } from './openapi<%= t.nodeNextResolutionExt.ts %>';
 <% Object.values(t.schema.segments).filter((segment) => segment.emitSchema).forEach((segment, i) => { if(segment.segmentType !== 'mixin') { %>
 import type { Controllers as Controllers<%= i %> } from "<%= t.segmentMeta[segment.segmentName].segmentImportPath %>";
 <% }

package/dist/bundle/index.mjs

@@ -30,6 +30,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         fullSchema,
         locatedSegments,
         cliGenerateOptions: {
+            schemaPath: cliBundleOptions?.schemaPath,
             origin: cliBundleOptions?.origin,
             openapiSpec: cliBundleOptions?.openapiSpec,
             openapiGetModuleName: cliBundleOptions?.openapiGetModuleName,
@@ -63,6 +64,16 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         tsconfig,
     });
     log.debug(`Bundled schema.ts to ${chalkHighlightThing(outDirAbsolute)}`);
+    await build({
+        entry: path.join(tsFullClientOutAbsoluteDirInput, './openapi.ts'),
+        dts: true,
+        format: ['cjs'],
+        fixedExtension: true,
+        outDir: outDirAbsolute,
+        clean: false,
+        tsconfig,
+    });
+    log.debug(`Bundled openapi.ts to ${chalkHighlightThing(outDirAbsolute)}`);
     const requiresGroup = groupBy(Object.entries(bundleConfig.requires), ([, relativePath]) => relativePath);
     for (const [relativePath, group] of Object.entries(requiresGroup)) {
         await generate({
@@ -72,6 +83,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             fullSchema,
             locatedSegments,
             cliGenerateOptions: {
+                schemaPath: cliBundleOptions?.schemaPath,
                 origin: cliBundleOptions?.origin,
                 composedFrom: group.map(([templateName]) => templateName),
                 composedOut: path.resolve(outDirAbsolute, relativePath),

package/dist/generate/generate.mjs

@@ -94,7 +94,9 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             .map((segment) => ({ ...segment }))),
     };
     const { config, cwd, log, srcRoot, vovkCliPackage } = projectInfo;
-    Object.entries(config.generatorConfig.segments ?? {}).forEach(([segmentName, segmentConfig]) => {
+    Object.entries(config.generatorConfig.segments ?? {})
+        .filter(([, segmentConfig]) => segmentConfig.openAPIMixin)
+        .forEach(([segmentName, segmentConfig]) => {
         fullSchema.segments = {
             ...fullSchema.segments,
             [segmentName]: openAPIToVovkSchema({ ...segmentConfig.openAPIMixin, segmentName }).segments[segmentName],
@@ -172,6 +174,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 isBundle,
                 origin: cliGenerateOptions?.origin ?? origin,
                 configKey: 'composedClient',
+                cliSchemaPath: cliGenerateOptions?.schemaPath ?? null,
             });
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
             return {
@@ -253,6 +256,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     isBundle,
                     origin: cliGenerateOptions?.origin ?? origin,
                     configKey: 'segmentedClient',
+                    cliSchemaPath: cliGenerateOptions?.schemaPath ?? null,
                 });
                 return {
                     written,

package/dist/generate/getTemplateClientImports.mjs

@@ -2,7 +2,17 @@ import path from 'node:path';
 import { getGeneratorConfig } from 'vovk';
 import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
 export default function getTemplateClientImports({ fullSchema, outCwdRelativeDir, segmentName, isBundle, }) {
-    const { imports } = getGeneratorConfig({ schema: fullSchema, segmentName, isBundle });
+    const { imports: configImports } = getGeneratorConfig({ schema: fullSchema, segmentName, isBundle });
+    const validateOnClientImport = configImports?.validateOnClient ?? null;
+    const fetcherImport = configImports?.fetcher ?? 'vovk';
+    const createRPCImport = configImports?.createRPC ?? 'vovk';
+    const imports = {
+        fetcher: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,
+        validateOnClient: typeof validateOnClientImport === 'string'
+            ? [validateOnClientImport]
+            : (validateOnClientImport ?? null),
+        createRPC: typeof createRPCImport === 'string' ? [createRPCImport] : createRPCImport,
+    };
     const getImportPath = (p, s = '') => p.startsWith('.') ? path.relative(path.join(outCwdRelativeDir, s), p) : p;
     const clientImports = {
         composedClient: {

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, }: {
+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, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -34,6 +34,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     isBundle: boolean;
     origin: string | null;
     configKey: 'composedClient' | 'segmentedClient';
+    cliSchemaPath: string | null;
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -16,7 +16,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
 // imports,
 templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, 
 // templateDef,
-locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, }) {
+locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, }) {
     const { config, apiRoot } = projectInfo;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
@@ -64,8 +64,8 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
             mjs: isNodeNextResolution ? '.mjs' : '',
         },
         schemaOutDir: typeof segmentName === 'string'
-            ? path.relative(path.join(outCwdRelativeDir, segmentName || ROOT_SEGMENT_FILE_NAME), config.schemaOutDir)
-            : path.relative(outCwdRelativeDir, config.schemaOutDir),
+            ? path.relative(path.join(outCwdRelativeDir, segmentName || ROOT_SEGMENT_FILE_NAME), cliSchemaPath ?? config.schemaOutDir)
+            : path.relative(outCwdRelativeDir, cliSchemaPath ?? config.schemaOutDir),
         commonImports: getTemplateClientImports({ fullSchema, isBundle, outCwdRelativeDir, segmentName })['composedClient'],
         segmentImports: Object.fromEntries(Object.values(fullSchema.segments).map(({ segmentName: sName }) => {
             const clientImports = getTemplateClientImports({ fullSchema, segmentName: sName, isBundle, outCwdRelativeDir });

package/dist/getProjectInfo/getConfig/index.mjs

@@ -17,16 +17,6 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
     const env = process.env;
     const clientTemplateDefs = getTemplateDefs(conf.clientTemplateDefs);
     const srcRoot = await getRelativeSrcRoot({ cwd });
-    const validateOnClientImport = conf.generatorConfig?.imports?.validateOnClient ?? null;
-    const fetcherImport = conf.generatorConfig?.imports?.fetcher ?? 'vovk';
-    const createRPCImport = conf.generatorConfig?.imports?.createRPC ?? 'vovk';
-    const imports = {
-        fetcher: typeof fetcherImport === 'string' ? [fetcherImport] : fetcherImport,
-        validateOnClient: typeof validateOnClientImport === 'string'
-            ? [validateOnClientImport]
-            : (validateOnClientImport ?? null),
-        createRPC: typeof createRPCImport === 'string' ? [createRPCImport] : createRPCImport,
-    };
     const config = {
         $schema: VovkSchemaIdEnum.CONFIG,
         clientTemplateDefs,
@@ -51,7 +41,6 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
             requires: {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
-                [BuiltInTemplateName.openapiJson]: '.',
             },
             generatorConfig: {},
             ...conf.bundle,
@@ -74,7 +63,6 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
         libs: conf.libs ?? {},
         generatorConfig: {
             ...conf.generatorConfig,
-            imports,
             origin: (env.VOVK_ORIGIN ?? conf?.generatorConfig?.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
             segments: Object.fromEntries(await Promise.all(Object.entries(conf.generatorConfig?.segments ?? {}).map(async ([key, value]) => [
                 key,

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -23,7 +23,7 @@ export default function getMetaSchema({ config, package: packageJson, }) {
                     import: './openapi.cjs',
                     require: './openapi.cjs',
                     types: './openapi.d.cts',
-                }
+                },
             },
         },
         ...{

package/dist/index.mjs

@@ -123,8 +123,8 @@ program
     .option('--exclude, --exclude-segments <segments...>', 'exclude segments')
     .option('--prebundle-out-dir, --prebundle-out <path>', 'path to output directory for prebundle')
     .option('--keep-prebundle-dir', 'do not delete prebundle directory after bundling')
-    .option('--config <config>', 'path to config file')
-    .option('--schema <path>', 'path to schema folder (default: .vovk-schema)')
+    .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('--tsconfig <path>', 'path to tsconfig.json for bundling by tsdown')
     .option('--openapi, --openapi-spec <openapi_path_or_urls...>', 'use OpenAPI schema instead of Vovk schema')
@@ -134,7 +134,7 @@ program
     .option('--log-level <level>', 'set the log level')
     .action(async (cliBundleOptions) => {
     const projectInfo = await getProjectInfo({
-        configPath: cliBundleOptions.config,
+        configPath: cliBundleOptions.configPath,
         srcRootRequired: false,
         logLevel: cliBundleOptions.logLevel,
     });

package/dist/init/createStandardSchemaValidatorFile.d.mts

@@ -1,4 +1,4 @@
-export declare function createStandardSchemaValidatorFile({ cwd, validationLibrary, }: {
-    cwd: string;
+export declare function createStandardSchemaValidatorFile({ root, validationLibrary, }: {
+    root: string;
     validationLibrary: 'arktype' | 'valibot';
 }): Promise<void>;

package/dist/init/createStandardSchemaValidatorFile.mjs

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
-import getRelativeSrcRoot from '../getProjectInfo/getConfig/getRelativeSrcRoot.mjs';
 import path from 'path';
+import getRelativeSrcRoot from '../getProjectInfo/getConfig/getRelativeSrcRoot.mjs';
 function getCode(validationLibrary) {
     if (validationLibrary === 'valibot') {
         return `
@@ -29,10 +29,11 @@ export default withArk;
     }
     throw new Error(`Unknown validation library: ${validationLibrary}`);
 }
-export async function createStandardSchemaValidatorFile({ cwd, validationLibrary, }) {
+export async function createStandardSchemaValidatorFile({ root, validationLibrary, }) {
     const code = getCode(validationLibrary);
-    const srcRoot = (await getRelativeSrcRoot({ cwd })) ?? '.';
-    const libDir = path.join(cwd, srcRoot, 'lib');
+    const srcRoot = (await getRelativeSrcRoot({ cwd: root })) ?? '.';
+    const libDir = path.resolve(root, srcRoot, 'lib');
+    const filePath = path.join(libDir, `${validationLibrary === 'arktype' ? 'withArk' : 'withValibot'}.ts`);
     await fs.mkdir(libDir, { recursive: true });
-    await fs.writeFile(path.join(libDir, `${validationLibrary === 'arktype' ? 'withArk' : 'withValibot'}.ts`), code);
+    await fs.writeFile(filePath, code);
 }

package/dist/init/index.mjs

@@ -18,7 +18,7 @@ import { createStandardSchemaValidatorFile } from './createStandardSchemaValidat
 export class Init {
     root;
     log;
-    async #init({ configPaths, pkgJson, cwd = process.cwd(), }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
+    async #init({ configPaths, pkgJson, }, { useNpm, useYarn, usePnpm, useBun, skipInstall, updateTsConfig, updateScripts, validationLibrary, lang, dryRun, channel, }) {
         const { log, root } = this;
         const dependencies = ['vovk', 'vovk-client', 'openapi3-ts', 'vovk-ajv', 'ajv'];
         const devDependencies = ['vovk-cli'];
@@ -132,7 +132,7 @@ export class Init {
         }
         if (validationLibrary === 'valibot' || validationLibrary === 'arktype') {
             createStandardSchemaValidatorFile({
-                cwd,
+                root,
                 validationLibrary,
             });
         }
@@ -202,21 +202,21 @@ export class Init {
                                 value: 'class-validator',
                                 description: 'Use class-validator for data validation',
                             },
-                            {
-                                name: 'Valibot',
-                                value: 'valibot',
-                                description: 'Use valibot for data validation.',
-                            },
                             {
                                 name: 'ArkType',
                                 value: 'arktype',
-                                description: 'Use arktype for data validation.',
+                                description: 'Use ArkType for data validation.',
+                            },
+                            {
+                                name: 'Valibot',
+                                value: 'valibot',
+                                description: 'Use Valibot for data validation.',
                             },
                             { name: 'None', value: null, description: 'Install validation library later' },
                         ],
                     })));
         updateScripts ??= await select({
-            message: 'Do you want to update "dev" and "build" NPM scripts at package.json?',
+            message: 'Do you want to update "dev" and add "prebuild" NPM scripts at package.json?',
             default: 'implicit',
             choices: [
                 {

package/dist/types.d.mts

@@ -40,7 +40,8 @@ export interface GenerateOptions {
     logLevel?: LogLevelNames;
 }
 export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'], 'prebundleOutDir' | 'keepPrebundleDir' | 'includeSegments' | 'excludeSegments'>> {
-    config?: string;
+    configPath?: string;
+    schemaPath?: string;
     schema?: string;
     outDir?: string;
     origin?: string;

package/package.json

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