From 0ddd2468968ba22a0515c66056d0dcda9acda8af Mon Sep 17 00:00:00 2001 From: MahdiBM Date: Wed, 10 Jul 2024 21:51:50 +0330 Subject: [PATCH] move/rename/add modules --- Package.swift | 12 +++++++++- Sources/EnumeratorMacro/Enumerator.swift | 7 ++++++ .../EntryPoint.swift | 0 .../EnumCase.swift | 0 .../EnumeratorMacroType.swift | 0 .../MArray.swift | 0 .../MOptionalsArray.swift | 0 .../MString.swift | 0 .../MacroError.swift | 0 .../Utils.swift | 0 .../EnumeratorMacroTests.swift | 23 +------------------ 11 files changed, 19 insertions(+), 23 deletions(-) create mode 100644 Sources/EnumeratorMacro/Enumerator.swift rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/EntryPoint.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/EnumCase.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/EnumeratorMacroType.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/MArray.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/MOptionalsArray.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/MString.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/MacroError.swift (100%) rename Sources/{EnumeratorMacro => EnumeratorMacroImpl}/Utils.swift (100%) diff --git a/Package.swift b/Package.swift index 7656305..add76fa 100644 --- a/Package.swift +++ b/Package.swift @@ -34,7 +34,7 @@ let package = Package( ], targets: [ .macro( - name: "EnumeratorMacro", + name: "EnumeratorMacroImpl", dependencies: [ .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), @@ -42,10 +42,20 @@ let package = Package( ], swiftSettings: swiftSettings ), + .target( + name: "EnumeratorMacro", + dependencies: [ + "EnumeratorMacroImpl", + .product(name: "SwiftSyntaxMacros", package: "swift-syntax"), + .product(name: "SwiftCompilerPlugin", package: "swift-syntax"), + ], + swiftSettings: swiftSettings + ), .testTarget( name: "EnumeratorMacroTests", dependencies: [ "EnumeratorMacro", + "EnumeratorMacroImpl", .product(name: "Testing", package: "swift-testing"), .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"), .product(name: "SwiftSyntax", package: "swift-syntax"), diff --git a/Sources/EnumeratorMacro/Enumerator.swift b/Sources/EnumeratorMacro/Enumerator.swift new file mode 100644 index 0000000..14ee2ce --- /dev/null +++ b/Sources/EnumeratorMacro/Enumerator.swift @@ -0,0 +1,7 @@ +import EnumeratorMacroImpl + +@attached(member, names: arbitrary) +public macro Enumerator(_ templates: String...) = #externalMacro( + module: "EnumeratorMacro", + type: "EnumeratorMacroType" +) diff --git a/Sources/EnumeratorMacro/EntryPoint.swift b/Sources/EnumeratorMacroImpl/EntryPoint.swift similarity index 100% rename from Sources/EnumeratorMacro/EntryPoint.swift rename to Sources/EnumeratorMacroImpl/EntryPoint.swift diff --git a/Sources/EnumeratorMacro/EnumCase.swift b/Sources/EnumeratorMacroImpl/EnumCase.swift similarity index 100% rename from Sources/EnumeratorMacro/EnumCase.swift rename to Sources/EnumeratorMacroImpl/EnumCase.swift diff --git a/Sources/EnumeratorMacro/EnumeratorMacroType.swift b/Sources/EnumeratorMacroImpl/EnumeratorMacroType.swift similarity index 100% rename from Sources/EnumeratorMacro/EnumeratorMacroType.swift rename to Sources/EnumeratorMacroImpl/EnumeratorMacroType.swift diff --git a/Sources/EnumeratorMacro/MArray.swift b/Sources/EnumeratorMacroImpl/MArray.swift similarity index 100% rename from Sources/EnumeratorMacro/MArray.swift rename to Sources/EnumeratorMacroImpl/MArray.swift diff --git a/Sources/EnumeratorMacro/MOptionalsArray.swift b/Sources/EnumeratorMacroImpl/MOptionalsArray.swift similarity index 100% rename from Sources/EnumeratorMacro/MOptionalsArray.swift rename to Sources/EnumeratorMacroImpl/MOptionalsArray.swift diff --git a/Sources/EnumeratorMacro/MString.swift b/Sources/EnumeratorMacroImpl/MString.swift similarity index 100% rename from Sources/EnumeratorMacro/MString.swift rename to Sources/EnumeratorMacroImpl/MString.swift diff --git a/Sources/EnumeratorMacro/MacroError.swift b/Sources/EnumeratorMacroImpl/MacroError.swift similarity index 100% rename from Sources/EnumeratorMacro/MacroError.swift rename to Sources/EnumeratorMacroImpl/MacroError.swift diff --git a/Sources/EnumeratorMacro/Utils.swift b/Sources/EnumeratorMacroImpl/Utils.swift similarity index 100% rename from Sources/EnumeratorMacro/Utils.swift rename to Sources/EnumeratorMacroImpl/Utils.swift diff --git a/Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift b/Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift index d0741da..0b5ebc2 100644 --- a/Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift +++ b/Tests/EnumeratorMacroTests/EnumeratorMacroTests.swift @@ -1,4 +1,5 @@ import EnumeratorMacro +import EnumeratorMacroImpl import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import Testing @@ -194,12 +195,6 @@ import Testing } } -@attached(member, names: arbitrary) -macro Enumerator(_ templates: String...) = #externalMacro( - module: "EnumeratorMacro", - type: "EnumeratorMacroType" -) - @Enumerator(""" enum Subtype: String { {{#cases}} @@ -255,19 +250,3 @@ enum TestEnum { self.subtype == other.subtype } } - -@Enumerator(""" -{{#cases}} -var is{{capitalized(name)}}: Bool { - switch self { - case .{{name}}: true - default: false - } -} -{{/cases}} -""") -enum TestEnum3 { - case a(value: String) - case b - case testCase(testValue: String) -}