Removes TecoRegionGenerator's dependency on OrderedCollections

stevapple · stevapple · commit 8e8bce20656f · 2023-02-02T03:21:06.000+08:00
diff --git a/Package.swift b/Package.swift
@@ -59,7 +59,6 @@ let package = Package(
             name: "TecoRegionGenerator",
             dependencies: [
                 .byName(name: "TecoCodeGeneratorCommons"),
-                .product(name: "OrderedCollections", package: "swift-collections"),
             ]),
         .executableTarget(
             name: "TecoServiceGenerator",
diff --git a/Sources/TecoRegionDataGenerator/builder.swift b/Sources/TecoRegionDataGenerator/builder.swift
@@ -2,14 +2,11 @@ import SwiftSyntax
 import SwiftSyntaxBuilder
 @_implementationOnly import OrderedCollections
 
-func buildRegionExpr(id: String, names: [String], trailingComma: Bool = false) -> ArrayElementSyntax {
+func buildRegionExpr(id: String, names: OrderedSet<String>, trailingComma: Bool = false) -> ArrayElementSyntax {
     precondition(names.isEmpty == false)
     let valueExpr = FunctionCallExprSyntax(callee: ExprSyntax("Region")) {
         TupleExprElementSyntax(label: "id", expression: ExprSyntax("\(literal: id)"))
-        TupleExprElementSyntax(label: "localizedNames", expression: ExprSyntax("\(literal: names[0])"))
-        for name in names.dropFirst() {
-            TupleExprElementSyntax(expression: ExprSyntax("\(literal: name)"))
-        }
+        TupleExprElementSyntax(label: "localizedNames", expression: ExprSyntax("\(literal: Array(names))"))
     }
     return ArrayElementSyntax(expression: valueExpr, trailingComma: trailingComma ? .commaToken() : nil)
 }
@@ -21,7 +18,7 @@ func buildRegionListExpr(from maps: OrderedDictionary<String, String>...) -> Arr
     }
     return ArrayExprSyntax(elements: ArrayElementListSyntax {
         for id in baseKeys {
-            buildRegionExpr(id: id, names: maps.map { $0[id]! }, trailingComma: true)
+            buildRegionExpr(id: id, names: .init(maps.map { $0[id]! }), trailingComma: true)
                 .withTrailingTrivia(.newline)
         }
     }.withLeadingTrivia(.newline))
diff --git a/Sources/TecoRegionDataGenerator/generator.swift b/Sources/TecoRegionDataGenerator/generator.swift
@@ -21,28 +21,18 @@ struct TecoRegionDataGenerator: AsyncParsableCommand {
         let intlMap = getRegionMap(from: try await client.with(language: .en_US).describeRegions(for: product))
 
         let sourceFile = SourceFileSyntax {
-            ImportDeclSyntax("""
+            StructDeclSyntax("""
                 // THIS FILE IS AUTOMATICALLY GENERATED by TecoRegionDataGenerator.
                 // DO NOT EDIT.
-                
-                @_implementationOnly import OrderedCollections
-                """)
 
-            StructDeclSyntax("""
                 struct Region: Hashable {
                     let id: String
-                    let localizedNames: OrderedSet<String>
-                    init(id: String, localizedNames: String...) {
-                        self.id = id
-                        self.localizedNames = OrderedSet(localizedNames)
-                    }
+                    let localizedNames: [String]
                 }
                 """)
 
             VariableDeclSyntax("let regions = \(buildRegionListExpr(from: intlMap, map))")
-
         }
-
         try sourceFile.save(to: self.output)
     }
 }
diff --git a/Sources/TecoRegionGenerator/data.swift b/Sources/TecoRegionGenerator/data.swift
@@ -1,37 +1,30 @@
 // THIS FILE IS AUTOMATICALLY GENERATED by TecoRegionDataGenerator.
 // DO NOT EDIT.
 
-@_implementationOnly import OrderedCollections
-
 struct Region: Hashable {
     let id: String
 
-    let localizedNames: OrderedSet<String>
-
-    init(id: String, localizedNames: String...) {
-        self.id = id
-        self.localizedNames = OrderedSet(localizedNames)
-    }
+    let localizedNames: [String]
 }
 
 let regions = [
-    Region(id: "ap-guangzhou", localizedNames: "South China(Guangzhou)", "华南地区(广州)"),
-    Region(id: "ap-shanghai", localizedNames: "East China(Shanghai)", "华东地区(上海)"),
-    Region(id: "ap-nanjing", localizedNames: "East China(Nanjing)", "华东地区(南京)"),
-    Region(id: "ap-hongkong", localizedNames: "Hong Kong, Macau and Taiwan (China)(Hong Kong, China)", "港澳台地区(中国香港)"),
-    Region(id: "na-toronto", localizedNames: "North America(Toronto)", "北美地区(多伦多)"),
-    Region(id: "ap-beijing", localizedNames: "North China region(Beijing)", "华北地区(北京)"),
-    Region(id: "ap-singapore", localizedNames: "Southeast Asia(Singapore)", "亚太东南(新加坡)"),
-    Region(id: "ap-bangkok", localizedNames: "Southeast Asia(Bangkok)", "亚太东南(曼谷)"),
-    Region(id: "ap-jakarta", localizedNames: "Southeast Asia(Jakarta)", "亚太东南(雅加达)"),
-    Region(id: "na-siliconvalley", localizedNames: "US West(Silicon Valley)", "美国西部(硅谷)"),
-    Region(id: "ap-chengdu", localizedNames: "Southwest China(Chengdu)", "西南地区(成都)"),
-    Region(id: "ap-chongqing", localizedNames: "Southwest China(Chongqing)", "西南地区(重庆)"),
-    Region(id: "eu-frankfurt", localizedNames: "Europe(Frankfurt)", "欧洲地区(法兰克福)"),
-    Region(id: "eu-moscow", localizedNames: "Europe(Northeastern Europe)", "欧洲地区(莫斯科)"),
-    Region(id: "ap-seoul", localizedNames: "Northeast Asia(Seoul)", "亚太东北(首尔)"),
-    Region(id: "ap-tokyo", localizedNames: "Northeast Asia(Tokyo)", "亚太东北(东京)"),
-    Region(id: "ap-mumbai", localizedNames: "South Asia(Mumbai)", "亚太南部(孟买)"),
-    Region(id: "na-ashburn", localizedNames: "US East(Virginia)", "美国东部(弗吉尼亚)"),
-    Region(id: "sa-saopaulo", localizedNames: "South America(São Paulo)", "南美地区(圣保罗)"),
+    Region(id: "ap-guangzhou", localizedNames: ["South China(Guangzhou)", "华南地区(广州)"]),
+    Region(id: "ap-shanghai", localizedNames: ["East China(Shanghai)", "华东地区(上海)"]),
+    Region(id: "ap-nanjing", localizedNames: ["East China(Nanjing)", "华东地区(南京)"]),
+    Region(id: "ap-hongkong", localizedNames: ["Hong Kong, Macau and Taiwan (China)(Hong Kong, China)", "港澳台地区(中国香港)"]),
+    Region(id: "na-toronto", localizedNames: ["North America(Toronto)", "北美地区(多伦多)"]),
+    Region(id: "ap-beijing", localizedNames: ["North China region(Beijing)", "华北地区(北京)"]),
+    Region(id: "ap-singapore", localizedNames: ["Southeast Asia(Singapore)", "亚太东南(新加坡)"]),
+    Region(id: "ap-bangkok", localizedNames: ["Southeast Asia(Bangkok)", "亚太东南(曼谷)"]),
+    Region(id: "ap-jakarta", localizedNames: ["Southeast Asia(Jakarta)", "亚太东南(雅加达)"]),
+    Region(id: "na-siliconvalley", localizedNames: ["US West(Silicon Valley)", "美国西部(硅谷)"]),
+    Region(id: "ap-chengdu", localizedNames: ["Southwest China(Chengdu)", "西南地区(成都)"]),
+    Region(id: "ap-chongqing", localizedNames: ["Southwest China(Chongqing)", "西南地区(重庆)"]),
+    Region(id: "eu-frankfurt", localizedNames: ["Europe(Frankfurt)", "欧洲地区(法兰克福)"]),
+    Region(id: "eu-moscow", localizedNames: ["Europe(Northeastern Europe)", "欧洲地区(莫斯科)"]),
+    Region(id: "ap-seoul", localizedNames: ["Northeast Asia(Seoul)", "亚太东北(首尔)"]),
+    Region(id: "ap-tokyo", localizedNames: ["Northeast Asia(Tokyo)", "亚太东北(东京)"]),
+    Region(id: "ap-mumbai", localizedNames: ["South Asia(Mumbai)", "亚太南部(孟买)"]),
+    Region(id: "na-ashburn", localizedNames: ["US East(Virginia)", "美国东部(弗吉尼亚)"]),
+    Region(id: "sa-saopaulo", localizedNames: ["South America(São Paulo)", "南美地区(圣保罗)"]),
 ]
diff --git a/Sources/TecoRegionGenerator/helpers.swift b/Sources/TecoRegionGenerator/helpers.swift
@@ -1,4 +1,4 @@
-extension Region: Equatable, Comparable {
+extension Region {
     var description: String { self.localizedNames.joined(separator: " / ") }
     var identifier: String { self.id.replacingOccurrences(of: "-", with: "_") }
     var kind: String? {
@@ -10,7 +10,9 @@ extension Region: Equatable, Comparable {
         }
         return nil
     }
+}
 
+extension Region: Comparable {
     static func == (lhs: Region, rhs: Region) -> Bool {
         lhs.id == rhs.id
     }

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,11 @@ import SwiftSyntax`
`2`	`2`	`import SwiftSyntaxBuilder`
`3`	`3`	`@_implementationOnly import OrderedCollections`
`4`	`4`
`5`		`-func buildRegionExpr(id: String, names: [String], trailingComma: Bool = false) -> ArrayElementSyntax {`
	`5`	`+func buildRegionExpr(id: String, names: OrderedSet<String>, trailingComma: Bool = false) -> ArrayElementSyntax {`
`6`	`6`	`precondition(names.isEmpty == false)`
`7`	`7`	`let valueExpr = FunctionCallExprSyntax(callee: ExprSyntax("Region")) {`
`8`	`8`	`TupleExprElementSyntax(label: "id", expression: ExprSyntax("\(literal: id)"))`
`9`		`- TupleExprElementSyntax(label: "localizedNames", expression: ExprSyntax("\(literal: names[0])"))`
`10`		`- for name in names.dropFirst() {`
`11`		`- TupleExprElementSyntax(expression: ExprSyntax("\(literal: name)"))`
`12`		`- }`
	`9`	`+ TupleExprElementSyntax(label: "localizedNames", expression: ExprSyntax("\(literal: Array(names))"))`
`13`	`10`	`}`
`14`	`11`	`return ArrayElementSyntax(expression: valueExpr, trailingComma: trailingComma ? .commaToken() : nil)`
`15`	`12`	`}`
`@@ -21,7 +18,7 @@ func buildRegionListExpr(from maps: OrderedDictionary<String, String>...) -> Arr`
`21`	`18`	`}`
`22`	`19`	`return ArrayExprSyntax(elements: ArrayElementListSyntax {`
`23`	`20`	`for id in baseKeys {`
`24`		`- buildRegionExpr(id: id, names: maps.map { $0[id]! }, trailingComma: true)`
	`21`	`+ buildRegionExpr(id: id, names: .init(maps.map { $0[id]! }), trailingComma: true)`
`25`	`22`	`.withTrailingTrivia(.newline)`
`26`	`23`	`}`
`27`	`24`	`}.withLeadingTrivia(.newline))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-extension Region: Equatable, Comparable {`
	`1`	`+extension Region {`
`2`	`2`	`var description: String { self.localizedNames.joined(separator: " / ") }`
`3`	`3`	`var identifier: String { self.id.replacingOccurrences(of: "-", with: "_") }`
`4`	`4`	`var kind: String? {`
`@@ -10,7 +10,9 @@ extension Region: Equatable, Comparable {`
`10`	`10`	`}`
`11`	`11`	`return nil`
`12`	`12`	`}`
	`13`	`+}`
`13`	`14`
	`15`	`+extension Region: Comparable {`
`14`	`16`	`static func == (lhs: Region, rhs: Region) -> Bool {`
`15`	`17`	`lhs.id == rhs.id`
`16`	`18`	`}`