@plasmicapp/loader-react 1.0.344 → 1.0.346

package/dist/index.js

@@ -269,17 +269,9 @@ function MaybeWrap(props) {
 function uniq(elements) {
   return Array.from(new Set(elements));
 }
-function uniqBy(elements, iterator) {
-  const vis = /* @__PURE__ */ new Set();
-  const filtered = [];
-  for (const elt of elements) {
-    const key = iterator(elt);
-    if (!vis.has(key)) {
-      vis.add(key);
-      filtered.push(elt);
-    }
-  }
-  return filtered;
+function intersect(a, b) {
+  const setB = new Set(b);
+  return a.filter((elt) => setB.has(elt));
 }
 
 // src/variation.ts
@@ -622,14 +614,7 @@ function prepComponentData(bundle, compMetas, opts) {
   };
 }
 function mergeBundles(target, from) {
-  var _a;
-  const existingCompIds = new Set(target.components.map((c) => c.id));
-  const newCompMetas = from.components.filter(
-    (m) => !existingCompIds.has(m.id)
-  );
-  if (newCompMetas.length > 0) {
-    target = __spreadProps(__spreadValues({}, target), { components: [...target.components, ...newCompMetas] });
-  }
+  var _a, _b, _c, _d, _e;
   const existingProjects = new Set(target.projects.map((p) => p.id));
   const newProjects = from.projects.filter((p) => !existingProjects.has(p.id));
   if (newProjects.length > 0) {
@@ -637,6 +622,35 @@ function mergeBundles(target, from) {
       projects: [...target.projects, ...newProjects]
     });
   }
+  const existingCompIds = new Set(target.components.map((c) => c.id));
+  function shouldIncludeComponentInBundle(c) {
+    if (existingCompIds.has(c.id)) {
+      return false;
+    }
+    if (!existingProjects.has(c.projectId)) {
+      return true;
+    }
+    if (!target.filteredIds[c.projectId]) {
+      return true;
+    }
+    return target.filteredIds[c.projectId].includes(c.id);
+  }
+  const newCompMetas = from.components.filter(
+    (m) => shouldIncludeComponentInBundle(m)
+  );
+  if (newCompMetas.length > 0) {
+    target = __spreadProps(__spreadValues({}, target), { components: [...target.components, ...newCompMetas] });
+    Object.entries(from.filteredIds).forEach(([projectId, ids]) => {
+      if (!target.filteredIds[projectId]) {
+        target.filteredIds[projectId] = [...ids];
+      } else {
+        target.filteredIds[projectId] = intersect(
+          target.filteredIds[projectId],
+          ids
+        );
+      }
+    });
+  }
   const existingModules = {
     browser: new Set(target.modules.browser.map((m) => m.fileName)),
     server: new Set(target.modules.server.map((m) => m.fileName))
@@ -667,12 +681,18 @@ function mergeBundles(target, from) {
     });
   }
   const existingSplitIds = new Set(target.activeSplits.map((s) => s.id));
-  const newSplits = (_a = from.activeSplits.filter((s) => !existingSplitIds.has(s.id))) != null ? _a : [];
+  const newSplits = (_a = from.activeSplits.filter(
+    // Don't include splits belonging to projects already present
+    // in the target bundle
+    (s) => !existingSplitIds.has(s.id) && !existingProjects.has(s.projectId)
+  )) != null ? _a : [];
   if (newSplits.length > 0) {
     target = __spreadProps(__spreadValues({}, target), {
       activeSplits: [...target.activeSplits, ...newSplits]
     });
   }
+  target.bundleKey = (_c = (_b = target.bundleKey) != null ? _b : from.bundleKey) != null ? _c : null;
+  target.deferChunksByDefault = (_e = (_d = target.deferChunksByDefault) != null ? _d : from.deferChunksByDefault) != null ? _e : false;
   return target;
 }
 var convertBundlesToComponentRenderData = (bundles, compMetas) => {
@@ -788,7 +808,8 @@ var BaseInternalPlasmicComponentLoader = class {
       projects: [],
       activeSplits: [],
       bundleKey: null,
-      deferChunksByDefault: false
+      deferChunksByDefault: false,
+      filteredIds: {}
     };
     this.opts = args.opts;
     this.fetcher = args.fetcher;
@@ -899,7 +920,7 @@ var BaseInternalPlasmicComponentLoader = class {
     });
   }
   mergeBundle(newBundle) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b;
     newBundle.bundleKey = (_a = newBundle.bundleKey) != null ? _a : null;
     if (newBundle.bundleKey && this.bundle.bundleKey && newBundle.bundleKey !== this.bundle.bundleKey) {
       console.warn(
@@ -909,39 +930,8 @@ ${newBundle.bundleKey}
 ${this.bundle.bundleKey}`
       );
     }
-    const bundles = [this.bundle, newBundle];
-    this.bundle = {
-      activeSplits: uniqBy(
-        bundles.flatMap((bundle) => bundle.activeSplits),
-        (split) => split.id
-      ),
-      components: uniqBy(
-        bundles.flatMap((bundle) => bundle.components),
-        (c) => c.id
-      ),
-      globalGroups: uniqBy(
-        bundles.flatMap((bundle) => bundle.globalGroups),
-        (g) => g.id
-      ),
-      modules: {
-        browser: uniqBy(
-          bundles.flatMap((bundle) => bundle.modules.browser),
-          (m) => m.fileName
-        ),
-        server: uniqBy(
-          bundles.flatMap((bundle) => bundle.modules.server),
-          (m) => m.fileName
-        )
-      },
-      projects: uniqBy(
-        bundles.flatMap((bundle) => bundle.projects),
-        (p) => p.id
-      ),
-      // Avoid `undefined` as it cannot be serialized as JSON
-      bundleKey: (_c = (_b = newBundle.bundleKey) != null ? _b : this.bundle.bundleKey) != null ? _c : null,
-      deferChunksByDefault: (_d = newBundle.deferChunksByDefault) != null ? _d : false
-    };
-    (_e = this.onBundleMerged) == null ? void 0 : _e.call(this);
+    this.bundle = mergeBundles(newBundle, this.bundle);
+    (_b = this.onBundleMerged) == null ? void 0 : _b.call(this);
   }
   getBundle() {
     return this.bundle;
@@ -957,7 +947,8 @@ ${this.bundle.bundleKey}`
       projects: [],
       activeSplits: [],
       bundleKey: null,
-      deferChunksByDefault: false
+      deferChunksByDefault: false,
+      filteredIds: {}
     };
     this.registry.clear();
   }