vovk-cli 0.1.3 → 0.3.0-beta.0

package/dist/generate/{getClientTemplateFiles.mjs → get-client-template-files.mjs}

@@ -1,10 +1,10 @@
 import path from 'node:path';
 import { glob } from 'glob';
-import { resolveAbsoluteModulePath } from '../utils/resolveAbsoluteModulePath.mjs';
-import { getFileSystemEntryType, FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
-import { getPublicModuleNameFromPath } from '../utils/getPublicModuleNameFromPath.mjs';
-import omit from 'lodash/omit.js';
 import merge from 'lodash/merge.js';
+import omit from 'lodash/omit.js';
+import { FileSystemEntryType, getFileSystemEntryType } from '../utils/get-file-system-entry-type.mjs';
+import { getPublicModuleNameFromPath } from '../utils/get-public-module-name-from-path.mjs';
+import { resolveAbsoluteModulePath } from '../utils/resolve-absolute-module-path.mjs';
 export async function getClientTemplateFiles({ config, cwd, log, configKey, cliGenerateOptions, }) {
     const usedTemplateDefs = {};
     const fromTemplates = configKey === 'composedClient'
@@ -18,6 +18,10 @@ export async function getClientTemplateFiles({ config, cwd, log, configKey, cliG
     const configOutDir = config[configKey].outDir;
     for (const templateName of fromTemplates) {
         if (!(templateName in config.clientTemplateDefs)) {
+            // js family removed in v4
+            if (['js', 'jsBase', 'schemaJs', 'openapiJs'].includes(templateName)) {
+                throw new Error(`The "${templateName}" template was removed in v4. Use "ts" instead.`);
+            }
             throw new Error(`Unknown template name: ${templateName}`);
         }
         usedTemplateDefs[templateName] = config.clientTemplateDefs[templateName];

package/dist/generate/{getProjectFullSchema.d.mts → get-project-full-schema.d.mts}

@@ -1,6 +1,6 @@
 import type { VovkSchema } from 'vovk';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 import { type VovkStrictConfig } from 'vovk/internal';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 export declare function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, config, }: {
     schemaOutAbsolutePath: string;
     isNextInstalled: boolean;

package/dist/generate/{getProjectFullSchema.mjs → get-project-full-schema.mjs}

@@ -1,9 +1,9 @@
-import { readFile, access } from 'node:fs/promises';
+import { access, readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { glob } from 'glob';
-import { META_FILE_NAME, ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-import { getMetaSchema } from '../getProjectInfo/getMetaSchema.mjs';
 import { deepExtend, VovkSchemaIdEnum } from 'vovk/internal';
+import { META_FILE_NAME, ROOT_SEGMENT_FILE_NAME } from '../dev/write-one-segment-schema-file.mjs';
+import { getMetaSchema } from '../get-project-info/get-meta-schema.mjs';
 export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, config, }) {
     const result = {
         $schema: VovkSchemaIdEnum.SCHEMA,

package/dist/generate/{getTemplateClientImports.mjs → get-template-client-imports.mjs}

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { resolveGeneratorConfigValues } from 'vovk/internal';
-import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
+import { ROOT_SEGMENT_FILE_NAME } from '../dev/write-one-segment-schema-file.mjs';
 export function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir, segmentName, isBundle, outputConfigs, }) {
     const { imports: configImports } = resolveGeneratorConfigValues({
         config,
@@ -12,7 +12,7 @@ export function getTemplateClientImports({ config, fullSchema, outCwdRelativeDir
     const imports = {
         fetcher: configImports?.fetcher ?? 'vovk/fetcher',
         validateOnClient: configImports?.validateOnClient ?? null,
-        createRPC: configImports?.createRPC ?? 'vovk/createRPC',
+        createRPC: configImports?.createRPC ?? 'vovk/create-rpc',
     };
     const getImportPath = (p, s = '') => p.startsWith('.') ? path.relative(path.join(outCwdRelativeDir, s), p) : p;
     const clientImports = {

package/dist/generate/index.d.mts

@@ -1,6 +1,6 @@
 import type { VovkSchema } from 'vovk';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
 import type { GenerateOptions } from '../types.mjs';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
 export declare class VovkGenerate {
     #private;
     constructor({ cliGenerateOptions, projectInfo, forceNothingWrittenLog, }: {
@@ -8,7 +8,7 @@ export declare class VovkGenerate {
         projectInfo: ProjectInfo;
         forceNothingWrittenLog?: boolean;
     });
-    start(): void;
+    start(): Promise<void> | undefined;
     generate(): Promise<void>;
     getFullSchema(): Promise<VovkSchema>;
     watch({ throttleDelay }: {

package/dist/generate/index.mjs

@@ -1,9 +1,9 @@
 import path from 'node:path';
 import * as chokidar from 'chokidar';
-import { getProjectFullSchema } from './getProjectFullSchema.mjs';
+import { chalkHighlightThing } from '../utils/chalk-highlight-thing.mjs';
+import { locateSegments } from '../utils/locate-segments.mjs';
 import { generate } from './generate.mjs';
-import { locateSegments } from '../utils/locateSegments.mjs';
-import { chalkHighlightThing } from '../utils/chalkHighlightThing.mjs';
+import { getProjectFullSchema } from './get-project-full-schema.mjs';
 const THROTTLE_DELAY = 5000;
 export class VovkGenerate {
     #cliGenerateOptions;
@@ -19,10 +19,10 @@ export class VovkGenerate {
         if (watch) {
             const throttleDelay = typeof watch === 'boolean' ? THROTTLE_DELAY : parseFloat(watch) * 1e3 || THROTTLE_DELAY;
             this.watch({ throttleDelay });
+            return;
         }
-        else {
-            this.generate();
-        }
+        // return the promise so one-shot generate errors reach the CLI error handler
+        return this.generate();
     }
     async generate() {
         const fullSchema = await this.getFullSchema();
@@ -63,6 +63,17 @@ export class VovkGenerate {
     watchSchema({ schemaPath, throttleDelay }) {
         const { log } = this.#projectInfo;
         let lastGenerationTime = 0;
+        let pendingTimer = null;
+        const generateCode = async () => {
+            try {
+                lastGenerationTime = Date.now();
+                await this.generate();
+                log.debug(`Regenerated from schema changes`);
+            }
+            catch (error) {
+                log.error(`Failed to regenerate from schema: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        };
         chokidar
             .watch(schemaPath, {
             persistent: true,
@@ -72,20 +83,15 @@ export class VovkGenerate {
             if (event === 'change' || event === 'add' || event === 'ready' || event === 'unlink') {
                 log.debug(`Schema file ${event}: ${path}`);
                 const now = Date.now();
-                const shouldGenerateImmediately = now - lastGenerationTime > throttleDelay;
-                const generateCode = async () => {
-                    try {
-                        lastGenerationTime = Date.now();
-                        await this.generate();
-                        log.debug(`Regenerated from schema changes`);
-                    }
-                    catch (error) {
-                        log.error(`Failed to regenerate from schema: ${error instanceof Error ? error.message : String(error)}`);
-                    }
-                };
-                // Generate immediately if it's been a while since the last generation
-                if (shouldGenerateImmediately) {
-                    generateCode();
+                // generate immediately outside the throttle window, otherwise defer to the end of it
+                if (now - lastGenerationTime > throttleDelay) {
+                    void generateCode();
+                }
+                else if (!pendingTimer) {
+                    pendingTimer = setTimeout(() => {
+                        pendingTimer = null;
+                        void generateCode();
+                    }, throttleDelay - (now - lastGenerationTime));
                 }
             }
         });
@@ -111,6 +117,17 @@ export class VovkGenerate {
     watchOpenApiSpecLocal({ openApiSpecPaths, throttleDelay }) {
         const { log, cwd } = this.#projectInfo;
         let lastGenerationTime = 0;
+        let pendingTimer = null;
+        const generateCode = async () => {
+            try {
+                lastGenerationTime = Date.now();
+                await this.generate();
+                log.debug(`Regenerated from OpenAPI spec changes`);
+            }
+            catch (error) {
+                log.error(`Failed to regenerate from OpenAPI spec: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        };
         chokidar
             .watch(openApiSpecPaths, {
             cwd,
@@ -121,20 +138,15 @@ export class VovkGenerate {
             if (event === 'change' || event === 'add' || event === 'ready' || event === 'unlink') {
                 log.debug(`OpenAPI spec file changed: ${path}`);
                 const now = Date.now();
-                const shouldGenerateImmediately = now - lastGenerationTime > throttleDelay;
-                const generateCode = async () => {
-                    try {
-                        lastGenerationTime = Date.now();
-                        await this.generate();
-                        log.debug(`Regenerated from OpenAPI spec changes`);
-                    }
-                    catch (error) {
-                        log.error(`Failed to regenerate from OpenAPI spec: ${error instanceof Error ? error.message : String(error)}`);
-                    }
-                };
-                // Generate immediately if it's been a while since the last generation
-                if (shouldGenerateImmediately) {
-                    generateCode();
+                // generate immediately outside the throttle window, otherwise defer to the end of it
+                if (now - lastGenerationTime > throttleDelay) {
+                    void generateCode();
+                }
+                else if (!pendingTimer) {
+                    pendingTimer = setTimeout(() => {
+                        pendingTimer = null;
+                        void generateCode();
+                    }, throttleDelay - (now - lastGenerationTime));
                 }
             }
         });

package/dist/generate/{writeOneClientFile.d.mts → write-one-client-file.d.mts}

@@ -1,10 +1,10 @@
+import type { OpenAPIObject } from 'openapi3-ts/oas31';
+import type { PackageJson } from 'type-fest';
 import type { VovkSchema } from 'vovk';
 import { type VovkReadmeConfig, type VovkSamplesConfig, type VovkStrictConfig } from 'vovk/internal';
-import type { PackageJson } from 'type-fest';
-import type { OpenAPIObject } from 'openapi3-ts/oas31';
-import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
-import type { Segment } from '../utils/locateSegments.mjs';
+import type { ProjectInfo } from '../get-project-info/index.mjs';
+import type { Segment } from '../utils/locate-segments.mjs';
+import type { ClientTemplateFile } from './get-client-template-files.mjs';
 export declare function normalizeOutTemplatePath(out: string, packageJson: PackageJson): string;
 export declare function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, templateContent, matterResult: { data, content }, openAPIObject, package: packageJson, readme, samples, reExports, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, configKey, cliSchemaPath, projectConfig, }: {
     cwd: string;

package/dist/generate/{writeOneClientFile.mjs → write-one-client-file.mjs}

@@ -1,15 +1,16 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import TOML from '@iarna/toml';
 import ejs from 'ejs';
 import _ from 'lodash';
-import * as YAML from 'yaml';
-import TOML from '@iarna/toml';
 import { createCodeSamples, reattachMixinDefs, VovkSchemaIdEnum, } from 'vovk/internal';
-import { compileJSONSchemaToTypeScriptType } from '../utils/compileJSONSchemaToTypeScriptType.mjs';
-import { getTemplateClientImports } from './getTemplateClientImports.mjs';
-import { chalkHighlightThing } from '../utils/chalkHighlightThing.mjs';
-import { ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-import { prettify } from '../utils/prettify.mjs';
+import * as YAML from 'yaml';
+import { ROOT_SEGMENT_FILE_NAME } from '../dev/write-one-segment-schema-file.mjs';
+import { chalkHighlightThing } from '../utils/chalk-highlight-thing.mjs';
+import { compileJSONSchemaToTypeScriptType } from '../utils/compile-json-schema-to-typescript-type.mjs';
+import { GENERATED_BANNER_PREFIX } from '../utils/generated-banner.mjs';
+import { prettify, warnIfPrettierMissing } from '../utils/prettify.mjs';
+import { getTemplateClientImports } from './get-template-client-imports.mjs';
 export function normalizeOutTemplatePath(out, packageJson) {
     return out.replace('[package_name]', packageJson.name?.replace(/-/g, '_') ?? 'my_package_name');
 }
@@ -27,7 +28,7 @@ templateContent, matterResult: { data, content }, openAPIObject, package: packag
 // 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 = `Generated by vovk-cli v${vovkCliPackage.version} at ${new Date().toISOString()}`;
+        const text = `${GENERATED_BANNER_PREFIX} v${vovkCliPackage.version} at ${new Date().toISOString()}`;
         switch (type) {
             case 'html':
                 return `<!-- ${text} -->`;
@@ -130,6 +131,7 @@ templateContent, matterResult: { data, content }, openAPIObject, package: packag
         : templateContent;
     // Optionally prettify
     if (prettifyClient) {
+        await warnIfPrettierMissing(log);
         rendered = await prettify(rendered, outPath);
     }
     if (isEnsuringClient) {

package/dist/{getProjectInfo/getConfig/getRelativeSrcRoot.mjs → get-project-info/get-config/get-relative-src-root.mjs}

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { getFileSystemEntryType, FileSystemEntryType } from '../../utils/getFileSystemEntryType.mjs';
+import { FileSystemEntryType, getFileSystemEntryType } from '../../utils/get-file-system-entry-type.mjs';
 export async function getRelativeSrcRoot({ cwd }) {
     // Next.js Docs: src/app or src/pages will be ignored if app or pages are present in the root directory.
     if ((await getFileSystemEntryType(path.join(cwd, 'app'))) === FileSystemEntryType.DIRECTORY) {

package/dist/get-project-info/get-config/get-template-defs.d.mts

@@ -0,0 +1,22 @@
+import type { VovkStrictConfig } from 'vovk/internal';
+export declare const BuiltInTemplateName: {
+    readonly tsBase: "tsBase";
+    readonly ts: "ts";
+    readonly schemaTs: "schemaTs";
+    readonly schemaJson: "schemaJson";
+    readonly openapiTs: "openapiTs";
+    readonly openapiJson: "openapiJson";
+    readonly readme: "readme";
+    readonly packageJson: "packageJson";
+    readonly mixins: "mixins";
+    readonly rsSrc: "rsSrc";
+    readonly rsPkg: "rsPkg";
+    readonly rsReadme: "rsReadme";
+    readonly rs: "rs";
+    readonly pySrc: "pySrc";
+    readonly pyPkg: "pyPkg";
+    readonly pyReadme: "pyReadme";
+    readonly py: "py";
+};
+export type BuiltInTemplateName = (typeof BuiltInTemplateName)[keyof typeof BuiltInTemplateName];
+export declare function getTemplateDefs(userTemplateDefs?: VovkStrictConfig['clientTemplateDefs']): VovkStrictConfig['clientTemplateDefs'];

package/dist/{getProjectInfo/getConfig/getTemplateDefs.mjs → get-project-info/get-config/get-template-defs.mjs}

@@ -1,105 +1,79 @@
-export var BuiltInTemplateName;
-(function (BuiltInTemplateName) {
-    // ts/js
-    BuiltInTemplateName["tsBase"] = "tsBase";
-    BuiltInTemplateName["jsBase"] = "jsBase";
-    BuiltInTemplateName["ts"] = "ts";
-    BuiltInTemplateName["js"] = "js";
+// const object instead of enum, node 26 runs ts with erasable syntax only
+export const BuiltInTemplateName = {
+    // ts
+    tsBase: 'tsBase',
+    ts: 'ts',
     // schema
-    BuiltInTemplateName["schemaTs"] = "schemaTs";
-    BuiltInTemplateName["schemaJs"] = "schemaJs";
-    BuiltInTemplateName["schemaJson"] = "schemaJson";
+    schemaTs: 'schemaTs',
+    schemaJson: 'schemaJson',
     // openapi
-    BuiltInTemplateName["openapiTs"] = "openapiTs";
-    BuiltInTemplateName["openapiJs"] = "openapiJs";
-    BuiltInTemplateName["openapiJson"] = "openapiJson";
+    openapiTs: 'openapiTs',
+    openapiJson: 'openapiJson',
     // misc
-    BuiltInTemplateName["readme"] = "readme";
-    BuiltInTemplateName["packageJson"] = "packageJson";
-    BuiltInTemplateName["mixins"] = "mixins";
+    readme: 'readme',
+    packageJson: 'packageJson',
+    mixins: 'mixins',
     // other languages (packages installed separately)
-    BuiltInTemplateName["rsSrc"] = "rsSrc";
-    BuiltInTemplateName["rsPkg"] = "rsPkg";
-    BuiltInTemplateName["rsReadme"] = "rsReadme";
-    BuiltInTemplateName["rs"] = "rs";
-    BuiltInTemplateName["pySrc"] = "pySrc";
-    BuiltInTemplateName["pyPkg"] = "pyPkg";
-    BuiltInTemplateName["pyReadme"] = "pyReadme";
-    BuiltInTemplateName["py"] = "py";
-})(BuiltInTemplateName || (BuiltInTemplateName = {}));
+    rsSrc: 'rsSrc',
+    rsPkg: 'rsPkg',
+    rsReadme: 'rsReadme',
+    rs: 'rs',
+    pySrc: 'pySrc',
+    pyPkg: 'pyPkg',
+    pyReadme: 'pyReadme',
+    py: 'py',
+};
 export function getTemplateDefs(userTemplateDefs = {}) {
     const defs = {};
     const builtInDefs = {
         [BuiltInTemplateName.openapiTs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiTs}/`,
-            requires: {
-                [BuiltInTemplateName.openapiJson]: './',
-            },
-        },
-        [BuiltInTemplateName.openapiJs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiJs}/`,
+            templatePath: 'vovk-cli/client-templates/openapi-ts/',
             requires: {
                 [BuiltInTemplateName.openapiJson]: './',
             },
         },
         [BuiltInTemplateName.openapiJson]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.openapiJson}/`,
+            templatePath: 'vovk-cli/client-templates/openapi-json/',
         },
         [BuiltInTemplateName.tsBase]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.tsBase}/`,
+            templatePath: 'vovk-cli/client-templates/ts-base/',
             requires: {
                 [BuiltInTemplateName.schemaTs]: './',
                 [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
             },
         },
-        [BuiltInTemplateName.jsBase]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.jsBase}/`,
-            requires: {
-                [BuiltInTemplateName.schemaJs]: './',
-                [BuiltInTemplateName.mixins]: './', // used conditionally if OpenAPI mixins are used
-            },
-        },
         [BuiltInTemplateName.ts]: {
             requires: {
                 [BuiltInTemplateName.tsBase]: './',
                 [BuiltInTemplateName.openapiTs]: './',
             },
         },
-        [BuiltInTemplateName.js]: {
-            requires: {
-                [BuiltInTemplateName.jsBase]: './',
-                [BuiltInTemplateName.openapiJs]: './',
-            },
-        },
         [BuiltInTemplateName.schemaTs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaTs}/`,
-        },
-        [BuiltInTemplateName.schemaJs]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaJs}/`,
+            templatePath: 'vovk-cli/client-templates/schema-ts/',
         },
         [BuiltInTemplateName.schemaJson]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaJson}/`,
+            templatePath: 'vovk-cli/client-templates/schema-json/',
         },
         [BuiltInTemplateName.readme]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.readme}/`,
+            templatePath: 'vovk-cli/client-templates/readme/',
         },
         [BuiltInTemplateName.packageJson]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.packageJson}/`,
+            templatePath: 'vovk-cli/client-templates/package-json/',
         },
         [BuiltInTemplateName.mixins]: {
-            templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mixins}/`,
+            templatePath: 'vovk-cli/client-templates/mixins/',
         },
         [BuiltInTemplateName.rsSrc]: {
-            templatePath: `vovk-rust/client-templates/${BuiltInTemplateName.rsSrc}/`,
+            templatePath: 'vovk-rust/client-templates/rs-src/',
             requires: {
                 [BuiltInTemplateName.schemaJson]: './',
             },
         },
         [BuiltInTemplateName.rsPkg]: {
-            templatePath: `vovk-rust/client-templates/${BuiltInTemplateName.rsPkg}/`,
+            templatePath: 'vovk-rust/client-templates/rs-pkg/',
         },
         [BuiltInTemplateName.rsReadme]: {
-            templatePath: `vovk-rust/client-templates/${BuiltInTemplateName.rsReadme}/`,
+            templatePath: 'vovk-rust/client-templates/rs-readme/',
         },
         [BuiltInTemplateName.rs]: {
             composedClient: {
@@ -112,16 +86,16 @@ export function getTemplateDefs(userTemplateDefs = {}) {
             },
         },
         [BuiltInTemplateName.pySrc]: {
-            templatePath: `vovk-python/client-templates/${BuiltInTemplateName.pySrc}/`,
+            templatePath: 'vovk-python/client-templates/py-src/',
             requires: {
                 [BuiltInTemplateName.schemaJson]: './',
             },
         },
         [BuiltInTemplateName.pyPkg]: {
-            templatePath: `vovk-python/client-templates/${BuiltInTemplateName.pyPkg}/`,
+            templatePath: 'vovk-python/client-templates/py-pkg/',
         },
         [BuiltInTemplateName.pyReadme]: {
-            templatePath: `vovk-python/client-templates/${BuiltInTemplateName.pyReadme}/`,
+            templatePath: 'vovk-python/client-templates/py-readme/',
         },
         [BuiltInTemplateName.py]: {
             composedClient: {

package/dist/{getProjectInfo/getConfig/getUserConfig.mjs → get-project-info/get-config/get-user-config.mjs}

@@ -1,9 +1,9 @@
-import { pathToFileURL } from 'node:url';
 import { readFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
 import { dirname, extname } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import vm from 'node:vm';
-import { getConfigAbsolutePaths } from './getConfigAbsolutePaths.mjs';
+import { getConfigAbsolutePaths } from './get-config-absolute-paths.mjs';
 const isVMModulesEnabled = typeof vm.SourceTextModule !== 'undefined';
 export async function getUserConfig({ configPath: givenConfigPath, cwd, }) {
     const configAbsolutePaths = await getConfigAbsolutePaths({ configPath: givenConfigPath, cwd });

package/dist/{getProjectInfo/getConfig → get-project-info/get-config}/index.d.mts

@@ -1,7 +1,7 @@
+import type { LogLevelNames } from 'loglevel';
 import type { VovkConfig } from 'vovk';
 import { type VovkStrictConfig } from 'vovk/internal';
-import type { LogLevelNames } from 'loglevel';
-import { getLogger } from '../../utils/getLogger.mjs';
+import { getLogger } from '../../utils/get-logger.mjs';
 export declare function getConfig({ configPath, cwd, logLevel, }: {
     configPath?: string;
     cwd: string;

package/dist/{getProjectInfo/getConfig → get-project-info/get-config}/index.mjs

@@ -1,16 +1,20 @@
 import path from 'node:path';
 import { VovkSchemaIdEnum } from 'vovk/internal';
-import { getLogger } from '../../utils/getLogger.mjs';
-import { getUserConfig } from './getUserConfig.mjs';
-import { getRelativeSrcRoot } from './getRelativeSrcRoot.mjs';
-import { getTemplateDefs, BuiltInTemplateName } from './getTemplateDefs.mjs';
-import { normalizeOpenAPIMixin } from '../../utils/normalizeOpenAPIMixin.mjs';
-import { chalkHighlightThing } from '../../utils/chalkHighlightThing.mjs';
+import { chalkHighlightThing } from '../../utils/chalk-highlight-thing.mjs';
+import { getLogger } from '../../utils/get-logger.mjs';
+import { normalizeOpenAPIMixin } from '../../utils/normalize-openapi-mixin.mjs';
+import { getRelativeSrcRoot } from './get-relative-src-root.mjs';
+import { BuiltInTemplateName, getTemplateDefs } from './get-template-defs.mjs';
+import { getUserConfig } from './get-user-config.mjs';
 export async function getConfig({ configPath, cwd, logLevel, }) {
     const { configAbsolutePaths, error, userConfig } = await getUserConfig({
         configPath,
         cwd,
     });
+    // a config that exists but fails to load must not be silently replaced by defaults
+    if (!userConfig && configAbsolutePaths.length) {
+        throw new Error(`Failed to load config file at ${chalkHighlightThing(configAbsolutePaths[0])}. ${error?.message ?? 'Unknown error'}`);
+    }
     const conf = userConfig ?? {};
     logLevel = logLevel ?? conf.logLevel ?? 'info';
     const log = getLogger(logLevel);
@@ -24,9 +28,9 @@ export async function getConfig({ configPath, cwd, logLevel, }) {
         composedClient: {
             ...conf.composedClient,
             enabled: conf.composedClient?.enabled ?? true,
-            fromTemplates: conf.composedClient?.fromTemplates ?? [BuiltInTemplateName.js],
-            outDir: conf.composedClient?.outDir ?? './node_modules/.vovk-client',
-            prettifyClient: conf.composedClient?.prettifyClient ?? false,
+            fromTemplates: conf.composedClient?.fromTemplates ?? [BuiltInTemplateName.ts],
+            outDir: conf.composedClient?.outDir ?? path.join(srcRoot ?? '.', 'client'),
+            prettifyClient: conf.composedClient?.prettifyClient ?? true,
         },
         segmentedClient: {
             ...conf.segmentedClient,
@@ -45,9 +49,10 @@ export async function getConfig({ configPath, cwd, logLevel, }) {
             },
             outputConfig: {},
             build: conf.bundle?.build ??
-                (() => {
+                // isMissingBuild lets the bundle command fail fast before doing any work
+                Object.assign(() => {
                     throw new Error('No bundle.build function specified');
-                }),
+                }, { isMissingBuild: true }),
             ...conf.bundle,
         },
         modulesDir: conf.modulesDir ?? path.join(srcRoot ?? '.', 'modules'),
@@ -86,7 +91,7 @@ export async function getConfig({ configPath, cwd, logLevel, }) {
         config.exposeConfigKeys = conf.exposeConfigKeys;
     } // else it's false and exposeConfigKeys already is []
     if (!userConfig) {
-        log.warn(`Unable to load config at ${chalkHighlightThing(`${cwd}/`)}. Using default values. ${error ?? ''}`);
+        log.warn(`No config file found at ${chalkHighlightThing(`${cwd}/`)}. Using default values.`);
     }
     return { config, srcRoot, configAbsolutePaths, userConfig, log };
 }

package/dist/{getProjectInfo/getMetaSchema.d.mts → get-project-info/get-meta-schema.d.mts}

@@ -1,4 +1,4 @@
-import { type VovkStrictConfig, type VovkMetaSchema } from 'vovk/internal';
+import { type VovkMetaSchema, type VovkStrictConfig } from 'vovk/internal';
 export declare function getMetaSchema({ config }: {
     config: VovkStrictConfig;
 }): VovkMetaSchema;

package/dist/{getProjectInfo → get-project-info}/index.mjs

@@ -1,7 +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';
+import path from 'node:path';
+import { getPackageJson } from '../utils/get-package-json.mjs';
+import { getConfig } from './get-config/index.mjs';
 export async function getProjectInfo({ port: givenPort, cwd = process.cwd(), configPath, srcRootRequired = true, logLevel, } = {
     logLevel: 'info',
 }) {