Finishing SwiftSyntax touches.

Author: Matyáš Kříž

Cuckoo.podspec

@@ -12,10 +12,10 @@ Pod::Spec.new do |s|
   s.author           = { 'Matyas Kriz' => '[email protected]', 'Tadeas Kriz' => '[email protected]', 'Filip Dolnik' => '[email protected]' }
   s.source           = { :git => 'https://github.com/Brightify/Cuckoo.git', :tag => s.version.to_s }
 
-  s.ios.deployment_target       = '12.0'
+  s.ios.deployment_target       = '13.0'
   s.osx.deployment_target       = '11'
   #s.watchos.deployment_target   = '2.0' # watchos does not include XCTest framework :(
-  s.tvos.deployment_target      = '12.0'
+  s.tvos.deployment_target      = '13.0'
   generator_name                = 'cuckoonator'
   s.swift_version               = '5.0'
   s.preserve_paths              = ['Generator/**/*', 'version', 'run', 'build_generator', generator_name]

Cuckoo.xcodeproj/project.pbxproj

@@ -277,6 +277,7 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin-21

Gemfile.lock

@@ -10,13 +10,13 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Copy executable"
-               scriptText = "\cp &quot;$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME&quot; &quot;$PROJECT_DIR/bin/cuckoo_generator&quot;">
+               scriptText = "\cp &quot;$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME&quot; &quot;$PROJECT_DIR/bin/cuckoonator&quot;">
                <EnvironmentBuildable>
                   <BuildableReference
                      BuildableIdentifier = "primary"
-                     BlueprintIdentifier = "BFA35E87D881C5E54340E27C"
-                     BuildableName = "cuckoo_generator"
-                     BlueprintName = "CuckooGenerator"
+                     BlueprintIdentifier = "B015B928C38A178E17010830"
+                     BuildableName = "cuckoonator"
+                     BlueprintName = "Cuckoonator"
                      ReferencedContainer = "container:Generator.xcodeproj">
                   </BuildableReference>
                </EnvironmentBuildable>
@@ -32,9 +32,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BFA35E87D881C5E54340E27C"
-               BuildableName = "cuckoo_generator"
-               BlueprintName = "CuckooGenerator"
+               BlueprintIdentifier = "B015B928C38A178E17010830"
+               BuildableName = "cuckoonator"
+               BlueprintName = "Cuckoonator"
                ReferencedContainer = "container:Generator.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -44,9 +44,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      disableMainThreadChecker = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "210A2D4A8CA610B2DBD38F07"
+               BuildableName = "CuckoonatorTests.xctest"
+               BlueprintName = "CuckoonatorTests"
+               ReferencedContainer = "container:Generator.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -64,31 +73,19 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BFA35E87D881C5E54340E27C"
-            BuildableName = "cuckoo_generator"
-            BlueprintName = "CuckooGenerator"
+            BlueprintIdentifier = "B015B928C38A178E17010830"
+            BuildableName = "cuckoonator"
+            BlueprintName = "Cuckoonator"
             ReferencedContainer = "container:Generator.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "generate"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "--testable Cuckoo"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "--exclude ExcludedTestClass,ExcludedProtocol"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "--output &quot;$PROJECT_DIR&quot;/GeneratedMocks.swift"
+            argument = "--configuration ../Cuckoofile"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--glob &quot;$PROJECT_DIR&quot;/../Tests/Swift/Source/*.swift"
+            argument = "--verbose"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
@@ -105,9 +102,9 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BFA35E87D881C5E54340E27C"
-            BuildableName = "cuckoo_generator"
-            BlueprintName = "CuckooGenerator"
+            BlueprintIdentifier = "B015B928C38A178E17010830"
+            BuildableName = "cuckoonator"
+            BlueprintName = "Cuckoonator"
             ReferencedContainer = "container:Generator.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

Generator/Derived/InfoPlists/CuckooGenerator-Info.plist renamed to Generator/Derived/InfoPlists/Cuckoonator-Info.plist

@@ -42,11 +42,15 @@ final class Generator {
             }
         }
         let flatMappedFiles = files.map { $0.flatMappingMemberContainers() }
-        let finalFiles = module.options.noInheritance ? flatMappedFiles : inheritNSObject(mergingInheritance(flatMappedFiles))
+        let finalFiles = if module.options.enableInheritance {
+            inheritNSObject(mergingInheritance(flatMappedFiles))
+        } else {
+            flatMappedFiles
+        }
 
         // filter classes/protocols based on the settings passed to the generator
         var typeFilters: [TokenFilter] = []
-        if module.options.noClassMocking {
+        if module.options.protocolsOnly {
             typeFilters.append(ignoreClasses)
         }
         if let regex = module.regex {
@@ -63,7 +67,7 @@ final class Generator {
             GeneratedFile(
                 path: file.file.path,
                 contents: [
-                    module.options.noHeaders ? nil : FileHeaderHandler.header(for: file, timestamp: timestamp),
+                    module.options.omitHeaders ? nil : FileHeaderHandler.header(for: file, timestamp: timestamp),
                     FileHeaderHandler.imports(for: file, imports: module.imports, testableImports: module.testableImports),
                     try GeneratorHelper.generate(tokens: file.tokens),
                 ]

Generator/Derived/InfoPlists/GeneratorTests-Info.plist renamed to Generator/Derived/InfoPlists/CuckoonatorTests-Info.plist

@@ -33,9 +33,9 @@ final class Module {
         self.options = Options(
             glob: dto.options?.glob ?? true,
             keepDocumentation: dto.options?.keepDocumentation ?? true,
-            noInheritance: dto.options?.noInheritance ?? false,
-            noClassMocking: dto.options?.noClassMocking ?? false,
-            noHeaders: dto.options?.noHeaders ?? false
+            enableInheritance: dto.options?.enableInheritance ?? true,
+            protocolsOnly: dto.options?.protocolsOnly ?? false,
+            omitHeaders: dto.options?.omitHeaders ?? false
         )
 
         if let xcodeproj = dto.xcodeproj {
@@ -61,9 +61,9 @@ final class Module {
     struct Options {
         let glob: Bool
         let keepDocumentation: Bool
-        let noInheritance: Bool
-        let noClassMocking: Bool
-        let noHeaders: Bool
+        let enableInheritance: Bool
+        let protocolsOnly: Bool
+        let omitHeaders: Bool
     }
 
     struct Xcodeproj {
@@ -104,9 +104,9 @@ extension Module {
         struct Options: Decodable {
             let glob: Bool?
             let keepDocumentation: Bool?
-            let noInheritance: Bool?
-            let noClassMocking: Bool?
-            let noHeaders: Bool?
+            let enableInheritance: Bool?
+            let protocolsOnly: Bool?
+            let omitHeaders: Bool?
         }
 
         struct Xcodeproj: Decodable {
@@ -139,9 +139,9 @@ extension Module.Options: CustomDebugStringConvertible {
         [
             "glob: \(String(glob).bold)",
             "keep documentation: \(String(keepDocumentation).bold)",
-            "disabled inheritance: \(String(noInheritance).bold)",
-            "disabled class mocking: \(String(noClassMocking).bold)",
-            "disabled headers: \(String(noHeaders).bold)",
+            "enable inheritance: \(String(enableInheritance).bold)",
+            "protocols only: \(String(protocolsOnly).bold)",
+            "omit headers: \(String(omitHeaders).bold)",
         ]
         .compactMap { $0 }
         .joined(separator: "\n")