@uniformdev/transformer 1.1.25 → 1.1.27

package/dist/cli/index.js

@@ -619,6 +619,7 @@ var CompositionConverterService = class {
     if (sourceItemMap.size > 0) {
       this.logger.info(`Found ${sourceItemMap.size} existing entry(ies) with sourceItem values`);
     }
+    const existingEntryMap = await this.buildEntryIdMap(entriesDirFull);
     const compositionResults = await this.compositionService.findCompositionsByTypes(
       compositionsDirFull,
       compositionTypes,
@@ -723,7 +724,23 @@ var CompositionConverterService = class {
       const compositionId = comp._id;
       const compositionName = comp._name ?? compositionId;
       const compositionType = comp.type;
-      const entry = this.generateEntryFromComposition(composition);
+      const existingEntryPath = existingEntryMap.get(compositionId);
+      let entry;
+      let isExistingEntry = false;
+      if (existingEntryPath) {
+        const existingEntry = await this.fileSystem.readFile(existingEntryPath);
+        if (existingEntry?.entry) {
+          entry = existingEntry;
+          isExistingEntry = true;
+          this.logger.info(
+            `Found existing entry "${compositionId}" \u2014 merging references and blocks`
+          );
+        } else {
+          entry = this.generateEntryFromComposition(composition);
+        }
+      } else {
+        entry = this.generateEntryFromComposition(composition);
+      }
       const refsByType = /* @__PURE__ */ new Map();
       if (componentsToReferences.length > 0 && comp.slots) {
         for (const refType of componentsToReferences) {
@@ -803,21 +820,33 @@ var CompositionConverterService = class {
         blocksEmbedded += instances.length;
       }
       const entryId = entry.entry._id;
-      const entryFilePath = this.fileSystem.joinPath(entriesDirFull, `${entryId}.json`);
-      this.logger.action(
-        whatIf,
-        "WRITE",
-        `${entriesDir}/${entryId}.json (${compositionType}, "${this.truncate(compositionName, 50)}")`
-      );
-      if (!whatIf) {
-        await this.fileSystem.writeFile(entryFilePath, entry);
+      if (isExistingEntry) {
+        this.logger.action(
+          whatIf,
+          "UPDATE",
+          `${entriesDir}/${entryId}.json (${compositionType}, merged refs/blocks from "${this.truncate(compositionName, 50)}")`
+        );
+        if (!whatIf) {
+          await this.fileSystem.writeFile(existingEntryPath, entry);
+        }
+        entriesReused++;
+      } else {
+        const entryFilePath = this.fileSystem.joinPath(entriesDirFull, `${entryId}.json`);
+        this.logger.action(
+          whatIf,
+          "WRITE",
+          `${entriesDir}/${entryId}.json (${compositionType}, "${this.truncate(compositionName, 50)}")`
+        );
+        if (!whatIf) {
+          await this.fileSystem.writeFile(entryFilePath, entry);
+        }
+        entriesFromCompositions++;
       }
-      entriesFromCompositions++;
       for (const [refType, instances] of refsByType) {
         for (const inst of instances) {
           const existingId = this.findExistingEntryBySourceItem(inst, sourceItemMap);
           if (existingId) {
-            const existingEntryPath = this.fileSystem.joinPath(
+            const existingEntryPath2 = this.fileSystem.joinPath(
               entriesDirFull,
               `${existingId}.json`
             );
@@ -827,14 +856,14 @@ var CompositionConverterService = class {
               `${entriesDir}/${existingId}.json (${refType}, merged fields from "${this.truncate(compositionName, 50)}")`
             );
             if (!whatIf) {
-              const existingEntry = await this.fileSystem.readFile(existingEntryPath);
+              const existingEntry = await this.fileSystem.readFile(existingEntryPath2);
               if (existingEntry?.entry) {
                 const instanceFields = inst.instance.parameters ?? {};
                 existingEntry.entry.fields = {
                   ...existingEntry.entry.fields,
                   ...instanceFields
                 };
-                await this.fileSystem.writeFile(existingEntryPath, existingEntry);
+                await this.fileSystem.writeFile(existingEntryPath2, existingEntry);
               }
             }
             entriesReused++;
@@ -1090,6 +1119,21 @@ var CompositionConverterService = class {
     }
   }
   // --- Source Item Matching ---
+  async buildEntryIdMap(entriesDirFull) {
+    const entryIdMap = /* @__PURE__ */ new Map();
+    const entryFiles = await this.fileSystem.findFiles(entriesDirFull, "*.json");
+    for (const filePath of entryFiles) {
+      try {
+        const entryData = await this.fileSystem.readFile(filePath);
+        if (entryData?.entry?._id) {
+          entryIdMap.set(entryData.entry._id, filePath);
+        }
+      } catch {
+        continue;
+      }
+    }
+    return entryIdMap;
+  }
   async buildSourceItemMap(entriesDirFull) {
     const sourceItemMap = /* @__PURE__ */ new Map();
     const entryFiles = await this.fileSystem.findFiles(entriesDirFull, "*.json");
@@ -1235,8 +1279,16 @@ var PropertyPropagatorService = class {
     const sourceComponents = [];
     for (const sourceType of compositionTypes) {
       this.logger.info(`Loading component: ${sourceType}`);
-      const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, sourceType, findOptions);
-      sourceComponents.push({ sourceType, sourceFilePath, sourceComponent });
+      try {
+        const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, sourceType, findOptions);
+        sourceComponents.push({ sourceType, sourceFilePath, sourceComponent });
+      } catch (error) {
+        if (error instanceof ComponentNotFoundError) {
+          this.logger.warn(`Component not found: ${sourceType} (searched: ${fullComponentsDir})`);
+          continue;
+        }
+        throw error;
+      }
     }
     this.logger.info(`Loading component: ${targetComponentType}`);
     const { component: targetComponent, filePath: targetFilePath } = await this.componentService.loadComponent(fullComponentsDir, targetComponentType, findOptions);
@@ -4016,8 +4068,16 @@ var SlotPropagatorService = class {
     const sourceComponents = [];
     for (const sourceType of compositionTypes) {
       this.logger.info(`Loading component: ${sourceType}`);
-      const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, sourceType, findOptions);
-      sourceComponents.push({ sourceType, sourceFilePath, sourceComponent });
+      try {
+        const { component: sourceComponent, filePath: sourceFilePath } = await this.componentService.loadComponent(fullComponentsDir, sourceType, findOptions);
+        sourceComponents.push({ sourceType, sourceFilePath, sourceComponent });
+      } catch (error) {
+        if (error instanceof ComponentNotFoundError) {
+          this.logger.warn(`Component not found: ${sourceType} (searched: ${fullComponentsDir})`);
+          continue;
+        }
+        throw error;
+      }
     }
     this.logger.info(`Loading component: ${targetComponentType}`);
     const { component: targetComponent, filePath: targetFilePath } = await this.componentService.loadComponent(fullComponentsDir, targetComponentType, findOptions);
@@ -4905,7 +4965,7 @@ function createRemoveFieldCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.25",
+  version: "1.1.27",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {