move/rename/add modules

MahdiBM · Jul 10, 2024 · 0ddd246 · 0ddd246
1 parent a545b1b
commit 0ddd246
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 23 deletions.
diff --git a/Package.swift b/Package.swift
@@ -34,18 +34,28 @@ let package = Package(
     ],
     targets: [
         .macro(
-            name: "EnumeratorMacro",
+            name: "EnumeratorMacroImpl",
             dependencies: [
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
                 .product(name: "Mustache", package: "swift-mustache"),
             ],
             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
@@ -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 → Sources/EnumeratorMacroImpl/EntryPoint.swift b/Sources/EnumeratorMacro/EntryPoint.swift → Sources/EnumeratorMacroImpl/EntryPoint.swift
diff --git a/Sources/EnumeratorMacro/EnumCase.swift → Sources/EnumeratorMacroImpl/EnumCase.swift b/Sources/EnumeratorMacro/EnumCase.swift → Sources/EnumeratorMacroImpl/EnumCase.swift
diff --git a/...EnumeratorMacro/EnumeratorMacroType.swift → ...eratorMacroImpl/EnumeratorMacroType.swift b/...EnumeratorMacro/EnumeratorMacroType.swift → ...eratorMacroImpl/EnumeratorMacroType.swift
diff --git a/Sources/EnumeratorMacro/MArray.swift → Sources/EnumeratorMacroImpl/MArray.swift b/Sources/EnumeratorMacro/MArray.swift → Sources/EnumeratorMacroImpl/MArray.swift
diff --git a/...ces/EnumeratorMacro/MOptionalsArray.swift → ...EnumeratorMacroImpl/MOptionalsArray.swift b/...ces/EnumeratorMacro/MOptionalsArray.swift → ...EnumeratorMacroImpl/MOptionalsArray.swift
diff --git a/Sources/EnumeratorMacro/MString.swift → Sources/EnumeratorMacroImpl/MString.swift b/Sources/EnumeratorMacro/MString.swift → Sources/EnumeratorMacroImpl/MString.swift
diff --git a/Sources/EnumeratorMacro/MacroError.swift → Sources/EnumeratorMacroImpl/MacroError.swift b/Sources/EnumeratorMacro/MacroError.swift → Sources/EnumeratorMacroImpl/MacroError.swift
diff --git a/Sources/EnumeratorMacro/Utils.swift → Sources/EnumeratorMacroImpl/Utils.swift b/Sources/EnumeratorMacro/Utils.swift → Sources/EnumeratorMacroImpl/Utils.swift
diff --git 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)
-}