more-proms 1.9.1 → 1.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4,10 +4,10 @@ type P<Args extends unknown[], Ret> = {
|
|
|
4
4
|
} & ((...a: Args) => (CancelAblePromise<Ret> | Promise<Ret> | undefined));
|
|
5
5
|
export declare function latestLatent<Args extends unknown[], Ret>(cb: (...args: Args) => (CancelAblePromise<Ret> | Promise<Ret> | undefined)): P<Args, Ret>;
|
|
6
6
|
export declare function execQueue(defaultOptions?: {
|
|
7
|
-
skipAble?: boolean;
|
|
7
|
+
skipAble?: boolean | (() => void);
|
|
8
8
|
cancelVal?: any;
|
|
9
9
|
continueOnError?: boolean;
|
|
10
|
-
}): <T, FR extends Promise<T> | CancelAblePromise<T, string, string | void | Promise<any>>>(f: () => FR, options?: typeof defaultOptions | boolean, cancelPrevIfPossible?: boolean) => FR;
|
|
10
|
+
}): <T, FR extends Promise<T> | CancelAblePromise<T, string, string | void | Promise<any>>>(f: () => FR, options?: typeof defaultOptions | boolean | (() => void), cancelPrevIfPossible?: boolean) => FR;
|
|
11
11
|
export declare class SyncPromise<T = unknown> {
|
|
12
12
|
private thenListener;
|
|
13
13
|
private catchListener;
|
|
@@ -65,7 +65,11 @@ function execQueue(defaultOptions = {
|
|
|
65
65
|
if (wantToCancelUntil === ob)
|
|
66
66
|
wantToCancelUntil = undefined;
|
|
67
67
|
const wantToCancelThis = wantToCancelUntil !== undefined;
|
|
68
|
-
if (
|
|
68
|
+
if (wantToCancelThis && skipAble) {
|
|
69
|
+
if (skipAble instanceof Function)
|
|
70
|
+
skipAble();
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
69
73
|
const prom = curFP = f();
|
|
70
74
|
curCancelVal = cancelVal;
|
|
71
75
|
const localPromsToContinue = [];
|
|
@@ -88,7 +92,7 @@ function execQueue(defaultOptions = {
|
|
|
88
92
|
running = false;
|
|
89
93
|
}
|
|
90
94
|
return (f, options = defaultOptions, cancelPrevIfPossible = false) => {
|
|
91
|
-
options = typeof options
|
|
95
|
+
options = typeof options !== "object" ? { ...defaultOptions, ...{ skipAble: options } } : { ...defaultOptions, ...options };
|
|
92
96
|
const p = new CancelAblePromise(() => { }, (cVal) => {
|
|
93
97
|
// on cancel
|
|
94
98
|
if (cancelDataStore !== undefined)
|
|
@@ -4,10 +4,10 @@ type P<Args extends unknown[], Ret> = {
|
|
|
4
4
|
} & ((...a: Args) => (CancelAblePromise<Ret> | Promise<Ret> | undefined));
|
|
5
5
|
export declare function latestLatent<Args extends unknown[], Ret>(cb: (...args: Args) => (CancelAblePromise<Ret> | Promise<Ret> | undefined)): P<Args, Ret>;
|
|
6
6
|
export declare function execQueue(defaultOptions?: {
|
|
7
|
-
skipAble?: boolean;
|
|
7
|
+
skipAble?: boolean | (() => void);
|
|
8
8
|
cancelVal?: any;
|
|
9
9
|
continueOnError?: boolean;
|
|
10
|
-
}): <T, FR extends Promise<T> | CancelAblePromise<T, string, string | void | Promise<any>>>(f: () => FR, options?: typeof defaultOptions | boolean, cancelPrevIfPossible?: boolean) => FR;
|
|
10
|
+
}): <T, FR extends Promise<T> | CancelAblePromise<T, string, string | void | Promise<any>>>(f: () => FR, options?: typeof defaultOptions | boolean | (() => void), cancelPrevIfPossible?: boolean) => FR;
|
|
11
11
|
export declare class SyncPromise<T = unknown> {
|
|
12
12
|
private thenListener;
|
|
13
13
|
private catchListener;
|
|
@@ -62,7 +62,11 @@ export function execQueue(defaultOptions = {
|
|
|
62
62
|
if (wantToCancelUntil === ob)
|
|
63
63
|
wantToCancelUntil = undefined;
|
|
64
64
|
const wantToCancelThis = wantToCancelUntil !== undefined;
|
|
65
|
-
if (
|
|
65
|
+
if (wantToCancelThis && skipAble) {
|
|
66
|
+
if (skipAble instanceof Function)
|
|
67
|
+
skipAble();
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
66
70
|
const prom = curFP = f();
|
|
67
71
|
curCancelVal = cancelVal;
|
|
68
72
|
const localPromsToContinue = [];
|
|
@@ -85,7 +89,7 @@ export function execQueue(defaultOptions = {
|
|
|
85
89
|
running = false;
|
|
86
90
|
}
|
|
87
91
|
return (f, options = defaultOptions, cancelPrevIfPossible = false) => {
|
|
88
|
-
options = typeof options
|
|
92
|
+
options = typeof options !== "object" ? { ...defaultOptions, ...{ skipAble: options } } : { ...defaultOptions, ...options };
|
|
89
93
|
const p = new CancelAblePromise(() => { }, (cVal) => {
|
|
90
94
|
// on cancel
|
|
91
95
|
if (cancelDataStore !== undefined)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "more-proms",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.2",
|
|
4
4
|
"description": "A collection of additional promise extending classes. Including a (from the outside) ResablePromise, CancelAblePromise and a latestLatent utility function.",
|
|
5
5
|
"main": "./app/dist/esm/moreProms.mjs",
|
|
6
6
|
"types": "./app/dist/esm/moreProms.d.ts",
|