bunja 2.1.0 → 3.0.0-alpha.3

package/dist/{bunja-B_HNgDan.d.ts → bunja-DEFeIlpt.d.ts}

@@ -1,13 +1,40 @@
 //#region bunja.d.ts
 interface BunjaFn {
-  <T>(init: () => T): Bunja<T>;
+  <T>(init: () => T): Bunja<T, NoSeed>;
+  withSeed: BunjaWithSeedFn;
   use: BunjaUseFn;
-  fork: BunjaForkFn;
+  will: BunjaWillFn;
   effect: BunjaEffectFn;
 }
 declare const bunja: BunjaFn;
-type BunjaUseFn = <T>(dep: Dep<T>) => T;
-type BunjaForkFn = <T>(bunja: Bunja<T>, scopeValuePairs: ScopeValuePair<any>[]) => T;
+declare const NO_SEED: unique symbol;
+type NoSeed = typeof NO_SEED;
+type BunjaWithSeedFn = <Seed, T>(defaultSeed: Seed, init: (seed: Seed) => T) => Bunja<T, Seed>;
+type ScopeValuePairs = ScopeValuePair<any>[];
+type BunjaRefBase<T, Seed> = {
+  bunja: Bunja<T, Seed>;
+  with?: ScopeValuePairs;
+};
+type BunjaGetRef<T, Seed = NoSeed> = BunjaRefBase<T, Seed> & ([Seed] extends [NoSeed] ? {
+  seed?: never;
+} : {
+  seed?: Seed;
+});
+type BunjaRef<T, Seed = NoSeed> = BunjaGetRef<T, Seed>;
+type BunjaPrebakeRef<T, Seed = NoSeed> = BunjaRefBase<T, Seed> & {
+  seed?: never;
+};
+interface BunjaUseFn {
+  <T>(dep: Scope<T>): T;
+  <T, Seed>(dep: Bunja<T, Seed>): T;
+  <T, Seed>(bunja: Bunja<T, Seed>, scopeValuePairs: ScopeValuePairs): T;
+  <T, Seed>(ref: BunjaRef<T, Seed>): T;
+}
+interface BunjaWillFn {
+  <T, Seed>(dep: Bunja<T, Seed>): () => T;
+  <T, Seed>(bunja: Bunja<T, Seed>, scopeValuePairs: ScopeValuePairs): () => T;
+  <T, Seed>(ref: BunjaRef<T, Seed>): () => T;
+}
 type BunjaEffectFn = (callback: BunjaEffectCallback) => void;
 type BunjaEffectCallback = () => (() => void) | void;
 declare function createScope<T>(hash?: HashFn<T>): Scope<T>;
@@ -15,12 +42,25 @@ interface CreateBunjaStoreConfig {
   wrapInstance?: WrapInstanceFn;
 }
 declare function createBunjaStore(config?: CreateBunjaStoreConfig): BunjaStore;
-type Dep<T> = Bunja<T> | Scope<T>;
+type Dep<T> = Bunja<T, any> | Scope<T>;
+type AnyBunja = Bunja<any, any>;
 interface InternalState {
   bunjas: Record<string, BunjaInstance>;
   scopes: Map<Scope<unknown>, Map<unknown, ScopeInstance>>;
   instantiating: boolean;
 }
