@uniformdev/transformer 1.1.19 → 1.1.21

package/dist/cli/index.js

@@ -189,7 +189,59 @@ 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 = this.sortParametersByGroup(result.parameters);
+    }
+    if (result.slots) {
+      result.slots = [...result.slots].sort((a, b) => a.id.localeCompare(b.id, void 0, { sensitivity: "base" })).map((slot) => {
+        if (slot.allowedComponents) {
+          return { ...slot, allowedComponents: [...slot.allowedComponents].sort((a, b) => a.localeCompare(b, void 0, { sensitivity: "base" })) };
+        }
+        return slot;
+      });
+    }
+    const variants = result.variants;
+    if (Array.isArray(variants)) {
+      result.variants = [...variants].sort((a, b) => a.id.localeCompare(b.id, void 0, { sensitivity: "base" }));
+    }
+    return result;
+  }
+  sortParametersByGroup(parameters) {
+    const compare = (a, b) => a.localeCompare(b, void 0, { sensitivity: "base" });
+    const groups = [];
+    const childToGroup = /* @__PURE__ */ new Set();
+    for (const param of parameters) {
+      if (param.type === "group") {
+        groups.push(param);
+        if (param.typeConfig?.childrenParams) {
+          param.typeConfig.childrenParams = [...param.typeConfig.childrenParams].sort(compare);
+        }
+        for (const childId of param.typeConfig?.childrenParams ?? []) {
+          childToGroup.add(childId.toLowerCase());
+        }
+      }
+    }
+    const ungrouped = parameters.filter(
+      (p) => p.type !== "group" && !childToGroup.has(p.id.toLowerCase())
+    );
+    const sortedGroups = [...groups].sort((a, b) => compare(a.id, b.id));
+    const result = [];
+    result.push(...[...ungrouped].sort((a, b) => compare(a.id, b.id)));
+    for (const group of sortedGroups) {
+      result.push(group);
+      for (const childId of group.typeConfig?.childrenParams ?? []) {
+        const child = parameters.find((p) => p.id.toLowerCase() === childId.toLowerCase());
+        if (child) {
+          result.push(child);
+        }
+      }
+    }
+    return result;
   }
   findParameter(component, parameterName, options = {}) {
     const { strict = false } = options;
@@ -736,6 +788,12 @@ var CompositionConverterService = class {
         }
       }
     }
+    for (const contentType of contentTypeMap.values()) {
+      contentType.fields = this.componentService.sortParametersByGroup(contentType.fields);
+    }
+    for (const contentType of flattenContentTypeMap.values()) {
+      contentType.fields = this.componentService.sortParametersByGroup(contentType.fields);
+    }
     for (const [typeName, contentType] of contentTypeMap) {
       const filePath = this.fileSystem.joinPath(contentTypesDirFull, `${typeName}.json`);
       const fieldCount = contentType.fields.filter((f) => f.type !== "contentReference").length;
@@ -1021,7 +1079,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);
       }
@@ -4721,7 +4779,7 @@ function createRemoveFieldCommand() {
 // package.json
 var package_default = {
   name: "@uniformdev/transformer",
-  version: "1.1.19",
+  version: "1.1.21",
   description: "CLI tool for transforming Uniform.dev serialization files offline",
   type: "module",
   bin: {