Swift 5.8 parser process

Author: kishikawakatsumi

.github/workflows/spm.yml

@@ -19,8 +19,12 @@ jobs:
       - name: Update Swift Package
         run: |
           set -ex
+
           export TOOLCHAINS=swift
+
           swift package update --package-path ./
+
+          swift package update --package-path Resources/parsers/50800
           swift package update --package-path Resources/parsers/50900
           swift package update --package-path Resources/parsers/trunk
       - name: Create Pull Request

.github/workflows/test.yml

@@ -15,7 +15,10 @@ jobs:
       - name: Test
         run: |
           set -ex
+
           swift test
+
+          (cd Resources/parsers/50800 && swift test)
           (cd Resources/parsers/50900 && swift test)
           (cd Resources/parsers/trunk && swift test)
       - name: Build

Dockerfile

@@ -27,6 +27,7 @@ RUN swift package resolve
 COPY . .
 RUN swift build -c release --static-swift-stdlib
 
+RUN cd Resources/parsers/50800 && swift build -c release -Xswiftc -static-executable
 RUN cd Resources/parsers/50900 && swift build -c release -Xswiftc -static-executable
 RUN cd Resources/parsers/trunk && swift build -c release -Xswiftc -static-executable
 

Package.resolved

@@ -180,15 +180,6 @@
         "version" : "1.0.2"
       }
     },
-    {
-      "identity" : "swift-syntax",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax",
-      "state" : {
-        "revision" : "2c49d66d34dfd6f8130afdba889de77504b58ec0",
-        "version" : "508.0.1"
-      }
-    },
     {
       "identity" : "swift-system",
       "kind" : "remoteSourceControl",

Package.swift

@@ -7,21 +7,17 @@ let package = Package(
     .macOS(.v13)
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax", from: "508.0.1"),
-    .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.5.2"),
     .package(url: "https://github.com/vapor/vapor.git", from: "4.78.0"),
     .package(url: "https://github.com/vapor/leaf.git", from: "4.2.4"),
+    .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.5.2"),
   ],
   targets: [
     .executableTarget(
       name: "App",
       dependencies: [
-        .product(name: "SwiftSyntax", package: "swift-syntax"),
-        .product(name: "SwiftOperators", package: "swift-syntax"),
-        .product(name: "SwiftParser", package: "swift-syntax"),
-        .product(name: "TSCBasic", package: "swift-tools-support-core"),
         .product(name: "Vapor", package: "vapor"),
         .product(name: "Leaf", package: "leaf"),
+        .product(name: "TSCBasic", package: "swift-tools-support-core"),
       ],
       swiftSettings: [
         .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
@@ -32,8 +28,7 @@ let package = Package(
       dependencies: [
         .target(name: "App"),
         .product(name: "XCTVapor", package: "vapor"),
-      ],
-      resources: [.process("Fixtures")]
+      ]
     )
   ]
 )

Resources/parsers/50800/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax",
+      "state" : {
+        "revision" : "2c49d66d34dfd6f8130afdba889de77504b58ec0",
+        "version" : "508.0.1"
+      }
+    }
+  ],
+  "version" : 2
+}

Resources/parsers/50800/Package.resolved

@@ -0,0 +1,32 @@
+// swift-tools-version:5.8
+import PackageDescription
+
+let package = Package(
+  name: "parser",
+  platforms: [
+    .macOS(.v13)
+  ],
+  dependencies: [
+    .package(url: "https://github.com/apple/swift-syntax", from: "508.0.1"),
+  ],
+  targets: [
+    .executableTarget(
+      name: "parser",
+      dependencies: [
+        .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftOperators", package: "swift-syntax"),
+        .product(name: "SwiftParser", package: "swift-syntax"),
+      ],
+      swiftSettings: [
+        .unsafeFlags(["-cross-module-optimization"], .when(configuration: .release))
+      ]
+    ),
+    .testTarget(
+      name: "Tests",
+      dependencies: [
+        .target(name: "parser"),
+      ],
+      resources: [.process("Fixtures")]
+    )
+  ]
+)

Resources/parsers/50800/Package.swift

@@ -0,0 +1,25 @@
+import Foundation
+
+@main
+struct Main {
+  static func main() throws {
+    do {
+      let code = String(decoding: FileHandle.standardInput.availableData, as: UTF8.self)
+      let options = Array(CommandLine.arguments.dropFirst(1))
+
+      let response = try SyntaxParser.parse(code: code, options: options)
+
+      let data = try JSONEncoder().encode(response)
+      print(String(decoding: data, as: UTF8.self))
+    } catch {
+      var standardError = FileHandle.standardError
+      print("\(error)", to:&standardError)
+    }
+  }
+}
+
+extension FileHandle : TextOutputStream {
+  public func write(_ string: String) {
+    self.write(Data(string.utf8))
+  }
+}

Resources/parsers/50800/Sources/parser/Main.swift

@@ -6,7 +6,7 @@ import SwiftParser
 struct SyntaxParser {
   static func parse(code: String, options: [String] = []) throws -> SyntaxResponse {
     let sourceFile = Parser.parse(source: code)
-    
+
     let syntax: Syntax
     if options.contains("fold") {
       syntax = OperatorTable.standardOperators.foldAll(sourceFile, errorHandler: { _ in })
@@ -26,6 +26,6 @@ struct SyntaxParser {
     let encoder = JSONEncoder()
     let json = String(decoding: try encoder.encode(tree), as: UTF8.self)
 
-    return SyntaxResponse(syntaxHTML: html, syntaxJSON: json, swiftVersion: swiftVersion)
+    return SyntaxResponse(syntaxHTML: html, syntaxJSON: json, swiftVersion: version)
   }
 }

Sources/App/Controllers/SyntaxParser.swift Resources/parsers/50800/Sources/parser/SyntaxParser.swift

@@ -0,0 +1 @@
+../../../../../Sources/App/Models/SyntaxResponse.swift

Resources/parsers/50800/Sources/parser/SyntaxResponse.swift

@@ -84,7 +84,7 @@ final class TokenVisitor: SyntaxRewriter {
       ),
       type: syntaxType
     )
-    
+
     tree.append(treeNode)
     index += 1
 

Sources/App/Controllers/TokenVisitor.swift Resources/parsers/50800/Sources/parser/TokenVisitor.swift

@@ -0,0 +1,2 @@
+import Foundation
+let version = "5.8.1"