vovk-cli 0.0.1-draft.326 → 0.0.1-draft.327

package/dist/bundle/index.mjs

@@ -30,6 +30,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
         package: bundleConfig.package,
         readme: bundleConfig.readme,
         cliGenerateOptions: {
+            origin: cliBundleOptions?.origin ?? bundleConfig.origin,
             openapiSpec: cliBundleOptions?.openapiSpec,
             openapiGetModuleName: cliBundleOptions?.openapiGetModuleName,
             openapiGetMethodName: cliBundleOptions?.openapiGetMethodName,

package/dist/generate/generate.mjs

@@ -173,6 +173,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                 isVovkProject,
                 vovkCliPackage,
                 isBundle,
+                origin: cliGenerateOptions?.origin ?? templateDef.origin ?? config.origin,
             });
             const outAbsoluteDir = path.resolve(cwd, outCwdRelativeDir);
             return {
@@ -258,6 +259,7 @@ export async function generate({ isEnsuringClient = false, isBundle = false, pro
                     isVovkProject,
                     vovkCliPackage,
                     isBundle,
+                    origin: cliGenerateOptions?.origin ?? templateDef.origin ?? config.origin,
                 });
                 return {
                     written,

package/dist/generate/writeOneClientFile.d.mts

@@ -5,7 +5,7 @@ import type { ClientTemplateFile } from './getClientTemplateFiles.mjs';
 import type { ClientImports } from './getTemplateClientImports.mjs';
 import type { Segment } from '../locateSegments.mjs';
 export declare function normalizeOutTemplatePath(out: string, packageJson: PackageJson): string;
-export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, }: {
+export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }: {
     cwd: string;
     projectInfo: ProjectInfo;
     clientTemplateFile: ClientTemplateFile;
@@ -31,6 +31,7 @@ export default function writeOneClientFile({ cwd, projectInfo, clientTemplateFil
     isVovkProject: boolean;
     vovkCliPackage: PackageJson;
     isBundle: boolean;
+    origin: string | null;
 }): Promise<{
     written: boolean;
 }>;

package/dist/generate/writeOneClientFile.mjs

@@ -11,9 +11,8 @@ import { compileJSONSchemaToTypeScriptType } from '../utils/compileJSONSchemaToT
 export function normalizeOutTemplatePath(out, packageJson) {
     return out.replace('[package_name]', packageJson.name?.replace(/-/g, '_') ?? 'my_package_name');
 }
-export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, }) {
+export default async function writeOneClientFile({ cwd, projectInfo, clientTemplateFile, fullSchema, prettifyClient, segmentName, imports, templateContent, matterResult: { data, content }, package: packageJson, readme, isEnsuringClient, outCwdRelativeDir, templateDef, locatedSegments, isNodeNextResolution, hasMixins, isVovkProject, vovkCliPackage, isBundle, origin, }) {
     const { config, apiRoot } = projectInfo;
-    const origin = templateDef?.origin ?? config.origin ?? null;
     const { templateFilePath, relativeDir } = clientTemplateFile;
     const locatedSegmentsByName = _.keyBy(locatedSegments, 'segmentName');
     const outPath = normalizeOutTemplatePath(path.resolve(cwd, outCwdRelativeDir, typeof segmentName === 'string' ? segmentName || ROOT_SEGMENT_FILE_NAME : '', relativeDir, path.basename(templateFilePath).replace('.ejs', '')), packageJson);

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

@@ -56,6 +56,7 @@ export default function getConfig({ configPath, cwd }: {
             requires?: Record<string, string>;
             tsClientOutDir?: string;
             dontDeleteTsClientOutDirAfter?: boolean;
+            origin?: string;
             package?: import("type-fest").PackageJson;
             readme?: {
                 banner?: string;

package/dist/getProjectInfo/getConfig/index.mjs

@@ -43,6 +43,7 @@ export default async function getConfig({ configPath, cwd }) {
             outDir: conf.segmentedClient?.outDir ?? path.join(srcRoot ?? '.', 'client'),
         },
         bundle: {
+            origin: conf.bundle?.origin,
             tsClientOutDir: conf.bundle?.tsClientOutDir ?? 'tmp_prebundle',
             dontDeleteTsClientOutDirAfter: conf.bundle?.dontDeleteTsClientOutDirAfter ?? false,
             requires: {

package/dist/types.d.mts

@@ -17,6 +17,7 @@ export interface GenerateOptions {
     prettify?: boolean;
     configPath?: string;
     schemaPath?: string;
+    origin?: string;
     openapiSpec?: string[];
     openapiGetModuleName?: string[];
     openapiGetMethodName?: string[];
@@ -39,6 +40,7 @@ export interface BundleOptions extends Partial<Pick<VovkStrictConfig['bundle'],
     config?: string;
     schema?: string;
     outDir?: string;
+    origin?: string;
     openapiSpec?: string[];
     openapiGetModuleName?: string[];
     openapiGetMethodName?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.326",
+  "version": "0.0.1-draft.327",
   "bin": {
     "vovk": "./dist/index.mjs"
   },