@uniformdev/transformer 1.1.45 → 1.1.47

package/dist/cli/index.js

@@ -6173,7 +6173,7 @@ function createFlattenBlockFieldCommand() {
   const command = new Command15("flatten-block-field");
   command.description(
     "Dissolves a $block parameter by lifting the block content type fields onto the component and extracting block item values into composition instances directly."
-  ).option("--componentId <id>", "The ID of the component that owns the block parameter").option("--parameterId <id>", "The ID of the $block parameter to flatten").option("--excludeFields <ids>", "Comma-separated list of block content type field IDs to skip when flattening").hook("preAction", (thisCommand) => {
+  ).option("--componentId <id>", "The ID (or ,;|-separated list of IDs) of the component(s) that own the block parameter").option("--parameterId <id>", "The ID of the $block parameter to flatten").option("--excludeFields <ids>", "Comma-separated list of block content type field IDs to skip when flattening").hook("preAction", (thisCommand) => {
     const opts = thisCommand.opts();
     const requiredOptions = [
       { name: "componentId", flag: "--componentId" },
@@ -6193,31 +6193,49 @@ function createFlattenBlockFieldCommand() {
       excludeFields: opts.excludeFields
     };
     const logger = new Logger();
+    logger.info(`componentId: ${options.componentId}`);
+    logger.info(`parameterId: ${options.parameterId}`);
+    logger.info(`excludeFields: ${options.excludeFields ?? ""}`);
     const fileSystem = new FileSystemService();
     const componentService = new ComponentService(fileSystem);
     const flattener = new BlockFieldFlattenerService(fileSystem, componentService, logger);
+    const componentIds = splitList(options.componentId);
+    const aggregate = {
+      compositionsModified: 0,
+      compositionPatternsModified: 0,
+      componentPatternsModified: 0
+    };
     try {
-      const result = await flattener.flatten({
-        rootDir: options.rootDir,
-        componentsDir: options.componentsDir,
-        compositionsDir: options.compositionsDir,
-        compositionPatternsDir: options.compositionPatternsDir,
-        componentPatternsDir: options.componentPatternsDir,
-        contentTypesDir: options.contentTypesDir,
-        componentId: options.componentId,
-        parameterId: options.parameterId,
-        whatIf: options.whatIf ?? false,
-        strict: options.strict ?? false,
-        excludeFields: options.excludeFields ? options.excludeFields.split(",").map((s) => s.trim()) : []
-      });
+      for (const componentId of componentIds) {
+        try {
+          const result = await flattener.flatten({
+            rootDir: options.rootDir,
+            componentsDir: options.componentsDir,
+            compositionsDir: options.compositionsDir,
+            compositionPatternsDir: options.compositionPatternsDir,
+            componentPatternsDir: options.componentPatternsDir,
+            contentTypesDir: options.contentTypesDir,
+            componentId,
+            parameterId: options.parameterId,
+            whatIf: options.whatIf ?? false,
+            strict: options.strict ?? false,
+            excludeFields: options.excludeFields ? options.excludeFields.split(",").map((s) => s.trim()) : []
+          });
+          aggregate.compositionsModified += result.compositionsModified;
+          aggregate.compositionPatternsModified += result.compositionPatternsModified;
+          aggregate.componentPatternsModified += result.componentPatternsModified;
+        } catch (error) {
+          if (error instanceof ComponentNotFoundError || error instanceof PropertyNotFoundError) {
+            logger.warn(error.message);
+            continue;
+          }
+          throw error;
+        }
+      }
       logger.success(
-        `Flattened parameter "${options.parameterId}" on component "${options.componentId}": ${result.compositionsModified} composition(s), ${result.compositionPatternsModified} composition pattern(s), ${result.componentPatternsModified} component pattern(s) updated`
+        `Flattened parameter "${options.parameterId}" on component "${options.componentId}": ${aggregate.compositionsModified} composition(s), ${aggregate.compositionPatternsModified} composition pattern(s), ${aggregate.componentPatternsModified} component pattern(s) updated`
       );
     } catch (error) {
-      if (error instanceof ComponentNotFoundError || error instanceof PropertyNotFoundError) {
-        logger.warn(error.message);
-        return;
-      }
       if (error instanceof TransformError) {
         logger.error(error.message);
         process.exit(1);
@@ -7200,6 +7218,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 ?? {};
@@ -7212,9 +7239,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;
@@ -7429,7 +7456,7 @@ function createPropagateRootSlotCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.45",
+  version: "1.1.47",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {