3.0.1

Rename macro target

Author: looneytsci

.gitignore

@@ -0,0 +1,184 @@
+# Created by https://www.gitignore.io/api/swift,xcode,macos,fastlane,cocoapods
+# Edit at https://www.gitignore.io/?templates=swift,xcode,macos,fastlane,cocoapods
+
+### temp folder ###
+temp/
+
+### prebuild ###
+prebuildUtil/
+PrebuildSpecLocal
+vendor/
+
+### xcpretty output ###
+result.json
+xcodebuild.log
+
+### CocoaPods ###
+## CocoaPods GitIgnore Template
+
+# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
+#           - Also handy if you have a large number of dependant pods
+#           - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
+Pods/
+Modules/OzonDesign/OzonDesignDemo/Pods/
+
+### fastlane ###
+# fastlane - A streamlined workflow tool for Cocoa deployment
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+# autogenerated REEDME file with all lanes description
+fastlane/README.md
+
+# fastlane specific
+fastlane/report.xml
+fastlane/xcov_output/
+
+# deliver temporary files
+fastlane/Preview.html
+
+# snapshot generated screenshots
+fastlane/screenshots/**/*.png
+fastlane/screenshots/screenshots.html
+
+# scan temporary files
+fastlane/test_output
+.test/
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# vscode
+
+.vscode/
+
+
+# Tools With Nice
+.tools/
+!.tools/nice
+
+### Swift ###
+# Xcode
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+.prebuild.log
+build/
+DerivedData/
+**/*generated.swift
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+Package.resolved
+.build/
+.swiftpm/
+# Add this line if you want to avoid checking in Xcode SPM integration.
+# .swiftpm/xcode
+
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# Accio dependency management
+Dependencies/
+.accio/
+
+# fastlane
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Xcode ###
+# Xcode
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+*.xcodeproj
+*.xcworkspace
+*.entitlements
+
+Derived
+.package.resolved
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
+
+# End of https://www.gitignore.io/api/swift,xcode,macos,fastlane,cocoapods
+
+# SwiftLint Remote Config Cache
+.swiftlint/RemoteConfigCache
+.DS_Store
+Package.resolved

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Version History
 
+# 3.0.1
+
+## Technical changes
+
+- Renamed the Macro target TestingMacros to OzonTestingMacros.
+- Ran swiftformat.
+
 # 3.0.0
 
 ## Added

Package.swift

@@ -17,23 +17,23 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/swiftlang/swift-syntax.git", "600.0.0" ..< "601.0.1"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", "600.0.0"..<"601.0.1"),
     ],
     targets: [
         .macro(
-            name: "TestingMacros",
+            name: "OzonTestingMacros",
             dependencies: [
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
             ]
         ),
-        .target(name: "TestingMacroCollection", dependencies: ["TestingMacros"]),
+        .target(name: "TestingMacroCollection", dependencies: ["OzonTestingMacros"]),
         .executableTarget(name: "TestingMacroCollectionSandbox", dependencies: ["TestingMacroCollection"]),
         .testTarget(
             name: "TestingMacroCollectionTests",
             dependencies: [
                 "TestingMacroCollection",
-                "TestingMacros",
+                "OzonTestingMacros",
                 .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
             ]
         ),

Sources/TestingMacros/AnyMockableMacro/AnyMockableMacro.swift renamed to Sources/OzonTestingMacros/AnyMockableMacro/AnyMockableMacro.swift

@@ -99,9 +99,9 @@ public struct AnyMockableMacro: MemberMacro {
     ///
     private static func makeModifiersForMockClass(_ declAccessModifier: DeclModifierSyntax) -> DeclModifierListSyntax {
         if declAccessModifier.isOpen {
-            return .init(arrayLiteral: declAccessModifier)
+            .init(arrayLiteral: declAccessModifier)
         } else {
-            return .init(arrayLiteral: declAccessModifier, .init(name: .keyword(.final)))
+            .init(arrayLiteral: declAccessModifier, .init(name: .keyword(.final)))
         }
     }
 }

Sources/TestingMacros/AnyMockableMacro/AnyMockableParameters.swift renamed to Sources/OzonTestingMacros/AnyMockableMacro/AnyMockableParameters.swift

@@ -59,19 +59,17 @@ public struct ArbitraryMacro: PeerMacro {
 
                 partialResult.append(.init(name: name, type: type, isIgnored: variable.isIgnored, isNilable: variable.isNilable))
             }
-        let arbitraryMethod: FunctionDeclSyntax
-
-        switch arbitraryType {
+        let arbitraryMethod: FunctionDeclSyntax = switch arbitraryType {
         case .mock:
-            arbitraryMethod = makeArbitraryMethodForMock(
+            makeArbitraryMethodForMock(
                 accessModifier: accessModifier,
                 typeName: typeName,
                 parameters: parameters,
                 arbitraryConfig: arbitraryConfig,
                 declMembers: declGroup.memberBlock.members
             )
         case .model:
-            arbitraryMethod = makeArbitraryMethodForModel(
+            makeArbitraryMethodForModel(
                 accessModifier: accessModifier,
                 typeName: typeName,
                 parameters: parameters,
@@ -148,29 +146,29 @@ public struct ArbitraryMacro: PeerMacro {
     ///
     static func getVariableType(_ type: TypeSyntax) -> VariableType {
         if let optionalType = type.as(OptionalTypeSyntax.self), !optionalType.wrappedType.is(MemberTypeSyntax.self) {
-            return .optional
+            .optional
         } else if let optionalType = type.as(OptionalTypeSyntax.self), optionalType.wrappedType.is(MemberTypeSyntax.self) {
-            return .nested(cleanType: optionalType.wrappedType)
+            .nested(cleanType: optionalType.wrappedType)
         } else if isSwiftOrFoundationType(type) {
-            return .foundation
+            .foundation
         } else if type.is(ArrayTypeSyntax.self) || type.as(IdentifierTypeSyntax.self)?.name.text == String.array {
-            return .array
+            .array
         } else if let forceUnwrappedType = type.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) {
-            return getVariableType(forceUnwrappedType.wrappedType)
+            getVariableType(forceUnwrappedType.wrappedType)
         } else if let functionType = type.findSyntaxInTree(FunctionTypeSyntax.self) {
-            return .closure(cleanType: functionType)
+            .closure(cleanType: functionType)
         } else if type.is(TupleTypeSyntax.self) {
-            return .tuple
+            .tuple
         } else if type.is(DictionaryTypeSyntax.self) || type.as(IdentifierTypeSyntax.self)?.name.text == String.dictionary {
-            return .dictionary
+            .dictionary
         } else if let type = type.as(IdentifierTypeSyntax.self)?.name.text, type == String.set {
-            return .set
+            .set
         } else if type.is(MemberTypeSyntax.self) {
-            return .nested(cleanType: type)
+            .nested(cleanType: type)
         } else if let attributedType = type.as(AttributedTypeSyntax.self) {
-            return getVariableType(attributedType.baseType)
+            getVariableType(attributedType.baseType)
         } else {
-            return .custom
+            .custom
         }
     }
 
@@ -216,19 +214,19 @@ public struct ArbitraryMacro: PeerMacro {
     private static func getTypeNameFromDecl(_ decl: DeclGroupSyntax) -> TokenSyntax? {
         switch decl.kind {
         case .classDecl:
-            return decl.as(ClassDeclSyntax.self)?.name
+            decl.as(ClassDeclSyntax.self)?.name
         case .structDecl:
-            return decl.as(StructDeclSyntax.self)?.name
+            decl.as(StructDeclSyntax.self)?.name
         case .extensionDecl:
-            return decl.as(ExtensionDeclSyntax.self)?.extendedType.as(IdentifierTypeSyntax.self)?.name
+            decl.as(ExtensionDeclSyntax.self)?.extendedType.as(IdentifierTypeSyntax.self)?.name
         case .actorDecl:
-            return decl.as(ActorDeclSyntax.self)?.name
+            decl.as(ActorDeclSyntax.self)?.name
         case .enumDecl:
-            return decl.as(EnumDeclSyntax.self)?.name
+            decl.as(EnumDeclSyntax.self)?.name
         case .protocolDecl:
-            return decl.as(ProtocolDeclSyntax.self)?.name
+            decl.as(ProtocolDeclSyntax.self)?.name
         default:
-            return nil
+            nil
         }
     }
 }

Sources/TestingMacros/AnyMockableMacro/AnyMockableParametersHandler.swift renamed to Sources/OzonTestingMacros/AnyMockableMacro/AnyMockableParametersHandler.swift

@@ -13,9 +13,9 @@ enum ArbitraryMacroError: CustomStringConvertible, Error {
     var description: String {
         switch self {
         case .unsupportedType:
-            return "@Arbitrary macro is attached to an unsupported declaration"
+            "@Arbitrary macro is attached to an unsupported declaration"
         case .wrongArbitraryType:
-            return "ArbitraryType can only be static or dynamic"
+            "ArbitraryType can only be static or dynamic"
         }
     }
 }