ctx-core 3.0.0 → 3.2.0

package/all/be_/index.js

@@ -1,12 +1,5 @@
 import { globalThis__prop__ensure } from '../globalThis__prop__ensure/index.js'
-import { isArray } from '../isArray/index.js'
-let proto_ = Object.getPrototypeOf
-let string_proto = proto_('')
-let _null = null
-let pending_sym = Symbol.for('pending')
-let be_M_is_source_ = globalThis__prop__ensure(
-	Symbol.for('be_M_is_source_'),
-	()=>new WeakMap())
+let be_M_is_source_ = globalThis.be_M_is_source_ ||= new WeakMap()
 /** @typedef {import('./index.d.ts').Be}Be */
 /** @typedef {import('./index.d.ts').Ctx}Ctx */
 /** @typedef {import('./index.d.ts').MapCtx}MapCtx */
@@ -51,69 +44,60 @@ export function globalThis__be_(
 export function be_(
 	id_OR_val__new,
 	val__new_OR_be__params,
-	be__params = {}
+	be__params
 ) {
 	/** @type {string} */
-	let id =
-		proto_(id_OR_val__new) === string_proto
-			? id_OR_val__new
-			: _null
+	let id
 	/** @type {be__val__T} */
-	let val__new =
-		proto_(id_OR_val__new) === string_proto
-			? val__new_OR_be__params || (()=>null)
-			: id_OR_val__new
-	be__params =
-		proto_(id_OR_val__new) === string_proto
-			? be__params
-			: val__new_OR_be__params
-	let is_source_ =
-		be__params
-			? be__params.is_source_
-			: _null
-	let expired_ =
-		be__params
-			? be__params.expired_
-			: ()=>0
-	let be = (argv__ctx, params = {})=>{
+	let val__new
+	/** @type {is_source__T} */
+	let is_source_
+	/** @type {expired__T} */
+	let expired_
+	if (typeof id_OR_val__new === 'string') {
+		val__new = val__new_OR_be__params
+		id = id_OR_val__new
+	} else {
+		val__new = id_OR_val__new
+		be__params = val__new_OR_be__params
+	}
+	if (be__params) {
+		is_source_ = be__params.is_source_
+		expired_ = be__params.expired_
+	}
+	let be = (argv__ctx, params)=>{
 		if (!argv__ctx) {
-			throw new Error(`be must have a Ctx passed as an argument`)
+			throw new Error(`be: no Ctx`)
 		}
 		let saved__val = be__val_(be, argv__ctx)
 		if (
-			be__has_(be, argv__ctx)
-			&& !params.force
-			&& (!expired_ || !expired_(argv__ctx))
+			!params?.force
+			&& be__has_(be, argv__ctx)
+			&& !expired_?.(argv__ctx)
 		) {
 			return saved__val
 		}
 		let ctx = source__map_ctx_(argv__ctx, is_source_)
 		if (!ctx) {
 			throw new Error(
-				`be: ${
-					String(id)
-				}: is_source_ must be true for at least one Ctx`)
+				`be: ${String(id)}: no is_source_ returns true`)
 		}
-		let pending = ctx.get(pending_sym)
+		let pending = ctx.get(Symbol.for('pending'))
 		if (!pending) {
-			pending = new Map()
-			ctx.set(pending_sym, pending)
+			pending = new Map
+			ctx.set(Symbol.for('pending'), pending)
 		}
 		if (pending.get(be)) {
-			let pending_value_a = []
-			for (let value of pending.values()) {
-				pending_value_a.push(value)
-			}
 			throw new Error(
 				`be_: ${
 					String(id)
-				}: circular dependency:\n${pending_value_a.map(pending_value=>
-					typeof pending_value === 'function'
-						? 'Function'
-						: pending_value).join('\n')}`)
+				}: circular:\n${pending.values().map(pending_value=>
+					typeof pending_value === 'string'
+						? pending_value
+						: 'Function').join('\n')}`)
 		}
 		pending.set(be, id || be)
-		let val = val__new(argv__ctx, be, params)
+		let val = val__new ? val__new(argv__ctx, be, params) : null
 		ctx.set(be, val)
 		if (id) {
 			ctx.set(id, val)
@@ -162,7 +146,6 @@ export function ctx__set(
 	val,
 	is_source_
 ) {
-	if (!is_source_) is_source_ = ()=>true
 	let source__map_ctx = source__map_ctx_(ctx, is_source_)
 	if (source__map_ctx) {
 		source__map_ctx.set(be_OR_id, val)
@@ -189,25 +172,18 @@ export function ctx__delete(
 	ctx,
 	be_OR_id,
 ) {
-	const is_source_ =
-		be__is_source__(be_OR_id)
-		|| (()=>true)
-	if (isArray(ctx)) {
-		for (let i = 0; i < ctx.length; i++) {
-			if (is_source_(ctx[i], ctx)) {
-				ctx__delete(ctx[i], be_OR_id)
-			}
+	if (Array.isArray(ctx)) {
+		for (let _ctx of ctx) {
+			ctx__delete(_ctx, be_OR_id)
 		}
 	} else {
 		/** @type {MapCtx} */
 		let map_ctx = /** @type {any} */ctx
-		if (is_source_(map_ctx, ctx)) {
-			let { id } = be_OR_id
-			if (id) {
-				map_ctx.delete(id)
-			}
-			map_ctx.delete(be_OR_id)
+		let { id } = be_OR_id
+		if (id) {
+			map_ctx.delete(id)
 		}
+		map_ctx.delete(be_OR_id)
 	}
 }
 /**
@@ -217,7 +193,7 @@ export function ctx__delete(
  * @private
  */
 export function be__has_(be_or_id, argv__ctx) {
-	return !!be__has__ctx_(be_or_id, argv__ctx)
+	return Boolean(be__has__ctx_(be_or_id, argv__ctx))
 }
 /**
  * @param {Be|string}be_or_id
@@ -226,7 +202,7 @@ export function be__has_(be_or_id, argv__ctx) {
  * @private
  */
 export function be__has__ctx_(be_or_id, argv__ctx) {
-	if (isArray(argv__ctx)) {
+	if (Array.isArray(argv__ctx)) {
 		for (let i = 0; i < argv__ctx.length; i++) {
 			const be__has__ctx = be__has__ctx_(be_or_id, argv__ctx[i])
 			if (be__has__ctx) return be__has__ctx
@@ -243,7 +219,7 @@ export function be__has__ctx_(be_or_id, argv__ctx) {
  * @private
  */
 export function be__val_(be_or_id, argv__ctx) {
-	if (isArray(argv__ctx)) {
+	if (Array.isArray(argv__ctx)) {
 		for (let i = 0; i < argv__ctx.length; i++) {
 			let ctx = argv__ctx[i]
 			const be__has__ctx = be__has__ctx_(be_or_id, ctx)
@@ -260,7 +236,7 @@ export function be__val_(be_or_id, argv__ctx) {
  * @private
  */
 export function source__map_ctx_(ctx, is_source_) {
-	if (isArray(ctx)) {
+	if (Array.isArray(ctx)) {
 		for (let i = 0; i < ctx.length; i++) {
 			let i_ctx = ctx[i]
 			let source__map_ctx = source__map_ctx_(i_ctx, is_source_)

package/all/rmemo/index.d.ts

@@ -1,17 +1,24 @@
 export declare function rmemo_<val_T>(
 	def:rmemo_def_T<val_T>,
 	...subscriber_a:rmemo_subscriber_T<val_T>[]
-):rmemo_T<val_T>
+):read_rmemo_T<val_T>
 export declare function rsig_<val_T>(
 	init_val:val_T,
 	...subscriber_a:rmemo_subscriber_T<val_T>[]
-):rmemo_T<val_T>
-export type rmemo_T<val_T> = ((val?:val_T)=>val_T)&rmemo_o_T<val_T>
-export type rmemo_def_T<val_T> = (rmemo:rmemo_T<val_T>)=>val_T
-export type rmemo_subscriber_T<val_T> = (rmemo:rmemo_T<val_T>)=>unknown
+):readwrite_rmemo_T<val_T>
+export type rmemo_T<val_T> = readwrite_rmemo_T<val_T>|read_rmemo_T<val_T>
+export type readwrite_rmemo_T<val_T> = ((val?:val_T)=>val_T)&rmemo_o_T<val_T>
+export type read_rmemo_T<val_T> = (()=>val_T)&read_rmemo_o_T<val_T>
+export type rmemo_def_T<val_T> = (rmemo:readwrite_rmemo_T<val_T>)=>val_T
+export type rmemo_subscriber_T<val_T> = (rmemo:readwrite_rmemo_T<val_T>)=>unknown
 export type rmemo_o_T<val_T> = {
 	_:val_T
-	readonly val:val_T
+	go():unknown
+	onset(val:val_T):unknown
+	refresh():val_T
+}&read_rmemo_o_T<val_T>
+export type read_rmemo_o_T<val_T> = {
+	readonly _:val_T
 	go():unknown
 	onset(val:val_T):unknown
 	refresh():val_T

package/all/rmemo/index.test.ts

@@ -37,21 +37,29 @@ test('rsig_|async subsubscriber|case 1', async ()=>{
 	let user0 = { id: 'id-0' }
 	let user1 = { id: 'id-1' }
 	let id$ = rsig_('id-0')
+	let call_count = 0
 	let user$ = rsig_<{ id:string }|null>(
 		null,
 		async (_user$)=>{
+			call_count++
 			id$()
 			let user:{ id:string } = await new Promise(_resolve=>resolve = _resolve)
 			_user$(user)
 		})
+	// equal(call_count, 0)
 	equal(user$(), null)
+	equal(call_count, 1)
 	resolve!(user0)
 	await sleep(0)
+	equal(call_count, 1)
 	equal(user$(), user0)
+	equal(call_count, 1)
 	id$('id-1')
+	equal(call_count, 2)
 	equal(user$(), user0)
 	resolve!(user1)
 	await sleep(0)
+	equal(call_count, 2)
 })
 test('rsig_|async subsubscriber|case 2', async ()=>{
 	let a$ = rsig_(1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -114,7 +114,7 @@
     "sinon": "^17.0.1",
     "size-limit": "^11.0.0",
     "ts-node": "^10.9.1",
-    "tsx": "^4.1.2",
+    "tsx": "^4.1.3",
     "typescript": "next",
     "uvu": "^0.5.6"
   },
@@ -129,7 +129,7 @@
       "import": {
         "./be": "{ be_ }"
       },
-      "limit": "600 B"
+      "limit": "465 B"
     },
     {
       "name": "rmemo",