vovk-cli 0.0.1-draft.395 → 0.0.1-draft.397

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

@@ -9,7 +9,7 @@ import segment<%= i %> from './<%= t.schemaOutDir %>/<%= segment.segmentName ||
 <% if(t.isVovkProject) { %>
 import meta from './<%= t.schemaOutDir %>/_meta.json' with { type: "json" };
 <% } else { %>
-const meta = <%- JSON.stringify(t.publicMeta, null, 2) %>;
+const meta = <%- JSON.stringify(t.schema.meta, null, 2) %>;
 <% } %>
 const segments = {<% Object.values(t.schema.segments).filter((segment) => segment.emitSchema && segment.segmentType !== 'mixin').forEach((segment, i) => { %>
   '<%= segment.segmentName %>': segment<%= i %>,<% }) %>

package/dist/dev/index.mjs

@@ -285,7 +285,6 @@ export class VovkDev {
             segments: this.#schemaSegments,
             meta: getMetaSchema({
                 config: this.#projectInfo.config,
-                useexposeConfigKeys: false,
             }),
         };
         return generate({

package/dist/dev/writeMetaJson.mjs

@@ -7,7 +7,6 @@ export default async function writeMetaJson(schemaOutAbsolutePath, projectInfo)
     const metaJsonPath = path.join(schemaOutAbsolutePath, META_FILE_NAME + '.json');
     const metaStr = JSON.stringify(getMetaSchema({
         config: projectInfo.config,
-        useexposeConfigKeys: true,
     }), null, 2);
     const existingStr = await fs.readFile(metaJsonPath, 'utf-8').catch(() => null);
     if (existingStr !== metaStr) {

package/dist/generate/ensureClient.mjs

@@ -21,7 +21,7 @@ export default async function ensureClient(projectInfo, locatedSegments) {
         fullSchema: {
             $schema: VovkSchemaIdEnum.SCHEMA,
             segments: getEmptySegmentRecordSchema(locatedSegments.map(({ segmentName }) => segmentName)),
-            meta: getMetaSchema({ config: projectInfo.config, useexposeConfigKeys: false }),
+            meta: getMetaSchema({ config: projectInfo.config }),
         },
         locatedSegments,
     });

package/dist/generate/generate.mjs

@@ -146,7 +146,11 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 config: projectInfo.config,
                 rootEntry: config.rootEntry,
                 schema: fullSchema,
-                outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
+                outputConfigs: [
+                    config.composedClient.outputConfig ?? {},
+                    templateDef.outputConfig ?? {},
+                    { origin: cliGenerateOptions?.origin },
+                ],
                 projectPackageJson,
                 isBundle,
                 segmentName: null,
@@ -234,7 +238,11 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     schema: fullSchema,
                     rootEntry: config.rootEntry,
                     segmentName,
-                    outputConfigs: [templateDef.outputConfig ?? {}, { origin: cliGenerateOptions?.origin }],
+                    outputConfigs: [
+                        config.segmentedClient.outputConfig ?? {},
+                        templateDef.outputConfig ?? {},
+                        { origin: cliGenerateOptions?.origin },
+                    ],
                     isBundle,
                     projectPackageJson,
                 });

package/dist/generate/getProjectFullSchema.mjs

@@ -11,7 +11,6 @@ export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstal
         segments: {},
         meta: getMetaSchema({
             config,
-            useexposeConfigKeys: false,
         }),
     };
     const isEmptyLogOrWarn = isNextInstalled ? log.warn : log.debug;

package/dist/generate/writeOneClientFile.mjs

@@ -9,7 +9,6 @@ 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');
 }
@@ -61,7 +60,6 @@ templateContent, matterResult: { data, content }, openAPIObject, package: packag
         YAML,
         TOML,
         getFirstLineBanner,
