valdres 0.2.0-alpha.4 → 0.2.0-alpha.6

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { atom } from "./src/atom";
 export { atomFamily } from "./src/atomFamily";
 export { createStore } from "./src/createStore";
+export { createStoreWithSelectorSet } from "./src/createStoreWithSelectorSet";
 export { getDefaultStore, resetDefaultStore } from "./src/getDefaultStore";
 export { selector } from "./src/selector";
 export { selectorFamily } from "./src/selectorFamily";
@@ -14,6 +15,7 @@ export type { GetValue } from "./src/types/GetValue";
 export type { Selector } from "./src/types/Selector";
 export type { SelectorFamily } from "./src/types/SelectorFamily";
 export type { SetAtom } from "./src/types/SetAtom";
+export type { SetAtomValue } from "./src/types/SetAtomValue";
 export type { State } from "./src/types/State";
 export type { Store } from "./src/types/Store";
 export type { StoreData } from "./src/types/StoreData";

package/dist/index.js

@@ -101,9 +101,6 @@ var createStoreData = (id = generateId()) => ({
 // src/utils/isAtom.ts
 var isAtom = (state) => Object.hasOwn(state, "defaultValue");
 
-// src/utils/isSelector.ts
-var isSelector = (state) => Object.hasOwn(state, "get");
-
 // src/lib/updateStateSubscribers.ts
 var updateStateSubscribers = (state, data) => {
   const subscribtions = data.subscriptions.get(state);
@@ -182,7 +179,7 @@ var handleSelectorResult = (value, selector, data) => {
     value.then((resolved) => {
       data.values.set(selector, resolved);
       updateStateSubscribers(selector, data);
-      console.log(`TODO: Should we check if other selectors are using this?`);
+      console.log("Should we reEvaluate?");
     });
     return value;
   } else {
@@ -209,7 +206,7 @@ var updateSelectorSubscribers = (selector, data) => {
   const familySubscriptions = selector.family && data.subscriptions.get(selector.family);
   if (!subscribtions?.size && !familySubscriptions?.size)
     return;
-  if (subscribtions?.size && data.subscriptionsRequireEqualCheck.get(selector) || familySubscriptions?.size && data.subscriptionsRequireEqualCheck.get(selector.family)) {
+  if (subscribtions?.size && data.subscriptionsRequireEqualCheck.get(selector) || familySubscriptions?.size && selector.family && data.subscriptionsRequireEqualCheck.get(selector.family)) {
     try {
       const oldValue = data.expiredValues.get(selector);
       const newValue = initSelector(selector, data);
@@ -317,6 +314,9 @@ var initAtom = (atom3, data) => {
   return value;
 };
 
+// src/utils/isSelector.ts
+var isSelector = (state) => Object.hasOwn(state, "get");
+
 // src/utils/isFamily.ts
 var isFamily = (state) => Object.hasOwn(state, "_map");
 
@@ -446,23 +446,41 @@ var findDependencies = (state, data, result = new Set) => {
   }
   return result;
 };
+var recursivlyResetTxnSelectorCache = (state, txnSubscribers, txnSelectorCache) => {
+  for (const dep of txnSubscribers.get(state)) {
+    txnSelectorCache.delete(dep);
+    if (txnSubscribers.get(dep)?.size) {
+      recursivlyResetTxnSelectorCache(dep, txnSubscribers, txnSelectorCache);
+    }
+  }
+};
 var transaction = (callback, data) => {
   let txnAtomMap = new Map;
   let txnSelectorCache = new Map;
+  let txnSubscribers = new Map;
   let dirtySelectors = new Set;
   const txnGet = (state) => {
     if (isAtom(state)) {
       return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState2(state, data);
-    } else {
+    } else if (isSelector(state)) {
       if (txnSelectorCache.has(state)) {
         return txnSelectorCache.get(state);
-      } else if (dirtySelectors.has(state)) {
-        const res = state.get(txnGet);
-        txnSelectorCache.set(state, res);
-        return res;
-      } else {
-        return getState2(state, data);
       }
+      const deps = new Set;
+      const res = state.get((s) => {
+        deps.add(s);
+        return txnGet(s);
+      });
+      for (const dep of deps) {
+        if (!txnSubscribers.has(dep)) {
+          txnSubscribers.set(dep, new Set);
+        }
+        txnSubscribers.get(dep).add(state);
+      }
+      txnSelectorCache.set(state, res);
+      return res;
+    } else {
+      throw new Error("Unsupported state");
     }
   };
   const txnSet = (atom3, value) => {
@@ -476,6 +494,9 @@ var transaction = (callback, data) => {
       dirtySelectors.add(selector);
       txnSelectorCache.delete(selector);
     }
+    if (txnSubscribers.get(atom3)?.size) {
+      recursivlyResetTxnSelectorCache(atom3, txnSubscribers, txnSelectorCache);
+    }
     txnAtomMap.set(atom3, value);
   };
   const txnReset = (atom3) => {
@@ -496,19 +517,9 @@ var transaction = (callback, data) => {
 var storeFromStoreData2 = (data) => {
   const get = (state) => getState2(state, data);
   const set = (state, value) => {
-    if (isAtom(state)) {
-      return setAtom(state, value, data);
-    } else {
-      if (isSelector(state)) {
-        if (state.set) {
-          txn((set2, get2) => state.set({ get: get2, set: set2 }, value));
-          return;
-        } else {
-          throw new Error("set on selector is not supported");
-        }
-      }
-      throw new Error("Invalid state object passed to set");
-    }
+    if (!isAtom(state))
+      throw new Error("Invalid state object");
+    return setAtom(state, value, data);
   };
   const reset = (atom3) => resetAtom(atom3, data);
   const sub = (state, callback, deepEqualCheckBeforeCallback = true) => subscribe(state, callback, deepEqualCheckBeforeCallback, data);
@@ -528,6 +539,23 @@ var createStore = (id) => {
   const data = createStoreData(id);
   return storeFromStoreData2(data);
 };
+// src/createStoreWithSelectorSet.ts
+var setSelector = (selector, values, store) => {
+  return selector.set(store.set, store.get, store.reset, ...values);
+};
+var createStoreWithSelectorSet = (id) => {
+  const data = createStoreData(id);
+  const store = storeFromStoreData2(data);
+  store.set = (state, value, ...rest) => {
+    if (isAtom(state))
+      return setAtom(state, value, data);
+    if (isSelector(state))
+      return setSelector(state, [value, ...rest], store);
+    throw new Error("Invalid state object");
+  };
+  store.kind = "storeWithSelectorSet";
+  return store;
+};
 // src/getDefaultStore.ts
 if (!globalThis._valdresStore) {
   globalThis._valdresStore = createStore("default");
@@ -570,6 +598,7 @@ export {
   isFamily,
   isAtom,
   getDefaultStore,
+  createStoreWithSelectorSet,
   createStore,
   atomFamily,
   atom

package/dist/src/atom.d.ts

@@ -1,9 +1,9 @@
 import type { Atom } from "./types/Atom";
-type AtomOptions<MountRes = undefined> = {
+type AtomOptions<Value, MountRes = undefined> = {
     label?: string;
-    onInit?: () => void;
+    onInit?: (setSelf: (value: Value) => void) => void;
     onMount?: () => MountRes;
     onUnmount?: (mountRes?: MountRes) => void;
 };
-export declare const atom: <Value, FamilyKey = undefined, MountReturnValue = undefined>(defaultValue?: Value | (() => Value | Promise<Value>), options?: AtomOptions<MountReturnValue>) => Atom<Value, FamilyKey>;
+export declare const atom: <Value, FamilyKey = undefined, MountReturnValue = undefined>(defaultValue?: Value | (() => Value | Promise<Value>), options?: AtomOptions<Value, MountReturnValue>) => Atom<Value, FamilyKey>;
 export {};

package/dist/src/createStoreWithSelectorSet.d.ts

@@ -0,0 +1,2 @@
+import type { Store } from "./types/Store";
+export declare const createStoreWithSelectorSet: (id?: string) => Store;

package/dist/src/lib/transaction.d.ts

@@ -1,8 +1,9 @@
 import type { State } from "../types/State";
 import type { StoreData } from "../types/StoreData";
+import type { Atom } from "../types/Atom";
 type GetValdresValue = <V>(state: State<V>) => V;
 type SetValdresValue = <V>(state: State<V>, value: V) => void;
-type ResetValdresValue = <V>(state: State<V>) => V;
+type ResetValdresValue = <V>(atom: Atom<V>) => V;
 type TransactionInterface = (set: SetValdresValue, get: GetValdresValue, reset: ResetValdresValue, commit: () => void) => void;
 export declare const transaction: (callback: TransactionInterface, data: StoreData) => void;
 export {};

package/dist/src/lib/unsubscribe.d.ts

@@ -1,3 +1,5 @@
+import type { Family } from "../types/Family";
 import type { State } from "../types/State";
 import type { StoreData } from "../types/StoreData";
-export declare const unsubscribe: <V>(state: State<V>, subscription: any, data: StoreData, mount?: any) => void;
+import type { Subscription } from "../types/Subscription";
+export declare const unsubscribe: <V>(state: State<V> | Family<V>, subscription: Subscription, data: StoreData, mount?: any) => void;

package/dist/src/types/Atom.d.ts

@@ -4,7 +4,7 @@ export type Atom<Value = unknown, FamilyKey = undefined, MountRes = undefined> =
     label?: string;
     family?: AtomFamily<Value, FamilyKey>;
     familyKey?: FamilyKey;
-    onInit?: () => void;
+    onInit?: (setSelf: (value: Value) => void) => void;
     onMount?: () => MountRes;
     onUnmount?: (mountRes?: MountRes) => void;
 };

package/dist/src/types/Selector.d.ts

@@ -1,8 +1,9 @@
 import type { GetValue } from "./GetValue";
 import type { SelectorFamily } from "./SelectorFamily";
-export type Selector<Value = any, FamilyKey = undefined> = {
+export type Selector<Value = any, FamilyKey = undefined, MountRes = unknown> = {
     get: (get: GetValue) => Value;
     debugLabel?: string;
     family?: SelectorFamily<Value, FamilyKey>;
     familyKey?: FamilyKey;
+    onMount?: () => MountRes;
 };

package/dist/src/types/SetAtom.d.ts

@@ -1,2 +1,3 @@
 import type { Atom } from "./Atom";
-export type SetAtom = <V>(atom: Atom<V>, value: V | ((current: V) => V)) => void;
+import type { SetAtomValue } from "./SetAtomValue";
+export type SetAtom<V = unknown> = (atom: Atom<V>, value: SetAtomValue<V>) => void;

package/dist/src/types/SetAtomValue.d.ts

@@ -0,0 +1 @@
+export type SetAtomValue<V> = V | ((current: V) => V);

package/dist/src/types/Subscription.d.ts

@@ -0,0 +1 @@
+export type Subscription = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.4",
+    "version": "0.2.0-alpha.6",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -34,5 +34,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "1bde879ca28be7fb3e98add8bbcd2c568f8c6911"
+    "gitHead": "727e6a247df61e016e0f7905397a9121abf4e82c"
 }