Fix protocol composition and clean up the code.

Brightify · May 20, 2024 · a756db9 · a756db9
1 parent e26eb21
commit a756db9
Show file tree

Hide file tree

Showing 20 changed files with 392 additions and 219 deletions.
diff --git a/.package.resolved b/.package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "a64ff5917cc2a5d0406bc10508197e31aa8e7eaacbc9e999a52bea35093394de",
   "pins" : [
     {
       "identity" : "aexml",
@@ -57,7 +58,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
         "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
         "version" : "1.2.3"
@@ -68,8 +69,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-cmark.git",
       "state" : {
-        "revision" : "29d9c97e6310b87c4799268eaa2fc76164b2dbd8",
-        "version" : "0.2.0"
+        "revision" : "f218e5d7691f78b55bfa39b367763f4612486c35",
+        "version" : "0.3.0"
       }
     },
     {
@@ -86,8 +87,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-markdown.git",
       "state" : {
-        "revision" : "68b2fed9fb12fb71ac81e537f08bed430b189e35",
-        "version" : "0.2.0"
+        "revision" : "e4f95e2dc23097a1a9a1dfdfe3fe3ee44de77378",
+        "version" : "0.3.0"
       }
     },
     {
@@ -118,5 +119,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/Cuckoo.xcodeproj/project.pbxproj b/Cuckoo.xcodeproj/project.pbxproj
diff --git a/Generator/Generator.xcodeproj/project.pbxproj b/Generator/Generator.xcodeproj/project.pbxproj
diff --git a/Generator/Generator.xcodeproj/xcshareddata/xcschemes/Generator.xcscheme b/Generator/Generator.xcodeproj/xcshareddata/xcschemes/Generator.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1010"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -81,14 +81,21 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "--configuration ../Cuckoofile"
+            argument = "--configuration ./Cuckoofile"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--verbose"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "PROJECT_DIR"
+            value = "/Users/matty/Documents/Work/Brightify/Cuckoo"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Generator/Project.swift b/Generator/Project.swift
@@ -73,9 +73,12 @@ let project = Project(
             runAction: RunAction.runAction(
                 executable: "Cuckoonator",
                 arguments: Arguments(
+                    environment: [
+                        "PROJECT_DIR": Environment.projectDir.requireString(message: "TUIST_PROJECT_DIR environment property is required."),
+                    ],
                     launchArguments: [
                         // Any changes here should be reflected in `../Project.swift` as well.
-                        LaunchArgument(name: "--configuration ../Cuckoofile", isEnabled: true),
+                        LaunchArgument(name: "--configuration ./Cuckoofile", isEnabled: true),
                         LaunchArgument(name: "--verbose", isEnabled: true),
                     ]
                 )

diff --git a/Generator/Sources/CLI/Generator.swift b/Generator/Sources/CLI/Generator.swift
@@ -32,7 +32,7 @@ final class Generator {
             .filter { $0.exists }
             .map(TextFile.init(path:))
 
-        let files: [FileRepresentation] = inputFiles.compactMap { file in
+        let files: [FileRepresentation] = await inputFiles.concurrentCompactMap { file in
             do {
                 log(.verbose, message: "Processing file: \(file.path)")
                 let crawler = try Crawler.crawl(url: file.path.url)
@@ -66,7 +66,7 @@ final class Generator {
 
         let timestamp = verbose ? Date().description : nil
         return try await mockableFiles.concurrentMap { file in
-            GeneratedFile(
+            await GeneratedFile(
                 path: file.file.path,
                 contents: [
                     module.options.omitHeaders ? nil : FileHeaderHandler.header(for: file, timestamp: timestamp),

diff --git a/Generator/Sources/Internal/Crawlers/Crawler.swift b/Generator/Sources/Internal/Crawlers/Crawler.swift
@@ -267,7 +267,7 @@ extension Crawler {
         } else if let initializer = binding.initializer?.value.trimmed.description, let guessedType = TypeGuesser.guessType(from: initializer) {
             type = .type(guessedType)
         } else {
-            fatalError("Can't infer type: \(url)")
+            fatalError("Can't infer type of property '\(identifier)' in file \(url)")
         }
 
         let isReadOnly: Bool
@@ -504,6 +504,11 @@ class Multi {
 //    @available(*, renamed: "sameInstance(as:)")
 //    private(set) var geg: Stool
 
+    var gg: Dictionary<Int, String>
+    var ggwp: Array<String>
+
+    func compositionalParameters(param1: any Equatable & Numeric, param2: OnlyLabelProtocol & Codable)
+
     @objc
     var hammo: Tpikulka!
 
@@ -523,11 +528,11 @@ class Multi {
 
     #if DEBUG
     var pravda: Cool {
-        prdel
+        thing
     }
     #elseif RELEASE
     var pravda: Cool {
-        prdel
+        some
     }
     #endif
 
@@ -540,7 +545,7 @@ class Multi {
 }
 
 protocol Brek<Crack: Codable> {
-    associatedtype gag: Encodable
+    associatedtype plak: Encodable
 
     var asyncThrowsProperty: Int { get async throws }
     var mutableProperty: Int { get set }

diff --git a/Generator/Sources/Internal/GeneratorHelper.swift b/Generator/Sources/Internal/GeneratorHelper.swift
@@ -10,6 +10,7 @@ struct GeneratorHelper {
     @StaticActor
     private static let extensions = createExtensions()
 
+    @StaticActor
     static func generate(tokens: [Token], debug: Bool = false) throws -> String {
         let containers = tokens.map { $0.serialize() }
 
@@ -76,7 +77,11 @@ struct GeneratorHelper {
         var fullString = ""
         for (index, parameter) in method.signature.parameters.enumerated() {
             if !parameter.type.containsAttribute(named: "@escaping"), let closure = parameter.type.findClosure() {
-                let indents = String(repeating: "\t", count: index)
+                if fullString.isEmpty {
+                    fullString = "\n"
+                }
+
+                let indents = String(repeating: "\t", count: index + 2)
                 let tries = method.isThrowing ? "try " : ""
                 let awaits = method.isAsync ? "await " : ""
 
@@ -90,15 +95,17 @@ struct GeneratorHelper {
                 fullString += "\(indents)return \(tries)\(awaits)withoutActuallyEscaping(\(parameter.usableName), do: { (\(parameter.usableName): @escaping \(parameter.type))\(returnSignature) in\n"
             }
         }
-
         return fullString
     }
 
     private static func closeNestedClosure(for parameters: [MethodParameter]) -> String {
         var fullString = ""
         for (index, parameter) in parameters.enumerated() {
             if !parameter.type.containsAttribute(named: "@escaping"), parameter.type.isClosure {
-                let indents = String(repeating: "\t", count: index)
+                if fullString.isEmpty {
+                    fullString = "\n"
+                }
+                let indents = String(repeating: "\t", count: index + 2)
                 fullString += "\(indents)})\n"
             }
         }

diff --git a/Generator/Sources/Internal/Helpers/Async+convenience.swift b/Generator/Sources/Internal/Helpers/Async+convenience.swift
@@ -14,6 +14,20 @@ extension Sequence {
 
         return values
     }
+
+    func asyncCompactMap<T>(
+        _ transform: (Element) async throws -> T?
+    ) async rethrows -> [T] {
+        var values = [T]()
+
+        for element in self {
+            if let value = try await transform(element) {
+                values.append(value)
+            }
+        }
+
+        return values
+    }
 }
 
 extension Sequence {
@@ -56,7 +70,7 @@ extension Sequence {
 extension Sequence {
     func concurrentMap<T>(
         _ transform: @escaping (Element) async throws -> T
-    ) async throws -> [T] {
+    ) async rethrows -> [T] {
         let tasks = map { element in
             Task {
                 try await transform(element)
@@ -67,4 +81,18 @@ extension Sequence {
             try await task.value
         }
     }
+
+    func concurrentCompactMap<T>(
+        _ transform: @escaping (Element) async throws -> T?
+    ) async rethrows -> [T] {
+        let tasks = map { element in
+            Task {
+                try await transform(element)
+            }
+        }
+
+        return try await tasks.asyncCompactMap { task in
+            try await task.value
+        }
+    }
 }
diff --git a/Generator/Sources/Internal/Helpers/SwiftSyntax+convenience.swift b/Generator/Sources/Internal/Helpers/SwiftSyntax+convenience.swift
@@ -23,3 +23,13 @@ extension ExprSyntaxProtocol {
         }
     }
 }
+
+extension IdentifierTypeSyntax {
+    var identifier: String {
+        if case .identifier(let identifier) = name.tokenKind {
+            return identifier
+        } else {
+            fatalError("Cuckoo error: Expected identifier. Please create an issue.")
+        }
+    }
+}
diff --git a/Generator/Sources/Internal/Templates/MockTemplate.swift b/Generator/Sources/Internal/Templates/MockTemplate.swift
@@ -55,6 +55,7 @@ extension {{ container.parentFullyQualifiedName }} {
     {% endif -%}
 
     {% for property in container.properties %}
+    
     {% if debug %}
     // {{ property }}
     {% endif %}
@@ -64,7 +65,7 @@ extension {{ container.parentFullyQualifiedName }} {
     {% for attribute in property.attributes %}
     {{ attribute }}
     {% endfor %}
-    {{ property.accessibility|withSpace }}{% if property.isOverriding %}override {% endif %} var {{ property.name|escapeReservedKeywords }}: {{ property.type }} {
+    {{ property.accessibility|withSpace }}{% if property.isOverriding %}override {%+ endif %}var {{ property.name|escapeReservedKeywords }}: {{ property.type }} {
         get {%+ if property.isAsync %}async {%+ endif %}{% if property.isThrowing %}throws {%+ endif %}{
             return {%+ if property.isThrowing %}try {%+ endif %}{% if property.isAsync %}await {%+ endif %}cuckoo_manager.getter{% if property.isThrowing %}Throws{% endif %}(
                 "{{ property.name }}",
@@ -102,8 +103,8 @@ extension {{ container.parentFullyQualifiedName }} {
     {% endfor %}
     {{ initializer.accessibility|withSpace }}required init{{initializer.signature}} {}
     {% endfor %}
-
     {% for method in container.methods %}
+    
     {% if debug %}
     // {{method}}
     {% endif %}
@@ -114,15 +115,13 @@ extension {{ container.parentFullyQualifiedName }} {
     {{ attribute }}
     {% endfor %}
     {{ method.accessibility|withSpace }}{% if method.isOverriding %}override {%+ endif %}func {{ method.name|escapeReservedKeywords }}{{ method.signature }} {
-        {{ method.self|openNestedClosure }}
-        return{% if method.isThrowing %} try{% endif %}{% if method.isAsync %} await{% endif %} cuckoo_manager.call{% if method.isThrowing %}{{ method.throwType|capitalize }}{% endif %}(
+        {{ method.self|openNestedClosure }}return{% if method.isThrowing %} try{% endif %}{% if method.isAsync %} await{% endif %} cuckoo_manager.call{% if method.isThrowing %}{{ method.throwType|capitalize }}{% endif %}(
             "{{method.fullyQualifiedName}}",
             parameters: ({{method.parameterNames}}),
             escapingParameters: ({{method.escapingParameterNames}}),
             superclassCall: {%+ if container.isImplementation %}{% if method.isAsync %}await {%+ endif %}super.{{method.name}}({{method.call}}){% else %}Cuckoo.MockManager.crashOnProtocolSuperclassCall(){% endif %},
             defaultCall: {%+ if method.isAsync %}await {%+ endif %}__defaultImplStub!.{{method.name}}{%if method.isOptional %}!{%endif%}({{method.call}})
-        )
-        {{ method.parameters|closeNestedClosure }}
+        ){{ method.parameters|closeNestedClosure }}
     }
     {% endfor %}
 

diff --git a/Generator/Sources/Internal/Templates/NopImplStubTemplate.swift b/Generator/Sources/Internal/Templates/NopImplStubTemplate.swift
@@ -12,7 +12,7 @@ extension Templates {
     {% for attribute in property.attributes %}
     {{ attribute }}
     {% endfor %}
-    {{ property.accessibility|withSpace }}{% if property.isOverriding %}override{% endif %} var {{ property.name }}: {{ property.type }} {
+    {{ property.accessibility|withSpace }}{% if property.isOverriding %}override {%+ endif %}var {{ property.name }}: {{ property.type }} {
         get {
             return DefaultValueRegistry.defaultValue(for: ({{property.type|genericSafe|removeClosureArgumentNames}}).self)
         }
@@ -41,7 +41,7 @@ extension Templates {
     {% for attribute in method.attributes %}
     {{ attribute }}
     {% endfor %}
-    {{ method.accessibility|withSpace }}{% if method.isOverriding %}override{% endif %} func {{ method.name|escapeReservedKeywords }}{{ method.signature }} {
+    {{ method.accessibility|withSpace }}{% if method.isOverriding %}override {%+ endif %}func {{ method.name|escapeReservedKeywords }}{{ method.signature }} {
         return DefaultValueRegistry.defaultValue(for: ({{method.returnType|genericSafe}}).self)
     }
     {% if method.hasUnavailablePlatforms %}

diff --git a/Generator/Sources/Internal/Templates/VerificationProxyTemplate.swift b/Generator/Sources/Internal/Templates/VerificationProxyTemplate.swift
@@ -12,17 +12,17 @@ extension Templates {
         self.callMatcher = callMatcher
         self.sourceLocation = sourceLocation
     }
-
     {% for property in container.properties %}
+    
     {% for attribute in property.attributes %}
     {{ attribute }}
     {% endfor %}
     var {{property.name}}: Cuckoo.{{property.verifyType}}<{% if property.isReadOnly %}{{property.type|genericSafe}}{% else %}{{property.nonOptionalType|genericSafe}}{% endif %}> {
         return .init(manager: cuckoo_manager, name: "{{property.name}}", callMatcher: callMatcher, sourceLocation: sourceLocation)
     }
     {% endfor %}
-
     {% for method in container.methods %}
+    
     {{ method.unavailablePlatformsCheck }}
     {% for attribute in method.attributes %}
     {{ attribute }}