Property wrapper re-write

.github/workflows/swift.yml

@@ -24,4 +24,5 @@ jobs:
     - run: swift test --enable-code-coverage
     - uses: drekka/swift-coverage-action@v1
       with:
+        coverage: 90
         show-all-files: true

.swiftpm/xcode/xcshareddata/xcschemes/DayType-Package.xcscheme

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DayType"
+               BuildableName = "DayType"
+               BlueprintName = "DayType"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DayTypeMacros"
+               BuildableName = "DayTypeMacros"
+               BlueprintName = "DayTypeMacros"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:DayType-Package.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DayTypeTests"
+               BuildableName = "DayTypeTests"
+               BlueprintName = "DayTypeTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DayType"
+            BuildableName = "DayType"
+            BlueprintName = "DayType"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

.swiftpm/xcode/xcshareddata/xcschemes/DayTypeMacros.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "DayTypeMacros"
+               BuildableName = "DayTypeMacros"
+               BlueprintName = "DayTypeMacros"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "DayTypeMacros"
+            BuildableName = "DayTypeMacros"
+            BlueprintName = "DayTypeMacros"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

DayType-Package.xctestplan

@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "F28B9C65-0AA9-4599-8E55-40AEEF5A8B41",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "DayTypeTests",
+        "name" : "DayTypeTests"
+      }
+    }
+  ],
+  "version" : 1
+}

Macros/Implementations/EpochPropertyWrapperMacro.swift

@@ -0,0 +1,56 @@
+import SwiftDiagnostics
+import SwiftSyntax
+import SwiftSyntaxMacros
+
+struct EpochPropertyWrapperMacro: MemberMacro {
+
+    static func expansion(
+        of node: AttributeSyntax,
+        providingMembersOf _: some DeclGroupSyntax,
+        in context: some MacroExpansionContext
+    ) throws -> [DeclSyntax] {
+
+        guard let typeName = node.arguments?.stringArgumentValue("typeName"),
+              let milliseconds = node.arguments?.argumentValue("milliseconds") else {
+            context.diagnose(Diagnostic(
+                node: node, message: MacroExpansionErrorMessage("typeName or milliseconds argument not supplied. Passed arguments \(node.arguments?.description ?? "")")
+            ))
+            return []
+        }
+
+        let withNullableImplementation = (node.arguments?.argumentValue("withNullableImplementation") ?? "true") == "true"
+
+        return [
+            DeclSyntax(stringLiteral: propertyWrapper(name: typeName, milliseconds: milliseconds, withNullableImplementation: withNullableImplementation)),
+        ]
+    }
+
+    private static func propertyWrapper(name: String, milliseconds: String, withNullableImplementation: Bool) -> String {
+        let writeNulls = withNullableImplementation ? "false" : "true"
+        return """
+        @propertyWrapper
+        public struct \(name): Codable {
+
+            \(withNullableImplementation ? propertyWrapper(name: "Nullable", milliseconds: milliseconds, withNullableImplementation: false) : "")
+
+            public var wrappedValue: DayType
+
+            // We need to expose these values so keyed containers can access them.
+            let writeNulls = \(writeNulls)
+            let milliseconds = \(milliseconds)
+
+            public init(wrappedValue: DayType) {
+                self.wrappedValue = wrappedValue
+            }
+
+            public init(from decoder: Decoder) throws {
+                wrappedValue = try DayType.decode(using: decoder, milliseconds: \(milliseconds))
+            }
+
+            public func encode(to encoder: Encoder) throws {
+                try wrappedValue.encode(using: encoder, milliseconds: \(milliseconds), writeNulls: writeNulls)
+            }
+        }
+        """
+    }
+}

Macros/Implementations/FormattedStringPropertyWrapperMacro.swift

