ctx-core 6.7.1 → 6.8.1

package/README.md

@@ -2,8 +2,6 @@
 
 The ctx-core library is a 0 dependency library with several exports to support general app development. This library has several exports to limit what is loaded into memory & to make tree-shaking less intensive. Some of the underlying functions are in multiple exports. The full list of exports is below. There is varying comprehensiveness & usage for these functions.
 
-
-
 ## Development Monorepo
 
 The [development monorepo](https://github.com/ctx-core/dev) used to have the ctx-core/ctx-core project name but has been moved to make room for this package.
@@ -117,3 +115,5 @@ The docs for rmemo are in https://github.com/ctx-core/rmemo. Since the source fo
 ## ctx-core/uri
 
 ## ctx-core/uuid
+
+## ctx-core/web_animation

package/all/atob/index.browser.js

@@ -1 +1,12 @@
-export * from './index.js'
+/**
+ * @param {string}str
+ * @returns {string}
+ */
+export const atob = globalThis.atob
+/**
+ * @return {typeof atob}
+ */
+export function atob_() {
+	return atob
+}
+export { atob_ as _atob, }

package/all/btoa/index.browser.js

@@ -1 +1,12 @@
-export * from './index.js'
+/**
+ * @param {string}str
+ * @returns {string}
+ */
+export const btoa = globalThis.btoa
+/**
+ * @return {typeof btoa}
+ */
+export function btoa_() {
+	return btoa
+}
+export { btoa_ as _btoa, }

package/all/btoa/index.js

@@ -8,7 +8,7 @@ export function btoa(str) {
 	return (
 		process_release_name
 			? new Buffer(str).toString('base64')
-			: window.btoa(str)
+			: globalThis.btoa(str)
 	)
 }
 /**

package/all/rmemo/index.d.ts

@@ -42,11 +42,9 @@ export type sig_T<val_T, E = unknown> = (()=>val_T)&{
 	_:val_T
 	readonly a?:rmemo_a_T
 	readonly f?:rmemo_f_T
-	readonly s?:rmemo_r_T
-	readonly t:rmemo_r_T[]
 	readonly l:number
-	readonly u:rmemo_T<unknown>[]
-	readonly v:rmemo_T<unknown>[]
+	readonly t:rmemo_T<unknown>[]
+	readonly i:rmemo_T<unknown>[]
 	readonly val:val_T
 	add<add_val_T>(fn:rmemo_add_def_T<val_T, add_val_T>):sig_T<val_T, E>
 	memo_<_val_T, E = unknown>(def:memo_def_T<_val_T>):memo_T<_val_T, E>
@@ -66,9 +64,5 @@ export type rmemo_val_T<sig_T> = sig_T extends { ():infer val_T }
 export type memo_def_T<val_T, E = unknown> = (sig:sig_T<val_T, E>)=>val_T
 export type rmemo_a_T = unknown[]
 export type rmemo_add_def_T<val_T, add_val_T, E = unknown> = (sig:sig_T<val_T, E>)=>add_val_T
-export type rmemo_f_T = (()=>void)&{
-	readonly l:number
-	readonly s:rmemo_T<unknown>[]
-	readonly t:rmemo_T<unknown>[]
-}
+export type rmemo_f_T = (()=>void)
 export type rmemo_r_T = WeakRef<rmemo_f_T>&{ readonly d?: ()=>rmemo_f_T }

package/all/rmemo/index.js

@@ -12,20 +12,19 @@ let $ = globalThis.__rmemo__ ??= { q: new Set }
  * @private
  */
 export function memo_(memo_def, ...add_def_a) {
+	let t = []
 	/** @type {memo_T} */
 	let memo = ()=>{
-		if (!('val' in memo)) {
-			memo.f()
-		}
+		'val' in memo || memo.f()
 		if ($.c) {
-			if (!memo.t.includes($.c.s ??= new WeakRef($.c.f))) {
-				memo.t.push($.c.s)
+			if (!t.includes($.c.r ??= new WeakRef($.c))) {
+				t.push($.c.r)
 			}
-			if ($.c.f.l < memo.f.l + 1) $.c.f.l = memo.f.l + 1
+			if ($.c.l < memo.l + 1) $.c.l = memo.l + 1
 			// memo is called by $.c's conditional execution...next change to memo will notify $.c
-			$.c.f.s.push(memo)
+			$.c.t.push(memo)
 			// prevent memo from GC while $.c still has a strong reference
-			if (!$.c.f.t.includes(memo)) $.c.f.t.push(memo)
+			if (!$.c.i.includes(memo)) $.c.i.push(memo)
 		}
 		return memo.val
 	}
@@ -33,9 +32,9 @@ export function memo_(memo_def, ...add_def_a) {
 		get: memo,
 		set: val=>{
 			if (memo.val !== val) {
-				memo.t = memo.t.filter(r=>{
+				t = t.filter(r=>{
 					r = r.deref()
-					if (r?.s.includes(memo)) { // if added by $.c.f.s.push(memo), add to $.q
+					if (r?.t.includes(memo)) { // if added by $.c.t.push(memo), add to $.q
 						$.q.add(r)
 					}
 					return r
@@ -54,7 +53,7 @@ export function memo_(memo_def, ...add_def_a) {
 						continue cur_refresh_loop
 					}
 				}
-				cur_refresh()
+				cur_refresh.f()
 			}
 		},
 	})
@@ -78,7 +77,7 @@ export function memo_(memo_def, ...add_def_a) {
 	memo.f = ()=>{
 		let prev_memo = $.c
 		$.c = memo
-		memo.f.s = [] // reset references in memo_def conditional execution path...see $.c.f.s.push(memo)
+		memo.t = [] // reset references in memo_def conditional execution path...see $.c.t.push(memo)
 		try {
 			memo._ = memo_def(memo)
 		} catch (err) {
@@ -86,10 +85,9 @@ export function memo_(memo_def, ...add_def_a) {
 		}
 		$.c = prev_memo // catch does not throw
 	}
-	memo.f.l = 0
-	memo.f.s = []
-	memo.f.t = []
+	memo.l = 0
 	memo.t = []
+	memo.i = []
 	return memo
 }
 export { memo_ as memosig_ }
@@ -155,8 +153,8 @@ export function memo__bind(fn) {
  */
 export function rmemo__on(rmemo, off_fn) {
 	if (off_fn) rmemo__off__add(rmemo, off_fn)
-	if (rmemo.s?.d) {
-		rmemo.s.deref = rmemo.s.d
+	if (rmemo.r?.d) {
+		rmemo.r.deref = rmemo.r.d
 	}
 	rmemo.f()
 	return rmemo
@@ -167,9 +165,9 @@ export function rmemo__on(rmemo, off_fn) {
  * @returns {rmemo_T}
  */
 export function rmemo__off(rmemo) {
-	if (rmemo.s) {
-		rmemo.s.d ??= rmemo.s.deref
-		rmemo.s.deref = ()=>{
+	if (rmemo.r) {
+		rmemo.r.d ??= rmemo.r.deref
+		rmemo.r.deref = ()=>{
 		}
 	}
 	for (let a_o of rmemo.a ?? []) {

package/all/rmemo__wait/index.test.ts

@@ -8,7 +8,7 @@ test('rmemo__wait|rmemo', async ()=>{
 		subject$,
 		subject=>subject >= 0,
 		10_000)
-	equal(promise.m.t, [])
+	// equal(promise.m.t, [])
 	equal(subject$(), -1)
 	subject$._ = 1
 	equal(subject$(), 1)
@@ -21,7 +21,7 @@ test('rmemo__wait|rmemolike', async ()=>{
 		()=>subject$(),
 		subject=>subject >= 0,
 		10_000)
-	equal(promise.m.t, [])
+	// equal(promise.m.t, [])
 	equal(subject$(), -1)
 	subject$._ = 1
 	equal(subject$(), 1)

package/all/wanimato/index.browser.d.ts

@@ -0,0 +1 @@
+export * from './index.js'

package/all/wanimato/index.browser.js

@@ -0,0 +1 @@
+export * from './index.js'

package/all/wanimato/index.d.ts

@@ -0,0 +1,15 @@
+import type { nullish } from '../nullish/index.js'
+import type { sig_T } from '../rmemo/index.js'
+export declare function wanimato__new<E extends Element>(
+	$:sig_T<wanimato_T|nullish>,
+	el:E,
+	animation_:(el:E)=>Animation
+):wanimato_T
+export type wanimato_T = {
+	animation:Animation
+	el:Element
+	is_play:boolean
+	is_finish:boolean
+	finish_currentTime:number|null
+	is_remove:boolean
+}

package/all/wanimato/index.js

@@ -0,0 +1,128 @@
+/**
+ * @param {sig_T<wanimato_T|nullish>}$
+ * @param {Element}el
+ * @param {(el:Element)=>Animation}animation_
+ * @returns {wanimato_T}
+ */
+export function wanimato__new($, el, animation_) {
+	if ($.val?.el === el) return $.val
+	let _animation = animation_(el)
+	_animation.addEventListener('finish', ()=>{
+		$._ = {
+			...$(),
+			is_finish: true,
+			finish_currentTime: $().animation.currentTime
+		}
+	})
+	_animation.addEventListener('remove', ()=>{
+		$._ = {
+			...$(),
+			is_remove: true
+		}
+	})
+	let play_state__ensure = ()=>{
+		if ($().is_play !== true || $().is_finish !== false) {
+			$._ = {
+				...$(),
+				is_play: true,
+				is_finish: false
+			}
+		}
+	}
+	let begin_state__ensure__setTimeout = ()=>{
+		setTimeout(
+			()=>{
+				if ($().is_play !== !!_animation.currentTime || $().is_finish !== false) {
+					$._ = {
+						...$(),
+						is_play: !!_animation.currentTime,
+						is_finish: false,
+					}
+				}
+			},
+			_animation.currentTime / -_animation.playbackRate)
+	}
+	let animation_mixin = {
+		play() {
+			if (_animation.playbackRate < 0) {
+				this.reverse()
+			} else {
+				_animation.play()
+				play_state__ensure()
+				if (_animation.playbackRate < 0) {
+					begin_state__ensure__setTimeout()
+				}
+			}
+		},
+		reverse() {
+			_animation.reverse()
+			play_state__ensure()
+			begin_state__ensure__setTimeout()
+		},
+		finish() {
+			_animation.finish()
+			if ($().is_play !== false || $().is_finish !== !!_animation.currentTime) {
+				$._ = {
+					...$(),
+					is_play: false,
+					is_finish: !!_animation.currentTime
+				}
+			}
+		},
+		cancel() {
+			_animation.cancel()
+			if ($().is_play !== false || $().is_finish !== false) {
+				$._ = {
+					...$(),
+					is_play: false,
+					is_finish: false
+				}
+			}
+		},
+		updatePlaybackRate(playbackRate) {
+			_animation.updatePlaybackRate(playbackRate)
+			_animation.ready
+				.then(()=>{
+					if (_animation.playbackRate < 0) {
+						begin_state__ensure__setTimeout()
+					}
+				})
+		},
+		addEventListener(...arg_a) {
+			_animation.addEventListener(...arg_a)
+		},
+		removeEventListener(...arg_a) {
+			_animation.removeEventListener(...arg_a)
+		},
+	}
+	return {
+		el,
+		animation: new Proxy(_animation, {
+			get(_animation, /** @type {keyof Animation} */prop) {
+				return animation_mixin[prop] ?? _animation[prop]
+			},
+			set(
+				_animation,
+				/** @type {keyof Omit<Animation, 'finished'|'pending'|'playState'|'ready'|'replaceState'>} */
+				prop,
+				val
+			) {
+				if (prop === 'playbackRate') {
+					if (_animation[prop] === val) return false
+					_animation[prop] = val
+					if (val < 0) {
+						begin_state__ensure__setTimeout()
+					}
+					return true
+				}
+				if (_animation[prop] === val) return false
+				_animation[prop] = val
+				return true
+			}
+		}),
+		is_play: true,
+		is_finish: false,
+		finish_currentTime: null,
+		is_remove: false,
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "6.7.1",
+  "version": "6.8.1",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",
@@ -82,6 +82,7 @@
     "types",
     "uri",
     "uuid",
+    "web_animation",
     "package.json"
   ],
   "exports": {
@@ -298,6 +299,10 @@
       "browser": "./uuid/index.browser.js",
       "default": "./uuid/index.js"
     },
+    "./web_animation": {
+      "browser": "./web_animation/index.browser.js",
+      "default": "./web_animation/index.js"
+    },
     "./package.json": "./package.json"
   },
   "devDependencies": {
@@ -369,28 +374,28 @@
       "import": {
         "./rmemo": "{ memo_ }"
       },
-      "limit": "376 B"
+      "limit": "377 B"
     },
     {
       "name": "memo_ sig_",
       "import": {
         "./rmemo": "{ sig_, memo_ }"
       },
-      "limit": "395 B"
+      "limit": "393 B"
     },
     {
       "name": "memo_ sig_ be_ ctx_",
       "import": {
         "./rmemo": "{ sig_, memo_, be_, ctx_ }"
       },
-      "limit": "498 B"
+      "limit": "499 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": "591 B"
+      "limit": "587 B"
     },
     {
       "name": "class_",
@@ -419,6 +424,13 @@
         "./uuid": "{ uuid__compact }"
       },
       "limit": "107 B"
+    },
+    {
+      "name": "web_animation",
+      "import": {
+        "./web_animation": "{ memo_, wanimato__new }"
+      },
+      "limit": "728 B"
     }
   ],
   "scripts": {

package/web_animation/index.browser.d.ts

@@ -0,0 +1 @@
+export * from '../all/wanimato/index.js'

package/web_animation/index.browser.js

@@ -0,0 +1 @@
+export * from '../all/wanimato/index.js'

package/web_animation/index.d.ts

@@ -0,0 +1,2 @@
+export * from '../rmemo/index.js'
+export * from '../all/wanimato/index.js'

package/web_animation/index.js

@@ -0,0 +1,2 @@
+export * from '../rmemo/index.js'
+export * from '../all/wanimato/index.js'