vovk-cli 0.0.1-draft.297 → 0.0.1-draft.299

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

@@ -5,7 +5,7 @@ const { schema } = require('./schema.cjs');
 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(([reExportWhat, reExportFrom]) => { %>
-exports[<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>] = require('<%= reExportFrom %>')[<%= reExportWhat.split(/\s+as\s+/)[0] %>];
+exports['<%= reExportWhat.split(/\s+as\s+/)[1] ?? reExportWhat %>'] = require('<%= reExportFrom %>')['<%= reExportWhat.split(/\s+as\s+/)[0] %>'];
   <% }) %>
   <% Object.keys(segment.controllers).forEach((rpcModuleName) => { %>
 exports.<%= rpcModuleName %> = createRPC(

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

@@ -22,7 +22,8 @@ npm install <%= t.package.name %>
 
 <%- handlerSchema.openapi?.description ? `${handlerSchema.openapi.description}` : '' %>
 
-`<%= handlerSchema.httpMethod %> <%= [t.apiRoot, segmentName, controllerSchema.prefix, handlerSchema.path].filter(Boolean).join('/') %>`
+<% const forceApiRoot = t.segmentMeta[segment.segmentName].forceApiRoot ?? controllerSchema.forceApiRoot; %>
+`<%= handlerSchema.httpMethod %> <%= [...(forceApiRoot ? [forceApiRoot] : [t.apiRoot, segmentName]), controllerSchema.prefix, handlerSchema.path].map((part, i) => i > 0 ? t._.trim(part, '/') : part).filter(Boolean).join('/') %>`
 
 ```ts
 <%- t.createCodeExamples({

package/dist/generate/generate.mjs

@@ -221,12 +221,15 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
                     log,
                     rootPackageJson,
                     packages: [
+                        fullSchema.segments[segmentName]?.meta?.package,
                         config.segmentedClient.packages?.[segmentName],
                         templateDef.segmentedClient?.packages?.[segmentName],
                         argPackageJson,
                     ],
                 });
-                const readme = Object.assign({}, config.segmentedClient.readmes?.[segmentName], templateDef.segmentedClient?.readmes?.[segmentName], argReadme);
+                const readme = Object.assign({}, 
+                // TODO fullSchema.segments[segmentName]?.meta?.readme,
+                config.segmentedClient.readmes?.[segmentName], templateDef.segmentedClient?.readmes?.[segmentName], argReadme);
                 const segmentedFullSchema = pickSegmentFullSchema(fullSchema, [segmentName]);
                 const hasMixins = Object.values(segmentedFullSchema.segments).some((segment) => segment.segmentType === 'mixin');
                 if (templateName === BuiltInTemplateName.mixins && !hasMixins) {

package/dist/generate/getProjectFullSchema.d.mts

@@ -1,3 +1,7 @@
 import { type VovkSchema } from 'vovk';
 import type { ProjectInfo } from '../getProjectInfo/index.mjs';
-export declare function getProjectFullSchema(schemaOutAbsolutePath: string, log: ProjectInfo['log']): Promise<VovkSchema>;
+export declare function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, }: {
+    schemaOutAbsolutePath: string;
+    isNextInstalled: boolean;
+    log: ProjectInfo['log'];
+}): Promise<VovkSchema>;

package/dist/generate/getProjectFullSchema.mjs

@@ -3,7 +3,7 @@ import path from 'node:path';
 import { glob } from 'glob';
 import { VovkSchemaIdEnum } from 'vovk';
 import { META_FILE_NAME, ROOT_SEGMENT_FILE_NAME } from '../dev/writeOneSegmentSchemaFile.mjs';
-export async function getProjectFullSchema(schemaOutAbsolutePath, log) {
+export async function getProjectFullSchema({ schemaOutAbsolutePath, isNextInstalled, log, }) {
     const result = {
         $schema: VovkSchemaIdEnum.SCHEMA,
         segments: {},
@@ -14,6 +14,7 @@ export async function getProjectFullSchema(schemaOutAbsolutePath, log) {
             },
         },
     };
+    const isEmptyLogOrWarn = isNextInstalled ? log.warn : log.debug;
     // Handle config.json
     const metaPath = path.join(schemaOutAbsolutePath, `${META_FILE_NAME}.json`);
     try {
@@ -21,7 +22,7 @@ export async function getProjectFullSchema(schemaOutAbsolutePath, log) {
         result.meta = JSON.parse(metaContent);
     }
     catch {
-        log.warn(`${META_FILE_NAME}.json not found at ${metaPath}. Using empty meta as fallback.`);
+        isEmptyLogOrWarn(`${META_FILE_NAME}.json not found at ${metaPath}. Using empty meta as fallback.`);
     }
     // Handle segments directory
     const segmentsDir = path.join(schemaOutAbsolutePath);
@@ -57,7 +58,7 @@ export async function getProjectFullSchema(schemaOutAbsolutePath, log) {
         }
     }
     catch {
-        log.warn(`Segments directory not found at ${segmentsDir}. Using empty segments as fallback.`);
+        isEmptyLogOrWarn(`Segments directory not found at ${segmentsDir}. Using empty segments as fallback.`);
         result.segments = {};
     }
     return result;

package/dist/generate/index.mjs

@@ -37,9 +37,13 @@ export class VovkGenerate {
         });
     }
     async getFullSchema() {
-        const { log, config, cwd } = this.#projectInfo;
+        const { log, config, cwd, isNextInstalled } = this.#projectInfo;
         const { schemaPath } = this.#cliGenerateOptions;
-        const fullSchema = await getProjectFullSchema(path.resolve(cwd, schemaPath ?? config.schemaOutDir), log);
+        const fullSchema = await getProjectFullSchema({
+            schemaOutAbsolutePath: path.resolve(cwd, schemaPath ?? config.schemaOutDir),
+            isNextInstalled,
+            log,
+        });
         return fullSchema;
     }
     watch({ throttleDelay }) {

package/dist/getProjectInfo/index.d.mts

@@ -15,6 +15,7 @@ export default function getProjectInfo({ port: givenPort, cwd, configPath, srcRo
     };
     config: import("vovk").VovkStrictConfig;
     packageJson: import("type-fest").PackageJson;
+    isNextInstalled: boolean;
     log: {
         info: (msg: string) => void;
         warn: (msg: string) => void;

package/dist/getProjectInfo/index.mjs

@@ -11,6 +11,7 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
         cwd,
     });
     const packageJson = await getPackageJson(cwd, log);
+    const isNextInstalled = !!packageJson?.dependencies?.next || !!packageJson?.devDependencies?.next;
     if (srcRootRequired && !srcRoot) {
         throw new Error(`Could not find app router directory at ${cwd}. Check Next.js docs for more info.`);
     }
@@ -29,6 +30,7 @@ export default async function getProjectInfo({ port: givenPort, cwd = process.cw
         vovkCliPackage,
         config,
         packageJson,
+        isNextInstalled,
         log,
     };
 }

package/dist/index.mjs

@@ -121,8 +121,12 @@ program
     .option('--openapi-root-url <urls...>', 'root URLs corresponding to the index of --openapi option')
     .action(async (cliBundleOptions) => {
     const projectInfo = await getProjectInfo({ configPath: cliBundleOptions.config, srcRootRequired: false });
-    const { cwd, config, log } = projectInfo;
-    const fullSchema = await getProjectFullSchema(path.resolve(cwd, cliBundleOptions?.schema ?? config.schemaOutDir), log);
+    const { cwd, config, log, isNextInstalled } = projectInfo;
+    const fullSchema = await getProjectFullSchema({
+        schemaOutAbsolutePath: path.resolve(cwd, cliBundleOptions?.schema ?? config.schemaOutDir),
+        log,
+        isNextInstalled,
+    });
     await bundle({
         projectInfo,
         fullSchema,

package/dist/utils/normalizeOpenAPIMixins.mjs

@@ -37,7 +37,7 @@ async function getOpenApiSpecRemote({ cwd, url, fallback, log, }) {
 }
 export async function normalizeOpenAPIMixins({ mixinModules, log, cwd = process.cwd(), }) {
     if (mixinModules) {
-        const modules = await Promise.all(Object.entries(mixinModules).map(async ([mixinName, { source, apiRoot, getModuleName, getMethodName, errorMessageKey }]) => {
+        const modules = await Promise.all(Object.entries(mixinModules).map(async ([mixinName, { source, apiRoot, getModuleName, getMethodName, errorMessageKey, package: packageJson },]) => {
             let openAPIObject;
             if ('url' in source) {
                 openAPIObject = await getOpenApiSpecRemote({ url: source.url, fallback: source.fallback, log, cwd });
@@ -57,6 +57,7 @@ export async function normalizeOpenAPIMixins({ mixinModules, log, cwd = process.
                 getModuleName,
                 getMethodName,
                 errorMessageKey,
+                package: packageJson,
                 mixinName,
             };
         }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.297",
+  "version": "0.0.1-draft.299",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.323"
+    "vovk": "^3.0.0-draft.324"
   },
   "optionalDependencies": {
     "vovk-python": "^0.0.1-draft.53"