@darajs/core 1.4.5 → 1.5.0
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/actions/download-variable.js +1 -1
- package/dist/actions/download-variable.js.map +1 -1
- package/dist/actions/navigate-to.js.map +1 -1
- package/dist/actions/reset-variables.d.ts.map +1 -1
- package/dist/actions/reset-variables.js +1 -1
- package/dist/actions/reset-variables.js.map +1 -1
- package/dist/actions/update-variable.d.ts.map +1 -1
- package/dist/actions/update-variable.js +1 -1
- package/dist/actions/update-variable.js.map +1 -1
- package/dist/api/core.d.ts +3 -2
- package/dist/api/core.d.ts.map +1 -1
- package/dist/api/core.js +13 -13
- package/dist/api/core.js.map +1 -1
- package/dist/api/http.d.ts +27 -2
- package/dist/api/http.d.ts.map +1 -1
- package/dist/api/http.js +49 -5
- package/dist/api/http.js.map +1 -1
- package/dist/api/index.d.ts +1 -1
- package/dist/api/index.d.ts.map +1 -1
- package/dist/api/index.js.map +1 -1
- package/dist/api/websocket.js.map +1 -1
- package/dist/auth/auth-wrapper.js.map +1 -1
- package/dist/auth/auth.d.ts.map +1 -1
- package/dist/auth/auth.js +3 -3
- package/dist/auth/auth.js.map +1 -1
- package/dist/auth/basic/basic-auth-login.js.map +1 -1
- package/dist/auth/default/default-auth-login.js.map +1 -1
- package/dist/components/for/for.js.map +1 -1
- package/dist/components/progress-tracker/progress-tracker.js.map +1 -1
- package/dist/{dara_core-1.4.5-py3-none-any.whl → dara_core-1.5.0-py3-none-any.whl} +0 -0
- package/dist/devtools/devtools-wrapper.js.map +1 -1
- package/dist/devtools/floating-button.js.map +1 -1
- package/dist/devtools/use-move.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/run.js.map +1 -1
- package/dist/shared/context/global-task-context.d.ts.map +1 -1
- package/dist/shared/context/global-task-context.js +6 -4
- package/dist/shared/context/global-task-context.js.map +1 -1
- package/dist/shared/context/index.d.ts +1 -0
- package/dist/shared/context/index.d.ts.map +1 -1
- package/dist/shared/context/index.js +1 -0
- package/dist/shared/context/index.js.map +1 -1
- package/dist/shared/context/request-extras-context.d.ts +35 -0
- package/dist/shared/context/request-extras-context.d.ts.map +1 -0
- package/dist/shared/context/request-extras-context.js +61 -0
- package/dist/shared/context/request-extras-context.js.map +1 -0
- package/dist/shared/dynamic-component/dynamic-component.js +1 -1
- package/dist/shared/dynamic-component/dynamic-component.js.map +1 -1
- package/dist/shared/error-handling/types.d.ts +2 -1
- package/dist/shared/error-handling/types.d.ts.map +1 -1
- package/dist/shared/error-handling/types.js +2 -2
- package/dist/shared/error-handling/types.js.map +1 -1
- package/dist/shared/index.d.ts +1 -1
- package/dist/shared/index.d.ts.map +1 -1
- package/dist/shared/index.js +1 -1
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/interactivity/data-variable.d.ts +5 -6
- package/dist/shared/interactivity/data-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/data-variable.js +19 -21
- package/dist/shared/interactivity/data-variable.js.map +1 -1
- package/dist/shared/interactivity/derived-variable.d.ts +18 -11
- package/dist/shared/interactivity/derived-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/derived-variable.js +87 -46
- package/dist/shared/interactivity/derived-variable.js.map +1 -1
- package/dist/shared/interactivity/filtering.js.map +1 -1
- package/dist/shared/interactivity/index.d.ts +1 -1
- package/dist/shared/interactivity/index.d.ts.map +1 -1
- package/dist/shared/interactivity/index.js +0 -1
- package/dist/shared/interactivity/index.js.map +1 -1
- package/dist/shared/interactivity/nested.js.map +1 -1
- package/dist/shared/interactivity/plain-variable.d.ts +5 -4
- package/dist/shared/interactivity/plain-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/plain-variable.js +145 -46
- package/dist/shared/interactivity/plain-variable.js.map +1 -1
- package/dist/shared/interactivity/resolve-value.js.map +1 -1
- package/dist/shared/interactivity/resolve-variable.d.ts +3 -3
- package/dist/shared/interactivity/resolve-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/resolve-variable.js +5 -6
- package/dist/shared/interactivity/resolve-variable.js.map +1 -1
- package/dist/shared/interactivity/store.d.ts +41 -8
- package/dist/shared/interactivity/store.d.ts.map +1 -1
- package/dist/shared/interactivity/store.js +55 -23
- package/dist/shared/interactivity/store.js.map +1 -1
- package/dist/shared/interactivity/triggers.js.map +1 -1
- package/dist/shared/interactivity/url-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/url-variable.js +1 -2
- package/dist/shared/interactivity/url-variable.js.map +1 -1
- package/dist/shared/interactivity/use-any-variable.js.map +1 -1
- package/dist/shared/interactivity/use-data-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/use-data-variable.js +3 -6
- package/dist/shared/interactivity/use-data-variable.js.map +1 -1
- package/dist/shared/interactivity/use-refresh-selector.d.ts +1 -1
- package/dist/shared/interactivity/use-refresh-selector.d.ts.map +1 -1
- package/dist/shared/interactivity/use-refresh-selector.js +9 -5
- package/dist/shared/interactivity/use-refresh-selector.js.map +1 -1
- package/dist/shared/interactivity/use-server-component.d.ts.map +1 -1
- package/dist/shared/interactivity/use-server-component.js +45 -29
- package/dist/shared/interactivity/use-server-component.js.map +1 -1
- package/dist/shared/interactivity/use-variable-state.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable-state.js +5 -14
- package/dist/shared/interactivity/use-variable-state.js.map +1 -1
- package/dist/shared/interactivity/use-variable-value.d.ts +2 -1
- package/dist/shared/interactivity/use-variable-value.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable-value.js +13 -10
- package/dist/shared/interactivity/use-variable-value.js.map +1 -1
- package/dist/shared/interactivity/use-variable.d.ts.map +1 -1
- package/dist/shared/interactivity/use-variable.js +5 -8
- package/dist/shared/interactivity/use-variable.js.map +1 -1
- package/dist/shared/private-route/private-route.js.map +1 -1
- package/dist/shared/template-root/dynamic-context.js.map +1 -1
- package/dist/shared/template-root/template-root.js.map +1 -1
- package/dist/shared/utils/clean-session-cache.js.map +1 -1
- package/dist/shared/utils/embed.js.map +1 -1
- package/dist/shared/utils/get-icon.js.map +1 -1
- package/dist/shared/utils/hashing.js.map +1 -1
- package/dist/shared/utils/inject-css.js.map +1 -1
- package/dist/shared/utils/normalization.js.map +1 -1
- package/dist/shared/utils/resolve-theme.js.map +1 -1
- package/dist/shared/utils/templating.js.map +1 -1
- package/dist/shared/utils/use-action-registry.js.map +1 -1
- package/dist/shared/utils/use-action.d.ts +7 -3
- package/dist/shared/utils/use-action.d.ts.map +1 -1
- package/dist/shared/utils/use-action.js +45 -41
- package/dist/shared/utils/use-action.js.map +1 -1
- package/dist/shared/utils/use-component-registry.d.ts.map +1 -1
- package/dist/shared/utils/use-component-registry.js +3 -4
- package/dist/shared/utils/use-component-registry.js.map +1 -1
- package/dist/shared/utils/use-component-styles.js.map +1 -1
- package/dist/shared/utils/use-defer-loadable.js.map +1 -1
- package/dist/shared/utils/use-interval.js.map +1 -1
- package/dist/shared/utils/use-url-sync.js.map +1 -1
- package/dist/shared/utils/use-window-title.js.map +1 -1
- package/dist/types/core.d.ts +9 -4
- package/dist/types/core.d.ts.map +1 -1
- package/dist/types/core.js.map +1 -1
- package/dist/umd/dara.core.umd.js +22780 -30228
- package/dist/utils.d.ts +9 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +10 -1
- package/dist/utils.js.map +1 -1
- package/package.json +11 -11
|
@@ -13,7 +13,7 @@ import { atom } from 'recoil';
|
|
|
13
13
|
import { HTTP_METHOD, validateResponse } from '@darajs/ui-utils';
|
|
14
14
|
import { fetchTaskResult } from '../../api';
|
|
15
15
|
import { request } from '../../api/http';
|
|
16
|
-
import {
|
|
16
|
+
import { useRequestExtras } from '../context';
|
|
17
17
|
import { combineFilters } from './filtering';
|
|
18
18
|
import { atomRegistry } from './store';
|
|
19
19
|
/**
|
|
@@ -54,14 +54,14 @@ function createDataUrl(path, pagination) {
|
|
|
54
54
|
* Retrieve the value of a data variable from the backend
|
|
55
55
|
*
|
|
56
56
|
* @param uid
|
|
57
|
-
* @param
|
|
57
|
+
* @param extras request extras to be merged into the options
|
|
58
58
|
* @param filters
|
|
59
59
|
* @param pagination
|
|
60
60
|
*/
|
|
61
|
-
export function fetchDataVariable(uid,
|
|
61
|
+
export function fetchDataVariable(uid, extras, filters, pagination) {
|
|
62
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
63
|
const url = createDataUrl(`/api/core/data-variable/${uid}`, pagination);
|
|
64
|
-
const response = yield request(url, { body: JSON.stringify({ filters }), method: HTTP_METHOD.POST },
|
|
64
|
+
const response = yield request(url, { body: JSON.stringify({ filters }), method: HTTP_METHOD.POST }, extras);
|
|
65
65
|
yield validateResponse(response, 'Failed to fetch data variable');
|
|
66
66
|
return response.json();
|
|
67
67
|
});
|
|
@@ -73,16 +73,16 @@ export function isDataResponse(response) {
|
|
|
73
73
|
* Retrieve the value of a derived data variable from the backend
|
|
74
74
|
*
|
|
75
75
|
* @param uid
|
|
76
|
-
* @param
|
|
76
|
+
* @param extras request extras to be merged into the options
|
|
77
77
|
* @param filters
|
|
78
78
|
* @param pagination
|
|
79
79
|
* @param cacheKey - cache key of the underlying DV, required for DerivedDataVariables
|
|
80
80
|
* @param wsChannel - websocket channel, required for DerivedDataVariables
|
|
81
81
|
*/
|
|
82
|
-
export function fetchDerivedDataVariable(uid,
|
|
82
|
+
export function fetchDerivedDataVariable(uid, extras, cacheKey, wsChannel, filters, pagination) {
|
|
83
83
|
return __awaiter(this, void 0, void 0, function* () {
|
|
84
84
|
const url = createDataUrl(`/api/core/data-variable/${uid}`, pagination);
|
|
85
|
-
const response = yield request(url, { body: JSON.stringify({ cache_key: cacheKey, filters, ws_channel: wsChannel }), method: HTTP_METHOD.POST },
|
|
85
|
+
const response = yield request(url, { body: JSON.stringify({ cache_key: cacheKey, filters, ws_channel: wsChannel }), method: HTTP_METHOD.POST }, extras);
|
|
86
86
|
yield validateResponse(response, 'Failed to fetch data variable');
|
|
87
87
|
return response.json();
|
|
88
88
|
});
|
|
@@ -91,12 +91,12 @@ export function fetchDerivedDataVariable(uid, token, cacheKey, wsChannel, filter
|
|
|
91
91
|
* Get total count of data in a data variable
|
|
92
92
|
*
|
|
93
93
|
* @param uid uid of the variable
|
|
94
|
-
* @param
|
|
94
|
+
* @param extras request extras to be merged into the options
|
|
95
95
|
* @param cacheKey cache key of the underlying DV in the case of derived data variables
|
|
96
96
|
*/
|
|
97
|
-
function fetchDataVariableCount(uid,
|
|
97
|
+
function fetchDataVariableCount(uid, extras, filters, cacheKey) {
|
|
98
98
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
-
const response = yield request(`/api/core/data-variable/${uid}/count`, { body: JSON.stringify({ cache_key: cacheKey, filters }), method: HTTP_METHOD.POST },
|
|
99
|
+
const response = yield request(`/api/core/data-variable/${uid}/count`, { body: JSON.stringify({ cache_key: cacheKey, filters }), method: HTTP_METHOD.POST }, extras);
|
|
100
100
|
yield validateResponse(response, 'Failed to fetch data variable total count');
|
|
101
101
|
return response.json();
|
|
102
102
|
});
|
|
@@ -105,20 +105,19 @@ function fetchDataVariableCount(uid, token, filters, cacheKey) {
|
|
|
105
105
|
* Get a callback to fetch data variable from the backend
|
|
106
106
|
*
|
|
107
107
|
* @param variable variable instance
|
|
108
|
-
* @param token session token
|
|
109
108
|
* @param serverTriggerCounter a counter to force recreation of the callback
|
|
110
109
|
*/
|
|
111
110
|
export function useFetchDataVariable(variable, serverTriggerCounter) {
|
|
112
|
-
const
|
|
111
|
+
const extras = useRequestExtras();
|
|
113
112
|
const dataCallback = useCallback((filters, pagination) => __awaiter(this, void 0, void 0, function* () {
|
|
114
113
|
const mergedFilters = combineFilters('AND', [variable.filters, filters]);
|
|
115
|
-
const data = yield fetchDataVariable(variable.uid,
|
|
116
|
-
const totalCount = yield fetchDataVariableCount(variable.uid,
|
|
114
|
+
const data = yield fetchDataVariable(variable.uid, extras, mergedFilters, pagination);
|
|
115
|
+
const totalCount = yield fetchDataVariableCount(variable.uid, extras, mergedFilters);
|
|
117
116
|
return {
|
|
118
117
|
data,
|
|
119
118
|
totalCount,
|
|
120
119
|
};
|
|
121
|
-
}), [variable,
|
|
120
|
+
}), [variable, extras, serverTriggerCounter]);
|
|
122
121
|
return dataCallback;
|
|
123
122
|
}
|
|
124
123
|
/**
|
|
@@ -129,15 +128,14 @@ export function useFetchDataVariable(variable, serverTriggerCounter) {
|
|
|
129
128
|
* @param taskContext global task context
|
|
130
129
|
* @param wsClient websocket client instance
|
|
131
130
|
* @param dvValuePromise promise representing underlying derived variable state
|
|
132
|
-
* @param token session token
|
|
133
131
|
*/
|
|
134
132
|
export function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvValuePromise) {
|
|
135
|
-
const
|
|
133
|
+
const extras = useRequestExtras();
|
|
136
134
|
const previousResult = useRef({ data: null, totalCount: 0 });
|
|
137
135
|
const dataCallback = useCallback((filters, pagination) => __awaiter(this, void 0, void 0, function* () {
|
|
138
136
|
const mergedFilters = combineFilters('AND', [variable.filters, filters]);
|
|
139
137
|
const dvValue = yield dvValuePromise;
|
|
140
|
-
const response = yield fetchDerivedDataVariable(variable.uid,
|
|
138
|
+
const response = yield fetchDerivedDataVariable(variable.uid, extras, dvValue.cache_key, yield wsClient.getChannel(), mergedFilters, pagination);
|
|
141
139
|
let data = null;
|
|
142
140
|
const variableTaskId = `${variable.uid}-filter`;
|
|
143
141
|
// cancel previously running filter tasks
|
|
@@ -159,7 +157,7 @@ export function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvV
|
|
|
159
157
|
finally {
|
|
160
158
|
taskContext.endTask(taskId);
|
|
161
159
|
}
|
|
162
|
-
data = yield fetchTaskResult(taskId,
|
|
160
|
+
data = yield fetchTaskResult(taskId, extras);
|
|
163
161
|
}
|
|
164
162
|
else {
|
|
165
163
|
// otherwise use response directly
|
|
@@ -167,13 +165,13 @@ export function useFetchDerivedDataVariable(variable, taskContext, wsClient, dvV
|
|
|
167
165
|
}
|
|
168
166
|
// For derived data variables count can only be fetched when task is not running so we have to make the request here
|
|
169
167
|
// As the total count could have changed because of the underlying DV changing
|
|
170
|
-
const totalCount = yield fetchDataVariableCount(variable.uid,
|
|
168
|
+
const totalCount = yield fetchDataVariableCount(variable.uid, extras, mergedFilters, dvValue.cache_key);
|
|
171
169
|
previousResult.current = { data, totalCount };
|
|
172
170
|
return {
|
|
173
171
|
data,
|
|
174
172
|
totalCount,
|
|
175
173
|
};
|
|
176
|
-
}), [variable,
|
|
174
|
+
}), [variable, extras, dvValuePromise]);
|
|
177
175
|
return dataCallback;
|
|
178
176
|
}
|
|
179
177
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/data-variable.tsx"],"names":[],"mappings":"AAAA,gDAAgD;;;;;;;;;;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAA4B,eAAe,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,
|
|
1
|
+
{"version":3,"file":"data-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/data-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { GetRecoilValue, RecoilValue } from 'recoil';
|
|
2
2
|
import { WebSocketClientInterface } from '../../api';
|
|
3
|
+
import { RequestExtras } from '../../api/http';
|
|
3
4
|
import { GlobalTaskContext } from '../../shared/context/global-task-context';
|
|
4
5
|
import { AnyVariable, DerivedDataVariable, DerivedVariable, ResolvedDataVariable, ResolvedDerivedDataVariable, ResolvedDerivedVariable } from '../../types';
|
|
5
6
|
import { TriggerIndexValue } from './store';
|
|
@@ -21,11 +22,18 @@ interface DerivedVariableTaskResponse {
|
|
|
21
22
|
export declare function formatDerivedVariableRequest(values: Array<any | ResolvedDerivedVariable>): any[];
|
|
22
23
|
interface FetchDerivedVariableArgs {
|
|
23
24
|
cache: DerivedVariable['cache'];
|
|
25
|
+
extras: RequestExtras;
|
|
24
26
|
force: boolean;
|
|
25
27
|
is_data_variable?: boolean;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
+
/**
|
|
29
|
+
* selector instance key - each selector's requests should be treated separately
|
|
30
|
+
*/
|
|
31
|
+
selectorKey: string;
|
|
28
32
|
values: Record<string | number, any>;
|
|
33
|
+
/**
|
|
34
|
+
* Variable uid
|
|
35
|
+
*/
|
|
36
|
+
variableUid: string;
|
|
29
37
|
wsClient: WebSocketClientInterface;
|
|
30
38
|
}
|
|
31
39
|
/**
|
|
@@ -34,12 +42,12 @@ interface FetchDerivedVariableArgs {
|
|
|
34
42
|
* @param input Function inputs
|
|
35
43
|
* - `cache`, the cache option for the derived variable.
|
|
36
44
|
* - `force`, send force=true in the request body
|
|
37
|
-
* - `
|
|
45
|
+
* - `extras`, request extras to be merged into the options
|
|
38
46
|
* - `uid`, the uid of the derived variable
|
|
39
47
|
* - `values`, values to pass in the request
|
|
40
48
|
* - `wsClient`, websocket client
|
|
41
49
|
*/
|
|
42
|
-
export declare function fetchDerivedVariable<T>({ cache, force,
|
|
50
|
+
export declare function fetchDerivedVariable<T>({ cache, force, extras, variableUid, values, wsClient, is_data_variable, }: FetchDerivedVariableArgs): Promise<DerivedVariableResponse<T>>;
|
|
43
51
|
/**
|
|
44
52
|
* Resolve a value to a format understood by the backend, resolving atoms to values.
|
|
45
53
|
*
|
|
@@ -124,10 +132,9 @@ export declare function resolveDerivedValue(key: string, variables: AnyVariable<
|
|
|
124
132
|
* @param variable variable to register
|
|
125
133
|
* @param wsClient WebSocket client from context
|
|
126
134
|
* @param tasks tasks list from context
|
|
127
|
-
* @param
|
|
128
|
-
* @param sessionToken session token from context
|
|
135
|
+
* @param currentExtras request extras to be merged into the options
|
|
129
136
|
*/
|
|
130
|
-
export declare function getOrRegisterDerivedVariable(variable: DerivedVariable | DerivedDataVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext,
|
|
137
|
+
export declare function getOrRegisterDerivedVariable(variable: DerivedVariable | DerivedDataVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<DerivedVariableValueResponse<any>>;
|
|
131
138
|
/**
|
|
132
139
|
* Get a derived selector for a derived variable.
|
|
133
140
|
* Retrieves the value of the derived variable directly instead of returning an object with cache_key and value.
|
|
@@ -136,9 +143,9 @@ export declare function getOrRegisterDerivedVariable(variable: DerivedVariable |
|
|
|
136
143
|
* @param wsClient WebSocket client from context
|
|
137
144
|
* @param taskContext global task context
|
|
138
145
|
* @param search search query from location
|
|
139
|
-
* @param
|
|
146
|
+
* @param extras request extras to be merged into the options
|
|
140
147
|
*/
|
|
141
|
-
export declare function getOrRegisterDerivedVariableValue(variable: DerivedVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext,
|
|
148
|
+
export declare function getOrRegisterDerivedVariableValue(variable: DerivedVariable, wsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, currentExtras: RequestExtras): RecoilValue<any>;
|
|
142
149
|
/**
|
|
143
150
|
* Helper hook to get the (data) derived variable selector, while correctly registering triggers and setting up polling interval.
|
|
144
151
|
*
|
|
@@ -146,8 +153,8 @@ export declare function getOrRegisterDerivedVariableValue(variable: DerivedVaria
|
|
|
146
153
|
* @param WsClient websocket client instance
|
|
147
154
|
* @param taskContext global task context
|
|
148
155
|
* @param search search query
|
|
149
|
-
* @param
|
|
156
|
+
* @param extras request extras to be merged into the options
|
|
150
157
|
*/
|
|
151
|
-
export declare function useDerivedVariable(variable: DerivedVariable | DerivedDataVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext,
|
|
158
|
+
export declare function useDerivedVariable(variable: DerivedVariable | DerivedDataVariable, WsClient: WebSocketClientInterface, taskContext: GlobalTaskContext, extras: RequestExtras): RecoilValue<DerivedVariableValueResponse<any>>;
|
|
152
159
|
export {};
|
|
153
160
|
//# 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":"AAIA,OAAO,EAAE,cAAc,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,19 +21,20 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
21
21
|
};
|
|
22
22
|
import { isEqual } from 'lodash';
|
|
23
23
|
import { useCallback, useMemo } from 'react';
|
|
24
|
-
import {
|
|
24
|
+
import { selectorFamily, useRecoilValue, useSetRecoilState } from 'recoil';
|
|
25
25
|
import { BehaviorSubject, from } from 'rxjs';
|
|
26
26
|
import { debounceTime, filter, share, switchMap, take } from 'rxjs/operators';
|
|
27
27
|
import shortid from 'shortid';
|
|
28
28
|
import { HTTP_METHOD, validateResponse } from '@darajs/ui-utils';
|
|
29
29
|
import { fetchTaskResult, request } from '../../api';
|
|
30
|
+
import { RequestExtrasSerializable } from '../../api/http';
|
|
30
31
|
import { getUniqueIdentifier } from '../../shared/utils/hashing';
|
|
31
32
|
import { normalizeRequest } from '../../shared/utils/normalization';
|
|
32
33
|
import useInterval from '../../shared/utils/use-interval';
|
|
33
34
|
import { isDerivedDataVariable, isDerivedVariable, isResolvedDataVariable, isResolvedDerivedDataVariable, isResolvedDerivedVariable, } from '../../types';
|
|
34
35
|
// eslint-disable-next-line import/no-cycle
|
|
35
36
|
import { getOrRegisterTrigger, registerChildTriggers, resolveNested, resolveVariable } from './internal';
|
|
36
|
-
import { depsRegistry, getRegistryKey,
|
|
37
|
+
import { depsRegistry, getRegistryKey, selectorFamilyMembersRegistry, selectorFamilyRegistry, } from './store';
|
|
37
38
|
export function isTaskResponse(dvResponse) {
|
|
38
39
|
return 'task_id' in dvResponse;
|
|
39
40
|
}
|
|
@@ -61,12 +62,12 @@ export function formatDerivedVariableRequest(values) {
|
|
|
61
62
|
* @param input Function inputs
|
|
62
63
|
* - `cache`, the cache option for the derived variable.
|
|
63
64
|
* - `force`, send force=true in the request body
|
|
64
|
-
* - `
|
|
65
|
+
* - `extras`, request extras to be merged into the options
|
|
65
66
|
* - `uid`, the uid of the derived variable
|
|
66
67
|
* - `values`, values to pass in the request
|
|
67
68
|
* - `wsClient`, websocket client
|
|
68
69
|
*/
|
|
69
|
-
export function fetchDerivedVariable({ cache, force,
|
|
70
|
+
export function fetchDerivedVariable({ cache, force, extras, variableUid, values, wsClient, is_data_variable = false, }) {
|
|
70
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
72
|
const cacheControl = cache === null
|
|
72
73
|
? {
|
|
@@ -74,12 +75,12 @@ export function fetchDerivedVariable({ cache, force, token, uid, values, wsClien
|
|
|
74
75
|
}
|
|
75
76
|
: undefined;
|
|
76
77
|
const ws_channel = yield wsClient.getChannel();
|
|
77
|
-
const res = yield request(`/api/core/derived-variable/${
|
|
78
|
+
const res = yield request(`/api/core/derived-variable/${variableUid}`, {
|
|
78
79
|
body: JSON.stringify({ force, is_data_variable, values, ws_channel }),
|
|
79
80
|
headers: Object.assign({}, cacheControl),
|
|
80
81
|
method: HTTP_METHOD.POST,
|
|
81
|
-
},
|
|
82
|
-
yield validateResponse(res, `Failed to fetch the derived variable with uid: ${
|
|
82
|
+
}, extras);
|
|
83
|
+
yield validateResponse(res, `Failed to fetch the derived variable with uid: ${variableUid}`);
|
|
83
84
|
return res.json();
|
|
84
85
|
});
|
|
85
86
|
}
|
|
@@ -90,18 +91,27 @@ export function fetchDerivedVariable({ cache, force, token, uid, values, wsClien
|
|
|
90
91
|
*/
|
|
91
92
|
const debouncedFetchSubjects = {};
|
|
92
93
|
const debouncedFetchCache = {};
|
|
93
|
-
function debouncedFetchDerivedVariable({
|
|
94
|
+
function debouncedFetchDerivedVariable({ variableUid, selectorKey, values, wsClient, force, extras, cache, is_data_variable = false, }) {
|
|
94
95
|
return __awaiter(this, void 0, void 0, function* () {
|
|
95
|
-
// If this is the first time this is called then set up a subject and return stream for this
|
|
96
|
-
if (!debouncedFetchSubjects[
|
|
97
|
-
debouncedFetchSubjects[
|
|
98
|
-
debouncedFetchCache[
|
|
96
|
+
// If this is the first time this is called then set up a subject and return stream for this selector
|
|
97
|
+
if (!debouncedFetchSubjects[selectorKey]) {
|
|
98
|
+
debouncedFetchSubjects[selectorKey] = new BehaviorSubject(null);
|
|
99
|
+
debouncedFetchCache[selectorKey] = debouncedFetchSubjects[selectorKey].pipe(filter((args) => !!args), debounceTime(10), switchMap((args) => from(fetchDerivedVariable(args))), share());
|
|
99
100
|
}
|
|
100
101
|
// Push the next set of args to the subject
|
|
101
|
-
debouncedFetchSubjects[
|
|
102
|
+
debouncedFetchSubjects[selectorKey].next({
|
|
103
|
+
cache,
|
|
104
|
+
extras,
|
|
105
|
+
force,
|
|
106
|
+
is_data_variable,
|
|
107
|
+
selectorKey,
|
|
108
|
+
values,
|
|
109
|
+
variableUid,
|
|
110
|
+
wsClient,
|
|
111
|
+
});
|
|
102
112
|
// Return the debounced response from the backend
|
|
103
113
|
return new Promise((resolve, reject) => {
|
|
104
|
-
debouncedFetchCache[
|
|
114
|
+
debouncedFetchCache[selectorKey].pipe(take(1)).subscribe(resolve, reject);
|
|
105
115
|
});
|
|
106
116
|
});
|
|
107
117
|
}
|
|
@@ -252,28 +262,31 @@ export function resolveDerivedValue(key, variables, deps, resolvedVariables, wsC
|
|
|
252
262
|
* @param variable variable to register
|
|
253
263
|
* @param wsClient WebSocket client from context
|
|
254
264
|
* @param tasks tasks list from context
|
|
255
|
-
* @param
|
|
256
|
-
* @param sessionToken session token from context
|
|
265
|
+
* @param currentExtras request extras to be merged into the options
|
|
257
266
|
*/
|
|
258
|
-
export function getOrRegisterDerivedVariable(variable, wsClient, taskContext,
|
|
267
|
+
export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, currentExtras) {
|
|
259
268
|
const key = getRegistryKey(variable, 'selector');
|
|
260
|
-
if (!
|
|
261
|
-
/**
|
|
262
|
-
* Recursively resolve variables to list of values
|
|
263
|
-
*
|
|
264
|
-
* For derived variables, put ResolvedDerivedVariable object with values resolved to recoil atoms/selectors,
|
|
265
|
-
* and deps resolved to array of indexes of variables (or null if not set)
|
|
266
|
-
* For data variables, put ResolvedDataVariable object.
|
|
267
|
-
*/
|
|
268
|
-
const resolvedVariables = variable.variables.map((v) => resolveVariable(v, wsClient, taskContext, search, token));
|
|
269
|
+
if (!selectorFamilyRegistry.has(key)) {
|
|
269
270
|
getOrRegisterTrigger(variable);
|
|
270
|
-
|
|
271
|
+
// register a family for this particular variable
|
|
272
|
+
selectorFamilyRegistry.set(key, selectorFamily({
|
|
271
273
|
cachePolicy_UNSTABLE: {
|
|
272
274
|
eviction: 'most-recent',
|
|
273
275
|
},
|
|
274
|
-
get: ({ get }) => __awaiter(this, void 0, void 0, function* () {
|
|
276
|
+
get: (extrasSerializable) => ({ get }) => __awaiter(this, void 0, void 0, function* () {
|
|
277
|
+
/**
|
|
278
|
+
* Recursively resolve variables to list of values
|
|
279
|
+
*
|
|
280
|
+
* For derived variables, put ResolvedDerivedVariable object with values resolved to recoil atoms/selectors,
|
|
281
|
+
* and deps resolved to array of indexes of variables (or null if not set)
|
|
282
|
+
* For data variables, put ResolvedDataVariable object.
|
|
283
|
+
*/
|
|
284
|
+
const resolvedVariables = variable.variables.map((v) => resolveVariable(v, wsClient, taskContext, currentExtras));
|
|
275
285
|
const selfTrigger = get(getOrRegisterTrigger(variable));
|
|
276
|
-
const
|
|
286
|
+
const { extras } = extrasSerializable;
|
|
287
|
+
// for deps use a different key for each selector instance rather than one per family
|
|
288
|
+
const selectorKey = key + extrasSerializable.toJSON();
|
|
289
|
+
const derivedResult = yield resolveDerivedValue(selectorKey, variable.variables, variable.deps, resolvedVariables, wsClient, get, selfTrigger);
|
|
277
290
|
if (derivedResult.type === 'previous') {
|
|
278
291
|
return { cache_key: derivedResult.entry.cacheKey, value: derivedResult.entry.result };
|
|
279
292
|
}
|
|
@@ -281,17 +294,19 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, se
|
|
|
281
294
|
try {
|
|
282
295
|
variableResponse = yield debouncedFetchDerivedVariable({
|
|
283
296
|
cache: variable.cache,
|
|
297
|
+
extras,
|
|
284
298
|
force: derivedResult.force,
|
|
285
299
|
is_data_variable: isDerivedDataVariable(variable),
|
|
286
|
-
|
|
287
|
-
uid: variable.uid,
|
|
300
|
+
selectorKey,
|
|
288
301
|
values: normalizeRequest(formatDerivedVariableRequest(derivedResult.values), variable.variables),
|
|
302
|
+
variableUid: variable.uid,
|
|
289
303
|
wsClient,
|
|
290
304
|
});
|
|
291
305
|
}
|
|
292
306
|
catch (e) {
|
|
293
|
-
// On DV error put selectorId into the error so the boundary can reset the selector cache
|
|
307
|
+
// On DV error put selectorId and extras into the error so the boundary can reset the selector cache
|
|
294
308
|
e.selectorId = key;
|
|
309
|
+
e.selectorExtras = extrasSerializable.toJSON();
|
|
295
310
|
throw e;
|
|
296
311
|
}
|
|
297
312
|
const cacheKey = variableResponse.cache_key;
|
|
@@ -322,11 +337,12 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, se
|
|
|
322
337
|
taskContext.endTask(taskId);
|
|
323
338
|
}
|
|
324
339
|
try {
|
|
325
|
-
variableValue = yield fetchTaskResult(taskId,
|
|
340
|
+
variableValue = yield fetchTaskResult(taskId, extras);
|
|
326
341
|
}
|
|
327
342
|
catch (e) {
|
|
328
|
-
// On DV task error put selectorId into the error so the boundary can reset the selector cache
|
|
343
|
+
// On DV task error put selectorId and extras into the error so the boundary can reset the selector cache
|
|
329
344
|
e.selectorId = key;
|
|
345
|
+
e.selectorExtras = extrasSerializable.toJSON();
|
|
330
346
|
throw e;
|
|
331
347
|
}
|
|
332
348
|
}
|
|
@@ -338,7 +354,7 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, se
|
|
|
338
354
|
// resolve nested if defined (i.e. for DerivedVariable, DerivedDataVariable does not have nested)
|
|
339
355
|
variableValue =
|
|
340
356
|
'nested' in variable ? resolveNested(variableValue, variable.nested) : variableValue;
|
|
341
|
-
depsRegistry.set(
|
|
357
|
+
depsRegistry.set(selectorKey, {
|
|
342
358
|
args: derivedResult.relevantValues,
|
|
343
359
|
cacheKey,
|
|
344
360
|
result: variableValue,
|
|
@@ -351,7 +367,19 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, se
|
|
|
351
367
|
key: shortid.generate(),
|
|
352
368
|
}));
|
|
353
369
|
}
|
|
354
|
-
|
|
370
|
+
const family = selectorFamilyRegistry.get(key);
|
|
371
|
+
// Get a selector instance for this particular extras value
|
|
372
|
+
// This is required as otherwise the selector is not aware of different possible extras values
|
|
373
|
+
// at the call site of e.g. useVariable and would otherwise be a stale closure using the initial extras when
|
|
374
|
+
// first registered
|
|
375
|
+
const serializableExtras = new RequestExtrasSerializable(currentExtras);
|
|
376
|
+
const selectorInstance = family(serializableExtras);
|
|
377
|
+
// register selector instance in the selector family registry
|
|
378
|
+
if (!selectorFamilyMembersRegistry.has(family)) {
|
|
379
|
+
selectorFamilyMembersRegistry.set(family, new Map());
|
|
380
|
+
}
|
|
381
|
+
selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
|
|
382
|
+
return selectorInstance;
|
|
355
383
|
}
|
|
356
384
|
/**
|
|
357
385
|
* Get a derived selector for a derived variable.
|
|
@@ -361,21 +389,34 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, se
|
|
|
361
389
|
* @param wsClient WebSocket client from context
|
|
362
390
|
* @param taskContext global task context
|
|
363
391
|
* @param search search query from location
|
|
364
|
-
* @param
|
|
392
|
+
* @param extras request extras to be merged into the options
|
|
365
393
|
*/
|
|
366
|
-
export function getOrRegisterDerivedVariableValue(variable, wsClient, taskContext,
|
|
367
|
-
const dvSelector = getOrRegisterDerivedVariable(variable, wsClient, taskContext, search, token);
|
|
394
|
+
export function getOrRegisterDerivedVariableValue(variable, wsClient, taskContext, currentExtras) {
|
|
368
395
|
const key = getRegistryKey(variable, 'derived-selector');
|
|
369
|
-
if (!
|
|
370
|
-
|
|
371
|
-
get: ({ get }) => {
|
|
396
|
+
if (!selectorFamilyRegistry.has(key)) {
|
|
397
|
+
selectorFamilyRegistry.set(key, selectorFamily({
|
|
398
|
+
get: (extrasSerializable) => ({ get }) => {
|
|
399
|
+
// get the right selector instance for this extras value
|
|
400
|
+
const dvSelector = getOrRegisterDerivedVariable(variable, wsClient, taskContext, extrasSerializable.extras);
|
|
372
401
|
const dvResponse = get(dvSelector);
|
|
373
402
|
return dvResponse.value;
|
|
374
403
|
},
|
|
375
404
|
key: shortid.generate(),
|
|
376
405
|
}));
|
|
377
406
|
}
|
|
378
|
-
|
|
407
|
+
const family = selectorFamilyRegistry.get(key);
|
|
408
|
+
// Get a selector instance for this particular extras value
|
|
409
|
+
// This is required as otherwise the selector is not aware of different possible extras values
|
|
410
|
+
// at the call site of e.g. useVariable and would otherwise be a stale closure using the initial extras when
|
|
411
|
+
// first registered
|
|
412
|
+
const serializableExtras = new RequestExtrasSerializable(currentExtras);
|
|
413
|
+
const selectorInstance = family(serializableExtras);
|
|
414
|
+
// register selector instance in the selector family registry
|
|
415
|
+
if (!selectorFamilyMembersRegistry.has(family)) {
|
|
416
|
+
selectorFamilyMembersRegistry.set(family, new Map());
|
|
417
|
+
}
|
|
418
|
+
selectorFamilyMembersRegistry.get(family).set(serializableExtras.toJSON(), selectorInstance);
|
|
419
|
+
return selectorInstance;
|
|
379
420
|
}
|
|
380
421
|
/**
|
|
381
422
|
* Helper hook to get the (data) derived variable selector, while correctly registering triggers and setting up polling interval.
|
|
@@ -384,10 +425,10 @@ export function getOrRegisterDerivedVariableValue(variable, wsClient, taskContex
|
|
|
384
425
|
* @param WsClient websocket client instance
|
|
385
426
|
* @param taskContext global task context
|
|
386
427
|
* @param search search query
|
|
387
|
-
* @param
|
|
428
|
+
* @param extras request extras to be merged into the options
|
|
388
429
|
*/
|
|
389
|
-
export function useDerivedVariable(variable, WsClient, taskContext,
|
|
390
|
-
const dvSelector = getOrRegisterDerivedVariable(variable, WsClient, taskContext,
|
|
430
|
+
export function useDerivedVariable(variable, WsClient, taskContext, extras) {
|
|
431
|
+
const dvSelector = getOrRegisterDerivedVariable(variable, WsClient, taskContext, extras);
|
|
391
432
|
/**
|
|
392
433
|
* Workaround for forcing a re-calculation for derived variables by creating a triggerIndex atom and making it a dependency of
|
|
393
434
|
* the recoil selector. This way the selector can be re-run and derived variable can be re-fetched from the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"AAAA,gDAAgD;;;;;;;;;;;;;;;;;;;;;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAA+B,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAClG,OAAO,EAAE,eAAe,EAAc,IAAI,EAAE,MAAM,MAAM,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAA4B,eAAe,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAOH,qBAAqB,EACrB,iBAAiB,EACjB,sBAAsB,EACtB,6BAA6B,EAC7B,yBAAyB,GAC5B,MAAM,SAAS,CAAC;AAEjB,2CAA2C;AAC3C,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACzG,OAAO,EAAqB,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAS5F,MAAM,UAAU,cAAc,CAAC,UAAwC;IACnE,OAAO,SAAS,IAAI,UAAU,CAAC;AACnC,CAAC;AAOD;;;;GAIG;AACH,6EAA6E;AAC7E,MAAM,UAAU,4BAA4B,CAAC,MAA4C;IACrF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,yBAAyB,CAAC,GAAG,CAAC,IAAI,6BAA6B,CAAC,GAAG,CAAC,EAAE;YACtE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,KAAc,GAAG,EAAZ,IAAI,UAAK,GAAG,EAA7C,kBAAuC,CAAM,CAAC;YAEpD,uCAAuC;YACvC,0GAA0G;YAC1G,uEAAuE;YACvE,uCACO,IAAI,KACP,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,4BAA4B,CAAC,YAAY,CAAC,IACpD;SACL;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC;AAYD;;;;;;;;;;GAUG;AACH,MAAM,UAAgB,oBAAoB,CAAI,EAC1C,KAAK,EACL,KAAK,EACL,KAAK,EACL,GAAG,EACH,MAAM,EACN,QAAQ,EACR,gBAAgB,GAAG,KAAK,GACD;;QACvB,MAAM,YAAY,GACd,KAAK,KAAK,IAAI;YACV,CAAC,CAAE;gBACG,eAAe,EAAE,MAAM;aAChB;YACb,CAAC,CAAC,SAAS,CAAC;QAEpB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,GAAG,GAAG,MAAM,OAAO,CACrB,8BAA8B,GAAG,EAAE,EACnC;YACI,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YACrE,OAAO,oBAAO,YAAY,CAAE;YAC5B,MAAM,EAAE,WAAW,CAAC,IAAI;SAC3B,EACD,KAAK,CACR,CAAC;QACF,MAAM,gBAAgB,CAAC,GAAG,EAAE,kDAAkD,GAAG,EAAE,CAAC,CAAC;QACrF,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CAAA;AAED;;;;GAIG;AACH,MAAM,sBAAsB,GAExB,EAAE,CAAC;AACP,MAAM,mBAAmB,GAErB,EAAE,CAAC;AAEP,SAAe,6BAA6B,CAAC,EACzC,GAAG,EACH,MAAM,EACN,QAAQ,EACR,KAAK,EACL,KAAK,EACL,KAAK,EACL,gBAAgB,GAAG,KAAK,GACD;;QACvB,sGAAsG;QACtG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE;YAC9B,sBAAsB,CAAC,GAAG,CAAC,GAAG,IAAI,eAAe,CAA2B,IAAI,CAAC,CAAC;YAClF,mBAAmB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,IAAI,CACvD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EACxB,YAAY,CAAC,EAAE,CAAC,EAChB,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EACrD,KAAK,EAAE,CACV,CAAC;SACL;QAED,2CAA2C;QAC3C,sBAAsB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEnG,iDAAiD;QACjD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CACxB,KAAsG,EACtG,MAAsB;IAEtB,IAAI,yBAAyB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,KAAK,CAAC,EAAE;QAC1E,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAExE,uCACO,KAAK,KACR,MAAM,EAAE,cAAc,IACxB;KACL;IACD,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE;QAC/B,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;GAMG;AACH,6EAA6E;AAC7E,MAAM,UAAU,OAAO,CAAC,MAA4C,EAAE,IAAe;IACjF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC3B,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7B,OAAO,EAAE,CAAC;SACb;QAED,OAAO,yBAAyB,CAAC,GAAG,CAAC,IAAI,6BAA6B,CAAC,GAAG,CAAC;YACvE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE;YACtC,CAAC,CAAC,GAAG,CAAC;IACd,CAAC,CAAC,CAAC;AACP,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,QAAyB;IACrD,OAAO,cAAc,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC1D,CAAC;AA2CD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAgB,mBAAmB,CACrC,GAAW,EACX,SAA6B,EAC7B,IAAwB,EACxB,iBAAwB,EACxB,QAAkC,EAClC,GAAmB,EACnB,WAA+B;;QAE/B,+HAA+H;QAC/H,MAAM,QAAQ,GAAG,qBAAqB,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEjE,IAAI,WAAW,EAAE;YACb,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACjC;QAED;;;;;WAKG;QACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAElE;;;;;WAKG;QACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAEnC;;;;;;WAMG;QACH,MAAM,gBAAgB,GAAG,SAAS,CAAC,MAAM,CACrC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EACjE,IAAI,GAAG,EAAe,CACzB,CAAC;QAEF,IAAI,iBAAiB,GAAG,KAAK,CAAC,CAAC,mFAAmF;QAClH,IAAI,YAAY,GAAG,KAAK,CAAC,CAAC,kDAAkD;QAC5E,IAAI,kBAAkB,GAAG,KAAK,CAAC,CAAC,mEAAmE;QAEnG;;WAEG;QACH,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE5C,oCAAoC;QACpC,MAAM,cAAc,GAAG,IAAI;aACtB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;aAC5D,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,oFAAoF;QAEzI,6DAA6D;QAC7D,IAAI,aAAa,EAAE;YACf,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAEnE,mEAAmE;YACnE,IAAI,cAAc,EAAE;gBAChB,OAAO;oBACH,KAAK,EAAE,aAAa;oBACpB,IAAI,EAAE,UAAU;iBACnB,CAAC;aACL;YAED,iFAAiF;YAEjF,iHAAiH;YACjH,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CACpD,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAClC,CAAC;YAEd,KAAK,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;gBAClD;;;mBAGG;gBACH,IAAI,YAAY,CAAC,GAAG,KAAK,uBAAuB,CAAC,GAAG,CAAC,EAAE;oBACnD,iBAAiB,GAAG,YAAY,CAAC,KAAK,CAAC;oBAEvC,oEAAoE;oBACpE,IAAI,GAAG,KAAK,CAAC,EAAE;wBACX,kBAAkB,GAAG,IAAI,CAAC;qBAC7B;oBAED,YAAY,GAAG,IAAI,CAAC;oBACpB,MAAM;iBACT;aACJ;SACJ;QAED,oGAAoG;QACpG,IAAI,YAAY,IAAI,CAAC,kBAAkB,EAAE;YACrC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;SAC3D;QAED,OAAO;YACH,KAAK,EAAE,iBAAiB;YACxB,cAAc;YACd,IAAI,EAAE,SAAS;YACf,MAAM;SACT,CAAC;IACN,CAAC;CAAA;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,4BAA4B,CACxC,QAA+C,EAC/C,QAAkC,EAClC,WAA8B,EAC9B,MAAc,EACd,KAAa;IAEb,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC5B;;;;;;WAMG;QACH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACnD,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAC3D,CAAC;QAEF,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE/B,gBAAgB,CAAC,GAAG,CAChB,GAAG,EACH,QAAQ,CAAC;YACL,oBAAoB,EAAE;gBAClB,QAAQ,EAAE,aAAa;aAC1B;YACD,GAAG,EAAE,CAAO,EAAE,GAAG,EAAE,EAAE,EAAE;gBACnB,MAAM,WAAW,GAAG,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAExD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAC3C,GAAG,EACH,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,IAAI,EACb,iBAAiB,EACjB,QAAQ,EACR,GAAG,EACH,WAAW,CACd,CAAC;gBAEF,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,EAAE;oBACnC,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;iBACzF;gBAED,IAAI,gBAAgB,GAAG,IAAI,CAAC;gBAE5B,IAAI;oBACA,gBAAgB,GAAG,MAAM,6BAA6B,CAAC;wBACnD,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,KAAK,EAAE,aAAa,CAAC,KAAK;wBAC1B,gBAAgB,EAAE,qBAAqB,CAAC,QAAQ,CAAC;wBACjD,KAAK;wBACL,GAAG,EAAE,QAAQ,CAAC,GAAG;wBACjB,MAAM,EAAE,gBAAgB,CACpB,4BAA4B,CAAC,aAAa,CAAC,MAAM,CAAC,EAClD,QAAQ,CAAC,SAAS,CACrB;wBACD,QAAQ;qBACX,CAAC,CAAC;iBACN;gBAAC,OAAO,CAAC,EAAE;oBACR,yFAAyF;oBACzF,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC;oBACnB,MAAM,CAAC,CAAC;iBACX;gBAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,SAAS,CAAC;gBAC5C,IAAI,aAAa,GAAG,IAAI,CAAC;gBAEzB,qDAAqD;gBACrD,uGAAuG;gBACvG,2CAA2C;gBAC3C,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE;oBAC7B,wGAAwG;oBACxG,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;oBAE9C,wFAAwF;oBACxF,IAAI,cAAc,CAAC,gBAAgB,CAAC,EAAE;wBAClC,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC;wBAExC,8BAA8B;wBAC9B,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;wBAEjF,IAAI;4BACA,MAAM,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;yBACtC;wBAAC,WAAM;4BACJ,iFAAiF;4BACjF,+FAA+F;4BAC/F,OAAO;gCACH,SAAS,EAAE,QAAQ;gCACnB,KAAK,EAAE,IAAI;6BACd,CAAC;yBACL;gCAAS;4BACN,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;yBAC/B;wBAED,IAAI;4BACA,aAAa,GAAG,MAAM,eAAe,CAAM,MAAM,EAAE,KAAK,CAAC,CAAC;yBAC7D;wBAAC,OAAO,CAAC,EAAE;4BACR,8FAA8F;4BAC9F,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC;4BACnB,MAAM,CAAC,CAAC;yBACX;qBACJ;yBAAM;wBACH,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC;qBAC1C;iBACJ;gBAED,iEAAiE;gBAEjE,iGAAiG;gBACjG,aAAa;oBACT,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAEzF,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE;oBAClB,IAAI,EAAE,aAAa,CAAC,cAAc;oBAClC,QAAQ;oBACR,MAAM,EAAE,aAAa;iBACxB,CAAC,CAAC;gBAEH,OAAO;oBACH,SAAS,EAAE,QAAQ;oBACnB,KAAK,EAAE,aAAa;iBACvB,CAAC;YACN,CAAC,CAAA;YACD,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE;SAC1B,CAAC,CACL,CAAC;KACL;IAED,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,iCAAiC,CAC7C,QAAyB,EACzB,QAAkC,EAClC,WAA8B,EAC9B,MAAc,EACd,KAAa;IAEb,MAAM,UAAU,GAAG,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAEhG,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAEzD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC5B,gBAAgB,CAAC,GAAG,CAChB,GAAG,EACH,QAAQ,CAAC;YACL,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;gBACb,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnC,OAAO,UAAU,CAAC,KAAK,CAAC;YAC5B,CAAC;YACD,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE;SAC1B,CAAC,CACL,CAAC;KACL;IAED,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAC9B,QAA+C,EAC/C,QAAkC,EAClC,WAA8B,EAC9B,MAAc,EACd,KAAa;IAEb,MAAM,UAAU,GAAG,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAEhG;;;;OAIG;IACH,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEvE,8CAA8C;IAC9C,MAAM,cAAc,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,WAAW,CACvB,CAAC,KAAK,GAAG,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,EACxE,CAAC,cAAc,CAAC,CACnB,CAAC;IAEF,6DAA6D;IAC7D,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAEhD,OAAO,UAAU,CAAC;AACtB,CAAC"}
|
|
1
|
+
{"version":3,"file":"derived-variable.js","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filtering.js","sourceRoot":"","sources":["../../../js/shared/interactivity/filtering.tsx"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,UAA2B,EAAE,OAAsB;IAC9E,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,mCAAmC;IAEjF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"filtering.js","sourceRoot":"","sources":["../../../js/shared/interactivity/filtering.tsx"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,UAA2B,EAAE,OAAsB;IAC9E,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,mCAAmC;IAEjF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO;QACH,OAAO,EAAE,YAAY;QACrB,UAAU;KACb,CAAC;AACN,CAAC"}
|
|
@@ -2,7 +2,7 @@ export { useVariable } from './use-variable';
|
|
|
2
2
|
export { useAnyVariable } from './use-any-variable';
|
|
3
3
|
export { default as useVariableValue, getVariableValue } from './use-variable-value';
|
|
4
4
|
export { resolveValue } from './resolve-value';
|
|
5
|
-
export { TriggerIndexValue
|
|
5
|
+
export { TriggerIndexValue } from './store';
|
|
6
6
|
export { useDataVariable } from './use-data-variable';
|
|
7
7
|
export { combineFilters } from './filtering';
|
|
8
8
|
export { default as useRefreshSelector } from './use-refresh-selector';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}
|
|
@@ -2,7 +2,6 @@ export { useVariable } from './use-variable';
|
|
|
2
2
|
export { useAnyVariable } from './use-any-variable';
|
|
3
3
|
export { default as useVariableValue, getVariableValue } from './use-variable-value';
|
|
4
4
|
export { resolveValue } from './resolve-value';
|
|
5
|
-
export { getAtom } from './store';
|
|
6
5
|
export { useDataVariable } from './use-data-variable';
|
|
7
6
|
export { combineFilters } from './filtering';
|
|
8
7
|
export { default as useRefreshSelector } from './use-refresh-selector';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../js/shared/interactivity/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../js/shared/interactivity/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,sBAAsB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nested.js","sourceRoot":"","sources":["../../../js/shared/interactivity/nested.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAgC,GAAM,EAAE,MAAgB;IACjF,sBAAsB;IACtB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"nested.js","sourceRoot":"","sources":["../../../js/shared/interactivity/nested.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AACjC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAgC,GAAM,EAAE,MAAgB;IACjF,sBAAsB;IACtB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,GAAG,CAAC;IACf,CAAC;IAED,gBAAgB;IAChB,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAI,SAAS,GAAG,GAAG,CAAC;IAEpB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;QACvB,6FAA6F;QAC7F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAgC,GAAM,EAAE,MAAgB,EAAE,QAAiB;IAChG,sBAAsB;IACtB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,gBAAgB;IAChB,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,4CAA4C;IAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IAE1B,wFAAwF;IACxF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;IACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjC,MAAc,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IAEA,MAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IAE1G,OAAO,MAAM,CAAC;AAClB,CAAC"}
|