Merge pull request #27 from andooown/lexicon-type-id

Introduce LexiconDefinitionID and robust Union decoding

Author: andooown

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-13]
         swift-version: ["5.9"]
     steps:
       - uses: swift-actions/setup-swift@v1

Makefile

@@ -2,6 +2,7 @@ TOOLS_PACKAGE_PATH := Tools
 TOOLS_PATH := ${TOOLS_PACKAGE_PATH}/.build/release
 
 
+.PHONY: gyb
 gyb:
 	@Scripts/run-gyb.sh
 

Package.resolved

@@ -27,6 +27,15 @@
         "version" : "0.13.0"
       }
     },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax.git",
+      "state" : {
+        "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
+        "version" : "509.0.0"
+      }
+    },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",

Package.swift

@@ -1,5 +1,6 @@
 // swift-tools-version: 5.9
 
+import CompilerPluginSupport
 import PackageDescription
 
 let package = Package(
@@ -25,10 +26,15 @@ let package = Package(
             name: "ATProtoCore",
             targets: ["ATProtoCore"]
         ),
+        .library(
+            name: "ATProtoMacro",
+            targets: ["ATProtoMacro"]
+        ),
     ],
     dependencies: [
         .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.13.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.0"),
+        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"),
     ],
     targets: [
         .target(
@@ -44,6 +50,7 @@ let package = Package(
             dependencies: [
                 "ATProtoXRPC",
                 "ATProtoCore",
+                "ATProtoMacro",
             ]
         ),
         .target(
@@ -59,7 +66,8 @@ let package = Package(
         .testTarget(
             name: "ATProtoXRPCTests",
             dependencies: [
-                "ATProtoXRPC"
+                "ATProtoXRPC",
+                "ATProtoMacro",
             ]
         ),
         .target(
@@ -74,5 +82,26 @@ let package = Package(
                 "ATProtoCore"
             ]
         ),
+        .target(
+            name: "ATProtoMacro",
+            dependencies: [
+                "ATProtoMacroPlugin"
+            ]
+        ),
+        .macro(
+            name: "ATProtoMacroPlugin",
+            dependencies: [
+                "ATProtoCore",
+                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+            ]
+        ),
+        .testTarget(
+            name: "ATProtoMacroPluginTests",
+            dependencies: [
+                "ATProtoMacroPlugin",
+                .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
+            ]
+        ),
     ]
 )