@plitzi/nexus 0.31.1 → 0.32.0

package/dist/createStore/helpers/PathTrie.mjs

@@ -1,42 +1,77 @@
 import e from "../../helpers/parsePath.mjs";
 import t from "./Subscribers.mjs";
 //#region src/createStore/helpers/PathTrie.ts
-var n = (e, t, n) => {
-	let r = "";
-	for (let i = 0; i < t; i++) r = r ? `${r}.${e[i]}` : e[i], n(r);
+var n = class {
+	subscribers = null;
+	children = null;
 }, r = class {
 	direct = /* @__PURE__ */ new Map();
 	descendants = /* @__PURE__ */ new Map();
+	root = new n();
 	size = 0;
 	add(r, i) {
-		let a = this.direct.get(r), o = e(r);
-		return a || (a = new t(), this.direct.set(r, a), this.size++, n(o, o.length - 1, (e) => {
-			let t = this.descendants.get(e);
-			t || (t = /* @__PURE__ */ new Set(), this.descendants.set(e, t)), t.add(r);
-		})), a.add(i), () => this.remove(r, a, i, o);
+		let a = e(r), o = this.direct.get(r);
+		if (!o) {
+			o = new t(), this.direct.set(r, o);
+			let e = this.root;
+			for (let t of a) {
+				e.children ||= /* @__PURE__ */ new Map();
+				let r = e.children.get(t);
+				r || (r = new n(), e.children.set(t, r)), e = r;
+			}
+			e.subscribers = o, this.size++;
+			let i = "";
+			for (let e = 0; e < a.length - 1; e++) {
+				i = i ? `${i}.${a[e]}` : a[e];
+				let t = this.descendants.get(i);
+				t || (t = /* @__PURE__ */ new Set(), this.descendants.set(i, t)), t.add(r);
+			}
+		}
+		return o.add(i), () => this.remove(r, o, i, a);
 	}
-	remove(e, t, r, i) {
-		this.direct.get(e) === t && (t.remove(r), !(t.length > 0) && (this.direct.delete(e), this.size--, n(i, i.length - 1, (t) => {
-			let n = this.descendants.get(t);
-			n && (n.delete(e), n.size === 0 && this.descendants.delete(t));
-		})));
+	remove(e, t, n, r) {
+		if (this.direct.get(e) !== t || (t.remove(n), t.length > 0)) return;
+		this.direct.delete(e), this.size--;
+		let i = this.root;
+		for (let e of r) {
+			if (!i.children) return;
+			let t = i.children.get(e);
+			if (!t) return;
+			i = t;
+		}
+		i.subscribers === t && (i.subscribers = null);
+		let a = "";
+		for (let t = 0; t < r.length - 1; t++) {
+			a = a ? `${a}.${r[t]}` : r[t];
+			let n = this.descendants.get(a);
+			n && (n.delete(e), n.size === 0 && this.descendants.delete(a));
+		}
+	}
+	walkAncestors(e, t) {
+		let n = this.root;
+		for (let r of e) {
+			if (!n.children) return;
+			let e = n.children.get(r);
+			if (!e) return;
+			n = e, n.subscribers && t(n.subscribers);
+		}
 	}
 	getDescendants(e) {
 		return this.descendants.get(e);
 	}
-	forEachAffected(t, r, i) {
-		let a = (e) => {
-			e && e.forEach(r, i);
+	forEachAffected(t, n, r) {
+		let i = (e) => {
+			e && e.forEach(n, r);
 		};
 		if (typeof t != "string") {
-			this.direct.forEach(a);
+			this.direct.forEach(i);
 			return;
 		}
-		let o = e(t);
-		n(o, o.length, (e) => a(this.direct.get(e))), this.descendants.get(t)?.forEach((e) => a(this.direct.get(e)));
+		let a = e(t);
+		this.walkAncestors(a, i), this.descendants.get(t)?.forEach((e) => i(this.direct.get(e)));
 	}
 	clear() {
-		this.direct.clear(), this.descendants.clear(), this.size = 0;
+		this.direct.clear(), this.descendants.clear(), this.root.children = null, this.root.subscribers = null, this.size = 0;
 	}
 };
 //#endregion

package/dist/createStore/helpers/createChainReads.d.ts

@@ -4,7 +4,7 @@ export type ChainReads<TState extends object> = {
     getState: GetState<TState>;
     getPath: GetPath<TState>;
     invalidate: () => void;
-    setActive: (active: boolean) => void;
+    resetCache: () => void;
     getMergeCount: () => number;
 };
 export declare function createChainReads<TState extends object>(getOwnState: () => TState, getOwnSnapshot: () => TState, parent: StoreApi<TState> | undefined): ChainReads<TState>;

package/dist/createStore/helpers/createChainReads.mjs

@@ -6,31 +6,30 @@ function r(r, i, a) {
 		getState: i,
 		getPath: (e) => n(r(), e),
 		invalidate: () => {},
-		setActive: () => {},
+		resetCache: () => {},
 		getMergeCount: () => 0
 	};
-	let o = a, s = !0, c = !0, l = !1, u, d = 0, f = /* @__PURE__ */ new Map(), p = () => (d++, e(o.getState(), i())), m = () => s ? ((c || u === void 0) && (u = p(), c = !1), u) : p(), h = (e) => {
+	let o = a, s = !0, c = !1, l, u = 0, d = /* @__PURE__ */ new Map(), f = () => (u++, e(o.getState(), i())), p = () => ((s || l === void 0) && (l = f(), s = !1), l), m = (e) => {
 		let i = n(r(), e);
 		if (i === void 0) return o.getPath(e);
 		let a = o.getPath(e);
-		return a === void 0 || !t(i) || !t(a) ? i : n(m(), e);
+		return a === void 0 || !t(i) || !t(a) ? i : n(p(), e);
 	};
 	return {
-		getState: m,
+		getState: p,
 		getPath: (e) => {
-			if (!s) return h(e);
-			if (l) f.clear(), l = !1;
-			else if (f.has(e)) return f.get(e);
-			let t = h(e);
-			return f.set(e, t), t;
+			if (c) d.clear(), c = !1;
+			else if (d.has(e)) return d.get(e);
+			let t = m(e);
+			return d.set(e, t), t;
 		},
 		invalidate: () => {
-			c = !0, l = !0;
+			s = !0, c = !0;
 		},
-		setActive: (e) => {
-			s = e, e || (f.clear(), u = void 0, c = !0, l = !1);
+		resetCache: () => {
+			d.clear(), l = void 0, s = !0, c = !1;
 		},
-		getMergeCount: () => d
+		getMergeCount: () => u
 	};
 }
 //#endregion

package/dist/createStore/helpers/createSetState.mjs

@@ -44,12 +44,14 @@ function u(u) {
 			for (let e = 0, t = n.length; e < t; e++) T.add(n[e]);
 			return;
 		}
-		e.begin();
-		try {
-			let e = s(n, t, n.length);
-			e !== o && b(e, "notify", t);
-		} finally {
-			e.end();
+		if (n.length !== 0) {
+			e.begin();
+			try {
+				let e = s(n, t, n.length);
+				e !== o && b(e, "notify", t);
+			} finally {
+				e.end();
+			}
 		}
 	}, D = (e) => {
 		w++;
@@ -77,19 +79,14 @@ function u(u) {
 			v.end();
 		}
 	}, k = (e, t) => {
-		let n = "";
-		for (let r = 0; r < t.length; r++) {
-			n = n ? `${n}.${t[r]}` : t[r];
-			let i = _.direct.get(n);
-			i && E(i, e);
-		}
-	}, A = (e, n, r, i) => {
-		let a = _.getDescendants(e);
-		if (a) for (let o of a) {
-			let a = _.direct.get(o);
-			if (!a) continue;
-			let s = o.slice(i);
-			t(n, s) !== t(r, s) && E(a, e);
+		_.walkAncestors(t, (t) => E(t, e));
+	}, A = (n, r, i, a) => {
+		let o = _.getDescendants(n);
+		if (o) for (let s of o) {
+			let o = _.direct.get(s);
+			if (!o) continue;
+			let c = e(s).slice(a);
+			t(r, c) !== t(i, c) && E(o, n);
 		}
 	}, j = (e, n, r, o) => {
 		let s = e ? t(r, e) : void 0, c = e ? typeof n == "function" ? n(s) : n : void 0;
@@ -108,15 +105,9 @@ function u(u) {
 			if (e === a) return;
 			l = e;
 		}
-		if (l !== r) {
-			if (p(l), v.length > 0 && O(e, r, l), !o) {
-				x();
-				return;
-			}
-			E(g, e), _.size > 0 && _.direct.forEach((n, i) => {
-				t(r, i) !== t(l, i) && E(n, e);
-			});
-		}
+		l !== r && (p(l), v.length > 0 && O(e, r, l), x(), o && (E(g, e), _.size > 0 && _.direct.forEach((n, i) => {
+			t(r, i) !== t(l, i) && E(n, e);
+		})));
 	};
 	return {
 		setState: (i, o, s = !0) => {
@@ -139,11 +130,11 @@ function u(u) {
 				}
 				if (e === n) return;
 				let r = v.length > 0 ? f() : void 0;
-				if (m(i, n), r !== void 0 && O(i, r, f()), s) {
-					E(g, i);
+				if (m(i, n), r !== void 0 && O(i, r, f()), s && (E(g, i), _.size > 0)) {
 					let t = _.direct.get(i);
-					t && E(t, i), A(i, e, n, i.length + 1);
-				} else x();
+					t && E(t, i), A(i, e, n, 1);
+				}
+				x();
 				return;
 			}
 			let b = e(i), w;
@@ -154,7 +145,7 @@ function u(u) {
 			} else w = r(u, i, b, o, typeof o == "function");
 			if (w === n) return;
 			let T = w;
-			p(T), v.length > 0 && O(i, u, T), s ? (E(g, i), k(i, b), A(i, u, T, 0)) : x();
+			p(T), v.length > 0 && O(i, u, T), s && (E(g, i), _.size > 0 && (k(i, b), A(i, u, T, 0))), x();
 		},
 		batch: D
 	};

package/dist/createStore/helpers/writeByPath.mjs

@@ -24,6 +24,7 @@ var e = Symbol("unchanged"), t = (e) => /^\d+$/.test(e), n = (e) => Array.isArra
 	return n += `return ${i};`, Function("o", "v", "f", n);
 }, c, l, u = () => {
 	if (l !== void 0) return l;
+	if (typeof window > "u") return !1;
 	if (c === void 0) try {
 		s(["x", "y"])({ x: {} }, 1, !1), c = !0;
 	} catch {

package/dist/createStore/hooks/shared.d.ts

@@ -1,10 +1,9 @@
 import { PathOf, PathOrFn, StoreApi, SyncMode } from '../../types';
 import { RefObject } from 'react';
 export declare const defaultMultiEqualityFn: (a: unknown[], b: unknown[]) => boolean;
-export declare function makeSingleSnapshot<TState extends object>(store: StoreApi<TState>, pathOrFn: PathOf<TState> | ((state: TState) => PathOf<TState>) | undefined, defaultValue?: unknown): () => unknown;
+export declare function makeSingleSnapshot<TState extends object>(store: StoreApi<TState>, pathOrFn: PathOf<TState> | ((state: TState) => PathOf<TState>) | undefined): () => unknown;
 export declare function makeMultiSnapshot<TState extends object>(store: StoreApi<TState>, pathsRef: RefObject<ReadonlyArray<PathOrFn<TState>>>, lastRef: RefObject<unknown[] | null>, options?: {
     equalityFn?: (a: unknown[], b: unknown[]) => boolean;
-    defaultValue?: unknown;
 }): () => unknown[];
 export declare function useResolvedStore<TState extends object>(optionStore: StoreApi<TState> | undefined, hookName: string, storeId?: string): StoreApi<TState>;
 export declare function useMultiSubscribe<TState extends object>(store: StoreApi<TState>, pathsRef: RefObject<ReadonlyArray<PathOrFn<TState>>>, pathsKey: string, enabled: boolean, mode: SyncMode): (cb: () => void) => () => void;

package/dist/createStore/hooks/shared.mjs

@@ -7,32 +7,21 @@ var c = (e, t) => {
 	for (let n = 0; n < e.length; n++) if (!Object.is(e[n], t[n])) return !1;
 	return !0;
 };
-function l(t, n, r) {
+function l(t, n) {
 	return () => {
-		if (typeof n == "string") {
-			let e = t.getPath(n);
-			return e === void 0 ? r : e;
-		}
+		if (typeof n == "string") return t.getPath(n);
 		if (typeof n == "function") {
-			let i = t.getState(), a = e(i, n(i));
-			return a === void 0 ? r : a;
+			let r = t.getState();
+			return e(r, n(r));
 		}
 		return t.getState();
 	};
 }
 function u(t, n, r, i = {}) {
-	let { equalityFn: a = c, defaultValue: o } = i;
+	let { equalityFn: a = c } = i;
 	return () => {
-		let i = n.current, s = i.some((e) => typeof e == "function") ? t.getState() : void 0, c = i.map((n, r) => {
-			let i = typeof n == "function" ? e(s, n(s)) : t.getPath(n);
-			if (i !== void 0 || o === void 0) return i;
-			if (Array.isArray(o)) {
-				let e = o[r];
-				return e === void 0 ? i : e;
-			}
-			return o;
-		}), l = r.current;
-		return l !== null && a(l, c) ? l : (r.current = c, c);
+		let i = n.current, o = i.some((e) => typeof e == "function") ? t.getState() : void 0, s = i.map((n) => typeof n == "function" ? e(o, n(o)) : t.getPath(n)), c = r.current;
+		return c !== null && a(c, s) ? c : (r.current = s, s);
 	};
 }
 function d(e, i, o) {

package/dist/createStore/hooks/useStore.d.ts

@@ -1,72 +1,27 @@
-import { ___NoDefault, MultiPathReturn, PathOf, PathOrFn, PathOrFnSetters, PathOrFnValue, PathOrFnValues, PathSetter, PathSetters, PathValue, PathValues, StoreApi, UseStoreMultiOptions, UseStoreOptions, UseStoreReturn } from '../../types';
+import { MultiPathReturn, PathOf, PathOrFn, PathOrFnSetters, PathOrFnValues, PathSetter, PathSetters, PathValue, PathValues, StoreApi, UseStoreMultiOptions, UseStoreOptions, UseStoreReturn } from '../../types';
 export { defaultMultiEqualityFn } from './shared';
 export type { MultiPathReturn, UseStoreOptions, UseStoreMultiOptions, UseStoreReturn };
 declare function useStore<TState extends object>(arg?: undefined, options?: UseStoreOptions<TState>): [TState, StoreApi<TState>['setState']];
-declare function useStore<TState extends object, P extends PathOf<TState>>(path: P, options: Omit<UseStoreOptions<PathValue<TState, P>>, 'defaultValue'> & {
-    defaultValue: undefined;
-    transformer?: never;
-}): [PathValue<TState, P> | undefined, PathSetter<TState, P>];
 declare function useStore<TState extends object, P extends PathOf<TState>>(path: P, options?: UseStoreOptions<PathValue<TState, P>> & {
-    defaultValue?: never;
     transformer?: never;
 }): [PathValue<TState, P>, PathSetter<TState, P>];
-declare function useStore<TState extends object, P extends PathOf<TState>, D>(path: P, options: UseStoreOptions<PathValue<TState, P>> & {
-    defaultValue: D;
-    transformer?: never;
-}): [NonNullable<PathValue<TState, P>> | D, PathSetter<TState, P>];
 declare function useStore<TState extends object, P extends PathOf<TState>, TResult>(path: P, options: UseStoreOptions<PathValue<TState, P>> & {
     transformer: (value: PathValue<TState, P>) => TResult;
 }): [TResult, PathSetter<TState, P>];
-declare function useStore<TState extends object, P extends PathOf<TState>>(pathFn: (state: TState) => P, options: Omit<UseStoreOptions<PathValue<TState, P>, TState>, 'defaultValue'> & {
-    defaultValue: undefined;
-    transformer?: never;
-}): [PathValue<TState, P> | undefined, PathSetter<TState, P>];
 declare function useStore<TState extends object, P extends PathOf<TState>>(pathFn: (state: TState) => P, options?: UseStoreOptions<PathValue<TState, P>, TState> & {
-    defaultValue?: never;
     transformer?: never;
 }): [PathValue<TState, P>, PathSetter<TState, P>];
-declare function useStore<TState extends object, P extends PathOf<TState>, D>(pathFn: (state: TState) => P, options: UseStoreOptions<PathValue<TState, P>, TState> & {
-    defaultValue: D;
-    transformer?: never;
-}): [NonNullable<PathValue<TState, P>> | D, PathSetter<TState, P>];
 declare function useStore<TState extends object, P extends PathOf<TState>, TResult>(pathFn: (state: TState) => P, options: UseStoreOptions<PathValue<TState, P>, TState> & {
     transformer: (value: PathValue<TState, P>) => TResult;
 }): [TResult, PathSetter<TState, P>];
-declare function useStore<TState extends object, const Paths extends ReadonlyArray<PathOf<TState>>>(paths: Paths, options?: Omit<UseStoreMultiOptions<TState, Paths>, 'defaultValue' | 'transformer'>): MultiPathReturn<TState, Paths, __NoDefault>;
-declare function useStore<TState extends object, const Paths extends ReadonlyArray<PathOf<TState>>>(paths: Paths, options: UseStoreMultiOptions<TState, Paths> & {
-    defaultValue: undefined;
-    transformer?: never;
-}): MultiPathReturn<TState, Paths, undefined>;
-declare function useStore<TState extends object, const Paths extends ReadonlyArray<PathOf<TState>>, const TDefaultValue extends readonly (PathValue<TState, Paths[number]> | undefined)[]>(paths: Paths, options: UseStoreMultiOptions<TState, Paths, TDefaultValue> & {
-    defaultValue: TDefaultValue;
-    transformer?: never;
-}): MultiPathReturn<TState, Paths, TDefaultValue>;
-declare function useStore<TState extends object, const Paths extends ReadonlyArray<PathOf<TState>>, TDefaultValue extends PathValue<TState, Paths[number]>>(paths: Paths, options: UseStoreMultiOptions<TState, Paths, TDefaultValue> & {
-    defaultValue: TDefaultValue;
-    transformer?: never;
-}): MultiPathReturn<TState, Paths, TDefaultValue>;
+declare function useStore<TState extends object, const Paths extends ReadonlyArray<PathOf<TState>>>(paths: Paths, options?: Omit<UseStoreMultiOptions<TState, Paths>, 'transformer'>): MultiPathReturn<TState, Paths>;
 declare function useStore<TState extends object, const Paths extends ReadonlyArray<PathOf<TState>>, TResult>(paths: Paths, options: UseStoreMultiOptions<TState, Paths> & {
     transformer: (values: PathValues<TState, Paths>) => TResult;
 }): [TResult, ...PathSetters<TState, Paths>];
-declare function useStore<TState extends object, const Entries extends ReadonlyArray<PathOrFn<TState>>>(paths: Entries, options?: Omit<UseStoreMultiOptions<TState, any>, 'defaultValue' | 'transformer'> & {
+declare function useStore<TState extends object, const Entries extends ReadonlyArray<PathOrFn<TState>>>(paths: Entries, options?: Omit<UseStoreMultiOptions<TState, any>, 'transformer'> & {
     transformer?: never;
 }): [PathOrFnValues<TState, Entries>, ...PathOrFnSetters<TState, Entries>];
-declare function useStore<TState extends object, const Entries extends ReadonlyArray<PathOrFn<TState>>>(paths: Entries, options: Omit<UseStoreMultiOptions<TState, any>, 'defaultValue' | 'transformer'> & {
-    defaultValue: undefined;
-    transformer?: never;
-}): [{
-    [I in keyof Entries]: PathOrFnValue<TState, Entries[I]> | undefined;
-}, ...PathOrFnSetters<TState, Entries>];
-declare function useStore<TState extends object, const Entries extends ReadonlyArray<PathOrFn<TState>>, const TDefaultValue extends readonly unknown[]>(paths: Entries, options: Omit<UseStoreMultiOptions<TState, any>, 'defaultValue' | 'transformer'> & {
-    defaultValue: TDefaultValue;
-    transformer?: never;
-}): [
-    {
-        [I in keyof Entries]: I extends keyof TDefaultValue ? TDefaultValue[I] extends undefined ? PathOrFnValue<TState, Entries[I]> | undefined : NonNullable<PathOrFnValue<TState, Entries[I]>> | TDefaultValue[I] : PathOrFnValue<TState, Entries[I]>;
-    },
-    ...PathOrFnSetters<TState, Entries>
-];
-declare function useStore<TState extends object, const Entries extends ReadonlyArray<PathOrFn<TState>>, TResult>(paths: Entries, options: Omit<UseStoreMultiOptions<TState, any>, 'defaultValue' | 'transformer'> & {
+declare function useStore<TState extends object, const Entries extends ReadonlyArray<PathOrFn<TState>>, TResult>(paths: Entries, options: Omit<UseStoreMultiOptions<TState, any>, 'transformer'> & {
     transformer: (values: PathOrFnValues<TState, Entries>) => TResult;
 }): [TResult, ...PathOrFnSetters<TState, Entries>];
 export type { PathSetters, PathValues };

package/dist/createStore/hooks/useStore.mjs

@@ -4,42 +4,34 @@ import { useCallback as c, useMemo as l, useRef as u, useSyncExternalStore as d
 //#region src/createStore/hooks/useStore.ts
 var f = [];
 function p(e, t, r) {
-	let i = r.mode ?? "sync", a = r.enabled ?? !0, o = r.defaultValue, f = t === void 0, p = r.equalityFn ?? (f ? s : Object.is), m = r.transformer, h = u(m);
-	h.current = m;
-	let g = l(() => n(e, t, o), [
-		e,
-		t,
-		o
-	]), _ = u(g()), v = l(() => (n) => !a || i === "mount" ? () => {} : typeof t == "string" ? e.subscribePath(t, n) : e.subscribe(n), [
+	let i = r.mode ?? "sync", a = r.enabled ?? !0, o = t === void 0, f = r.equalityFn ?? (o ? s : Object.is), p = r.transformer, m = u(p);
+	m.current = p;
+	let h = l(() => n(e, t), [e, t]), g = u(h()), _ = l(() => (n) => !a || i === "mount" ? () => {} : typeof t == "string" ? e.subscribePath(t, n) : e.subscribe(n), [
 		a,
 		i,
 		t,
 		e
-	]), y = () => {
-		if (!a) return _.current;
-		if (i === "mount") return g();
-		let e = g();
-		return p(_.current, e) ? _.current : (_.current = e, e);
-	}, b = d(v, y, y);
-	return [l(() => h.current ? h.current(b) : b, [b]), c((n) => {
-		f ? e.setState(void 0, n) : typeof t == "function" ? e.setState(t(e.getState()), n) : e.setState(t, n);
+	]), v = () => {
+		if (!a) return g.current;
+		if (i === "mount") return h();
+		let e = h();
+		return f(g.current, e) ? g.current : (g.current = e, e);
+	}, y = d(_, v, v);
+	return [l(() => m.current ? m.current(y) : y, [y]), c((n) => {
+		o ? e.setState(void 0, n) : typeof t == "function" ? e.setState(t(e.getState()), n) : e.setState(t, n);
 	}, [e, t])];
 }
 function m(n, o, s) {
-	let c = s.mode ?? "sync", d = s.enabled ?? !0, f = s.defaultValue, p = s.equalityFn ?? e, m = s.transformer, h = u(m);
-	h.current = m;
-	let g = u(o);
-	g.current = o;
-	let _ = o.map((e, t) => typeof e == "function" ? `fn_${t}` : e).join("|"), v = u(null), y = l(() => t(n, g, v, {
-		equalityFn: p,
-		defaultValue: f
-	}), [
+	let c = s.mode ?? "sync", d = s.enabled ?? !0, f = s.equalityFn ?? e, p = s.transformer, m = u(p);
+	m.current = p;
+	let h = u(o);
+	h.current = o;
+	let g = o.map((e, t) => typeof e == "function" ? `fn_${t}` : e).join("|"), _ = u(null), v = l(() => t(n, h, _, { equalityFn: f }), [
 		n,
-		_,
-		p,
+		g,
 		f
-	]), b = r(a(n, g, _, d, c), y, d, v);
-	return [l(() => h.current ? h.current(b) : b, [b]), ...i(n, g, _)];
+	]), y = r(a(n, h, g, d, c), v, d, _);
+	return [l(() => m.current ? m.current(y) : y, [y]), ...i(n, h, g)];
 }
 function h(e, t = {}) {
 	let n = o(t.store, "useStore", t.storeId), r = Array.isArray(e), i = p(n, r ? void 0 : e, r ? {

package/dist/createStore/hooks/useStoreGetter.d.ts

@@ -1,9 +1,6 @@
-import { GetterTuple, GetValueFromBaseWithDefaultFn, GetValueFromBaseFn, GetValueFn, PathOf, PathValue, UseStoreGetterOptions } from '../../types';
-export type { GetValueFn, GetValueFromBaseFn, GetValueFromBaseWithDefaultFn, GetterTuple, UseStoreGetterOptions };
+import { GetterTuple, GetValueFromBaseFn, GetValueFn, PathOf, PathValue, UseStoreGetterOptions } from '../../types';
+export type { GetValueFn, GetValueFromBaseFn, GetterTuple, UseStoreGetterOptions };
 declare function useStoreGetter<TState extends object>(options?: UseStoreGetterOptions<TState>): GetValueFn<TState>;
 declare function useStoreGetter<TState extends object, P extends PathOf<TState>>(basePath: P, options?: UseStoreGetterOptions<TState>): GetValueFromBaseFn<PathValue<TState, P>>;
-declare function useStoreGetter<TState extends object, P extends PathOf<TState>, D>(basePath: P, options: UseStoreGetterOptions<TState, D> & {
-    defaultValue: D;
-}): GetValueFromBaseWithDefaultFn<PathValue<TState, P>, D>;
 declare function useStoreGetter<TState extends object, const Entries extends ReadonlyArray<PathOf<TState> | ((state: TState) => unknown)>>(entries: Entries, options?: UseStoreGetterOptions<TState>): GetterTuple<TState, Entries>;
 export default useStoreGetter;

package/dist/createStore/hooks/useStoreGetter.mjs

@@ -3,34 +3,31 @@ import { useResolvedStore as t } from "./shared.mjs";
 import { useMemo as n } from "react";
 //#region src/createStore/hooks/useStoreGetter.ts
 function r(r, i) {
-	let a = typeof r == "string" ? r : void 0, o = Array.isArray(r) ? r : void 0, s = typeof r == "object" && !Array.isArray(r) ? r : i, c = t(s?.store, "useStoreGetter", s?.storeId), { defaultValue: l } = s ?? {}, u = o?.map((e) => typeof e == "function" ? e.toString() : e).join("|");
-	return n(() => o ? o.map((t) => (n, r) => {
-		let i = typeof t == "function" ? t(c.getState()) : e(c.getState(), t);
-		if (n !== void 0) {
-			let t = e(i, n);
-			return t === void 0 && r !== void 0 ? r : t;
-		}
-		return i === void 0 && r !== void 0 ? r : i;
-	}) : (t, n) => {
-		let r = c.getState();
+	let a = typeof r == "string" ? r : void 0, o = Array.isArray(r) ? r : void 0, s = typeof r == "object" && !Array.isArray(r) ? r : i, c = t(s?.store, "useStoreGetter", s?.storeId), l = o?.map((e) => typeof e == "function" ? e.toString() : e).join("|");
+	return n(() => {
+		if (o) return o.map((t) => (n, r) => {
+			let i = typeof t == "function" ? t(c.getState()) : e(c.getState(), t);
+			if (n !== void 0) {
+				let t = e(i, n);
+				return t === void 0 && r !== void 0 ? r : t;
+			}
+			return i === void 0 && r !== void 0 ? r : i;
+		});
 		if (a !== void 0) {
-			let i = e(r, a);
+			let e = c.withBase(a);
+			return (t, n) => t === void 0 ? n === void 0 ? e.getState() : e.getState(n) : n === void 0 ? e.getPath(t) : e.getPath(t, n);
+		}
+		return (t, n) => {
+			let r = c.getState();
 			if (t !== void 0) {
-				let r = e(i, t);
-				return r === void 0 && n !== void 0 ? n : r;
+				let i = e(r, t);
+				return i === void 0 && n !== void 0 ? n : i;
 			}
-			let o = n === void 0 ? l : n;
-			return i === void 0 && o !== void 0 ? o : i;
-		}
-		if (t !== void 0) {
-			let i = e(r, t);
-			return i === void 0 && n !== void 0 ? n : i;
-		}
-		return r;
+			return r;
+		};
 	}, [
 		c,
 		a,
-		u,
 		l
 	]);
 }

package/dist/createStore/hooks/useStoreSetter.mjs

@@ -1,11 +1,9 @@
 import { useResolvedStore as e } from "./shared.mjs";
-import { useCallback as t } from "react";
+import { useMemo as t } from "react";
 //#region src/createStore/hooks/useStoreSetter.ts
 function n(n, r) {
 	let i = typeof n == "string" ? n : void 0, a = typeof n == "object" ? n : r, o = e(a?.store, "useStoreSetter", a?.storeId);
-	return t((e, t) => {
-		i === void 0 ? o.setState(e, t) : e === void 0 ? o.setState(i, t) : o.setState(`${i}.${e}`, t);
-	}, [o, i]);
+	return t(() => i === void 0 ? o.setState : o.withBase(i).setState, [o, i]);
 }
 //#endregion
 export { n as default };

package/dist/derived/createDerived.d.ts

@@ -7,4 +7,4 @@ export type Derived<R> = {
 export type DerivedOptions<R> = {
     equalityFn?: (a: R, b: R) => boolean;
 };
-export declare function createDerived<TState extends object, const Paths extends readonly PathOf<TState>[], R>(store: StoreApi<TState>, deps: Paths, compute: (values: PathValues<TState, Paths>) => R, options?: DerivedOptions<R>): Derived<R>;
+export declare function createDerived<TState extends object, const Paths extends readonly PathOf<TState>[], R>(store: StoreApi<TState>, deps: Paths, compute: (values: PathValues<TState, Paths>, changedPath?: string) => R, options?: DerivedOptions<R>): Derived<R>;

package/dist/derived/createDerived.mjs

@@ -1,19 +1,22 @@
 import { createObservable as e } from "../helpers/createObservable.mjs";
 //#region src/derived/createDerived.ts
 function t(t, n, r, i = {}) {
-	let a = i.equalityFn ?? Object.is, o = e(() => r(n.map((e) => t.getPath(e)))), s = () => {
-		if (!o.hasListeners()) {
-			o.invalidate();
+	let a = i.equalityFn ?? Object.is, o, s = e(() => {
+		let e = o;
+		return o = void 0, r(n.map((e) => t.getPath(e)), e);
+	}), c = (e) => {
+		if (o = e, !s.hasListeners()) {
+			s.invalidate();
 			return;
 		}
-		let e = o.get();
-		o.invalidate(), a(e, o.get()) || o.notify();
-	}, c = n.map((e) => t.subscribePath(e, s));
+		let t = s.get();
+		s.invalidate(), a(t, s.get()) || s.notify();
+	}, l = n.map((e) => t.subscribePath(e, c));
 	return {
-		get: o.get,
-		subscribe: (e) => (o.get(), o.subscribe(e)),
+		get: s.get,
+		subscribe: (e) => (s.get(), s.subscribe(e)),
 		destroy: () => {
-			c.forEach((e) => e()), o.destroy();
+			l.forEach((e) => e()), s.destroy();
 		}
 	};
 }

package/dist/entities/createEntityStore.d.ts

@@ -0,0 +1,38 @@
+import { EntityId } from './createEntityAdapter';
+export type EntityChangeListener = () => void;
+export type EntityStoreOptions<T> = {
+    selectId?: (entity: T) => EntityId;
+    sortComparer?: (a: T, b: T) => number;
+};
+export type EntityStore<T> = {
+    selectId: (entity: T) => EntityId;
+    getOne: (id: EntityId) => T | undefined;
+    getAll: () => T[];
+    getIds: () => string[];
+    has: (id: EntityId) => boolean;
+    size: () => number;
+    setOne: (entity: T) => void;
+    setMany: (entities: readonly T[]) => void;
+    setAll: (entities: readonly T[]) => void;
+    addOne: (entity: T) => void;
+    addMany: (entities: readonly T[]) => void;
+    upsertOne: (entity: T) => void;
+    upsertMany: (entities: readonly T[]) => void;
+    updateOne: (id: EntityId, changes: Partial<T>) => void;
+    updateMany: (updates: readonly {
+        id: EntityId;
+        changes: Partial<T>;
+    }[]) => void;
+    removeOne: (id: EntityId) => void;
+    removeMany: (ids: readonly EntityId[]) => void;
+    removeAll: () => void;
+    batch: (fn: () => void) => void;
+    subscribeOne: (id: EntityId, listener: EntityChangeListener) => () => void;
+    subscribeIds: (listener: EntityChangeListener) => () => void;
+    subscribeAll: (listener: EntityChangeListener) => () => void;
+    useOne: (id: EntityId) => T | undefined;
+    useIds: () => string[];
+    useAll: () => T[];
+    destroy: () => void;
+};
+export declare function createEntityStore<T>(initialEntities?: readonly T[], options?: EntityStoreOptions<T>): EntityStore<T>;