ctx-core 4.3.1 → 4.4.0

package/all/index.d.ts

@@ -309,6 +309,7 @@ export * from './rank/index.js'
 export * from './rate_limit/index.js'
 export * from './reduce/index.js'
 export * from './reject/index.js'
+export * from './rmemo/index.js'
 export * from './remove/index.js'
 export * from './remove_idx/index.js'
 export * from './resolver_curry/index.js'

package/all/index.js

@@ -309,6 +309,7 @@ export * from './rank/index.js'
 export * from './rate_limit/index.js'
 export * from './reduce/index.js'
 export * from './reject/index.js'
+export * from './rmemo/index.js'
 export * from './remove/index.js'
 export * from './remove_idx/index.js'
 export * from './resolver_curry/index.js'

package/all/primitive/index.d.ts

@@ -1,2 +1,2 @@
 import type { nullish } from '../nullish/index.js'
-export type primitive_T = boolean|number|string|nullish
+export type primitive_T = boolean|number|bigint|string|nullish

package/all/rmemo/index.d.ts

@@ -1,23 +1,28 @@
-export declare function r_rmemo_<val_T>(
+export declare function r_rmemo_<val_T, ret_T extends rmemo_T<val_T> = r_rmemo_T<val_T>>(
 	def:rmemo_def_T<val_T>,
 	...subscriber_a:rmemo_subscriber_T<val_T>[]
-):r_rmemo_T<val_T>
+):ret_T
 export declare function rw_rmemo_<val_T>(
 	init_val:val_T,
 	...subscriber_a:rmemo_subscriber_T<val_T>[]
 ):rw_rmemo_T<val_T>
