bunja 2.0.0-alpha.5 → 2.0.0-alpha.6

package/bunja.ts

@@ -1,6 +1,7 @@
 export interface BunjaFn {
   <T>(init: () => T): Bunja<T>;
   use: BunjaUseFn;
+  fork: BunjaForkFn;
   effect: BunjaEffectFn;
 }
 export const bunja: BunjaFn = bunjaFn;
@@ -8,9 +9,14 @@ function bunjaFn<T>(init: () => T): Bunja<T> {
   return new Bunja(init);
 }
 bunjaFn.use = invalidUse as BunjaUseFn;
+bunjaFn.fork = invalidFork as BunjaForkFn;
 bunjaFn.effect = invalidEffect as BunjaEffectFn;
 
 export type BunjaUseFn = <T>(dep: Dep<T>) => T;
+export type BunjaForkFn = <T>(
+  bunja: Bunja<T>,
+  scopeValuePairs: ScopeValuePair<any>[],
+) => T;
 export type BunjaEffectFn = (callback: BunjaEffectCallback) => void;
 export type BunjaEffectCallback = () => (() => void) | void;
 
@@ -18,8 +24,14 @@ export function createScope<T>(hash?: HashFn<T>): Scope<T> {
   return new Scope(hash);
 }
 
-export function createBunjaStore(): BunjaStore {
-  return new BunjaStore();
+export interface CreateBunjaStoreConfig {
+  wrapInstance?: WrapInstanceFn;
+}
+export function createBunjaStore(config?: CreateBunjaStoreConfig): BunjaStore {
+  const { wrapInstance = defaultWrapInstanceFn } = config ?? {};
+  const store = new BunjaStore();
+  store.wrapInstance = wrapInstance;
+  return store;
 }
 
 export type Dep<T> = Bunja<T> | Scope<T>;
@@ -29,6 +41,11 @@ function invalidUse() {
     "`bunja.use` can only be used inside a bunja init function.",
   );
 }
