@uniformdev/transformer 1.1.51 → 1.1.53

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;
 }
@@ -620,6 +623,7 @@ interface RemoveFieldInternalOptions {
     compositionsDir: string;
     compositionPatternsDir: string;
     componentPatternsDir: string;
+    contentTypesDir: string;
     componentType: string;
     parameterId: string;
     whatIf: boolean;
@@ -629,6 +633,7 @@ interface RemoveFieldResult {
     compositionsModified: number;
     compositionPatternsModified: number;
     componentPatternsModified: number;
+    contentTypesModified: number;
     instancesUpdated: number;
 }
 declare class FieldRemoverService {
@@ -638,9 +643,19 @@ declare class FieldRemoverService {
     constructor(fileSystem: FileSystemService, componentService: ComponentService, logger: Logger);
     private compareIds;
     remove(options: RemoveFieldInternalOptions): Promise<RemoveFieldResult>;
+    private removeFieldFromContentTypes;
     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

@@ -2890,6 +2890,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 +2901,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 +2912,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 +2934,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 +2963,7 @@ var ParameterRemoverService = class {
       if (!composition?.composition) {
         continue;
       }
+      validCompositionDocuments++;
       const count = this.removeParameterFromTree(
         composition.composition,
         componentType,
@@ -2969,7 +2991,7 @@ var ParameterRemoverService = class {
         instancesUpdated += totalCount;
       }
     }
-    return { filesModified, instancesUpdated };
+    return { filesModified, instancesUpdated, totalFilesMatched, validCompositionDocuments };
   }
   removeParameterFromTree(node, componentType, parameterIds, strict) {
     let count = 0;
@@ -3011,24 +3033,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 +3088,8 @@ var ParameterRemoverService = class {
             componentType,
             parameterIds,
             strict,
-            counter
+            counter,
+            [...idPath, instance._id ?? ""]
           );
         }
       }
@@ -3076,6 +3129,7 @@ var FieldRemoverService = class {
       compositionsDir,
       compositionPatternsDir,
       componentPatternsDir,
+      contentTypesDir,
       componentType,
       parameterId,
       whatIf,
@@ -3086,6 +3140,7 @@ var FieldRemoverService = class {
     const fullCompositionsDir = this.fileSystem.resolvePath(rootDir, compositionsDir);
     const fullCompositionPatternsDir = this.fileSystem.resolvePath(rootDir, compositionPatternsDir);
     const fullComponentPatternsDir = this.fileSystem.resolvePath(rootDir, componentPatternsDir);
+    const fullContentTypesDir = this.fileSystem.resolvePath(rootDir, contentTypesDir);
     let allIdsToRemove = [parameterId];
     try {
       const { component } = await this.componentService.loadComponent(fullComponentsDir, componentType, findOptions);
@@ -3100,6 +3155,13 @@ var FieldRemoverService = class {
       this.logger.info(`Cascade-removing ${childIds.length} child field(s) [${childIds.join(", ")}] along with "${parameterId}"`);
     }
     this.logger.info(`Removing field "${parameterId}" from instances of ${componentType}`);
+    const contentTypesModified = await this.removeFieldFromContentTypes(
+      fullContentTypesDir,
+      componentType,
+      allIdsToRemove,
+      whatIf,
+      strict
+    );
     const compositionsResult = await this.removeFieldInDirectory(
       fullCompositionsDir,
       componentType,
@@ -3108,6 +3170,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,
@@ -3116,6 +3181,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,
@@ -3124,31 +3192,101 @@ 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("");
     this.logger.info(
-      `Summary: ${totalFiles} file(s) (${totalInstances} instance(s)) updated.`
+      `Summary: ${contentTypesModified} content type(s), ${totalFiles} file(s) (${totalInstances} instance(s)) updated.`
     );
     return {
       compositionsModified: compositionsResult.filesModified,
       compositionPatternsModified: compositionPatternsResult.filesModified,
       componentPatternsModified: componentPatternsResult.filesModified,
+      contentTypesModified,
       instancesUpdated: totalInstances
     };
   }
+  async removeFieldFromContentTypes(contentTypesDir, componentType, fieldIds, whatIf, strict) {
+    let files;
+    try {
+      files = await this.fileSystem.findFiles(contentTypesDir, "**/*.{json,yaml,yml}");
+    } catch {
+      return 0;
+    }
+    if (files.length === 0) {
+      return 0;
+    }
+    const isWildcard = componentType === "*";
+    let contentTypesModified = 0;
+    for (const filePath of files) {
+      let contentType;
+      try {
+        contentType = await this.fileSystem.readFile(filePath);
+      } catch {
+        continue;
+      }
+      if (!contentType?.id || !contentType.fields) {
+        continue;
+      }
+      if (!isWildcard && !this.compareIds(contentType.id, componentType, strict)) {
+        continue;
+      }
+      const removedFieldIds = [];
+      contentType.fields = contentType.fields.filter((field) => {
+        const shouldRemove = fieldIds.some((id) => this.compareIds(field.id, id, strict));
+        if (shouldRemove) {
+          removedFieldIds.push(field.id);
+        }
+        return !shouldRemove;
+      });
+      if (removedFieldIds.length === 0) {
+        continue;
+      }
+      const entryName = contentType.entryName;
+      if (entryName && removedFieldIds.some((id) => this.compareIds(id, entryName, strict))) {
+        this.logger.info(`Clearing entryName "${entryName}" on content type "${contentType.id}" (field was removed)`);
+        contentType.entryName = "";
+      }
+      const relativePath = this.fileSystem.getBasename(filePath);
+      this.logger.action(
+        whatIf,
+        "UPDATE",
+        `contentType/${relativePath} (removed ${removedFieldIds.length} field(s): ${removedFieldIds.join(", ")})`
+      );
+      if (!whatIf) {
+        await this.fileSystem.writeFile(filePath, contentType);
+      }
+      contentTypesModified++;
+    }
+    return contentTypesModified;
+  }
   async removeFieldInDirectory(directory, componentType, parameterIds, whatIf, strict, label) {
     let files;
     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 {
@@ -3159,6 +3297,7 @@ var FieldRemoverService = class {
       if (!composition?.composition) {
         continue;
       }
+      validCompositionDocuments++;
       const treeCount = this.removeFieldFromTree(
         composition.composition,
         componentType,
@@ -3186,7 +3325,7 @@ var FieldRemoverService = class {
         instancesUpdated += totalCount;
       }
     }
-    return { filesModified, instancesUpdated };
+    return { filesModified, instancesUpdated, totalFilesMatched, validCompositionDocuments };
   }
   removeFieldFromTree(node, componentType, parameterIds, strict) {
     let count = 0;
@@ -3212,8 +3351,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) {
@@ -3221,8 +3360,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,
@@ -3230,27 +3377,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 ?? ""]
           );
         }
       }