@uniformdev/transformer 1.1.1 → 1.1.2

package/dist/cli/index.js

@@ -2719,26 +2719,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);