Move generation to a single executable

Author: kimdv

CodeGeneration/Package.swift

@@ -8,47 +8,13 @@ let package = Package(
       .macOS(.v10_15),
     ],
   products: [
-    .executable(name: "generate-swiftbasicformat", targets: ["generate-swiftbasicformat"]),
-    .executable(name: "generate-swiftideutils", targets: ["generate-swiftideutils"]),
-    .executable(name: "generate-swiftparser", targets: ["generate-swiftparser"]),
     .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"]),
-    .executable(name: "generate-swiftsyntaxbuilder", targets: ["generate-swiftsyntaxbuilder"]),
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-syntax.git", revision: "74b1286795d6a4e4f5a106638dc99eb482df609d"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.1.4")),
   ],
   targets: [
-    .executableTarget(
-      name: "generate-swiftbasicformat",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
-    ),
-    .executableTarget(
-      name: "generate-swiftideutils",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
-    ),
-    .executableTarget(
-      name: "generate-swiftparser",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
-    ),
     .executableTarget(
       name: "generate-swiftsyntax",
       dependencies: [
@@ -58,16 +24,6 @@ let package = Package(
         "SyntaxSupport",
         "Utils"
       ]
-    ),
-      .executableTarget(
-      name: "generate-swiftsyntaxbuilder",
-      dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
-        .product(name: "ArgumentParser", package: "swift-argument-parser"),
-        "SyntaxSupport",
-        "Utils"
-      ]
     ),
     .target(
       name: "SyntaxSupport",

CodeGeneration/Sources/generate-swiftbasicformat/GenerateSwiftBasicFormat.swift

@@ -17,22 +17,80 @@ import Utils
 
 @main
 struct GenerateSwiftSyntax: ParsableCommand {
-  @Argument(help: "The path to the destination directory where the source files are to be generated")
+  @Argument(help: "The path to the source directory where the source files are to be generated")
   var generatedPath: String
 
   @Flag(help: "Enable verbose output")
   var verbose: Bool = false
-
+  
   func run() throws {
-    try generateTemplates(
+    try generateSwiftBasicFormat()
+    try generateIDEUtils()
+    try generateSwiftParser()
+    try generateSwiftSyntax()
+    try generateSwiftSyntaxBuilder()
+  }
+  
+  private func generateSwiftBasicFormat() throws {
+    try generateFiles(
+    templates: [
+      (basicFormatFile, "BasicFormat.swift"),
+    ],
+    inSource: "SwiftBasicFormat")
+  }
+  
+  private func generateIDEUtils() throws {
+    try generateFiles(
+    templates: [
+      (syntaxClassificationFile, "SyntaxClassification.swift"),
+    ],
+    inSource: "IDEUtils")
+  }
+  
+  private func generateSwiftParser() throws {
+    try generateFiles(
       templates: [
+        (declarationAttributeFile, "DeclarationAttribute.swift"),
+        (declarationModifierFile, "DeclarationModifier.swift"),
         (miscFile, "Misc.swift"),
+        (parserEntryFile, "Parser+Entry.swift"),
         (syntaxAnyVisitorFile, "SyntaxAnyVisitor.swift"),
         (syntaxBaseNodesFile, "SyntaxBaseNodes.swift"),
         (syntaxEnumFile, "SyntaxEnum.swift"),
-        (syntaxKindFile, "SyntaxKind.swift")
+        (syntaxKindFile, "SyntaxKind.swift"),
+        (typeAttributeFile, "TypeAttribute.swift"),
       ],
-      destination: URL(fileURLWithPath: generatedPath),
+      inSource: "SwiftParser")
+  }
+  
+  private func generateSwiftSyntax() throws {
+    
+    try generateFiles(
+      templates: [
+        (miscFile, "MiscFile.swift"),
+      ],
+      inSource: "SwiftSyntax")
+  }
+  
+  func generateSwiftSyntaxBuilder() throws {
+    try generateFiles(
+      templates: [
+        (buildableCollectionNodesFile, "BuildableCollectionNodes.swift"),
+        (buildableNodesFile, "BuildableNodes.swift"),
+        (resultBuildersFile, "ResultBuilders.swift"),
+        (syntaxExpressibleByStringInterpolationConformancesFile, "SyntaxExpressibleByStringInterpolationConformances.swift"),
+        (tokenFile, "Token.swift"),
+        (typealiasesFile, "Typealiases.swift")
+      ],
+      inSource: "SwiftSyntaxBuilder")
+  }
+  
+  private func generateFiles(templates: [(SourceFile, String)], inSource source: String) throws {
+    try generateTemplates(
+      templates: templates,
+      destination: URL(fileURLWithPath: generatedPath)
+        .appendingPathComponent(source)
+        .appendingPathComponent("generated"),
       verbose: verbose
     )
   }