+export declare function rwr_rmemo_<val_T>(
+	def:rmemo_def_T<val_T>,
+	...subscriber_a:rmemo_subscriber_T<val_T>[]
+):rw_rmemo_T<val_T>
+export declare function rw_rmemo__set_<val_T>(rmemo:rw_rmemo_T<val_T>):val_T
+export type rmemo_T<val_T> = r_rmemo_T<val_T>|rw_rmemo_T<val_T>
 export type r_rmemo_T<val_T> = {
 	readonly _:val_T
 	val:val_T
-	get():val_T
-	go():r_rmemo_T<val_T>
+	rmr:WeakRef<()=>val_T>
+	rmrs?:Set<WeakRef<()=>val_T>>
 }
 export type rw_rmemo_T<val_T> = {
 	_:val_T
 	val:val_T
-	get():val_T
-	set(val:val_T):void
-	go():r_rmemo_T<val_T>
+	rmr:WeakRef<()=>val_T>
+	rmrs:Set<WeakRef<()=>val_T>>
 }
 export type rmemo_val_T<rw_rmemo_T> = rw_rmemo_T extends {
 		_:infer val_T

package/all/rmemo/index.js

@@ -2,9 +2,9 @@
 /** @typedef {import('./index.d.ts').r_rmemo_T} */
 /** @typedef {import('./index.d.ts').rmemo_subscriber_T} */
 /** @type {WeakRef<r_rmemo_T>} */
-let cur_r
-/** @type {(()=>unknown)[]} */
-let queue = []
+let cur_rmr
+/** @type {Set<()=>unknown>} */
+let queue = new Set
 /**
  * @param {rmemo_def_T}rmemo_def
  * @param {rmemo_subscriber_T<unknown>[]}subscriber_a
@@ -12,60 +12,80 @@ let queue = []
  * @private
  */
 export function r_rmemo_(rmemo_def, ...subscriber_a) {
-	let init
+	let refresh
+	let rmrs
 	let r_rmemo = {
 		get _() {
 			if (!('val' in r_rmemo)) {
-				let prev_r = cur_r
-				cur_r = r_rmemo._r
-				try {
-					init()
-				} finally {
-					cur_r = prev_r
-				}
+				refresh()
 			}
-			if (cur_r) {
-				cur_r.l = cur_r.l < r_rmemo._r.l + 1 ? r_rmemo._r.l + 1 : cur_r.l
-				r_rmemo._rs.add(cur_r)
+			if (cur_rmr) {
+				let cur_rmr_refresh = cur_rmr.deref()
+				cur_rmr_refresh.l =
+					cur_rmr_refresh.l < refresh.l + 1
+						? refresh.l + 1
+						: cur_rmr_refresh.l
+				rmrs.add(cur_rmr)
+				cur_rmr_refresh.s.add(r_rmemo) // conditional in rmr calls this r_memo
+				cur_rmr_refresh.S.add(r_rmemo) // prevent this rmemo from GC while cur_rmr is still active
 			}
 			return r_rmemo.val
 		},
 		set _(val) {
 			if (val !== r_rmemo.val) {
-				r_rmemo.val = val
-				// hook for rw_rmemo_
-				r_rmemo._s?.(val)
-				let run_queue = !queue[0]
-				for (let r of r_rmemo._rs) {
-					if (!~queue.indexOf(r)) queue.push(r)
-				}
-				if (!r_rmemo._sa) {
-					// add reference to subscribers to prevent GC
-					r_rmemo._sa = subscriber_a.map(subscriber=>
-						r_rmemo_(()=>subscriber(r_rmemo)).go())
+				r_rmemo.val = val // val is available for other purposes
+				let run_queue = !queue.size
+				for (let rmr of rmrs) {
+					val = rmr.deref() // val is no longer used...saving bytes
+					if (!val) {
+						rmrs.delete(rmr)
+					} else if (val.s.has(r_rmemo)) { // if conditional rmr refresh calls this r_memo, add to queue
+						queue.add(val)
+					}
 				}
+				// add reference to subscribers to prevent GC
+				r_rmemo._s ||=
+					subscriber_a.map(subscriber=>
+						r_rmemo_(subscriber$=>(
+							subscriber(r_rmemo),
+							subscriber$
+						))._)
 				if (run_queue) {
-					// eslint-disable-next-line no-cond-assign
-					for (let r; r = queue.shift();) {
-						if (queue.some(queue_r=>r.l > queue_r.l)) {
-							queue.push(r)
-						} else {
-							(r.deref() || r_rmemo._rs.delete)(r)
+					cur_refresh_loop:for (let cur_refresh of queue) {
+						queue.delete(cur_refresh)
+						for (let queue_refresh of queue) {
+							if (cur_refresh.l > queue_refresh.l) {
+								queue.add(cur_refresh)
+								continue cur_refresh_loop
+							}
 						}
+						cur_refresh()
 					}
 				}
 			}
 		},
-		go: ()=>(r_rmemo._, r_rmemo),
-		get: ()=>r_rmemo._,
-		set: val=>r_rmemo._ = val,
-		_rs: new Set,
 	}
-	init = ()=>r_rmemo._ = rmemo_def(r_rmemo)
-	r_rmemo._r = new WeakRef(init)
-	r_rmemo._r.l = 0
+	refresh = ()=>{
+		let prev_rmr = cur_rmr
+		cur_rmr = r_rmemo.rmr
+		refresh.s.clear()
+		try {
+			r_rmemo._ = rmemo_def(r_rmemo)
+		} catch (err) {
+			console.error(err)
+		}
+		cur_rmr = prev_rmr // finally is not necessary due since catch does not throw
+	}
+	refresh.l = 0
+	// rmrs = new Set
+	// r_rmemo.rmrs is kept for GC testing/debugging purposes...small size increase
+	r_rmemo.rmrs = rmrs = new Set
+	r_rmemo.rmr = new WeakRef(refresh)
+	refresh.s = new Set
+	refresh.S = new Set
 	return r_rmemo
 }
+export { r_rmemo_ as rwr_rmemo_ }
 /**
  * @param {unknown}init_val
  * @param {rmemo_subscriber_T[]}subscriber_a
@@ -73,8 +93,17 @@ export function r_rmemo_(rmemo_def, ...subscriber_a) {
  * @private
  */
 export function rw_rmemo_(init_val, ...subscriber_a) {
-	let rw_rmemo = r_rmemo_(_rw_rmemo=>_rw_rmemo._v, ...subscriber_a)
-	rw_rmemo._s = val=>rw_rmemo._v = val
-	rw_rmemo._v = init_val
-	return rw_rmemo
+	return r_rmemo_(rw_rmemo=>
+		'val' in rw_rmemo
+			? rw_rmemo.val
+			: init_val,
+	...subscriber_a)
+}
+/**
+ * @param {rw_rmemo_T}rw_rmemo
+ * @returns {(val:unknown)=>unknown}
+ * @private
+ */
+export function rw_rmemo__set_(rw_rmemo) {
+	return val=>rw_rmemo._ = val
 }

package/all/rmemo/index.test.ts

@@ -1,8 +1,10 @@
+// Reference: https://github.com/nanostores/nanostores/blob/main/computed/index.test.ts
+// Reference: https://github.com/vanjs-org/van/blob/main/test/van.test.ts
 import { deepStrictEqual } from 'node:assert'
 import { test } from 'uvu'
 import { equal } from 'uvu/assert'
 import { sleep } from '../sleep/index.js'
-import { r_rmemo_, type r_rmemo_T, rw_rmemo_ } from './index.js'
+import { r_rmemo_, type r_rmemo_T, rw_rmemo_, rwr_rmemo_ } from './index.js'
 test('r_rmemo_|static value', ()=>{
 	let count = 0
 	const r_rmemo = r_rmemo_(()=>{
@@ -15,15 +17,9 @@ test('r_rmemo_|static value', ()=>{
 	equal(r_rmemo._, 'rmemo-value')
 	equal(count, 1)
 })
-test('rw_rmemo_', ()=>{
-	const rw_rmemo = rw_rmemo_('val0')
-	equal(rw_rmemo._, 'val0')
-	rw_rmemo._ = 'val1'
-	equal(rw_rmemo._, 'val1')
-})
-test('r_rmemo_|def function|rmemo$ argument', ()=>{
+test('r_rmemo_|def function|rmemo argument', ()=>{
 	const rw_rmemo = rw_rmemo_('val0')
-	const r_rmemo:r_rmemo_T<string>&{custom?:string} = r_rmemo_<string>((_rmemo$:r_rmemo_T<string>&{custom?:string})=>
+	const r_rmemo:r_rmemo_T<string>&{ custom?:string } = r_rmemo_<string>((_rmemo$:r_rmemo_T<string>&{ custom?:string })=>
 		`${_rmemo$.custom}-${rw_rmemo._}`)
 	r_rmemo.custom = 'custom_val0'
 	equal(r_rmemo._, 'custom_val0-val0')
@@ -32,6 +28,113 @@ test('r_rmemo_|def function|rmemo$ argument', ()=>{
 	rw_rmemo._ = 'val1'
 	equal(r_rmemo._, 'custom_val1-val1')
 })
+test('r_memo_|side effect', ()=>{
+	const history:string[] = []
+	const s = rw_rmemo_('This')
+	r_rmemo_(()=>history.push(s._))._
+	s._ = 'is'
+	s._ = 'a'
+	s._ = 'test'
+	s._ = 'test'
+	equal(history, ['This', 'is', 'a', 'test'])
+})
+test('r_rmemo_|conditional', ()=>{
+	const cond$ = rw_rmemo_(true)
+	const a$ = rw_rmemo_(1)
+	const b$ = rw_rmemo_(2)
+	const c$ = rw_rmemo_(3)
+	const d$ = rw_rmemo_(4)
+	let trigger_count = 0
+	const sum$ = r_rmemo_(()=>(++trigger_count, cond$._ ? a$._ + b$._ : c$._ + d$._))
+	equal(sum$._, 3)
+	equal(trigger_count, 1)
+	a$._ = 11
+	equal(sum$._, 13)
+	equal(trigger_count, 2)
+	b$._ = 12
+	equal(sum$._, 23)
+	equal(trigger_count, 3)
+	// Changing c$ or d$ won't triggered the effect as they're not its current dependencies
+	c$._ = 13
+	equal(sum$._, 23)
+	equal(trigger_count, 3)
+	d$._ = 14
+	equal(sum$._, 23)
+	equal(trigger_count, 3)
+	cond$._ = false
+	equal(sum$._, 27)
+	equal(trigger_count, 4)
+	c$._ = 23
+	equal(sum$._, 37)
+	equal(trigger_count, 5)
+	d$._ = 24
+	equal(sum$._, 47)
+	equal(trigger_count, 6)
+	// Changing a$ or b$ won't triggered the effect as they're not its current dependencies
+	a$._ = 21
+	equal(sum$._, 47)
+	equal(trigger_count, 6)
+	b$._ = 22
+	equal(sum$._, 47)
+	equal(trigger_count, 6)
+})
+test('rwr_rmemo_', ()=>{
+	const num_items$ = rw_rmemo_(0)
+	const items$ = r_rmemo_(()=>[...Array(num_items$._).keys()].map(i=>`Item ${i + 1}`))
+	const selected_index$ = rwr_rmemo_(()=>(items$._, 0))
+	const selected_item$ = r_rmemo_(()=>items$._[selected_index$._])
+	num_items$._ = 3
+	equal(num_items$._, 3)
+	equal(items$._.join(','), 'Item 1,Item 2,Item 3')
+	equal(selected_index$._, 0)
+	equal(selected_item$._, 'Item 1')
+	selected_index$._ = 2
+	equal(selected_index$._, 2)
+	equal(selected_item$._, 'Item 3')
+	num_items$._ = 5
+	equal(num_items$._, 5)
+	equal(items$._.join(','), 'Item 1,Item 2,Item 3,Item 4,Item 5')
+	equal(selected_index$._, 0)
+	equal(selected_item$._, 'Item 1')
+	selected_index$._ = 3
+	equal(selected_index$._, 3)
+	equal(selected_item$._, 'Item 4')
+})
+test('r_rmemo_|error|case 1', ()=>{
+	const r$ = r_rmemo_(()=>{
+		throw new Error('error case')
+	})
+	equal(r$._, undefined)
+})
+test('r_rmemo_|error|case 2', ()=>{
+	const rw0 = rw_rmemo_(1)
+	const r1 = r_rmemo_(()=>rw0._ * 2)
+	const r2 = r_rmemo_(()=>{
+		if (rw0._ > 1) throw new Error()
+		return rw0._
+	})
+	const r3 = r_rmemo_(()=>rw0._ * rw0._)
+	equal(r1._, 2)
+	equal(r2._, 1)
+	equal(r3._, 1)
+	rw0._ = 3
+	equal(r1._, 6)
+	// r2._ keeps it's old value of 1 due to error
+	equal(r2._, 1)
+	equal(r3._, 9)
+})
+test('rw_rmemo_', ()=>{
+	const rw_rmemo = rw_rmemo_('val0')
+	equal(rw_rmemo._, 'val0')
+	rw_rmemo._ = 'val1'
+	equal(rw_rmemo._, 'val1')
+})
+test('rw_rmemo_|undefined', ()=>{
+	const rw_rmemo = rw_rmemo_(undefined)
+	const r_rmemo = r_rmemo_(()=>rw_rmemo._)
+	equal(rw_rmemo._, undefined)
+	equal(r_rmemo._, undefined)
+})
 test('rw_rmemo_|async subsubscriber|case 1', async ()=>{
 	let resolve:(user:{ id:string })=>void
 	const user0 = { id: 'id-0' }
@@ -125,7 +228,7 @@ test('prevents diamond dependency problem 1', ()=>{
 	r_rmemo_(()=>`${b$._}${c$._}${d$._}`,
 		combined$=>
 			values.push(combined$._)
-	).go()
+	)._
 	deepStrictEqual(values, ['b0c0d0'])
 	store$._ = 1
 	store$._ = 2
@@ -142,7 +245,7 @@ test('prevents diamond dependency problem 2', ()=>{
 	r_rmemo_<string>(
 		()=>[a$._, e$._].join(''),
 		$=>values.push($._)
-	).go()
+	)._
 	deepStrictEqual(values, ['a0e0'])
 	store$._ = 1
 	deepStrictEqual(values, ['a0e0', 'a1e1'])
@@ -157,7 +260,7 @@ test('prevents diamond dependency problem 3', ()=>{
 	r_rmemo_<string>(
 		()=>`${a$._}${b$._}${c$._}${d$._}`,
 		combined$=>values.push(combined$._)
-	).go()
+	)._
 	deepStrictEqual(values, ['a0b0c0d0'])
 	store$._ = 1
 	deepStrictEqual(values, ['a0b0c0d0', 'a1b1c1d1'])
@@ -176,11 +279,11 @@ test('autosubscribe: prevents diamond dependency problem 4 (complex)', ()=>{
 	r_rmemo_(
 		()=>e$._,
 		combined1$=>values.push(combined1$._)
-	).go()
+	)._
 	r_rmemo_(
 		()=>[e$._, g$._].join(''),
 		combined2$=>values.push(combined2$._)
-	).go()
+	)._
 	deepStrictEqual(values, ['eca0b0da0', 'eca0b0da0gfeca0b0da0'])
 	store1$._ = 1
 	store2$._ = 2
@@ -231,7 +334,7 @@ test('prevents diamond dependency problem 6', ()=>{
 	r_rmemo_(
 		()=>`${a$._}${c$._}`,
 		combined$=>values.push(combined$._)
-	).go()
+	)._
 	deepStrictEqual(values, ['a0c0'])
 	store1$._ = 1
 	deepStrictEqual(values, ['a0c0', 'a1c0'])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -107,14 +107,14 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.1",
     "@size-limit/preset-small-lib": "^11.0.0",
-    "@types/node": "^20.9.3",
+    "@types/node": "^20.9.4",
     "@types/sinon": "^17.0.2",
     "c8": "^8.0.1",
     "check-dts": "^0.7.2",
     "sinon": "^17.0.1",
     "size-limit": "^11.0.0",
     "ts-node": "^10.9.1",
-    "tsx": "^4.2.0",
+    "tsx": "^4.3.0",
     "typescript": "next",
     "uvu": "^0.5.6"
   },
@@ -150,28 +150,28 @@
       "import": {
         "./rmemo": "{ r_rmemo_ }"
       },
-      "limit": "289 B"
+      "limit": "298 B"
     },
     {
-      "name": "r_rmemo_ signal_",
+      "name": "r_rmemo_ rw_rmemo_",
       "import": {
         "./rmemo": "{ rw_rmemo_, r_rmemo_ }"
       },
       "limit": "318 B"
     },
     {
-      "name": "r_rmemo_ signal_ be_ ctx_",
+      "name": "r_rmemo_ rw_rmemo_ be_ ctx_",
       "import": {
         "./rmemo": "{ rw_rmemo_, r_rmemo_, be_, ctx_ }"
       },
-      "limit": "475 B"
+      "limit": "478 B"
     },
     {
-      "name": "r_rmemo_ signal_ be_ ctx_ be_r_rmemo_pair_ be_rw_rmemo_triple_",
+      "name": "r_rmemo_ rw_rmemo_ be_ ctx_ be_r_rmemo_pair_ be_rw_rmemo_triple_",
       "import": {
         "./rmemo": "{ rw_rmemo_, r_rmemo_, be_, ctx_, be_r_rmemo_pair_, be_rw_rmemo_triple_ }"
       },
-      "limit": "557 B"
+      "limit": "571 B"
     }
   ],
   "scripts": {

package/rmemo/index.d.ts

@@ -1,3 +1,4 @@
+export { rw_rmemo__set_ as set_ } from '../all/rmemo/index.js'
 export * from '../all/be_/index.js'
 export * from '../all/be_r_rmemo_pair/index.js'
 export * from '../all/be_rw_rmemo_triple/index.js'