@uniformdev/transformer 1.1.31 → 1.1.32

package/dist/cli/index.js

@@ -346,18 +346,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))
         );
       }
     }
@@ -4520,11 +4533,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)
@@ -4547,7 +4569,7 @@ var ParameterRemoverService = class {
     const compositionsResult = await this.removeParameterInDirectory(
       fullCompositionsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "composition"
@@ -4555,7 +4577,7 @@ var ParameterRemoverService = class {
     const compositionPatternsResult = await this.removeParameterInDirectory(
       fullCompositionPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "compositionPattern"
@@ -4563,7 +4585,7 @@ var ParameterRemoverService = class {
     const componentPatternsResult = await this.removeParameterInDirectory(
       fullComponentPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "componentPattern"
@@ -4582,7 +4604,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}");
@@ -4607,13 +4629,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;
@@ -4633,11 +4655,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++;
       }
     }
@@ -4645,13 +4667,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;
     }
@@ -4660,8 +4682,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++;
         }
       }
@@ -4671,14 +4693,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;
@@ -4686,8 +4708,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++;
               }
             }
@@ -4696,7 +4718,7 @@ var ParameterRemoverService = class {
             instance,
             overrides,
             componentType,
-            parameterId,
+            parameterIds,
             strict,
             counter
           );
@@ -4704,15 +4726,16 @@ 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;
   }
 };
 
@@ -4774,8 +4797,9 @@ import { Command as Command12 } from "commander";
 
 // 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) {
@@ -4787,6 +4811,7 @@ var FieldRemoverService = class {
   async remove(options) {
     const {
       rootDir,
+      componentsDir,
       compositionsDir,
       compositionPatternsDir,
       componentPatternsDir,
@@ -4795,14 +4820,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"
@@ -4810,7 +4850,7 @@ var FieldRemoverService = class {
     const compositionPatternsResult = await this.removeFieldInDirectory(
       fullCompositionPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "compositionPattern"
@@ -4818,7 +4858,7 @@ var FieldRemoverService = class {
     const componentPatternsResult = await this.removeFieldInDirectory(
       fullComponentPatternsDir,
       componentType,
-      parameterId,
+      allIdsToRemove,
       whatIf,
       strict,
       "componentPattern"
@@ -4836,7 +4876,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}");
@@ -4861,13 +4901,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;
@@ -4887,11 +4927,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++;
       }
     }
@@ -4899,13 +4939,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;
     }
@@ -4914,8 +4954,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++;
         }
       }
@@ -4924,12 +4964,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)) {
@@ -4938,8 +4978,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++;
               }
             }
@@ -4948,7 +4988,7 @@ var FieldRemoverService = class {
             instance,
             overrides,
             componentType,
-            parameterId,
+            parameterIds,
             strict
           );
         }
@@ -4956,15 +4996,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;
   }
 };
 
@@ -4993,10 +5034,12 @@ function createRemoveFieldCommand() {
     };
     const logger = new Logger();
     const fileSystem = new FileSystemService();
-    const remover = new FieldRemoverService(fileSystem, logger);
+    const componentService = new ComponentService(fileSystem);
+    const remover = new FieldRemoverService(fileSystem, componentService, logger);
     try {
       const result = await remover.remove({
         rootDir: options.rootDir,
+        componentsDir: options.componentsDir,
         compositionsDir: options.compositionsDir,
         compositionPatternsDir: options.compositionPatternsDir,
         componentPatternsDir: options.componentPatternsDir,
@@ -5749,7 +5792,7 @@ function createFlattenBlockFieldCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.31",
+  version: "1.1.32",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {