@uniformdev/transformer 1.1.18 → 1.1.20

package/dist/cli/index.js

@@ -189,7 +189,27 @@ var ComponentService = class {
     throw new ComponentNotFoundError(componentType, componentsDir);
   }
   async saveComponent(filePath, component) {
-    await this.fileSystem.writeFile(filePath, component);
+    const sorted = this.sortComponentArrays(component);
+    await this.fileSystem.writeFile(filePath, sorted);
+  }
+  sortComponentArrays(component) {
+    const result = { ...component };
+    if (result.parameters) {
+      result.parameters = [...result.parameters].sort((a, b) => a.id.localeCompare(b.id));
+    }
+    if (result.slots) {
+      result.slots = [...result.slots].sort((a, b) => a.id.localeCompare(b.id)).map((slot) => {
+        if (slot.allowedComponents) {
+          return { ...slot, allowedComponents: [...slot.allowedComponents].sort((a, b) => a.localeCompare(b)) };
+        }
+        return slot;
+      });
+    }
+    const variants = result.variants;
+    if (Array.isArray(variants)) {
+      result.variants = [...variants].sort((a, b) => a.id.localeCompare(b.id));
+    }
+    return result;
   }
   findParameter(component, parameterName, options = {}) {
     const { strict = false } = options;
@@ -674,9 +694,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;
           }
@@ -1004,7 +1041,7 @@ function walkAndRegenerate(value, currentPath) {
     for (const [key, val] of Object.entries(obj)) {
       const childPath = `${currentPath}.${key}`;
       if (key === "_id" && typeof val === "string" && UUID_PATTERN.test(val)) {
-        result[key] = computeGuidHash(val + childPath);
+        result[key] = computeGuidHash(childPath);
       } else {
         result[key] = walkAndRegenerate(val, childPath);
       }
@@ -4704,7 +4741,7 @@ function createRemoveFieldCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.18",
+  version: "1.1.20",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {