bunja 2.0.0-alpha.9 → 2.0.0

package/README.md

@@ -19,7 +19,7 @@ depended on somewhere in the render tree and ends when all dependencies
 disappear.
 
 Therefore, when writing a state to manage a WebSocket, you only need to create a
-function that establishes the WebSocket connection and an dispose handler that
+function that establishes the WebSocket connection and a disposal handler that
 terminates the connection.\
 The library automatically tracks the actual usage period and calls the init and
 dispose as needed.

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@disjukr/bunja",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0",
   "license": "Zlib",
   "exports": {
     ".": "./bunja.ts",

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

@@ -108,14 +108,14 @@ var BunjaStore = class BunjaStore {
 		const bunjaInstanceMap = /* @__PURE__ */ new Map();
 		const scopeInstanceMap = /* @__PURE__ */ new Map();
 		function getUse(map, addDep, getInstance) {
-			return (dep) => {
+			return ((dep) => {
 				const d = dep;
 				addDep(d);
 				if (map.has(d)) return map.get(d).value;
 				const instance = getInstance(d);
 				map.set(d, instance);
 				return instance.value;
-			};
+			});
 		}
 		const useScope = getUse(scopeInstanceMap, (dep) => this.#bakingContext.currentBunja.addScope(dep), (dep) => this.#getScopeInstance(dep, readScope(dep)));
 		const useBunja = getUse(bunjaInstanceMap, (dep) => this.#bakingContext.currentBunja.addParent(dep), (dep) => {

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

@@ -107,14 +107,14 @@ var BunjaStore = class BunjaStore {
 		const bunjaInstanceMap = /* @__PURE__ */ new Map();
 		const scopeInstanceMap = /* @__PURE__ */ new Map();
 		function getUse(map, addDep, getInstance) {
-			return (dep) => {
+			return ((dep) => {
 				const d = dep;
 				addDep(d);
 				if (map.has(d)) return map.get(d).value;
 				const instance = getInstance(d);
 				map.set(d, instance);
 				return instance.value;
-			};
+			});
 		}
 		const useScope = getUse(scopeInstanceMap, (dep) => this.#bakingContext.currentBunja.addScope(dep), (dep) => this.#getScopeInstance(dep, readScope(dep)));
 		const useBunja = getUse(bunjaInstanceMap, (dep) => this.#bakingContext.currentBunja.addParent(dep), (dep) => {

package/dist/bunja.cjs

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

package/dist/bunja.js

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

package/dist/react.cjs

@@ -2,7 +2,7 @@
 
 
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_bunja = require('./bunja-DO4Cr7x-.cjs');
+const require_bunja = require('./bunja-CaephaLd.cjs');
 const react = require_chunk.__toESM(require("react"));
 
 //#region react.ts

package/dist/react.js

@@ -1,7 +1,7 @@
 "use client";
 
 
-import { createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-DxIUFo_M.js";
+import { createBunjaStore, createReadScopeFn, createScope, delayUnmount } from "./bunja-EJqDbU0A.js";
 import { createContext, createElement, use, useEffect, useMemo, useState } from "react";
 
 //#region react.ts

package/dist/solid.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_bunja = require('./bunja-DO4Cr7x-.cjs');
+const require_bunja = require('./bunja-CaephaLd.cjs');
 const solid_js = require_chunk.__toESM(require("solid-js"));
 
 //#region solid.ts
@@ -36,8 +36,11 @@ const defaultReadScope = (scope) => {
 };
 function useBunja(bunja, scopeValuePairs) {
 	const store = (0, solid_js.useContext)(BunjaStoreContext);
-	const readScope = scopeValuePairs ? require_bunja.createReadScopeFn(scopeValuePairs, defaultReadScope) : defaultReadScope;
-	const entry = (0, solid_js.createMemo)(() => store.get(access(bunja), readScope));
+	const readScope = (0, solid_js.createMemo)(() => {
+		const pairs = access(scopeValuePairs);
+		return pairs ? require_bunja.createReadScopeFn(pairs, defaultReadScope) : defaultReadScope;
+	});
+	const entry = (0, solid_js.createMemo)(() => store.get(access(bunja), readScope()));
 	(0, solid_js.createEffect)(() => {
 		const cleanup = entry().mount();
 		(0, solid_js.onCleanup)(() => setTimeout(cleanup));

package/dist/solid.d.cts

@@ -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?: ScopeValuePair<any>[]): Accessor<T>;
+declare function useBunja<T>(bunja: MaybeAccessor<Bunja<T>>, scopeValuePairs?: MaybeAccessor<ScopeValuePair<any>[]>): Accessor<T>;
 //#endregion
 export { BunjaStoreContext, BunjaStoreProvider, bindScope, createScopeFromContext, scopeContextMap, useBunja };

package/dist/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?: ScopeValuePair<any>[]): Accessor<T>;
+declare function useBunja<T>(bunja: MaybeAccessor<Bunja<T>>, scopeValuePairs?: MaybeAccessor<ScopeValuePair<any>[]>): Accessor<T>;
 //#endregion
 export { BunjaStoreContext, BunjaStoreProvider, bindScope, createScopeFromContext, scopeContextMap, useBunja };

package/dist/solid.js

@@ -1,4 +1,4 @@
-import { createBunjaStore, createReadScopeFn, createScope } from "./bunja-DxIUFo_M.js";
+import { createBunjaStore, createReadScopeFn, createScope } from "./bunja-EJqDbU0A.js";
 import { createComponent, createContext, createEffect, createMemo, createRoot, getOwner, onCleanup, useContext } from "solid-js";
 
 //#region solid.ts
@@ -35,8 +35,11 @@ const defaultReadScope = (scope) => {
 };
 function useBunja(bunja, scopeValuePairs) {
 	const store = useContext(BunjaStoreContext);
-	const readScope = scopeValuePairs ? createReadScopeFn(scopeValuePairs, defaultReadScope) : defaultReadScope;
-	const entry = createMemo(() => store.get(access(bunja), readScope));
+	const readScope = createMemo(() => {
+		const pairs = access(scopeValuePairs);
+		return pairs ? createReadScopeFn(pairs, defaultReadScope) : defaultReadScope;
+	});
+	const entry = createMemo(() => store.get(access(bunja), readScope()));
 	createEffect(() => {
 		const cleanup = entry().mount();
 		onCleanup(() => setTimeout(cleanup));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bunja",
   "type": "module",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0",
   "description": "State Lifetime Manager",
   "main": "dist/bunja.cjs",
   "module": "dist/bunja.js",

package/solid.ts

@@ -83,13 +83,16 @@ const defaultReadScope: ReadScope = <T>(scope: Scope<T>) => {
 
 export function useBunja<T>(
   bunja: MaybeAccessor<Bunja<T>>,
-  scopeValuePairs?: ScopeValuePair<any>[],
+  scopeValuePairs?: MaybeAccessor<ScopeValuePair<any>[]>,
 ): Accessor<T> {
   const store = useContext(BunjaStoreContext);
-  const readScope = scopeValuePairs
-    ? createReadScopeFn(scopeValuePairs, defaultReadScope)
-    : defaultReadScope;
-  const entry = createMemo(() => store.get(access(bunja), readScope));
+  const readScope = createMemo(() => {
+    const pairs = access(scopeValuePairs);
+    return pairs
+      ? createReadScopeFn(pairs, defaultReadScope)
+      : defaultReadScope;
+  });
+  const entry = createMemo(() => store.get(access(bunja), readScope()));
   createEffect(() => {
     const cleanup = entry().mount();
     onCleanup(() => setTimeout(cleanup));