@module-federation/dts-plugin 0.9.0 → 0.9.1

package/dist/fork-dev-worker.js

@@ -104,6 +104,7 @@ var import_ansi_colors = __toESM(require("ansi-colors"));
 var import_path4 = __toESM(require("path"));
 var import_promises3 = require("fs/promises");
 var import_fs = __toESM(require("fs"));
+var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_sdk5 = require("@module-federation/sdk");
 var import_third_party_dts_extractor2 = require("@module-federation/third-party-dts-extractor");
 
@@ -1723,7 +1724,8 @@ var defaultOptions = {
   context: process.cwd(),
   abortOnError: true,
   consumeAPITypes: false,
-  runtimePkgs: []
+  runtimePkgs: [],
+  remoteTypeUrls: {}
 };
 var buildZipUrl = /* @__PURE__ */ __name((hostOptions, url) => {
   const remoteUrl = new URL(url, "file:");
@@ -1739,18 +1741,31 @@ var buildApiTypeUrl = /* @__PURE__ */ __name((zipUrl) => {
 }, "buildApiTypeUrl");
 var retrieveRemoteInfo = /* @__PURE__ */ __name((options) => {
   const { hostOptions, remoteAlias, remote } = options;
+  const { remoteTypeUrls } = hostOptions;
   let decodedRemote = remote;
   if (decodedRemote.startsWith(import_sdk4.ENCODE_NAME_PREFIX)) {
     decodedRemote = (0, import_sdk4.decodeName)(decodedRemote, import_sdk4.ENCODE_NAME_PREFIX);
   }
   const parsedInfo = (0, import_sdk4.parseEntry)(decodedRemote, void 0, "@");
   const url = "entry" in parsedInfo ? parsedInfo.entry : parsedInfo.name === decodedRemote ? decodedRemote : "";
-  const zipUrl = url ? buildZipUrl(hostOptions, url) : "";
+  let zipUrl = "";
+  let apiTypeUrl = "";
+  const name = parsedInfo.name || remoteAlias;
+  if (typeof remoteTypeUrls === "object" && remoteTypeUrls[name]) {
+    zipUrl = remoteTypeUrls[name].zip;
+    apiTypeUrl = remoteTypeUrls[name].api;
+  }
+  if (!zipUrl && url) {
+    zipUrl = buildZipUrl(hostOptions, url);
+  }
+  if (!apiTypeUrl && zipUrl) {
+    apiTypeUrl = buildApiTypeUrl(zipUrl);
+  }
   return {
-    name: parsedInfo.name || remoteAlias,
+    name,
     url,
     zipUrl,
-    apiTypeUrl: buildApiTypeUrl(zipUrl),
+    apiTypeUrl,
     alias: remoteAlias
   };
 }, "retrieveRemoteInfo");
@@ -1826,6 +1841,7 @@ var DTSManager = (_a = class {
   }
   extractRemoteTypes(options) {
     return __async(this, null, function* () {
+      var _a3;
       const { remoteOptions, tsConfig } = options;
       if (!remoteOptions.extractRemoteTypes) {
         return;
@@ -1840,20 +1856,29 @@ var DTSManager = (_a = class {
         }
       }
       const mfTypesPath = retrieveMfTypesPath(tsConfig, remoteOptions);
-      if (hasRemotes) {
-        const tempHostOptions = {
-          moduleFederationConfig: remoteOptions.moduleFederationConfig,
-          typesFolder: import_path4.default.join(mfTypesPath, "node_modules"),
-          remoteTypesFolder: (remoteOptions == null ? void 0 : remoteOptions.hostRemoteTypesFolder) || remoteOptions.typesFolder,
-          deleteTypesFolder: true,
-          context: remoteOptions.context,
-          implementation: remoteOptions.implementation,
-          abortOnError: false
-        };
-        yield this.consumeArchiveTypes(tempHostOptions);
+      if (hasRemotes && this.options.host) {
+        try {
+          const { hostOptions } = retrieveHostConfig(this.options.host);
+          const remoteTypesFolder = import_path4.default.resolve(hostOptions.context, hostOptions.typesFolder);
+          const targetDir = import_path4.default.join(mfTypesPath, "node_modules");
+          if (import_fs.default.existsSync(remoteTypesFolder)) {
+            const targetFolder = import_path4.default.resolve(remoteOptions.context, targetDir);
+            yield import_fs_extra3.default.ensureDir(targetFolder);
+            yield import_fs_extra3.default.copy(remoteTypesFolder, targetFolder, {
+              overwrite: true
+            });
+          }
+        } catch (err) {
+          if (((_a3 = this.options.host) == null ? void 0 : _a3.abortOnError) === false) {
+            fileLog(`Unable to copy remote types, ${err}`, "extractRemoteTypes", "error");
+          } else {
+            throw err;
+          }
+        }
       }
     });
   }
+  // it must execute after consumeTypes
   generateTypes() {
     return __async(this, null, function* () {
       var _a3;
@@ -1866,6 +1891,18 @@ var DTSManager = (_a = class {
         if (!Object.keys(mapComponentsToExpose).length) {
           return;
         }
+        if (tsConfig.compilerOptions.tsBuildInfoFile) {
+          try {
+            const tsBuildInfoFile = import_path4.default.resolve(remoteOptions.context, tsConfig.compilerOptions.tsBuildInfoFile);
+            const mfTypesPath = retrieveMfTypesPath(tsConfig, remoteOptions);
+            if (!import_fs.default.existsSync(mfTypesPath)) {
+              import_fs.default.rmSync(tsBuildInfoFile, {
+                force: true
+              });
+            }
+          } catch (e) {
+          }
+        }
         yield this.extractRemoteTypes({
           remoteOptions,
           tsConfig,
@@ -1895,7 +1932,7 @@ var DTSManager = (_a = class {
       } catch (error2) {
         if (((_a3 = this.options.remote) == null ? void 0 : _a3.abortOnError) === false) {
           if (this.options.displayErrorInTerminal) {
-            logger.error(`Unable to compile federated types${error2}`);
+            logger.error(`Unable to compile federated types ${error2}`);
           }
         } else {
           throw error2;
@@ -1909,6 +1946,9 @@ var DTSManager = (_a = class {
         if (!remoteInfo.url.includes(import_sdk5.MANIFEST_EXT)) {
           return remoteInfo;
         }
+        if (remoteInfo.zipUrl) {
+          return remoteInfo;
+        }
         const url = remoteInfo.url;
         const res = yield axiosGet(url);
         const manifestJson = res.data;
@@ -1974,8 +2014,10 @@ var DTSManager = (_a = class {
         apiTypeFile = apiTypeFile.replaceAll(REMOTE_ALIAS_IDENTIFIER, remoteInfo.alias);
         const filePath = import_path4.default.join(destinationPath, REMOTE_API_TYPES_FILE_NAME);
         import_fs.default.writeFileSync(filePath, apiTypeFile);
+        const existed = this.loadedRemoteAPIAlias.has(remoteInfo.alias);
         this.loadedRemoteAPIAlias.add(remoteInfo.alias);
         fileLog(`success`, "downloadAPITypes", "info");
+        return existed;
       } catch (err) {
         fileLog(`Unable to download "${remoteInfo.name}" api types, ${err}`, "downloadAPITypes", "error");
       }
@@ -2117,7 +2159,10 @@ hostName: ${hostName}`, "updateTypes", "info");
               // use remoteTarPath first
               zipUrl: remoteTarPath || requiredRemoteInfo.zipUrl
             }));
-            yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            const addNew = yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            if (addNew) {
+              this.consumeAPITypes(hostOptions);
+            }
             fileLog(`consumeTypes end`, "updateTypes", "info");
           }), "consumeTypes");
           fileLog(`loadedRemoteInfo: ${JSON.stringify(loadedRemoteInfo, null, 2)}`, "updateTypes", "info");
@@ -2135,7 +2180,6 @@ hostName: ${hostName}`, "updateTypes", "info");
             } else if (updatedRemoteInfo) {
               const consumeDynamicRemoteTypes = /* @__PURE__ */ __name(() => __async(this, null, function* () {
                 yield consumeTypes2(this.updatedRemoteInfos[updatedRemoteInfo.name]);
-                this.consumeAPITypes(hostOptions);
               }), "consumeDynamicRemoteTypes");
               if (!this.updatedRemoteInfos[updatedRemoteInfo.name]) {
                 const parsedRemoteInfo = retrieveRemoteInfo({
@@ -2187,10 +2231,13 @@ function cloneDeepOptions(options) {
     "manifest",
     "async"
   ];
-  return (0, import_lodash.default)(options, (_value, key) => {
+  return (0, import_lodash.default)(options, (value, key) => {
     if (typeof key === "string" && excludeKeys.includes(key)) {
       return false;
     }
+    if (typeof value === "function") {
+      return false;
+    }
   });
 }
 __name(cloneDeepOptions, "cloneDeepOptions");

package/dist/fork-generate-dts.d.mts

@@ -1,4 +1,4 @@
-import { k as DtsWorkerOptions } from './DtsWorker-484d9f4a.js';
+import { k as DtsWorkerOptions } from './DtsWorker-edc3f145.js';
 import 'child_process';
 import './DTSManagerOptions-c74c59ed.js';
 import '@module-federation/sdk';

package/dist/fork-generate-dts.d.ts

@@ -1,4 +1,4 @@
-import { k as DtsWorkerOptions } from './DtsWorker-484d9f4a.js';
+import { k as DtsWorkerOptions } from './DtsWorker-edc3f145.js';
 import 'child_process';
 import './DTSManagerOptions-c74c59ed.js';
 import '@module-federation/sdk';

package/dist/fork-generate-dts.js

@@ -289,6 +289,7 @@ var retrieveRemoteConfig = /* @__PURE__ */ __name((options) => {
 var import_path4 = __toESM(require("path"));
 var import_promises3 = require("fs/promises");
 var import_fs2 = __toESM(require("fs"));
+var import_fs_extra3 = __toESM(require("fs-extra"));
 var import_sdk5 = require("@module-federation/sdk");
 var import_third_party_dts_extractor2 = require("@module-federation/third-party-dts-extractor");
 
@@ -1369,7 +1370,8 @@ var defaultOptions2 = {
   context: process.cwd(),
   abortOnError: true,
   consumeAPITypes: false,
-  runtimePkgs: []
+  runtimePkgs: [],
+  remoteTypeUrls: {}
 };
 var buildZipUrl = /* @__PURE__ */ __name((hostOptions, url) => {
   const remoteUrl = new URL(url, "file:");
@@ -1385,18 +1387,31 @@ var buildApiTypeUrl = /* @__PURE__ */ __name((zipUrl) => {
 }, "buildApiTypeUrl");
 var retrieveRemoteInfo = /* @__PURE__ */ __name((options) => {
   const { hostOptions, remoteAlias, remote } = options;
+  const { remoteTypeUrls } = hostOptions;
   let decodedRemote = remote;
   if (decodedRemote.startsWith(import_sdk4.ENCODE_NAME_PREFIX)) {
     decodedRemote = (0, import_sdk4.decodeName)(decodedRemote, import_sdk4.ENCODE_NAME_PREFIX);
   }
   const parsedInfo = (0, import_sdk4.parseEntry)(decodedRemote, void 0, "@");
   const url = "entry" in parsedInfo ? parsedInfo.entry : parsedInfo.name === decodedRemote ? decodedRemote : "";
-  const zipUrl = url ? buildZipUrl(hostOptions, url) : "";
+  let zipUrl = "";
+  let apiTypeUrl = "";
+  const name = parsedInfo.name || remoteAlias;
+  if (typeof remoteTypeUrls === "object" && remoteTypeUrls[name]) {
+    zipUrl = remoteTypeUrls[name].zip;
+    apiTypeUrl = remoteTypeUrls[name].api;
+  }
+  if (!zipUrl && url) {
+    zipUrl = buildZipUrl(hostOptions, url);
+  }
+  if (!apiTypeUrl && zipUrl) {
+    apiTypeUrl = buildApiTypeUrl(zipUrl);
+  }
   return {
-    name: parsedInfo.name || remoteAlias,
+    name,
     url,
     zipUrl,
-    apiTypeUrl: buildApiTypeUrl(zipUrl),
+    apiTypeUrl,
     alias: remoteAlias
   };
 }, "retrieveRemoteInfo");
@@ -1472,6 +1487,7 @@ var DTSManager = (_a = class {
   }
   extractRemoteTypes(options) {
     return __async(this, null, function* () {
+      var _a2;
       const { remoteOptions, tsConfig } = options;
       if (!remoteOptions.extractRemoteTypes) {
         return;
@@ -1486,20 +1502,29 @@ var DTSManager = (_a = class {
         }
       }
       const mfTypesPath = retrieveMfTypesPath(tsConfig, remoteOptions);
-      if (hasRemotes) {
-        const tempHostOptions = {
-          moduleFederationConfig: remoteOptions.moduleFederationConfig,
-          typesFolder: import_path4.default.join(mfTypesPath, "node_modules"),
-          remoteTypesFolder: (remoteOptions == null ? void 0 : remoteOptions.hostRemoteTypesFolder) || remoteOptions.typesFolder,
-          deleteTypesFolder: true,
-          context: remoteOptions.context,
-          implementation: remoteOptions.implementation,
-          abortOnError: false
-        };
-        yield this.consumeArchiveTypes(tempHostOptions);
+      if (hasRemotes && this.options.host) {
+        try {
+          const { hostOptions } = retrieveHostConfig(this.options.host);
+          const remoteTypesFolder = import_path4.default.resolve(hostOptions.context, hostOptions.typesFolder);
+          const targetDir = import_path4.default.join(mfTypesPath, "node_modules");
+          if (import_fs2.default.existsSync(remoteTypesFolder)) {
+            const targetFolder = import_path4.default.resolve(remoteOptions.context, targetDir);
+            yield import_fs_extra3.default.ensureDir(targetFolder);
+            yield import_fs_extra3.default.copy(remoteTypesFolder, targetFolder, {
+              overwrite: true
+            });
+          }
+        } catch (err) {
+          if (((_a2 = this.options.host) == null ? void 0 : _a2.abortOnError) === false) {
+            fileLog(`Unable to copy remote types, ${err}`, "extractRemoteTypes", "error");
+          } else {
+            throw err;
+          }
+        }
       }
     });
   }
+  // it must execute after consumeTypes
   generateTypes() {
     return __async(this, null, function* () {
       var _a2;
@@ -1512,6 +1537,18 @@ var DTSManager = (_a = class {
         if (!Object.keys(mapComponentsToExpose).length) {
           return;
         }
+        if (tsConfig.compilerOptions.tsBuildInfoFile) {
+          try {
+            const tsBuildInfoFile = import_path4.default.resolve(remoteOptions.context, tsConfig.compilerOptions.tsBuildInfoFile);
+            const mfTypesPath = retrieveMfTypesPath(tsConfig, remoteOptions);
+            if (!import_fs2.default.existsSync(mfTypesPath)) {
+              import_fs2.default.rmSync(tsBuildInfoFile, {
+                force: true
+              });
+            }
+          } catch (e) {
+          }
+        }
         yield this.extractRemoteTypes({
           remoteOptions,
           tsConfig,
@@ -1541,7 +1578,7 @@ var DTSManager = (_a = class {
       } catch (error2) {
         if (((_a2 = this.options.remote) == null ? void 0 : _a2.abortOnError) === false) {
           if (this.options.displayErrorInTerminal) {
-            logger.error(`Unable to compile federated types${error2}`);
+            logger.error(`Unable to compile federated types ${error2}`);
           }
         } else {
           throw error2;
@@ -1555,6 +1592,9 @@ var DTSManager = (_a = class {
         if (!remoteInfo.url.includes(import_sdk5.MANIFEST_EXT)) {
           return remoteInfo;
         }
+        if (remoteInfo.zipUrl) {
+          return remoteInfo;
+        }
         const url = remoteInfo.url;
         const res = yield axiosGet(url);
         const manifestJson = res.data;
@@ -1620,8 +1660,10 @@ var DTSManager = (_a = class {
         apiTypeFile = apiTypeFile.replaceAll(REMOTE_ALIAS_IDENTIFIER, remoteInfo.alias);
         const filePath = import_path4.default.join(destinationPath, REMOTE_API_TYPES_FILE_NAME);
         import_fs2.default.writeFileSync(filePath, apiTypeFile);
+        const existed = this.loadedRemoteAPIAlias.has(remoteInfo.alias);
         this.loadedRemoteAPIAlias.add(remoteInfo.alias);
         fileLog(`success`, "downloadAPITypes", "info");
+        return existed;
       } catch (err) {
         fileLog(`Unable to download "${remoteInfo.name}" api types, ${err}`, "downloadAPITypes", "error");
       }
@@ -1763,7 +1805,10 @@ hostName: ${hostName}`, "updateTypes", "info");
               // use remoteTarPath first
               zipUrl: remoteTarPath || requiredRemoteInfo.zipUrl
             }));
-            yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            const addNew = yield this.downloadAPITypes(requiredRemoteInfo, destinationPath);
+            if (addNew) {
+              this.consumeAPITypes(hostOptions);
+            }
             fileLog(`consumeTypes end`, "updateTypes", "info");
           }), "consumeTypes");
           fileLog(`loadedRemoteInfo: ${JSON.stringify(loadedRemoteInfo, null, 2)}`, "updateTypes", "info");
@@ -1781,7 +1826,6 @@ hostName: ${hostName}`, "updateTypes", "info");
             } else if (updatedRemoteInfo) {
               const consumeDynamicRemoteTypes = /* @__PURE__ */ __name(() => __async(this, null, function* () {
                 yield consumeTypes(this.updatedRemoteInfos[updatedRemoteInfo.name]);
-                this.consumeAPITypes(hostOptions);
               }), "consumeDynamicRemoteTypes");
               if (!this.updatedRemoteInfos[updatedRemoteInfo.name]) {
                 const parsedRemoteInfo = retrieveRemoteInfo({
@@ -1833,10 +1877,13 @@ function cloneDeepOptions(options) {
     "manifest",
     "async"
   ];
-  return (0, import_lodash.default)(options, (_value, key) => {
+  return (0, import_lodash.default)(options, (value, key) => {
     if (typeof key === "string" && excludeKeys.includes(key)) {
       return false;
     }
+    if (typeof value === "function") {
+      return false;
+    }
   });
 }
 __name(cloneDeepOptions, "cloneDeepOptions");