@uniformdev/transformer 1.1.1 → 1.1.3

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;
@@ -369,13 +368,13 @@ declare class ComponentAdderService {
     private compareIds;
     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;
     private addComponentToNestedSlots;
 }

package/dist/index.js

@@ -1129,25 +1129,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)) {
@@ -1367,7 +1351,11 @@ var ComponentAdderService = class {
         allowedComponentsUpdated = true;
       }
     }
-    const newInstance = this.cloneComponentInstance(patternDefinition);
+    const newInstance = {
+      type: componentTypeInPattern,
+      _pattern: pattern.componentPatternId,
+      _id: randomUUID()
+    };
     const compositionsResult = await this.addComponentToDirectory(
       fullCompositionsDir,
       parentComponentType,
@@ -1411,26 +1399,42 @@ var ComponentAdderService = class {
     const jsonPath = this.fileSystem.joinPath(componentPatternsDir, `${patternId}.json`);
     const yamlPath = this.fileSystem.joinPath(componentPatternsDir, `${patternId}.yaml`);
     const ymlPath = this.fileSystem.joinPath(componentPatternsDir, `${patternId}.yml`);
+    let raw;
     if (await this.fileSystem.fileExists(jsonPath)) {
-      return this.fileSystem.readFile(jsonPath);
+      raw = await this.fileSystem.readFile(jsonPath);
+    } else if (await this.fileSystem.fileExists(yamlPath)) {
+      raw = await this.fileSystem.readFile(yamlPath);
+    } else if (await this.fileSystem.fileExists(ymlPath)) {
+      raw = await this.fileSystem.readFile(ymlPath);
     }
-    if (await this.fileSystem.fileExists(yamlPath)) {
-      return this.fileSystem.readFile(yamlPath);
-    }
-    if (await this.fileSystem.fileExists(ymlPath)) {
-      return this.fileSystem.readFile(ymlPath);
-    }
-    if (!strict) {
+    if (!raw && !strict) {
       const files = await this.fileSystem.findFiles(componentPatternsDir, "*.{json,yaml,yml}");
       for (const filePath of files) {
         const basename2 = this.fileSystem.getBasename(filePath);
         const nameWithoutExt = basename2.replace(/\.(json|yaml|yml)$/i, "");
         if (nameWithoutExt.toLowerCase() === patternId.toLowerCase()) {
-          return this.fileSystem.readFile(filePath);
+          raw = await this.fileSystem.readFile(filePath);
+          break;
         }
       }
     }
-    throw new TransformError(`Component pattern "${patternId}" not found in ${componentPatternsDir}`);
+    if (!raw) {
+      throw new TransformError(`Component pattern "${patternId}" not found in ${componentPatternsDir}`);
+    }
+    return this.normalizeComponentPattern(raw, patternId);
+  }
+  normalizeComponentPattern(raw, patternId) {
+    if (raw.definition && typeof raw.definition === "object" && raw.definition.type) {
+      return raw;
+    }
+    if (raw.composition && typeof raw.composition === "object" && raw.composition.type) {
+      const composition = raw.composition;
+      return {
+        componentPatternId: patternId,
+        definition: composition
+      };
+    }
+    return raw;
   }
   async addComponentToDirectory(directory, parentComponentType, slot, newInstance, whatIf, strict, dirType) {
     const exists = await this.fileSystem.fileExists(directory);