zova-cli-set-front 1.2.93 → 1.2.95

package/dist/index.js

@@ -252,14 +252,20 @@ class CliBinBuildRest extends BeanCliBase {
     // Modules
     const modules = [];
     const bundleModules = [];
+    const sideEffectImportModuleNames = [];
     for (const module of modulesMeta.modulesArray) {
-      modules.push(`export * from '${module.info.fullName}';`);
+      const moduleName = module.info.fullName;
+      modules.push(`import '${moduleName}';`);
+      modules.push(`export * from '${moduleName}';`);
       const moduleRoot = module.root.replaceAll('\\', '/');
       if (moduleRoot.includes('/src/module/') || moduleRoot.includes('/src/suite/')) {
-        bundleModules.push(module.info.fullName);
+        bundleModules.push(moduleName);
+      } else {
+        sideEffectImportModuleNames.push(moduleName);
       }
     }
     context.bundleModules = bundleModules;
+    context.sideEffectImportModuleNames = sideEffectImportModuleNames;
     argv.Modules = modules.join('\n');
     // Name/Version
     argv.Name = bundleName;
@@ -297,7 +303,8 @@ class CliBinBuildRest extends BeanCliBase {
   async _buildDts({
     srcDir,
     outDir,
-    bundleModules
+    bundleModules,
+    sideEffectImportModuleNames
   }) {
     // entry
     const entry = path.join(srcDir, 'index.ts');
@@ -325,6 +332,15 @@ class CliBinBuildRest extends BeanCliBase {
       }
       // minify: true,
     });
+    await this._injectDtsImports(outDir, sideEffectImportModuleNames);
+  }
+  async _injectDtsImports(outDir, sideEffectImportModuleNames) {
+    const fileIndex = path.join(outDir, 'index.d.mts');
+    let fileContent = (await fse.readFile(fileIndex)).toString();
+    const imports = sideEffectImportModuleNames.filter(moduleName => !fileContent.includes(`import "${moduleName}";`)).map(moduleName => `import "${moduleName}";`);
+    if (imports.length === 0) return;
+    fileContent = `${imports.join('\n')}\n${fileContent}`;
+    await fse.writeFile(fileIndex, fileContent);
   }
   async _build(buildContext) {
     const {
@@ -369,7 +385,7 @@ async function _extractDeps(filePath) {
   const pos = content.indexOf('//#region');
   content = content.substring(0, pos);
   const packageNames = new Set();
-  const re = /import\s+[\s\S]*?\s+from\s+['"]([^'"]+)['"]/g;
+  const re = /import\s+(?:[\s\S]*?\s+from\s+)?['"]([^'"]+)['"]/g;
   let match;
   while (true) {
     match = re.exec(content);
@@ -1794,14 +1810,18 @@ export const OpenApiBaseURL = (sys: ZovaSys) => {
     }
     //
     const contentTypes2 = contentTypes.join('\n');
-    const importsType = [];
-    if (contentSignatures.length > 0) importsType.push('OpenApiBaseURL');
-    if (contentTypes2.includes('components["schemas"]')) importsType.push('type components');
-    if (contentTypes2.includes('paths[')) importsType.push('type paths');
-    const contentImportsType = importsType.length > 0 ? `import { ${importsType.join(', ')} } from './openapi/index.js';` : '';
+    const importsOpenapiValue = [];
+    const importsOpenapiType = [];
+    if (contentSignatures.length > 0) importsOpenapiValue.push('OpenApiBaseURL');
+    if (contentTypes2.includes('components["schemas"]')) importsOpenapiType.push('components');
+    if (contentTypes2.includes('paths[')) importsOpenapiType.push('paths');
+    const contentImportsOpenapiValue = importsOpenapiValue.length > 0 ? `import { ${importsOpenapiValue.join(', ')} } from './openapi/index.js';` : '';
+    const contentImportsOpenapiType = importsOpenapiType.length > 0 ? `import type { ${importsOpenapiType.join(', ')} } from './openapi/index.js';` : '';
+    const contentImportsOpenapi = [contentImportsOpenapiValue, contentImportsOpenapiType].filter(item => !!item).join('\n');
     // apiContent
-    const apiContent = `import { Api, BeanApiBase, IApiActionOptions } from 'zova-module-a-api';
-${contentImportsType}
+    const apiContent = `import { Api, BeanApiBase } from 'zova-module-a-api';
+import type { IApiActionOptions } from 'zova-module-a-api';
+${contentImportsOpenapi}
 
 ${contentTypes2}
 
@@ -1836,7 +1856,8 @@ export class ApiMeta${apiName} extends BeanBase {
 }
 `;
     const apiSchemaContent = `import { BeanBase } from 'zova';
-import { ApiSchema, IApiSchemaOptions } from 'zova-module-a-api';
+import { ApiSchema } from 'zova-module-a-api';
+import type { IApiSchemaOptions } from 'zova-module-a-api';
 ${contentImportsApiPath}
 
 @ApiSchema()

package/dist/lib/bean/cli.bin.buildRest.d.ts

@@ -16,12 +16,14 @@ interface IBinBuildRestContext {
     srcDir: string;
     outDir: string;
     bundleModules?: string[];
+    sideEffectImportModuleNames?: string[];
 }
 export declare class CliBinBuildRest extends BeanCliBase {
     execute(): Promise<void>;
     _prepareResources(context: IBinBuildRestContext): Promise<void>;
     _buildTs({ srcDir, outDir }: IBinBuildRestContext): Promise<void>;
-    _buildDts({ srcDir, outDir, bundleModules }: IBinBuildRestContext): Promise<void>;
+    _buildDts({ srcDir, outDir, bundleModules, sideEffectImportModuleNames, }: IBinBuildRestContext): Promise<void>;
+    _injectDtsImports(outDir: string, sideEffectImportModuleNames: string[]): Promise<void>;
     _build(buildContext: IBinBuildRestContext): Promise<void>;
 }
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.93",
-  "gitHead": "e12433f9ed9e7bba82a4c80458bbf0893e56348f",
+  "version": "1.2.95",
+  "gitHead": "7a711c5f09e0c1d3b0fda2084710297ea45b5d8e",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",
@@ -36,21 +36,21 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.27",
+    "@cabloy/cli": "^3.1.28",
     "@cabloy/extend": "^3.2.8",
-    "@cabloy/module-info": "^2.0.0",
+    "@cabloy/module-info": "^2.0.3",
     "@cabloy/openapi-typescript": "^7.9.2",
-    "@cabloy/utils": "^2.1.25",
+    "@cabloy/utils": "^2.1.26",
     "@cabloy/vite-plugin-babel": "^1.3.3",
     "@cabloy/vue-babel-plugin-jsx": "^2.0.1",
     "@cabloy/word-utils": "^2.1.14",
     "@typescript/native-preview": "^7.0.0-dev.20260320.1",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "babel-plugin-transform-typescript-metadata": "^0.4.0",
-    "babel-plugin-zova-bean-module": "^1.2.14",
-    "babel-plugin-zova-bean-use": "^1.1.14",
-    "babel-plugin-zova-behavior": "^1.1.14",
-    "babel-plugin-zova-component": "^1.1.14",
+    "babel-plugin-zova-bean-module": "^1.2.15",
+    "babel-plugin-zova-bean-use": "^1.1.15",
+    "babel-plugin-zova-behavior": "^1.1.15",
+    "babel-plugin-zova-component": "^1.1.15",
     "compressing": "^1.10.0",
     "fs-extra": "^11.3.5",
     "globby": "^14.1.0",
@@ -65,6 +65,6 @@
     "vite": "^8.0.14",
     "yaml": "^2.8.3",
     "zova-openapi": "^1.1.17",
-    "zova-vite": "^1.1.42"
+    "zova-vite": "^1.1.43"
   }
 }