Added annotations to typealiases and typealiases property to JS template context (#1379)

Author: fabianmuecke

SourceryFramework/Sources/Parsing/SwiftSyntax/FileParserSyntax.swift

@@ -55,6 +55,10 @@ public final class FileParserSyntax: SyntaxVisitor, FileParserType {
             $0.imports = collector.imports
             $0.path = path
         }
+        
+        collector.typealiases.forEach {
+            $0.imports = collector.imports
+        }
 
         return FileParserResult(
           path: path,

SourceryFramework/Sources/Parsing/SwiftSyntax/SyntaxTreeCollector.swift

@@ -225,6 +225,7 @@ class SyntaxTreeCollector: SyntaxVisitor {
           accessLevel: baseModifiers.readAccess,
           parent: visitingType,
           module: module,
+          annotations: annotations,
           documentation: documentation
         )
 

SourceryRuntime/Sources/Common/AST/Typealias.swift

@@ -16,6 +16,9 @@ public final class Typealias: NSObject, Typed, SourceryModel, Diffable {
 
     /// module in which this typealias was declared
     public var module: String?
+    
+    /// Imports that existed in the file that contained this typealias declaration
+    public var imports: [Import] = []
 
     /// typealias annotations
     public var annotations: Annotations = [:]
@@ -130,6 +133,12 @@ public final class Typealias: NSObject, Typed, SourceryModel, Diffable {
              }; self.typeName = typeName
             self.type = aDecoder.decode(forKey: "type")
             self.module = aDecoder.decode(forKey: "module")
+            guard let imports: [Import] = aDecoder.decode(forKey: "imports") else { 
+                withVaList(["imports"]) { arguments in
+                    NSException.raise(NSExceptionName.parseErrorException, format: "Key '%@' not found.", arguments: arguments)
+                }
+                fatalError()
+             }; self.imports = imports
             guard let annotations: Annotations = aDecoder.decode(forKey: "annotations") else { 
                 withVaList(["annotations"]) { arguments in
                     NSException.raise(NSExceptionName.parseErrorException, format: "Key '%@' not found.", arguments: arguments)
@@ -158,6 +167,7 @@ public final class Typealias: NSObject, Typed, SourceryModel, Diffable {
             aCoder.encode(self.typeName, forKey: "typeName")
             aCoder.encode(self.type, forKey: "type")
             aCoder.encode(self.module, forKey: "module")
+            aCoder.encode(self.imports, forKey: "imports")
             aCoder.encode(self.annotations, forKey: "annotations")
             aCoder.encode(self.documentation, forKey: "documentation")
             aCoder.encode(self.parent, forKey: "parent")

SourceryRuntime/Sources/Common/TemplateContext.swift

@@ -130,7 +130,8 @@ public final class TemplateContext: NSObject, SourceryModel, NSCoding, Diffable
                 "based": types.based,
                 "inheriting": types.inheriting,
                 "implementing": types.implementing,
-                "protocolCompositions": types.protocolCompositions
+                "protocolCompositions": types.protocolCompositions,
+                "typealiases": types.typealiases
             ] as [String : Any],
             "functions": functions,
             "type": types.typesByName,

SourceryRuntime/Sources/Generated/JSExport.generated.swift

@@ -673,6 +673,7 @@ extension Type: TypeAutoJSExport {}
     var set: SetType? { get }
     var asSource: String { get }
     var description: String { get }
+    var hash: Int { get }
     var debugDescription: String { get }
 }
 
@@ -683,6 +684,7 @@ extension TypeName: TypeNameAutoJSExport {}
     var typeName: TypeName { get }
     var type: Type? { get }
     var module: String? { get }
+    var imports: [Import] { get }
     var annotations: Annotations { get }
     var documentation: Documentation { get }
     var parent: Type? { get }

SourceryTests/Generating/JavaScriptTemplateSpecs.swift

@@ -33,7 +33,18 @@ class JavaScriptTemplateTests: QuickSpec {
 
             it("provides protocol compositions") {
                 let templatePath = Stubs.jsTemplates + Path("ProtocolCompositions.ejs")
-                let expectedResult = try? (Stubs.resultDirectory + Path("FooBar.swift")).read(.utf8)
+                let expectedResult = try? (Stubs.resultDirectory + Path("ProtocolCompositions.swift")).read(.utf8)
+                
+                expect { try Sourcery(cacheDisabled: true).processFiles(.sources(Paths(include: [Stubs.sourceDirectory])), usingTemplates: Paths(include: [templatePath]), output: output, baseIndentation: 0) }.toNot(throwError())
+
+                let result = (try? (outputDir + Sourcery().generatedPath(for: templatePath)).read(.utf8))
+                print("expected:\n\(expectedResult)\n\ngot:\n\(result)")
+                expect(result).to(equal(expectedResult))
+            }
+            
+            it("provides protocol all typealiases") {
+                let templatePath = Stubs.jsTemplates + Path("AllTypealiases.ejs")
+                let expectedResult = try? (Stubs.resultDirectory + Path("AllTypealiases.swift")).read(.utf8)
 
                 expect { try Sourcery(cacheDisabled: true).processFiles(.sources(Paths(include: [Stubs.sourceDirectory])), usingTemplates: Paths(include: [templatePath]), output: output, baseIndentation: 0) }.toNot(throwError())
 

SourceryTests/Stub/JavaScriptTemplates/AllTypealiases.ejs

@@ -0,0 +1,8 @@
+<%_
+for (alias of types.typealiases.filter((t) => t.annotations.AutoStruct != null)) { %>
+struct Any<%- alias.name %>: <%- alias.type.name %> {
+<%_ for (variable of alias.type.instanceVariables) { -%>
+    var <%- variable.name %>: <%- variable.typeName.asSource %>
+<% } -%>
+}
+<%_ } -%>

SourceryTests/Stub/Result/AllTypealiases.swift

@@ -0,0 +1,10 @@
+// Generated using Sourcery Major.Minor.Patch — https://github.com/krzysztofzablocki/Sourcery
+// DO NOT EDIT
+
+struct AnyBarAlias: HasBar {
+    var bar: BarBaz
+}
+
+struct AnyFooAlias: HasFoo {
+    var foo: FooBarBaz
+}

SourceryTests/Stub/Result/FooBar.swift renamed to SourceryTests/Stub/Result/ProtocolCompositions.swift

@@ -9,3 +9,9 @@ protocol HasBar {
 
 // sourcery: AutoStruct
 typealias FooBar = HasFoo & HasBar
+
+// sourcery: AutoStruct
+typealias FooAlias = HasFoo
+
+// sourcery: AutoStruct
+typealias BarAlias = HasBar