@uniformdev/transformer 1.1.14 → 1.1.16

package/dist/cli/index.js

@@ -3605,10 +3605,15 @@ var CompositionConverterService = class {
     let contentTypesWritten = 0;
     let entriesFromCompositions = 0;
     let entriesFromFlattened = 0;
+    let entriesReused = 0;
     this.logger.info(`Composition types: ${compositionTypes.join(", ")}`);
     if (flattenComponentIds.length > 0) {
       this.logger.info(`Flatten component types: ${flattenComponentIds.join(", ")}`);
     }
+    const sourceItemMap = flattenComponentIds.length > 0 ? await this.buildSourceItemMap(entriesDirFull) : /* @__PURE__ */ new Map();
+    if (sourceItemMap.size > 0) {
+      this.logger.info(`Found ${sourceItemMap.size} existing entry(ies) with sourceItem values`);
+    }
     const compositionResults = await this.compositionService.findCompositionsByTypes(
       compositionsDirFull,
       compositionTypes,
@@ -3616,7 +3621,7 @@ var CompositionConverterService = class {
     );
     if (compositionResults.length === 0) {
       this.logger.warn("No compositions found matching the specified types");
-      return { contentTypesWritten: 0, entriesFromCompositions: 0, entriesFromFlattened: 0 };
+      return { contentTypesWritten: 0, entriesFromCompositions: 0, entriesFromFlattened: 0, entriesReused: 0 };
     }
     this.logger.info(`Found ${compositionResults.length} composition(s)`);
     const rootComponentTypes = /* @__PURE__ */ new Set();
@@ -3690,10 +3695,19 @@ var CompositionConverterService = class {
           }
         }
       }
+      const resolvedRefIds = /* @__PURE__ */ new Map();
       for (const [flattenType, instances] of flattenedByType) {
+        const refIds = [];
+        for (const inst of instances) {
+          const existingId = this.findExistingEntryBySourceItem(inst, sourceItemMap);
+          refIds.push(existingId ?? inst.determinisiticId);
+        }
+        resolvedRefIds.set(flattenType, refIds);
+      }
+      for (const [flattenType] of flattenedByType) {
         entry.entry.fields[flattenType] = {
           type: "contentReference",
-          value: instances.map((inst) => inst.determinisiticId)
+          value: resolvedRefIds.get(flattenType)
         };
       }
       if (flattenComponentIds.length > 0) {
@@ -3712,6 +3726,14 @@ var CompositionConverterService = class {
       entriesFromCompositions++;
       for (const [flattenType, instances] of flattenedByType) {
         for (const inst of instances) {
+          const existingId = this.findExistingEntryBySourceItem(inst, sourceItemMap);
+          if (existingId) {
+            this.logger.info(
+              `Reusing existing entry ${existingId} for ${flattenType} (sourceItem match)`
+            );
+            entriesReused++;
+            continue;
+          }
           const flatEntry = this.generateEntryFromFlattenedInstance(inst);
           const flatEntryPath = this.fileSystem.joinPath(
             entriesDirFull,
@@ -3786,7 +3808,7 @@ var CompositionConverterService = class {
         `Flatten component type(s) not found in any composition: ${neverFoundMissingTypes.join(", ")}`
       );
     }
-    return { contentTypesWritten, entriesFromCompositions, entriesFromFlattened };
+    return { contentTypesWritten, entriesFromCompositions, entriesFromFlattened, entriesReused };
   }
   // --- Content Type Generation ---
   generateContentType(component) {
@@ -3837,10 +3859,11 @@ var CompositionConverterService = class {
       }
     }
     const entryId = computeGuidHash(`entry${comp._id}`);
+    const entryName = this.truncateName(comp._name ?? comp._id, 60);
     return {
       entry: {
         _id: entryId,
-        _name: comp._name ?? comp._id,
+        _name: entryName,
         type: comp.type,
         fields: { ...comp.parameters ?? {} },
         ...extraRootProps
@@ -3849,10 +3872,14 @@ var CompositionConverterService = class {
     };
   }
   generateEntryFromFlattenedInstance(inst) {
+    const entryName = this.truncateName(
+      `${inst.componentType} (from ${inst.compositionName})`,
+      60
+    );
     return {
       entry: {
         _id: inst.determinisiticId,
-        _name: `${inst.componentType} (from ${inst.compositionName})`,
+        _name: entryName,
         type: inst.componentType,
         fields: { ...inst.instance.parameters ?? {} }
       }
@@ -3923,6 +3950,30 @@ var CompositionConverterService = class {
       };
     }
   }
+  // --- Source Item Matching ---
+  async buildSourceItemMap(entriesDirFull) {
+    const sourceItemMap = /* @__PURE__ */ new Map();
+    const entryFiles = await this.fileSystem.findFiles(entriesDirFull, "*.json");
+    for (const filePath of entryFiles) {
+      try {
+        const entryData = await this.fileSystem.readFile(filePath);
+        const sourceItemField = entryData?.entry?.fields?.sourceItem;
+        if (sourceItemField?.value != null) {
+          sourceItemMap.set(String(sourceItemField.value), entryData.entry._id);
+        }
+      } catch {
+        continue;
+      }
+    }
+    return sourceItemMap;
+  }
+  findExistingEntryBySourceItem(inst, sourceItemMap) {
+    const sourceItemParam = inst.instance.parameters?.sourceItem;
+    if (sourceItemParam?.value == null) {
+      return void 0;
+    }
+    return sourceItemMap.get(String(sourceItemParam.value));
+  }
   // --- Utilities ---
   compareTypes(type1, type2, strict) {
     if (strict) {
@@ -3934,6 +3985,10 @@ var CompositionConverterService = class {
     if (str.length <= maxLength) return str;
     return str.substring(0, maxLength - 3) + "...";
   }
+  truncateName(name, maxLength) {
+    if (name.length <= maxLength) return name;
+    return name.substring(0, maxLength);
+  }
 };
 function computeGuidHash(guidOrSeed) {
   let uuidStr;
@@ -4038,8 +4093,9 @@ function createConvertCompositionsToEntriesCommand() {
         strict: options.strict ?? false
       });
       const flatInfo = result.entriesFromFlattened > 0 ? `, ${result.entriesFromFlattened} from flattened components` : "";
+      const reusedInfo = result.entriesReused > 0 ? `, ${result.entriesReused} reused existing` : "";
       logger.success(
-        `${result.contentTypesWritten} content type(s), ${result.entriesFromCompositions} entry(ies) from compositions${flatInfo}`
+        `${result.contentTypesWritten} content type(s), ${result.entriesFromCompositions} entry(ies) from compositions${flatInfo}${reusedInfo}`
       );
     } catch (error) {
       if (error instanceof TransformError) {
@@ -4593,7 +4649,7 @@ function createRemoveFieldCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.14",
+  version: "1.1.16",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {