@uniformdev/transformer 1.1.20 → 1.1.21

package/dist/index.d.ts

@@ -199,6 +199,14 @@ declare class ComponentService {
     }>;
     saveComponent(filePath: string, component: ComponentDefinition): Promise<void>;
     private sortComponentArrays;
+    sortParametersByGroup<T extends {
+        id: string;
+        type: string;
+        typeConfig?: {
+            childrenParams?: string[];
+            [key: string]: unknown;
+        };
+    }>(parameters: T[]): T[];
     findParameter(component: ComponentDefinition, parameterName: string, options?: FindOptions$1): Parameter | undefined;
     isGroupParameter(parameter: Parameter): boolean;
     resolveGroupParameters(component: ComponentDefinition, groupParameter: Parameter, options?: FindOptions$1): Parameter[];

package/dist/index.js

@@ -185,19 +185,51 @@ var ComponentService = class {
   sortComponentArrays(component) {
     const result = { ...component };
     if (result.parameters) {
-      result.parameters = [...result.parameters].sort((a, b) => a.id.localeCompare(b.id));
+      result.parameters = this.sortParametersByGroup(result.parameters);
     }
     if (result.slots) {
-      result.slots = [...result.slots].sort((a, b) => a.id.localeCompare(b.id)).map((slot) => {
+      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)) };
+          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));
+      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;
   }
@@ -746,6 +778,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;