-        publicMeta: getMetaSchema({ config: projectConfig, useexposeConfigKeys: true }),
         nodeNextResolutionExt: {
             ts: isNodeNextResolution ? '.ts' : '',
             js: isNodeNextResolution ? '.js' : '',

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

@@ -25,6 +25,11 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             outDir?: string;
             fromTemplates?: string[];
             prettifyClient?: boolean;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -37,6 +42,11 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             outDir?: string;
             fromTemplates?: string[];
             prettifyClient?: boolean;
+            outputConfig?: import("vovk").VovkOutputConfig<{
+                fetcher?: string | [string, string] | [string];
+                validateOnClient?: string | [string, string] | [string] | null;
+                createRPC?: string | [string, string] | [string];
+            }>;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];

package/dist/getProjectInfo/getConfig/index.mjs

@@ -86,7 +86,7 @@ export default 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(`Unable to load config at ${chalkHighlightThing(cwd + '/')}. Using default values. ${error ?? ''}`);
     }
     return { config, srcRoot, configAbsolutePaths, userConfig, log };
 }

package/dist/getProjectInfo/getMetaSchema.d.mts

@@ -1,7 +1,6 @@
 import { VovkSchemaIdEnum, type VovkStrictConfig } from 'vovk';
-export default function getMetaSchema({ config, useexposeConfigKeys, }: {
+export default function getMetaSchema({ config }: {
     config: VovkStrictConfig;
-    useexposeConfigKeys: boolean;
 }): {
     config: VovkStrictConfig;
     $schema: VovkSchemaIdEnum;

package/dist/getProjectInfo/getMetaSchema.mjs

@@ -2,26 +2,24 @@ import { VovkSchemaIdEnum } from 'vovk';
 import pick from 'lodash/pick.js';
 import mapValues from 'lodash/mapValues.js';
 import omit from 'lodash/omit.js';
-export default function getMetaSchema({ config, useexposeConfigKeys, }) {
+export default function getMetaSchema({ config }) {
     return {
         $schema: VovkSchemaIdEnum.META,
         ...{
-            config: useexposeConfigKeys
-                ? (config
-                    ? pick({
-                        ...config,
-                        outputConfig: config.outputConfig
-                            ? {
-                                ...config.outputConfig,
-                                // TODO: Dirty fix! Need to think of a better way to avoid emission of mixins.
-                                segments: config.outputConfig.segments
-                                    ? mapValues(config.outputConfig.segments, (segment) => omit(segment, ['openAPIMixin']))
-                                    : undefined,
-                            }
-                            : undefined,
-                    }, [...config.exposeConfigKeys, '$schema'])
-                    : {})
-                : config,
+            config: (config
+                ? pick({
+                    ...config,
+                    outputConfig: config.outputConfig
+                        ? {
+                            ...config.outputConfig,
+                            // TODO: Dirty fix! Need to think of a better way to avoid emission of mixins.
+                            segments: config.outputConfig.segments
+                                ? mapValues(config.outputConfig.segments, (segment) => omit(segment, ['openAPIMixin']))
+                                : undefined,
+                        }
+                        : undefined,
+                }, [...config.exposeConfigKeys, '$schema'])
+                : {}),
         },
     };
 }

package/dist/utils/getPackageJson.mjs

@@ -1,5 +1,6 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import chalkHighlightThing from './chalkHighlightThing.mjs';
 let cachedPromise;
 export function getPackageJson(cwd, log) {
     const pkgPath = path.join(cwd, 'package.json');
@@ -12,7 +13,7 @@ export function getPackageJson(cwd, log) {
         .then((content) => JSON.parse(content))
         .catch(() => {
         cachedPromise = undefined;
-        log.warn(`Failed to read package.json at ${pkgPath}. Using a fallback.`);
+        log.warn(`Unable to load package.json at ${chalkHighlightThing(pkgPath)}. Using an empty fallback.`);
         return {
             name: 'unknown',
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.395",
+  "version": "0.0.1-draft.397",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.471",
+    "vovk": "^3.0.0-draft.473",
     "vovk-ajv": "^0.0.0-draft.113",
     "vovk-client": "^0.0.4-draft.140",
     "vovk-python": "^0.0.1-draft.82",