valdres 0.2.0-alpha.0 → 0.2.0-alpha.2

package/dist/index.js

@@ -8,7 +8,9 @@ var atom = (defaultValue, options) => {
   };
 };
 // src/utils/isPromiseLike.ts
-var isPromiseLike = (object) => object && object.then && typeof object.then === "function";
+var isPromiseLike = (object) => {
+  return object && object.then && typeof object.then === "function";
+};
 
 // src/lib/stableStringify.ts
 var stableStringifyRecurse = (x, key) => {
@@ -65,24 +67,15 @@ var stableStringify = (x) => {
 };
 
 // src/atomFamily.ts
-var handleDefaultValue = (defaultValue, override, key) => {
-  if (override) {
-    return typeof override === "function" ? () => typeof defaultValue === "function" ? override(defaultValue(key)) : override(defaultValue) : override;
-  } else {
-    return typeof defaultValue === "function" ? () => defaultValue(key) : defaultValue;
-  }
-};
 var atomFamily = (defaultValue, debugLabel) => {
   const map = new Map;
   const atomFamily2 = (key, defaultOverride) => {
     const keyStringified = stableStringify(key);
     if (map.has(keyStringified)) {
-      if (defaultOverride)
-        throw new Error("defaultOverride is only allowed first time an atom is initiaizlied");
       return map.get(keyStringified);
     }
     const atomDebugLabel = debugLabel && debugLabel + "_" + keyStringified;
-    const newAtom = atom(handleDefaultValue(defaultValue, defaultOverride, key), {
+    const newAtom = atom(typeof defaultValue === "function" ? () => defaultValue(key) : defaultValue, {
       label: atomDebugLabel
     });
     newAtom.family = atomFamily2;
@@ -94,18 +87,18 @@ var atomFamily = (defaultValue, debugLabel) => {
   return atomFamily2;
 };
 // src/lib/updateStateSubscribers.ts
-var updateStateSubscribers = (state2, data) => {
-  const subscribtions = data.subscriptions.get(state2);
+var updateStateSubscribers = (state, data) => {
+  const subscribtions = data.subscriptions.get(state);
   if (subscribtions?.size) {
     for (const subscribtion of subscribtions) {
       subscribtion.callback();
     }
   }
-  if (state2.family) {
-    const familySubscriptions = data.subscriptions.get(state2.family);
+  if (state.family) {
+    const familySubscriptions = data.subscriptions.get(state.family);
     if (familySubscriptions?.size) {
       for (const subscribtion of familySubscriptions) {
-        subscribtion.callback(state2.familyKey);
+        subscribtion.callback(state.familyKey);
       }
     }
   }
@@ -123,12 +116,12 @@ class SuspendAndWaitForResolveError extends Error {
     this.promise = promise;
   }
 }
-var getOrInitConsumersSet = (state2, data) => {
-  const set = data.stateConsumers.get(state2);
+var getOrInitConsumersSet = (state, data) => {
+  const set = data.stateConsumers.get(state);
   if (set)
     return set;
   const newSet = new Set;
-  data.stateConsumers.set(state2, newSet);
+  data.stateConsumers.set(state, newSet);
   return newSet;
 };
 var evaluateSelector = (selector, data) => {
@@ -136,9 +129,9 @@ var evaluateSelector = (selector, data) => {
   const updatedDependencies = new Set;
   let result;
   try {
-    result = selector.get((state2) => {
-      const value = getState2(state2, data);
-      updatedDependencies.add(state2);
+    result = selector.get((state) => {
+      const value = getState2(state, data);
+      updatedDependencies.add(state);
       if (isPromiseLike(value))
         throw new SuspendAndWaitForResolveError(value);
       return value;
@@ -152,12 +145,12 @@ var evaluateSelector = (selector, data) => {
   }
   const added = updatedDependencies?.difference(currentDependencies);
   const removed = currentDependencies?.difference(updatedDependencies);
-  for (const state2 of added) {
-    const set = getOrInitConsumersSet(state2, data);
+  for (const state of added) {
+    const set = getOrInitConsumersSet(state, data);
     set.add(selector);
   }
-  for (const state2 of removed) {
-    const set = getOrInitConsumersSet(state2, data);
+  for (const state of removed) {
+    const set = getOrInitConsumersSet(state, data);
     set.delete(selector);
   }
   data.stateDependencies.set(selector, updatedDependencies);
@@ -214,7 +207,7 @@ var updateSelectorSubscribers = (selector, data) => {
   }
   if (familySubscriptions?.size) {
     for (const subscribtion of familySubscriptions) {
-      subscribtion.callback(state.familyKey);
+      subscribtion.callback(selector.familyKey);
     }
   }
 };
@@ -307,25 +300,25 @@ var initAtom = (atom3, data) => {
 };
 
 // src/utils/isAtom.ts
-var isAtom = (state2) => Object.hasOwn(state2, "defaultValue");
+var isAtom = (state) => Object.hasOwn(state, "defaultValue");
 
 // src/utils/isSelector.ts
-var isSelector = (state2) => Object.hasOwn(state2, "get");
+var isSelector = (state) => Object.hasOwn(state, "get");
 
 // src/utils/isFamily.ts
-var isFamily = (state2) => Object.hasOwn(state2, "_map");
+var isFamily = (state) => Object.hasOwn(state, "_map");
 
 // src/lib/getState.ts
-var getState2 = (state2, data) => {
-  if (data.values.has(state2))
-    return data.values.get(state2);
-  if (isAtom(state2))
-    return initAtom(state2, data);
-  if (isSelector(state2))
-    return initSelector(state2, data);
-  if (isFamily(state2)) {
+var getState2 = (state, data) => {
+  if (data.values.has(state))
+    return data.values.get(state);
+  if (isAtom(state))
+    return initAtom(state, data);
+  if (isSelector(state))
+    return initSelector(state, data);
+  if (isFamily(state)) {
     const res = [];
-    for (const atom3 of state2._map.values()) {
+    for (const atom3 of state._map.values()) {
       res.push([atom3.familyKey, getState2(atom3, data)]);
     }
     return res;
@@ -334,11 +327,11 @@ var getState2 = (state2, data) => {
 };
 
 // src/lib/unsubscribe.ts
-var unsubscribe = (state2, subscription, data, mountRes) => {
-  const subscribers = data.subscriptions.get(state2);
+var unsubscribe = (state, subscription, data, mountRes) => {
+  const subscribers = data.subscriptions.get(state);
   if (subscribers) {
     subscribers.delete(subscription);
-    if (data.subscriptionsRequireEqualCheck.get(state2)) {
+    if (data.subscriptionsRequireEqualCheck.get(state)) {
       let remove = true;
       for (const subscriber of subscribers) {
         if (subscriber.requireDeepEqualCheckBeforeCallback) {
@@ -347,33 +340,33 @@ var unsubscribe = (state2, subscription, data, mountRes) => {
         }
       }
       if (remove) {
-        data.subscriptionsRequireEqualCheck.delete(state2);
+        data.subscriptionsRequireEqualCheck.delete(state);
       }
     }
     if (subscribers.size === 0) {
-      if (state2.onUnmount) {
-        state2.onUnmount(mountRes);
+      if (state.onUnmount) {
+        state.onUnmount(mountRes);
       }
     }
   }
 };
 
 // src/lib/subscribe.ts
-var initSubscribers = (state2, data) => {
+var initSubscribers = (state, data) => {
   const set = new Set;
-  data.subscriptions.set(state2, set);
+  data.subscriptions.set(state, set);
   return set;
 };
-var subscribe = (state2, callback, requireDeepEqualCheckBeforeCallback, data) => {
-  const subscribers = data.subscriptions.get(state2) || initSubscribers(state2, data);
-  if (isSelector(state2) && !data.values.has(state2)) {
-    initSelector(state2, data);
+var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) => {
+  const subscribers = data.subscriptions.get(state) || initSubscribers(state, data);
+  if (isSelector(state) && !data.values.has(state)) {
+    initSelector(state, data);
   }
   let subscription;
-  if (isFamily(state2)) {
+  if (isFamily(state)) {
     subscription = {
       callback,
-      state: state2,
+      state,
       requireDeepEqualCheckBeforeCallback
     };
   } else {
@@ -383,16 +376,16 @@ var subscribe = (state2, callback, requireDeepEqualCheckBeforeCallback, data) =>
     };
   }
   let mountRes;
-  if (subscribers.size === 0 && state2.onMount) {
-    mountRes = state2.onMount((value) => {
-      setAtom(state2, value, data);
+  if (subscribers.size === 0 && state.onMount) {
+    mountRes = state.onMount((value) => {
+      setAtom(state, value, data);
     });
   }
   subscribers.add(subscription);
-  if (requireDeepEqualCheckBeforeCallback && data.subscriptionsRequireEqualCheck.get(state2) !== true) {
-    data.subscriptionsRequireEqualCheck.set(state2, true);
+  if (requireDeepEqualCheckBeforeCallback && data.subscriptionsRequireEqualCheck.get(state) !== true) {
+    data.subscriptionsRequireEqualCheck.set(state, true);
   }
-  return () => unsubscribe(state2, subscription, data, mountRes);
+  return () => unsubscribe(state, subscription, data, mountRes);
 };
 
 // src/lib/setAtoms.ts
@@ -410,8 +403,8 @@ var setAtoms = (pairs, data) => {
 };
 
 // src/lib/transaction.ts
-var findDependencies = (state2, data, result = new Set) => {
-  const consumers = data.stateConsumers.get(state2);
+var findDependencies = (state, data, result = new Set) => {
+  const consumers = data.stateConsumers.get(state);
   if (consumers?.size) {
     for (const consumer of consumers) {
       if (!result.has(consumer)) {
@@ -426,18 +419,18 @@ var transaction = (callback, data) => {
   let txnAtomMap = new Map;
   let txnSelectorCache = new Map;
   let dirtySelectors = new Set;
-  const txnGet = (state2) => {
-    if (isAtom(state2)) {
-      return txnAtomMap.has(state2) ? txnAtomMap.get(state2) : getState2(state2, data);
+  const txnGet = (state) => {
+    if (isAtom(state)) {
+      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState2(state, data);
     } else {
-      if (txnSelectorCache.has(state2)) {
-        return txnSelectorCache.get(state2);
-      } else if (dirtySelectors.has(state2)) {
-        const res = state2.get(txnGet);
-        txnSelectorCache.set(state2, res);
+      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(state2, data);
+        return getState2(state, data);
       }
     }
   };
@@ -489,14 +482,27 @@ var createStore = (id) => {
     stateConsumers: new WeakMap,
     stateDependencies: new WeakMap
   };
-  const get = (state2) => getState2(state2, data);
-  const set = (state2, value) => {
-    if (isAtom(state2)) {
-      return setAtom(state2, value, data);
+  const get = (state) => getState2(state, data);
+  const getWithDefault = (atom3, defaultValue) => {
+    if (!isAtom(atom3))
+      throw new Error("Only atom allowed");
+    if (data.values.has(atom3)) {
+      return data.values.get(atom3);
+    } else {
+      if (typeof defaultValue === "function") {
+        defaultValue = defaultValue((state) => getState2(state, data));
+      }
+      data.values.set(atom3, defaultValue);
+      return defaultValue;
+    }
+  };
+  const set = (state, value) => {
+    if (isAtom(state)) {
+      return setAtom(state, value, data);
     } else {
-      if (isSelector(state2)) {
-        if (state2.set) {
-          txn((set2, get2) => state2.set({ get: get2, set: set2 }, value));
+      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");
@@ -506,10 +512,11 @@ var createStore = (id) => {
     }
   };
   const reset = (atom3) => resetAtom(atom3, data);
-  const sub = (state2, callback, deepEqualCheckBeforeCallback = true) => subscribe(state2, callback, deepEqualCheckBeforeCallback, data);
+  const sub = (state, callback, deepEqualCheckBeforeCallback = true) => subscribe(state, callback, deepEqualCheckBeforeCallback, data);
   const txn = (callback) => transaction(callback, data);
   return {
     get,
+    getWithDefault,
     set,
     sub,
     txn,

package/dist/src/atom.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/atomFamily.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/createStore.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/getDefaultStore.d.ts

@@ -1,2 +1,2 @@
 export declare const getDefaultStore: () => any;
-export declare const resetDefaultStore: () => import("..").Store;
+export declare const resetDefaultStore: () => import("./types/Store").Store;

package/dist/src/lib/initAtom.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/lib/initSelector.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1 @@
+export {};

package/dist/src/lib/setAtom.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,3 +1,4 @@
+import type { Family } from "../types/Family";
 import type { State } from "../types/State";
 import type { StoreData } from "../types/StoreData";
-export declare const subscribe: <V>(state: State<V>, callback: any, data: StoreData) => () => void;
+export declare const subscribe: <V>(state: State<V> | Family<V>, callback: any, requireDeepEqualCheckBeforeCallback: boolean, data: StoreData) => () => void;

package/dist/src/lib/subscribe.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1 @@
+export {};

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

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

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

@@ -1,3 +1,3 @@
 import type { Selector } from "../types/Selector";
 import type { StoreData } from "../types/StoreData";
-export declare const updateSelectorSubscribers: (selector: Selector, data: StoreData, oldValue: any) => void;
+export declare const updateSelectorSubscribers: (selector: Selector, data: StoreData) => void;

package/dist/src/selector.d.ts

@@ -1,5 +1,3 @@
 import type { GetValue } from "./types/GetValue";
-export declare const selector: (get: GetValue, debugLabel?: string) => {
-    get: GetValue;
-    debugLabel: string;
-};
+import type { Selector } from "./types/Selector";
+export declare const selector: <Value, FamilyKey = undefined>(get: (get: GetValue) => Value, debugLabel?: string) => Selector<Value, FamilyKey>;

package/dist/src/selector.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/selectorFamily.d.ts

@@ -1,4 +1,2 @@
-export declare const selectorFamily: <V, A>(get: any, debugLabel?: string) => {
-    (key: A): any;
-    _map: Map<any, any>;
-};
+import type { SelectorFamily } from "./types/SelectorFamily";
+export declare const selectorFamily: <Value, Key>(get: any, debugLabel?: string) => SelectorFamily<Value, Key>;

package/dist/src/selectorFamily.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,7 +1,9 @@
 import type { AtomFamily } from "./AtomFamily";
-export type Atom<Value = unknown, FamilyKey = undefined> = {
+export type Atom<Value = unknown, FamilyKey = undefined, MountRes = undefined> = {
     defaultValue?: Value | (() => Value | Promise<Value>);
     label?: string;
     family?: AtomFamily<Value, FamilyKey>;
     familyKey?: FamilyKey;
+    onMount?: () => MountRes;
+    onUnmount?: (mountRes?: MountRes) => void;
 };

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

@@ -1,5 +1,5 @@
 import type { Atom } from "./Atom";
 export type AtomFamily<Value, Key> = {
-    (key: Key, defaultOverride?: any): Atom<Value, Key>;
+    (key: Key, defaultOverride?: any): Atom<Value>;
     _map: Map<Key, Atom<Value, Key>>;
 };

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

@@ -1,3 +1,3 @@
 import type { SelectorFamily } from "./SelectorFamily";
 import type { AtomFamily } from "./AtomFamily";
-export type Family<V, K> = AtomFamily<V, K> | SelectorFamily<V, K>;
+export type Family<V, K = any> = AtomFamily<V, K> | SelectorFamily<V, K>;

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

@@ -1,2 +1,2 @@
 import type { State } from "./State";
-export type GetValue = <V>(state: State<V>) => V;
+export type GetValue = <V>(state: State<V>) => V | Promise<V>;

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

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

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

@@ -1 +1,5 @@
-export type SelectorFamily<A, V> = {};
+import type { Selector } from "./Selector";
+export type SelectorFamily<Value, Key> = {
+    (key: Key, defaultOverride?: any): Selector<Value>;
+    _map: Map<Key, Selector<Value, Key>>;
+};

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

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

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

@@ -1,7 +1,9 @@
 export type StoreData = {
     id: string;
     values: WeakMap<WeakKey, any>;
-    subscriptions: WeakMap<WeakKey, any>;
+    expiredValues: WeakMap<WeakKey, any>;
+    subscriptions: WeakMap<WeakKey, Set<any>>;
+    subscriptionsRequireEqualCheck: WeakMap<WeakKey, boolean>;
     stateConsumers: WeakMap<WeakKey, any>;
     stateDependencies: WeakMap<WeakKey, any>;
 };

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

@@ -1,2 +1,2 @@
 import type { State } from "./State";
-export type SubscribeFn = <V>(state: State<V>, callback: () => void) => () => void;
+export type SubscribeFn = <V>(state: State<V>, callback: () => void, requireDeepEqualCheckBeforeCallback?: boolean) => () => void;

package/dist/src/utils/isAtom.d.ts

@@ -1,2 +1,3 @@
+import type { Atom } from "../types/Atom";
 import type { State } from "../types/State";
-export declare const isAtom: (state: State) => boolean;
+export declare const isAtom: (state: State) => state is Atom;

package/dist/src/utils/isPromiseLike.d.ts

@@ -1 +1 @@
-export declare const isPromiseLike: (object: any) => boolean;
+export declare const isPromiseLike: <T>(object: any) => object is Promise<T>;

package/dist/src/utils/isSelector.d.ts

@@ -1,3 +1,2 @@
 import type { Selector } from "../types/Selector";
-import type { State } from "../types/State";
-export declare const isSelector: (state: State) => state is Selector;
+export declare const isSelector: (state: any) => state is Selector;

package/dist/test/utils/wait.d.ts

@@ -0,0 +1,2 @@
+export declare const wait: (ms: number) => Promise<unknown>;
+export declare const waitCrash: (ms: number) => Promise<unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.0",
+    "version": "0.2.0-alpha.2",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -15,7 +15,7 @@
     ],
     "scripts": {
         "build": "NODE_ENV=production bun scripts/build.ts",
-        "build:types": "tsc index.ts --declaration --emitDeclarationOnly --outDir dist",
+        "build:types": "tsc",
         "test": "bun test"
     },
     "dependencies": {
@@ -23,6 +23,7 @@
     },
     "devDependencies": {
         "@testing-library/react-hooks": "8.0.1",
+        "jotai": "2.10.0",
         "mitata": "0.1.14",
         "react": ">=18",
         "react-dom": ">=18",
@@ -33,5 +34,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "ec1d460976eb7aa8b97c5def2c39bc406670d74c"
+    "gitHead": "4f2355214e1e4d2cf9011705733b18ab425f8d20"
 }

package/dist/index.d.ts

@@ -1,14 +0,0 @@
-export { atom } from "./src/atom";
-export { atomFamily } from "./src/atomFamily";
-export { createStore } from "./src/createStore";
-export { getDefaultStore, resetDefaultStore } from "./src/getDefaultStore";
-export { selector } from "./src/selector";
-export { selectorFamily } from "./src/selectorFamily";
-export { isAtom } from "./src/utils/isAtom";
-export { isSelector } from "./src/utils/isSelector";
-export { isFamily } from "./src/utils/isFamily";
-export { isPromiseLike } from "./src/utils/isPromiseLike";
-export type { Atom } from "./src/types/Atom";
-export type { Selector } from "./src/types/Selector";
-export type { State } from "./src/types/State";
-export type { Store } from "./src/types/Store";