valdres 0.2.0-alpha.6 → 0.2.0-alpha.8

package/dist/index.js

@@ -101,6 +101,9 @@ var createStoreData = (id = generateId()) => ({
 // src/utils/isAtom.ts
 var isAtom = (state) => Object.hasOwn(state, "defaultValue");
 
+// src/lib/getState.ts
+import equal4 from "fast-deep-equal";
+
 // src/lib/updateStateSubscribers.ts
 var updateStateSubscribers = (state, data) => {
   const subscribtions = data.subscriptions.get(state);
@@ -145,7 +148,7 @@ var evaluateSelector = (selector, data) => {
   let result;
   try {
     result = selector.get((state) => {
-      const value = getState2(state, data);
+      const value = getState(state, data);
       updatedDependencies.add(state);
       if (isPromiseLike(value))
         throw new SuspendAndWaitForResolveError(value);
@@ -243,13 +246,13 @@ var recursivlyResetSelectorTree = (selectors, data, clearedSelectors) => {
 };
 var propagateUpdatedAtoms = (atoms, data) => {
   const clearedSelectors = new Set;
-  for (const atom3 of atoms) {
-    const consumers = data.stateConsumers.get(atom3);
+  for (const atom2 of atoms) {
+    const consumers = data.stateConsumers.get(atom2);
     if (consumers && consumers.size) {
       recursivlyResetSelectorTree(consumers, data, clearedSelectors);
     }
-    if (atom3.family) {
-      const consumersFamily = data.stateConsumers.get(atom3.family);
+    if (atom2.family) {
+      const consumersFamily = data.stateConsumers.get(atom2.family);
       if (consumersFamily?.size) {
         recursivlyResetSelectorTree(consumersFamily, data, clearedSelectors);
       }
@@ -258,15 +261,15 @@ var propagateUpdatedAtoms = (atoms, data) => {
   for (const selector of clearedSelectors) {
     updateSelectorSubscribers(selector, data);
   }
-  for (const atom3 of atoms) {
-    updateStateSubscribers(atom3, data);
+  for (const atom2 of atoms) {
+    updateStateSubscribers(atom2, data);
   }
 };
 
 // src/lib/setAtom.ts
 import equal3 from "fast-deep-equal";
-var setAtom = (atom3, newValue, data) => {
-  const currentValue = getState2(atom3, data);
+var setAtom = (atom2, newValue, data) => {
+  const currentValue = getState(atom2, data);
   if (typeof newValue === "function") {
     newValue = newValue(currentValue);
     if (isPromiseLike(newValue) || isPromiseLike(currentValue))
@@ -274,16 +277,16 @@ var setAtom = (atom3, newValue, data) => {
   }
   if (equal3(currentValue, newValue))
     return;
-  data.values.set(atom3, newValue);
+  data.values.set(atom2, newValue);
   if (currentValue?.__isEmptyAtomPromise__) {
     currentValue.__resolveEmptyAtomPromise__(newValue);
   }
-  propagateUpdatedAtoms([atom3], data);
+  propagateUpdatedAtoms([atom2], data);
 };
 
 // src/lib/initAtom.ts
-var getAtomInitValue = (atom3, data) => {
-  if (atom3.defaultValue === undefined) {
+var getAtomInitValue = (atom2, data) => {
+  if (atom2.defaultValue === undefined) {
     let promiseResolve;
     const promise = new Promise((resolve) => {
       promiseResolve = resolve;
@@ -291,25 +294,26 @@ var getAtomInitValue = (atom3, data) => {
     promise.__isEmptyAtomPromise__ = true;
     promise.__resolveEmptyAtomPromise__ = promiseResolve;
     return promise;
-  } else if (typeof atom3.defaultValue === "function") {
-    const value = atom3.defaultValue();
+  } else if (typeof atom2.defaultValue === "function") {
+    const value = atom2.defaultValue();
     if (isPromiseLike(value)) {
       value.then((resolvedValue) => {
-        data.values.set(atom3, resolvedValue);
-        propagateUpdatedAtoms([atom3], data);
+        data.values.set(atom2, resolvedValue);
+        propagateUpdatedAtoms([atom2], data);
       });
     }
     return value;
   } else {
-    return atom3.defaultValue;
+    return atom2.defaultValue;
   }
 };
-var initAtom = (atom3, data) => {
-  const value = getAtomInitValue(atom3, data);
-  data.values.set(atom3, value);
-  if (atom3.onInit)
-    atom3.onInit((newVal) => {
-      setAtom(atom3, newVal, data);
+var initAtom = (atom2, data) => {
+  let value = getAtomInitValue(atom2, data);
+  data.values.set(atom2, value);
+  if (atom2.onInit)
+    atom2.onInit((newVal) => {
+      value = newVal;
+      setAtom(atom2, newVal, data);
     });
   return value;
 };
@@ -321,7 +325,7 @@ var isSelector = (state) => Object.hasOwn(state, "get");
 var isFamily = (state) => Object.hasOwn(state, "_map");
 
 // src/lib/getState.ts
-var getState2 = (state, data) => {
+function getState(state, data) {
   if (data.values.has(state))
     return data.values.get(state);
   if (isAtom(state))
@@ -329,20 +333,20 @@ var getState2 = (state, data) => {
   if (isSelector(state))
     return initSelector(state, data);
   if (isFamily(state)) {
-    const res = [];
-    for (const atom3 of state._map.values()) {
-      res.push([atom3.familyKey, getState2(atom3, data)]);
-    }
-    return res;
+    const array = Array.from(state._map.keys());
+    if (equal4(array, state._keyArray))
+      return state._keyArray;
+    state._keyArray = array;
+    return array;
   }
   throw new Error("Invalid object passed to get");
-};
+}
 
 // src/lib/resetAtom.ts
-var resetAtom = (atom3, data) => {
-  const res = initAtom(atom3, data);
+var resetAtom = (atom2, data) => {
+  const res = initAtom(atom2, data);
   if (!isPromiseLike(res)) {
-    propagateUpdatedAtoms([atom3], data);
+    propagateUpdatedAtoms([atom2], data);
   }
   return res;
 };
@@ -366,8 +370,8 @@ var unsubscribe = (state, subscription, data, mount) => {
     }
     if (mount) {
       if (subscribers.size === mount.mountSubscriptions.size) {
-        if (state.onUnmount) {
-          state.onUnmount(mount.onMountRes);
+        if (typeof mount.onUnmount === "function") {
+          mount.onUnmount();
         }
       }
     }
@@ -401,7 +405,7 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
   subscribers.add(subscription);
   let mount;
   if (subscribers.size === 1 && state.onMount) {
-    const store = storeFromStoreData2(data);
+    const store = storeFromStoreData(data);
     const mountSubscriptions = new Set;
     const originalSub = store.sub;
     store.sub = (state2, callback2) => {
@@ -409,7 +413,7 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
       return originalSub(state2, callback2);
     };
     mount = {
-      onMountRes: state.onMount(store, state),
+      onUnmount: state.onMount(store, state),
       mountSubscriptions
     };
   }
@@ -420,14 +424,14 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
 };
 
 // src/lib/setAtoms.ts
-import equal4 from "fast-deep-equal";
+import equal5 from "fast-deep-equal";
 var setAtoms = (pairs, data) => {
   const updatedAtoms = [];
-  for (let [atom3, value] of pairs) {
-    const currentValue = getState2(atom3, data);
-    if (!equal4(currentValue, value)) {
-      updatedAtoms.push(atom3);
-      data.values.set(atom3, value);
+  for (let [atom2, value] of pairs) {
+    const currentValue = getState(atom2, data);
+    if (!equal5(currentValue, value)) {
+      updatedAtoms.push(atom2);
+      data.values.set(atom2, value);
     }
   }
   propagateUpdatedAtoms(updatedAtoms, data);
@@ -461,7 +465,7 @@ var transaction = (callback, data) => {
   let dirtySelectors = new Set;
   const txnGet = (state) => {
     if (isAtom(state)) {
-      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState2(state, data);
+      return txnAtomMap.has(state) ? txnAtomMap.get(state) : getState(state, data);
     } else if (isSelector(state)) {
       if (txnSelectorCache.has(state)) {
         return txnSelectorCache.get(state);
@@ -483,25 +487,25 @@ var transaction = (callback, data) => {
       throw new Error("Unsupported state");
     }
   };
-  const txnSet = (atom3, value) => {
-    if (!isAtom(atom3))
+  const txnSet = (atom2, value) => {
+    if (!isAtom(atom2))
       throw new Error("Not an atom");
     if (typeof value === "function") {
-      const currentValue = txnGet(atom3);
+      const currentValue = txnGet(atom2);
       value = value(currentValue);
     }
-    for (const selector of findDependencies(atom3, data)) {
+    for (const selector of findDependencies(atom2, data)) {
       dirtySelectors.add(selector);
       txnSelectorCache.delete(selector);
     }
-    if (txnSubscribers.get(atom3)?.size) {
-      recursivlyResetTxnSelectorCache(atom3, txnSubscribers, txnSelectorCache);
+    if (txnSubscribers.get(atom2)?.size) {
+      recursivlyResetTxnSelectorCache(atom2, txnSubscribers, txnSelectorCache);
     }
-    txnAtomMap.set(atom3, value);
+    txnAtomMap.set(atom2, value);
   };
-  const txnReset = (atom3) => {
-    const value = getAtomInitValue(atom3, data);
-    txnAtomMap.set(atom3, value);
+  const txnReset = (atom2) => {
+    const value = getAtomInitValue(atom2, data);
+    txnAtomMap.set(atom2, value);
     return value;
   };
   const commit = () => {
@@ -514,14 +518,14 @@ var transaction = (callback, data) => {
 };
 
 // src/lib/storeFromStoreData.ts
-var storeFromStoreData2 = (data) => {
-  const get = (state) => getState2(state, data);
+var storeFromStoreData = (data) => {
+  const get = (state) => getState(state, data);
   const set = (state, value) => {
     if (!isAtom(state))
       throw new Error("Invalid state object");
     return setAtom(state, value, data);
   };
-  const reset = (atom3) => resetAtom(atom3, data);
+  const reset = (atom2) => resetAtom(atom2, data);
   const sub = (state, callback, deepEqualCheckBeforeCallback = true) => subscribe(state, callback, deepEqualCheckBeforeCallback, data);
   const txn = (callback) => transaction(callback, data);
   return {
@@ -537,7 +541,7 @@ var storeFromStoreData2 = (data) => {
 // src/createStore.ts
 var createStore = (id) => {
   const data = createStoreData(id);
-  return storeFromStoreData2(data);
+  return storeFromStoreData(data);
 };
 // src/createStoreWithSelectorSet.ts
 var setSelector = (selector, values, store) => {
@@ -545,7 +549,7 @@ var setSelector = (selector, values, store) => {
 };
 var createStoreWithSelectorSet = (id) => {
   const data = createStoreData(id);
-  const store = storeFromStoreData2(data);
+  const store = storeFromStoreData(data);
   store.set = (state, value, ...rest) => {
     if (isAtom(state))
       return setAtom(state, value, data);

package/dist/src/atom.d.ts

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

package/dist/src/atomFamily.d.ts

@@ -1,4 +1,4 @@
 import type { AtomFamily } from "./types/AtomFamily";
 type DefaultValueCallback<Key, Value> = (arg: Key) => Value | Promise<Value>;
-export declare const atomFamily: <Value, Key>(defaultValue?: Value | DefaultValueCallback<Key, Value>, debugLabel?: string) => AtomFamily<Value, Key>;
+export declare const atomFamily: <Value = unknown, Key = unknown>(defaultValue?: Value | DefaultValueCallback<Key, Value>, debugLabel?: string) => AtomFamily<Value, Key>;
 export {};

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

@@ -1,3 +1,7 @@
-import type { State } from "../types/State";
 import type { StoreData } from "../types/StoreData";
-export declare const getState: <V>(state: State<V>, data: StoreData) => V | Promise<V>;
+import type { Atom } from "../types/Atom";
+import type { AtomFamily } from "../types/AtomFamily";
+import type { Selector } from "../types/Selector";
+export declare function getState<V, K>(atom: Atom<V>, data: StoreData): V;
+export declare function getState<V, K>(selector: Selector<V>, data: StoreData): V;
+export declare function getState<V, K>(family: AtomFamily<V, K>, data: StoreData): K[];

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

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

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

@@ -1,2 +1,8 @@
-import type { State } from "./State";
-export type GetValue = <V>(state: State<V>) => V | Promise<V>;
+import type { Atom } from "./Atom";
+import type { AtomFamily } from "./AtomFamily";
+import type { Selector } from "./Selector";
+export type GetValue = {
+    <V, K>(atom: Atom<V>): V;
+    <V, K>(selector: Selector<V>): V;
+    <V, K>(family: AtomFamily<V, K>): K[];
+};

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

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

package/package.json

@@ -1,10 +1,15 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.6",
+    "version": "0.2.0-alpha.8",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
     },
+    "homepage": "https://valdres.dev",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/eigilsagafos/valdres.git"
+    },
     "type": "module",
     "exports": {
         "types": "./dist/index.d.ts",
@@ -28,11 +33,11 @@
         "react": ">=18",
         "react-dom": ">=18",
         "recoil": "0.7.7",
-        "typescript": "5.5.4"
+        "typescript": "5.6.2"
     },
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "727e6a247df61e016e0f7905397a9121abf4e82c"
+    "gitHead": "c7f6e2d76adc15985444d02244522841d52aa233"
 }