vovk-cli 0.0.1-draft.336 → 0.0.1-draft.338

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

@@ -2,6 +2,7 @@
 const { fetcher } = require('<%= t.imports.fetcher %>');
 const { createRPC } = require('<%= t.imports.createRPC %>');
 const { schema } = require('./schema.cjs');
+const openapi = require('./openapi.json');
 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]) => {
@@ -16,4 +17,5 @@ exports.<%= rpcModuleName %> = createRPC(
 );
   <% })
 }) %>
-exports.schema = schema;
+exports.schema = schema;
+exports.openapi = openapi;

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

@@ -20,6 +20,7 @@ export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segme
   <% }) 
 }) %>
 export { schema } from './schema.cjs';
+export { default as openapi } from './openapi.json' assert { type: 'json' };
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

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

@@ -20,6 +20,7 @@ export const <%= rpcModuleName %>: ReturnType<typeof createRPC<<%= segment.segme
   <% }) 
 }) %>
 export { schema } from './schema.cjs';
+export { default as openapi } from './openapi.json' with { type: 'json' };
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

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

@@ -2,6 +2,7 @@
 import { fetcher } from '<%= t.imports.module.fetcher %>';
 import { createRPC } from '<%= t.imports.module.createRPC %>';
 import { schema } from './schema.cjs';
+import openapi from './openapi.json' with { type: 'json' };
 <% if (t.imports.module.validateOnClient) { %>
 import { validateOnClient } from '<%= t.imports.module.validateOnClient %>';
 <% } else { %>
@@ -20,4 +21,4 @@ export const <%= rpcModuleName %> = createRPC(
   }); 
 });
 %>
-export { schema };
+export { schema, openapi };

package/client-templates/openapiJson/openapi.json.ejs

@@ -0,0 +1 @@
+<%- JSON.stringify(t.openapi, null, 2) %>

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

@@ -3,6 +3,7 @@ import type { VovkClientFetcher } from 'vovk';
 import { fetcher } from '<%= t.imports.fetcher %>';
 import { createRPC } from '<%= t.imports.createRPC %>';
 import { schema } from './schema<%= t.nodeNextResolutionExt.ts %>';
+import openapi from './openapi.json' with { type: 'json' };
 <% 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 %>";
 <% }
@@ -27,7 +28,7 @@ export const <%= rpcModuleName %> = createRPC<<%= segment.segmentType === 'mixin
 );
 <% }) 
 }) %>
-export { schema };
+export { schema, openapi };
 <% if (t.hasMixins) { %>
 export { Mixins };
 <% } %>

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, } from 'vovk';
+import { getGeneratorConfig, openAPIToVovkSchema, vovkSchemaToOpenAPI, } from 'vovk';
 import getClientTemplateFiles from './getClientTemplateFiles.mjs';
 import chalkHighlightThing from '../utils/chalkHighlightThing.mjs';
 import pickSegmentFullSchema from '../utils/pickSegmentFullSchema.mjs';
@@ -98,20 +98,14 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
     Object.entries(config.generatorConfig.segments ?? {}).forEach(([segmentName, segmentConfig]) => {
         fullSchema.segments = {
             ...fullSchema.segments,
-            [segmentName]: {
-                ...fullSchema.segments[segmentName],
-                ...openAPIToVovkSchema({ ...segmentConfig.openAPIMixin, segmentName }).segments[segmentName],
-            },
+            [segmentName]: openAPIToVovkSchema({ ...segmentConfig.openAPIMixin, segmentName }).segments[segmentName],
         };
     });
     const cliMixins = cliOptionsToOpenAPIMixins(cliGenerateOptions ?? {});
     await Promise.all(Object.entries(cliMixins).map(async ([mixinName, mixinModule]) => {
         fullSchema.segments = {
             ...fullSchema.segments,
-            [mixinName]: {
-                ...fullSchema.segments[mixinName],
-                ...openAPIToVovkSchema(await normalizeOpenAPIMixin({ mixinModule, log })).segments[mixinName],
-            },
+            [mixinName]: openAPIToVovkSchema(await normalizeOpenAPIMixin({ mixinModule, log })).segments[mixinName],
         };
     }));
     const isNodeNextResolution = ['node16', 'nodenext'].includes((await getTsconfig(cwd)?.config?.compilerOptions?.moduleResolution?.toLowerCase()) ?? '');
@@ -150,6 +144,10 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 config: templateDef.generatorConfig,
                 isBundle,
             });
