ctx-core 4.6.1 → 4.6.2

package/all/be_memo_pair/index.d.ts

@@ -1,10 +1,10 @@
 import type { Be, be__val__new_T, be_config_T, Ctx } from '../be_/index.js'
-import type { memo_T, rmemo_def_T, rmemo_val_T } from '../rmemo/index.js'
+import type { memo_T } from '../rmemo/index.js'
 export declare function be_memo_pair_<
 	val_T,
 	_memo_T extends memo_T<val_T> = memo_T<val_T>,
 	ctx_T extends Ctx = Ctx
->(be: Be<_memo_T, ctx_T>):be_memo_pair_T<_memo_T, ctx_T>
+>(be: Be<_memo_T, ctx_T>):be_memo_pair_T<val_T, _memo_T, ctx_T>
 export declare function be_memo_pair_<
 	val_T,
 	_memo_T extends memo_T<val_T> = memo_T<val_T>,
@@ -12,13 +12,14 @@ export declare function be_memo_pair_<
 >(
 	rmemo__new:be__val__new_T<val_T>,
 	...subscriber_a_THEN_config:
-		|[...rmemo_def_T<val_T>[]]
-		|[...rmemo_def_T<val_T>[], config:be_config_T]
-):be_memo_pair_T<_memo_T, ctx_T>
+		|[...((ctx:Ctx, memo:_memo_T)=>unknown)[]]
+		|[...((ctx:Ctx, memo:_memo_T)=>unknown)[], config:be_config_T]
+):be_memo_pair_T<val_T, _memo_T, ctx_T>
 export type be_memo_pair_T<
-	_memo_T extends memo_T<unknown> = memo_T<unknown>,
+	val_T,
+	_memo_T extends memo_T<val_T> = memo_T<val_T>,
 	ctx_T extends Ctx = Ctx
 > = [
 	Be<_memo_T, ctx_T>,
-	(ctx:ctx_T)=>rmemo_val_T<_memo_T>
+	(ctx:ctx_T)=>val_T
 ]

package/all/be_memo_pair/index.js

