ctx-core 5.7.0 → 5.8.0

package/all/promise_timeout/index.d.ts

@@ -2,4 +2,4 @@ export declare function promise_timeout<O>(
 	promise:(()=>Promise<O>)|Promise<O>,
 	ms:number,
 	error?:Error
-):Promise<O>
+):Promise<O>&{ cancel:(val:O)=>void }

package/all/promise_timeout/index.js

@@ -4,7 +4,7 @@
  * @param {Error}[error]
  * @returns {Promise<unknown>}
  */
-export async function promise_timeout(
+export function promise_timeout(
 	promise,
 	ms,
 	error
@@ -14,11 +14,16 @@ export async function promise_timeout(
 	let timeout = new Promise((_resolve, reject)=>{
 		id = setTimeout(()=>reject(error), ms)
 	})
-	return Promise.race([
+	let cancel_promise__resolve
+	let cancel_promise = new Promise(resolve=>cancel_promise__resolve = resolve)
+	let ret_promise = Promise.race([
 		typeof promise === 'function' ? promise() : promise,
-		timeout
+		timeout,
+		cancel_promise,
 	]).then(result=>{
 		clearTimeout(id)
 		return result
 	})
+	ret_promise.cancel = cancel_promise__resolve
+	return ret_promise
 }

package/all/promise_timeout/index.test.ts

@@ -29,4 +29,11 @@ test('promise_timeout|timeout', async ()=>{
 	equal(count, 1)
 	equal(err?.message, 'Timeout 1ms')
 })
+test('promise_timeout|cancel|arg', async ()=>{
+	const promise = promise_timeout(
+		new Promise<number>(()=>{}),
+		1000)
+	promise.cancel(5)
+	equal(await promise, 5)
+})
 test.run()

package/all/rmemo__wait/index.d.ts

@@ -9,4 +9,5 @@ export declare function rmemo__wait<
 ):Promise<rmemo_val_T<_rmemo_T>>&{
 	// prevent early usGC
 	m:memo_T<unknown>
+	cancel:(val:rmemo_val_T<_rmemo_T>)=>void
 }

package/all/rmemo__wait/index.js

@@ -1,6 +1,5 @@
 /// <reference types="../rmemo/index.d.ts" />
 /// <reference types="./index.d.ts" />
-import { isNumber_ } from '../isNumber/index.js'
 import { promise_timeout } from '../promise_timeout/index.js'
 import { memo_ } from '../rmemo/index.js'
 /**
@@ -26,9 +25,10 @@ export function rmemo__wait(
 		memo()
 	})
 	let promise =
-		isNumber_(timeout)
-			? promise_timeout(_subscribe_wait, timeout, error)
-			: _subscribe_wait
+		promise_timeout(
+			_subscribe_wait,
+			timeout ?? Infinity,
+			error)
 	// prevent GC
 	promise.m = memo
 	return promise

package/all/rmemo__wait/index.test.ts

@@ -15,4 +15,13 @@ test('rmemo__wait', async ()=>{
 	await promise
 	equal(subject$(), 1)
 })
+test('rmemo__wait|cancel', async ()=>{
+	const subject$ = sig_(-1)
+	const promise = rmemo__wait(
+		subject$,
+		subject=>subject >= 0,
+		10_000)
+	promise.cancel(500)
+	equal(await promise, 500)
+})
 test.run()

package/all/waitfor/index.d.ts

@@ -2,4 +2,4 @@ export declare function waitfor<V>(
 	fn:()=>Promise<V>|V,
 	timeout:number,
 	period?:number
-):Promise<V>&{ cancel: ()=>Promise<V> }
+):Promise<V>&{ cancel:()=>Promise<V> }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-core",
-  "version": "5.7.0",
+  "version": "5.8.0",
   "description": "ctx-core core library",
   "keywords": [
     "ctx-core",