@uniformdev/transformer 1.1.24 → 1.1.26

package/dist/index.d.ts

@@ -481,6 +481,7 @@ declare class CompositionConverterService {
     findFlattenTargets(slots: Record<string, ComponentInstance[]>, targetType: string, compositionId: string, compositionName: string, strict: boolean): FlattenedInstance[];
     private walkSlots;
     private transformContentReferences;
+    buildEntryIdMap(entriesDirFull: string): Promise<Map<string, string>>;
     buildSourceItemMap(entriesDirFull: string): Promise<Map<string, string>>;
     private findExistingEntryBySourceItem;
     private compareTypes;

package/dist/index.js

@@ -582,11 +582,13 @@ var CompositionConverterService = class {
       contentTypesDir,
       entriesDir,
       compositionTypes,
-      componentsToReferences,
-      componentsToBlocks,
+      componentsToReferences: rawComponentsToReferences,
+      componentsToBlocks: rawComponentsToBlocks,
       whatIf,
       strict
     } = options;
+    const componentsToReferences = [...new Set(rawComponentsToReferences)];
+    const componentsToBlocks = [...new Set(rawComponentsToBlocks)];
     const compositionsDirFull = this.fileSystem.resolvePath(rootDir, compositionsDir);
     const componentsDirFull = this.fileSystem.resolvePath(rootDir, componentsDir);
     const contentTypesDirFull = this.fileSystem.resolvePath(rootDir, contentTypesDir);
@@ -607,6 +609,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,
@@ -711,7 +714,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) {
@@ -791,21 +810,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`
             );
@@ -815,14 +846,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++;
@@ -1078,6 +1109,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");