vovk-cli 0.0.1-draft.286 → 0.0.1-draft.289

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

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 const { fetcher } = require('<%= t.imports.fetcher %>');
 const { createRPC } = require('<%= t.imports.createRPC %>');
 const { schema } = require('./schema.cjs');

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

@@ -1,5 +1,5 @@
 
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 import type { VovkClientFetcher } from 'vovk';
 import type { fetcher } from '<%= t.imports.module.fetcher %>';
 import type { createRPC } from '<%= t.imports.module.createRPC %>';

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

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 import type { VovkRequest, VovkStreamAsyncIterable, KnownAny } from 'vovk';
 
 <% const mixins = Object.values(t.schema.segments).filter((segment) => segment.emitSchema && segment.segmentType === 'mixin'); %>

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

@@ -1,5 +1,5 @@
 
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 import type { VovkClientFetcher } from 'vovk';
 import type { fetcher } from '<%= t.imports.module.fetcher %>';
 import type { createRPC } from '<%= t.imports.module.createRPC %>';

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

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 import { fetcher } from '<%= t.imports.module.fetcher %>';
 import { createRPC } from '<%= t.imports.module.createRPC %>';
 import { schema } from './schema.cjs';

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

@@ -1,3 +1,4 @@
+<%- t.getFirstLineBanner('html') %>
 <%- t.readme.banner %>
 
 # <%= t.package.name %> v<%= t.package.version %> [![TypeScript](https://badgen.net/badge/-/TypeScript?icon=typescript&label&labelColor=blue&color=555555)](https://www.typescriptlang.org/) [![Vovk.ts](https://badgen.net/badge/Built%20with/Vovk.ts/333333?icon=https://vovk.dev/icon-white.svg)](https://vovk.dev)

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

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 <% if(t.isVovkProject) { %>
 const meta = require('./<%= t.schemaOutDir %>/_meta.json');
 <% } %>

package/client-templates/schemaCjs/schema.d.cts.ejs

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 import type { VovkMetaSchema, VovkSegmentSchema } from 'vovk';
 
 export const schema: {

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

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 <% if(t.isVovkProject) { %>
 import meta from './<%= t.schemaOutDir %>/_meta.json' with { type: "json" };
 <% } %>

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

@@ -1,4 +1,4 @@
-<%- `// auto-generated by Vovk.ts ${new Date().toISOString()}` %>
+<%- t.getFirstLineBanner() %>
 import type { VovkClientFetcher } from 'vovk';
 import { fetcher } from '<%= t.imports.fetcher %>';
 import { createRPC } from '<%= t.imports.createRPC %>';

package/dist/generate/generate.mjs

@@ -90,7 +90,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
         // sort segments by name to avoid unnecessary rendering
         segments: Object.fromEntries(Object.entries(fullSchema.segments).sort(([a], [b]) => a.localeCompare(b))),
     };
