@uniformdev/transformer 1.1.46 → 1.1.48

package/dist/cli/index.js

@@ -4523,11 +4523,28 @@ var SlotPropagatorService = class {
       }
     }
     this.logger.info(`Resolved slots: ${resolvedSlotIds.join(", ")}`);
+    const compositions = await this.compositionService.findCompositionsByTypes(
+      fullCompositionsDir,
+      compositionTypes,
+      findOptions
+    );
+    const componentTypesInSlot = /* @__PURE__ */ new Set();
+    for (const { composition } of compositions) {
+      const rootSlots = composition.composition.slots ?? {};
+      for (const slotDef of resolvedSlots) {
+        const slotContent = rootSlots[slotDef.id] ?? [];
+        for (const instance of slotContent) {
+          if (instance.type) {
+            componentTypesInSlot.add(instance.type);
+          }
+        }
+      }
+    }
     let modifiedComponent = { ...targetComponent };
     let componentModified = false;
     const existingSlot = this.componentService.findSlot(modifiedComponent, targetSlot, findOptions);
     if (!existingSlot) {
-      const mergedAllowedComponents = this.mergeAllowedComponents(resolvedSlots);
+      const mergedAllowedComponents = this.mergeAllowedComponents(resolvedSlots, componentTypesInSlot);
       this.logger.action(whatIf, "CREATE", `Slot "${targetSlot}" on ${targetComponentType}`);
       modifiedComponent = this.componentService.addSlot(modifiedComponent, {
         id: targetSlot,
@@ -4536,7 +4553,7 @@ var SlotPropagatorService = class {
       });
       componentModified = true;
     } else {
-      const mergedAllowedComponents = this.mergeAllowedComponents([existingSlot, ...resolvedSlots]);
+      const mergedAllowedComponents = this.mergeAllowedComponents([existingSlot, ...resolvedSlots], componentTypesInSlot);
       const existingAllowed = existingSlot.allowedComponents ?? [];
       if (mergedAllowedComponents.length > existingAllowed.length) {
         this.logger.action(
@@ -4558,11 +4575,6 @@ var SlotPropagatorService = class {
     if (componentModified && !whatIf) {
       await this.componentService.saveComponent(targetFilePath, modifiedComponent);
     }
-    const compositions = await this.compositionService.findCompositionsByTypes(
-      fullCompositionsDir,
-      compositionTypes,
-      findOptions
-    );
     let modifiedCompositions = 0;
     let propagatedInstances = 0;
     for (const { composition, filePath } of compositions) {
@@ -4652,13 +4664,18 @@ var SlotPropagatorService = class {
       propagatedInstances
     };
   }
-  mergeAllowedComponents(slots) {
+  mergeAllowedComponents(slots, additionalTypes) {
     const allowed = /* @__PURE__ */ new Set();
     for (const slot of slots) {
       for (const comp of slot.allowedComponents ?? []) {
         allowed.add(comp);
       }
     }
+    if (additionalTypes) {
+      for (const comp of additionalTypes) {
+        allowed.add(comp);
+      }
+    }
     return Array.from(allowed).sort();
   }
   deepCloneComponents(components) {
@@ -7218,6 +7235,15 @@ var RootSlotPropagatorService = class {
     this.logger.debug(
       `Found ${compositions.length} composition(s) matching types [${compositionTypes.join(", ")}]`
     );
+    const allowedFromSource = /* @__PURE__ */ new Set();
+    for (const { sourceComponent } of sourceComponents) {
+      for (const slotName of slotNames) {
+        const slotDef = this.componentService.findSlot(sourceComponent, slotName, findOptions);
+        for (const allowed of slotDef?.allowedComponents ?? []) {
+          allowedFromSource.add(allowed);
+        }
+      }
+    }
     const componentTypesInSlot = /* @__PURE__ */ new Set();
     for (const { composition } of compositions) {
       const rootSlots = composition.composition.slots ?? {};
@@ -7230,9 +7256,9 @@ var RootSlotPropagatorService = class {
         }
       }
     }
-    const collectedTypes = Array.from(componentTypesInSlot).sort();
+    const collectedTypes = [.../* @__PURE__ */ new Set([...allowedFromSource, ...componentTypesInSlot])].sort();
     this.logger.info(
-      `Collected component types from slot contents: [${collectedTypes.join(", ")}]`
+      `Collected allowedComponents: [${collectedTypes.join(", ")}] (from source definitions: [${[...allowedFromSource].sort().join(", ")}], from slot contents: [${[...componentTypesInSlot].sort().join(", ")}])`
     );
     let modifiedComponent = { ...targetComponent };
     let componentModified = false;
@@ -7447,7 +7473,7 @@ function createPropagateRootSlotCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.46",
+  version: "1.1.48",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {