bunja 2.0.0 → 2.1.0

package/bunja.ts

@@ -68,6 +68,7 @@ type ScopeInstanceMap = Map<Scope<unknown>, ScopeInstance>;
 interface InternalState {
   bunjas: Record<string, BunjaInstance>;
   scopes: Map<Scope<unknown>, Map<unknown, ScopeInstance>>;
+  instantiating: boolean;
 }
 
 interface BunjaBakingContext {
@@ -91,7 +92,15 @@ export class BunjaStore {
     }
   }
   get _internalState(): InternalState | undefined {
-    if (__DEV__) return { bunjas: this.#bunjas, scopes: this.#scopes };
+    if (__DEV__) {
+      return {
+        bunjas: this.#bunjas,
+        scopes: this.#scopes,
+        get instantiating() {
+          return bunja.use != invalidUse;
+        },
+      };
+    }
     return undefined;
   }
   dispose(): void {
@@ -354,7 +363,12 @@ export class Bunja<T> {
   readonly id: string = String(Bunja.counter++);
   debugLabel: string = "";
   #phase: BunjaPhase = { baked: false, parents: new Set(), scopes: new Set() };
-  constructor(public init: () => T) {}
+  constructor(public init: () => T) {
+    if (__DEV__) {
+      devtoolsGlobalHook.bunjas[this.id] = this;
+      devtoolsGlobalHook.emit("bunjaCreated", { bunjaId: this.id });
+    }
+  }
   get baked(): boolean {
     return this.#phase.baked;
   }
@@ -422,7 +436,12 @@ export class Scope<T> {
   private static counter: number = 0;
   readonly id: string = String(Scope.counter++);
   debugLabel: string = "";
-  constructor(public readonly hash: HashFn<T> = Scope.identity) {}
+  constructor(public readonly hash: HashFn<T> = Scope.identity) {
+    if (__DEV__) {
+      devtoolsGlobalHook.scopes[this.id] = this;
+      devtoolsGlobalHook.emit("scopeCreated", { scopeId: this.id });
+    }
+  }
   private static identity<T>(x: T): T {
     return x;
   }
@@ -503,6 +522,8 @@ function toposort<T extends Toposortable>(nodes: T[]): T[] {
 const noop = () => {};
 
 export interface BunjaDevtoolsGlobalHook {
+  bunjas: Record<string, Bunja<any>>;
+  scopes: Record<string, Scope<any>>;
   stores: Record<string, BunjaStore>;
   listeners: Record<
     BunjaDevtoolsEventType,
@@ -518,6 +539,8 @@ export interface BunjaDevtoolsGlobalHook {
   ): () => void;
 }
 export interface BunjaDevtoolsEvent {
+  bunjaCreated: { bunjaId: string };
+  scopeCreated: { scopeId: string };
   storeCreated: { storeId: string };
   storeDisposed: { storeId: string };
   getCalled: { storeId: string; bunjaInstanceId: string };
@@ -542,7 +565,11 @@ if (__DEV__) {
   } else {
     devtoolsGlobalHook = {
       stores: {},
+      bunjas: {},
+      scopes: {},
       listeners: {
+        bunjaCreated: new Set(),
+        scopeCreated: new Set(),
         storeCreated: new Set(),
         storeDisposed: new Set(),
         getCalled: new Set(),

package/deno.json

@@ -1,11 +1,17 @@
 {
   "name": "@disjukr/bunja",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "Zlib",
   "exports": {
     ".": "./bunja.ts",
     "./react": "./react.ts",
     "./solid": "./solid.ts"
   },
-  "exclude": ["dist"]
+  "imports": {
+    "@std/assert": "jsr:@std/assert@1",
+    "@std/testing": "jsr:@std/testing@1"
+  },
+  "exclude": [
+    "dist"
+  ]
 }

package/dist/{bunja-DXtbhAmJ.d.cts → bunja-BKpQTG04.d.cts}

@@ -19,6 +19,7 @@ type Dep<T> = Bunja<T> | Scope<T>;
 interface InternalState {
   bunjas: Record<string, BunjaInstance>;
   scopes: Map<Scope<unknown>, Map<unknown, ScopeInstance>>;
+  instantiating: boolean;
 }
 type WrapInstanceFn = <T>(fn: (dispose: () => void) => T) => T;
 declare class BunjaStore {
@@ -93,12 +94,20 @@ declare class ScopeInstance extends RefCounter {
   constructor(value: unknown, dispose: () => void);
 }
 interface BunjaDevtoolsGlobalHook {
+  bunjas: Record<string, Bunja<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;
 }
 interface BunjaDevtoolsEvent {
+  bunjaCreated: {
+    bunjaId: string;
+  };
+  scopeCreated: {
+    scopeId: string;
+  };
   storeCreated: {
     storeId: string;
   };

package/dist/{bunja-EJqDbU0A.js → bunja-BOUkMIz6.js}

@@ -42,9 +42,11 @@ var BunjaStore = class BunjaStore {
 	get _internalState() {
 		if (__DEV__) return {
 			bunjas: this.#bunjas,
-			scopes: this.#scopes
+			scopes: this.#scopes,
+			get instantiating() {
+				return bunja.use != invalidUse;
+			}
 		};
-		return void 0;
 	}
 	dispose() {
 		for (const instance of Object.values(this.#bunjas)) instance.dispose();
@@ -96,9 +98,8 @@ var BunjaStore = class BunjaStore {
 			throw new Error("`bunja.use` can only be used with Bunja or Scope.");
 		};
 		for (const relatedBunja of bunja$1.relatedBunjas) bunjaInstanceMap.set(relatedBunja, this.#getBunjaInstance(relatedBunja, scopeInstanceMap));
-		const bunjaInstance = this.#getBunjaInstance(bunja$1, scopeInstanceMap);
 		return {
-			bunjaInstance,
+			bunjaInstance: this.#getBunjaInstance(bunja$1, scopeInstanceMap),
 			bunjaInstanceMap,
 			scopeInstanceMap
 		};
@@ -129,9 +130,8 @@ var BunjaStore = class BunjaStore {
 		const originalBakingContext = this.#bakingContext;
 		try {
 			this.#bakingContext = { currentBunja: bunja$1 };
-			const bunjaInstance = this.#getBunjaInstance(bunja$1, scopeInstanceMap);
 			return {
-				bunjaInstance,
+				bunjaInstance: this.#getBunjaInstance(bunja$1, scopeInstanceMap),
 				bunjaInstanceMap,
 				scopeInstanceMap
 			};
@@ -239,6 +239,10 @@ var Bunja = class Bunja {
 	};
 	constructor(init) {
 		this.init = init;
+		if (__DEV__) {
+			devtoolsGlobalHook.bunjas[this.id] = this;
+			devtoolsGlobalHook.emit("bunjaCreated", { bunjaId: this.id });
+		}
 	}
 	get baked() {
 		return this.#phase.baked;
@@ -268,12 +272,11 @@ var Bunja = class Bunja {
 		const scopes = this.#phase.scopes;
 		const parents = this.parents;
 		const relatedBunjas = toposort(parents);
-		const relatedScopes = Array.from(new Set([...relatedBunjas.flatMap((bunja$1) => bunja$1.relatedScopes), ...scopes]));
 		this.#phase = {
 			baked: true,
 			parents,
 			relatedBunjas,
-			relatedScopes
+			relatedScopes: Array.from(new Set([...relatedBunjas.flatMap((bunja$1) => bunja$1.relatedScopes), ...scopes]))
 		};
 	}
 	calcInstanceId(scopeInstanceMap) {
@@ -291,6 +294,10 @@ var Scope = class Scope {
 	debugLabel = "";
 	constructor(hash = Scope.identity) {
 		this.hash = hash;
+		if (__DEV__) {
+			devtoolsGlobalHook.scopes[this.id] = this;
+			devtoolsGlobalHook.emit("scopeCreated", { scopeId: this.id });
+		}
 	}
 	static identity(x) {
 		return x;
@@ -361,7 +368,11 @@ if (__DEV__) if (globalThis.__BUNJA_DEVTOOLS_GLOBAL_HOOK__) devtoolsGlobalHook =
 else {
 	devtoolsGlobalHook = {
 		stores: {},
+		bunjas: {},
+		scopes: {},
 		listeners: {
+			bunjaCreated: /* @__PURE__ */ new Set(),
+			scopeCreated: /* @__PURE__ */ new Set(),
 			storeCreated: /* @__PURE__ */ new Set(),
 			storeDisposed: /* @__PURE__ */ new Set(),
 			getCalled: /* @__PURE__ */ new Set(),

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

@@ -19,6 +19,7 @@ type Dep<T> = Bunja<T> | Scope<T>;
 interface InternalState {
   bunjas: Record<string, BunjaInstance>;
   scopes: Map<Scope<unknown>, Map<unknown, ScopeInstance>>;
+  instantiating: boolean;
 }
 type WrapInstanceFn = <T>(fn: (dispose: () => void) => T) => T;
 declare class BunjaStore {
@@ -93,12 +94,20 @@ declare class ScopeInstance extends RefCounter {
   constructor(value: unknown, dispose: () => void);
 }
 interface BunjaDevtoolsGlobalHook {
+  bunjas: Record<string, Bunja<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;
 }
 interface BunjaDevtoolsEvent {
+  bunjaCreated: {
+    bunjaId: string;
+  };
+  scopeCreated: {
+    scopeId: string;
+  };
   storeCreated: {
     storeId: string;
   };

package/dist/{bunja-CaephaLd.cjs → bunja-DFFVW7Gi.cjs}

@@ -43,9 +43,11 @@ var BunjaStore = class BunjaStore {
 	get _internalState() {
 		if (__DEV__) return {
 			bunjas: this.#bunjas,
-			scopes: this.#scopes
+			scopes: this.#scopes,
+			get instantiating() {
+				return bunja.use != invalidUse;
+			}
 		};
-		return void 0;
 	}
 	dispose() {
 		for (const instance of Object.values(this.#bunjas)) instance.dispose();
@@ -97,9 +99,8 @@ var BunjaStore = class BunjaStore {
 			throw new Error("`bunja.use` can only be used with Bunja or Scope.");
 		};
 		for (const relatedBunja of bunja$1.relatedBunjas) bunjaInstanceMap.set(relatedBunja, this.#getBunjaInstance(relatedBunja, scopeInstanceMap));
-		const bunjaInstance = this.#getBunjaInstance(bunja$1, scopeInstanceMap);
 		return {
-			bunjaInstance,
+			bunjaInstance: this.#getBunjaInstance(bunja$1, scopeInstanceMap),
 			bunjaInstanceMap,
 			scopeInstanceMap
 		};
@@ -130,9 +131,8 @@ var BunjaStore = class BunjaStore {
 		const originalBakingContext = this.#bakingContext;
 		try {
 			this.#bakingContext = { currentBunja: bunja$1 };
-			const bunjaInstance = this.#getBunjaInstance(bunja$1, scopeInstanceMap);
 			return {
-				bunjaInstance,
+				bunjaInstance: this.#getBunjaInstance(bunja$1, scopeInstanceMap),
 				bunjaInstanceMap,
 				scopeInstanceMap
 			};
@@ -240,6 +240,10 @@ var Bunja = class Bunja {
 	};
 	constructor(init) {
 		this.init = init;
+		if (__DEV__) {
+			devtoolsGlobalHook.bunjas[this.id] = this;
+			devtoolsGlobalHook.emit("bunjaCreated", { bunjaId: this.id });
+		}
 	}
 	get baked() {
 		return this.#phase.baked;
@@ -269,12 +273,11 @@ var Bunja = class Bunja {
 		const scopes = this.#phase.scopes;
 		const parents = this.parents;
 		const relatedBunjas = toposort(parents);
-		const relatedScopes = Array.from(new Set([...relatedBunjas.flatMap((bunja$1) => bunja$1.relatedScopes), ...scopes]));
 		this.#phase = {
 			baked: true,
 			parents,
 			relatedBunjas,
-			relatedScopes
+			relatedScopes: Array.from(new Set([...relatedBunjas.flatMap((bunja$1) => bunja$1.relatedScopes), ...scopes]))
 		};
 	}
 	calcInstanceId(scopeInstanceMap) {
@@ -292,6 +295,10 @@ var Scope = class Scope {
 	debugLabel = "";
 	constructor(hash = Scope.identity) {
 		this.hash = hash;
+		if (__DEV__) {
+			devtoolsGlobalHook.scopes[this.id] = this;
+			devtoolsGlobalHook.emit("scopeCreated", { scopeId: this.id });
+		}
 	}
 	static identity(x) {
 		return x;
@@ -362,7 +369,11 @@ if (__DEV__) if (globalThis.__BUNJA_DEVTOOLS_GLOBAL_HOOK__) devtoolsGlobalHook =
 else {
 	devtoolsGlobalHook = {
 		stores: {},
+		bunjas: {},
+		scopes: {},
 		listeners: {
+			bunjaCreated: /* @__PURE__ */ new Set(),
+			scopeCreated: /* @__PURE__ */ new Set(),
 			storeCreated: /* @__PURE__ */ new Set(),
 			storeDisposed: /* @__PURE__ */ new Set(),
 			getCalled: /* @__PURE__ */ new Set(),

package/dist/bunja.cjs

@@ -1,4 +1,4 @@
-const require_bunja = require('./bunja-CaephaLd.cjs');
+const require_bunja = require('./bunja-DFFVW7Gi.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-DXtbhAmJ.cjs";
+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 };

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-D_SKFBCD.js";
+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 };

package/dist/bunja.js

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

package/dist/react.cjs

@@ -2,8 +2,9 @@
 
 
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_bunja = require('./bunja-CaephaLd.cjs');
-const react = require_chunk.__toESM(require("react"));
+const require_bunja = require('./bunja-DFFVW7Gi.cjs');
+let react = require("react");
+react = require_chunk.__toESM(react);
 
 //#region react.ts
 const __DEV__ = process.env.NODE_ENV !== "production";
@@ -11,7 +12,7 @@ const BunjaStoreContext = (0, react.createContext)(require_bunja.createBunjaStor
 function BunjaStoreProvider({ children }) {
 	const [value] = (0, react.useState)(require_bunja.createBunjaStore);
 	(0, react.useEffect)(() => () => value.dispose(), [value]);
-	return (0, react.createElement)(BunjaStoreContext, {
+	return (0, react.createElement)(BunjaStoreContext.Provider, {
 		value,
 		children
 	});
@@ -26,13 +27,13 @@ function createScopeFromContext(context, hash) {
 	return scope;
 }
 const defaultReadScope = (scope) => {
-	const context = scopeContextMap.get(scope);
-	return (0, react.use)(context);
+	return (0, react.useContext)(scopeContextMap.get(scope));
 };
 function useBunja(bunja, scopeValuePairs) {
-	const store = (0, react.use)(BunjaStoreContext);
+	const store = (0, react.useContext)(BunjaStoreContext);
 	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.");
 		const { value, mount, deps, bunjaInstance } = store.get(bunja, readScope);
 		(0, react.useEffect)(require_bunja.delayUnmount(mount), deps);
 		(0, react.useMemo)(() => ({

package/dist/react.d.cts

@@ -1,4 +1,4 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-DXtbhAmJ.cjs";
+import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-BKpQTG04.cjs";
 import { Context, PropsWithChildren } from "react";
 
 //#region react.d.ts

package/dist/react.d.ts

@@ -1,4 +1,4 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-D_SKFBCD.js";
+import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-B_HNgDan.js";
 import { Context, PropsWithChildren } from "react";
 
 //#region react.d.ts

package/dist/react.js

@@ -1,8 +1,8 @@
 "use client";
 
 
-import { createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-EJqDbU0A.js";
-import { createContext, createElement, use, useEffect, useMemo, useState } from "react";
+import { createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-BOUkMIz6.js";
+import { createContext, createElement, useContext, useEffect, useMemo, useState } from "react";
 
 //#region react.ts
 const __DEV__ = process.env.NODE_ENV !== "production";
@@ -10,7 +10,7 @@ const BunjaStoreContext = createContext(createBunjaStore());
 function BunjaStoreProvider({ children }) {
 	const [value] = useState(createBunjaStore);
 	useEffect(() => () => value.dispose(), [value]);
-	return createElement(BunjaStoreContext, {
+	return createElement(BunjaStoreContext.Provider, {
 		value,
 		children
 	});
@@ -25,13 +25,13 @@ function createScopeFromContext(context, hash) {
 	return scope;
 }
 const defaultReadScope = (scope) => {
-	const context = scopeContextMap.get(scope);
-	return use(context);
+	return useContext(scopeContextMap.get(scope));
 };
 function useBunja(bunja, scopeValuePairs) {
-	const store = use(BunjaStoreContext);
+	const store = useContext(BunjaStoreContext);
 	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.");
 		const { value, mount, deps, bunjaInstance } = store.get(bunja, readScope);
 		useEffect(delayUnmount(mount), deps);
 		useMemo(() => ({

package/dist/solid.cjs

@@ -1,6 +1,7 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_bunja = require('./bunja-CaephaLd.cjs');
-const solid_js = require_chunk.__toESM(require("solid-js"));
+const require_bunja = require('./bunja-DFFVW7Gi.cjs');
+let solid_js = require("solid-js");
+solid_js = require_chunk.__toESM(solid_js);
 
 //#region solid.ts
 function access(maybeAccessor) {
@@ -31,8 +32,7 @@ function createScopeFromContext(context, hash) {
 	return scope;
 }
 const defaultReadScope = (scope) => {
-	const context = scopeContextMap.get(scope);
-	return access((0, solid_js.useContext)(context));
+	return access((0, solid_js.useContext)(scopeContextMap.get(scope)));
 };
 function useBunja(bunja, scopeValuePairs) {
 	const store = (0, solid_js.useContext)(BunjaStoreContext);

package/dist/solid.d.cts

@@ -1,4 +1,4 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-DXtbhAmJ.cjs";
+import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-BKpQTG04.cjs";
 import { Accessor, Context, JSX, ParentProps } from "solid-js";
 
 //#region solid.d.ts

package/dist/solid.d.ts

@@ -1,4 +1,4 @@
-import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-D_SKFBCD.js";
+import { Bunja, BunjaStore, HashFn, Scope, ScopeValuePair } from "./bunja-B_HNgDan.js";
 import { Accessor, Context, JSX, ParentProps } from "solid-js";
 
 //#region solid.d.ts

package/dist/solid.js

@@ -1,4 +1,4 @@
-import { createBunjaStore, createReadScopeFn, createScope } from "./bunja-EJqDbU0A.js";
+import { createBunjaStore, createReadScopeFn, createScope } from "./bunja-BOUkMIz6.js";
 import { createComponent, createContext, createEffect, createMemo, createRoot, getOwner, onCleanup, useContext } from "solid-js";
 
 //#region solid.ts
@@ -30,8 +30,7 @@ function createScopeFromContext(context, hash) {
 	return scope;
 }
 const defaultReadScope = (scope) => {
-	const context = scopeContextMap.get(scope);
-	return access(useContext(context));
+	return access(useContext(scopeContextMap.get(scope)));
 };
 function useBunja(bunja, scopeValuePairs) {
 	const store = useContext(BunjaStoreContext);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bunja",
   "type": "module",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "State Lifetime Manager",
   "main": "dist/bunja.cjs",
   "module": "dist/bunja.js",
@@ -61,6 +61,11 @@
   ],
   "author": "JongChan Choi <jong@chan.moe>",
   "license": "Zlib",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/disjukr/bunja.git",
+    "directory": "bunja"
+  },
   "devDependencies": {
     "@types/react": "^19",
     "react": "^19",
@@ -70,7 +75,7 @@
   },
   "peerDependencies": {
     "@types/react": "*",
-    "react": ">=19",
+    "react": ">=18",
     "solid-js": "^1"
   },
   "peerDependenciesMeta": {

package/react.ts

@@ -5,7 +5,7 @@ import {
   createContext,
   createElement,
   type PropsWithChildren,
-  use,
+  useContext,
   useEffect,
   useMemo,
   useState,
@@ -36,7 +36,7 @@ export function BunjaStoreProvider(
 ): React.JSX.Element {
   const [value] = useState(createBunjaStore);
   useEffect(() => () => value.dispose(), [value]);
-  return createElement(BunjaStoreContext, { value, children });
+  return createElement(BunjaStoreContext.Provider, { value, children });
 }
 
 export const scopeContextMap: Map<Scope<unknown>, Context<unknown>> = new Map();
@@ -55,18 +55,23 @@ export function createScopeFromContext<T>(
 
 const defaultReadScope: ReadScope = <T>(scope: Scope<T>) => {
   const context = scopeContextMap.get(scope as Scope<unknown>)!;
-  return use(context) as T;
+  return useContext(context) as T;
 };
 
 export function useBunja<T>(
   bunja: Bunja<T>,
   scopeValuePairs?: ScopeValuePair<any>[],
 ): T {
-  const store = use(BunjaStoreContext);
+  const store = useContext(BunjaStoreContext);
   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.",
+      );
+    }
     const { value, mount, deps, bunjaInstance } = store.get(bunja, readScope);
     useEffect(delayUnmount(mount), deps);
     useMemo(

package/test.ts

@@ -1,5 +1,5 @@
-import { assertEquals } from "jsr:@std/assert";
-import { assertSpyCalls, spy } from "jsr:@std/testing/mock";
+import { assertEquals } from "@std/assert";
+import { assertSpyCalls, spy } from "@std/testing/mock";
 
 import { bunja, createBunjaStore, createScope } from "./bunja.ts";
 

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "target": "ESNext",
+    "module": "ESNext",
     "strict": true,
     "moduleResolution": "Bundler",
     "allowImportingTsExtensions": true,