+function invalidFork() {
+  throw new Error(
+    "`bunja.fork` can only be used inside a bunja init function.",
+  );
+}
 function invalidEffect() {
   throw new Error(
     "`bunja.effect` can only be used inside a bunja init function.",
@@ -48,10 +65,14 @@ interface BunjaBakingContext {
   currentBunja: Bunja<unknown>;
 }
 
+export type WrapInstanceFn = <T>(fn: (dispose: () => void) => T) => T;
+const defaultWrapInstanceFn: WrapInstanceFn = (fn) => fn(noop);
+
 export class BunjaStore {
   #bunjas: Record<string, BunjaInstance> = {};
   #scopes: Map<Scope<unknown>, Map<unknown, ScopeInstance>> = new Map();
   #bakingContext: BunjaBakingContext | undefined;
+  wrapInstance: WrapInstanceFn = defaultWrapInstanceFn;
   dispose(): void {
     for (const instance of Object.values(this.#bunjas)) instance.dispose();
     for (const instanceMap of Object.values(this.#scopes)) {
@@ -73,11 +94,9 @@ export class BunjaStore {
           bunjaInstance.add();
           scopeInstanceMap.forEach((instance) => instance.add());
           const unmount = () => {
-            setTimeout(() => {
-              bunjaInstanceMap.forEach((instance) => instance.sub());
-              bunjaInstance.sub();
-              scopeInstanceMap.forEach((instance) => instance.sub());
-            });
+            bunjaInstanceMap.forEach((instance) => instance.sub());
+            bunjaInstance.sub();
+            scopeInstanceMap.forEach((instance) => instance.sub());
           };
           return unmount;
         },
@@ -150,12 +169,13 @@ export class BunjaStore {
       if (dep instanceof Scope) return useScope(dep) as T;
       throw new Error("`bunja.use` can only be used with Bunja or Scope.");
     };
+    const originalBakingContext = this.#bakingContext;
     try {
       this.#bakingContext = { currentBunja: bunja };
       const bunjaInstance = this.#getBunjaInstance(bunja, scopeInstanceMap);
       return { bunjaInstance, bunjaInstanceMap, scopeInstanceMap };
     } finally {
-      this.#bakingContext = undefined;
+      this.#bakingContext = originalBakingContext;
     }
   }
   #getBunjaInstance<T>(
@@ -163,26 +183,38 @@ export class BunjaStore {
     scopeInstanceMap: ScopeInstanceMap,
   ): BunjaInstance {
     const originalEffect = bunjaFn.effect;
+    const originalFork = bunjaFn.fork;
     const prevBunja = this.#bakingContext?.currentBunja;
     try {
       const effects: BunjaEffectCallback[] = [];
       bunjaFn.effect = (callback: BunjaEffectCallback) => {
         effects.push(callback);
       };
+      bunjaFn.fork = (b, scopeValuePairs) => {
+        const readScope = createReadScopeFn(scopeValuePairs, bunjaFn.use);
+        const { value, mount } = this.get(b, readScope);
+        bunjaFn.effect(mount);
+        return value;
+      };
       if (this.#bakingContext) this.#bakingContext.currentBunja = bunja;
       if (bunja.baked) {
         const id = bunja.calcInstanceId(scopeInstanceMap);
         if (id in this.#bunjas) return this.#bunjas[id];
-        const bunjaInstanceValue = bunja.init();
-        return this.#createBunjaInstance(id, bunjaInstanceValue, effects);
+        return this.wrapInstance((dispose) => {
+          const value = bunja.init();
+          return this.#createBunjaInstance(id, value, effects, dispose);
+        });
       } else {
-        const bunjaInstanceValue = bunja.init();
-        bunja.bake();
-        const id = bunja.calcInstanceId(scopeInstanceMap);
-        return this.#createBunjaInstance(id, bunjaInstanceValue, effects);
+        return this.wrapInstance((dispose) => {
+          const value = bunja.init();
+          bunja.bake();
+          const id = bunja.calcInstanceId(scopeInstanceMap);
+          return this.#createBunjaInstance(id, value, effects, dispose);
+        });
       }
     } finally {
       bunjaFn.effect = originalEffect;
+      bunjaFn.fork = originalFork;
       if (this.#bakingContext) this.#bakingContext.currentBunja = prevBunja!;
     }
   }
@@ -200,6 +232,7 @@ export class BunjaStore {
     id: string,
     value: unknown,
     effects: BunjaEffectCallback[],
+    dispose: () => void,
   ): BunjaInstance {
     const effect = () => {
       const cleanups = effects
@@ -207,14 +240,28 @@ export class BunjaStore {
         .filter(Boolean) as (() => void)[];
       return () => cleanups.forEach((cleanup) => cleanup());
     };
-    const dispose = () => delete this.#bunjas[id];
-    const bunjaInstance = new BunjaInstance(id, value, effect, dispose);
+    const bunjaInstance = new BunjaInstance(id, value, effect, () => {
+      dispose();
+      delete this.#bunjas[id];
+    });
     this.#bunjas[id] = bunjaInstance;
     return bunjaInstance;
   }
 }
 
 export type ReadScope = <T>(scope: Scope<T>) => T;
+export function createReadScopeFn(
+  scopeValuePairs: ScopeValuePair<any>[],
+  readScope: ReadScope,
+): ReadScope {
+  const map = new Map(scopeValuePairs);
+  return <T>(scope: Scope<T>) => {
+    if (map.has(scope as Scope<unknown>)) {
+      return map.get(scope as Scope<unknown>) as T;
+    }
+    return readScope(scope);
+  };
+}
 
 export interface BunjaStoreGetResult<T> {
   value: T;
@@ -222,6 +269,16 @@ export interface BunjaStoreGetResult<T> {
   deps: unknown[];
 }
 
+export function delayUnmount(
+  mount: () => () => void,
+  ms: number = 0,
+): () => () => void {
+  return () => {
+    const unmount = mount();
+    return () => setTimeout(unmount, ms);
+  };
+}
+
 export class Bunja<T> {
   private static counter: number = 0;
   readonly id: string = String(Bunja.counter++);
@@ -299,6 +356,9 @@ export class Scope<T> {
   private static identity<T>(x: T): T {
     return x;
   }
+  bind(value: T): ScopeValuePair<T> {
+    return [this, value];
+  }
   toString(): string {
     const { id, debugLabel } = this;
     return `[Scope:${id}${debugLabel && ` - ${debugLabel}`}]`;
@@ -306,8 +366,8 @@ export class Scope<T> {
 }
 
 export type HashFn<T> = (value: T) => unknown;
+export type ScopeValuePair<T> = [Scope<T>, T];
 
-const noop = () => {};
 abstract class RefCounter {
   #count: number = 0;
   abstract dispose(): void;
@@ -369,3 +429,5 @@ function toposort<T extends Toposortable>(nodes: T[]): T[] {
   for (const node of nodes) visit(node);
   return result;
 }
+
+const noop = () => {};

package/deno.json

@@ -1,9 +1,11 @@
 {
   "name": "@disjukr/bunja",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "license": "Zlib",
   "exports": {
     ".": "./bunja.ts",
-    "./react": "./react.ts"
-  }
+    "./react": "./react.ts",
+    "./solid": "./solid.ts"
+  },
+  "exclude": ["dist"]
 }

package/dist/{bunja-DsftUL38.js → bunja-BB7ru8D0.js}

@@ -4,23 +4,32 @@ function bunjaFn(init) {
 	return new Bunja(init);
 }
 bunjaFn.use = invalidUse;
+bunjaFn.fork = invalidFork;
 bunjaFn.effect = invalidEffect;
 function createScope(hash) {
 	return new Scope(hash);
 }
-function createBunjaStore() {
-	return new BunjaStore();
+function createBunjaStore(config) {
+	const { wrapInstance = defaultWrapInstanceFn } = config ?? {};
+	const store = new BunjaStore();
+	store.wrapInstance = wrapInstance;
+	return store;
 }
 function invalidUse() {
 	throw new Error("`bunja.use` can only be used inside a bunja init function.");
 }
+function invalidFork() {
+	throw new Error("`bunja.fork` can only be used inside a bunja init function.");
+}
 function invalidEffect() {
 	throw new Error("`bunja.effect` can only be used inside a bunja init function.");
 }
+const defaultWrapInstanceFn = (fn) => fn(noop);
 var BunjaStore = class {
 	#bunjas = {};
 	#scopes = /* @__PURE__ */ new Map();
 	#bakingContext;
+	wrapInstance = defaultWrapInstanceFn;
 	dispose() {
 		for (const instance of Object.values(this.#bunjas)) instance.dispose();
 		for (const instanceMap of Object.values(this.#scopes)) for (const instance of instanceMap.values()) instance.dispose();
@@ -38,11 +47,9 @@ var BunjaStore = class {
 					bunjaInstance.add();
 					scopeInstanceMap.forEach((instance) => instance.add());
 					const unmount = () => {
-						setTimeout(() => {
-							bunjaInstanceMap.forEach((instance) => instance.sub());
-							bunjaInstance.sub();
-							scopeInstanceMap.forEach((instance) => instance.sub());
-						});
+						bunjaInstanceMap.forEach((instance) => instance.sub());
+						bunjaInstance.sub();
+						scopeInstanceMap.forEach((instance) => instance.sub());
 					};
 					return unmount;
 				},
@@ -91,6 +98,7 @@ var BunjaStore = class {
 			if (dep instanceof Scope) return useScope(dep);
 			throw new Error("`bunja.use` can only be used with Bunja or Scope.");
 		};
+		const originalBakingContext = this.#bakingContext;
 		try {
 			this.#bakingContext = { currentBunja: bunja$1 };
 			const bunjaInstance = this.#getBunjaInstance(bunja$1, scopeInstanceMap);
@@ -100,31 +108,41 @@ var BunjaStore = class {
 				scopeInstanceMap
 			};
 		} finally {
-			this.#bakingContext = void 0;
+			this.#bakingContext = originalBakingContext;
 		}
 	}
 	#getBunjaInstance(bunja$1, scopeInstanceMap) {
 		const originalEffect = bunjaFn.effect;
+		const originalFork = bunjaFn.fork;
 		const prevBunja = this.#bakingContext?.currentBunja;
 		try {
 			const effects = [];
 			bunjaFn.effect = (callback) => {
 				effects.push(callback);
 			};
+			bunjaFn.fork = (b, scopeValuePairs) => {
+				const readScope = createReadScopeFn(scopeValuePairs, bunjaFn.use);
+				const { value, mount } = this.get(b, readScope);
+				bunjaFn.effect(mount);
+				return value;
+			};
 			if (this.#bakingContext) this.#bakingContext.currentBunja = bunja$1;
 			if (bunja$1.baked) {
 				const id = bunja$1.calcInstanceId(scopeInstanceMap);
 				if (id in this.#bunjas) return this.#bunjas[id];
-				const bunjaInstanceValue = bunja$1.init();
-				return this.#createBunjaInstance(id, bunjaInstanceValue, effects);
-			} else {
-				const bunjaInstanceValue = bunja$1.init();
+				return this.wrapInstance((dispose) => {
+					const value = bunja$1.init();
+					return this.#createBunjaInstance(id, value, effects, dispose);
+				});
+			} else return this.wrapInstance((dispose) => {
+				const value = bunja$1.init();
 				bunja$1.bake();
 				const id = bunja$1.calcInstanceId(scopeInstanceMap);
-				return this.#createBunjaInstance(id, bunjaInstanceValue, effects);
-			}
+				return this.#createBunjaInstance(id, value, effects, dispose);
+			});
 		} finally {
 			bunjaFn.effect = originalEffect;
+			bunjaFn.fork = originalFork;
 			if (this.#bakingContext) this.#bakingContext.currentBunja = prevBunja;
 		}
 	}
@@ -133,17 +151,32 @@ var BunjaStore = class {
 		const instanceMap = this.#scopes.get(scope) ?? this.#scopes.set(scope, /* @__PURE__ */ new Map()).get(scope);
 		return instanceMap.get(key) ?? instanceMap.set(key, new ScopeInstance(value, () => instanceMap.delete(key))).get(key);
 	}
-	#createBunjaInstance(id, value, effects) {
+	#createBunjaInstance(id, value, effects, dispose) {
 		const effect = () => {
 			const cleanups = effects.map((effect$1) => effect$1()).filter(Boolean);
 			return () => cleanups.forEach((cleanup) => cleanup());
 		};
-		const dispose = () => delete this.#bunjas[id];
-		const bunjaInstance = new BunjaInstance(id, value, effect, dispose);
+		const bunjaInstance = new BunjaInstance(id, value, effect, () => {
+			dispose();
+			delete this.#bunjas[id];
+		});
 		this.#bunjas[id] = bunjaInstance;
 		return bunjaInstance;
 	}
 };
+function createReadScopeFn(scopeValuePairs, readScope) {
+	const map = new Map(scopeValuePairs);
+	return (scope) => {
+		if (map.has(scope)) return map.get(scope);
+		return readScope(scope);
+	};
+}
+function delayUnmount(mount, ms = 0) {
+	return () => {
+		const unmount = mount();
+		return () => setTimeout(unmount, ms);
+	};
+}
 var Bunja = class Bunja {
 	static counter = 0;
 	id = String(Bunja.counter++);
@@ -211,12 +244,14 @@ var Scope = class Scope {
 	static identity(x) {
 		return x;
 	}
+	bind(value) {
+		return [this, value];
+	}
 	toString() {
 		const { id, debugLabel } = this;
 		return `[Scope:${id}${debugLabel && ` - ${debugLabel}`}]`;
 	}
 };
-const noop = () => {};
 var RefCounter = class {
 	#count = 0;
 	add() {
@@ -269,6 +304,7 @@ function toposort(nodes) {
 	for (const node of nodes) visit(node);
 	return result;
 }
+const noop = () => {};
 
 //#endregion
-export { Bunja, BunjaStore, Scope, bunja, createBunjaStore, createScope };
+export { Bunja, BunjaStore, Scope, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };

package/dist/{bunja-Bj2Zho1e.d.ts → bunja-CqyhNWOx.d.ts}

@@ -2,26 +2,35 @@
 interface BunjaFn {
   <T>(init: () => T): Bunja<T>;
   use: BunjaUseFn;
+  fork: BunjaForkFn;
   effect: BunjaEffectFn;
 }
 declare const bunja: BunjaFn;
 type BunjaUseFn = <T>(dep: Dep<T>) => T;
+type BunjaForkFn = <T>(bunja: Bunja<T>, scopeValuePairs: ScopeValuePair<any>[]) => T;
 type BunjaEffectFn = (callback: BunjaEffectCallback) => void;
 type BunjaEffectCallback = () => (() => void) | void;
 declare function createScope<T>(hash?: HashFn<T>): Scope<T>;
-declare function createBunjaStore(): BunjaStore;
+interface CreateBunjaStoreConfig {
+  wrapInstance?: WrapInstanceFn;
+}
+declare function createBunjaStore(config?: CreateBunjaStoreConfig): BunjaStore;
 type Dep<T> = Bunja<T> | Scope<T>;
+type WrapInstanceFn = <T>(fn: (dispose: () => void) => T) => T;
 declare class BunjaStore {
   #private;
+  wrapInstance: WrapInstanceFn;
   dispose(): void;
   get<T>(bunja: Bunja<T>, readScope: ReadScope): BunjaStoreGetResult<T>;
 }
 type ReadScope = <T>(scope: Scope<T>) => T;
+declare function createReadScopeFn(scopeValuePairs: ScopeValuePair<any>[], readScope: ReadScope): ReadScope;
 interface BunjaStoreGetResult<T> {
   value: T;
   mount: () => () => void;
   deps: unknown[];
 }
+declare function delayUnmount(mount: () => () => void, ms?: number): () => () => void;
 declare class Bunja<T> {
   #private;
   init: () => T;
@@ -46,9 +55,11 @@ declare class Scope<T> {
   debugLabel: string;
   constructor(hash?: HashFn<T>);
   private static identity;
+  bind(value: T): ScopeValuePair<T>;
   toString(): string;
 }
 type HashFn<T> = (value: T) => unknown;
+type ScopeValuePair<T> = [Scope<T>, T];
 declare abstract class RefCounter {
   #private;
   abstract dispose(): void;
@@ -63,4 +74,4 @@ declare class ScopeInstance extends RefCounter {
   constructor(value: unknown, dispose: () => void);
 }
 //#endregion
-export { Bunja, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, Dep, HashFn, ReadScope, Scope, bunja, createBunjaStore, createScope };
+export { Bunja, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };

package/dist/{bunja-WQqJyoyx.d.cts → bunja-P0kiwZQC.d.cts}

@@ -2,26 +2,35 @@
 interface BunjaFn {
   <T>(init: () => T): Bunja<T>;
   use: BunjaUseFn;
+  fork: BunjaForkFn;
   effect: BunjaEffectFn;
 }
 declare const bunja: BunjaFn;
 type BunjaUseFn = <T>(dep: Dep<T>) => T;
+type BunjaForkFn = <T>(bunja: Bunja<T>, scopeValuePairs: ScopeValuePair<any>[]) => T;
 type BunjaEffectFn = (callback: BunjaEffectCallback) => void;
 type BunjaEffectCallback = () => (() => void) | void;
 declare function createScope<T>(hash?: HashFn<T>): Scope<T>;
-declare function createBunjaStore(): BunjaStore;
+interface CreateBunjaStoreConfig {
+  wrapInstance?: WrapInstanceFn;
+}
+declare function createBunjaStore(config?: CreateBunjaStoreConfig): BunjaStore;
 type Dep<T> = Bunja<T> | Scope<T>;
+type WrapInstanceFn = <T>(fn: (dispose: () => void) => T) => T;
 declare class BunjaStore {
   #private;
+  wrapInstance: WrapInstanceFn;
   dispose(): void;
   get<T>(bunja: Bunja<T>, readScope: ReadScope): BunjaStoreGetResult<T>;
 }
 type ReadScope = <T>(scope: Scope<T>) => T;
+declare function createReadScopeFn(scopeValuePairs: ScopeValuePair<any>[], readScope: ReadScope): ReadScope;
 interface BunjaStoreGetResult<T> {
   value: T;
   mount: () => () => void;
   deps: unknown[];
 }
+declare function delayUnmount(mount: () => () => void, ms?: number): () => () => void;
 declare class Bunja<T> {
   #private;
   init: () => T;
@@ -46,9 +55,11 @@ declare class Scope<T> {
   debugLabel: string;
   constructor(hash?: HashFn<T>);
   private static identity;
+  bind(value: T): ScopeValuePair<T>;
   toString(): string;
 }
 type HashFn<T> = (value: T) => unknown;
+type ScopeValuePair<T> = [Scope<T>, T];
 declare abstract class RefCounter {
   #private;
   abstract dispose(): void;
@@ -63,4 +74,4 @@ declare class ScopeInstance extends RefCounter {
   constructor(value: unknown, dispose: () => void);
 }
 //#endregion
-export { Bunja, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, Dep, HashFn, ReadScope, Scope, bunja, createBunjaStore, createScope };
+export { Bunja, BunjaEffectCallback, BunjaEffectFn, BunjaFn, BunjaForkFn, BunjaStore, BunjaStoreGetResult, BunjaUseFn, CreateBunjaStoreConfig, Dep, HashFn, ReadScope, Scope, ScopeValuePair, WrapInstanceFn, bunja, createBunjaStore, createReadScopeFn, createScope, delayUnmount };