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

package/dist/generate/generate.mjs

@@ -95,7 +95,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             .map((segment) => ({ ...segment }))),
     };
     const { config, cwd, log, srcRoot, vovkCliPackage } = projectInfo;
-    Object.entries(config.projectConfig.segments ?? {}).forEach(([segmentName, segmentConfig]) => {
+    Object.entries(config.generatorConfig.segments ?? {}).forEach(([segmentName, segmentConfig]) => {
         fullSchema.segments = {
             ...fullSchema.segments,
             [segmentName]: {
@@ -147,7 +147,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             });
             const { package: packageJson, readme, origin, snippets, } = getGeneratorConfig({
                 schema: fullSchema,
-                config: templateDef.projectConfig,
+                config: templateDef.generatorConfig,
                 isBundle,
             });
             const composedFullSchema = pickSegmentFullSchema(fullSchema, segmentNames);
@@ -226,7 +226,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
             const results = await Promise.all(segmentNames.map(async (segmentName) => {
                 const { package: packageJson, readme, origin, snippets, } = getGeneratorConfig({
                     schema: fullSchema,
-                    config: templateDef.projectConfig,
+                    config: templateDef.generatorConfig,
                     segmentName,
                     isBundle,
                 });

package/dist/generate/getClientTemplateFiles.mjs

@@ -73,7 +73,7 @@ export default async function getClientTemplateFiles({ config, cwd, log, configK
                 }
                 def = {
                     ...def,
-                    projectConfig: merge({}, templateDef?.projectConfig, def.projectConfig),
+                    generatorConfig: merge({}, templateDef?.generatorConfig, def.generatorConfig),
                     composedClient: merge(omit(templateDef?.composedClient ?? {}, ['outDir']), def.composedClient),
                     segmentedClient: merge(omit(templateDef?.segmentedClient ?? {}, ['outDir']), def.segmentedClient),
                 };

package/dist/generate/getProjectFullSchema.mjs

@@ -13,7 +13,6 @@ export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstal
             package: packageJson,
         }),
     };
-    console.log('result', result);
     const isEmptyLogOrWarn = isNextInstalled ? log.warn : log.debug;
     // Handle config.json
     const metaPath = path.join(schemaOutAbsolutePath, `${META_FILE_NAME}.json`);

package/dist/generate/writeOneClientFile.mjs

@@ -66,13 +66,13 @@ locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage,
                 ? path.relative(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '.'), path.resolve(cwd, routeFilePath))
                 : null;
             const segmentConfig = {
-                ...config.projectConfig.segments?.[sName],
-                // ...templateDef.projectConfig?.segments?.[sName],
+                ...config.generatorConfig.segments?.[sName],
+                // ...templateDef.generatorConfig?.segments?.[sName],
             };
             const { origin: segmentConfigOrigin, rootEntry: segmentConfigRootEntry, segmentNameOverride } = segmentConfig;
             const reExports = {
                 ...segmentConfig.reExports,
-                ...(isBundle ? projectInfo.config.projectConfig?.bundle?.reExports : {}),
+                ...(isBundle ? projectInfo.config.bundle.generatorConfig?.reExports : {}),
             };
             return [
                 sName,

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -129,9 +129,9 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
                         ...builtIn.segmentedClient,
                         ...templateDef.segmentedClient,
                     },
-                    projectConfig: {
-                        ...builtIn.projectConfig,
-                        ...templateDef.projectConfig,
+                    generatorConfig: {
+                        ...builtIn.generatorConfig,
+                        ...templateDef.generatorConfig,
                     },
                     // 'requires' and other props will be overridden
                 };

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

@@ -49,6 +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;
         } & ({
             excludeSegments?: never;
             includeSegments?: string[];
@@ -68,7 +69,7 @@ export default function getConfig({ configPath, cwd, logLevel, }: {
             controller?: string;
             [key: string]: string | undefined;
         };
-        projectConfig?: import("vovk").VovkProjectConfig;
+        generatorConfig?: import("vovk").VovkGeneratorConfig;
     } | null;
     log: {
         info: (msg: string) => void;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -52,6 +52,7 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
                 [BuiltInTemplateName.readme]: '.',
                 [BuiltInTemplateName.packageJson]: '.',
             },
+            generatorConfig: {},
             ...conf.bundle,
             tsdownBuildOptions: {
                 outDir: conf.bundle?.tsdownBuildOptions?.outDir ?? 'dist',
@@ -70,10 +71,10 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
             ...conf.moduleTemplates,
         },
         libs: conf.libs ?? {},
-        projectConfig: {
-            ...conf.projectConfig,
-            origin: (env.VOVK_ORIGIN ?? conf?.projectConfig?.origin ?? '').replace(/\/$/, ''), // Remove trailing slash
-            segments: Object.fromEntries(await Promise.all(Object.entries(conf.projectConfig?.segments ?? {}).map(async ([key, value]) => [
+        generatorConfig: {
+            ...conf.generatorConfig,
+            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,
                 {
                     ...value,
@@ -85,7 +86,7 @@ export default async function getConfig({ configPath, cwd, logLevel, }) {
         },
     };
     if (typeof conf.emitConfig === 'undefined') {
-        config.emitConfig = ['libs', 'projectConfig'];
+        config.emitConfig = ['libs', 'generatorConfig'];
     }
     else if (conf.emitConfig === true) {
         config.emitConfig = Object.keys(config);

package/dist/getProjectInfo/index.mjs

@@ -18,7 +18,7 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
     if (srcRootRequired && !srcRoot) {
         throw new Error(`Could not find app router directory at ${cwd}. Check Next.js docs for more info.`);
     }
-    const apiRoot = `${config.projectConfig.origin ?? ''}/${config.rootEntry}`;
+    const apiRoot = `${config.generatorConfig.origin ?? ''}/${config.rootEntry}`;
     const apiDirAbsolutePath = srcRoot ? path.resolve(cwd, srcRoot, 'app', config.rootEntry) : null;
     if (configAbsolutePaths.length > 1) {
         log.warn(`Multiple config files found. Using the first one: ${configAbsolutePaths[0]}`);

package/dist/types.d.mts

@@ -1,4 +1,5 @@
 import type { LogLevelNames } from 'loglevel';
+import type { build } from 'tsdown';
 import type { VovkStrictConfig } from 'vovk';
 export type VovkModuleRenderResult = {
     fileName: string;
@@ -89,3 +90,6 @@ export type VovkEnv = {
     __VOVK_EXIT__?: 'true' | 'false';
     __VOVK_LOG_LEVEL__?: LogLevelNames;
 };
+declare global {
+    var TSdownBuildOptions: Parameters<typeof build>[0];
+}

package/dist/utils/normalizeOpenAPIMixin.d.mts

@@ -8,7 +8,7 @@ export type GetOpenAPINameFn = (config: {
     openAPIObject: OpenAPIObject;
 }) => string;
 export declare function normalizeOpenAPIMixin({ mixinModule, log, cwd, }: {
-    mixinModule: NonNullable<NonNullable<NonNullable<NonNullable<VovkConfig['projectConfig']>['segments']>[string]>['openAPIMixin']>;
+    mixinModule: NonNullable<NonNullable<NonNullable<NonNullable<VovkConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>;
     log: ProjectInfo['log'];
     cwd?: string;
-}): Promise<NonNullable<NonNullable<NonNullable<VovkStrictConfig['projectConfig']>['segments']>[string]>['openAPIMixin']>;
+}): Promise<NonNullable<NonNullable<NonNullable<VovkStrictConfig['generatorConfig']>['segments']>[string]>['openAPIMixin']>;

package/package.json

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