@uniformdev/transformer 1.1.52 → 1.1.54

package/dist/index.d.ts

@@ -36,6 +36,8 @@ interface ComponentInstance {
 }
 interface CompositionOverrides {
     parameters?: Record<string, ParameterValue>;
+    /** Slot patches stored only under _overrides (not duplicated on the main tree instance). */
+    slots?: Record<string, ComponentInstance[]>;
     [key: string]: unknown;
 }
 interface CompositionRoot {
@@ -610,6 +612,7 @@ declare class ParameterRemoverService {
     private removeParameterInDirectory;
     private removeParameterFromTree;
     private removeParameterFromOverrides;
+    private removeParameterFromOverrideSlotTrees;
     private removeOverridesForMatchingInstances;
     private removeKeysFromMap;
 }
@@ -644,6 +647,15 @@ declare class FieldRemoverService {
     private removeFieldInDirectory;
     private removeFieldFromTree;
     private removeFieldFromOverrides;
+    /**
+     * Walks every _overrides entry's `slots` trees (if present) and removes parameter keys from
+     * matching component instances. Uniform often stores nested slot patches only here.
+     */
+    private removeFieldFromOverrideSlotTrees;
+    /**
+     * Looks up override entries by compound key (ancestor _id chain joined with |) and,
+     * for backward compatibility, by instance _id alone when it differs from the compound key.
+     */
     private removeOverridesForMatchingInstances;
     private removeKeysFromMap;
 }

package/dist/index.js

@@ -700,32 +700,12 @@ var CompositionConverterService = class {
           this.logger.debug(`Generated reference content type "${targetType}" with ${contentType.fields.length} field(s): ${contentType.fields.map((f) => f.id).join(", ")}`);
         }
         if (isBlockType) {
-          let blockId = targetType;
-          let needsRename = false;
-          if (isRefType) {
-            needsRename = true;
-          }
-          if (!needsRename) {
-            const existingPath = this.fileSystem.joinPath(contentTypesDirFull, `${targetType}.json`);
-            if (await this.fileSystem.fileExists(existingPath)) {
-              try {
-                const existing = await this.fileSystem.readFile(existingPath);
-                if (existing?.type !== "block") {
-                  needsRename = true;
-                }
-              } catch {
-              }
-            }
-          }
-          if (needsRename) {
-            blockId = `${targetType}Block`;
-            this.logger.info(`Content type "${targetType}" already exists as non-block, using "${blockId}" for block`);
-          }
+          const blockId = `${targetType}Block`;
           blockTypeIdMap.set(targetType, blockId);
           const blockContentType = this.generateContentType(component);
           blockContentType.type = "block";
           blockContentType.id = blockId;
-          blockContentType.name = needsRename ? `${blockContentType.name} Block` : blockContentType.name;
+          blockContentType.name = `${blockContentType.name} Block`;
           targetContentTypeMap.set(blockId, blockContentType);
           this.logger.debug(`Generated block content type "${blockId}" with ${blockContentType.fields.length} field(s): ${blockContentType.fields.map((f) => f.id).join(", ")}`);
         }
@@ -740,7 +720,7 @@ var CompositionConverterService = class {
           this.logger.info(`Component type not found: ${targetType}`);
           missingTargetTypes.push(targetType);
           if (isBlockType) {
-            blockTypeIdMap.set(targetType, targetType);
+            blockTypeIdMap.set(targetType, `${targetType}Block`);
           }
           continue;
         }
@@ -791,34 +771,19 @@ var CompositionConverterService = class {
           this.logger.debug(`Generated slot reference content type "${targetType}" with ${contentType.fields.length} field(s)`);
         }
         if (isSlotBlockType && !blockTypeIdMap.has(targetType)) {
-          let blockId = targetType;
-          let needsRename = isSlotRefType;
-          if (!needsRename) {
-            const existingPath = this.fileSystem.joinPath(contentTypesDirFull, `${targetType}.json`);
-            if (await this.fileSystem.fileExists(existingPath)) {
-              try {
-                const existing = await this.fileSystem.readFile(existingPath);
-                if (existing?.type !== "block") needsRename = true;
-              } catch {
-              }
-            }
-          }
-          if (needsRename) {
-            blockId = `${targetType}Block`;
-            this.logger.info(`Content type "${targetType}" already exists as non-block, using "${blockId}" for block`);
-          }
+          const blockId = `${targetType}Block`;
           blockTypeIdMap.set(targetType, blockId);
           const blockContentType = this.generateContentType(component);
           blockContentType.type = "block";
           blockContentType.id = blockId;
-          blockContentType.name = needsRename ? `${blockContentType.name} Block` : blockContentType.name;
+          blockContentType.name = `${blockContentType.name} Block`;
           targetContentTypeMap.set(blockId, blockContentType);
           this.logger.debug(`Generated slot block content type "${blockId}" with ${blockContentType.fields.length} field(s)`);
         }
       } catch (error) {
         if (error instanceof ComponentNotFoundError) {
           this.logger.info(`Component type not found: ${targetType}`);
-          if (isSlotBlockType && !blockTypeIdMap.has(targetType)) blockTypeIdMap.set(targetType, targetType);
+          if (isSlotBlockType && !blockTypeIdMap.has(targetType)) blockTypeIdMap.set(targetType, `${targetType}Block`);
           continue;
         }
         throw error;
@@ -2890,6 +2855,9 @@ var ParameterRemoverService = class {
       strict,
       "composition"
     );
+    this.logger.info(
+      `Compositions (${compositionsDir}): ${compositionsResult.totalFilesMatched} file(s) matched, ${compositionsResult.validCompositionDocuments} with a composition root.`
+    );
     const compositionPatternsResult = await this.removeParameterInDirectory(
       fullCompositionPatternsDir,
       componentType,
@@ -2898,6 +2866,9 @@ var ParameterRemoverService = class {
       strict,
       "compositionPattern"
     );
+    this.logger.info(
+      `Composition patterns (${compositionPatternsDir}): ${compositionPatternsResult.totalFilesMatched} file(s) matched, ${compositionPatternsResult.validCompositionDocuments} with a composition root.`
+    );
     const componentPatternsResult = await this.removeParameterInDirectory(
       fullComponentPatternsDir,
       componentType,
@@ -2906,6 +2877,9 @@ var ParameterRemoverService = class {
       strict,
       "componentPattern"
     );
+    this.logger.info(
+      `Component patterns (${componentPatternsDir}): ${componentPatternsResult.totalFilesMatched} file(s) matched, ${componentPatternsResult.validCompositionDocuments} with a composition root.`
+    );
     const totalFiles = compositionsResult.filesModified + compositionPatternsResult.filesModified + componentPatternsResult.filesModified;
     const totalInstances = compositionsResult.instancesUpdated + compositionPatternsResult.instancesUpdated + componentPatternsResult.instancesUpdated;
     this.logger.info("");
@@ -2925,13 +2899,25 @@ var ParameterRemoverService = class {
     try {
       files = await this.fileSystem.findFiles(directory, "**/*.{json,yaml,yml}");
     } catch {
-      return { filesModified: 0, instancesUpdated: 0 };
+      return {
+        filesModified: 0,
+        instancesUpdated: 0,
+        totalFilesMatched: 0,
+        validCompositionDocuments: 0
+      };
     }
+    const totalFilesMatched = files.length;
     if (files.length === 0) {
-      return { filesModified: 0, instancesUpdated: 0 };
+      return {
+        filesModified: 0,
+        instancesUpdated: 0,
+        totalFilesMatched: 0,
+        validCompositionDocuments: 0
+      };
     }
     let filesModified = 0;
     let instancesUpdated = 0;
+    let validCompositionDocuments = 0;
     for (const filePath of files) {
       let composition;
       try {
@@ -2942,6 +2928,7 @@ var ParameterRemoverService = class {
       if (!composition?.composition) {
         continue;
       }
+      validCompositionDocuments++;
       const count = this.removeParameterFromTree(
         composition.composition,
         componentType,
@@ -2969,7 +2956,7 @@ var ParameterRemoverService = class {
         instancesUpdated += totalCount;
       }
     }
-    return { filesModified, instancesUpdated };
+    return { filesModified, instancesUpdated, totalFilesMatched, validCompositionDocuments };
   }
   removeParameterFromTree(node, componentType, parameterIds, strict) {
     let count = 0;
@@ -3011,24 +2998,54 @@ var ParameterRemoverService = class {
       componentType,
       parameterIds,
       strict,
-      counter
+      counter,
+      [composition.composition._id]
     );
     count += counter.count;
+    const slotTreeCounter = { count: 0 };
+    this.removeParameterFromOverrideSlotTrees(
+      composition.composition._overrides,
+      componentType,
+      parameterIds,
+      strict,
+      slotTreeCounter
+    );
+    count += slotTreeCounter.count;
     return count;
   }
-  removeOverridesForMatchingInstances(node, overrides, componentType, parameterIds, strict, counter) {
+  removeParameterFromOverrideSlotTrees(overrides, componentType, parameterIds, strict, counter) {
+    for (const entry of Object.values(overrides)) {
+      const slots = entry.slots;
+      if (!slots) continue;
+      for (const slotInstances of Object.values(slots)) {
+        if (!Array.isArray(slotInstances)) continue;
+        for (const instance of slotInstances) {
+          counter.count += this.removeParameterFromTree(instance, componentType, parameterIds, strict);
+        }
+      }
+    }
+  }
+  removeOverridesForMatchingInstances(node, overrides, componentType, parameterIds, strict, counter, idPath) {
     if (node.slots) {
       for (const slotInstances of Object.values(node.slots)) {
         if (!Array.isArray(slotInstances)) continue;
         for (const instance of slotInstances) {
           if (this.compareIds(instance.type, componentType, strict) && instance._id) {
-            const instanceOverrides = overrides[instance._id];
-            if (instanceOverrides?.parameters) {
-              const removed = this.removeKeysFromMap(instanceOverrides.parameters, parameterIds, strict);
-              if (removed > 0) {
-                counter.count++;
+            const compoundKey = [...idPath, instance._id].join("|");
+            const keysToTry = compoundKey === instance._id ? [compoundKey] : [compoundKey, instance._id];
+            let removedAny = false;
+            for (const overrideKey of keysToTry) {
+              const instanceOverrides = overrides[overrideKey];
+              if (instanceOverrides?.parameters) {
+                const removed = this.removeKeysFromMap(instanceOverrides.parameters, parameterIds, strict);
+                if (removed > 0) {
+                  removedAny = true;
+                }
               }
             }
+            if (removedAny) {
+              counter.count++;
+            }
           }
           this.removeOverridesForMatchingInstances(
             instance,
@@ -3036,7 +3053,8 @@ var ParameterRemoverService = class {
             componentType,
             parameterIds,
             strict,
-            counter
+            counter,
+            [...idPath, instance._id ?? ""]
           );
         }
       }
@@ -3117,6 +3135,9 @@ var FieldRemoverService = class {
       strict,
       "composition"
     );
+    this.logger.info(
+      `Compositions (${compositionsDir}): ${compositionsResult.totalFilesMatched} file(s) matched, ${compositionsResult.validCompositionDocuments} with a composition root.`
+    );
     const compositionPatternsResult = await this.removeFieldInDirectory(
       fullCompositionPatternsDir,
       componentType,
@@ -3125,6 +3146,9 @@ var FieldRemoverService = class {
       strict,
       "compositionPattern"
     );
+    this.logger.info(
+      `Composition patterns (${compositionPatternsDir}): ${compositionPatternsResult.totalFilesMatched} file(s) matched, ${compositionPatternsResult.validCompositionDocuments} with a composition root.`
+    );
     const componentPatternsResult = await this.removeFieldInDirectory(
       fullComponentPatternsDir,
       componentType,
@@ -3133,6 +3157,9 @@ var FieldRemoverService = class {
       strict,
       "componentPattern"
     );
+    this.logger.info(
+      `Component patterns (${componentPatternsDir}): ${componentPatternsResult.totalFilesMatched} file(s) matched, ${componentPatternsResult.validCompositionDocuments} with a composition root.`
+    );
     const totalFiles = compositionsResult.filesModified + compositionPatternsResult.filesModified + componentPatternsResult.filesModified;
     const totalInstances = compositionsResult.instancesUpdated + compositionPatternsResult.instancesUpdated + componentPatternsResult.instancesUpdated;
     this.logger.info("");
@@ -3206,13 +3233,25 @@ var FieldRemoverService = class {
     try {
       files = await this.fileSystem.findFiles(directory, "**/*.{json,yaml,yml}");
     } catch {
-      return { filesModified: 0, instancesUpdated: 0 };
+      return {
+        filesModified: 0,
+        instancesUpdated: 0,
+        totalFilesMatched: 0,
+        validCompositionDocuments: 0
+      };
     }
+    const totalFilesMatched = files.length;
     if (files.length === 0) {
-      return { filesModified: 0, instancesUpdated: 0 };
+      return {
+        filesModified: 0,
+        instancesUpdated: 0,
+        totalFilesMatched: 0,
+        validCompositionDocuments: 0
+      };
     }
     let filesModified = 0;
     let instancesUpdated = 0;
+    let validCompositionDocuments = 0;
     for (const filePath of files) {
       let composition;
       try {
@@ -3223,6 +3262,7 @@ var FieldRemoverService = class {
       if (!composition?.composition) {
         continue;
       }
+      validCompositionDocuments++;
       const treeCount = this.removeFieldFromTree(
         composition.composition,
         componentType,
@@ -3250,7 +3290,7 @@ var FieldRemoverService = class {
         instancesUpdated += totalCount;
       }
     }
-    return { filesModified, instancesUpdated };
+    return { filesModified, instancesUpdated, totalFilesMatched, validCompositionDocuments };
   }
   removeFieldFromTree(node, componentType, parameterIds, strict) {
     let count = 0;
@@ -3276,8 +3316,8 @@ var FieldRemoverService = class {
     }
     let count = 0;
     if (this.compareIds(composition.composition.type, componentType, strict)) {
-      const rootId = composition.composition._id;
-      const rootOverrides = composition.composition._overrides[rootId];
+      const rootId2 = composition.composition._id;
+      const rootOverrides = composition.composition._overrides[rootId2];
       if (rootOverrides?.parameters) {
         const removed = this.removeKeysFromMap(rootOverrides.parameters, parameterIds, strict);
         if (removed > 0) {
@@ -3285,8 +3325,16 @@ var FieldRemoverService = class {
         }
       }
     }
+    const rootId = composition.composition._id;
     count += this.removeOverridesForMatchingInstances(
       composition.composition,
+      composition.composition._overrides,
+      componentType,
+      parameterIds,
+      strict,
+      [rootId]
+    );
+    count += this.removeFieldFromOverrideSlotTrees(
       composition.composition._overrides,
       componentType,
       parameterIds,
@@ -3294,27 +3342,58 @@ var FieldRemoverService = class {
     );
     return count;
   }
-  removeOverridesForMatchingInstances(node, overrides, componentType, parameterIds, strict) {
+  /**
+   * Walks every _overrides entry's `slots` trees (if present) and removes parameter keys from
+   * matching component instances. Uniform often stores nested slot patches only here.
+   */
+  removeFieldFromOverrideSlotTrees(overrides, componentType, parameterIds, strict) {
+    let count = 0;
+    for (const entry of Object.values(overrides)) {
+      const slots = entry.slots;
+      if (!slots) continue;
+      for (const slotInstances of Object.values(slots)) {
+        if (!Array.isArray(slotInstances)) continue;
+        for (const instance of slotInstances) {
+          count += this.removeFieldFromTree(instance, componentType, parameterIds, strict);
+        }
+      }
+    }
+    return count;
+  }
+  /**
+   * Looks up override entries by compound key (ancestor _id chain joined with |) and,
+   * for backward compatibility, by instance _id alone when it differs from the compound key.
+   */
+  removeOverridesForMatchingInstances(node, overrides, componentType, parameterIds, strict, idPath) {
     let count = 0;
     if (node.slots) {
       for (const slotInstances of Object.values(node.slots)) {
         if (!Array.isArray(slotInstances)) continue;
         for (const instance of slotInstances) {
           if (this.compareIds(instance.type, componentType, strict) && instance._id) {
-            const instanceOverrides = overrides[instance._id];
-            if (instanceOverrides?.parameters) {
-              const removed = this.removeKeysFromMap(instanceOverrides.parameters, parameterIds, strict);
-              if (removed > 0) {
-                count++;
+            const compoundKey = [...idPath, instance._id].join("|");
+            const keysToTry = compoundKey === instance._id ? [compoundKey] : [compoundKey, instance._id];
+            let removedAny = false;
+            for (const overrideKey of keysToTry) {
+              const instanceOverrides = overrides[overrideKey];
+              if (instanceOverrides?.parameters) {
+                const removed = this.removeKeysFromMap(instanceOverrides.parameters, parameterIds, strict);
+                if (removed > 0) {
+                  removedAny = true;
+                }
               }
             }
+            if (removedAny) {
+              count++;
+            }
           }
           count += this.removeOverridesForMatchingInstances(
             instance,
             overrides,
             componentType,
             parameterIds,
-            strict
+            strict,
+            [...idPath, instance._id ?? ""]
           );
         }
       }