@uniformdev/transformer 1.1.17 → 1.1.19

package/dist/cli/index.js

@@ -674,9 +674,26 @@ var CompositionConverterService = class {
         for (const inst of instances) {
           const existingId = this.findExistingEntryBySourceItem(inst, sourceItemMap);
           if (existingId) {
-            this.logger.info(
-              `Reusing existing entry ${existingId} for ${flattenType} (sourceItem match)`
+            const existingEntryPath = this.fileSystem.joinPath(
+              entriesDirFull,
+              `${existingId}.json`
             );
+            this.logger.action(
+              whatIf,
+              "UPDATE",
+              `${entriesDir}/${existingId}.json (${flattenType}, merged fields from "${this.truncate(compositionName, 50)}")`
+            );
+            if (!whatIf) {
+              const existingEntry = await this.fileSystem.readFile(existingEntryPath);
+              if (existingEntry?.entry) {
+                const instanceFields = inst.instance.parameters ?? {};
+                existingEntry.entry.fields = {
+                  ...existingEntry.entry.fields,
+                  ...instanceFields
+                };
+                await this.fileSystem.writeFile(existingEntryPath, existingEntry);
+              }
+            }
             entriesReused++;
             continue;
           }
@@ -3299,9 +3316,23 @@ var ComponentAdderService = class {
       throw error;
     }
     let allowedComponentsUpdated = false;
+    const resolvedParentTypes = [];
     for (const parentType of parentTypes) {
-      this.logger.info(`Loading parent component: ${parentType}`);
-      const { component: parentComponent, filePath: parentComponentFilePath } = await this.componentService.loadComponent(fullComponentsDir, parentType, findOptions);
+      this.logger.info(`Loading component: ${parentType}`);
+      let parentComponent;
+      let parentComponentFilePath;
+      try {
+        const result = await this.componentService.loadComponent(fullComponentsDir, parentType, findOptions);
+        parentComponent = result.component;
+        parentComponentFilePath = result.filePath;
+      } catch (error) {
+        if (error instanceof ComponentNotFoundError) {
+          this.logger.warn(`Component not found: ${parentType} (searched: ${fullComponentsDir})`);
+          continue;
+        }
+        throw error;
+      }
+      resolvedParentTypes.push(parentType);
       if (!parentComponent.slots) {
         parentComponent.slots = [];
       }
@@ -3369,7 +3400,7 @@ var ComponentAdderService = class {
     );
     this.logger.info("");
     this.logger.info(
-      `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.`
+      `Summary: ${allowedComponentsUpdated ? `${resolvedParentTypes.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,
@@ -3418,9 +3449,23 @@ var ComponentAdderService = class {
     }
     const componentTypeInPattern = patternDefinition.type;
     let allowedComponentsUpdated = false;
+    const resolvedParentTypes = [];
     for (const parentType of parentTypes) {
-      this.logger.info(`Loading parent component: ${parentType}`);
-      const { component: parentComponent, filePath: parentComponentFilePath } = await this.componentService.loadComponent(fullComponentsDir, parentType, findOptions);
+      this.logger.info(`Loading component: ${parentType}`);
+      let parentComponent;
+      let parentComponentFilePath;
+      try {
+        const result = await this.componentService.loadComponent(fullComponentsDir, parentType, findOptions);
+        parentComponent = result.component;
+        parentComponentFilePath = result.filePath;
+      } catch (error) {
+        if (error instanceof ComponentNotFoundError) {
+          this.logger.warn(`Component not found: ${parentType} (searched: ${fullComponentsDir})`);
+          continue;
+        }
+        throw error;
+      }
+      resolvedParentTypes.push(parentType);
       if (!parentComponent.slots) {
         parentComponent.slots = [];
       }
@@ -3491,7 +3536,7 @@ var ComponentAdderService = class {
     );
     this.logger.info("");
     this.logger.info(
-      `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.`
+      `Summary: ${allowedComponentsUpdated ? `${resolvedParentTypes.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,
@@ -4676,7 +4721,7 @@ function createRemoveFieldCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.17",
+  version: "1.1.19",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {