Merge pull request #7 from andooown/lexicon-def-id

#LexiconDefID macro
andooown · Oct 20, 2023 · 86cfb1a · 86cfb1a
2 parents 1b73dea + f9d755b
commit 86cfb1a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Sources/LexiconGen/LexiconGen.swift b/Sources/LexiconGen/LexiconGen.swift
@@ -36,9 +36,10 @@ struct LexiconGen: ParsableCommand {
         print("\(defs.count) definitions found")
 
         let source = try SourceFileSyntax {
-            try ImportDeclSyntax("import Foundation")
             try ImportDeclSyntax("import ATProtoCore")
+            try ImportDeclSyntax("import ATProtoMacro")
             try ImportDeclSyntax("import ATProtoXRPC")
+            try ImportDeclSyntax("import Foundation")
 
             // Namespace enums
             for def in namespaces {
@@ -96,7 +97,7 @@ struct LexiconGen: ParsableCommand {
                                 object
                             ) {
                                 try VariableDeclSyntax(
-                                    "public static let typeValue = \"\(raw: def.id.valueWithoutMain)\""
+                                    "public static let typeValue = #LexiconDefID(\"\(raw: def.id.valueWithoutMain)\")"
                                 )
                             }
 
@@ -112,7 +113,7 @@ struct LexiconGen: ParsableCommand {
                                 object
                             ) {
                                 try VariableDeclSyntax(
-                                    "public static let typeValue = \"\(raw: def.id.valueWithoutMain)\""
+                                    "public static let typeValue = #LexiconDefID(\"\(raw: def.id.valueWithoutMain)\")"
                                 )
                             }