vovk-cli 0.0.1-draft.203 → 0.0.1-draft.205

package/dist/bundle/index.mjs

@@ -34,6 +34,7 @@ export async function bundle({ projectInfo, fullSchema, cliBundleOptions, }) {
             composedOnly: true,
             composedIncludeSegments: cliBundleOptions.includeSegments ?? bundleConfig.includeSegments,
             composedExcludeSegments: cliBundleOptions.excludeSegments ?? bundleConfig.excludeSegments,
+            forceTsStandalone: cliBundleOptions.forceTsStandalone,
         },
     });
     await build({

package/dist/generate/generate.mjs

@@ -74,6 +74,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
             config,
             cwd,
             log,
+            isTsStandalone,
             cliGenerateOptions,
             configKey: 'composedClient',
         });
@@ -142,6 +143,7 @@ export async function generate({ isEnsuringClient = false, projectInfo, forceNot
             config,
             cwd,
             log,
+            isTsStandalone,
             cliGenerateOptions,
             configKey: 'segmentedClient',
         });

package/dist/generate/getClientTemplateFiles.d.mts

@@ -8,11 +8,12 @@ export interface ClientTemplateFile {
     outCwdRelativeDir: string;
     templateDef: VovkStrictConfig['clientTemplateDefs'][string];
 }
-export default function getClientTemplateFiles({ config, cwd, log, configKey, cliGenerateOptions, }: {
+export default function getClientTemplateFiles({ config, cwd, log, configKey, isTsStandalone, cliGenerateOptions, }: {
     config: VovkStrictConfig;
     cwd: string;
     log: ProjectInfo['log'];
     configKey: 'composedClient' | 'segmentedClient';
+    isTsStandalone: boolean;
     cliGenerateOptions?: GenerateOptions;
 }): Promise<{
     fromTemplates: string[];

package/dist/generate/getClientTemplateFiles.mjs

@@ -3,7 +3,8 @@ import { glob } from 'glob';
 import resolveAbsoluteModulePath from '../utils/resolveAbsoluteModulePath.mjs';
 import getFileSystemEntryType, { FileSystemEntryType } from '../utils/getFileSystemEntryType.mjs';
 import getPublicModuleNameFromPath from '../utils/getPublicModuleNameFromPath.mjs';
-export default async function getClientTemplateFiles({ config, cwd, log, configKey, cliGenerateOptions, }) {
+import { BuiltInTemplateName } from '../getProjectInfo/getConfig/getTemplateDefs.mjs';
+export default async function getClientTemplateFiles({ config, cwd, log, configKey, isTsStandalone, cliGenerateOptions, }) {
     const usedTemplateDefs = {};
     const fromTemplates = configKey === 'composedClient'
         ? cliGenerateOptions?.composedFrom || cliGenerateOptions?.segmentedFrom
@@ -18,7 +19,17 @@ export default async function getClientTemplateFiles({ config, cwd, log, configK
         if (!(templateName in config.clientTemplateDefs)) {
             throw new Error(`Unknown template name: ${templateName}`);
         }
-        usedTemplateDefs[templateName] = config.clientTemplateDefs[templateName];
+        let usedDef = config.clientTemplateDefs[templateName];
+        if (usedDef.isTsClient && isTsStandalone) {
+            usedDef = {
+                ...usedDef,
+                requires: {
+                    ...usedDef.requires,
+                    [BuiltInTemplateName.standaloneTypesTs]: '.',
+                },
+            };
+        }
+        usedTemplateDefs[templateName] = usedDef;
     }
     const templateFiles = [];
     const entries = Object.entries(usedTemplateDefs);

package/dist/getProjectInfo/getConfig/getTemplateDefs.mjs

@@ -23,14 +23,17 @@ export default function getTemplateDefs(userTemplateDefs = {}) {
         [BuiltInTemplateName.ts]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.ts}/`,
             requires: { [BuiltInTemplateName.schemaTs]: '.' },
+            isTsClient: true,
         },
         [BuiltInTemplateName.cjs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.cjs}/`,
             requires: { [BuiltInTemplateName.schemaCjs]: '.' },
+            isTsClient: true,
         },
         [BuiltInTemplateName.mjs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.mjs}/`,
             requires: { [BuiltInTemplateName.schemaCjs]: '.' },
+            isTsClient: true,
         },
         [BuiltInTemplateName.schemaTs]: {
             templatePath: `vovk-cli/client-templates/${BuiltInTemplateName.schemaTs}/`,

package/dist/index.mjs

@@ -112,6 +112,7 @@ program
     .option('--schema <path>', 'path to schema folder (default: .vovk-schema)')
     .option('--sourcemap', 'generate sourcemaps')
     .option('--openapi, --openapi-spec <openapi_path_or_url>', 'use OpenAPI schema instead of Vovk schema')
+    .option('--force-ts-standalone', 'force TypeScript standalone mode (Next.js environment will be ignored, by default it\'s "true" for non-Next.js directories)')
     .action(async (cliBundleOptions) => {
     const projectInfo = await getProjectInfo({ configPath: cliBundleOptions.config, srcRootRequired: false });
     const { cwd, config, log } = projectInfo;

package/dist/types.d.mts

@@ -34,6 +34,7 @@ export interface BundleOptions extends Partial<Omit<VovkStrictConfig['bundle'],
     config?: string;
     schema?: string;
     openapiSpec?: string;
+    forceTsStandalone?: boolean;
 }
 export interface InitOptions {
     yes?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk-cli",
-  "version": "0.0.1-draft.203",
+  "version": "0.0.1-draft.205",
   "bin": {
     "vovk": "./dist/index.mjs"
   },
@@ -35,7 +35,7 @@
   },
   "homepage": "https://vovk.dev",
   "peerDependencies": {
-    "vovk": "^3.0.0-draft.181"
+    "vovk": "^3.0.0-draft.184"
   },
   "optionalDependencies": {
     "vovk-python-client": "^0.0.1-draft.37"