@@ -24,7 +24,10 @@ export function be_memo_pair_(
 		be_OR_val__new.is_be
 			? be_OR_val__new
 			: be_(ctx=>
-				memo_(()=>be_OR_val__new(ctx), ...subscriber_a_THEN_config),
+				memo_(
+					()=>be_OR_val__new(ctx),
+					...subscriber_a_THEN_config.map(subscriber=>
+						memo=>subscriber(ctx, memo))),
 			config)
 	return [
 		be,

package/all/be_memo_pair/index.test.ts

@@ -26,6 +26,12 @@ test('be_memo_pair_', ()=>{
 test('be_memo_pair_|+id|+is_source_|+oninit|+subscriber_a', ()=>{
 	const ctx = ctx__new()
 	let subscriber_count = 0
+	const [
+		,
+		subscriber_dep_,
+		subscriber_dep__set
+	] = be_sig_triple_(()=>1,
+		{ is_source_: map_ctx=>map_ctx === ctx })
 	const [
 		,
 		base_,
@@ -36,11 +42,11 @@ test('be_memo_pair_|+id|+is_source_|+oninit|+subscriber_a', ()=>{
 		foobar$_,
 		foobar_,
 	] = be_memo_pair_(ctx=>base_(ctx) + 1,
-		()=>subscriber_count++,
-		{
-			id: 'foobar',
-			is_source_: map_ctx=>map_ctx === ctx,
-		})
+		(ctx, foobar$)=>{
+			subscriber_count++
+			subscriber_dep__set(ctx, subscriber_count + foobar$())
+		},
+		{ id: 'foobar', is_source_: map_ctx=>map_ctx === ctx })
 	equal(subscriber_count, 0)
 	equal(foobar$_([ctx__new(), ctx])._, 2)
 	equal(foobar_([ctx__new(), ctx]), 2)
@@ -48,13 +54,15 @@ test('be_memo_pair_|+id|+is_source_|+oninit|+subscriber_a', ()=>{
 	equal(foobar_(ctx), 2)
 	equal((ctx.get('foobar') as memo_T<number>)._, 2)
 	equal(subscriber_count, 1)
+	equal(subscriber_dep_(ctx), 3)
 	base__set(ctx, 2)
 	equal(foobar$_([ctx__new(), ctx])._, 3)
 	equal(foobar_([ctx__new(), ctx]), 3)
 	equal(foobar$_(ctx)._, 3)
 	equal(foobar_(ctx), 3)
 	equal((ctx.get('foobar') as memo_T<number>)._, 3)
-	equal(subscriber_count, 1)
+	equal(subscriber_count, 2)
+	equal(subscriber_dep_(ctx), 5)
 })
 test('be_memo_pair_|be', ()=>{
 	const ctx = ctx__new()

package/all/be_sig_triple/index.d.ts

@@ -1,25 +1,26 @@
-import type { Be, be__val__new_T, be_config_T, Ctx } from '../be_/index.js'
-import type { sig_T, rmemo_def_T, rmemo_val_T } from '../rmemo/index.js'
+import type { Be, be_config_T, Ctx } from '../be_/index.js'
+import type { rmemo_val_T, sig_T } from '../rmemo/index.js'
 export declare function be_sig_triple_<
 	val_T,
 	_sig_T extends sig_T<val_T> = sig_T<val_T>,
 	ctx_T extends Ctx = Ctx
->(be: Be<_sig_T, ctx_T>):be_sig_triple_T<_sig_T, ctx_T>
+>(be:Be<_sig_T, ctx_T>):be_sig_triple_T<val_T, _sig_T, ctx_T>
 export declare function be_sig_triple_<
 	val_T,
 	_sig_T extends sig_T<val_T> = sig_T<val_T>,
 	ctx_T extends Ctx = Ctx
 >(
-	rmemo__new:be__val__new_T<val_T>,
+	val__new:(ctx:Ctx, sig:_sig_T)=>val_T,
 	...subscriber_a_THEN_config:
-		|[...rmemo_def_T<val_T>[]]
-		|[...rmemo_def_T<val_T>[], config:be_config_T]
-):be_sig_triple_T<_sig_T, ctx_T>
+		|[...((ctx:Ctx, sig:_sig_T)=>unknown)[]]
+		|[...((ctx:Ctx, sig:_sig_T)=>unknown)[], config:be_config_T]
+):be_sig_triple_T<val_T, _sig_T, ctx_T>
 export type be_sig_triple_T<
-	_sig_T extends sig_T<unknown> = sig_T<unknown>,
+	val_T,
+	_sig_T extends sig_T<val_T> = sig_T<val_T>,
 	ctx_T extends Ctx = Ctx
 > = [
 	Be<_sig_T>,
-	(ctx:ctx_T)=>rmemo_val_T<_sig_T>,
+	(ctx:ctx_T)=>val_T,
 	(ctx:ctx_T, val:rmemo_val_T<_sig_T>)=>void
 ]

package/all/be_sig_triple/index.js

@@ -24,11 +24,15 @@ export function be_sig_triple_(
 	let be =
 		be_OR_val__new.is_be
 			? be_OR_val__new
-			: be_(ctx=>sig_(be_OR_val__new(ctx), ...subscriber_a_THEN_config),
-				config)
+			: be_(ctx=>
+				sig_(
+					be_OR_val__new(ctx),
+					...subscriber_a_THEN_config.map(subscriber=>
+						sig=>subscriber(ctx, sig))),
+			config)
 	return [
 		be,
-		ctx=>be(ctx)._,
+		ctx=>be(ctx)(),
 		(ctx, val)=>{
 			be(ctx)._ = val
 		},

package/all/be_sig_triple/index.test.ts

@@ -2,7 +2,7 @@ import { test } from 'uvu'
 import { equal } from 'uvu/assert'
 import { be_ } from '../be_/index.js'
 import { ctx__new } from '../ctx/index.js'
-import { type sig_T, sig_ } from '../rmemo/index.js'
+import { sig_, type sig_T } from '../rmemo/index.js'
 import { be_sig_triple_ } from './index.js'
 test('be_sig_triple_', ()=>{
 	const [
@@ -20,20 +20,30 @@ test('be_sig_triple_', ()=>{
 test('be_sig_triple_|+id|+is_source_', ()=>{
 	const ctx = ctx__new()
 	let subscriber_count = 0
+	const [
+		,
+		subscriber_dep_,
+		subscriber_dep__set
+	] = be_sig_triple_(()=>1,
+		{ is_source_: map_ctx=>map_ctx === ctx })
 	const [
 		foobar$_,
 		foobar_,
 		foobar__set,
 	] = be_sig_triple_(
 		()=>1,
-		()=>subscriber_count++,
-		{ id: 'foobar', is_source_: map_ctx=>map_ctx === ctx },)
+		(ctx, foobar$)=>{
+			subscriber_count++
+			subscriber_dep__set(ctx, subscriber_count + foobar$())
+		},
+		{ id: 'foobar', is_source_: map_ctx=>map_ctx === ctx })
 	equal(subscriber_count, 0)
 	equal(foobar$_([ctx__new(), ctx])._, 1)
 	equal(foobar_([ctx__new(), ctx]), 1)
 	equal(foobar$_(ctx)._, 1)
 	equal(foobar_(ctx), 1)
 	equal(subscriber_count, 1)
+	equal(subscriber_dep_(ctx), 2)
 	equal((ctx.get('foobar') as sig_T<number>)._, 1)
 	foobar__set([ctx__new(), ctx], 2)
 	equal(foobar$_([ctx__new(), ctx])._, 2)
@@ -41,7 +51,8 @@ test('be_sig_triple_|+id|+is_source_', ()=>{
 	equal(foobar$_(ctx)._, 2)
 	equal(foobar_(ctx), 2)
 	equal((ctx.get('foobar') as sig_T<number>)._, 2)
-	equal(subscriber_count, 1)
+	equal(subscriber_count, 2)
+	equal(subscriber_dep_(ctx), 4)
 })
 test('be_sig_triple_|+be', ()=>{
 	const ctx = ctx__new()

package/all/rmemo/index.js

@@ -93,9 +93,10 @@ export { memo_ as memosig_ }
  * @private
  */
 export function sig_(init_val, ...subscriber_a) {
-	return memo_(sig=>
-		'val' in sig
+	return memo_(sig=>{
+		return 'val' in sig
 			? sig.val
-			: init_val,
+			: init_val
+	},
 	...subscriber_a)
 }

package/all/rmemo/index.test.ts

@@ -142,6 +142,11 @@ test('sig_', ()=>{
 	sig._ = 'val1'
 	equal(sig(), 'val1')
 })
+test('sig_|set before read', ()=>{
+	const sig = sig_('val0')
+	sig._ = 'val1'
+	equal(sig(), 'val1')
+})
 test('sig_|undefined', ()=>{
 	const sig = sig_(undefined)
 	const memo = memo_(()=>sig())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -157,7 +157,7 @@
       "import": {
         "./rmemo": "{ sig_, memo_ }"
       },
-      "limit": "359 B"
+      "limit": "360 B"
     },
     {
       "name": "memo_ sig_ be_ ctx_",
@@ -171,7 +171,7 @@
       "import": {
         "./rmemo": "{ sig_, memo_, be_, ctx_, be_memo_pair_, be_sig_triple_ }"
       },
-      "limit": "602 B"
+      "limit": "619 B"
     }
   ],
   "scripts": {