update

Author: minsOne

Sources/Implementation/Member/LoggingMacro.swift

@@ -31,13 +31,28 @@ public struct LoggingMacro: MemberMacro {
             throw MacroExpansionErrorMessage(msg)
         }
 
+        let category = extractCategory(from: node).map { "\"\($0)\"" } ?? "String(describing: Self.self)"
+
         return [
             DeclSyntax(
                 """
                 lazy var logger: OSLog = {
-                    LoggingMacroHelper.generateOSLog(category: String(describing: Self.self))
+                    LoggingMacroHelper.generateOSLog(category: \(raw: category))
                 }()
                 """),
         ]
     }
+
+    private static func extractCategory(from node: AttributeSyntax) -> String? {
+        node.arguments?.as(LabeledExprListSyntax.self)?
+            .lazy
+            .compactMap { labeledExprSyntax -> String? in
+                labeledExprSyntax.expression
+                    .as(StringLiteralExprSyntax.self)?
+                    .segments.first?
+                    .as(StringSegmentSyntax.self)?
+                    .content.text
+            }
+            .first
+    }
 }

Sources/Implementation/Support/SyntaxHelpers.swift

@@ -63,7 +63,7 @@ extension VariableDeclSyntax {
   var isComputedProperty: Bool {
     guard
       self.bindings.count == 1,
-      let binding = self.bindings.first?.as(PatternBindingSyntax.self)
+      let binding = self.bindings.first
     else { return false }
 
     return self.bindingSpecifier.tokenKind == .keyword(.var) && binding.isComputedProperty

Sources/Interface/MemberMacros.swift

@@ -17,7 +17,7 @@ public macro CaseDetection(_ accessLevel: CaseDetectionAccessLevelConfig? = nil)
 // MARK: - Logging
 
 @attached(member, names: named(logger))
-public macro Logging() = #externalMacro(module: "Macros", type: "LoggingMacro")
+public macro Logging(category: String? = nil) = #externalMacro(module: "Macros", type: "LoggingMacro")
 
 public enum LoggingMacroHelper {
     public static func generateOSLog(_ fileID: String = #fileID, category: String) -> OSLog {
@@ -36,6 +36,7 @@ public enum AssociatedValuesAccessLevelConfig {
     case `private`
     case `fileprivate`
     case `internal`
+    case `package`
     case `public`
 }
 

Sources/Playground/Run/MemberMacrosPlayground.swift

@@ -14,8 +14,16 @@ import Foundation
 import MacroKit
 
 func runMemberMacrosPlayground() {
-    // MARK: MemberMacros
+    runCaseDetection()
 
+    runLogging()
+
+    runAssociatedValues()
+}
+
+// MARK: MemberMacros
+
+private func runCaseDetection() {
     @CaseDetection(.fileprivate)
     enum Animal1 {
         case dog
@@ -33,8 +41,10 @@ func runMemberMacrosPlayground() {
 
     let cat = Animal2.cat(curious: true)
     print("cat is \(cat.isCat)")
+}
 
-    @Logging
+private func runLogging() {
+    @Logging()
     class LogModel {
         func log() {
             Logger(logger).trace("log messsage")
@@ -44,9 +54,22 @@ func runMemberMacrosPlayground() {
             #log(level: .error, "log messsage")
         }
     }
+    @Logging(category: "UI")
+    class LogUIModel {
+        func log() {
+            Logger(logger).trace("log messsage")
+            os_log(.info, log: logger, "log messsage")
+            #log(level: .info, "log messsage")
+            #log(level: .debug, "log messsage")
+            #log(level: .error, "log messsage")
+        }
+    }
 
     LogModel().log()
+    LogUIModel().log()
+}
 
+private func runAssociatedValues() {
     @AssociatedValues(.fileprivate)
     enum SomeEnum {
         case none
@@ -56,6 +79,8 @@ func runMemberMacrosPlayground() {
         case closure(() -> Void)
     }
 
-    let someEnum = SomeEnum.labeledValue(a: "a", b: "b")
-    print(someEnum.labeledValue)
+    print(SomeEnum.labeledValue(a: "a", b: "b").labeledValue!)
+    print(SomeEnum.value(10).value!)
+    print(SomeEnum.optional("Hello").optional!!)
+    SomeEnum.closure({ print("Hello MacroKit World") }).closure!()
 }

Sources/Playground/Run/PeerMacrosPlayground.swift

@@ -14,38 +14,42 @@ import Foundation
 import MacroKit
 
 func runPeerMacrosPlayground() {
-    // MARK: - Add Async
-    
+    runAddAsync()
+
+    runAddCompletionHandler()
+}
+
+// MARK: - Add Async
+private func runAddAsync() {
     struct MyStruct {
         @AddAsync
         func c(a: Int, for b: String, _ value: Double, completionBlock: @escaping (Result<String, Error>) -> Void) -> Void {
             completionBlock(.success("a: \(a), b: \(b), value: \(value)"))
         }
-        
+
         @AddAsync
         func d(a: Int, for b: String, _ value: Double, completionBlock: @escaping (Bool) -> Void) -> Void {
             completionBlock(true)
         }
     }
-    
+
     Task {
         let myStruct = MyStruct()
         _ = try? await myStruct.c(a: 5, for: "Test", 20)
-        
+
         _ = await myStruct.d(a: 10, for: "value", 40)
     }
-    
-    // MARK: - Add Completion Handler
-    
+}
+
+private func runAddCompletionHandler() {
     class MyClass {
         @AddCompletionHandler
         func f(a: Int, for b: String, _ value: Double) async -> String {
             return b
         }
     }
-    
+
     MyClass().f(a: 1, for: "hello", 3.14159) { result in
         print("Eventually received \(result + "!")")
     }
 }
-

Tests/MacroKitTests/Member/LoggingTests.swift

@@ -49,4 +49,31 @@ final class LoggingTests: XCTestCase {
             macros: ["Logging": LoggingMacro.self]
         )
     }
+
+    func testLoggingMacroExpansion3() throws {
+        assertMacroExpansion(
+            """
+            @Logging(category: "UI")
+            struct TestingView: View {
+
+                var body: some View {
+                    Text("Hello, world!")
+                }
+            }
+            """,
+            expandedSource: """
+            struct TestingView: View {
+
+                var body: some View {
+                    Text("Hello, world!")
+                }
+
+                lazy var logger: OSLog = {
+                    LoggingMacroHelper.generateOSLog(category: "UI")
+                }()
+            }
+            """,
+            macros: ["Logging": LoggingMacro.self]
+        )
+    }
 }