@uniformdev/transformer 1.1.1 → 1.1.3

package/dist/cli/index.js

@@ -2437,25 +2437,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)) {
@@ -2675,7 +2659,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,
@@ -2719,26 +2707,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);
-    }
-    if (await this.fileSystem.fileExists(yamlPath)) {
-      return this.fileSystem.readFile(yamlPath);
-    }
-    if (await this.fileSystem.fileExists(ymlPath)) {
-      return this.fileSystem.readFile(ymlPath);
+      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 (!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);
@@ -2911,7 +2915,7 @@ function createAddComponentCommand() {
 import { Command as Command8 } from "commander";
 function createAddComponentPatternCommand() {
   const command = new Command8("add-component-pattern");
-  command.description("Adds a component pattern instance to existing component slots across all compositions.").option("--parentComponentType <type>", "The component type that owns the slot").option("--slot <slotId>", "The slot ID where the component pattern will be added").option("--componentPatternId <id>", "The component pattern ID to add").option("--parameters <params>", "Pipe-separated parameter assignments (key1:value1|key2:value2)").hook("preAction", (thisCommand) => {
+  command.description("Adds a component pattern instance to existing component slots across all compositions.").option("--parentComponentType <type>", "The component type that owns the slot").option("--slot <slotId>", "The slot ID where the component pattern will be added").option("--componentPatternId <id>", "The component pattern ID to add").hook("preAction", (thisCommand) => {
     const opts = thisCommand.opts();
     const requiredOptions = [
       { name: "parentComponentType", flag: "--parentComponentType" },
@@ -2929,8 +2933,7 @@ function createAddComponentPatternCommand() {
       ...globalOpts,
       parentComponentType: opts.parentComponentType,
       slot: opts.slot,
-      componentPatternId: opts.componentPatternId,
-      parameters: opts.parameters
+      componentPatternId: opts.componentPatternId
     };
     const logger = new Logger();
     const fileSystem = new FileSystemService();
@@ -2946,7 +2949,6 @@ function createAddComponentPatternCommand() {
         parentComponentType: options.parentComponentType,
         slot: options.slot,
         componentPatternId: options.componentPatternId,
-        parameters: options.parameters,
         whatIf: options.whatIf ?? false,
         strict: options.strict ?? false
       });