ctx-core 4.12.0 → 4.13.0

package/all/be_/index.d.ts

@@ -58,7 +58,7 @@ export declare type Be<
 	ctx_T extends Ctx = Ctx
 > = ((ctx:ctx_T)=>val_T)&{
 	is_be: true
-	id?:string
+	id:string|Be<val_T, ctx_T>
 }
 export type be_config_T = {
 	id?:string

package/all/be_/index.js

@@ -1,4 +1,3 @@
-import { globalThis__prop__ensure } from '../globalThis__prop__ensure/index.js'
 /** @typedef {import('./index.d.ts').Be} */
 /** @typedef {import('./index.d.ts').be_} */
 /** @typedef {import('./index.d.ts').be_config_T} */
@@ -6,22 +5,6 @@ import { globalThis__prop__ensure } from '../globalThis__prop__ensure/index.js'
 /** @typedef {import('./index.d.ts').MapCtx} */
 /** @typedef {import('./index.d.ts').be__val__new_T} */
 /** @typedef {import('./index.d.ts').is_source__T} */
-/**
- * Auto-memoization function for the Ctx.
- * Memoized on globalThis to allow packages being loaded multiple times, which can happen during bundling.
- *
- * Returns a function to ensure that a member id_OR_val_ is defined on a ctx object,
- * otherwise it caches & uses the return value of val__new.
- * @param {string|symbol}id
- * @param {be__val__new_T}val__new
- * @param {be_config_T}config
- * @returns {Be}
- * @private
- */
-export function globalThis__be_(val__new, config) {
-	return globalThis__prop__ensure(config.id, ()=>
-		be_(val__new, config))
-}
 /**
  * Auto-memoization function for the Ctx.
  *
@@ -34,30 +17,42 @@ export function globalThis__be_(val__new, config) {
  */
 export function be_(val__new, config) {
 	let be = argv__ctx=>{
-		let flat__argv__ctx = Array.isArray(argv__ctx) && argv__ctx.flat(Infinity)
+		let flat__argv__ctx = argv__ctx.flat && argv__ctx.flat(Infinity)
 		let be__ctx =
-      flat__argv__ctx
-	      ? flat__argv__ctx.find(ctx=>ctx.has(be))
-	      : argv__ctx.has(be) && argv__ctx
+		  flat__argv__ctx
+	      ? flat__argv__ctx.find(ctx=>ctx.has(be.id))
+	      : argv__ctx.has(be.id) && argv__ctx
 		if (!be__ctx) {
 			be__ctx =
 				flat__argv__ctx
 					? flat__argv__ctx.find(ctx=>!be.is_source_ || be.is_source_(ctx, argv__ctx))
 					: (!be.is_source_ || be.is_source_(argv__ctx, argv__ctx)) && argv__ctx
 			// circular dependency state
-			// if val__new calls this be before returning, Symbol('cir') will be the value of this be
+			// if val__new calls this be before returning, 'cir' will be the value of this be
 			// 'cir' is used instead of 'circular' to reduce the payload by a few bytes
-			be__ctx.set(be, Symbol('cir'))
-			be__ctx.set(be, val__new(argv__ctx, be))
-			if (be.id) be__ctx.set(be.id, be__ctx.get(be))
+			be__ctx.set(be.id, 'cir')
+			be__ctx.set(be.id, val__new(argv__ctx, be))
 		}
-		return be__ctx.get(be)
+		return be__ctx.get(be.id)
 	}
-	be.id = config?.id
+	be.id = config?.id ?? be
 	be.is_source_ = config?.is_source_
 	be.is_be = true
 	return be
 }
+/**
+ * Auto-memoization function for the Ctx.
+ * Memoized on globalThis to allow packages being loaded multiple times, which can happen during bundling.
+ *
+ * Returns a function to ensure that a member id_OR_val_ is defined on a ctx object,
+ * otherwise it caches & uses the return value of val__new.
+ * @param {string|symbol}id
+ * @param {be__val__new_T}val__new
+ * @param {be_config_T}config
+ * @returns {Be}
+ * @private
+ */
+export { be_ as globalThis__be_ }
 /**
  * @param {Ctx}ctx
  * @param {Be|string|symbol}be_OR_id
@@ -74,11 +69,7 @@ export function ctx__set(
 ) {
 	let source__map_ctx = source__map_ctx_(ctx, is_source_)
 	if (source__map_ctx) {
-		source__map_ctx.set(be_OR_id, val)
-		let { id } = be_OR_id
-		if (id) {
-			source__map_ctx.set(id, val)
-		}
+		source__map_ctx.set(be_OR_id.id ?? be_OR_id, val)
 	}
 }
 /**
@@ -94,13 +85,7 @@ export function ctx__delete(
 			ctx__delete(_ctx, be_OR_id)
 		}
 	} else {
-		/** @type {MapCtx} */
-		let map_ctx = /** @type {any} */ctx
-		let { id } = be_OR_id
-		if (id) {
-			map_ctx.delete(id)
-		}
-		map_ctx.delete(be_OR_id)
+		ctx.delete(be_OR_id.id ?? be_OR_id)
 	}
 }
 /**
@@ -121,11 +106,11 @@ export function be__has_(be_or_id, argv__ctx) {
 export function be__ctx_(be_or_id, argv__ctx) {
 	if (Array.isArray(argv__ctx)) {
 		for (let ctx of argv__ctx) {
-			let be__ctx = be__ctx_(be_or_id, ctx)
+			let be__ctx = be__ctx_(be_or_id.id ?? be_or_id, ctx)
 			if (be__ctx) return be__ctx
 		}
 	} else {
-		if (argv__ctx.has(be_or_id)) return argv__ctx
+		if (argv__ctx.has(be_or_id.id ?? be_or_id)) return argv__ctx
 	}
 }
 export { be__ctx_ as be__has__ctx_ }
@@ -137,7 +122,7 @@ export { be__ctx_ as be__has__ctx_ }
  */
 export function be__val_(be_or_id, argv__ctx) {
 	let be__ctx = be__ctx_(be_or_id, argv__ctx)
-	if (be__ctx) return be__ctx.get(be_or_id)
+	if (be__ctx) return be__ctx.get(be_or_id.id ?? be_or_id)
 }
 /**
  * @param {Ctx}argv__ctx
@@ -151,7 +136,9 @@ export function source__map_ctx_(argv__ctx, is_source_) {
 			let source__map_ctx = source__map_ctx_(ctx, is_source_)
 			if (source__map_ctx) return source__map_ctx
 		}
-	} else if (!is_source_ || is_source_(/** @type {MapCtx} */argv__ctx, argv__ctx)) {
-		return argv__ctx
+	} else {
+		if (!is_source_ || is_source_(argv__ctx, argv__ctx)) {
+			return argv__ctx
+		}
 	}
 }

