@uniformdev/transformer 1.1.31 → 1.1.32

package/dist/index.d.ts

@@ -252,6 +252,7 @@ declare class ComponentService {
     addParameterToComponent(component: ComponentDefinition, parameter: Parameter, options?: FindOptions$1): ComponentDefinition;
     ensureGroupExists(component: ComponentDefinition, groupId: string, groupName?: string, options?: FindOptions$1): ComponentDefinition;
     addParameterToGroup(component: ComponentDefinition, groupId: string, parameterId: string, options?: FindOptions$1): ComponentDefinition;
+    resolveRemoveIds(component: ComponentDefinition, parameterId: string, options?: FindOptions$1): string[];
     removeParameter(component: ComponentDefinition, parameterId: string, options?: FindOptions$1): ComponentDefinition;
     removeEmptyGroups(component: ComponentDefinition): ComponentDefinition;
     findSlot(component: ComponentDefinition, slotId: string, options?: FindOptions$1): SlotDefinition | undefined;
@@ -573,11 +574,12 @@ declare class ParameterRemoverService {
     private removeParameterFromTree;
     private removeParameterFromOverrides;
     private removeOverridesForMatchingInstances;
-    private removeKeyFromMap;
+    private removeKeysFromMap;
 }
 
 interface RemoveFieldInternalOptions {
     rootDir: string;
+    componentsDir: string;
     compositionsDir: string;
     compositionPatternsDir: string;
     componentPatternsDir: string;
@@ -594,15 +596,16 @@ interface RemoveFieldResult {
 }
 declare class FieldRemoverService {
     private fileSystem;
+    private componentService;
     private logger;
-    constructor(fileSystem: FileSystemService, logger: Logger);
+    constructor(fileSystem: FileSystemService, componentService: ComponentService, logger: Logger);
     private compareIds;
     remove(options: RemoveFieldInternalOptions): Promise<RemoveFieldResult>;
     private removeFieldInDirectory;
     private removeFieldFromTree;
     private removeFieldFromOverrides;
     private removeOverridesForMatchingInstances;
-    private removeKeyFromMap;
+    private removeKeysFromMap;
 }
 
 export { type AddComponentOptions, type AddComponentParameterOptions, type AddComponentPatternOptions, type AddContentTypeFieldOptions, ComponentAdderService, ComponentAlreadyExistsError, type ComponentDefinition, type ComponentInstance, ComponentNotFoundError, ComponentRenamerService, ComponentService, type Composition, CompositionConverterService, type CompositionOverrides, type CompositionPatternCandidatesOptions, type CompositionRoot, CompositionService, type ContentTypeDefinition$1 as ContentTypeDefinition, type ContentTypeField$1 as ContentTypeField, type ConvertCompositionsToEntriesOptions, DuplicateIdError, FieldRemoverService, FileNotFoundError, FileSystemService, type FlattenBlockFieldOptions, type GlobalOptions, InvalidYamlError, Logger, type PackSerializationOptions, type Parameter, ParameterRemoverService, type ParameterValue, type PropagateRootComponentPropertyOptions, type PropagateRootComponentSlotOptions, PropertyNotFoundError, PropertyPropagatorService, type RemoveFieldOptions, type RemoveParameterOptions, type RenameComponentOptions, type RenameSlotOptions, SlotAlreadyExistsError, type SlotDefinition, SlotNotFoundError, SlotRenamerService, TransformError, type UnpackSerializationOptions, computeGuidHash, regenerateIds };

package/dist/index.js

@@ -336,18 +336,31 @@ var ComponentService = class {
     }
     return component;
   }
+  resolveRemoveIds(component, parameterId, options = {}) {
+    const param = this.findParameter(component, parameterId, options);
+    if (!param) return [];
+    if (!this.isGroupParameter(param)) {
+      return [param.id];
+    }
+    const ids = [param.id];
+    for (const childId of param.typeConfig?.childrenParams ?? []) {
+      ids.push(...this.resolveRemoveIds(component, childId, options));
+    }
+    return ids;
+  }
   removeParameter(component, parameterId, options = {}) {
     const { strict = false } = options;
     if (!component.parameters) {
       return component;
     }
+    const idsToRemove = this.resolveRemoveIds(component, parameterId, options);
     component.parameters = component.parameters.filter(
-      (p) => !this.compareIds(p.id, parameterId, strict)
+      (p) => !idsToRemove.some((id) => this.compareIds(p.id, id, strict))
     );
     for (const param of component.parameters) {
       if (this.isGroupParameter(param) && param.typeConfig?.childrenParams) {
         param.typeConfig.childrenParams = param.typeConfig.childrenParams.filter(
-          (id) => !this.compareIds(id, parameterId, strict)
+          (id) => !idsToRemove.some((removeId) => this.compareIds(id, removeId, strict))
         );
       }
     }
@@ -2506,11 +2519,20 @@ var ParameterRemoverService = class {
     if (!param) {
       throw new PropertyNotFoundError(parameterId, componentType);
     }
+    const allIdsToRemove = this.componentService.resolveRemoveIds(component, parameterId, findOptions);
+    const childIds = allIdsToRemove.filter((id) => !this.compareIds(id, parameterId, strict));
     this.logger.action(
       whatIf,
       "REMOVE",
       `Parameter "${parameterId}" from component/${this.fileSystem.getBasename(componentFilePath)}`
     );
+    if (childIds.length > 0) {
+      this.logger.action(
+        whatIf,
+        "REMOVE",
+        `Cascade-removing ${childIds.length} child parameter(s) [${childIds.join(", ")}] from component/${this.fileSystem.getBasename(componentFilePath)}`
+      );
+    }
     let modifiedComponent = this.componentService.removeParameter(component, parameterId, findOptions);
     const beforeGroupCount = modifiedComponent.parameters?.filter(
       (p) => this.componentService.isGroupParameter(p)
@@ -2533,7 +2555,7 @@ var ParameterRemoverService = class {
     const compositionsResult = await this.removeParameterInDirectory(
       fullCompositionsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "composition"
@@ -2541,7 +2563,7 @@ var ParameterRemoverService = class {
     const compositionPatternsResult = await this.removeParameterInDirectory(
       fullCompositionPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "compositionPattern"
@@ -2549,7 +2571,7 @@ var ParameterRemoverService = class {
     const componentPatternsResult = await this.removeParameterInDirectory(
       fullComponentPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "componentPattern"
@@ -2568,7 +2590,7 @@ var ParameterRemoverService = class {
       instancesUpdated: totalInstances
     };
   }
-  async removeParameterInDirectory(directory, componentType, parameterId, whatIf, strict, label) {
+  async removeParameterInDirectory(directory, componentType, parameterIds, whatIf, strict, label) {
     let files;
     try {
       files = await this.fileSystem.findFiles(directory, "**/*.{json,yaml,yml}");
@@ -2593,13 +2615,13 @@ var ParameterRemoverService = class {
       const count = this.removeParameterFromTree(
         composition.composition,
         componentType,
-        parameterId,
+        parameterIds,
         strict
       );
       const overridesCount = this.removeParameterFromOverrides(
         composition,
         componentType,
-        parameterId,
+        parameterIds,
         strict
       );
       const totalCount = count + overridesCount;
@@ -2619,11 +2641,11 @@ var ParameterRemoverService = class {
     }
     return { filesModified, instancesUpdated };
   }
-  removeParameterFromTree(node, componentType, parameterId, strict) {
+  removeParameterFromTree(node, componentType, parameterIds, strict) {
     let count = 0;
     if (this.compareIds(node.type, componentType, strict) && node.parameters) {
-      const removed = this.removeKeyFromMap(node.parameters, parameterId, strict);
-      if (removed) {
+      const removed = this.removeKeysFromMap(node.parameters, parameterIds, strict);
+      if (removed > 0) {
         count++;
       }
     }
@@ -2631,13 +2653,13 @@ var ParameterRemoverService = class {
       for (const slotInstances of Object.values(node.slots)) {
         if (!Array.isArray(slotInstances)) continue;
         for (const instance of slotInstances) {
-          count += this.removeParameterFromTree(instance, componentType, parameterId, strict);
+          count += this.removeParameterFromTree(instance, componentType, parameterIds, strict);
         }
       }
     }
     return count;
   }
-  removeParameterFromOverrides(composition, componentType, parameterId, strict) {
+  removeParameterFromOverrides(composition, componentType, parameterIds, strict) {
     if (!composition.composition._overrides) {
       return 0;
     }
@@ -2646,8 +2668,8 @@ var ParameterRemoverService = class {
       const rootId = composition.composition._id;
       const rootOverrides = composition.composition._overrides[rootId];
       if (rootOverrides?.parameters) {
-        const removed = this.removeKeyFromMap(rootOverrides.parameters, parameterId, strict);
-        if (removed) {
+        const removed = this.removeKeysFromMap(rootOverrides.parameters, parameterIds, strict);
+        if (removed > 0) {
           count++;
         }
       }
@@ -2657,14 +2679,14 @@ var ParameterRemoverService = class {
       composition.composition,
       composition.composition._overrides,
       componentType,
-      parameterId,
+      parameterIds,
       strict,
       counter
     );
     count += counter.count;
     return count;
   }
-  removeOverridesForMatchingInstances(node, overrides, componentType, parameterId, strict, counter) {
+  removeOverridesForMatchingInstances(node, overrides, componentType, parameterIds, strict, counter) {
     if (node.slots) {
       for (const slotInstances of Object.values(node.slots)) {
         if (!Array.isArray(slotInstances)) continue;
@@ -2672,8 +2694,8 @@ var ParameterRemoverService = class {
           if (this.compareIds(instance.type, componentType, strict) && instance._id) {
             const instanceOverrides = overrides[instance._id];
             if (instanceOverrides?.parameters) {
-              const removed = this.removeKeyFromMap(instanceOverrides.parameters, parameterId, strict);
-              if (removed) {
+              const removed = this.removeKeysFromMap(instanceOverrides.parameters, parameterIds, strict);
+              if (removed > 0) {
                 counter.count++;
               }
             }
@@ -2682,7 +2704,7 @@ var ParameterRemoverService = class {
             instance,
             overrides,
             componentType,
-            parameterId,
+            parameterIds,
             strict,
             counter
           );
@@ -2690,22 +2712,24 @@ var ParameterRemoverService = class {
       }
     }
   }
-  removeKeyFromMap(map, key, strict) {
-    const matchingKey = Object.keys(map).find(
-      (k) => this.compareIds(k, key, strict)
-    );
-    if (!matchingKey) {
-      return false;
+  removeKeysFromMap(map, keys, strict) {
+    let removed = 0;
+    for (const key of keys) {
+      const matchingKey = Object.keys(map).find((k) => this.compareIds(k, key, strict));
+      if (matchingKey) {
+        delete map[matchingKey];
+        removed++;
+      }
     }
-    delete map[matchingKey];
-    return true;
+    return removed;
   }
 };
 
 // src/core/services/field-remover.service.ts
 var FieldRemoverService = class {
-  constructor(fileSystem, logger) {
+  constructor(fileSystem, componentService, logger) {
     this.fileSystem = fileSystem;
+    this.componentService = componentService;
     this.logger = logger;
   }
   compareIds(id1, id2, strict) {
@@ -2717,6 +2741,7 @@ var FieldRemoverService = class {
   async remove(options) {
     const {
       rootDir,
+      componentsDir,
       compositionsDir,
       compositionPatternsDir,
       componentPatternsDir,
@@ -2725,14 +2750,29 @@ var FieldRemoverService = class {
       whatIf,
       strict
     } = options;
+    const findOptions = { strict };
+    const fullComponentsDir = this.fileSystem.resolvePath(rootDir, componentsDir);
     const fullCompositionsDir = this.fileSystem.resolvePath(rootDir, compositionsDir);
     const fullCompositionPatternsDir = this.fileSystem.resolvePath(rootDir, compositionPatternsDir);
     const fullComponentPatternsDir = this.fileSystem.resolvePath(rootDir, componentPatternsDir);
+    let allIdsToRemove = [parameterId];
+    try {
+      const { component } = await this.componentService.loadComponent(fullComponentsDir, componentType, findOptions);
+      const resolved = this.componentService.resolveRemoveIds(component, parameterId, findOptions);
+      if (resolved.length > 0) {
+        allIdsToRemove = resolved;
+      }
+    } catch {
+    }
+    const childIds = allIdsToRemove.filter((id) => id.toLowerCase() !== parameterId.toLowerCase());
+    if (childIds.length > 0) {
+      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 compositionsResult = await this.removeFieldInDirectory(
       fullCompositionsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "composition"
@@ -2740,7 +2780,7 @@ var FieldRemoverService = class {
     const compositionPatternsResult = await this.removeFieldInDirectory(
       fullCompositionPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "compositionPattern"
@@ -2748,7 +2788,7 @@ var FieldRemoverService = class {
     const componentPatternsResult = await this.removeFieldInDirectory(
       fullComponentPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "componentPattern"
@@ -2766,7 +2806,7 @@ var FieldRemoverService = class {
       instancesUpdated: totalInstances
     };
   }
-  async removeFieldInDirectory(directory, componentType, parameterId, whatIf, strict, label) {
+  async removeFieldInDirectory(directory, componentType, parameterIds, whatIf, strict, label) {
     let files;
     try {
       files = await this.fileSystem.findFiles(directory, "**/*.{json,yaml,yml}");
@@ -2791,13 +2831,13 @@ var FieldRemoverService = class {
       const treeCount = this.removeFieldFromTree(
         composition.composition,
         componentType,
-        parameterId,
+        parameterIds,
         strict
       );
       const overridesCount = this.removeFieldFromOverrides(
         composition,
         componentType,
-        parameterId,
+        parameterIds,
         strict
       );
       const totalCount = treeCount + overridesCount;
@@ -2817,11 +2857,11 @@ var FieldRemoverService = class {
     }
     return { filesModified, instancesUpdated };
   }
-  removeFieldFromTree(node, componentType, parameterId, strict) {
+  removeFieldFromTree(node, componentType, parameterIds, strict) {
     let count = 0;
     if (this.compareIds(node.type, componentType, strict) && node.parameters) {
-      const removed = this.removeKeyFromMap(node.parameters, parameterId, strict);
-      if (removed) {
+      const removed = this.removeKeysFromMap(node.parameters, parameterIds, strict);
+      if (removed > 0) {
         count++;
       }
     }
@@ -2829,13 +2869,13 @@ var FieldRemoverService = class {
       for (const slotInstances of Object.values(node.slots)) {
         if (!Array.isArray(slotInstances)) continue;
         for (const instance of slotInstances) {
-          count += this.removeFieldFromTree(instance, componentType, parameterId, strict);
+          count += this.removeFieldFromTree(instance, componentType, parameterIds, strict);
         }
       }
     }
     return count;
   }
-  removeFieldFromOverrides(composition, componentType, parameterId, strict) {
+  removeFieldFromOverrides(composition, componentType, parameterIds, strict) {
     if (!composition.composition._overrides) {
       return 0;
     }
@@ -2844,8 +2884,8 @@ var FieldRemoverService = class {
       const rootId = composition.composition._id;
       const rootOverrides = composition.composition._overrides[rootId];
       if (rootOverrides?.parameters) {
-        const removed = this.removeKeyFromMap(rootOverrides.parameters, parameterId, strict);
-        if (removed) {
+        const removed = this.removeKeysFromMap(rootOverrides.parameters, parameterIds, strict);
+        if (removed > 0) {
           count++;
         }
       }
@@ -2854,12 +2894,12 @@ var FieldRemoverService = class {
       composition.composition,
       composition.composition._overrides,
       componentType,
-      parameterId,
+      parameterIds,
       strict
     );
     return count;
   }
-  removeOverridesForMatchingInstances(node, overrides, componentType, parameterId, strict) {
+  removeOverridesForMatchingInstances(node, overrides, componentType, parameterIds, strict) {
     let count = 0;
     if (node.slots) {
       for (const slotInstances of Object.values(node.slots)) {
@@ -2868,8 +2908,8 @@ var FieldRemoverService = class {
           if (this.compareIds(instance.type, componentType, strict) && instance._id) {
             const instanceOverrides = overrides[instance._id];
             if (instanceOverrides?.parameters) {
-              const removed = this.removeKeyFromMap(instanceOverrides.parameters, parameterId, strict);
-              if (removed) {
+              const removed = this.removeKeysFromMap(instanceOverrides.parameters, parameterIds, strict);
+              if (removed > 0) {
                 count++;
               }
             }
@@ -2878,7 +2918,7 @@ var FieldRemoverService = class {
             instance,
             overrides,
             componentType,
-            parameterId,
+            parameterIds,
             strict
           );
         }
@@ -2886,15 +2926,16 @@ var FieldRemoverService = class {
     }
     return count;
   }
-  removeKeyFromMap(map, key, strict) {
-    const matchingKey = Object.keys(map).find(
-      (k) => this.compareIds(k, key, strict)
-    );
-    if (!matchingKey) {
-      return false;
+  removeKeysFromMap(map, keys, strict) {
+    let removed = 0;
+    for (const key of keys) {
+      const matchingKey = Object.keys(map).find((k) => this.compareIds(k, key, strict));
+      if (matchingKey) {
+        delete map[matchingKey];
+        removed++;
+      }
     }
-    delete map[matchingKey];
-    return true;
+    return removed;
   }
 };