+            const openapi = vovkSchemaToOpenAPI({
+                schema: fullSchema,
+                rootEntry: config.rootEntry,
+            });
             const composedFullSchema = pickSegmentFullSchema(fullSchema, segmentNames);
             const hasMixins = Object.values(composedFullSchema.segments).some((segment) => segment.segmentType === 'mixin');
             if (templateName === BuiltInTemplateName.mixins && !hasMixins) {
@@ -165,6 +163,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 imports: clientImports.composedClient,
                 templateContent,
                 matterResult,
+                openapi,
                 package: packageJson,
                 readme,
                 snippets,
@@ -235,6 +234,11 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 if (templateName === BuiltInTemplateName.mixins && !hasMixins) {
                     return null;
                 }
+                const openapi = vovkSchemaToOpenAPI({
+                    schema: fullSchema,
+                    rootEntry: config.rootEntry,
+                    segmentName,
+                });
                 const { written } = await writeOneClientFile({
                     cwd,
                     projectInfo,
@@ -245,6 +249,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     imports: clientImports.segmentedClient[segmentName],
                     templateContent,
                     matterResult,
+                    openapi,
                     package: packageJson,
                     readme,
                     snippets,

package/dist/generate/writeOneClientFile.d.mts

@@ -4,8 +4,9 @@ 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';
+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, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -20,6 +21,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
         };
         content: string;
     };
+    openapi: OpenAPIObject;
     package: PackageJson;
     readme: VovkReadmeConfig;
     snippets: VovkSnippetsConfig;

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, snippets, isEnsuringClient, outCwdRelativeDir, 
+export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, openapi, package: packageJson, readme, snippets, isEnsuringClient, outCwdRelativeDir, 
 // templateDef,
 locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }) {
     const { config, apiRoot } = projectInfo;
@@ -41,6 +41,7 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
         package: packageJson,
         readme,
         snippets,
+        openapi,
         ROOT_SEGMENT_FILE_NAME,
         apiRoot: origin ? `${origin}/${config.rootEntry}` : apiRoot,
         imports,

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

@@ -9,6 +9,7 @@ export declare enum BuiltInTemplateName {
     standaloneTypesTs = "standaloneTypesTs",
     readme = "readme",
     packageJson = "packageJson",
+    openapiJson = "openapiJson",
     mixins = "mixins",
     rsSrc = "rsSrc",
     rsPkg = "rsPkg",

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -13,6 +13,7 @@ export var BuiltInTemplateName;
     // misc
     BuiltInTemplateName["readme"] = "readme";
     BuiltInTemplateName["packageJson"] = "packageJson";
+    BuiltInTemplateName["openapiJson"] = "openapiJson";
     BuiltInTemplateName["mixins"] = "mixins";
     // other languages (packages installed separately)
     BuiltInTemplateName["rsSrc"] = "rsSrc";
@@ -31,6 +32,7 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.ts}/`,
             requires: {
                 [BuiltInTemplateName.schemaTs]: '.',
+                [BuiltInTemplateName.openapiJson]: '.',
                 [BuiltInTemplateName.mixins]: '.', // used conditionally if OpenAPI mixins are used
             },
         },
@@ -38,6 +40,7 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.cjs}/`,
             requires: {
                 [BuiltInTemplateName.schemaCjs]: '.',
+                [BuiltInTemplateName.openapiJson]: '.',
                 [BuiltInTemplateName.mixins]: '.', // used conditionally if OpenAPI mixins are used
             },
         },
@@ -45,6 +48,7 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mjs}/`,
             requires: {
                 [BuiltInTemplateName.schemaCjs]: '.',
+                [BuiltInTemplateName.openapiJson]: '.',
                 [BuiltInTemplateName.mixins]: '.', // used conditionally if OpenAPI mixins are used
             },
         },
@@ -63,6 +67,9 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.packageJson]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.packageJson}/`,
         },
+        [BuiltInTemplateName.openapiJson]: {
+            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiJson}/`,
+        },
         [BuiltInTemplateName.mixins]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mixins}/`,
         },

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

@@ -49,7 +49,7 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             prebundleOutDir?: string;
             keepPrebundleDir?: boolean;
             tsdownBuildOptions?: Parameters<typeof import("tsdown/config-9hj-APNF.mjs").build>[0];
-            generatorConfig: import("vovk").VovkGeneratorConfigCommon;
+            generatorConfig?: import("vovk").VovkGeneratorConfigCommon;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];

package/dist/getProjectInfo/getConfig/index.mjs

@@ -12,7 +12,8 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
         cwd,
     });
     const conf = userConfig ?? {};
-    const log = getLogger(logLevel ?? conf.logLevel);
+    logLevel = logLevel ?? conf.logLevel ?? 'info';
+    const log = getLogger(logLevel);
     const env = process.env;
     const clientTemplateDefs = getTemplateDefs(conf.clientTemplateDefs);
     const srcRoot = await getRelativeSrcRoot({ cwd });
@@ -51,6 +52,7 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
             requires: {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
+                [BuiltInTemplateName.openapiJson]: '.',
             },
             generatorConfig: {},
             ...conf.bundle,
@@ -63,7 +65,7 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
         schemaOutDir: env.VOVK_SCHEMA_OUT_DIR ?? conf.schemaOutDir ?? './.vovk-schema',
         rootEntry: env.VOVK_ROOT_ENTRY ?? conf.rootEntry ?? 'api',
         rootSegmentModulesDirName: conf.rootSegmentModulesDirName ?? '',