+type AnyNormalizedBunjaRef = NormalizedBunjaRef<any, any>;
+interface NormalizedBunjaRef<T, Seed> {
+  bunja: Bunja<T, Seed>;
+  scopeValuePairs: ScopeValuePairs;
+}
+interface ActiveDependencyRecipe {
+  ref: AnyNormalizedBunjaRef;
+  seed: unknown;
+}
+interface BunjaInstanceRecipe {
+  activeDependencies: ActiveDependencyRecipe[];
+}
 type WrapInstanceFn = <T>(fn: (dispose: () => void) => T) => T;
 declare class BunjaStore {
   #private;
@@ -30,7 +70,8 @@ declare class BunjaStore {
   constructor();
   get _internalState(): InternalState | undefined;
   dispose(): void;
-  get<T>(bunja: Bunja<T>, readScope: ReadScope): BunjaStoreGetResult<T>;
+  get<T, Seed>(bunjaOrRef: Bunja<T, Seed> | BunjaGetRef<T, Seed>, readScope: ReadScope): BunjaStoreGetResult<T>;
+  prebake<T, Seed>(bunjaOrRef: Bunja<T, Seed> | BunjaPrebakeRef<T, Seed>, readScope: ReadScope): BunjaStorePrebakeResult;
 }
 type ReadScope = <T>(scope: Scope<T>) => T;
 declare function createReadScopeFn(scopeValuePairs: ScopeValuePair<any>[], readScope: ReadScope): ReadScope;
@@ -40,22 +81,33 @@ interface BunjaStoreGetResult<T> {
   deps: unknown[];
   bunjaInstance?: BunjaInstance;
 }
+interface BunjaStorePrebakeResult {
+  relatedBunjas: Bunja<any, any>[];
+  requiredScopes: Scope<unknown>[];
+}
 declare function delayUnmount(mount: () => () => void, ms?: number): () => () => void;
-declare class Bunja<T> {
+declare class Bunja<T, Seed = NoSeed> {
   #private;
-  init: () => T;
+  init: (seed: Seed) => T;
+  defaultSeed: Seed;
   private static counter;
   readonly id: string;
   debugLabel: string;
-  constructor(init: () => T);
+  constructor(init: (seed: Seed) => T, defaultSeed: Seed);
   get baked(): boolean;
-  get parents(): Bunja<unknown>[];
-  get relatedBunjas(): Bunja<unknown>[];
-  get relatedScopes(): Scope<unknown>[];
-  addParent(bunja: Bunja<unknown>): void;
+  get requiredBunjas(): AnyBunja[];
+  get optionalBunjas(): AnyBunja[];
+  get requiredBunjaRefs(): AnyNormalizedBunjaRef[];
+  get optionalBunjaRefs(): AnyNormalizedBunjaRef[];
+  get expandedRequiredBunjas(): AnyBunja[];
+  get relatedBunjas(): AnyBunja[];
+  get requiredScopes(): Scope<unknown>[];
+  addRequiredBunjaRef(ref: AnyNormalizedBunjaRef): void;
+  addOptionalBunjaRef(ref: AnyNormalizedBunjaRef): void;
   addScope(scope: Scope<unknown>): void;
   bake(): void;
-  calcInstanceId(scopeInstanceMap: Map<Scope<unknown>, ScopeInstance>): string;
+  calcBaseInstanceId(scopeInstanceMap: Map<Scope<unknown>, ScopeInstance>): string;
+  calcInstanceId(scopeInstanceMap: Map<Scope<unknown>, ScopeInstance>, activeDependencyIds?: Iterable<string>): string;
   toString(): string;
 }
 declare class Scope<T> {
@@ -79,10 +131,13 @@ declare abstract class RefCounter {
 declare class BunjaInstance extends RefCounter {
   #private;
   readonly id: string;
+  readonly baseId: string;
   readonly value: unknown;
-  readonly effect: BunjaEffectCallback;
+  private readonly dependencyMounts;
+  private readonly effects;
+  readonly recipe: BunjaInstanceRecipe;
   private readonly _dispose;
-  constructor(id: string, value: unknown, effect: BunjaEffectCallback, _dispose: () => void);
+  constructor(id: string, baseId: string, value: unknown, dependencyMounts: (() => () => void)[], effects: BunjaEffectCallback[], recipe: BunjaInstanceRecipe, _dispose: () => void);
   dispose(): void;
   add(): void;
 }
@@ -94,9 +149,8 @@ declare class ScopeInstance extends RefCounter {
   constructor(value: unknown, dispose: () => void);
 }
 interface BunjaDevtoolsGlobalHook {
-  bunjas: Record<string, Bunja<any>>;
+  bunjas: Record<string, Bunja<any, any>>;
   scopes: Record<string, Scope<any>>;
-  stores: Record<string, BunjaStore>;
   listeners: Record<BunjaDevtoolsEventType, Set<(event: any) => void>>;
   emit<T extends BunjaDevtoolsEventType>(type: T, event: BunjaDevtoolsEvent[T]): void;
   on<T extends BunjaDevtoolsEventType>(type: T, listener: (event: BunjaDevtoolsEvent[T]) => void): () => void;
@@ -139,4 +193,4 @@ interface BunjaDevtoolsEvent {
 }
 type BunjaDevtoolsEventType = keyof BunjaDevtoolsEvent;
 //#endregion
-export { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };
+export { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaGetRef, BunjaRef, BunjaStore, BunjaStoreGetResult, BunjaStorePrebakeResult, BunjaUseFn, BunjaWillFn, BunjaWithSeedFn, CreateBunjaStoreConfig, Dep, HashFn, NoSeed, ReadScope, Scope, ScopeValuePair, ScopeValuePairs, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };

package/dist/bunja.cjs

@@ -1,4 +1,4 @@
-const require_bunja = require('./bunja-DFFVW7Gi.cjs');
+const require_bunja = require('./bunja-BJSmIdkQ.cjs');
 
 exports.Bunja = require_bunja.Bunja;
 exports.BunjaStore = require_bunja.BunjaStore;

package/dist/bunja.d.cts

@@ -1,2 +1,2 @@
-import { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-BKpQTG04.cjs";
-export { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };
+import { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaGetRef, BunjaRef, BunjaStore, BunjaStoreGetResult, BunjaStorePrebakeResult, BunjaUseFn, BunjaWillFn, BunjaWithSeedFn, CreateBunjaStoreConfig, Dep, HashFn, NoSeed, ReadScope, Scope, ScopeValuePair, ScopeValuePairs, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-BxbzuHdH.cjs";
+export { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaGetRef, BunjaRef, BunjaStore, BunjaStoreGetResult, BunjaStorePrebakeResult, BunjaUseFn, BunjaWillFn, BunjaWithSeedFn, CreateBunjaStoreConfig, Dep, HashFn, NoSeed, ReadScope, Scope, ScopeValuePair, ScopeValuePairs, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };

package/dist/bunja.d.ts

@@ -1,2 +1,2 @@
-import { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-B_HNgDan.js";
-export { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };
+import { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaGetRef, BunjaRef, BunjaStore, BunjaStoreGetResult, BunjaStorePrebakeResult, BunjaUseFn, BunjaWillFn, BunjaWithSeedFn, CreateBunjaStoreConfig, Dep, HashFn, NoSeed, ReadScope, Scope, ScopeValuePair, ScopeValuePairs, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-DEFeIlpt.js";
+export { Bunja, BunjaDevtoolsEvent, BunjaDevtoolsEventType, BunjaDevtoolsGlobalHook, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaGetRef, BunjaRef, BunjaStore, BunjaStoreGetResult, BunjaStorePrebakeResult, BunjaUseFn, BunjaWillFn, BunjaWithSeedFn, CreateBunjaStoreConfig, Dep, HashFn, NoSeed, ReadScope, Scope, ScopeValuePair, ScopeValuePairs, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };

package/dist/bunja.js

@@ -1,3 +1,3 @@
-import { Bunja, BunjaStore, Scope, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-BOUkMIz6.js";
+import { Bunja, BunjaStore, Scope, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-CtHOS4_Q.js";
 
 export { Bunja, BunjaStore, Scope, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };

package/dist/react.cjs

@@ -2,12 +2,13 @@
 
 
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_bunja = require('./bunja-DFFVW7Gi.cjs');
+const require_bunja = require('./bunja-BJSmIdkQ.cjs');
 let react = require("react");
 react = require_chunk.__toESM(react);
 
 //#region react.ts
 const __DEV__ = process.env.NODE_ENV !== "production";
+const reactUse = react.use;
 const BunjaStoreContext = (0, react.createContext)(require_bunja.createBunjaStore());
 function BunjaStoreProvider({ children }) {
 	const [value] = (0, react.useState)(require_bunja.createBunjaStore);
@@ -18,7 +19,9 @@ function BunjaStoreProvider({ children }) {
 	});
 }
 const scopeContextMap = /* @__PURE__ */ new Map();
+let scopeContextMapLocked = false;
 function bindScope(scope, context) {
+	if (__DEV__ && !reactUse && scopeContextMapLocked) throw new Error("`bindScope` must be called before rendering when using React 18.");
 	scopeContextMap.set(scope, context);
 }
 function createScopeFromContext(context, hash) {
@@ -26,11 +29,20 @@ function createScopeFromContext(context, hash) {
 	bindScope(scope, context);
 	return scope;
 }
-const defaultReadScope = (scope) => {
-	return (0, react.useContext)(scopeContextMap.get(scope));
-};
+function useScopeContextValues() {
+	if (reactUse) return void 0;
+	scopeContextMapLocked = true;
+	return new Map(Array.from(scopeContextMap, ([scope, context]) => [scope, (0, react.useContext)(context)]));
+}
 function useBunja(bunja, scopeValuePairs) {
 	const store = (0, react.useContext)(BunjaStoreContext);
+	const scopeContextValues = useScopeContextValues();
+	const defaultReadScope = (scope) => {
+		const context = scopeContextMap.get(scope);
+		if (!context) throw new Error("Scope is not bound to a React context.");
+		if (reactUse) return reactUse(context);
+		return scopeContextValues.get(scope);
+	};
 	const readScope = scopeValuePairs ? require_bunja.createReadScopeFn(scopeValuePairs, defaultReadScope) : defaultReadScope;
 	if (__DEV__) {
 		if (store._internalState?.instantiating) throw new Error("`useBunja` cannot be called inside a bunja init function.");

package/dist/react.d.cts

@@ -1,4 +1,5 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-BKpQTG04.cjs";
+import { Bunja, BunjaGetRef, BunjaStore, HashFn, Scope, ScopeValuePairs } from "./bunja-BxbzuHdH.cjs";
+import * as React from "react";
 import { Context, PropsWithChildren } from "react";
 
 //#region react.d.ts
@@ -9,6 +10,6 @@ declare function BunjaStoreProvider({
 declare const scopeContextMap: Map<Scope<unknown>, Context<unknown>>;
 declare function bindScope<T>(scope: Scope<T>, context: Context<T>): void;
 declare function createScopeFromContext<T>(context: Context<T>, hash?: HashFn<T>): Scope<T>;
-declare function useBunja<T>(bunja: Bunja<T>, scopeValuePairs?: ScopeValuePair<any>[]): T;
+declare function useBunja<T, Seed>(bunja: Bunja<T, Seed> | BunjaGetRef<T, Seed>, scopeValuePairs?: ScopeValuePairs): T;
 //#endregion
 export { BunjaStoreContext, BunjaStoreProvider, bindScope, createScopeFromContext, scopeContextMap, useBunja };

package/dist/react.d.ts

@@ -1,4 +1,5 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-B_HNgDan.js";
+import { Bunja, BunjaGetRef, BunjaStore, HashFn, Scope, ScopeValuePairs } from "./bunja-DEFeIlpt.js";
+import * as React from "react";
 import { Context, PropsWithChildren } from "react";
 
 //#region react.d.ts
@@ -9,6 +10,6 @@ declare function BunjaStoreProvider({
 declare const scopeContextMap: Map<Scope<unknown>, Context<unknown>>;
 declare function bindScope<T>(scope: Scope<T>, context: Context<T>): void;
 declare function createScopeFromContext<T>(context: Context<T>, hash?: HashFn<T>): Scope<T>;
-declare function useBunja<T>(bunja: Bunja<T>, scopeValuePairs?: ScopeValuePair<any>[]): T;
+declare function useBunja<T, Seed>(bunja: Bunja<T, Seed> | BunjaGetRef<T, Seed>, scopeValuePairs?: ScopeValuePairs): T;
 //#endregion
 export { BunjaStoreContext, BunjaStoreProvider, bindScope, createScopeFromContext, scopeContextMap, useBunja };

package/dist/react.js

@@ -1,11 +1,13 @@
 "use client";
 
 
-import { createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-BOUkMIz6.js";
+import { createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-CtHOS4_Q.js";
+import * as React from "react";
 import { createContext, createElement, useContext, useEffect, useMemo, useState } from "react";
 
 //#region react.ts
 const __DEV__ = process.env.NODE_ENV !== "production";
+const reactUse = React.use;
 const BunjaStoreContext = createContext(createBunjaStore());
 function BunjaStoreProvider({ children }) {
 	const [value] = useState(createBunjaStore);
@@ -16,7 +18,9 @@ function BunjaStoreProvider({ children }) {
 	});
 }
 const scopeContextMap = /* @__PURE__ */ new Map();
+let scopeContextMapLocked = false;
 function bindScope(scope, context) {
+	if (__DEV__ && !reactUse && scopeContextMapLocked) throw new Error("`bindScope` must be called before rendering when using React 18.");
 	scopeContextMap.set(scope, context);
 }
 function createScopeFromContext(context, hash) {
@@ -24,11 +28,20 @@ function createScopeFromContext(context, hash) {
 	bindScope(scope, context);
 	return scope;
 }
-const defaultReadScope = (scope) => {
-	return useContext(scopeContextMap.get(scope));
-};
+function useScopeContextValues() {
+	if (reactUse) return void 0;
+	scopeContextMapLocked = true;
+	return new Map(Array.from(scopeContextMap, ([scope, context]) => [scope, useContext(context)]));
+}
 function useBunja(bunja, scopeValuePairs) {
 	const store = useContext(BunjaStoreContext);
+	const scopeContextValues = useScopeContextValues();
+	const defaultReadScope = (scope) => {
+		const context = scopeContextMap.get(scope);
+		if (!context) throw new Error("Scope is not bound to a React context.");
+		if (reactUse) return reactUse(context);
+		return scopeContextValues.get(scope);
+	};
 	const readScope = scopeValuePairs ? createReadScopeFn(scopeValuePairs, defaultReadScope) : defaultReadScope;
 	if (__DEV__) {
 		if (store._internalState?.instantiating) throw new Error("`useBunja` cannot be called inside a bunja init function.");

package/dist/solid.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_bunja = require('./bunja-DFFVW7Gi.cjs');
+const require_bunja = require('./bunja-BJSmIdkQ.cjs');
 let solid_js = require("solid-js");
 solid_js = require_chunk.__toESM(solid_js);
 

package/dist/solid.d.cts

@@ -1,4 +1,4 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-BKpQTG04.cjs";
+import { Bunja, BunjaGetRef, BunjaStore, HashFn, Scope, ScopeValuePairs } from "./bunja-BxbzuHdH.cjs";
 import { Accessor, Context, JSX, ParentProps } from "solid-js";
 
 //#region solid.d.ts
@@ -9,6 +9,6 @@ declare function BunjaStoreProvider(props: ParentProps): JSX.Element;
 declare const scopeContextMap: Map<Scope<unknown>, Context<MaybeAccessor<unknown>>>;
 declare function bindScope<T>(scope: Scope<T>, context: Context<MaybeAccessor<T>>): void;
 declare function createScopeFromContext<T>(context: Context<T>, hash?: HashFn<AccessedValue<T>>): Scope<AccessedValue<T>>;
-declare function useBunja<T>(bunja: MaybeAccessor<Bunja<T>>, scopeValuePairs?: MaybeAccessor<ScopeValuePair<any>[]>): Accessor<T>;
+declare function useBunja<T>(bunja: MaybeAccessor<Bunja<T, any> | BunjaGetRef<T, any>>, scopeValuePairs?: MaybeAccessor<ScopeValuePairs>): Accessor<T>;
 //#endregion
 export { BunjaStoreContext, BunjaStoreProvider, bindScope, createScopeFromContext, scopeContextMap, useBunja };

package/dist/solid.d.ts

@@ -1,4 +1,4 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-B_HNgDan.js";
+import { Bunja, BunjaGetRef, BunjaStore, HashFn, Scope, ScopeValuePairs } from "./bunja-DEFeIlpt.js";
 import { Accessor, Context, JSX, ParentProps } from "solid-js";
 
 //#region solid.d.ts
@@ -9,6 +9,6 @@ declare function BunjaStoreProvider(props: ParentProps): JSX.Element;
 declare const scopeContextMap: Map<Scope<unknown>, Context<MaybeAccessor<unknown>>>;
 declare function bindScope<T>(scope: Scope<T>, context: Context<MaybeAccessor<T>>): void;
 declare function createScopeFromContext<T>(context: Context<T>, hash?: HashFn<AccessedValue<T>>): Scope<AccessedValue<T>>;
-declare function useBunja<T>(bunja: MaybeAccessor<Bunja<T>>, scopeValuePairs?: MaybeAccessor<ScopeValuePair<any>[]>): Accessor<T>;
+declare function useBunja<T>(bunja: MaybeAccessor<Bunja<T, any> | BunjaGetRef<T, any>>, scopeValuePairs?: MaybeAccessor<ScopeValuePairs>): Accessor<T>;
 //#endregion
 export { BunjaStoreContext, BunjaStoreProvider, bindScope, createScopeFromContext, scopeContextMap, useBunja };

package/dist/solid.js

@@ -1,4 +1,4 @@
-import { createBunjaStore, createReadScopeFn, createScope } from "./bunja-BOUkMIz6.js";
+import { createBunjaStore, createReadScopeFn, createScope } from "./bunja-CtHOS4_Q.js";
 import { createComponent, createContext, createEffect, createMemo, createRoot, getOwner, onCleanup, useContext } from "solid-js";
 
 //#region solid.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bunja",
   "type": "module",
-  "version": "2.1.0",
+  "version": "3.0.0-alpha.3",
   "description": "State Lifetime Manager",
   "main": "dist/bunja.cjs",
   "module": "dist/bunja.js",
@@ -53,7 +53,7 @@
   },
   "scripts": {
     "clean": "rm -rf ./dist",
-    "build": "tsdown"
+    "build": "tsdown --format cjs && tsdown --format esm --no-clean"
   },
   "keywords": [
     "bunja",

package/react.ts

@@ -12,6 +12,7 @@ import {
 } from "react";
 import {
   type Bunja,
+  type BunjaGetRef,
   type BunjaStore,
   createBunjaStore,
   createReadScopeFn,
@@ -20,12 +21,16 @@ import {
   type HashFn,
   type ReadScope,
   type Scope,
-  type ScopeValuePair,
+  type ScopeValuePairs,
 } from "./bunja.ts";
+import * as React from "react";
 
 // @ts-ignore dev
 // deno-lint-ignore no-process-global
 const __DEV__ = process.env.NODE_ENV !== "production";
+const reactUse = (React as unknown as {
+  use?: <T>(usable: Context<T>) => T;
+}).use;
 
 export const BunjaStoreContext: Context<BunjaStore> = createContext(
   createBunjaStore(),
@@ -40,7 +45,13 @@ export function BunjaStoreProvider(
 }
 
 export const scopeContextMap: Map<Scope<unknown>, Context<unknown>> = new Map();
+let scopeContextMapLocked = false;
 export function bindScope<T>(scope: Scope<T>, context: Context<T>): void {
+  if (__DEV__ && !reactUse && scopeContextMapLocked) {
+    throw new Error(
+      "`bindScope` must be called before rendering when using React 18.",
+    );
+  }
   scopeContextMap.set(scope as Scope<unknown>, context as Context<unknown>);
 }
 
@@ -53,16 +64,31 @@ export function createScopeFromContext<T>(
   return scope;
 }
 
-const defaultReadScope: ReadScope = <T>(scope: Scope<T>) => {
-  const context = scopeContextMap.get(scope as Scope<unknown>)!;
-  return useContext(context) as T;
-};
+function useScopeContextValues(): Map<Scope<unknown>, unknown> | undefined {
+  if (reactUse) return undefined;
+  scopeContextMapLocked = true;
+  return new Map(
+    Array.from(scopeContextMap, ([scope, context]) => [
+      scope,
+      useContext(context),
+    ]),
+  );
+}
 
-export function useBunja<T>(
-  bunja: Bunja<T>,
-  scopeValuePairs?: ScopeValuePair<any>[],
+export function useBunja<T, Seed>(
+  bunja: Bunja<T, Seed> | BunjaGetRef<T, Seed>,
+  scopeValuePairs?: ScopeValuePairs,
 ): T {
   const store = useContext(BunjaStoreContext);
+  const scopeContextValues = useScopeContextValues();
+  const defaultReadScope: ReadScope = <T>(scope: Scope<T>) => {
+    const context = scopeContextMap.get(scope as Scope<unknown>) as
+      | Context<T>
+      | undefined;
+    if (!context) throw new Error("Scope is not bound to a React context.");
+    if (reactUse) return reactUse(context);
+    return scopeContextValues!.get(scope as Scope<unknown>) as T;
+  };
   const readScope = scopeValuePairs
     ? createReadScopeFn(scopeValuePairs, defaultReadScope)
     : defaultReadScope;

package/solid.ts

@@ -14,6 +14,7 @@ import {
 } from "solid-js";
 import {
   type Bunja,
+  type BunjaGetRef,
   type BunjaStore,
   createBunjaStore,
   createReadScopeFn,
@@ -21,7 +22,7 @@ import {
   type HashFn,
   type ReadScope,
   type Scope,
-  type ScopeValuePair,
+  type ScopeValuePairs,
 } from "./bunja.ts";
 
 type MaybeAccessor<T> = T | Accessor<T>;
@@ -82,8 +83,8 @@ const defaultReadScope: ReadScope = <T>(scope: Scope<T>) => {
 };
 
 export function useBunja<T>(
-  bunja: MaybeAccessor<Bunja<T>>,
-  scopeValuePairs?: MaybeAccessor<ScopeValuePair<any>[]>,
+  bunja: MaybeAccessor<Bunja<T, any> | BunjaGetRef<T, any>>,
+  scopeValuePairs?: MaybeAccessor<ScopeValuePairs>,
 ): Accessor<T> {
   const store = useContext(BunjaStoreContext);
   const readScope = createMemo(() => {