@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
|
@@ -27,7 +27,7 @@ import ErrorStatusCodePage from '../pages/error-status-code-page';
|
|
|
27
27
|
import RouteErrorBoundary from '../pages/route-error-boundary';
|
|
28
28
|
import {} from '../types/core';
|
|
29
29
|
import DynamicAuthComponent from '../shared/dynamic-component/dynamic-auth-component';
|
|
30
|
-
import AuthenticatedRoot from '../shared/root/authenticated-root';
|
|
30
|
+
import AuthenticatedRoot, { createAuthenticatedRootLoader } from '../shared/root/authenticated-root';
|
|
31
31
|
import UnauthenticatedRoot from '../shared/root/unauthenticated-root';
|
|
32
32
|
import RouteContent, { createRouteLoader } from './route-content';
|
|
33
33
|
/**
|
|
@@ -55,7 +55,7 @@ function joinPaths(parentPath, childPath) {
|
|
|
55
55
|
}
|
|
56
56
|
return `/${cleanParent}/${cleanChild}`;
|
|
57
57
|
}
|
|
58
|
-
export function createRoute(route,
|
|
58
|
+
export function createRoute(route, snapshot, routeDefMap) {
|
|
59
59
|
// Add to route definition map for quick lookup
|
|
60
60
|
routeDefMap.set(route.id, route);
|
|
61
61
|
const sharedProps = {
|
|
@@ -66,13 +66,13 @@ export function createRoute(route, snapshotRef, routeDefMap) {
|
|
|
66
66
|
};
|
|
67
67
|
switch (route.__typename) {
|
|
68
68
|
case 'IndexRoute':
|
|
69
|
-
return Object.assign(Object.assign({}, sharedProps), { index: true, element: _jsx(RouteContent, { route: route }, route.id), loader: createRouteLoader(route,
|
|
69
|
+
return Object.assign(Object.assign({}, sharedProps), { index: true, element: _jsx(RouteContent, { route: route }, route.id), loader: createRouteLoader(route, snapshot) });
|
|
70
70
|
case 'PageRoute':
|
|
71
|
-
return Object.assign(Object.assign({}, sharedProps), { path: cleanPath(route.path), element: _jsx(RouteContent, { route: route }, route.id), loader: createRouteLoader(route,
|
|
71
|
+
return Object.assign(Object.assign({}, sharedProps), { path: cleanPath(route.path), element: _jsx(RouteContent, { route: route }, route.id), loader: createRouteLoader(route, snapshot), children: route.children.map((r) => createRoute(r, snapshot, routeDefMap)) });
|
|
72
72
|
case 'LayoutRoute':
|
|
73
|
-
return Object.assign(Object.assign({}, sharedProps), { element: _jsx(RouteContent, { route: route }, route.id), loader: createRouteLoader(route,
|
|
73
|
+
return Object.assign(Object.assign({}, sharedProps), { element: _jsx(RouteContent, { route: route }, route.id), loader: createRouteLoader(route, snapshot), children: route.children.map((r) => createRoute(r, snapshot, routeDefMap)) });
|
|
74
74
|
case 'PrefixRoute':
|
|
75
|
-
return Object.assign(Object.assign({}, sharedProps), { path: cleanPath(route.path), children: route.children.map((r) => createRoute(r,
|
|
75
|
+
return Object.assign(Object.assign({}, sharedProps), { path: cleanPath(route.path), children: route.children.map((r) => createRoute(r, snapshot, routeDefMap)) });
|
|
76
76
|
default:
|
|
77
77
|
throw new Error(`Unknown route type ${JSON.stringify(route)}`);
|
|
78
78
|
}
|
|
@@ -125,8 +125,8 @@ let verifiedToken = false;
|
|
|
125
125
|
/**
|
|
126
126
|
* Create the router for the application
|
|
127
127
|
*/
|
|
128
|
-
export function createRouter(config,
|
|
129
|
-
let basename = '';
|
|
128
|
+
export function createRouter(config, snapshot) {
|
|
129
|
+
let basename = '/';
|
|
130
130
|
// The base_url is set in the html template by the backend when returning it
|
|
131
131
|
if (window.dara.base_url !== '') {
|
|
132
132
|
basename = new URL(window.dara.base_url, window.origin).pathname;
|
|
@@ -134,7 +134,7 @@ export function createRouter(config, snapshotRef) {
|
|
|
134
134
|
const _a = config.auth_components, { login, logout } = _a, extraRoutes = __rest(_a, ["login", "logout"]);
|
|
135
135
|
// Create map to collect route definitions during route creation
|
|
136
136
|
const routeDefMap = new Map();
|
|
137
|
-
const userRoutes = config.router.children.map((r) => createRoute(r,
|
|
137
|
+
const userRoutes = config.router.children.map((r) => createRoute(r, snapshot, routeDefMap));
|
|
138
138
|
const defaultPath = findFirstPath(config.router.children) || '/';
|
|
139
139
|
const router = createBrowserRouter([
|
|
140
140
|
{
|
|
@@ -164,6 +164,7 @@ export function createRouter(config, snapshotRef) {
|
|
|
164
164
|
// root of the app
|
|
165
165
|
{
|
|
166
166
|
element: _jsx(AuthenticatedRoot, { daraData: config }),
|
|
167
|
+
loader: createAuthenticatedRootLoader(config),
|
|
167
168
|
// token must be set to access the authenticated routes
|
|
168
169
|
unstable_middleware: [
|
|
169
170
|
() => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -205,6 +206,7 @@ export function createRouter(config, snapshotRef) {
|
|
|
205
206
|
routeDefinitions: config.router.children,
|
|
206
207
|
routeObjects: userRoutes,
|
|
207
208
|
routeDefMap,
|
|
209
|
+
defaultPath,
|
|
208
210
|
};
|
|
209
211
|
}
|
|
210
212
|
//# sourceMappingURL=create-router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-router.js","sourceRoot":"","sources":["../../js/router/create-router.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAoB,mBAAmB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGzF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,mBAAmB,MAAM,gCAAgC,CAAC;AACjE,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAON,MAAM,cAAc,CAAC;AAEtB,OAAO,oBAAoB,MAAM,oDAAoD,CAAC;AACtF,OAAO,iBAAiB,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"create-router.js","sourceRoot":"","sources":["../../js/router/create-router.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetching.d.ts","sourceRoot":"","sources":["../../js/router/fetching.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetching.d.ts","sourceRoot":"","sources":["../../js/router/fetching.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,KAAK,QAAQ,EAAqB,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAM5B,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,aAAa,EAA4D,MAAM,UAAU,CAAC;AACvH,OAAO,EAEH,UAAU,EACV,KAAK,iBAAiB,EACtB,KAAK,eAAe,EAGpB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,eAAe,EAEvB,MAAM,SAAS,CAAC;AA0BjB,eAAO,MAAM,aAAa;;;;;;iBAGxB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,WAAW;;;;;;iBAGtB,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAEtD,eAAO,MAAM,oBAAoB;;;;;;;iBAI/B,CAAC;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAExE,eAAO,MAAM,gBAAgB;;;;;;;iBAI3B,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEhE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAgF,CAAC;AAC3G,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,UAAU,sBAAsB;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,iBAAiB,CAAC,GAAG,EAAE,CAAC,CAAC;CACpC;AAED,UAAU,kBAAkB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;CAClD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,eAAe,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,EAAE,sBAAsB,CAAC;CACnC;AAED,UAAU,iBAAiB;IACvB,EAAE,EAAE,mBAAmB,CAAC;IACxB,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,EAAE,kBAAkB,CAAC;CAC/B;AAED,MAAM,WAAW,UAAU;IACvB,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,gBAAgB,EAAE,eAAe,CAAC;IAClC,iBAAiB,EAAE,qBAAqB,EAAE,CAAC;IAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;CACtC;AAkDD;;;;GAIG;AACH,wBAAsB,cAAc,CAChC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EACtB,QAAQ,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,UAAU,CAAC,CA2JrB;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GACvB,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,SAAS,CAE9C;AAED;;;GAGG;AACH,wBAAgB,eAAe,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,KAAK,IAAI,CA0C3E"}
|
package/dist/router/fetching.js
CHANGED
|
@@ -27,7 +27,8 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
|
27
27
|
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
28
28
|
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
29
29
|
};
|
|
30
|
-
import
|
|
30
|
+
import isEqual from 'lodash/isEqual';
|
|
31
|
+
import { matchRoutes, useMatches } from 'react-router';
|
|
31
32
|
import { useRecoilCallback } from 'recoil';
|
|
32
33
|
import * as z from 'zod/v4';
|
|
33
34
|
import { HTTP_METHOD } from '@darajs/ui-utils';
|
|
@@ -122,7 +123,7 @@ export function fetchRouteData(route, params, snapshot, signal) {
|
|
|
122
123
|
}
|
|
123
124
|
const actionPayloads = actions.filter(isAnnotatedAction).map((a) => {
|
|
124
125
|
const kwargs = cleanKwargs(Object.fromEntries(Object.entries(a.dynamic_kwargs).map(([k, v]) => {
|
|
125
|
-
return [k, resolveVariableStatic(v, snapshot)];
|
|
126
|
+
return [k, resolveVariableStatic(v, snapshot, params)];
|
|
126
127
|
})), null);
|
|
127
128
|
return {
|
|
128
129
|
uid: a.uid,
|
|
@@ -133,7 +134,7 @@ export function fetchRouteData(route, params, snapshot, signal) {
|
|
|
133
134
|
// Collect payloads for DVs and py_components,
|
|
134
135
|
// preloading ones that don't have a cached value
|
|
135
136
|
const dvHandles = Object.values((_b = (_a = route.dependency_graph) === null || _a === void 0 ? void 0 : _a.derived_variables) !== null && _b !== void 0 ? _b : {}).flatMap((dv) => {
|
|
136
|
-
const handle = preloadDerivedVariable(dv, snapshot);
|
|
137
|
+
const handle = preloadDerivedVariable(dv, snapshot, params);
|
|
137
138
|
if (!handle) {
|
|
138
139
|
return [];
|
|
139
140
|
}
|
|
@@ -143,7 +144,7 @@ export function fetchRouteData(route, params, snapshot, signal) {
|
|
|
143
144
|
} });
|
|
144
145
|
});
|
|
145
146
|
const pyHandles = Object.values((_d = (_c = route.dependency_graph) === null || _c === void 0 ? void 0 : _c.py_components) !== null && _d !== void 0 ? _d : {}).flatMap((py) => {
|
|
146
|
-
const handle = preloadServerComponent(py, snapshot);
|
|
147
|
+
const handle = preloadServerComponent(py, snapshot, params);
|
|
147
148
|
if (!handle) {
|
|
148
149
|
return [];
|
|
149
150
|
}
|
|
@@ -160,13 +161,15 @@ export function fetchRouteData(route, params, snapshot, signal) {
|
|
|
160
161
|
});
|
|
161
162
|
const dvHandlesByUid = dvHandles.reduce((acc, h) => (Object.assign(Object.assign({}, acc), { [h.dv.uid]: h })), {});
|
|
162
163
|
const pyHandlesByUid = pyHandles.reduce((acc, h) => (Object.assign(Object.assign({}, acc), { [h.py.uid]: h })), {});
|
|
164
|
+
const wsClient = yield window.dara.ws.getValue();
|
|
165
|
+
const wsChannel = yield wsClient.getChannel();
|
|
163
166
|
const response = yield request(`/api/core/route/${route.id}`, {
|
|
164
167
|
method: HTTP_METHOD.POST,
|
|
165
168
|
body: JSON.stringify({
|
|
166
169
|
action_payloads: actionPayloads,
|
|
167
170
|
derived_variable_payloads: dvHandles.map((h) => h.payload),
|
|
168
171
|
py_component_payloads: pyHandles.map((h) => h.payload),
|
|
169
|
-
ws_channel:
|
|
172
|
+
ws_channel: wsChannel,
|
|
170
173
|
params,
|
|
171
174
|
}),
|
|
172
175
|
signal,
|
|
@@ -234,9 +237,10 @@ export function fetchRouteData(route, params, snapshot, signal) {
|
|
|
234
237
|
}
|
|
235
238
|
}));
|
|
236
239
|
// return as soon as we have the template and on_load actions
|
|
240
|
+
const [templateValue, onLoadActionsValue] = yield Promise.all([template.getValue(), onLoadActions.getValue()]);
|
|
237
241
|
return {
|
|
238
|
-
template:
|
|
239
|
-
on_load:
|
|
242
|
+
template: templateValue,
|
|
243
|
+
on_load: onLoadActionsValue,
|
|
240
244
|
route_definition: route,
|
|
241
245
|
py_components: pyHandles,
|
|
242
246
|
derived_variables: dvHandles,
|
|
@@ -257,24 +261,34 @@ export function getFromPreloadCache(routeId, params) {
|
|
|
257
261
|
* Checks the preload cache first, and if not found, fetches the data from the server.
|
|
258
262
|
*/
|
|
259
263
|
export function usePreloadRoute() {
|
|
264
|
+
const currentMatches = useMatches();
|
|
260
265
|
const { routeObjects, routeDefMap } = useRouterContext();
|
|
261
|
-
return useRecoilCallback(({ snapshot }) => (url) => {
|
|
266
|
+
return useRecoilCallback(({ snapshot }) => (url) => __awaiter(this, void 0, void 0, function* () {
|
|
262
267
|
var _a;
|
|
263
268
|
// Match routes for the given URL using React Router's route objects
|
|
264
269
|
const matches = matchRoutes(routeObjects, url, (_a = window.dara) === null || _a === void 0 ? void 0 : _a.base_url);
|
|
265
270
|
if (!matches) {
|
|
266
271
|
return;
|
|
267
272
|
}
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
273
|
+
const release = snapshot.retain();
|
|
274
|
+
try {
|
|
275
|
+
yield Promise.all(matches
|
|
276
|
+
// filter out matches for the same exact route/param combo, i.e. don't re-fetch current route as it's unlikely user will navigate into the same route again
|
|
277
|
+
.filter((match) => !currentMatches.some((m) => m.id === match.route.id && isEqual(m.params, match.params)))
|
|
278
|
+
.map((match) => {
|
|
279
|
+
// Find the corresponding route definition using the route ID
|
|
280
|
+
const routeDef = routeDefMap.get(match.route.id);
|
|
281
|
+
if (!routeDef) {
|
|
282
|
+
return Promise.resolve();
|
|
283
|
+
}
|
|
284
|
+
return preloadCache.setIfMissing(createCacheKey(routeDef.id, match.params), () => {
|
|
285
|
+
return fetchRouteData(routeDef, match.params, snapshot);
|
|
286
|
+
});
|
|
287
|
+
}));
|
|
288
|
+
}
|
|
289
|
+
finally {
|
|
290
|
+
release();
|
|
291
|
+
}
|
|
292
|
+
}), [routeDefMap, routeObjects, currentMatches]);
|
|
279
293
|
}
|
|
280
294
|
//# sourceMappingURL=fetching.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetching.js","sourceRoot":"","sources":["../../js/router/fetching.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"fetching.js","sourceRoot":"","sources":["../../js/router/fetching.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { type LoaderData } from './fetching';
|
|
|
6
6
|
export interface LoaderResult {
|
|
7
7
|
data: LoaderData | Promise<LoaderData>;
|
|
8
8
|
}
|
|
9
|
-
export declare function createRouteLoader(route: RouteDefinition,
|
|
9
|
+
export declare function createRouteLoader(route: RouteDefinition, snapshot: () => Snapshot): ({ request: loaderRequest, params }: LoaderFunctionArgs) => Promise<{
|
|
10
10
|
data: LoaderData | Promise<LoaderData>;
|
|
11
11
|
}>;
|
|
12
12
|
declare function RouteContent(props: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-content.d.ts","sourceRoot":"","sources":["../../js/router/route-content.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAS,KAAK,kBAAkB,EAA6B,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIvC,OAAO,EAAE,KAAK,eAAe,EAAqB,MAAM,SAAS,CAAC;AAKlE,OAAO,EAAE,KAAK,UAAU,EAAuC,MAAM,YAAY,CAAC;AAElF,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1C;AAoBD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"route-content.d.ts","sourceRoot":"","sources":["../../js/router/route-content.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAS,KAAK,kBAAkB,EAA6B,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAIvC,OAAO,EAAE,KAAK,eAAe,EAAqB,MAAM,SAAS,CAAC;AAKlE,OAAO,EAAE,KAAK,UAAU,EAAuC,MAAM,YAAY,CAAC;AAElF,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC1C;AAoBD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAAQ,wCACb,kBAAkB;;GAsBtF;AAsED,iBAAS,YAAY,CAAC,KAAK,EAAE;IAAE,KAAK,EAAE,eAAe,CAAA;CAAE,GAAG,KAAK,CAAC,SAAS,CAYxE;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -35,15 +35,20 @@ function hasServerActions(route) {
|
|
|
35
35
|
function shouldHoldPromise(route) {
|
|
36
36
|
return !((route.__typename === 'IndexRoute' || route.__typename === 'PageRoute') && hasServerActions(route));
|
|
37
37
|
}
|
|
38
|
-
export function createRouteLoader(route,
|
|
38
|
+
export function createRouteLoader(route, snapshot) {
|
|
39
39
|
return function loader(_a) {
|
|
40
40
|
return __awaiter(this, arguments, void 0, function* ({ request: loaderRequest, params }) {
|
|
41
41
|
// Check preload cache first
|
|
42
42
|
let result = getFromPreloadCache(route.id, params);
|
|
43
|
+
// Not in cache, fetch fresh data
|
|
44
|
+
// Note: loader-initiated requests are NOT cached
|
|
43
45
|
if (!result) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
result = fetchRouteData(route, params,
|
|
46
|
+
const snapshotInstance = snapshot();
|
|
47
|
+
const release = snapshotInstance.retain();
|
|
48
|
+
result = fetchRouteData(route, params, snapshotInstance, loaderRequest.signal).finally(() => {
|
|
49
|
+
// ensure that after the fetcher completes, the snapshot is released
|
|
50
|
+
release();
|
|
51
|
+
});
|
|
47
52
|
}
|
|
48
53
|
if (shouldHoldPromise(route)) {
|
|
49
54
|
result = yield result;
|
|
@@ -63,7 +68,7 @@ function Content({ route, on_load, template, py_components, derived_variables, }
|
|
|
63
68
|
for (const resultHandle of [...py_components, ...derived_variables]) {
|
|
64
69
|
depsRegistry.set(resultHandle.result.depsKey, {
|
|
65
70
|
args: resultHandle.result.relevantValues,
|
|
66
|
-
result: resultHandle.handle
|
|
71
|
+
result: resultHandle.handle,
|
|
67
72
|
});
|
|
68
73
|
}
|
|
69
74
|
let cancelled = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-content.js","sourceRoot":"","sources":["../../js/router/route-content.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,+CAA+C;AAC/C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,EAA2B,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAiB,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAwB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,gBAAgB,MAAM,+CAA+C,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAmB,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAMlF,SAAS,gBAAgB,CAAC,KAAsB;IAC5C,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/E,OAAO,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,KAAsB;IAC7C,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,KAAK,YAAY,IAAI,KAAK,CAAC,UAAU,KAAK,WAAW,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;AACjH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"route-content.js","sourceRoot":"","sources":["../../js/router/route-content.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-root.d.ts","sourceRoot":"","sources":["../../js/router/router-root.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router-root.d.ts","sourceRoot":"","sources":["../../js/router/router-root.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKxC,UAAU,eAAe;IACrB,QAAQ,EAAE,QAAQ,CAAC;CACtB;AAED,iBAAS,UAAU,CAAC,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,GAAG,CAAC,OAAO,CAc9D;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { useState } from 'react';
|
|
3
3
|
import { RouterProvider } from 'react-router/dom';
|
|
4
|
-
import {
|
|
5
|
-
import { useLatestRef } from '@darajs/ui-utils';
|
|
4
|
+
import { useRecoilCallback } from 'recoil';
|
|
6
5
|
import { RouterContextProvider } from './context';
|
|
7
6
|
import { createRouter } from './create-router';
|
|
8
7
|
function RouterRoot({ daraData }) {
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
return (_jsx(RouterContextProvider, { routeDefinitions: routerData.routeDefinitions, routeObjects: routerData.routeObjects, routeDefMap: routerData.routeDefMap, children: _jsx(RouterProvider, { router: routerData.router }) }));
|
|
8
|
+
const getSnapshot = useRecoilCallback((ctx) => () => ctx.snapshot, []);
|
|
9
|
+
const [routerData] = useState(() => createRouter(daraData, getSnapshot));
|
|
10
|
+
return (_jsx(RouterContextProvider, { routeDefinitions: routerData.routeDefinitions, routeObjects: routerData.routeObjects, routeDefMap: routerData.routeDefMap, defaultPath: routerData.defaultPath, children: _jsx(RouterProvider, { router: routerData.router }) }));
|
|
13
11
|
}
|
|
14
12
|
export default RouterRoot;
|
|
15
13
|
//# sourceMappingURL=router-root.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-root.js","sourceRoot":"","sources":["../../js/router/router-root.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"router-root.js","sourceRoot":"","sources":["../../js/router/router-root.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,SAAS,UAAU,CAAC,EAAE,QAAQ,EAAmB;IAC7C,MAAM,WAAW,GAAG,iBAAiB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACvE,MAAM,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAEzE,OAAO,CACH,KAAC,qBAAqB,IAClB,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,EAC7C,YAAY,EAAE,UAAU,CAAC,YAAY,EACrC,WAAW,EAAE,UAAU,CAAC,WAAW,EACnC,WAAW,EAAE,UAAU,CAAC,WAAW,YAEnC,KAAC,cAAc,IAAC,MAAM,EAAE,UAAU,CAAC,MAAM,GAAI,GACzB,CAC3B,CAAC;AACN,CAAC;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Params } from 'react-router';
|
|
1
2
|
import { type GetRecoilValue, type RecoilValue, type Snapshot } from 'recoil';
|
|
2
3
|
import { type WebSocketClientInterface } from '../../api';
|
|
3
4
|
import { type RequestExtras } from '../../api/http';
|
|
@@ -104,7 +105,7 @@ interface CurrentResult {
|
|
|
104
105
|
*/
|
|
105
106
|
interface CachedResponse {
|
|
106
107
|
type: 'cached';
|
|
107
|
-
response:
|
|
108
|
+
response: Deferred<{
|
|
108
109
|
ok: boolean;
|
|
109
110
|
value: any;
|
|
110
111
|
}>;
|
|
@@ -143,8 +144,9 @@ export declare function resolveDerivedValue({ key, variables, deps, resolvedVari
|
|
|
143
144
|
name: 'get';
|
|
144
145
|
get: GetRecoilValue;
|
|
145
146
|
} | {
|
|
146
|
-
name: '
|
|
147
|
+
name: 'static';
|
|
147
148
|
snapshot: Snapshot;
|
|
149
|
+
params: Params<string>;
|
|
148
150
|
};
|
|
149
151
|
triggerList: Array<TriggerInfo>;
|
|
150
152
|
triggers: TriggerIndexValue[];
|
|
@@ -175,13 +177,14 @@ export declare function getOrRegisterDerivedVariable(variable: DerivedVariable,
|
|
|
175
177
|
* Otherwise, returns an object with values so be sent to the backend
|
|
176
178
|
* and handles to resolve the cached promise to the result.
|
|
177
179
|
*/
|
|
178
|
-
export declare function preloadDerivedValue({ key, variables, deps, triggerList, triggers, snapshot, }: {
|
|
180
|
+
export declare function preloadDerivedValue({ key, variables, deps, triggerList, triggers, snapshot, params, }: {
|
|
179
181
|
key: string;
|
|
180
182
|
variables: any[];
|
|
181
183
|
deps: any[];
|
|
182
184
|
triggerList: Array<TriggerInfo>;
|
|
183
185
|
triggers: TriggerIndexValue[];
|
|
184
186
|
snapshot: Snapshot;
|
|
187
|
+
params: Params<string>;
|
|
185
188
|
}): {
|
|
186
189
|
handle: Deferred<any>;
|
|
187
190
|
result: DerivedResult;
|
|
@@ -189,7 +192,7 @@ export declare function preloadDerivedValue({ key, variables, deps, triggerList,
|
|
|
189
192
|
/**
|
|
190
193
|
* Preload a derived variable value.
|
|
191
194
|
*/
|
|
192
|
-
export declare function preloadDerivedVariable(variable: DerivedVariable, snapshot: Snapshot): ReturnType<typeof preloadDerivedValue>;
|
|
195
|
+
export declare function preloadDerivedVariable(variable: DerivedVariable, snapshot: Snapshot, params: Params<string>): ReturnType<typeof preloadDerivedValue>;
|
|
193
196
|
/**
|
|
194
197
|
* Helper hook to get the (data) derived variable selector, while correctly registering triggers and setting up polling interval.
|
|
195
198
|
*
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"derived-variable.d.ts","sourceRoot":"","sources":["../../../js/shared/interactivity/derived-variable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ 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
|
+
import { deferred, isDeferred } from '../utils/deferred';
|
|
28
28
|
// eslint-disable-next-line import/no-cycle
|
|
29
29
|
import { cleanArgs, getOrRegisterTrigger, resolveNested, resolveVariable, resolveVariableStatic } from './internal';
|
|
30
30
|
import { depsRegistry, getRegistryKey, selectorFamilyMembersRegistry, selectorFamilyRegistry, } from './store';
|
|
@@ -178,8 +178,8 @@ export function resolveDerivedValue({ key, variables, deps, resolvedVariables, r
|
|
|
178
178
|
* - server variables are resolved to their sequence number
|
|
179
179
|
*/
|
|
180
180
|
const values = resolvedVariables.map((v) => {
|
|
181
|
-
if (resolutionStrategy.name === '
|
|
182
|
-
return resolveVariableStatic(v, resolutionStrategy.snapshot);
|
|
181
|
+
if (resolutionStrategy.name === 'static') {
|
|
182
|
+
return resolveVariableStatic(v, resolutionStrategy.snapshot, resolutionStrategy.params);
|
|
183
183
|
}
|
|
184
184
|
return resolveValue(v, resolutionStrategy.get);
|
|
185
185
|
});
|
|
@@ -219,7 +219,7 @@ export function resolveDerivedValue({ key, variables, deps, resolvedVariables, r
|
|
|
219
219
|
// If the relevant arg values didn't change, return previous result
|
|
220
220
|
if (areArgsTheSame) {
|
|
221
221
|
const previousValue = previousEntry.result;
|
|
222
|
-
if (previousValue
|
|
222
|
+
if (isDeferred(previousValue)) {
|
|
223
223
|
return {
|
|
224
224
|
type: 'cached',
|
|
225
225
|
response: previousValue,
|
|
@@ -402,7 +402,7 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
|
|
|
402
402
|
// Skip fetching if we have a cached result, await it instead
|
|
403
403
|
if (derivedResult.type === 'cached') {
|
|
404
404
|
try {
|
|
405
|
-
const response = yield derivedResult.response;
|
|
405
|
+
const response = yield derivedResult.response.getValue();
|
|
406
406
|
shouldFetchTask = true;
|
|
407
407
|
if (!response.ok) {
|
|
408
408
|
throwError(new Error(response.value));
|
|
@@ -511,13 +511,13 @@ export function getOrRegisterDerivedVariable(variable, wsClient, taskContext, cu
|
|
|
511
511
|
* Otherwise, returns an object with values so be sent to the backend
|
|
512
512
|
* and handles to resolve the cached promise to the result.
|
|
513
513
|
*/
|
|
514
|
-
export function preloadDerivedValue({ key, variables, deps, triggerList, triggers, snapshot, }) {
|
|
514
|
+
export function preloadDerivedValue({ key, variables, deps, triggerList, triggers, snapshot, params, }) {
|
|
515
515
|
const derivedResult = resolveDerivedValue({
|
|
516
516
|
key,
|
|
517
517
|
variables,
|
|
518
518
|
deps,
|
|
519
519
|
resolvedVariables: variables,
|
|
520
|
-
resolutionStrategy: { name: '
|
|
520
|
+
resolutionStrategy: { name: 'static', snapshot, params },
|
|
521
521
|
triggerList,
|
|
522
522
|
triggers,
|
|
523
523
|
});
|
|
@@ -531,7 +531,7 @@ export function preloadDerivedValue({ key, variables, deps, triggerList, trigger
|
|
|
531
531
|
/**
|
|
532
532
|
* Preload a derived variable value.
|
|
533
533
|
*/
|
|
534
|
-
export function preloadDerivedVariable(variable, snapshot) {
|
|
534
|
+
export function preloadDerivedVariable(variable, snapshot, params) {
|
|
535
535
|
// assume no extras in top-level variables
|
|
536
536
|
const key = getRegistryKey(variable, 'result-selector') + new RequestExtrasSerializable({}).toJSON();
|
|
537
537
|
// prepare trigger list as usual but use static resolution
|
|
@@ -544,6 +544,7 @@ export function preloadDerivedVariable(variable, snapshot) {
|
|
|
544
544
|
triggers,
|
|
545
545
|
triggerList,
|
|
546
546
|
snapshot,
|
|
547
|
+
params,
|
|
547
548
|
});
|
|
548
549
|
}
|
|
549
550
|
/**
|
|
@@ -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":";;;;;;;;;AAAA,gDAAgD;AAChD,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,EAIH,aAAa,EACb,cAAc,EACd,cAAc,EACd,iBAAiB,GACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAiC,eAAe,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChF,OAAO,EAAsB,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAMH,WAAW,EACX,yBAAyB,EACzB,wBAAwB,EACxB,wBAAwB,EACxB,UAAU,GACb,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAiB,QAAQ,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACxE,2CAA2C;AAC3C,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,aAAa,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACpH,OAAO,EAEH,YAAY,EACZ,cAAc,EACd,6BAA6B,EAC7B,sBAAsB,GACzB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAoB,gBAAgB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAS7G,MAAM,UAAU,cAAc,CAAC,UAAwC;IACnE,OAAO,SAAS,IAAI,UAAU,CAAC;AACnC,CAAC;AAuBD;;;;;;;;;GASG;AACH,MAAM,UAAgB,oBAAoB;yDAAI,EAC1C,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,EACX,MAAM,EACN,QAAQ,GACe;QACvB,MAAM,YAAY,GACd,KAAK,KAAK,IAAI,CAAC,CAAC;YACX;gBACG,eAAe,EAAE,MAAM;aAChB;YACf,CAAC,CAAG,SAAS,CAAC;QAElB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;QAE/C,MAAM,GAAG,GAAG,MAAM,OAAO,CACrB,8BAA8B,WAAW,EAAE,EAC3C;YACI,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,EAAE,CAAC;YAC1E,OAAO,oBAAO,YAAY,CAAE;YAC5B,MAAM,EAAE,WAAW,CAAC,IAAI;SAC3B,EACD,MAAM,CACT,CAAC;QACF,MAAM,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAClC,MAAM,gBAAgB,CAAC,GAAG,EAAE,kDAAkD,WAAW,EAAE,CAAC,CAAC;QAC7F,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;yDAAC,EACzC,WAAW,EACX,WAAW,EACX,MAAM,EACN,QAAQ,EACR,MAAM,EACN,KAAK,EACL,SAAS,GACc;QACvB,qGAAqG;QACrG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAAE,CAAC;YACvC,sBAAsB,CAAC,WAAW,CAAC,GAAG,IAAI,eAAe,CAAkC,IAAI,CAAC,CAAC;YACjG,mBAAmB,CAAC,WAAW,CAAC,GAAG,sBAAsB,CAAC,WAAW,CAAC,CAAC,IAAI,CACvE,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;QACN,CAAC;QAED,2CAA2C;QAC3C,sBAAsB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;YACrC,KAAK;YACL,MAAM;YACN,SAAS;YACT,WAAW;YACX,MAAM;YACN,WAAW;YACX,QAAQ;SACX,CAAC,CAAC;QAEH,iDAAiD;QACjD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,mBAAmB,CAAC,WAAW,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACP,CAAC;CAAA;AAED;;;;;GAKG;AACH,SAAS,YAAY,CACjB,KAAmG,EACnG,MAAsB;IAEtB,IAAI,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,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;IACN,CAAC;IACD,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,uCACO,KAAK,KACR,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,EACxC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,EAChD,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,IAC9C;IACN,CAAC;IAED,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,uCACO,KAAK,KACR,eAAe,EACX,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,IAClG;IACN,CAAC;IAED,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,uCACO,KAAK;YACR,iFAAiF;YACjF,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,QAAmC,EAAE,MAAM,CAAC,IAC3E;IACN,CAAC;IAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,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,CAAC;YAC9B,OAAO,EAAE,CAAC;QACd,CAAC;QAED,IAAI,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;QAChD,CAAC;QAED,IAAI,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,GAAG,CAAC,eAAe,CAAC;QAC/B,CAAC;QAED,IAAI,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,qEAAqE;YACrE,OAAO,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9E,CAAC;QAED,OAAO,GAAG,CAAC;IACf,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;AAgED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAChC,GAAG,EACH,SAAS,EACT,IAAI,EACJ,iBAAiB,EACjB,kBAAkB,EAClB,WAAW,EACX,QAAQ,GAWX;IACG;;;;;;OAMG;IACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACvC,IAAI,kBAAkB,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvC,OAAO,qBAAqB,CAAC,CAAC,EAAE,kBAAkB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC5F,CAAC;QAED,OAAO,YAAY,CAAC,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH;;;;;OAKG;IACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnC;;;;;;OAMG;IACH,MAAM,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;QACtD,qBAAqB;QACrB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YACjB,OAAO,GAAG,CAAC;QACf,CAAC;QACD,OAAO,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC,EAAE,IAAI,GAAG,EAAe,CAAC,CAAC;IAE3B;;OAEG;IACH,MAAM,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAE5C,oCAAoC;IACpC,MAAM,cAAc,GAAG,IAAI;SACtB,MAAM,CAAC,UAAU,CAAC;SAClB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;SAC5D,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,oFAAoF;IAEzI,6DAA6D;IAC7D,IAAI,aAAa,EAAE,CAAC;QAChB,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEnE,mEAAmE;QACnE,IAAI,cAAc,EAAE,CAAC;YACjB,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC;YAC3C,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC5B,OAAO;oBACH,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,aAAa;oBACvB,OAAO,EAAE,GAAG;oBACZ,MAAM;oBACN,cAAc;oBACd,aAAa,EAAE;wBACX,cAAc;wBACd,mBAAmB,EAAE,IAAI;wBACzB,IAAI,EAAE,SAAS;wBACf,MAAM;wBACN,OAAO,EAAE,GAAG;qBACf;iBACJ,CAAC;YACN,CAAC;YAED,OAAO;gBACH,KAAK,EAAE,aAAa;gBACpB,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,cAAc;gBACd,OAAO,EAAE,GAAG;aACf,CAAC;QACN,CAAC;QAED,iFAAiF;QAEjF,iHAAiH;QACjH,MAAM,uBAAuB,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CACpD,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAClC,CAAC;QAEd,gEAAgE;QAChE,IAAI,mBAAmB,GAAkB,IAAI,CAAC;QAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YACnD;;;eAGG;YACH,IAAI,YAAY,CAAC,GAAG,KAAK,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpD,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;oBACZ,sEAAsE;oBACtE,mBAAmB,GAAG,YAAY,CAAC,SAAS,CAAC;gBACjD,CAAC;qBAAM,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;oBAChC,+EAA+E;oBAC/E,4DAA4D;oBAC5D,MAAM,UAAU,GAAG,GAAG,GAAG,CAAC,CAAC;oBAC3B,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAE,CAAC;oBAE7C,wEAAwE;oBACxE,kEAAkE;oBAClE,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAChC,mBAAmB,GAAG,YAAY,CAAC,SAAS,CAAC;oBACjD,CAAC;yBAAM,CAAC;wBACJ,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC5E,CAAC;gBACL,CAAC;gBACD,MAAM;YACV,CAAC;QACL,CAAC;QAED,OAAO;YACH,cAAc;YACd,mBAAmB;YACnB,IAAI,EAAE,SAAS;YACf,MAAM;YACN,OAAO,EAAE,GAAG;SACf,CAAC;IACN,CAAC;IAED,OAAO;QACH,cAAc;QACd,mBAAmB,EAAE,IAAI;QACzB,IAAI,EAAE,SAAS;QACf,MAAM;QACN,OAAO,EAAE,GAAG;KACf,CAAC;AACN,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kCAAkC,CAC9C,QAAyB,EACzB,QAAkC,EAClC,WAA8B,EAC9B,aAA4B;IAE5B,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAExD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE/B,iDAAiD;QACjD,sBAAsB,CAAC,GAAG,CACtB,GAAG,EACH,cAAc,CAAC;YACX,oBAAoB,EAAE;gBAClB,QAAQ,EAAE,aAAa;aAC1B;YACD,GAAG,EACC,CAAC,kBAA6C,EAAE,EAAE,CAClD,KAAgB,EAAE,0CAAX,EAAE,GAAG,EAAE;gBACV;;;;;mBAKG;gBACH,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACvC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAO,CAAC,EAAE,EAAE;oBAC/B,yEAAyE;oBACzE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;wBACjB,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC9B,CAAC;oBAED,OAAO,eAAe,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;gBACpE,CAAC,CAAA,CAAC,CACL,CAAC;gBAEF,MAAM,WAAW,GAAG,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAExD,qFAAqF;gBACrF,MAAM,WAAW,GAAG,GAAG,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAEtD,+CAA+C;gBAC/C,MAAM,WAAW,GAAG,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAEzD,+HAA+H;gBAC/H,MAAM,QAAQ,GAAG,qBAAqB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;gBACzD,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBAE9B,MAAM,aAAa,GAAG,mBAAmB,CAAC;oBACtC,GAAG,EAAE,WAAW;oBAChB,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,iBAAiB;oBACjB,kBAAkB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE;oBACxC,WAAW;oBACX,QAAQ;iBACX,CAAC,CAAC;gBACH,OAAO,aAAa,CAAC;YACzB,CAAC,CAAA;YACL,GAAG,EAAE,MAAM,EAAE;SAChB,CAAC,CACL,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IAChD,2DAA2D;IAC3D,8FAA8F;IAC9F,4GAA4G;IAC5G,mBAAmB;IACnB,MAAM,kBAAkB,GAAG,IAAI,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACxE,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACpD,6DAA6D;IAC7D,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7C,6BAA6B,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAC9F,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED,MAAM,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAElC;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CACxC,QAAyB,EACzB,QAAkC,EAClC,WAA8B,EAC9B,aAA4B;IAE5B,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE/B,iDAAiD;QACjD,sBAAsB,CAAC,GAAG,CACtB,GAAG,EACH,cAAc,CAAC;YACX,oBAAoB,EAAE;gBAClB,QAAQ,EAAE,aAAa;aAC1B;YACD,GAAG,EACC,CAAC,kBAA6C,EAAE,EAAE,CAClD,KAAgB,EAAE,0CAAX,EAAE,GAAG,EAAE;gBACV,MAAM,WAAW,GAAG,GAAG,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAEtD,MAAM,UAAU,GAAG,CAAC,KAAc,EAAS,EAAE;oBACzC,yGAAyG;oBACxG,KAAa,CAAC,UAAU,GAAG,GAAG,CAAC;oBAC/B,KAAa,CAAC,cAAc,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC;oBAC5D,MAAM,KAAK,CAAC;gBAChB,CAAC,CAAC;gBACF,MAAM,WAAW,GAAG,CAAK,IAAa,EAAiB,EAAE;oBACrD,IAAI,CAAC;wBACD,OAAO,IAAI,EAAE,CAAC;oBAClB,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,UAAU,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;gBACL,CAAC,CAAC;gBAEF,yDAAyD;gBACzD,MAAM,gBAAgB,GAAG,kCAAkC,CACvD,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,kBAAkB,CAAC,MAAM,CAC5B,CAAC;gBACF,IAAI,aAAa,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBAE1C,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBACpC,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC;gBACtC,CAAC;gBAED,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC;gBACtC,IAAI,gBAAgB,GAAG,IAAI,CAAC;gBAC5B,uCAAuC;gBACvC,IAAI,eAAe,GAAG,KAAK,CAAC;gBAE5B,6DAA6D;gBAC7D,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAClC,IAAI,CAAC;wBACD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBACzD,eAAe,GAAG,IAAI,CAAC;wBACvB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;4BACf,UAAU,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;wBAC1C,CAAC;wBACD,gBAAgB,GAAG,QAAQ,CAAC,KAAK,CAAC;wBAClC,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC;oBAChD,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,UAAU,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,gBAAgB,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,CACtC,6BAA6B,CAAC;wBAC1B,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,MAAM;wBACN,SAAS,EAAG,aAA+B,CAAC,mBAAmB;wBAC/D,WAAW;wBACX,MAAM,EAAE,gBAAgB,CACpB,SAAS,CAAE,aAA+B,CAAC,MAAM,CAAC,EAClD,QAAQ,CAAC,SAAS,CACrB;wBACD,WAAW,EAAE,QAAQ,CAAC,GAAG;wBACzB,QAAQ;qBACX,CAAC,CACL,CAAC;gBACN,CAAC;gBAED,IAAI,aAAa,GAAQ,OAAO,CAAC;gBAEjC,wGAAwG;gBACxG,WAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAE9C,wFAAwF;gBACxF,IAAI,cAAc,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACnC,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC;oBAExC,2FAA2F;oBAC3F,IAAI,eAAe,EAAE,CAAC;wBAClB,IAAI,CAAC;4BACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAM,MAAM,EAAE,MAAM,CAAC,CAAC;4BAC9D,IAAI,UAAU,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;gCAC7B,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC;4BACtC,CAAC;wBACL,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACT,UAAU,CAAC,CAAC,CAAC,CAAC;wBAClB,CAAC;oBACL,CAAC;oBAED,0DAA0D;oBAC1D,IAAI,aAAa,KAAK,OAAO,EAAE,CAAC;wBAC5B,8BAA8B;wBAC9B,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;wBAEjF,IAAI,CAAC;4BACD,MAAM,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;wBACvC,CAAC;wBAAC,OAAO,CAAU,EAAE,CAAC;4BAClB,IAAI,CAAC,YAAY,SAAS,EAAE,CAAC;gCACzB,UAAU,CAAC,CAAC,CAAC,CAAC;4BAClB,CAAC;4BAED,iCAAiC;4BACjC,+FAA+F;4BAC/F,OAAO,IAAI,CAAC;wBAChB,CAAC;gCAAS,CAAC;4BACP,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;wBAChC,CAAC;wBAED,aAAa,GAAG,MAAM,WAAW,CAAC,GAAS,EAAE;4BACzC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAM,MAAM,EAAE,MAAM,CAAC,CAAC;4BAC1D,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gCAChC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;4BAC7C,CAAC;4BACD,OAAO,MAAM,CAAC,MAAM,CAAC;wBACzB,CAAC,CAAA,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC;gBAC3C,CAAC;gBAED,4BAA4B;gBAC5B,aAAa;oBACT,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAEzF,4CAA4C;gBAC5C,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE;oBACpC,IAAI,EAAE,aAAa,CAAC,cAAc;oBAClC,MAAM,EAAE,aAAa;iBACxB,CAAC,CAAC;gBAEH,OAAO,aAAa,CAAC;YACzB,CAAC,CAAA;YACL,GAAG,EAAE,MAAM,EAAE;SAChB,CAAC,CACL,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IAEhD,2DAA2D;IAC3D,8FAA8F;IAC9F,4GAA4G;IAC5G,mBAAmB;IACnB,MAAM,kBAAkB,GAAG,IAAI,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACxE,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAEpD,6DAA6D;IAC7D,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7C,6BAA6B,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,6BAA6B,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAE9F,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAChC,GAAG,EACH,SAAS,EACT,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAST;IAIG,MAAM,aAAa,GAAG,mBAAmB,CAAC;QACtC,GAAG;QACH,SAAS;QACT,IAAI;QACJ,iBAAiB,EAAE,SAAS;QAC5B,kBAAkB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE;QACxD,WAAW;QACX,QAAQ;KACX,CAAC,CAAC;IAEH,8DAA8D;IAC9D,IAAI,aAAa,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC;AACzD,CAAC;AACD;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAClC,QAAyB,EACzB,QAAkB,EAClB,MAAsB;IAEtB,0CAA0C;IAC1C,MAAM,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IAErG,0DAA0D;IAC1D,MAAM,WAAW,GAAG,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtF,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE5G,OAAO,mBAAmB,CAAC;QACvB,GAAG;QACH,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,QAAQ;QACR,WAAW;QACX,QAAQ;QACR,MAAM;KACT,CAAC,CAAC;AACP,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAC9B,QAAyB,EACzB,QAAkC,EAClC,WAA8B,EAC9B,MAAqB;IAErB,MAAM,UAAU,GAAG,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAEzF;;;;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,CACb,cAAc,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACrB,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;QAClC,GAAG,EAAE,GAAG,CAAC,GAAG,GAAG,CAAC;KACnB,CAAC,CAAC,EACP,CAAC,cAAc,CAAC,CACnB,CAAC;IAEF,6DAA6D;IAC7D,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAEhD,OAAO,UAAU,CAAC;AACtB,CAAC"}
|