package/all/be_/index.test.ts

@@ -18,26 +18,23 @@ test.after(()=>{
 })
 test('globalThis__be_', ()=>{
 	const ctx = ctx__new()
-	equal(root_be_(), undefined)
 	const be = globalThis__be_(()=>1, { id: 'root_be' })
-	equal(root_be_(), be)
-	equal(root_be_()!(ctx), 1)
 	equal(be(ctx), 1)
 	const be2 = globalThis__be_(()=>1, { id: 'root_be' })
-	equal(be2, be)
-	equal(root_be_(), be2)
-	equal(root_be_()!(ctx), 1)
 	equal(be2(ctx), 1)
-	function root_be_() {
-	  return (globalThis as { root_be?:Be<unknown> }).root_be
-	}
 })
 test('be_|Map', ()=>{
 	const ctx = ctx__new()
 	let incrementer_num = 0
 	const incrementer = ()=>++incrementer_num
-	const root_ = be_(()=>incrementer(), { id: 'root_' })
-	const child_ = be_(ctx=>root_(ctx) + incrementer(), { id: 'child_' })
+	const root_ = be_(()=>{
+		console.debug('root_|debug|1')
+		return incrementer()
+	}, { id: 'root_' })
+	const child_ = be_(ctx=>{
+		console.debug('child_|debug|1')
+		return root_(ctx) + incrementer()
+	}, { id: 'child_' })
 	const child1_ = be_(ctx=>root_(ctx) + child_(ctx), { id: 'child1_' })
 	equal(root_(ctx), 1)
 	equal(ctx.get('root_'), 1)
@@ -53,12 +50,12 @@ test('be_|simple array', ()=>{
 	const root_ = be_(()=>1, { id: 'root_' })
 	equal(root_(ctx1), 1)
 	equal(root_(ctx), 1)
-	equal(ctx0.has(root_), false)
-	equal(ctx1.has(root_), true)
+	equal(ctx0.has(root_.id), false)
+	equal(ctx1.has(root_.id), true)
 	const child_ = be_(ctx=>root_(ctx) + 1, { id: 'child_' })
 	equal(child_(ctx), 2)
-	equal(ctx0.has(child_), true)
-	equal(ctx1.has(child_), false)
+	equal(ctx0.has(child_.id), true)
+	equal(ctx1.has(child_.id), false)
 })
 test('be_|nested array', ()=>{
 	const ctx0 = ctx__new()
@@ -69,16 +66,16 @@ test('be_|nested array', ()=>{
 	const root_ = be_(()=>1, { id: 'root_' })
 	equal(root_(ctx3), 1)
 	equal(root_(ctx), 1)
-	equal(ctx0.has(root_), false)
-	equal(ctx1.has(root_), false)
-	equal(ctx2.has(root_), false)
-	equal(ctx3.has(root_), true)
+	equal(ctx0.has(root_.id), false)
+	equal(ctx1.has(root_.id), false)
+	equal(ctx2.has(root_.id), false)
+	equal(ctx3.has(root_.id), true)
 	const child_ = be_(ctx=>root_(ctx) + 1, { id: 'child_' })
 	equal(child_(ctx), 2)
-	equal(ctx0.has(child_), true)
-	equal(ctx1.has(child_), false)
-	equal(ctx2.has(child_), false)
-	equal(ctx3.has(child_), false)
+	equal(ctx0.has(child_.id), true)
+	equal(ctx1.has(child_.id), false)
+	equal(ctx2.has(child_.id), false)
+	equal(ctx3.has(child_.id), false)
 })
 test('be_|is_source_', ()=>{
 	const ctx0 = ctx__new()
@@ -95,8 +92,8 @@ test('be_|is_source_', ()=>{
 	})
 	equal(root_(ctx), 1)
 	equal(be__ctx_a, [[ctx0, ctx1]])
-	equal(ctx0.has(root_), false)
-	equal(ctx1.has(root_), true)
+	equal(ctx0.has(root_.id), false)
+	equal(ctx1.has(root_.id), true)
 })
 test('be_|Ctx generic type', ()=>{
 	const valid_ctx = ctx__new() as test_ctx_T
@@ -116,8 +113,8 @@ test('be_|circular dependency', ()=>{
 	const be0:Be<symbol> = be_(ctx=>be1(ctx))
 	const be1:Be<symbol> = be_(ctx=>be0(ctx))
 	const ctx = ctx__new()
-	equal(String(be0(ctx)), 'Symbol(cir)')
-	equal(String(be1(ctx)), 'Symbol(cir)')
+	equal(be0(ctx), 'cir')
+	equal(be1(ctx), 'cir')
 })
 test('ctx__set', ()=>{
 	const ctx0 = ctx__new()
@@ -152,46 +149,46 @@ test('ctx__delete|be', ()=>{
 	const ctx0 = ctx__new()
 	const num_ = be_(()=>1)
 	ctx__delete(ctx0, num_)
-	equal(ctx0.has(num_), false)
+	equal(ctx0.has(num_.id), false)
 	num_(ctx0)
-	equal(ctx0.has(num_), true)
+	equal(ctx0.has(num_.id), true)
 	ctx__delete(ctx0, num_)
-	equal(ctx0.has(num_), false)
+	equal(ctx0.has(num_.id), false)
 	num_(ctx0)
-	equal(ctx0.has(num_), true)
+	equal(ctx0.has(num_.id), true)
 	ctx__delete(ctx0, num_)
-	equal(ctx0.has(num_), false)
+	equal(ctx0.has(num_.id), false)
 	const ctx1 = ctx__new()
 	ctx1.set('ctx1', true)
 	const nested__ctx = [ctx0, ctx1]
 	num_(ctx0)
 	num_(ctx1)
-	equal(ctx0.has(num_), true)
-	equal(ctx1.has(num_), true)
+	equal(ctx0.has(num_.id), true)
+	equal(ctx1.has(num_.id), true)
 	ctx__delete(nested__ctx, num_)
-	equal(ctx0.has(num_), false)
-	equal(ctx1.has(num_), false)
+	equal(ctx0.has(num_.id), false)
+	equal(ctx1.has(num_.id), false)
 	num_(ctx0)
 	num_(ctx1)
-	equal(ctx0.has(num_), true)
-	equal(ctx1.has(num_), true)
+	equal(ctx0.has(num_.id), true)
+	equal(ctx1.has(num_.id), true)
 	ctx__delete(nested__ctx, num_)
-	equal(ctx0.has(num_), false)
-	equal(ctx1.has(num_), false)
+	equal(ctx0.has(num_.id), false)
+	equal(ctx1.has(num_.id), false)
 	const is_source__num_ =
 		be_(()=>1, { is_source_: ctx=>!!ctx.get('ctx1') })
 	is_source__num_(nested__ctx)
-	equal(ctx0.has(is_source__num_), false)
-	equal(ctx1.has(is_source__num_), true)
+	equal(ctx0.has(is_source__num_.id), false)
+	equal(ctx1.has(is_source__num_.id), true)
 	ctx__delete(nested__ctx, is_source__num_)
-	equal(ctx0.has(is_source__num_), false)
-	equal(ctx1.has(is_source__num_), false)
+	equal(ctx0.has(is_source__num_.id), false)
+	equal(ctx1.has(is_source__num_.id), false)
 	is_source__num_(nested__ctx)
-	equal(ctx0.has(is_source__num_), false)
-	equal(ctx1.has(is_source__num_), true)
+	equal(ctx0.has(is_source__num_.id), false)
+	equal(ctx1.has(is_source__num_.id), true)
 	ctx__delete(nested__ctx, is_source__num_)
-	equal(ctx0.has(is_source__num_), false)
-	equal(ctx1.has(is_source__num_), false)
+	equal(ctx0.has(is_source__num_.id), false)
+	equal(ctx1.has(is_source__num_.id), false)
 })
 test('be__has_', ()=>{
 	const ctx0 = ctx__new()
@@ -223,7 +220,7 @@ test('be__val_', ()=>{
 	const ctx = ctx__new()
 	const val_ = be_<boolean>(()=>true, { id: 'val_' })
 	equal(val_(ctx), true)
-	equal(ctx.get(val_), true)
+	equal(ctx.get(val_.id), true)
 	equal(be__val_(val_, ctx), true)
 	ctx__set(ctx, val_, false)
 	equal(val_(ctx), false)
@@ -232,5 +229,5 @@ test('be__val_', ()=>{
 test.run()
 declare const test_ctx_sym:unique symbol
 type test_ctx_T = Ctx&{
-	[test_ctx_sym]:any
+	[test_ctx_sym]:unknown
 }

package/all/be_memo_pair/index.d.ts

@@ -15,6 +15,15 @@ export declare function be_memo_pair_<
 		|[...((ctx:Ctx, memosig:sig_T<val_T>)=>unknown)[]]
 		|[...((ctx:Ctx, memosig:sig_T<val_T>)=>unknown)[], config:be_config_T]
 ):be_memo_pair_T<val_T, _memo_T, ctx_T>
+export declare function globalThis__be_memo_pair_<
+	val_T,
+	_memo_T extends memo_T<val_T> = memo_T<val_T>,
+	ctx_T extends Ctx = Ctx
+>(
+	rmemo__new:(ctx:Ctx, memo:_memo_T&{ _:val_T })=>val_T,
+	...subscriber_a_THEN_config:
+		|[...((ctx:Ctx, memosig:sig_T<val_T>)=>unknown)[], config:be_config_T&{ id:string }]
+):be_memo_pair_T<val_T, _memo_T, ctx_T>
 export type be_memo_pair_T<
 	val_T,
 	_memo_T extends memo_T<val_T> = memo_T<val_T>,

package/all/be_memosig_triple/index.d.ts

@@ -15,6 +15,15 @@ export declare function be_memosig_triple_<
 		|[...((ctx:Ctx, sig:_sig_T)=>unknown)[]]
 		|[...((ctx:Ctx, sig:_sig_T)=>unknown)[], config:be_config_T]
 ):be_memosig_triple_T<val_T, _sig_T, ctx_T>
+export declare function globalThis__be_memosig_triple_<
+	val_T,
+	_sig_T extends sig_T<val_T> = sig_T<val_T>,
+	ctx_T extends Ctx = Ctx
+>(
+	rmemo__new:(ctx:Ctx, memosig:_sig_T)=>val_T,
+	...subscriber_a_THEN_config:
+		|[...((ctx:Ctx, sig:_sig_T)=>unknown)[], config:be_config_T&{ id:string }]
+):be_memosig_triple_T<val_T, _sig_T, ctx_T>
 export type be_memosig_triple_T<
 	val_T,
 	_sig_T extends sig_T<val_T> = sig_T<val_T>,

package/all/be_sig_triple/index.js

@@ -1,7 +1,8 @@
 /// <reference types="../be_/index.d.ts" />
 /// <reference types="../rmemo/index.d.ts" />
 /// <reference types="./index.d.ts" />
-import { be_ } from '../be_/index.js'
+import { be_, globalThis__be_ } from '../be_/index.js'
+import { ctx_, ctx__new } from '../ctx'
 import { sig_ } from '../rmemo/index.js'
 /**
  * @param {Be<sig_T>|be__val__new_T<unknown>}be_OR_val__new

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -135,14 +135,14 @@
       "import": {
         "./be": "{ be_ }"
       },
-      "limit": "162 B"
+      "limit": "147 B"
     },
     {
       "name": "be_ ctx_",
       "import": {
         "./be": "{ be_, ctx_ }"
       },
-      "limit": "187 B"
+      "limit": "173 B"
     },
     {
       "name": "memo_",
@@ -163,14 +163,14 @@
       "import": {
         "./rmemo": "{ sig_, memo_, be_, ctx_ }"
       },
-      "limit": "506 B"
+      "limit": "494 B"
     },
     {
       "name": "memo_ sig_ be_ ctx_ be_memo_pair_ be_sig_triple_",
       "import": {
         "./rmemo": "{ sig_, memo_, be_, ctx_, be_memo_pair_, be_sig_triple_ }"
       },
-      "limit": "600 B"
+      "limit": "591 B"
     }
   ],
   "scripts": {