-        logLevel: conf.logLevel ?? 'info',
+        logLevel,
         devHttps: conf.devHttps ?? false,
         moduleTemplates: {
             service: 'vovk-cli/module-templates/service.ts.ejs',

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -6,5 +6,30 @@ export default function getMetaSchema({ config, package: packageJson, }: {
 }): {
     config: VovkStrictConfig;
     $schema: VovkSchemaIdEnum;
-    package: Pick<PackageJson, "name" | "version" | "description" | "author" | "license">;
+    package: {
+        main: string;
+        module: string;
+        types: string;
+        exports: {
+            '.': {
+                import: string;
+                require: string;
+                types: string;
+            };
+            './schema': {
+                import: string;
+                require: string;
+                types: string;
+            };
+            './openapi': {
+                import: string;
+                require: string;
+            };
+        };
+        name?: string | undefined;
+        version?: string | undefined;
+        description?: string | undefined;
+        author?: PackageJson.Person | undefined;
+        license?: string | undefined;
+    };
 };

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -3,7 +3,28 @@ import pick from 'lodash/pick.js';
 export default function getMetaSchema({ config, package: packageJson, }) {
     return {
         $schema: VovkSchemaIdEnum.META,
-        package: pick(packageJson, ['name', 'version', 'description', 'author', 'license']),
+        package: {
+            ...pick(packageJson, ['name', 'version', 'description', 'author', 'license']),
+            main: './index.cjs',
+            module: './index.mjs',
+            types: './index.d.mts',
+            exports: {
+                '.': {
+                    import: './index.mjs',
+                    require: './index.cjs',
+                    types: './index.d.mts',
+                },
+                './schema': {
+                    import: './schema.cjs',
+                    require: './schema.cjs',
+                    types: './schema.d.cts',
+                },
+                './openapi': {
+                    import: './openapi.json',
+                    require: './openapi.json',
+                },
+            },
+        },
         ...{
             config: (config
                 ? pick(config, [...config.emitConfig, '$schema'])

package/module-templates/arktype/controller.ts.ejs

@@ -9,7 +9,7 @@ sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
-import { prefix, get, put, post, del, openapi } from 'vovk';
+import { prefix, get, put, post, del, operation } from 'vovk';
 import { type } from 'arktype';
 import withArk from '@/lib/withArk<%= t.nodeNextResolutionExt.ts %>';
 <% if(t.withService) { %>
@@ -18,7 +18,7 @@ import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextReso
 
 @prefix('<%= t['the-things'] %>')
 export default class <%= vars.ModuleName %> {
-    @openapi({
+    @operation({
       summary: 'Get <%= t.TheThings %>',
     })
     @get()
@@ -34,7 +34,7 @@ export default class <%= vars.ModuleName %> {
         }
     });
 
-    @openapi({
+    @operation({
         summary: 'Update <%= t.TheThing %>',
     })
     @put('{id}')

package/module-templates/type/controller.ts.ejs

@@ -9,14 +9,14 @@ sourceName: <%= vars.rpcModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
-import { prefix, get, put, post, del, openapi, type VovkRequest } from 'vovk';
+import { prefix, get, put, post, del, operation, type VovkRequest } from 'vovk';
 <% if(t.withService) { %>
 import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextResolutionExt.ts %>';
 <% } %>
 
 @prefix('<%= t['the-things'] %>')
 export default class <%= vars.rpcModuleName %> {
-    @openapi({
+    @operation({
         summary: 'Get <%= t.TheThings %>',
     })
     @get()
@@ -29,7 +29,7 @@ export default class <%= vars.rpcModuleName %> {
         <% } %>
     }
 
-    @openapi({
+    @operation({
         summary: 'Update <%= t.TheThing %>',
     })
     @put('{id}')

package/module-templates/valibot/controller.ts.ejs

@@ -9,7 +9,7 @@ sourceName: <%= vars.ModuleName %>
 compiledName: <%= t.TheThing + 'RPC' %>
 ---
 
-import { prefix, get, put, post, del, openapi } from 'vovk';
+import { prefix, get, put, post, del, operation } from 'vovk';
 import * as v from 'valibot';
 import withValibot from '@/lib/withValibot<%= t.nodeNextResolutionExt.ts %>';
 <% if(t.withService) { %>
@@ -18,7 +18,7 @@ import <%= vars.ServiceName %> from './<%= vars.ServiceName %><%= t.nodeNextReso
 
 @prefix('<%= t['the-things'] %>')
 export default class <%= vars.ModuleName %> {
-    @openapi({
+    @operation({
       summary: 'Get <%= t.TheThings %>',
     })
     @get()
@@ -34,7 +34,7 @@ export default class <%= vars.ModuleName %> {
         }
     });
 
-    @openapi({
+    @operation({
         summary: 'Update <%= t.TheThing %>',
     })
     @put('{id}')

package/package.json

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