-    const { config, cwd, log, srcRoot, packageJson: rootPackageJson } = projectInfo;
+    const { config, cwd, log, srcRoot, packageJson: rootPackageJson, vovkCliPackage } = projectInfo;
     const allOpenAPIMixins = {
         ...config.openApiMixins,
         ...cliOptionsToOpenAPIMixins(cliGenerateOptions ?? {}),
@@ -170,6 +170,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                 isNodeNextResolution,
                 hasMixins,
                 isVovkProject,
+                vovkCliPackage,
             });
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
             return {
@@ -250,6 +251,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                     isNodeNextResolution,
                     hasMixins,
                     isVovkProject,
+                    vovkCliPackage,
                 });
                 return {
                     written,

package/dist/generate/writeOneClientFile.d.mts

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

package/dist/generate/writeOneClientFile.mjs

@@ -8,7 +8,7 @@ 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 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, }) {
+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');
@@ -17,6 +17,17 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
 // 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`;
     placeholder = outPath.endsWith('.py') ? placeholder.replace(/\/\//g, '#') : placeholder;
+    const getFirstLineBanner = (type = 'c') => {
+        const text = `auto-generated by vovk-cli ${vovkCliPackage.version} at ${new Date().toISOString()}`;
+        switch (type) {
+            case 'html':
+                return `<!-- ${text} -->`;
+            case 'py':
+                return `# ${text}`;
+            case 'c':
+                return `// ${text}`;
+        }
+    };
     // Data for the EJS templates:
     const t = {
         _, // lodash
@@ -33,6 +44,7 @@ export default async function writeOneClientFile({ cwd, projectInfo, clientTempl
         compileJSONSchemaToTypeScriptType,
         YAML,
         TOML,
+        getFirstLineBanner,
         nodeNextResolutionExt: {
             ts: isNodeNextResolution ? '.ts' : '',
             js: isNodeNextResolution ? '.js' : '',

package/dist/getProjectInfo/index.d.mts

@@ -10,6 +10,9 @@ export default function getProjectInfo({ port: givenPort, cwd, configPath, srcRo
     apiRoot: string;
     apiDirAbsolutePath: string | null;
     srcRoot: string | null;
+    vovkCliPackage: {
+        version: string;
+    };
     config: import("vovk").VovkStrictConfig;
     packageJson: import("type-fest").PackageJson;
     log: {

package/dist/getProjectInfo/index.mjs

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import getConfig from './getConfig/index.mjs';
 import { getPackageJson } from '../utils/getPackageJson.mjs';
+import { readFile } from 'node:fs/promises';
 export default async function getProjectInfo({ port: givenPort, cwd = process.cwd(), configPath, srcRootRequired = true, } = {}) {
     const port = givenPort?.toString() ?? process.env.PORT ?? '3000';
     // Make PORT available to the config file at getConfig
@@ -18,12 +19,14 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
     if (configAbsolutePaths.length > 1) {
         log.warn(`Multiple config files found. Using the first one: ${configAbsolutePaths[0]}`);
     }
+    const vovkCliPackage = JSON.parse(await readFile(path.join(import.meta.dirname, '../../package.json'), 'utf-8'));
     return {
         cwd,
         port,
         apiRoot,
         apiDirAbsolutePath,
         srcRoot,
+        vovkCliPackage,
         config,
         packageJson,
         log,

package/dist/index.mjs

@@ -13,8 +13,8 @@ import { newComponents } from './new/index.mjs';
 import { initProgram } from './initProgram.mjs';
 import { getProjectFullSchema } from './generate/getProjectFullSchema.mjs';
 const program = new Command();
-const packageJSON = JSON.parse(readFileSync(path.join(import.meta.dirname, '../package.json'), 'utf-8'));
-program.name('vovk').description('Vovk CLI').version(packageJSON.version);
+const vovkCliPackage = JSON.parse(readFileSync(path.join(import.meta.dirname, '../package.json'), 'utf-8'));
+program.name('vovk').description('Vovk CLI').version(vovkCliPackage.version);
 initProgram(program.command('init'));
 program
     .command('dev')
@@ -56,7 +56,7 @@ program
                 },
             },
         ], {
-            killOthers: ['failure', 'success'],
+            killOthersOn: ['failure', 'success'],
             prefix: 'none',
             successCondition: 'first',
         });

package/dist/init/index.mjs

@@ -22,10 +22,10 @@ export class Init {
         const dependencies = ['vovk', 'vovk-client', 'vovk-ajv', 'openapi3-ts'];
         const devDependencies = ['vovk-cli'];
         if (lang?.includes('py')) {
-            dependencies.push('vovk-python');
+            devDependencies.push('vovk-python');
         }
         if (lang?.includes('rs')) {
-            dependencies.push('vovk-rust');
+            devDependencies.push('vovk-rust');
         }
         // delete older config files
         if (configPaths.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.286",
+  "version": "0.0.1-draft.289",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,10 +35,10 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.318"
+    "vovk": "^3.0.0-draft.321"
   },
   "optionalDependencies": {
-    "vovk-python": "^0.0.1-draft.42"
+    "vovk-python": "^0.0.1-draft.46"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",