@darajs/core 1.21.0 → 1.21.1
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.
- package/dist/api/core.d.ts +8 -1
- package/dist/api/core.d.ts.map +1 -1
- package/dist/api/core.js +4 -1
- package/dist/api/core.js.map +1 -1
- package/dist/components/link.d.ts +1 -1
- package/dist/components/link.d.ts.map +1 -1
- package/dist/components/link.js +49 -5
- package/dist/components/link.js.map +1 -1
- package/dist/{dara_core-1.21.0-py3-none-any.whl → dara_core-1.21.1-py3-none-any.whl} +0 -0
- package/dist/router/cache.d.ts +19 -0
- package/dist/router/cache.d.ts.map +1 -0
- package/dist/router/cache.js +56 -0
- package/dist/router/cache.js.map +1 -0
- package/dist/router/context.d.ts +17 -0
- package/dist/router/context.d.ts.map +1 -0
- package/dist/router/context.js +21 -0
- package/dist/router/context.js.map +1 -0
- package/dist/router/create-router.d.ts +22 -0
- package/dist/router/create-router.d.ts.map +1 -0
- package/dist/{shared/router.js → router/create-router.js} +24 -13
- package/dist/router/create-router.js.map +1 -0
- package/dist/router/fetching.d.ts +115 -0
- package/dist/router/fetching.d.ts.map +1 -0
- package/dist/router/fetching.js +280 -0
- package/dist/router/fetching.js.map +1 -0
- package/dist/router/index.d.ts +7 -0
- package/dist/router/index.d.ts.map +1 -0
- package/dist/router/index.js +7 -0
- package/dist/router/index.js.map +1 -0
- package/dist/router/route-content.d.ts +16 -0
- package/dist/router/route-content.d.ts.map +1 -0
- package/dist/router/route-content.js +112 -0
- package/dist/router/route-content.js.map +1 -0
- package/dist/router/router-root.d.ts +7 -0
- package/dist/router/router-root.d.ts.map +1 -0
- package/dist/router/router-root.js +15 -0
- package/dist/router/router-root.js.map +1 -0
- package/dist/run.d.ts +12 -1
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +9 -16
- package/dist/run.js.map +1 -1
- package/dist/shared/interactivity/derived-variable.d.ts +62 -17
- package/dist/shared/interactivity/derived-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/derived-variable.js +162 -96
- package/dist/shared/interactivity/derived-variable.js.map +1 -1
- package/dist/shared/interactivity/persistence.js +2 -2
- package/dist/shared/interactivity/persistence.js.map +1 -1
- package/dist/shared/interactivity/plain-variable.js +2 -2
- package/dist/shared/interactivity/plain-variable.js.map +1 -1
- package/dist/shared/interactivity/store.d.ts +0 -1
- package/dist/shared/interactivity/store.d.ts.map +1 -1
- package/dist/shared/interactivity/store.js.map +1 -1
- package/dist/shared/interactivity/tabular-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/tabular-variable.js +5 -2
- package/dist/shared/interactivity/tabular-variable.js.map +1 -1
- package/dist/shared/interactivity/triggers.d.ts +7 -2
- package/dist/shared/interactivity/triggers.d.ts.map +1 -1
- package/dist/shared/interactivity/triggers.js +15 -2
- package/dist/shared/interactivity/triggers.js.map +1 -1
- package/dist/shared/interactivity/use-server-component.d.ts +4 -1
- package/dist/shared/interactivity/use-server-component.d.ts.map +1 -1
- package/dist/shared/interactivity/use-server-component.js +107 -38
- package/dist/shared/interactivity/use-server-component.js.map +1 -1
- package/dist/shared/interactivity/use-variable.js +1 -1
- package/dist/shared/interactivity/use-variable.js.map +1 -1
- package/dist/shared/root/authenticated-root.js +1 -1
- package/dist/shared/root/authenticated-root.js.map +1 -1
- package/dist/shared/utils/deferred.d.ts +10 -0
- package/dist/shared/utils/deferred.d.ts.map +1 -0
- package/dist/shared/utils/deferred.js +13 -0
- package/dist/shared/utils/deferred.js.map +1 -0
- package/dist/shared/utils/index.d.ts +1 -0
- package/dist/shared/utils/index.d.ts.map +1 -1
- package/dist/shared/utils/index.js +1 -0
- package/dist/shared/utils/index.js.map +1 -1
- package/dist/types/core.d.ts +18 -11
- package/dist/types/core.d.ts.map +1 -1
- package/dist/types/core.js +5 -0
- package/dist/types/core.js.map +1 -1
- package/dist/types/utils.d.ts +2 -2
- package/dist/types/utils.d.ts.map +1 -1
- package/dist/types/utils.js.map +1 -1
- package/dist/umd/dara.core.umd.cjs +61046 -57648
- package/package.json +11 -10
- package/dist/shared/root/route-content.d.ts +0 -21
- package/dist/shared/root/route-content.d.ts.map +0 -1
- package/dist/shared/root/route-content.js +0 -164
- package/dist/shared/root/route-content.js.map +0 -1
- package/dist/shared/router.d.ts +0 -14
- package/dist/shared/router.d.ts.map +0 -1
- package/dist/shared/router.js.map +0 -1
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { type GetRecoilValue, type RecoilValue } from 'recoil';
|
|
1
|
+
import { type GetRecoilValue, type RecoilValue, type Snapshot } from 'recoil';
|
|
2
2
|
import { type WebSocketClientInterface } from '../../api';
|
|
3
3
|
import { type RequestExtras } from '../../api/http';
|
|
4
4
|
import { type DerivedVariable, type GlobalTaskContext, type ResolvedDerivedVariable } from '../../types';
|
|
5
|
+
import { type Deferred } from '../utils/deferred';
|
|
5
6
|
import { type TriggerIndexValue } from './store';
|
|
7
|
+
import { type TriggerInfo } from './triggers';
|
|
6
8
|
export interface DerivedVariableValueResponse<T> {
|
|
7
9
|
cache_key: string;
|
|
8
10
|
value: T;
|
|
@@ -64,10 +66,10 @@ interface PreviousResult {
|
|
|
64
66
|
*/
|
|
65
67
|
entry: {
|
|
66
68
|
args: any[];
|
|
67
|
-
cacheKey: string | null;
|
|
68
69
|
result: any;
|
|
69
70
|
};
|
|
70
71
|
type: 'previous';
|
|
72
|
+
relevantValues: any[];
|
|
71
73
|
/**
|
|
72
74
|
* List of values to use in the refetch request (force_key is embedded directly in the values)
|
|
73
75
|
*/
|
|
@@ -96,10 +98,25 @@ interface CurrentResult {
|
|
|
96
98
|
/** Key to the deps cache */
|
|
97
99
|
depsKey: string;
|
|
98
100
|
}
|
|
101
|
+
/**
|
|
102
|
+
* Represents a cached result of a derived variable resolution.
|
|
103
|
+
* This can happen when we prefetch a derived value, wraps the current result and the raw server response.
|
|
104
|
+
*/
|
|
105
|
+
interface CachedResponse {
|
|
106
|
+
type: 'cached';
|
|
107
|
+
response: Promise<{
|
|
108
|
+
ok: boolean;
|
|
109
|
+
value: any;
|
|
110
|
+
}>;
|
|
111
|
+
values: any[];
|
|
112
|
+
depsKey: string;
|
|
113
|
+
currentResult: CurrentResult;
|
|
114
|
+
relevantValues: any[];
|
|
115
|
+
}
|
|
99
116
|
/**
|
|
100
117
|
* Represents the result of a derived variable resolution.
|
|
101
118
|
*/
|
|
102
|
-
export type DerivedResult = PreviousResult | CurrentResult;
|
|
119
|
+
export type DerivedResult = PreviousResult | CurrentResult | CachedResponse;
|
|
103
120
|
/**
|
|
104
121
|
* Resolve a derived value from a list of dependant variables and their resolved values.
|
|
105
122
|
*
|
|
@@ -114,11 +131,24 @@ export type DerivedResult = PreviousResult | CurrentResult;
|
|
|
114
131
|
* @param deps list of relevant dependant variables, akin to useEffect dependency array
|
|
115
132
|
* @param resolvedVariables resolved values of dependant variables - turned into primitives and Resolved forms
|
|
116
133
|
* @param get getter function to resolve atoms to values
|
|
117
|
-
* @param
|
|
134
|
+
* @param triggerList list of trigger info objects
|
|
135
|
+
* @param triggers list of triggers to register as dependencies; first one is expected to be the self-trigger
|
|
118
136
|
*/
|
|
119
|
-
export declare function resolveDerivedValue(key
|
|
120
|
-
|
|
121
|
-
|
|
137
|
+
export declare function resolveDerivedValue({ key, variables, deps, resolvedVariables, resolutionStrategy, triggerList, triggers, }: {
|
|
138
|
+
key: string;
|
|
139
|
+
variables: any[];
|
|
140
|
+
deps: any[];
|
|
141
|
+
resolvedVariables: any[];
|
|
142
|
+
resolutionStrategy: {
|
|
143
|
+
name: 'get';
|
|
144
|
+
get: GetRecoilValue;
|
|
145
|
+
} | {
|
|
146
|
+
name: 'snapshot';
|
|
147
|
+
snapshot: Snapshot;
|
|
148
|
+
};
|
|
149
|
+
triggerList: Array<TriggerInfo>;
|
|
150
|
+
triggers: TriggerIndexValue[];
|
|
151
|
+
}): DerivedResult;
|
|
122
152
|
/**
|
|
123
153
|
* Get or register a recoil selector for a given derived variable result object.
|
|
124
154
|
* Resolves the primitive values and returns either the previous cached result or an object
|
|
@@ -133,18 +163,33 @@ export declare function getOrRegisterDerivedVariableResult(variable: DerivedVari
|
|
|
133
163
|
* @param tasks tasks list from context
|
|
134
164
|
* @param currentExtras request extras to be merged into the options
|
|
135
165
|
*/
|
|
136
|
-
export declare function getOrRegisterDerivedVariable(variable: DerivedVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<
|
|
166
|
+
export declare function getOrRegisterDerivedVariable(variable: DerivedVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<any>;
|
|
137
167
|
/**
|
|
138
|
-
*
|
|
139
|
-
*
|
|
168
|
+
* Preload a derived value.
|
|
169
|
+
* Replicates the logic of normal resolution but resolving the values
|
|
170
|
+
* from snapshot or falling back to the defaults.
|
|
140
171
|
*
|
|
141
|
-
*
|
|
142
|
-
*
|
|
143
|
-
*
|
|
144
|
-
*
|
|
145
|
-
*
|
|
172
|
+
* For details, see the original implementation comments.
|
|
173
|
+
*
|
|
174
|
+
* Returns null if there already is a cached value for the variable.
|
|
175
|
+
* Otherwise, returns an object with values so be sent to the backend
|
|
176
|
+
* and handles to resolve the cached promise to the result.
|
|
177
|
+
*/
|
|
178
|
+
export declare function preloadDerivedValue({ key, variables, deps, triggerList, triggers, snapshot, }: {
|
|
179
|
+
key: string;
|
|
180
|
+
variables: any[];
|
|
181
|
+
deps: any[];
|
|
182
|
+
triggerList: Array<TriggerInfo>;
|
|
183
|
+
triggers: TriggerIndexValue[];
|
|
184
|
+
snapshot: Snapshot;
|
|
185
|
+
}): {
|
|
186
|
+
handle: Deferred<any>;
|
|
187
|
+
result: DerivedResult;
|
|
188
|
+
} | null;
|
|
189
|
+
/**
|
|
190
|
+
* Preload a derived variable value.
|
|
146
191
|
*/
|
|
147
|
-
export declare function
|
|
192
|
+
export declare function preloadDerivedVariable(variable: DerivedVariable, snapshot: Snapshot): ReturnType<typeof preloadDerivedValue>;
|
|
148
193
|
/**
|
|
149
194
|
* Helper hook to get the (data) derived variable selector, while correctly registering triggers and setting up polling interval.
|
|
150
195
|
*
|
|
@@ -154,6 +199,6 @@ export declare function getOrRegisterDerivedVariableValue(variable: DerivedVaria
|
|
|
154
199
|
* @param search search query
|
|
155
200
|
* @param extras request extras to be merged into the options
|
|
156
201
|
*/
|
|
157
|
-
export declare function useDerivedVariable(variable: DerivedVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras): RecoilValue<
|
|
202
|
+
export declare function useDerivedVariable(variable: DerivedVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras): RecoilValue<any>;
|
|
158
203
|
export {};
|
|
159
204
|
//# sourceMappingURL=derived-variable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAKA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,WAAW,
|
|
1
|
+
{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAKA,OAAO,EACH,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,QAAQ,EAKhB,MAAM,QAAQ,CAAC;AAMhB,OAAO,EAAE,KAAK,wBAAwB,EAA4B,MAAM,OAAO,CAAC;AAChF,OAAO,EAAE,KAAK,aAAa,EAA6B,MAAM,YAAY,CAAC;AAM3E,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,uBAAuB,EAQ/B,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EACH,KAAK,iBAAiB,EAKzB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,WAAW,EAAiE,MAAM,YAAY,CAAC;AAE7G,MAAM,WAAW,4BAA4B,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,CAAC;CACZ;AAED,KAAK,uBAAuB,CAAC,CAAC,IAAI,2BAA2B,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAAC;AAEhG,wBAAgB,cAAc,CAAC,UAAU,EAAE,uBAAuB,CAAC,GAAG,CAAC,GAAG,UAAU,IAAI,2BAA2B,CAElH;AAED,UAAU,2BAA2B;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,wBAAwB;IAC9B,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,wBAAwB,CAAC;CACtC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,EAC1C,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,EACX,MAAM,EACN,QAAQ,GACX,EAAE,wBAAwB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAsBhE;AAqGD;;;;;;GAMG;AAEH,wBAAgB,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,uBAAuB,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,CAqB5F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,GAAG,iBAAiB,CAE5E;AAED;;;GAGG;AACH,UAAU,cAAc;IACpB;;OAEG;IACH,KAAK,EAAE;QACH,IAAI,EAAE,GAAG,EAAE,CAAC;QACZ,MAAM,EAAE,GAAG,CAAC;KACf,CAAC;IACF,IAAI,EAAE,UAAU,CAAC;IACjB,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,4BAA4B;IAC5B,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,UAAU,aAAa;IACnB;;OAEG;IACH,cAAc,EAAE,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,4BAA4B;IAC5B,OAAO,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,UAAU,cAAc;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,CAAC,CAAC;IAC/C,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,GAAG,EAAE,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,aAAa,GAAG,cAAc,CAAC;AAE5E;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,EAChC,GAAG,EACH,SAAS,EACT,IAAI,EACJ,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,QAAQ,GACX,EAAE;IACC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,iBAAiB,EAAE,GAAG,EAAE,CAAC;IACzB,kBAAkB,EAAE;QAAE,IAAI,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,cAAc,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC;IACpG,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAChC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CACjC,GAAG,aAAa,CAwIhB;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAC9C,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,GAC7B,WAAW,CAAC,aAAa,CAAC,CA0E5B;AAID;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CACxC,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,GAC7B,WAAW,CAAC,GAAG,CAAC,CAqKlB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,EAChC,GAAG,EACH,SAAS,EACT,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAQ,GACX,EAAE;IACC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAChC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,QAAQ,EAAE,QAAQ,CAAC;CACtB,GAAG;IACA,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;CACzB,GAAG,IAAI,CAkBP;AACD;;GAEG;AACH,wBAAgB,sBAAsB,CAClC,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,QAAQ,GACnB,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAgBxC;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAC9B,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,GACtB,WAAW,CAAC,GAAG,CAAC,CAyBlB"}
|
|
@@ -24,10 +24,11 @@ import { getUniqueIdentifier } from '../../shared/utils/hashing';
|
|
|
24
24
|
import { normalizeRequest } from '../../shared/utils/normalization';
|
|
25
25
|
import useInterval from '../../shared/utils/use-interval';
|
|
26
26
|
import { isCondition, isResolvedDerivedVariable, isResolvedServerVariable, isResolvedSwitchVariable, isVariable, } from '../../types';
|
|
27
|
+
import { deferred } from '../utils/deferred';
|
|
27
28
|
// eslint-disable-next-line import/no-cycle
|
|
28
|
-
import { cleanArgs, getOrRegisterTrigger, resolveNested, resolveVariable } from './internal';
|
|
29
|
+
import { cleanArgs, getOrRegisterTrigger, resolveNested, resolveVariable, resolveVariableStatic } from './internal';
|
|
29
30
|
import { depsRegistry, getRegistryKey, selectorFamilyMembersRegistry, selectorFamilyRegistry, } from './store';
|
|
30
|
-
import { buildTriggerList, registerChildTriggers } from './triggers';
|
|
31
|
+
import { buildTriggerList, registerChildTriggers, resolveTriggerStatic } from './triggers';
|
|
31
32
|
export function isTaskResponse(dvResponse) {
|
|
32
33
|
return 'task_id' in dvResponse;
|
|
33
34
|
}
|
|
@@ -165,18 +166,10 @@ export function useTriggerIndex(variable) {
|
|
|
165
166
|
* @param deps list of relevant dependant variables, akin to useEffect dependency array
|
|
166
167
|
* @param resolvedVariables resolved values of dependant variables - turned into primitives and Resolved forms
|
|
167
168
|
* @param get getter function to resolve atoms to values
|
|
168
|
-
* @param
|
|
169
|
+
* @param triggerList list of trigger info objects
|
|
170
|
+
* @param triggers list of triggers to register as dependencies; first one is expected to be the self-trigger
|
|
169
171
|
*/
|
|
170
|
-
export function resolveDerivedValue(key, variables,
|
|
171
|
-
deps, // variable or primitive
|
|
172
|
-
resolvedVariables, get, selfTrigger) {
|
|
173
|
-
// Build trigger map once for efficient lookups
|
|
174
|
-
const triggerList = buildTriggerList(variables);
|
|
175
|
-
// Register nested triggers as dependencies so triggering one of the nested derived variables will trigger a recalculation here
|
|
176
|
-
const triggers = registerChildTriggers(triggerList, get);
|
|
177
|
-
if (selfTrigger) {
|
|
178
|
-
triggers.unshift(selfTrigger);
|
|
179
|
-
}
|
|
172
|
+
export function resolveDerivedValue({ key, variables, deps, resolvedVariables, resolutionStrategy, triggerList, triggers, }) {
|
|
180
173
|
/**
|
|
181
174
|
* Array of values:
|
|
182
175
|
* - primitive values are resolved to themselves
|
|
@@ -184,7 +177,12 @@ resolvedVariables, get, selfTrigger) {
|
|
|
184
177
|
* - derived variables are resolved to ResolvedDerivedVariable objects with nested values/deps resolved to values
|
|
185
178
|
* - server variables are resolved to their sequence number
|
|
186
179
|
*/
|
|
187
|
-
const values = resolvedVariables.map((v) =>
|
|
180
|
+
const values = resolvedVariables.map((v) => {
|
|
181
|
+
if (resolutionStrategy.name === 'snapshot') {
|
|
182
|
+
return resolveVariableStatic(v, resolutionStrategy.snapshot);
|
|
183
|
+
}
|
|
184
|
+
return resolveValue(v, resolutionStrategy.get);
|
|
185
|
+
});
|
|
188
186
|
/**
|
|
189
187
|
* Array of values with ResolvedDerivedVariable objects replaced
|
|
190
188
|
* (recursively) by nested arrays of their dependency values
|
|
@@ -220,10 +218,28 @@ resolvedVariables, get, selfTrigger) {
|
|
|
220
218
|
const areArgsTheSame = isEqual(previousEntry.args, relevantValues);
|
|
221
219
|
// If the relevant arg values didn't change, return previous result
|
|
222
220
|
if (areArgsTheSame) {
|
|
221
|
+
const previousValue = previousEntry.result;
|
|
222
|
+
if (previousValue instanceof Promise) {
|
|
223
|
+
return {
|
|
224
|
+
type: 'cached',
|
|
225
|
+
response: previousValue,
|
|
226
|
+
depsKey: key,
|
|
227
|
+
values,
|
|
228
|
+
relevantValues,
|
|
229
|
+
currentResult: {
|
|
230
|
+
relevantValues,
|
|
231
|
+
selfTriggerForceKey: null,
|
|
232
|
+
type: 'current',
|
|
233
|
+
values,
|
|
234
|
+
depsKey: key,
|
|
235
|
+
},
|
|
236
|
+
};
|
|
237
|
+
}
|
|
223
238
|
return {
|
|
224
239
|
entry: previousEntry,
|
|
225
240
|
type: 'previous',
|
|
226
241
|
values,
|
|
242
|
+
relevantValues,
|
|
227
243
|
depsKey: key,
|
|
228
244
|
};
|
|
229
245
|
}
|
|
@@ -238,14 +254,14 @@ resolvedVariables, get, selfTrigger) {
|
|
|
238
254
|
* handle the force_key appropriately
|
|
239
255
|
*/
|
|
240
256
|
if (triggerValue.inc !== previousTriggerCounters[idx]) {
|
|
241
|
-
if (
|
|
257
|
+
if (idx === 0) {
|
|
242
258
|
// This is a self-trigger (polling, manual trigger) - use global force
|
|
243
259
|
selfTriggerForceKey = triggerValue.force_key;
|
|
244
260
|
}
|
|
245
261
|
else if (triggerValue.force_key) {
|
|
246
262
|
// This is a nested variable trigger - embed force_key in the specific variable
|
|
247
|
-
// shift index back by 1
|
|
248
|
-
const valueIndex =
|
|
263
|
+
// shift index back by 1 because we prepended a self trigger
|
|
264
|
+
const valueIndex = idx - 1;
|
|
249
265
|
const triggerInfo = triggerList[valueIndex];
|
|
250
266
|
// If the trigger path is empty, it means we need to force the DV itself
|
|
251
267
|
// This can happen when e.g. a dependant DataVariable is triggered
|
|
@@ -306,7 +322,20 @@ export function getOrRegisterDerivedVariableResult(variable, wsClient, taskConte
|
|
|
306
322
|
const selfTrigger = get(getOrRegisterTrigger(variable));
|
|
307
323
|
// for deps use a different key for each selector instance rather than one per family
|
|
308
324
|
const selectorKey = key + extrasSerializable.toJSON();
|
|
309
|
-
|
|
325
|
+
// Build trigger map once for efficient lookups
|
|
326
|
+
const triggerList = buildTriggerList(variable.variables);
|
|
327
|
+
// Register nested triggers as dependencies so triggering one of the nested derived variables will trigger a recalculation here
|
|
328
|
+
const triggers = registerChildTriggers(triggerList, get);
|
|
329
|
+
triggers.unshift(selfTrigger);
|
|
330
|
+
const derivedResult = resolveDerivedValue({
|
|
331
|
+
key: selectorKey,
|
|
332
|
+
variables: variable.variables,
|
|
333
|
+
deps: variable.deps,
|
|
334
|
+
resolvedVariables,
|
|
335
|
+
resolutionStrategy: { name: 'get', get },
|
|
336
|
+
triggerList,
|
|
337
|
+
triggers,
|
|
338
|
+
});
|
|
310
339
|
return derivedResult;
|
|
311
340
|
}),
|
|
312
341
|
key: nanoid(),
|
|
@@ -326,6 +355,7 @@ export function getOrRegisterDerivedVariableResult(variable, wsClient, taskConte
|
|
|
326
355
|
selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
|
|
327
356
|
return selectorInstance;
|
|
328
357
|
}
|
|
358
|
+
const NOT_SET = Symbol('NOT_SET');
|
|
329
359
|
/**
|
|
330
360
|
* Get a derived variable from the selector registry, registering it if not already registered
|
|
331
361
|
*
|
|
@@ -345,16 +375,47 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
|
|
|
345
375
|
},
|
|
346
376
|
get: (extrasSerializable) => (_a) => __awaiter(this, [_a], void 0, function* ({ get }) {
|
|
347
377
|
const selectorKey = key + extrasSerializable.toJSON();
|
|
378
|
+
const throwError = (error) => {
|
|
379
|
+
// On DV task error put selectorId and extras into the error so the boundary can reset the selector cache
|
|
380
|
+
error.selectorId = key;
|
|
381
|
+
error.selectorExtras = extrasSerializable.toJSON();
|
|
382
|
+
throw error;
|
|
383
|
+
};
|
|
384
|
+
const handleError = (func) => {
|
|
385
|
+
try {
|
|
386
|
+
return func();
|
|
387
|
+
}
|
|
388
|
+
catch (e) {
|
|
389
|
+
throwError(e);
|
|
390
|
+
}
|
|
391
|
+
};
|
|
348
392
|
// get the result selector instance for this extras value
|
|
349
393
|
const dvResultSelector = getOrRegisterDerivedVariableResult(variable, wsClient, taskContext, extrasSerializable.extras);
|
|
350
|
-
|
|
394
|
+
let derivedResult = get(dvResultSelector);
|
|
351
395
|
if (derivedResult.type === 'previous') {
|
|
352
|
-
return
|
|
396
|
+
return derivedResult.entry.result;
|
|
353
397
|
}
|
|
354
398
|
const { extras } = extrasSerializable;
|
|
355
399
|
let variableResponse = null;
|
|
356
|
-
|
|
357
|
-
|
|
400
|
+
// whether to check for an initial task
|
|
401
|
+
let shouldFetchTask = false;
|
|
402
|
+
// Skip fetching if we have a cached result, await it instead
|
|
403
|
+
if (derivedResult.type === 'cached') {
|
|
404
|
+
try {
|
|
405
|
+
const response = yield derivedResult.response;
|
|
406
|
+
shouldFetchTask = true;
|
|
407
|
+
if (!response.ok) {
|
|
408
|
+
throwError(new Error(response.value));
|
|
409
|
+
}
|
|
410
|
+
variableResponse = response.value;
|
|
411
|
+
derivedResult = derivedResult.currentResult;
|
|
412
|
+
}
|
|
413
|
+
catch (e) {
|
|
414
|
+
throwError(e);
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
else {
|
|
418
|
+
variableResponse = yield handleError(() => debouncedFetchDerivedVariable({
|
|
358
419
|
cache: variable.cache,
|
|
359
420
|
extras,
|
|
360
421
|
force_key: derivedResult.selfTriggerForceKey,
|
|
@@ -362,51 +423,51 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
|
|
|
362
423
|
values: normalizeRequest(cleanArgs(derivedResult.values), variable.variables),
|
|
363
424
|
variableUid: variable.uid,
|
|
364
425
|
wsClient,
|
|
365
|
-
});
|
|
426
|
+
}));
|
|
366
427
|
}
|
|
367
|
-
|
|
368
|
-
// On DV error put selectorId and extras into the error so the boundary can reset the selector cache
|
|
369
|
-
e.selectorId = key;
|
|
370
|
-
e.selectorExtras = extrasSerializable.toJSON();
|
|
371
|
-
throw e;
|
|
372
|
-
}
|
|
373
|
-
const cacheKey = variableResponse.cache_key;
|
|
374
|
-
let variableValue = null;
|
|
428
|
+
let variableValue = NOT_SET;
|
|
375
429
|
// If there is a task running related to the current variable then something has changed, so cancel them
|
|
376
430
|
taskContext.cleanupRunningTasks(variable.uid);
|
|
377
431
|
// If the variable is computed as a task then wait for it to finish and fetch the result
|
|
378
432
|
if (isTaskResponse(variableResponse)) {
|
|
379
433
|
const taskId = variableResponse.task_id;
|
|
380
|
-
//
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
e
|
|
390
|
-
throw e;
|
|
434
|
+
// pre-fetch task result since it could already be available without us receiving the notif
|
|
435
|
+
if (shouldFetchTask) {
|
|
436
|
+
try {
|
|
437
|
+
const taskResult = yield fetchTaskResult(taskId, extras);
|
|
438
|
+
if (taskResult.status === 'ok') {
|
|
439
|
+
variableValue = taskResult.result;
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
catch (e) {
|
|
443
|
+
throwError(e);
|
|
391
444
|
}
|
|
392
|
-
// should be a TaskCancelledError
|
|
393
|
-
// It should be safe to return `null` here as the selector will re-run and throw suspense again
|
|
394
|
-
return {
|
|
395
|
-
cache_key: cacheKey,
|
|
396
|
-
value: null,
|
|
397
|
-
};
|
|
398
|
-
}
|
|
399
|
-
finally {
|
|
400
|
-
taskContext.endTask(taskId);
|
|
401
|
-
}
|
|
402
|
-
try {
|
|
403
|
-
variableValue = yield fetchTaskResult(taskId, extras);
|
|
404
445
|
}
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
446
|
+
// continue waiting for the task if it's not available yet
|
|
447
|
+
if (variableValue === NOT_SET) {
|
|
448
|
+
// register task being started
|
|
449
|
+
taskContext.startTask(taskId, variable.uid, getRegistryKey(variable, 'trigger'));
|
|
450
|
+
try {
|
|
451
|
+
yield wsClient.waitForTask(taskId);
|
|
452
|
+
}
|
|
453
|
+
catch (e) {
|
|
454
|
+
if (e instanceof TaskError) {
|
|
455
|
+
throwError(e);
|
|
456
|
+
}
|
|
457
|
+
// should be a TaskCancelledError
|
|
458
|
+
// It should be safe to return `null` here as the selector will re-run and throw suspense again
|
|
459
|
+
return null;
|
|
460
|
+
}
|
|
461
|
+
finally {
|
|
462
|
+
taskContext.endTask(taskId);
|
|
463
|
+
}
|
|
464
|
+
variableValue = yield handleError(() => __awaiter(this, void 0, void 0, function* () {
|
|
465
|
+
const result = yield fetchTaskResult(taskId, extras);
|
|
466
|
+
if (result.status === 'not_found') {
|
|
467
|
+
throw new Error('Task result not found');
|
|
468
|
+
}
|
|
469
|
+
return result.result;
|
|
470
|
+
}));
|
|
410
471
|
}
|
|
411
472
|
}
|
|
412
473
|
else {
|
|
@@ -418,13 +479,9 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
|
|
|
418
479
|
// Store the final result and arguments used
|
|
419
480
|
depsRegistry.set(derivedResult.depsKey, {
|
|
420
481
|
args: derivedResult.relevantValues,
|
|
421
|
-
cacheKey,
|
|
422
482
|
result: variableValue,
|
|
423
483
|
});
|
|
424
|
-
return
|
|
425
|
-
cache_key: cacheKey,
|
|
426
|
-
value: variableValue,
|
|
427
|
-
};
|
|
484
|
+
return variableValue;
|
|
428
485
|
}),
|
|
429
486
|
key: nanoid(),
|
|
430
487
|
}));
|
|
@@ -444,41 +501,50 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
|
|
|
444
501
|
return selectorInstance;
|
|
445
502
|
}
|
|
446
503
|
/**
|
|
447
|
-
*
|
|
448
|
-
*
|
|
504
|
+
* Preload a derived value.
|
|
505
|
+
* Replicates the logic of normal resolution but resolving the values
|
|
506
|
+
* from snapshot or falling back to the defaults.
|
|
449
507
|
*
|
|
450
|
-
*
|
|
451
|
-
*
|
|
452
|
-
*
|
|
453
|
-
*
|
|
454
|
-
*
|
|
508
|
+
* For details, see the original implementation comments.
|
|
509
|
+
*
|
|
510
|
+
* Returns null if there already is a cached value for the variable.
|
|
511
|
+
* Otherwise, returns an object with values so be sent to the backend
|
|
512
|
+
* and handles to resolve the cached promise to the result.
|
|
455
513
|
*/
|
|
456
|
-
export function
|
|
457
|
-
const
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
const family = selectorFamilyRegistry.get(key);
|
|
470
|
-
// Get a selector instance for this particular extras value
|
|
471
|
-
// This is required as otherwise the selector is not aware of different possible extras values
|
|
472
|
-
// at the call site of e.g. useVariable and would otherwise be a stale closure using the initial extras when
|
|
473
|
-
// first registered
|
|
474
|
-
const serializableExtras = new RequestExtrasSerializable(currentExtras);
|
|
475
|
-
const selectorInstance = family(serializableExtras);
|
|
476
|
-
// register selector instance in the selector family registry
|
|
477
|
-
if (!selectorFamilyMembersRegistry.has(family)) {
|
|
478
|
-
selectorFamilyMembersRegistry.set(family, new Map());
|
|
514
|
+
export function preloadDerivedValue({ key, variables, deps, triggerList, triggers, snapshot, }) {
|
|
515
|
+
const derivedResult = resolveDerivedValue({
|
|
516
|
+
key,
|
|
517
|
+
variables,
|
|
518
|
+
deps,
|
|
519
|
+
resolvedVariables: variables,
|
|
520
|
+
resolutionStrategy: { name: 'snapshot', snapshot },
|
|
521
|
+
triggerList,
|
|
522
|
+
triggers,
|
|
523
|
+
});
|
|
524
|
+
// otherwise we already have a valid entry, nothing to do here
|
|
525
|
+
if (derivedResult.type === 'previous') {
|
|
526
|
+
return null;
|
|
479
527
|
}
|
|
480
|
-
|
|
481
|
-
return
|
|
528
|
+
// no previous entry or values changed - have to recompute
|
|
529
|
+
return { result: derivedResult, handle: deferred() };
|
|
530
|
+
}
|
|
531
|
+
/**
|
|
532
|
+
* Preload a derived variable value.
|
|
533
|
+
*/
|
|
534
|
+
export function preloadDerivedVariable(variable, snapshot) {
|
|
535
|
+
// assume no extras in top-level variables
|
|
536
|
+
const key = getRegistryKey(variable, 'result-selector') + new RequestExtrasSerializable({}).toJSON();
|
|
537
|
+
// prepare trigger list as usual but use static resolution
|
|
538
|
+
const triggerList = [...buildTriggerList(variable.variables), { path: [], variable }];
|
|
539
|
+
const triggers = triggerList.map((ti) => resolveTriggerStatic(getOrRegisterTrigger(ti.variable), snapshot));
|
|
540
|
+
return preloadDerivedValue({
|
|
541
|
+
key,
|
|
542
|
+
variables: variable.variables,
|
|
543
|
+
deps: variable.deps,
|
|
544
|
+
triggers,
|
|
545
|
+
triggerList,
|
|
546
|
+
snapshot,
|
|
547
|
+
});
|
|
482
548
|
}
|
|
483
549
|
/**
|
|
484
550
|
* Helper hook to get the (data) derived variable selector, while correctly registering triggers and setting up polling interval.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"derived-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ import { isDerivedVariable, } from '../../types';
|
|
|
26
26
|
import {} from '../../types/core';
|
|
27
27
|
import { WebSocketCtx } from '../context';
|
|
28
28
|
// eslint-disable-next-line import/no-cycle
|
|
29
|
-
import {
|
|
29
|
+
import { getOrRegisterDerivedVariable } from './internal';
|
|
30
30
|
import { atomFamilyMembersRegistry, atomFamilyRegistry, atomRegistry } from './store';
|
|
31
31
|
/**
|
|
32
32
|
* Global map to store the extras for each store uid
|
|
@@ -359,7 +359,7 @@ function localStorageEffect(variable, extrasSerializable, wsClient, taskContext)
|
|
|
359
359
|
if (!readValue) {
|
|
360
360
|
const isDefaultDerived = isDerivedVariable(variable.default);
|
|
361
361
|
return isDefaultDerived ?
|
|
362
|
-
|
|
362
|
+
getOrRegisterDerivedVariable(variable.default, wsClient, taskContext, extrasSerializable.extras)
|
|
363
363
|
: variable.default;
|
|
364
364
|
}
|
|
365
365
|
}
|