wip5

darkleaf · Oct 15, 2024 · 91cbdbc · 91cbdbc
1 parent 8bcce98
commit 91cbdbc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/darkleaf/di/core.clj b/src/darkleaf/di/core.clj
@@ -767,7 +767,13 @@
     (fn [registry]
       (fn [key]
         (if (= ::cache key)
-          @cache
+          (reify p/Factory
+            (dependencies [_]
+              nil)
+            (build [_ _]
+              (assoc @cache :valid? (atom true)))
+            (demolish [_ obj]
+              (reset! (:valid? obj) false)))
           (let [factory (registry key)]
             (reify p/Factory
               (dependencies [_]
@@ -784,6 +790,8 @@
 (defn use-cache [cache]
   (fn [registry]
     (fn [key]
+      (when-not @(:valid? cache)
+        (throw (IllegalStateException. "Invalid cache")))
       (let [factory     (registry key)
             cached-deps (cache [:key->deps key])
             cached-obj  (cache [:key->obj  key])]

diff --git a/test/darkleaf/di/tutorial/z_memoize_test.clj b/test/darkleaf/di/tutorial/z_memoize_test.clj
@@ -30,9 +30,6 @@
                   {"CONNECTION_URL" "1"}
                   (di/collect-cache))]
 
-
-    (prn cache)
-
     (with-open [local (di/start `root
                                 (di/use-cache cache))]
       (t/is (identical? global-system @local)))
@@ -49,9 +46,8 @@
       (t/is (not (identical? global-system @local))))
 
 
-    #_#_
     (di/stop root)
 
-    (with-open [local (di/start `root
-                                (di/use-cache cache))]
-      (t/is (identical? global-system @local)))))
+    (t/is (thrown? IllegalStateException
+                   (di/start `root
+                             (di/use-cache cache))))))