@uniformdev/transformer 1.1.2 → 1.1.4

package/dist/index.d.ts

@@ -119,7 +119,6 @@ interface AddComponentPatternOptions extends GlobalOptions {
     parentComponentType: string;
     slot: string;
     componentPatternId: string;
-    parameters?: string;
 }
 interface PropagateRootComponentSlotOptions extends GlobalOptions {
     compositionType: string;
@@ -367,14 +366,15 @@ declare class ComponentAdderService {
     private logger;
     constructor(fileSystem: FileSystemService, componentService: ComponentService, logger: Logger);
     private compareIds;
+    private parseParentComponentTypes;
+    private matchesAnyParentType;
     private parseParameters;
     private generateId;
-    private cloneComponentInstance;
     private regenerateInstanceIds;
     private createComponentInstance;
     private addComponentToSlot;
     addComponent(options: AddComponentInternalOptions): Promise<AddComponentResult>;
-    addComponentPattern(options: AddComponentInternalOptions): Promise<AddComponentResult>;
+    addComponentPattern(options: Omit<AddComponentInternalOptions, 'parameters'>): Promise<AddComponentResult>;
     private loadComponentPattern;
     private normalizeComponentPattern;
     private addComponentToDirectory;

package/dist/index.js

@@ -1114,6 +1114,12 @@ var ComponentAdderService = class {
     }
     return id1.toLowerCase() === id2.toLowerCase();
   }
+  parseParentComponentTypes(parentComponentType) {
+    return parentComponentType.split("|").map((t) => t.trim()).filter((t) => t.length > 0);
+  }
+  matchesAnyParentType(instanceType, parentTypes, strict) {
+    return parentTypes.some((pt) => this.compareIds(instanceType, pt, strict));
+  }
   parseParameters(parameterString) {
     const result = {};
     if (!parameterString) return result;
@@ -1129,25 +1135,9 @@ var ComponentAdderService = class {
   generateId(baseName) {
     return `${baseName}-${randomUUID().slice(0, 8)}`;
   }
-  cloneComponentInstance(instance) {
-    const clone = JSON.parse(JSON.stringify(instance));
-    if (clone._id) {
-      clone._id = this.generateId(clone.type);
-    }
-    if (clone.slots) {
-      for (const slotInstances of Object.values(clone.slots)) {
-        if (Array.isArray(slotInstances)) {
-          for (const nestedInstance of slotInstances) {
-            this.regenerateInstanceIds(nestedInstance);
-          }
-        }
-      }
-    }
-    return clone;
-  }
   regenerateInstanceIds(instance) {
     if (instance._id) {
-      instance._id = this.generateId(instance.type);
+      instance._id = instance._pattern ? randomUUID() : this.generateId(instance.type);
     }
     if (instance.slots) {
       for (const slotInstances of Object.values(instance.slots)) {
@@ -1203,18 +1193,9 @@ var ComponentAdderService = class {
     const fullCompositionPatternsDir = this.fileSystem.resolvePath(rootDir, compositionPatternsDir);
     const fullComponentPatternsDir = this.fileSystem.resolvePath(rootDir, componentPatternsDir);
     const findOptions = { strict };
-    this.logger.info(`Loading parent component: ${parentComponentType}`);
-    const { component: parentComponent, filePath: parentComponentFilePath } = await this.componentService.loadComponent(fullComponentsDir, parentComponentType, findOptions);
-    if (!parentComponent.slots) {
-      parentComponent.slots = [];
-    }
-    let slotDef = parentComponent.slots.find(
-      (s) => this.compareIds(s.id, slot, strict)
-    );
-    if (!slotDef) {
-      this.logger.info(`Slot "${slot}" not found on component "${parentComponentType}", creating it`);
-      slotDef = { id: slot, name: slot, allowedComponents: [] };
-      parentComponent.slots.push(slotDef);
+    const parentTypes = this.parseParentComponentTypes(parentComponentType);
+    if (parentTypes.length === 0) {
+      throw new TransformError("parentComponentType cannot be empty");
     }
     this.logger.info(`Validating new component: ${newComponentType}`);
     try {
@@ -1228,35 +1209,50 @@ var ComponentAdderService = class {
       throw error;
     }
     let allowedComponentsUpdated = false;
-    const slotIndex = parentComponent.slots?.findIndex(
-      (s) => this.compareIds(s.id, slotDef.id, strict)
-    );
-    if (slotIndex !== void 0 && slotIndex >= 0) {
-      const actualSlot = parentComponent.slots[slotIndex];
-      if (!actualSlot.allowedComponents) {
-        actualSlot.allowedComponents = [];
+    for (const parentType of parentTypes) {
+      this.logger.info(`Loading parent component: ${parentType}`);
+      const { component: parentComponent, filePath: parentComponentFilePath } = await this.componentService.loadComponent(fullComponentsDir, parentType, findOptions);
+      if (!parentComponent.slots) {
+        parentComponent.slots = [];
       }
-      const isAlreadyAllowed = actualSlot.allowedComponents.some(
-        (c) => this.compareIds(c, newComponentType, strict)
+      let slotDef = parentComponent.slots.find(
+        (s) => this.compareIds(s.id, slot, strict)
       );
-      if (!isAlreadyAllowed) {
-        this.logger.action(
-          whatIf,
-          "UPDATE",
-          `Adding "${newComponentType}" to allowedComponents for slot "${slot}" on component "${parentComponentType}"`
+      if (!slotDef) {
+        this.logger.info(`Slot "${slot}" not found on component "${parentType}", creating it`);
+        slotDef = { id: slot, name: slot, allowedComponents: [] };
+        parentComponent.slots.push(slotDef);
+      }
+      const slotIndex = parentComponent.slots?.findIndex(
+        (s) => this.compareIds(s.id, slotDef.id, strict)
+      );
+      if (slotIndex !== void 0 && slotIndex >= 0) {
+        const actualSlot = parentComponent.slots[slotIndex];
+        if (!actualSlot.allowedComponents) {
+          actualSlot.allowedComponents = [];
+        }
+        const isAlreadyAllowed = actualSlot.allowedComponents.some(
+          (c) => this.compareIds(c, newComponentType, strict)
         );
-        actualSlot.allowedComponents.push(newComponentType);
-        if (!whatIf) {
-          await this.componentService.saveComponent(parentComponentFilePath, parentComponent);
+        if (!isAlreadyAllowed) {
+          this.logger.action(
+            whatIf,
+            "UPDATE",
+            `Adding "${newComponentType}" to allowedComponents for slot "${slot}" on component "${parentType}"`
+          );
+          actualSlot.allowedComponents.push(newComponentType);
+          if (!whatIf) {
+            await this.componentService.saveComponent(parentComponentFilePath, parentComponent);
+          }
+          allowedComponentsUpdated = true;
         }
-        allowedComponentsUpdated = true;
       }
     }
     const parsedParams = this.parseParameters(paramString);
     const newInstance = this.createComponentInstance(newComponentType, parsedParams);
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
-      parentComponentType,
+      parentTypes,
       slot,
       newInstance,
       whatIf,
@@ -1265,7 +1261,7 @@ var ComponentAdderService = class {
     );
     const compositionPatternsResult = await this.addComponentToDirectory(
       fullCompositionPatternsDir,
-      parentComponentType,
+      parentTypes,
       slot,
       newInstance,
       whatIf,
@@ -1274,7 +1270,7 @@ var ComponentAdderService = class {
     );
     const componentPatternsResult = await this.addComponentToDirectory(
       fullComponentPatternsDir,
-      parentComponentType,
+      parentTypes,
       slot,
       newInstance,
       whatIf,
@@ -1283,7 +1279,7 @@ var ComponentAdderService = class {
     );
     this.logger.info("");
     this.logger.info(
-      `Summary: ${allowedComponentsUpdated ? "1 component definition updated, " : ""}${compositionsResult} composition(s), ${compositionPatternsResult} composition pattern(s), ${componentPatternsResult} component pattern(s) updated. ${compositionsResult + compositionPatternsResult + componentPatternsResult} instance(s) added.`
+      `Summary: ${allowedComponentsUpdated ? `${parentTypes.length} component definition(s) updated, ` : ""}${compositionsResult} composition(s), ${compositionPatternsResult} composition pattern(s), ${componentPatternsResult} component pattern(s) updated. ${compositionsResult + compositionPatternsResult + componentPatternsResult} instance(s) added.`
     );
     return {
       allowedComponentsUpdated,
@@ -1314,18 +1310,9 @@ var ComponentAdderService = class {
     const fullCompositionPatternsDir = this.fileSystem.resolvePath(rootDir, compositionPatternsDir);
     const fullComponentPatternsDir = this.fileSystem.resolvePath(rootDir, componentPatternsDir);
     const findOptions = { strict };
-    this.logger.info(`Loading parent component: ${parentComponentType}`);
-    const { component: parentComponent } = await this.componentService.loadComponent(fullComponentsDir, parentComponentType, findOptions);
-    if (!parentComponent.slots) {
-      parentComponent.slots = [];
-    }
-    let slotDef = parentComponent.slots.find(
-      (s) => this.compareIds(s.id, slot, strict)
-    );
-    if (!slotDef) {
-      this.logger.info(`Slot "${slot}" not found on component "${parentComponentType}", creating it`);
-      slotDef = { id: slot, name: slot, allowedComponents: [] };
-      parentComponent.slots.push(slotDef);
+    const parentTypes = this.parseParentComponentTypes(parentComponentType);
+    if (parentTypes.length === 0) {
+      throw new TransformError("parentComponentType cannot be empty");
     }
     this.logger.info(`Loading component pattern: ${componentPatternId}`);
     const pattern = await this.loadComponentPattern(
@@ -1339,38 +1326,55 @@ var ComponentAdderService = class {
         `Component pattern "${componentPatternId}" has no valid definition or missing type`
       );
     }
-    let allowedComponentsUpdated = false;
     const componentTypeInPattern = patternDefinition.type;
-    const slotIndex = parentComponent.slots?.findIndex(
-      (s) => this.compareIds(s.id, slotDef.id, strict)
-    );
-    if (slotIndex !== void 0 && slotIndex >= 0) {
-      const actualSlot = parentComponent.slots[slotIndex];
-      if (!actualSlot.allowedComponents) {
-        actualSlot.allowedComponents = [];
+    let allowedComponentsUpdated = false;
+    for (const parentType of parentTypes) {
+      this.logger.info(`Loading parent component: ${parentType}`);
+      const { component: parentComponent, filePath: parentComponentFilePath } = await this.componentService.loadComponent(fullComponentsDir, parentType, findOptions);
+      if (!parentComponent.slots) {
+        parentComponent.slots = [];
       }
-      const isAlreadyAllowed = actualSlot.allowedComponents.some(
-        (c) => this.compareIds(c, componentTypeInPattern, strict)
+      let slotDef = parentComponent.slots.find(
+        (s) => this.compareIds(s.id, slot, strict)
       );
-      if (!isAlreadyAllowed) {
-        this.logger.action(
-          whatIf,
-          "UPDATE",
-          `Adding "${componentTypeInPattern}" to allowedComponents for slot "${slot}" on component "${parentComponentType}"`
+      if (!slotDef) {
+        this.logger.info(`Slot "${slot}" not found on component "${parentType}", creating it`);
+        slotDef = { id: slot, name: slot, allowedComponents: [] };
+        parentComponent.slots.push(slotDef);
+      }
+      const slotIndex = parentComponent.slots?.findIndex(
+        (s) => this.compareIds(s.id, slotDef.id, strict)
+      );
+      if (slotIndex !== void 0 && slotIndex >= 0) {
+        const actualSlot = parentComponent.slots[slotIndex];
+        if (!actualSlot.allowedComponents) {
+          actualSlot.allowedComponents = [];
+        }
+        const isAlreadyAllowed = actualSlot.allowedComponents.some(
+          (c) => this.compareIds(c, componentTypeInPattern, strict)
         );
-        actualSlot.allowedComponents.push(componentTypeInPattern);
-        if (!whatIf) {
-          await this.componentService.loadComponent(fullComponentsDir, parentComponentType, findOptions).then(
-            ({ filePath }) => this.componentService.saveComponent(filePath, parentComponent)
+        if (!isAlreadyAllowed) {
+          this.logger.action(
+            whatIf,
+            "UPDATE",
+            `Adding "${componentTypeInPattern}" to allowedComponents for slot "${slot}" on component "${parentType}"`
           );
+          actualSlot.allowedComponents.push(componentTypeInPattern);
+          if (!whatIf) {
+            await this.componentService.saveComponent(parentComponentFilePath, parentComponent);
+          }
+          allowedComponentsUpdated = true;
         }
-        allowedComponentsUpdated = true;
       }
     }
-    const newInstance = this.cloneComponentInstance(patternDefinition);
+    const newInstance = {
+      type: componentTypeInPattern,
+      _pattern: pattern.componentPatternId,
+      _id: randomUUID()
+    };
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
-      parentComponentType,
+      parentTypes,
       slot,
       newInstance,
       whatIf,
@@ -1379,7 +1383,7 @@ var ComponentAdderService = class {
     );
     const compositionPatternsResult = await this.addComponentToDirectory(
       fullCompositionPatternsDir,
-      parentComponentType,
+      parentTypes,
       slot,
       newInstance,
       whatIf,
@@ -1388,7 +1392,7 @@ var ComponentAdderService = class {
     );
     const componentPatternsResult = await this.addComponentToDirectory(
       fullComponentPatternsDir,
-      parentComponentType,
+      parentTypes,
       slot,
       newInstance,
       whatIf,
@@ -1397,7 +1401,7 @@ var ComponentAdderService = class {
     );
     this.logger.info("");
     this.logger.info(
-      `Summary: ${allowedComponentsUpdated ? "1 component definition updated, " : ""}${compositionsResult} composition(s), ${compositionPatternsResult} composition pattern(s), ${componentPatternsResult} component pattern(s) updated. ${compositionsResult + compositionPatternsResult + componentPatternsResult} instance(s) added.`
+      `Summary: ${allowedComponentsUpdated ? `${parentTypes.length} component definition(s) updated, ` : ""}${compositionsResult} composition(s), ${compositionPatternsResult} composition pattern(s), ${componentPatternsResult} component pattern(s) updated. ${compositionsResult + compositionPatternsResult + componentPatternsResult} instance(s) added.`
     );
     return {
       allowedComponentsUpdated,
@@ -1448,7 +1452,7 @@ var ComponentAdderService = class {
     }
     return raw;
   }
-  async addComponentToDirectory(directory, parentComponentType, slot, newInstance, whatIf, strict, dirType) {
+  async addComponentToDirectory(directory, parentTypes, slot, newInstance, whatIf, strict, dirType) {
     const exists = await this.fileSystem.fileExists(directory);
     if (!exists) {
       this.logger.detail(`${dirType} directory does not exist, skipping`);
@@ -1481,7 +1485,7 @@ var ComponentAdderService = class {
         }
         const rootInstance = composition.composition;
         let modified = false;
-        if (this.compareIds(rootInstance.type, parentComponentType, strict)) {
+        if (this.matchesAnyParentType(rootInstance.type, parentTypes, strict)) {
           if (!rootInstance.slots) {
             rootInstance.slots = {};
           }
@@ -1493,7 +1497,7 @@ var ComponentAdderService = class {
         if (rootInstance.slots) {
           const nestedModified = this.addComponentToNestedSlots(
             rootInstance.slots,
-            parentComponentType,
+            parentTypes,
             slot,
             newInstance,
             strict
@@ -1527,12 +1531,12 @@ var ComponentAdderService = class {
     }
     return filesModified;
   }
-  addComponentToNestedSlots(slots, parentComponentType, slot, newInstance, strict) {
+  addComponentToNestedSlots(slots, parentTypes, slot, newInstance, strict) {
     let modified = false;
     for (const slotInstances of Object.values(slots)) {
       if (!Array.isArray(slotInstances)) continue;
       for (const instance of slotInstances) {
-        if (this.compareIds(instance.type, parentComponentType, strict)) {
+        if (this.matchesAnyParentType(instance.type, parentTypes, strict)) {
           if (!instance.slots) {
             instance.slots = {};
           }
@@ -1544,7 +1548,7 @@ var ComponentAdderService = class {
         if (instance.slots) {
           const nestedModified = this.addComponentToNestedSlots(
             instance.slots,
-            parentComponentType,
+            parentTypes,
             slot,
             newInstance,
             strict