@darajs/core 1.21.3 → 1.21.5
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/websocket.d.ts +1 -0
- package/dist/api/websocket.d.ts.map +1 -1
- package/dist/api/websocket.js.map +1 -1
- package/dist/auth/basic/basic-auth-login.d.ts.map +1 -1
- package/dist/auth/basic/basic-auth-login.js +4 -2
- package/dist/auth/basic/basic-auth-login.js.map +1 -1
- package/dist/auth/default/default-auth-login.d.ts.map +1 -1
- package/dist/auth/default/default-auth-login.js +4 -2
- package/dist/auth/default/default-auth-login.js.map +1 -1
- package/dist/components/fallback/default.d.ts.map +1 -1
- package/dist/components/fallback/default.js +3 -1
- package/dist/components/fallback/default.js.map +1 -1
- package/dist/components/index.d.ts +1 -0
- package/dist/components/index.d.ts.map +1 -1
- package/dist/components/index.js +1 -0
- package/dist/components/index.js.map +1 -1
- package/dist/components/link.d.ts +3 -2
- package/dist/components/link.d.ts.map +1 -1
- package/dist/components/link.js +7 -5
- package/dist/components/link.js.map +1 -1
- package/dist/components/navigate.d.ts +9 -0
- package/dist/components/navigate.d.ts.map +1 -0
- package/dist/components/navigate.js +21 -0
- package/dist/components/navigate.js.map +1 -0
- package/dist/{dara_core-1.21.3-py3-none-any.whl → dara_core-1.21.5-py3-none-any.whl} +0 -0
- package/dist/router/cache.d.ts +9 -1
- package/dist/router/cache.d.ts.map +1 -1
- package/dist/router/cache.js +10 -1
- package/dist/router/cache.js.map +1 -1
- package/dist/router/context.d.ts +3 -1
- package/dist/router/context.d.ts.map +1 -1
- package/dist/router/context.js +3 -2
- package/dist/router/context.js.map +1 -1
- package/dist/router/create-router.d.ts +3 -3
- package/dist/router/create-router.d.ts.map +1 -1
- package/dist/router/create-router.js +11 -9
- package/dist/router/create-router.js.map +1 -1
- package/dist/router/fetching.d.ts.map +1 -1
- package/dist/router/fetching.js +33 -19
- package/dist/router/fetching.js.map +1 -1
- package/dist/router/route-content.d.ts +1 -1
- package/dist/router/route-content.d.ts.map +1 -1
- package/dist/router/route-content.js +10 -5
- package/dist/router/route-content.js.map +1 -1
- package/dist/router/router-root.d.ts.map +1 -1
- package/dist/router/router-root.js +4 -6
- package/dist/router/router-root.js.map +1 -1
- package/dist/shared/interactivity/derived-variable.d.ts +7 -4
- package/dist/shared/interactivity/derived-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/derived-variable.js +9 -8
- package/dist/shared/interactivity/derived-variable.js.map +1 -1
- package/dist/shared/interactivity/persistence.d.ts.map +1 -1
- package/dist/shared/interactivity/persistence.js +6 -4
- package/dist/shared/interactivity/persistence.js.map +1 -1
- package/dist/shared/interactivity/plain-variable.d.ts +3 -2
- package/dist/shared/interactivity/plain-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/plain-variable.js +12 -6
- package/dist/shared/interactivity/plain-variable.js.map +1 -1
- package/dist/shared/interactivity/resolve-variable.d.ts +2 -1
- package/dist/shared/interactivity/resolve-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/resolve-variable.js +8 -8
- package/dist/shared/interactivity/resolve-variable.js.map +1 -1
- package/dist/shared/interactivity/use-server-component.d.ts +2 -1
- package/dist/shared/interactivity/use-server-component.d.ts.map +1 -1
- package/dist/shared/interactivity/use-server-component.js +3 -2
- package/dist/shared/interactivity/use-server-component.js.map +1 -1
- package/dist/shared/root/authenticated-root.d.ts +9 -3
- package/dist/shared/root/authenticated-root.d.ts.map +1 -1
- package/dist/shared/root/authenticated-root.js +23 -8
- package/dist/shared/root/authenticated-root.js.map +1 -1
- package/dist/shared/utils/deferred.d.ts +22 -1
- package/dist/shared/utils/deferred.d.ts.map +1 -1
- package/dist/shared/utils/deferred.js +80 -7
- package/dist/shared/utils/deferred.js.map +1 -1
- package/dist/types/core.d.ts +1 -0
- package/dist/types/core.d.ts.map +1 -1
- package/dist/types/core.js +3 -0
- package/dist/types/core.js.map +1 -1
- package/dist/umd/dara.core.umd.cjs +240 -101
- package/package.json +9 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/persistence.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,KAAK,UAAU,EAAqD,MAAM,QAAQ,CAAC;AAK5F,OAAO,EAAiC,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAW,MAAM,YAAY,CAAC;AAIhE,OAAO,EACH,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,eAAe,EAEpB,KAAK,cAAc,EAEtB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAwB,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAmRjH;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOjD;AA2DD,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"persistence.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/persistence.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,KAAK,UAAU,EAAqD,MAAM,QAAQ,CAAC;AAK5F,OAAO,EAAiC,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACrF,OAAO,EAAE,yBAAyB,EAAW,MAAM,YAAY,CAAC;AAIhE,OAAO,EACH,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,eAAe,EAEpB,KAAK,cAAc,EAEtB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAwB,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAmRjH;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOjD;AA2DD,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAqF1F;AA0ED,UAAU,MAAM,CAAC,CAAC,GAAG,GAAG,EAAE,MAAM,SAAS,gBAAgB,GAAG,gBAAgB;IACxE,CACI,QAAQ,EAAE,cAAc,CAAC,CAAC,EAAE,MAAM,CAAC,EACnC,aAAa,EAAE,yBAAyB,EACxC,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,GAC/B,UAAU,CAAC,CAAC,CAAC,CAAC;CACpB;AAGD,KAAK,YAAY,GAAG;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,cAAc,CAAC;CACnC,CAAC;AAGF,KAAK,YAAY,GAAG;KACf,CAAC,IAAI,MAAM,YAAY,GAAG;QACvB,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC;CACJ,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,YAapB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,SAAS,gBAAgB,EAC3D,QAAQ,EAAE,cAAc,CAAC,CAAC,EAAE,SAAS,CAAC,GACvC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,IAAI,CAS7B;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAQvF"}
|
|
@@ -328,11 +328,13 @@ export function PathParamSync({ children }) {
|
|
|
328
328
|
search: locationRef.current.search,
|
|
329
329
|
});
|
|
330
330
|
}, [matchesRef, navigate, paramsRef, locationRef]);
|
|
331
|
-
const listenToStoreChanges = React.useCallback(({
|
|
331
|
+
const listenToStoreChanges = React.useCallback(({ updateItems }) => {
|
|
332
332
|
function handleUpdate(newParams) {
|
|
333
|
-
//
|
|
334
|
-
// to
|
|
335
|
-
|
|
333
|
+
// NOTE: using updateItems instead of updateAllKnownItems
|
|
334
|
+
// We don't want to reset params that become null because that can happen while
|
|
335
|
+
// navigating away from a page, which would trigger derived values to re-run
|
|
336
|
+
// for no reason.
|
|
337
|
+
updateItems(new Map(Object.entries(newParams)));
|
|
336
338
|
}
|
|
337
339
|
locationSubscribers.current.push(handleUpdate);
|
|
338
340
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../js/shared/interactivity/persistence.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"persistence.js","sourceRoot":"","sources":["../../../js/shared/interactivity/persistence.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import type { Params } from 'react-router';
|
|
1
2
|
import { type RecoilState, type Snapshot } from 'recoil';
|
|
2
3
|
import { type WebSocketClientInterface } from '../../api';
|
|
3
4
|
import { type RequestExtras } from '../../api/http';
|
|
4
|
-
import { type GlobalTaskContext, type SingleVariable } from '../../types';
|
|
5
|
+
import { type DerivedVariable, type GlobalTaskContext, type SingleVariable } from '../../types';
|
|
5
6
|
/**
|
|
6
7
|
* Get a plain variable from the atom or selector registry (based on nested property),
|
|
7
8
|
* registering it if not already registered
|
|
@@ -13,5 +14,5 @@ import { type GlobalTaskContext, type SingleVariable } from '../../types';
|
|
|
13
14
|
* @param extras request extras to be merged into the options
|
|
14
15
|
*/
|
|
15
16
|
export declare function getOrRegisterPlainVariable<T>(variable: SingleVariable<T>, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras): RecoilState<T>;
|
|
16
|
-
export declare function resolvePlainVariableStatic(variable: SingleVariable<
|
|
17
|
+
export declare function resolvePlainVariableStatic<T>(variable: SingleVariable<T>, snapshot: Snapshot, params: Params<string>): DerivedVariable | T;
|
|
17
18
|
//# sourceMappingURL=plain-variable.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plain-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/plain-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,QAAQ,EAA8B,MAAM,QAAQ,CAAC;AAEtG,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAA6B,MAAM,YAAY,CAAC;AAE3E,OAAO,
|
|
1
|
+
{"version":3,"file":"plain-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/plain-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,QAAQ,EAA8B,MAAM,QAAQ,CAAC;AAEtG,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAA6B,MAAM,YAAY,CAAC;AAE3E,OAAO,EACH,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGtB,MAAM,SAAS,CAAC;AASjB;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EACxC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,wBAAwB,EAClC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,GACtB,WAAW,CAAC,CAAC,CAAC,CAuJhB;AAED,wBAAgB,0BAA0B,CAAC,CAAC,EACxC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,EAC3B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GACvB,eAAe,GAAG,CAAC,CAoBrB"}
|
|
@@ -2,7 +2,7 @@ import { atomFamily, selectorFamily } from 'recoil';
|
|
|
2
2
|
import {} from '../../api';
|
|
3
3
|
import { RequestExtrasSerializable } from '../../api/http';
|
|
4
4
|
import { isEmbedded } from '../../shared/utils/embed';
|
|
5
|
-
import { isDerivedVariable } from '../../types';
|
|
5
|
+
import { isDerivedVariable, isPathParamStore, } from '../../types';
|
|
6
6
|
// eslint-disable-next-line import/no-cycle
|
|
7
7
|
import { STORES, getEffect, getOrRegisterDerivedVariable, resolveNested, setNested } from './internal';
|
|
8
8
|
import { StateSynchronizer } from './state-synchronizer';
|
|
@@ -123,14 +123,20 @@ export function getOrRegisterPlainVariable(variable, wsClient, taskContext, extr
|
|
|
123
123
|
}
|
|
124
124
|
return atomInstance;
|
|
125
125
|
}
|
|
126
|
-
export function resolvePlainVariableStatic(variable, snapshot) {
|
|
126
|
+
export function resolvePlainVariableStatic(variable, snapshot, params) {
|
|
127
|
+
// special case - when staticaly resolving param store variables
|
|
128
|
+
if (variable.store && isPathParamStore(variable.store)) {
|
|
129
|
+
return params[variable.store.param_name];
|
|
130
|
+
}
|
|
127
131
|
const family = atomFamilyRegistry.get(variable.uid);
|
|
128
132
|
if (family) {
|
|
129
133
|
const extrasSerializable = new RequestExtrasSerializable({});
|
|
130
|
-
const atomInstance = family(extrasSerializable);
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
+
const atomInstance = atomFamilyMembersRegistry.get(family).get(extrasSerializable.toJSON());
|
|
135
|
+
if (atomInstance) {
|
|
136
|
+
const atomValue = snapshot.getLoadable(atomInstance).valueMaybe();
|
|
137
|
+
if (atomValue !== null && !(atomValue instanceof Promise)) {
|
|
138
|
+
return atomValue;
|
|
139
|
+
}
|
|
134
140
|
}
|
|
135
141
|
}
|
|
136
142
|
return variable.default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plain-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/plain-variable.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plain-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/plain-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Params } from 'react-router';
|
|
1
2
|
import { type RecoilState, type Snapshot } from 'recoil';
|
|
2
3
|
import { type WebSocketClientInterface } from '../../api';
|
|
3
4
|
import { type RequestExtras } from '../../api/http';
|
|
@@ -8,7 +9,7 @@ export declare function resolveVariable<VariableType>(variable: AnyVariable<Vari
|
|
|
8
9
|
* Notable does not register variables if they haven't yet been registered.
|
|
9
10
|
* For plain variables, uses default values if not yet registered.
|
|
10
11
|
*/
|
|
11
|
-
export declare function resolveVariableStatic(variable: AnyVariable<any>, snapshot: Snapshot): any;
|
|
12
|
+
export declare function resolveVariableStatic(variable: AnyVariable<any>, snapshot: Snapshot, params: Params<string>): any;
|
|
12
13
|
/**
|
|
13
14
|
* Clean value to a format understood by the backend.
|
|
14
15
|
* Removes `deps`, preserves embedded `force_key` from resolved derived(data)variables.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAS9B,MAAM,SAAS,CAAC;AAMjB,wBAAsB,eAAe,CAAC,YAAY,EAC9C,QAAQ,EAAE,WAAW,CAAC,YAAY,CAAC,EACnC,MAAM,EAAE,wBAAwB,EAChC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,CACN,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,KAC/B,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,uBAAuB,GAAG,YAAY,CAAqC,GACrH,OAAO,CACN,WAAW,CAAC,YAAY,CAAC,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,sBAAsB,GAAG,YAAY,CACvH,CAkEA;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG,CA+
|
|
1
|
+
{"version":3,"file":"resolve-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,KAAK,wBAAwB,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,sBAAsB,EAS9B,MAAM,SAAS,CAAC;AAMjB,wBAAsB,eAAe,CAAC,YAAY,EAC9C,QAAQ,EAAE,WAAW,CAAC,YAAY,CAAC,EACnC,MAAM,EAAE,wBAAwB,EAChC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,aAAa,EACrB,QAAQ,GAAE,CACN,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,KAC/B,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,uBAAuB,GAAG,YAAY,CAAqC,GACrH,OAAO,CACN,WAAW,CAAC,YAAY,CAAC,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,sBAAsB,GAAG,YAAY,CACvH,CAkEA;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CA+DjH;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,CAuBhF;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQ9G;AAED;;;;;;GAMG;AAEH,wBAAgB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,GAAG,uBAAuB,CAAC,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,EAAE,CAE/G"}
|
|
@@ -81,10 +81,10 @@ export function resolveVariable(variable_1, client_1, taskContext_1, extras_1) {
|
|
|
81
81
|
* Notable does not register variables if they haven't yet been registered.
|
|
82
82
|
* For plain variables, uses default values if not yet registered.
|
|
83
83
|
*/
|
|
84
|
-
export function resolveVariableStatic(variable, snapshot) {
|
|
84
|
+
export function resolveVariableStatic(variable, snapshot, params) {
|
|
85
85
|
if (isDerivedVariable(variable)) {
|
|
86
86
|
// For derived variable, recursively resolve the dependencies
|
|
87
|
-
const values = variable.variables.map((v) => resolveVariableStatic(v, snapshot));
|
|
87
|
+
const values = variable.variables.map((v) => resolveVariableStatic(v, snapshot, params));
|
|
88
88
|
// Store indexes of values which are in deps
|
|
89
89
|
const deps = variable.deps.map((dep) => variable.variables.findIndex((v) => v.uid === dep.uid));
|
|
90
90
|
return {
|
|
@@ -100,15 +100,15 @@ export function resolveVariableStatic(variable, snapshot) {
|
|
|
100
100
|
if (isSwitchVariable(variable)) {
|
|
101
101
|
// For switch variables, we need to resolve the constituent parts
|
|
102
102
|
// and return a serialized representation similar to derived variables
|
|
103
|
-
let resolvedValue = isVariable(variable.value) ? resolveVariableStatic(variable.value, snapshot) : variable.value;
|
|
103
|
+
let resolvedValue = isVariable(variable.value) ? resolveVariableStatic(variable.value, snapshot, params) : variable.value;
|
|
104
104
|
// value could be a condition object, resolve its variable
|
|
105
105
|
if (isCondition(resolvedValue)) {
|
|
106
|
-
resolvedValue = Object.assign(Object.assign({}, resolvedValue), { variable: resolveVariableStatic(resolvedValue.variable, snapshot) });
|
|
106
|
+
resolvedValue = Object.assign(Object.assign({}, resolvedValue), { variable: resolveVariableStatic(resolvedValue.variable, snapshot, params) });
|
|
107
107
|
}
|
|
108
108
|
const resolvedValueMap = isVariable(variable.value_map) ?
|
|
109
|
-
resolveVariableStatic(variable.value_map, snapshot)
|
|
109
|
+
resolveVariableStatic(variable.value_map, snapshot, params)
|
|
110
110
|
: variable.value_map;
|
|
111
|
-
const resolvedDefault = isVariable(variable.default) ? resolveVariableStatic(variable.default, snapshot) : variable.default;
|
|
111
|
+
const resolvedDefault = isVariable(variable.default) ? resolveVariableStatic(variable.default, snapshot, params) : variable.default;
|
|
112
112
|
return {
|
|
113
113
|
type: 'switch',
|
|
114
114
|
uid: variable.uid,
|
|
@@ -123,10 +123,10 @@ export function resolveVariableStatic(variable, snapshot) {
|
|
|
123
123
|
throw new Error('StateVariable should not be resolved - it should be handled by useVariable hook');
|
|
124
124
|
}
|
|
125
125
|
// plain variable
|
|
126
|
-
let result = resolvePlainVariableStatic(variable, snapshot);
|
|
126
|
+
let result = resolvePlainVariableStatic(variable, snapshot, params);
|
|
127
127
|
// unwrap if variable.default is a derived variable, i.e. used create_from_derived
|
|
128
128
|
while (isDerivedVariable(result)) {
|
|
129
|
-
result = resolveVariableStatic(result, snapshot);
|
|
129
|
+
result = resolveVariableStatic(result, snapshot, params);
|
|
130
130
|
}
|
|
131
131
|
return result;
|
|
132
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"resolve-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/resolve-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Params } from 'react-router';
|
|
1
2
|
import { type Snapshot } from 'recoil';
|
|
2
3
|
import { type AnyVariable, type ComponentInstance, type PyComponentInstance } from '../../types';
|
|
3
4
|
import { preloadDerivedValue } from './derived-variable';
|
|
@@ -8,7 +9,7 @@ import { preloadDerivedValue } from './derived-variable';
|
|
|
8
9
|
* @param trigger whether it's a trigger key
|
|
9
10
|
*/
|
|
10
11
|
export declare function getComponentRegistryKey(uid: string, trigger?: boolean, loopInstanceUid?: string): string;
|
|
11
|
-
export declare function preloadServerComponent(component: PyComponentInstance, snapshot: Snapshot): ReturnType<typeof preloadDerivedValue>;
|
|
12
|
+
export declare function preloadServerComponent(component: PyComponentInstance, snapshot: Snapshot, params: Params<string>): ReturnType<typeof preloadDerivedValue>;
|
|
12
13
|
/**
|
|
13
14
|
* A hook to fetch a server component
|
|
14
15
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-server-component.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"AAGA,OAAO,EAGH,KAAK,QAAQ,EAKhB,MAAM,QAAQ,CAAC;AAShB,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,iBAAiB,EAGtB,KAAK,mBAAmB,EAG3B,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,mBAAmB,EAAuB,MAAM,oBAAoB,CAAC;AAe9E;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAYxG;AAiRD,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"use-server-component.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAGH,KAAK,QAAQ,EAKhB,MAAM,QAAQ,CAAC;AAShB,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,iBAAiB,EAGtB,KAAK,mBAAmB,EAG3B,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,mBAAmB,EAAuB,MAAM,oBAAoB,CAAC;AAe9E;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,CAYxG;AAiRD,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GACvB,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAsBxC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,EAC/C,iBAAiB,CAAC,EAAE,MAAM,GAC3B,iBAAiB,CAoCnB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,CAa7F"}
|
|
@@ -149,7 +149,7 @@ function getOrRegisterServerComponent({ name, uid, dynamicKwargs, wsClient, task
|
|
|
149
149
|
let shouldFetchTask = false;
|
|
150
150
|
if (derivedResult.type === 'cached') {
|
|
151
151
|
try {
|
|
152
|
-
const response = yield derivedResult.response;
|
|
152
|
+
const response = yield derivedResult.response.getValue();
|
|
153
153
|
shouldFetchTask = true;
|
|
154
154
|
if (!response.ok) {
|
|
155
155
|
throwError(new Error(response.value));
|
|
@@ -236,7 +236,7 @@ function getOrRegisterServerComponent({ name, uid, dynamicKwargs, wsClient, task
|
|
|
236
236
|
selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
|
|
237
237
|
return selectorInstance;
|
|
238
238
|
}
|
|
239
|
-
export function preloadServerComponent(component, snapshot) {
|
|
239
|
+
export function preloadServerComponent(component, snapshot, params) {
|
|
240
240
|
const key = getComponentRegistryKey(component.uid, false, component.loop_instance_uid);
|
|
241
241
|
const kwargsList = Object.values(component.props.dynamic_kwargs);
|
|
242
242
|
const triggerList = buildTriggerList(kwargsList);
|
|
@@ -252,6 +252,7 @@ export function preloadServerComponent(component, snapshot) {
|
|
|
252
252
|
triggerList,
|
|
253
253
|
triggers,
|
|
254
254
|
snapshot,
|
|
255
|
+
params,
|
|
255
256
|
});
|
|
256
257
|
}
|
|
257
258
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-server-component.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,gDAAgD;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"use-server-component.js","sourceRoot":"","sources":["../../../js/shared/interactivity/use-server-component.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,17 @@
|
|
|
1
1
|
import { WebSocketClient } from '../../api';
|
|
2
2
|
import type { DaraData } from '../../types/core';
|
|
3
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Create a loader function for the authenticated root.
|
|
5
|
+
* This will ensure the WS client is set up at the time of running all loaders,
|
|
6
|
+
* which is required as other loaders will need to access the WS client.
|
|
7
|
+
*/
|
|
8
|
+
export declare function createAuthenticatedRootLoader(daraData: DaraData): () => void;
|
|
9
|
+
interface AuthenticatedRootProps {
|
|
4
10
|
daraData: DaraData;
|
|
5
11
|
initialWebsocketClient?: WebSocketClient;
|
|
6
12
|
}
|
|
7
13
|
/**
|
|
8
14
|
* The TemplateRoot component is rendered at the root of every authenticated application */
|
|
9
|
-
declare function
|
|
10
|
-
export default
|
|
15
|
+
declare function AuthenticatedRoot(props: AuthenticatedRootProps): React.ReactNode;
|
|
16
|
+
export default AuthenticatedRoot;
|
|
11
17
|
//# sourceMappingURL=authenticated-root.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticated-root.d.ts","sourceRoot":"","sources":["../../../js/shared/root/authenticated-root.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAkB,MAAM,OAAO,CAAC;AAOxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AA0C7C,UAAU,
|
|
1
|
+
{"version":3,"file":"authenticated-root.d.ts","sourceRoot":"","sources":["../../../js/shared/root/authenticated-root.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAkB,MAAM,OAAO,CAAC;AAOxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AA0C7C;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,QAAQ,cAY/D;AAED,UAAU,sBAAsB;IAC5B,QAAQ,EAAE,QAAQ,CAAC;IAEnB,sBAAsB,CAAC,EAAE,eAAe,CAAC;CAC5C;AAED;2FAC2F;AAC3F,iBAAS,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,KAAK,CAAC,SAAS,CAmDzE;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useEffect, useLayoutEffect, useState } from 'react';
|
|
3
|
-
import { Outlet, useNavigate } from 'react-router';
|
|
3
|
+
import { Outlet, redirect, useNavigate } from 'react-router';
|
|
4
4
|
import styled from '@darajs/styled-components';
|
|
5
5
|
import { NotificationWrapper } from '@darajs/ui-notifications';
|
|
6
6
|
import { WebSocketClient, setupWebsocket } from '../../api';
|
|
7
7
|
import { resolveReferrer } from '../../auth';
|
|
8
|
-
import { onTokenChange, useSessionToken } from '../../auth/use-session-token';
|
|
8
|
+
import { getSessionToken, onTokenChange, useSessionToken } from '../../auth/use-session-token';
|
|
9
9
|
import { DevTools } from '../../devtools';
|
|
10
10
|
import { WebSocketCtx } from '../../shared/context';
|
|
11
11
|
import { cleanSessionCache } from '../../shared/utils';
|
|
@@ -48,19 +48,34 @@ const RootWrapper = styled.div `
|
|
|
48
48
|
border-radius: 100px;
|
|
49
49
|
}
|
|
50
50
|
`;
|
|
51
|
+
/**
|
|
52
|
+
* Create a loader function for the authenticated root.
|
|
53
|
+
* This will ensure the WS client is set up at the time of running all loaders,
|
|
54
|
+
* which is required as other loaders will need to access the WS client.
|
|
55
|
+
*/
|
|
56
|
+
export function createAuthenticatedRootLoader(daraData) {
|
|
57
|
+
return function loader() {
|
|
58
|
+
// ensure ws client is set up
|
|
59
|
+
if (window.dara.ws.status === 'pending') {
|
|
60
|
+
const token = getSessionToken();
|
|
61
|
+
if (!token) {
|
|
62
|
+
// eslint-disable-next-line @typescript-eslint/only-throw-error
|
|
63
|
+
throw redirect('/login');
|
|
64
|
+
}
|
|
65
|
+
window.dara.ws.resolve(setupWebsocket(token, daraData.live_reload));
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
}
|
|
51
69
|
/**
|
|
52
70
|
* The TemplateRoot component is rendered at the root of every authenticated application */
|
|
53
|
-
function
|
|
71
|
+
function AuthenticatedRoot(props) {
|
|
54
72
|
const navigate = useNavigate();
|
|
55
73
|
const token = useSessionToken();
|
|
56
|
-
// create a WS client once, token will be updated separately
|
|
57
74
|
const [wsClient] = useState(() => {
|
|
58
75
|
if (props.initialWebsocketClient) {
|
|
59
76
|
return props.initialWebsocketClient;
|
|
60
77
|
}
|
|
61
|
-
|
|
62
|
-
window.dara.ws.resolve(ws);
|
|
63
|
-
return ws;
|
|
78
|
+
return window.dara.ws.getOrThrow();
|
|
64
79
|
});
|
|
65
80
|
useLayoutEffect(() => {
|
|
66
81
|
if (token) {
|
|
@@ -82,5 +97,5 @@ function TemplateRoot(props) {
|
|
|
82
97
|
}, [wsClient]);
|
|
83
98
|
return (_jsx(WebSocketCtx.Provider, { value: { client: wsClient }, children: _jsx(RegistriesCtxProvider, { componentRegistry: props.daraData.components, actionRegistry: props.daraData.actions, children: _jsx(DynamicContext, { contextComponents: props.daraData.context_components, children: _jsx(StoreProviders, { children: _jsx(ServerVariableSyncProvider, { children: _jsxs(RootWrapper, { children: [_jsx(NotificationWrapper, {}), _jsx(Outlet, {}), _jsx(VariableStateProvider, { wsClient: wsClient }), props.daraData.enable_devtools && _jsx(DevTools, {})] }) }) }) }) }) }));
|
|
84
99
|
}
|
|
85
|
-
export default
|
|
100
|
+
export default AuthenticatedRoot;
|
|
86
101
|
//# sourceMappingURL=authenticated-root.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticated-root.js","sourceRoot":"","sources":["../../../js/shared/root/authenticated-root.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"authenticated-root.js","sourceRoot":"","sources":["../../../js/shared/root/authenticated-root.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,31 @@
|
|
|
1
1
|
export interface Deferred<T> {
|
|
2
|
-
|
|
2
|
+
/**
|
|
3
|
+
* Resolve the deferred promise with a value
|
|
4
|
+
*/
|
|
3
5
|
resolve: (value: T) => void;
|
|
6
|
+
/**
|
|
7
|
+
* Reject the deferred promise with an error
|
|
8
|
+
*/
|
|
4
9
|
reject: (reason?: any) => void;
|
|
10
|
+
/**
|
|
11
|
+
* The status of the deferred promise
|
|
12
|
+
*/
|
|
13
|
+
status: 'pending' | 'resolved' | 'rejected';
|
|
14
|
+
/**
|
|
15
|
+
* Get the value of the deferred promise, throwing if it's not resolved yet
|
|
16
|
+
*/
|
|
17
|
+
getOrThrow(): T;
|
|
18
|
+
/**
|
|
19
|
+
* Get the value of the deferred promise, blocking if it's not resolved yet
|
|
20
|
+
* */
|
|
21
|
+
getValue(): Promise<T>;
|
|
5
22
|
}
|
|
6
23
|
/**
|
|
7
24
|
* Create a deferred promise
|
|
8
25
|
*/
|
|
9
26
|
export declare function deferred<T>(): Deferred<T>;
|
|
27
|
+
/**
|
|
28
|
+
* Check if a value is a Deferred
|
|
29
|
+
*/
|
|
30
|
+
export declare function isDeferred<T = any>(value: any): value is Deferred<T>;
|
|
10
31
|
//# sourceMappingURL=deferred.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deferred.d.ts","sourceRoot":"","sources":["../../../js/shared/utils/deferred.tsx"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ,CAAC,CAAC;IACvB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"deferred.d.ts","sourceRoot":"","sources":["../../../js/shared/utils/deferred.tsx"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ,CAAC,CAAC;IACvB;;OAEG;IACH,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B;;OAEG;IACH,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,UAAU,CAAC;IAC5C;;OAEG;IACH,UAAU,IAAI,CAAC,CAAC;IAChB;;SAEK;IACL,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAC1B;AAuED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAEzC;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,CAGpE"}
|