zova-cli-set-front 1.2.93 → 1.2.94

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);

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.94",
+  "gitHead": "2b67a70e9c2a1703aec3665ddd12d39413015fbf",
   "description": "zova cli-set-front",
   "keywords": [
     "framework",