fix ordering issue

mackoj · May 14, 2024 · fd491a0 · fd491a0
1 parent 208ab39
commit fd491a0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Plugins/PackageGenerator/PackageGenerator.swift b/Plugins/PackageGenerator/PackageGenerator.swift
@@ -183,7 +183,11 @@ struct PackageGenerator {
 
     // Write Targets
     if config.verbose { print("Generating Targets...") }
-    generateTargets(parsedPackages, outputFileHandle, config, packageDirectory)
+    var sortedParsedPackages = parsedPackages.sorted(by: \.name, order: <)
+    if config.pragmaMark {
+      sortedParsedPackages = parsedPackages.sorted(by: (\.fullPath, order: <), (\.name, order: <))
+    }
+    generateTargets(sortedParsedPackages, outputFileHandle, config, packageDirectory)
     outputFileHandle.closeFile()
   }
 

diff --git a/Plugins/PackageGenerator/Sequence+Helpers.swift b/Plugins/PackageGenerator/Sequence+Helpers.swift
@@ -32,4 +32,16 @@ extension Sequence {
       return order(a[keyPath: keyPath], b[keyPath: keyPath])
     }
   }
+  func sorted<T: Comparable>(by comparators: (keyPath: KeyPath<Element, T>, order: (T, T) -> Bool)...) -> [Element] {
+    return sorted { a, b in
+      for comparator in comparators {
+        if comparator.order(a[keyPath: comparator.keyPath], b[keyPath: comparator.keyPath]) {
+          return true
+        } else if comparator.order(b[keyPath: comparator.keyPath], a[keyPath: comparator.keyPath]) {
+          return false
+        }
+      }
+      return false
+    }
+  }
 }