@softarc/native-federation-orchestrator 4.0.0-RC3 → 4.0.0-RC4

package/fesm2022/@softarc/native-federation-orchestrator.mjs

@@ -1552,7 +1552,7 @@ function createDetermineSharedExternals(config, ports) {
   }
 }
 
-// node_modules/.pnpm/@softarc+native-federation@4.0.0-RC3_typescript@5.9.3_47bb4de43df406d114d8f653e70c5696/node_modules/@softarc/native-federation/src/lib/domain/core/build-notification-options.contract.js
+// node_modules/.pnpm/@softarc+native-federation@4.0.0-RC4_typescript@5.9.3_b0fd05590f82ec18d047413a60a6fe2a/node_modules/@softarc/native-federation/src/lib/domain/core/build-notification-options.contract.js
 var BuildNotificationType;
 (function(BuildNotificationType2) {
   BuildNotificationType2["COMPLETED"] = "federation-rebuild-complete";
@@ -1560,7 +1560,7 @@ var BuildNotificationType;
   BuildNotificationType2["CANCELLED"] = "federation-rebuild-cancelled";
 })(BuildNotificationType || (BuildNotificationType = {}));
 
-// node_modules/.pnpm/@softarc+native-federation@4.0.0-RC3_typescript@5.9.3_47bb4de43df406d114d8f653e70c5696/node_modules/@softarc/native-federation/src/lib/domain/core/chunk.js
+// node_modules/.pnpm/@softarc+native-federation@4.0.0-RC4_typescript@5.9.3_b0fd05590f82ec18d047413a60a6fe2a/node_modules/@softarc/native-federation/src/lib/domain/core/chunk.js
 var CHUNK_PREFIX = "@nf-internal";
 function toChunkImport(fileName) {
   if (fileName.startsWith("./")) {
@@ -1579,8 +1579,8 @@ function createGenerateImportMap(config, ports) {
       addScopedExternals(importMap, chunkBundles);
       addshareScopeExternals(importMap, chunkBundles);
       addGlobalSharedExternals(importMap, chunkBundles);
+      addRemoteInfos(importMap, chunkBundles);
       addChunkImports(importMap, chunkBundles);
-      addRemoteInfos(importMap);
       return Promise.resolve(importMap);
     } catch (e) {
       return Promise.reject(e);
@@ -1632,6 +1632,9 @@ function createGenerateImportMap(config, ports) {
         const scope = getScope2(shareScope, version.remotes[0].name, externalName);
         let targetFileUrl = join(scope, version.remotes[0].file);
         version.remotes[0].cached = true;
+        if (version.action === "share") {
+          registerBundleChunks(chunkBundles, version.remotes[0].name, version.remotes[0].bundle);
+        }
         if (version.action === "skip") {
           if (!override) {
             override = findOverride(external, shareScope, externalName) ?? "NOT_AVAILABLE";
@@ -1724,10 +1727,11 @@ function createGenerateImportMap(config, ports) {
   function addToGlobal(importMap, imports) {
     importMap.imports = Object.assign(importMap.imports, imports);
   }
-  function addRemoteInfos(importMap) {
+  function addRemoteInfos(importMap, chunkBundles) {
     const remotes = ports.remoteInfoRepo.getAll();
     for (const [remoteName, remote] of Object.entries(remotes)) {
       addRemoteExposedModules(importMap, remoteName, remote);
+      registerBundleChunks(chunkBundles, remoteName, "mapping-or-exposed");
     }
   }
   function addRemoteExposedModules(importMap, remoteName, remote) {
@@ -1744,18 +1748,18 @@ function createGenerateImportMap(config, ports) {
     return chunkBundles;
   }
   function addChunkImports(importMap, chunkBundles) {
-    const chunkImports = Object.entries(chunkBundles).reduce((imports, [remoteName, bundles]) => {
+    Object.entries(chunkBundles).forEach(([remoteName, bundles]) => {
       const baseUrl = getScope2("CHUNKS", remoteName);
-      Array.from(bundles).forEach((bundleName) => {
+      const imports = Array.from(bundles).reduce((_imports, bundleName) => {
         ports.sharedChunksRepo.tryGet(remoteName, bundleName).ifPresent((files) => {
           files.forEach((file) => {
-            imports[toChunkImport(file)] = join(baseUrl, file);
+            _imports[toChunkImport(file)] = join(baseUrl, file);
           });
         });
-      });
-      return imports;
-    }, {});
-    addToGlobal(importMap, chunkImports);
+        return _imports;
+      }, {});
+      if (Object.keys(imports).length > 0) addToScope(importMap, baseUrl, imports);
+    });
     return importMap;
   }
   function getScope2(ctx, remoteName, externalName) {
@@ -2348,7 +2352,7 @@ function createConvertToImportMap({ log }, ports) {
       return;
     }
     const remoteEntryScope = getScope(remoteEntry.url);
-    const chunkBundles = /* @__PURE__ */ new Set();
+    const chunkBundles = /* @__PURE__ */ new Set(["mapping-or-exposed"]);
     remoteEntry.shared.forEach((external) => {
       if (!external.singleton) {
         addToScopes(
@@ -2416,16 +2420,19 @@ function createConvertToImportMap({ log }, ports) {
       importMap.imports[moduleName] = moduleUrl;
     });
   }
-  function addChunkImports(importMap, remoteName, baseUrl, chunkBundles) {
-    const chunkImports = Array.from(chunkBundles).reduce((imports, bundleName) => {
+  function addChunkImports(importMap, remoteName, remoteEntryScope, chunkBundles) {
+    Array.from(chunkBundles).forEach((bundleName) => {
       ports.sharedChunksRepo.tryGet(remoteName, bundleName).ifPresent((files) => {
         files.forEach((file) => {
-          imports[toChunkImport(file)] = join(baseUrl, file);
+          addToScopes(
+            remoteEntryScope,
+            toChunkImport(file),
+            join(remoteEntryScope, file),
+            importMap
+          );
         });
       });
-      return imports;
-    }, {});
-    importMap.imports = { ...importMap.imports, ...chunkImports };
+    });
     return importMap;
   }
 }