valdres 0.2.0-pre.22 → 0.2.0-pre.24

package/dist/index.js

@@ -1125,26 +1125,41 @@ function storeFromStoreData(data, detach) {
   const del = (atom) => deleteFamilyAtom(atom, data);
   const sub = (state, callback, deepEqualCheckBeforeCallback = true) => subscribe(state, callback, deepEqualCheckBeforeCallback, data);
   const txn = (callback) => transaction(callback, data);
-  const scope = (scopeId) => {
-    let scopedStoreData;
-    if (scopeId in data.scopes) {
-      scopedStoreData = data.scopes[scopeId];
+  const scope = (scopeId, callback) => {
+    if (callback) {
+      if (!(scopeId in data.scopes)) {
+        throw new Error(`Scope ${scopeId} does not exist`);
+      }
+      const scopedStoreData = data.scopes[scopeId];
+      const scopedStore = storeFromStoreData(scopedStoreData);
+      const res = callback(scopedStore);
+      return res;
     } else {
-      scopedStoreData = createStoreData(scopeId, data);
-      data.scopes[scopeId] = scopedStoreData;
-    }
-    const detach2 = () => {
-      scopedStoreData.scopeConsumers.delete(detach2);
-      if (scopedStoreData.scopeConsumers.size === 0) {
-        delete data.scopes[scopeId];
-        return true;
+      let scopedStoreData;
+      if (scopeId in data.scopes) {
+        scopedStoreData = data.scopes[scopeId];
+      } else {
+        scopedStoreData = createStoreData(scopeId, data);
+        data.scopes[scopeId] = scopedStoreData;
       }
-      console.warn(`Scope ${scopeId} still has ${scopedStoreData.scopeConsumers.size} consumers, will not detach`);
-      return false;
-    };
-    scopedStoreData.scopeConsumers.add(detach2);
-    const newStore = storeFromStoreData(data.scopes[scopeId], detach2);
-    return newStore;
+      const detach2 = (expectedToDestory = false) => {
+        scopedStoreData.scopeConsumers.delete(detach2);
+        if (scopedStoreData.scopeConsumers.size === 0) {
+          if (expectedToDestory) {
+            console.log("Deleting scope", scopeId);
+          }
+          delete data.scopes[scopeId];
+          return true;
+        }
+        if (expectedToDestory) {
+          console.warn(`Scope ${scopeId} still has ${scopedStoreData.scopeConsumers.size} consumers, will not detach`);
+        }
+        return false;
+      };
+      scopedStoreData.scopeConsumers.add(detach2);
+      const newStore = storeFromStoreData(data.scopes[scopeId], detach2);
+      return newStore;
+    }
   };
   if (detach) {
     return {
@@ -1503,9 +1518,9 @@ var isFamilySelector = (state) => isFamilyState(state) && isSelector(state);
 
 // src/index.ts
 if (globalThis.__valdres__) {
-  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"0.2.0-pre.22"}`);
+  throw new Error(`Error! An instance of valdres is already loaded. Loaded: ${globalThis.__valdres__}. Attempted to load: ${"0.2.0-pre.24"}`);
 } else {
-  globalThis.__valdres__ = "0.2.0-pre.22";
+  globalThis.__valdres__ = "0.2.0-pre.24";
 }
 export {
   store,

package/dist/types/types/Store.d.ts

@@ -10,6 +10,10 @@ type SetAtom = {
     <Value extends any>(atom: Atom<Value>, value: Value): void;
 };
 type DeleteAtom = <Value extends any, Args extends [any, ...any[]] = [any, ...any[]]>(atom: AtomFamilyAtom<Value, Args>) => void;
+export type ScopeFn = {
+    <ReturnType extends any>(scopeId: string): ScopedStore;
+    <ReturnType extends any>(scopeId: string, callback: (store: ScopedStore) => ReturnType): ReturnType;
+};
 export type Store<T = StoreData> = {
     data: T;
     get: GetValue;
@@ -18,9 +22,9 @@ export type Store<T = StoreData> = {
     reset: ResetAtom;
     del: DeleteAtom;
     txn: (callback: TransactionFn) => void;
-    scope: (scopeId: string) => ScopedStore;
+    scope: ScopeFn;
 };
 export type ScopedStore = Store<ScopedStoreData> & {
-    detach: () => void;
+    detach: (warnIfNotDestroyed?: boolean) => void;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-pre.22",
+    "version": "0.2.0-pre.24",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"