Merge pull request #9 from WhoopInc/ncipollo/3/type-cleanup

Fixes #3 Cleanup types within ServiceDictionary
WhoopInc · Dec 14, 2023 · 4e75f9b · 4e75f9b
2 parents 2224c22 + aa8f45e
commit 4e75f9b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,5 +1,8 @@
 name: "Test"
-on: [push, pull_request] 
+on:
+  push:
+    branches: ["main", "release*"]
+  pull_request: 
 
 jobs:
   test:

diff --git a/Sources/WhoopDIKit/ServiceDictionary.swift b/Sources/WhoopDIKit/ServiceDictionary.swift
@@ -1,11 +1,11 @@
 public final class ServiceDictionary<Value> {
-    private var valuesByType: [AnyHashable: Value]
+    private var valuesByType: [ServiceKey: Value]
 
     convenience public init() {
         self.init(valuesByType: [:])
     }
 
-    private init(valuesByType: [AnyHashable: Value]) {
+    private init(valuesByType: [ServiceKey: Value]) {
         self.valuesByType = valuesByType
     }
 
@@ -27,7 +27,7 @@ public final class ServiceDictionary<Value> {
         }
     }
 
-    public func allKeys() -> Set<AnyHashable> {
+    public func allKeys() -> Set<ServiceKey> {
         Set(valuesByType.keys)
     }
 

diff --git a/Sources/WhoopDIKit/WhoopDI.swift b/Sources/WhoopDIKit/WhoopDI.swift
@@ -89,8 +89,7 @@ public final class WhoopDI: DependencyRegister {
 
     /// Used internally via the `WhoopDIValidator` to verify all definitions in the object graph have definitions for their sub-dependencies  (i.e this verifies the object graph is complete).
     internal static func validate(paramsDict: ServiceDictionary<Any>, onFailure: (Error) -> Void) {
-        serviceDict.allKeys().forEach { key in
-            let serviceKey = key as! ServiceKey
+        serviceDict.allKeys().forEach { serviceKey in
             let definition = getDefinition(serviceKey)
             do {
                 let _ = try definition?.get(params: paramsDict[serviceKey])