@@ -0,0 +1,59 @@
+import SwiftDiagnostics
+import SwiftSyntax
+import SwiftSyntaxBuilder
+import SwiftSyntaxMacros
+
+/// Adds a static embedeed type for encoding and decoding using a passed formatter.
+struct FormattedStringPropertyWrapperMacro: MemberMacro {
+
+    static func expansion(
+        of node: AttributeSyntax,
+        providingMembersOf _: some DeclGroupSyntax,
+        in context: some MacroExpansionContext
+    ) throws -> [DeclSyntax] {
+
+        guard let typeName = node.arguments?.stringArgumentValue("name"),
+              let formatter = node.arguments?.argumentValue("formatter")
+        else {
+            context.diagnose(Diagnostic(
+                node: node, message: MacroExpansionErrorMessage("typeName, formatter or writeNulls argument not supplied. Passed arguments: \(node.arguments?.description ?? "")")
+            ))
+            return []
+        }
+
+        let withNullableImplementation = (node.arguments?.argumentValue("withNullableImplementation") ?? "true") == "true"
+
+        return [
+            DeclSyntax(stringLiteral: propertyWrapper(name: typeName, formatter: formatter, withNullableImplementation: withNullableImplementation)),
+        ]
+    }
+
+    private static func propertyWrapper(name: String, formatter: String, withNullableImplementation: Bool) -> String {
+        let writeNulls = withNullableImplementation ? "false" : "true"
+        return """
+        @propertyWrapper
+        public struct \(name): Codable {
+
+            \(withNullableImplementation ? propertyWrapper(name: "Nullable", formatter: formatter, withNullableImplementation: false) : "")
+
+            public var wrappedValue: DayType
+
+            // We need to expose these values so keyed containers can access them.
+            let formatter = \(formatter)
+            let writeNulls = \(writeNulls)
+
+            public init(wrappedValue: DayType) {
+                self.wrappedValue = wrappedValue
+            }
+
+            public init(from decoder: Decoder) throws {
+                wrappedValue = try DayType.decode(from: decoder, formatter: \(formatter))
+            }
+
+            public func encode(to encoder: Encoder) throws {
+                try wrappedValue.encode(into: encoder, formatter: \(formatter), writeNulls: \(writeNulls))
+            }
+        }
+        """
+    }
+}

Macros/Implementations/KeyedContainerDecodeMissingDayStringMacro.swift

@@ -0,0 +1,35 @@
+import SwiftDiagnostics
+import SwiftSyntax
+import SwiftSyntaxMacros
+
+struct KeyedContainerDecodeMissingDayStringMacro: MemberMacro {
+
+    static func expansion(
+        of node: AttributeSyntax,
+        providingMembersOf owningType: some DeclGroupSyntax,
+        in context: some MacroExpansionContext
+    ) throws -> [DeclSyntax] {
+
+        guard owningType.as(ExtensionDeclSyntax.self)?.extendedType.trimmedDescription == "KeyedDecodingContainer" else {
+            context.diagnose(Diagnostic(
+                node: node, message: MacroExpansionErrorMessage("Can only be used on a KeyedDecodingContainer: \(owningType.as(ExtensionDeclSyntax.self)?.extendedType.trimmedDescription ?? "")")
+            ))
+            return []
+        }
+
+        guard let decodableType = node.arguments?.typeArgumentValue("type") else {
+            context.diagnose(Diagnostic(
+                node: node, message: MacroExpansionErrorMessage("Unable to determine passed type argument from: \(node.arguments?.description ?? "")")
+            ))
+            return []
+        }
+
+        return [
+            """
+            public func decode(_ type: \(raw: decodableType).Type, forKey key: Key) throws -> \(raw: decodableType) {
+                try decodeIfPresent(type, forKey: key) ?? .init(wrappedValue: nil)
+            }
+            """,
+        ]
+    }
+}

Macros/Implementations/KeyedContainerDecodeMissingEpochMacro.swift

@@ -0,0 +1,35 @@
+import SwiftDiagnostics
+import SwiftSyntax
+import SwiftSyntaxMacros
+
+struct KeyedContainerDecodeMissingEpochMacro: MemberMacro {
+
+    static func expansion(
+        of node: AttributeSyntax,
+        providingMembersOf owningType: some DeclGroupSyntax,
+        in context: some MacroExpansionContext
+    ) throws -> [DeclSyntax] {
+
+        guard owningType.as(ExtensionDeclSyntax.self)?.extendedType.trimmedDescription == "KeyedDecodingContainer" else {
+            context.diagnose(Diagnostic(
+                node: node, message: MacroExpansionErrorMessage("Can only be used on a KeyedDecodingContainer: \(owningType.as(ExtensionDeclSyntax.self)?.extendedType.trimmedDescription ?? "")")
+            ))
+            return []
+        }
+
+        guard let decodableType = node.arguments?.typeArgumentValue("type") else {
+            context.diagnose(Diagnostic(
+                node: node, message: MacroExpansionErrorMessage("Unable to determine passed type argument from: \(node.arguments?.description ?? "")")
+            ))
+            return []
+        }
+
+        return [
+            """
+            public func decode(_ type: \(raw: decodableType).Type, forKey key: Key) throws -> \(raw: decodableType) {
+                try decodeIfPresent(type, forKey: key) ?? .init(wrappedValue: nil)
+            }
+            """,
+        ]
+    }
+}