valdres 0.2.0-alpha.2 → 0.2.0-alpha.4

package/dist/index.d.ts

@@ -0,0 +1,19 @@
+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 { AtomFamily } from "./src/types/AtomFamily";
+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 { State } from "./src/types/State";
+export type { Store } from "./src/types/Store";
+export type { StoreData } from "./src/types/StoreData";

package/dist/index.js

@@ -86,6 +86,24 @@ var atomFamily = (defaultValue, debugLabel) => {
   atomFamily2._map = map;
   return atomFamily2;
 };
+// src/lib/createStoreData.ts
+var generateId = () => (Math.random() + 1).toString(36).substring(7);
+var createStoreData = (id = generateId()) => ({
+  id,
+  values: new WeakMap,
+  expiredValues: new WeakMap,
+  subscriptions: new WeakMap,
+  subscriptionsRequireEqualCheck: new WeakMap,
+  stateConsumers: new WeakMap,
+  stateDependencies: new WeakMap
+});
+
+// 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);
@@ -299,12 +317,6 @@ var initAtom = (atom3, data) => {
   return value;
 };
 
-// src/utils/isAtom.ts
-var isAtom = (state) => Object.hasOwn(state, "defaultValue");
-
-// src/utils/isSelector.ts
-var isSelector = (state) => Object.hasOwn(state, "get");
-
 // src/utils/isFamily.ts
 var isFamily = (state) => Object.hasOwn(state, "_map");
 
@@ -326,8 +338,17 @@ var getState2 = (state, data) => {
   throw new Error("Invalid object passed to get");
 };
 
+// src/lib/resetAtom.ts
+var resetAtom = (atom3, data) => {
+  const res = initAtom(atom3, data);
+  if (!isPromiseLike(res)) {
+    propagateUpdatedAtoms([atom3], data);
+  }
+  return res;
+};
+
 // src/lib/unsubscribe.ts
-var unsubscribe = (state, subscription, data, mountRes) => {
+var unsubscribe = (state, subscription, data, mount) => {
   const subscribers = data.subscriptions.get(state);
   if (subscribers) {
     subscribers.delete(subscription);
@@ -343,9 +364,11 @@ var unsubscribe = (state, subscription, data, mountRes) => {
         data.subscriptionsRequireEqualCheck.delete(state);
       }
     }
-    if (subscribers.size === 0) {
-      if (state.onUnmount) {
-        state.onUnmount(mountRes);
+    if (mount) {
+      if (subscribers.size === mount.mountSubscriptions.size) {
+        if (state.onUnmount) {
+          state.onUnmount(mount.onMountRes);
+        }
       }
     }
   }
@@ -375,17 +398,25 @@ var subscribe = (state, callback, requireDeepEqualCheckBeforeCallback, data) =>
       requireDeepEqualCheckBeforeCallback
     };
   }
-  let mountRes;
-  if (subscribers.size === 0 && state.onMount) {
-    mountRes = state.onMount((value) => {
-      setAtom(state, value, data);
-    });
-  }
   subscribers.add(subscription);
+  let mount;
+  if (subscribers.size === 1 && state.onMount) {
+    const store = storeFromStoreData2(data);
+    const mountSubscriptions = new Set;
+    const originalSub = store.sub;
+    store.sub = (state2, callback2) => {
+      mountSubscriptions.add(callback2);
+      return originalSub(state2, callback2);
+    };
+    mount = {
+      onMountRes: state.onMount(store, state),
+      mountSubscriptions
+    };
+  }
   if (requireDeepEqualCheckBeforeCallback && data.subscriptionsRequireEqualCheck.get(state) !== true) {
     data.subscriptionsRequireEqualCheck.set(state, true);
   }
-  return () => unsubscribe(state, subscription, data, mountRes);
+  return () => unsubscribe(state, subscription, data, mount);
 };
 
 // src/lib/setAtoms.ts
@@ -461,41 +492,9 @@ var transaction = (callback, data) => {
   return result;
 };
 
-// src/lib/resetAtom.ts
-var resetAtom = (atom3, data) => {
-  const res = initAtom(atom3, data);
-  if (!isPromiseLike(res)) {
-    propagateUpdatedAtoms([atom3], data);
-  }
-  return res;
-};
-
-// src/createStore.ts
-var generateId = () => (Math.random() + 1).toString(36).substring(7);
-var createStore = (id) => {
-  const data = {
-    id: id ?? generateId(),
-    values: new WeakMap,
-    expiredValues: new WeakMap,
-    subscriptions: new WeakMap,
-    subscriptionsRequireEqualCheck: new WeakMap,
-    stateConsumers: new WeakMap,
-    stateDependencies: new WeakMap
-  };
+// src/lib/storeFromStoreData.ts
+var storeFromStoreData2 = (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);
@@ -516,7 +515,6 @@ var createStore = (id) => {
   const txn = (callback) => transaction(callback, data);
   return {
     get,
-    getWithDefault,
     set,
     sub,
     txn,
@@ -524,6 +522,12 @@ var createStore = (id) => {
     data
   };
 };
+
+// src/createStore.ts
+var createStore = (id) => {
+  const data = createStoreData(id);
+  return storeFromStoreData2(data);
+};
 // src/getDefaultStore.ts
 if (!globalThis._valdresStore) {
   globalThis._valdresStore = createStore("default");

package/dist/src/atom.d.ts

@@ -1,9 +1,9 @@
 import type { Atom } from "./types/Atom";
-type AtomOptions<M = any> = {
+type AtomOptions<MountRes = undefined> = {
     label?: string;
     onInit?: () => void;
-    onMount?: () => M;
-    onUnmount?: (mountRes?: M) => 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 {};

package/dist/src/atomFamily.d.ts

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

package/dist/src/getDefaultStore.d.ts

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

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

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

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

@@ -1,4 +1,4 @@
 import type { StoreData } from "../types/StoreData";
 import type { Selector } from "../types/Selector";
 export declare const reEvaluateSelector: <V>(selector: Selector<V>, data: StoreData) => void;
-export declare const initSelector: <V>(selector: Selector<V>, data: StoreData) => V;
+export declare const initSelector: <V>(selector: Selector<V>, data: StoreData) => V | Promise<V>;

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

@@ -0,0 +1,3 @@
+import type { Store } from "../types/Store";
+import type { StoreData } from "../types/StoreData";
+export declare const storeFromStoreData: (data: StoreData) => Store;

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, data: StoreData, mountRes?: any) => void;
+export declare const unsubscribe: <V>(state: State<V>, subscription: any, data: StoreData, mount?: any) => void;

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.2",
+    "version": "0.2.0-alpha.4",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -14,7 +14,7 @@
         "dist"
     ],
     "scripts": {
-        "build": "NODE_ENV=production bun scripts/build.ts",
+        "build": "rm -rf dist && NODE_ENV=production bun scripts/build.ts",
         "build:types": "tsc",
         "test": "bun test"
     },
@@ -34,5 +34,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "4f2355214e1e4d2cf9011705733b18ab425f8d20"
+    "gitHead": "1bde879ca28be7fb3e98add8bbcd2c568f8c6911"
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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