@common-stack/client-react 0.5.29 → 0.5.31
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/lib/__tests__/fill-register-test.js +6 -31
- package/lib/__tests__/fill-register-test.js.map +1 -1
- package/lib/__tests__/helpers/sample-menu.js +1 -4
- package/lib/__tests__/helpers/sample-menu.js.map +1 -1
- package/lib/__tests__/integrated-routes.test.js +14 -42
- package/lib/__tests__/integrated-routes.test.js.map +1 -1
- package/lib/__tests__/router-render.test.js +13 -57
- package/lib/__tests__/router-render.test.js.map +1 -1
- package/lib/connector/base-connector.js +24 -48
- package/lib/connector/base-connector.js.map +1 -1
- package/lib/connector/connector.d.ts +3 -2
- package/lib/connector/connector.js +9 -13
- package/lib/connector/connector.js.map +1 -1
- package/lib/connector/connector.native.js +10 -17
- package/lib/connector/connector.native.js.map +1 -1
- package/lib/connector/connector.test.js +5 -30
- package/lib/connector/connector.test.js.map +1 -1
- package/lib/connector/index.js +1 -17
- package/lib/connector/index.js.map +1 -1
- package/lib/index.js +10 -28
- package/lib/index.js.map +1 -1
- package/lib/index.native.js +10 -28
- package/lib/index.native.js.map +1 -1
- package/lib/interfaces/extended-feature.js +1 -2
- package/lib/interfaces/feature.js +1 -2
- package/lib/interfaces/index.js +5 -21
- package/lib/interfaces/index.js.map +1 -1
- package/lib/interfaces/menu.js +2 -5
- package/lib/interfaces/menu.js.map +1 -1
- package/lib/interfaces/new-router.d.ts +9 -3
- package/lib/interfaces/new-router.js +1 -2
- package/lib/interfaces/router.js +1 -2
- package/lib/inversify/InversifyContext.js +6 -34
- package/lib/inversify/InversifyContext.js.map +1 -1
- package/lib/inversify/index.js +1 -17
- package/lib/inversify/index.js.map +1 -1
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js +12 -37
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js.map +1 -1
- package/lib/plugin-area/__tests__/plugin-api.test.js +11 -13
- package/lib/plugin-area/__tests__/plugin-api.test.js.map +1 -1
- package/lib/plugin-area/base-plugin-area.js +12 -39
- package/lib/plugin-area/base-plugin-area.js.map +1 -1
- package/lib/plugin-area/higher-order-component-util.js +3 -7
- package/lib/plugin-area/higher-order-component-util.js.map +1 -1
- package/lib/plugin-area/index.js +5 -35
- package/lib/plugin-area/index.js.map +1 -1
- package/lib/plugin-area/index.native.js +7 -37
- package/lib/plugin-area/index.native.js.map +1 -1
- package/lib/plugin-area/plugin-api.js +15 -18
- package/lib/plugin-area/plugin-api.js.map +1 -1
- package/lib/plugin-area/plugin-context.js +5 -32
- package/lib/plugin-area/plugin-context.js.map +1 -1
- package/lib/route/__tests__/admin-new-routes.test.js +11 -45
- package/lib/route/__tests__/admin-new-routes.test.js.map +1 -1
- package/lib/route/__tests__/getFlatMenus.test.js +4 -6
- package/lib/route/__tests__/getFlatMenus.test.js.map +1 -1
- package/lib/route/__tests__/render-routes-config.test.js +6 -18
- package/lib/route/__tests__/render-routes-config.test.js.map +1 -1
- package/lib/route/__tests__/route-type.test.js +1 -2
- package/lib/route/__tests__/route-type.test.js.map +1 -1
- package/lib/route/get-routes.js +24 -31
- package/lib/route/get-routes.js.map +1 -1
- package/lib/route/get-routes.test.js +8 -19
- package/lib/route/get-routes.test.js.map +1 -1
- package/lib/route/index.js +2 -18
- package/lib/route/index.js.map +1 -1
- package/lib/route/index.native.d.ts +1 -1
- package/lib/route/index.native.js +1 -17
- package/lib/route/index.native.js.map +1 -1
- package/lib/route/old/__tests__/config-sidebar-menu.test.js +17 -15
- package/lib/route/old/__tests__/config-sidebar-menu.test.js.map +1 -1
- package/lib/route/old/get-menus.js +14 -21
- package/lib/route/old/get-menus.js.map +1 -1
- package/lib/route/old/get-routes-notused.js +15 -13
- package/lib/route/old/get-routes-notused.js.map +1 -1
- package/lib/route/old/render.d.ts +1 -1
- package/lib/route/old/render.js +7 -31
- package/lib/route/old/render.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.d.ts +8 -0
- package/lib/route/react-navigation/get-navigation-utils.js +35 -40
- package/lib/route/react-navigation/get-navigation-utils.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js +15 -17
- package/lib/route/react-navigation/get-navigation-utils.test.js.map +1 -1
- package/lib/route/react-navigation/index.js +2 -18
- package/lib/route/react-navigation/index.js.map +1 -1
- package/lib/route/react-navigation/react-native.sample.test.js +8 -22
- package/lib/route/react-navigation/react-native.sample.test.js.map +1 -1
- package/lib/route/react-navigation/react-native.sample1.test.js +14 -48
- package/lib/route/react-navigation/react-native.sample1.test.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.js +16 -31
- package/lib/route/react-navigation/react-navigation-render.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.test.js +23 -37
- package/lib/route/react-navigation/react-navigation-render.test.js.map +1 -1
- package/lib/route/react-navigation/root-navigation.js +5 -9
- package/lib/route/react-navigation/root-navigation.js.map +1 -1
- package/lib/route/react-navigation/routes.js +1 -2
- package/lib/route/react-navigation/types.js +1 -5
- package/lib/route/react-navigation/types.js.map +1 -1
- package/lib/route/render-routes-native.d.ts +3 -0
- package/lib/route/render-routes-native.js +126 -0
- package/lib/route/render-routes-native.js.map +1 -0
- package/lib/route/render-routes.d.ts +1 -2
- package/lib/route/render-routes.js +132 -74
- package/lib/route/render-routes.js.map +1 -1
- package/lib/route/render-routes.test.js +317 -127
- package/lib/route/render-routes.test.js.map +1 -1
- package/lib/route/root-navigation.js +3 -7
- package/lib/route/root-navigation.js.map +1 -1
- package/lib/route/test-routes.d.ts +411 -0
- package/lib/route/test-routes.js +578 -0
- package/lib/route/test-routes.js.map +1 -0
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js +12 -37
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js.map +1 -1
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js +11 -13
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js.map +1 -1
- package/lib/route-based-plugin-area/higher-order-component-util.js +3 -7
- package/lib/route-based-plugin-area/higher-order-component-util.js.map +1 -1
- package/lib/route-based-plugin-area/index.js +2 -18
- package/lib/route-based-plugin-area/index.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-api.js +15 -18
- package/lib/route-based-plugin-area/plugin-api.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-context.js +5 -32
- package/lib/route-based-plugin-area/plugin-context.js.map +1 -1
- package/lib/route-based-plugin-area/route-based-plugin-area.js +12 -39
- package/lib/route-based-plugin-area/route-based-plugin-area.js.map +1 -1
- package/lib/router-factory/index.js +5 -31
- package/lib/router-factory/index.js.map +1 -1
- package/lib/router-factory/index.native.js +5 -31
- package/lib/router-factory/index.native.js.map +1 -1
- package/lib/utils/before-ssr.js +6 -19
- package/lib/utils/before-ssr.js.map +1 -1
- package/lib/utils/combine.js +2 -6
- package/lib/utils/combine.js.map +1 -1
- package/lib/utils/hydrate.js +3 -7
- package/lib/utils/hydrate.js.map +1 -1
- package/lib/utils/index.js +5 -21
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/sort-keys.d.ts +1 -0
- package/lib/utils/sort-keys.js +14 -10
- package/lib/utils/sort-keys.js.map +1 -1
- package/lib/utils/sort-keys.test.js +33 -7
- package/lib/utils/sort-keys.test.js.map +1 -1
- package/lib/utils/utils.js +1 -5
- package/lib/utils/utils.js.map +1 -1
- package/package.json +5 -4
- package/lib/route/render-routes.native.d.ts +0 -4
- package/lib/route/render-routes.native.js +0 -162
- package/lib/route/render-routes.native.js.map +0 -1
|
@@ -1,15 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
const get_routes_1 = require("./get-routes");
|
|
1
|
+
import { getSortedRoutes } from './get-routes';
|
|
13
2
|
const MyComponent = () => { };
|
|
14
3
|
describe('getRoutes utility with basic routes', () => {
|
|
15
4
|
const routerConfig1 = {
|
|
@@ -161,7 +150,7 @@ describe('getRoutes utility with basic routes', () => {
|
|
|
161
150
|
// ["//:orgName/artifact"]: { exact: false, component: MyComponent },
|
|
162
151
|
// ["/:orgName"]: { exact: false, component: MyComponent },
|
|
163
152
|
};
|
|
164
|
-
test('with /a', () =>
|
|
153
|
+
test('with /a', async () => {
|
|
165
154
|
const result = {
|
|
166
155
|
// component: any,
|
|
167
156
|
routes: [{
|
|
@@ -171,19 +160,19 @@ describe('getRoutes utility with basic routes', () => {
|
|
|
171
160
|
{ path: '/ab/2/1', exact: true }],
|
|
172
161
|
}],
|
|
173
162
|
};
|
|
174
|
-
const routes1 =
|
|
163
|
+
const routes1 = getSortedRoutes('/', routerConfig1);
|
|
175
164
|
// const routes = getRoutes(/^\/.*/, sortKeys(routerConfig, { compare }));
|
|
176
165
|
expect(routes1).toMatchSnapshot();
|
|
177
166
|
// expect(menu1).toMatchSnapshot();
|
|
178
167
|
// expect(routes).toMatchSnapshot();
|
|
179
168
|
// make sure the /a/p/1 is not nested under /a/p instead in should be nested under /a
|
|
180
|
-
})
|
|
181
|
-
|
|
182
|
-
const routes =
|
|
169
|
+
});
|
|
170
|
+
test('more url testing', () => {
|
|
171
|
+
const routes = getSortedRoutes('/', orgRoutes);
|
|
183
172
|
expect(routes).toMatchSnapshot();
|
|
184
173
|
});
|
|
185
|
-
|
|
186
|
-
const routes =
|
|
174
|
+
test('layout routes', () => {
|
|
175
|
+
const routes = getSortedRoutes('/', layoutRoutes);
|
|
187
176
|
expect(routes).toMatchSnapshot();
|
|
188
177
|
});
|
|
189
178
|
// xtest('render /a', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-routes.test.js","sourceRoot":"","sources":["../../src/route/get-routes.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-routes.test.js","sourceRoot":"","sources":["../../src/route/get-routes.test.ts"],"names":[],"mappings":"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"}
|
package/lib/route/index.js
CHANGED
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./render-routes"), exports);
|
|
18
|
-
__exportStar(require("./react-navigation"), exports);
|
|
1
|
+
export * from './render-routes';
|
|
2
|
+
export * from './react-navigation';
|
|
19
3
|
//# sourceMappingURL=index.js.map
|
package/lib/route/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './render-routes
|
|
1
|
+
export * from './render-routes-native';
|
|
@@ -1,18 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./render-routes.native"), exports);
|
|
1
|
+
export * from './render-routes-native';
|
|
18
2
|
//# sourceMappingURL=index.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../../src/route/index.native.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.native.js","sourceRoot":"","sources":["../../src/route/index.native.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const get_menus_1 = require("../get-menus");
|
|
5
|
-
const connector_1 = require("../../../connector");
|
|
1
|
+
import { sortBy } from 'lodash';
|
|
2
|
+
import { getMenus } from '../get-menus';
|
|
3
|
+
import { Feature } from '../../../connector';
|
|
6
4
|
const genMenuData = (namespace = '') => ({
|
|
7
5
|
[namespace + '/a']: { name: 'a', icon: 'a', authority: 'guest' },
|
|
8
6
|
[namespace + '/a/1']: { name: '1', icon: '1' },
|
|
@@ -14,7 +12,7 @@ const genMenuData = (namespace = '') => ({
|
|
|
14
12
|
});
|
|
15
13
|
describe('sort menu by priority', () => {
|
|
16
14
|
const sortMenusByPriority = (menus) => {
|
|
17
|
-
return
|
|
15
|
+
return sortBy(menus, (obj) => parseInt(obj.priority, 10));
|
|
18
16
|
};
|
|
19
17
|
const sortMenus = (sortByPriority, menus) => {
|
|
20
18
|
if (sortByPriority) {
|
|
@@ -124,7 +122,11 @@ describe('getMenu utility with basic paths', () => {
|
|
|
124
122
|
function formatter(data, parentAuthority = undefined) {
|
|
125
123
|
return data.map(item => {
|
|
126
124
|
let { path } = item;
|
|
127
|
-
const result =
|
|
125
|
+
const result = {
|
|
126
|
+
...item,
|
|
127
|
+
path,
|
|
128
|
+
authority: item.authority || parentAuthority,
|
|
129
|
+
};
|
|
128
130
|
if (item.children) {
|
|
129
131
|
result.children = formatter(item.children, item.authority || parentAuthority);
|
|
130
132
|
}
|
|
@@ -135,17 +137,17 @@ describe('getMenu utility with basic paths', () => {
|
|
|
135
137
|
let keys = {};
|
|
136
138
|
menus.forEach(item => {
|
|
137
139
|
if (item.children) {
|
|
138
|
-
keys[item.path] =
|
|
139
|
-
keys =
|
|
140
|
+
keys[item.path] = { ...item };
|
|
141
|
+
keys = { ...keys, ...getFlatMenuData(item.children) };
|
|
140
142
|
}
|
|
141
143
|
else {
|
|
142
|
-
keys[item.path] =
|
|
144
|
+
keys[item.path] = { ...item };
|
|
143
145
|
}
|
|
144
146
|
});
|
|
145
147
|
return keys;
|
|
146
148
|
}
|
|
147
149
|
test('with /a', () => {
|
|
148
|
-
const data =
|
|
150
|
+
const data = getMenus('/', genMenuData());
|
|
149
151
|
const formattedData = formatter(data);
|
|
150
152
|
expect(data).toMatchSnapshot();
|
|
151
153
|
expect(formattedData).toMatchSnapshot();
|
|
@@ -182,15 +184,15 @@ describe('getMenu utility with basic paths', () => {
|
|
|
182
184
|
],
|
|
183
185
|
},
|
|
184
186
|
];
|
|
185
|
-
const data =
|
|
187
|
+
const data = getMenus('/', genDashboardMenu);
|
|
186
188
|
expect(data).toMatchObject(menu);
|
|
187
189
|
});
|
|
188
190
|
});
|
|
189
191
|
describe('getMenu utility with connector', () => {
|
|
190
192
|
it('with connector', () => {
|
|
191
|
-
const connector = new
|
|
192
|
-
const connector2 = new
|
|
193
|
-
const feature = new
|
|
193
|
+
const connector = new Feature({ menuConfig: [genMenuData()] });
|
|
194
|
+
const connector2 = new Feature({ menuConfig: [genMenuData('/test')] });
|
|
195
|
+
const feature = new Feature(connector, connector2);
|
|
194
196
|
const finalMenu = feature.getMenus();
|
|
195
197
|
expect(finalMenu).toMatchSnapshot();
|
|
196
198
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-sidebar-menu.test.js","sourceRoot":"","sources":["../../../../src/route/old/__tests__/config-sidebar-menu.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-sidebar-menu.test.js","sourceRoot":"","sources":["../../../../src/route/old/__tests__/config-sidebar-menu.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var t = {};
|
|
4
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
-
t[p] = s[p];
|
|
6
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
-
t[p[i]] = s[p[i]];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.getMenus = void 0;
|
|
15
|
-
const interfaces_1 = require("../../interfaces");
|
|
16
|
-
function getMenus(path, menuData) {
|
|
1
|
+
import { IMenuPosition } from '../../interfaces';
|
|
2
|
+
export function getMenus(path, menuData) {
|
|
17
3
|
if (!path.startsWith('/')) {
|
|
18
4
|
throw new Error('Invalid path!');
|
|
19
5
|
}
|
|
@@ -25,13 +11,17 @@ function getMenus(path, menuData) {
|
|
|
25
11
|
return menuPath.indexOf(searchPath) === 0 || menuPath === path;
|
|
26
12
|
});
|
|
27
13
|
const mappedMenuPaths = routes.map(mPath => {
|
|
28
|
-
return
|
|
14
|
+
return {
|
|
15
|
+
route: mPath,
|
|
16
|
+
position: IMenuPosition.Middle,
|
|
17
|
+
...menuData[mPath],
|
|
18
|
+
};
|
|
29
19
|
});
|
|
30
20
|
const root = {
|
|
31
21
|
// just to satisfy types added following
|
|
32
22
|
// TOOD need to correct types so we don't have to enter them.
|
|
33
23
|
name: 'root',
|
|
34
|
-
position:
|
|
24
|
+
position: IMenuPosition.Logo,
|
|
35
25
|
};
|
|
36
26
|
mappedMenuPaths.forEach(menutItem => {
|
|
37
27
|
const children = menutItem.route.split('/');
|
|
@@ -54,10 +44,13 @@ function getMenus(path, menuData) {
|
|
|
54
44
|
if (!lastNode.children) {
|
|
55
45
|
lastNode.children = [];
|
|
56
46
|
}
|
|
57
|
-
const { route: ignore
|
|
58
|
-
lastNode.children.push(
|
|
47
|
+
const { route: ignore, ...rest } = menutItem;
|
|
48
|
+
lastNode.children.push({
|
|
49
|
+
path: menutItem.route,
|
|
50
|
+
...rest,
|
|
51
|
+
exact: menuData[menutItem.route].hasOwnProperty('exact') ? menuData[menutItem.route].exact : true,
|
|
52
|
+
});
|
|
59
53
|
});
|
|
60
54
|
return root.children;
|
|
61
55
|
}
|
|
62
|
-
exports.getMenus = getMenus;
|
|
63
56
|
//# sourceMappingURL=get-menus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-menus.js","sourceRoot":"","sources":["../../../src/route/old/get-menus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-menus.js","sourceRoot":"","sources":["../../../src/route/old/get-menus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRoutes2 = exports.isUrl = void 0;
|
|
4
|
-
const utils_1 = require("../../utils");
|
|
1
|
+
import { formatSlash } from '../../utils';
|
|
5
2
|
/* eslint no-useless-escape:0 */
|
|
6
3
|
const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/g;
|
|
7
|
-
function isUrl(path) {
|
|
4
|
+
export function isUrl(path) {
|
|
8
5
|
return reg.test(path);
|
|
9
6
|
}
|
|
10
|
-
exports.isUrl = isUrl;
|
|
11
7
|
/**
|
|
12
8
|
* Generates Routes based on the key value, where key has the path of the route and value
|
|
13
9
|
* has rest of the values for building a `<Router ../>` component.
|
|
@@ -16,12 +12,15 @@ exports.isUrl = isUrl;
|
|
|
16
12
|
* @param routerData
|
|
17
13
|
* @deprecated
|
|
18
14
|
*/
|
|
19
|
-
function getRoutes2(path, routerData) {
|
|
15
|
+
export function getRoutes2(path, routerData) {
|
|
20
16
|
const routes = Object.keys(routerData).filter(routePath => {
|
|
21
17
|
return routePath.match(path);
|
|
22
18
|
});
|
|
23
19
|
const mappedRoutes = routes.map(paths => {
|
|
24
|
-
return
|
|
20
|
+
return {
|
|
21
|
+
route: paths,
|
|
22
|
+
...routerData[paths],
|
|
23
|
+
};
|
|
25
24
|
});
|
|
26
25
|
const root = {};
|
|
27
26
|
mappedRoutes.forEach(eachRoute => {
|
|
@@ -45,17 +44,20 @@ function getRoutes2(path, routerData) {
|
|
|
45
44
|
}
|
|
46
45
|
lastNode = lastNode.routes[lastIndex];
|
|
47
46
|
// do not overwrite the route's exact value
|
|
48
|
-
lastNode.exact = routerData[lastNode.path].hasOwnProperty('exact') ? routerData[lastNode.path].exact : false;
|
|
47
|
+
// lastNode.exact = routerData[lastNode.path as string].hasOwnProperty('exact') ? routerData[lastNode.path as string].exact : false;
|
|
49
48
|
}
|
|
50
49
|
if (!lastNode.routes) {
|
|
51
50
|
lastNode.routes = [];
|
|
52
51
|
}
|
|
53
|
-
const modfiedRoute =
|
|
54
|
-
lastNode.routes.push(
|
|
52
|
+
const modfiedRoute = formatSlash(eachRoute.route);
|
|
53
|
+
lastNode.routes.push({
|
|
54
|
+
...eachRoute,
|
|
55
55
|
// route: modfiedRoute,
|
|
56
|
-
path: modfiedRoute,
|
|
56
|
+
path: modfiedRoute,
|
|
57
|
+
exact: routerData[eachRoute.route].hasOwnProperty('exact') ? routerData[eachRoute.route].exact : true,
|
|
58
|
+
component: eachRoute.component,
|
|
59
|
+
});
|
|
57
60
|
});
|
|
58
61
|
return root.routes;
|
|
59
62
|
}
|
|
60
|
-
exports.getRoutes2 = getRoutes2;
|
|
61
63
|
//# sourceMappingURL=get-routes-notused.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-routes-notused.js","sourceRoot":"","sources":["../../../src/route/old/get-routes-notused.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-routes-notused.js","sourceRoot":"","sources":["../../../src/route/old/get-routes-notused.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,gCAAgC;AAChC,MAAM,GAAG,GAAG,+JAA+J,CAAC;AAE5K,MAAM,UAAU,KAAK,CAAC,IAAI;IACxB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AACD;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,UAAsB;IAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACxD,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC1D,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,GAAG,UAAU,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAkC,EAC3C,CAAC;IACF,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,gDAAgD;QAChD,IAAI,SAAS,CAAC,KAAK,KAAK,GAAG,EAAE;YAC3B,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACzD,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzC,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gBACpB,MAAM;aACP;YACD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,2CAA2C;YAC3C,oIAAoI;SACrI;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC;SACtB;QACD,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,GAAG,SAAS;YACZ,uBAAuB;YACvB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACrG,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
export declare const renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}
|
|
2
|
+
export declare const renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}) => React.JSX.Element;
|
package/lib/route/old/render.js
CHANGED
|
@@ -1,33 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.renderRoutes = void 0;
|
|
27
|
-
const React = __importStar(require("react"));
|
|
28
|
-
const react_router_dom_1 = require("react-router-dom");
|
|
29
|
-
const renderRoutes = (routes, solidRoutes, extraProps = {}, switchProps = {}) => routes ? (React.createElement(React.Fragment, null, [
|
|
30
|
-
...solidRoutes, ...routes.map((route, i) => (React.createElement(react_router_dom_1.Route, { key: route.key || i, path: route.path, exact: route.exact, strict: route.strict, render: props => route.render ? (route.render(Object.assign(Object.assign(Object.assign({}, props), extraProps), { route: route }))) : (React.createElement(route.component, Object.assign({}, props, extraProps, { route: route }))) }))),
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { Route, Routes } from 'react-router-dom';
|
|
3
|
+
export const renderRoutes = (routes, solidRoutes, extraProps = {}) => routes ? (React.createElement(Routes, null, [
|
|
4
|
+
...solidRoutes,
|
|
5
|
+
...routes.map((route, i) => (React.createElement(Route, { key: route.key || i, path: route.path, element: route.render
|
|
6
|
+
? React.createElement(route.render, { ...extraProps, route: route })
|
|
7
|
+
: React.createElement(route.component, { ...extraProps, route: route }) }))),
|
|
31
8
|
])) : null;
|
|
32
|
-
exports.renderRoutes = renderRoutes;
|
|
33
9
|
//# sourceMappingURL=render.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/route/old/render.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/route/old/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,EAAE,CACjE,MAAM,CAAC,CAAC,CAAC,CACL,oBAAC,MAAM,QACF;IACG,GAAG,WAAW;IACd,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CACxB,oBAAC,KAAK,IACF,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,EACnB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EACH,KAAK,CAAC,MAAM;YACR,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YACpE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,GAEjF,CACL,CAAC;CACL,CACI,CACZ,CAAC,CAAC,CAAC,IAAI,CAAC"}
|
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import { ReactElement } from 'react';
|
|
2
2
|
import { IRouteData } from '../../interfaces';
|
|
3
|
+
export interface RouteProps {
|
|
4
|
+
caseSensitive?: boolean;
|
|
5
|
+
children?: React.ReactNode;
|
|
6
|
+
element?: React.ReactNode | null;
|
|
7
|
+
index?: boolean;
|
|
8
|
+
path?: string;
|
|
9
|
+
exact?: boolean;
|
|
10
|
+
}
|
|
3
11
|
export declare const getSortedNavigations: (path: string, routeData: IRouteData, authWrapper?: (component: React.FC) => ReactElement) => any;
|
|
4
12
|
export declare function getNavigation(path: string, routeData: any, authWrapper?: ((component: React.FC, unauthenticatedComponent: React.FC) => ReactElement)): any;
|
|
@@ -1,44 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
-
t[p[i]] = s[p[i]];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
-
exports.getNavigation = exports.getSortedNavigations = void 0;
|
|
15
|
-
const lodash_1 = require("lodash");
|
|
16
|
-
const interfaces_1 = require("../../interfaces");
|
|
17
|
-
const utils_1 = require("../../utils");
|
|
18
|
-
const getSortedNavigations = (path, routeData, authWrapper) => {
|
|
19
|
-
const sortedRoutes = (0, utils_1.sortKeys)(routeData);
|
|
1
|
+
import { isEmpty, uniq } from 'lodash';
|
|
2
|
+
import { IMenuPosition } from '../../interfaces';
|
|
3
|
+
import { sortKeys, formatSlash } from '../../utils';
|
|
4
|
+
export const getSortedNavigations = (path, routeData, authWrapper) => {
|
|
5
|
+
const sortedRoutes = sortKeys(routeData);
|
|
20
6
|
const result = addRouteParams(getNavigation(path, sortedRoutes, authWrapper));
|
|
21
7
|
return result;
|
|
22
8
|
};
|
|
23
|
-
exports.getSortedNavigations = getSortedNavigations;
|
|
24
9
|
const addRouteParams = (result, routeParams = []) => {
|
|
25
10
|
return result.map((item) => {
|
|
26
|
-
var _a;
|
|
27
11
|
let params = routeParams;
|
|
28
12
|
if (params.length && !item.container) {
|
|
29
13
|
item.routeParams = params;
|
|
30
14
|
}
|
|
31
|
-
if (
|
|
15
|
+
if (item?.children?.length) {
|
|
32
16
|
if (item.path !== '/' && item.path.includes(":")) {
|
|
33
17
|
const matched = item.path.match(/:([^\/]+)/g);
|
|
34
|
-
params =
|
|
18
|
+
params = uniq(params.concat(...matched.map((item) => item.replace(':', ""))));
|
|
35
19
|
}
|
|
36
|
-
item.children = addRouteParams(item.children,
|
|
20
|
+
item.children = addRouteParams(item.children, uniq(params));
|
|
37
21
|
}
|
|
38
22
|
return item;
|
|
39
23
|
});
|
|
40
24
|
};
|
|
41
|
-
function getNavigation(path, routeData, authWrapper) {
|
|
25
|
+
export function getNavigation(path, routeData, authWrapper) {
|
|
42
26
|
if (!path.startsWith('/')) {
|
|
43
27
|
throw new Error('Invalid path!');
|
|
44
28
|
}
|
|
@@ -50,16 +34,19 @@ function getNavigation(path, routeData, authWrapper) {
|
|
|
50
34
|
return menuPath.indexOf(searchPath) === 0 || menuPath === path;
|
|
51
35
|
});
|
|
52
36
|
const mappedMenuPaths = childrens.map(mPath => {
|
|
53
|
-
return
|
|
37
|
+
return {
|
|
38
|
+
route: mPath,
|
|
39
|
+
position: IMenuPosition.Middle,
|
|
40
|
+
...routeData[mPath],
|
|
41
|
+
};
|
|
54
42
|
});
|
|
55
43
|
const root = {
|
|
56
44
|
// just to satisfy types added following
|
|
57
45
|
// TOOD need to correct types so we don't have to enter them.
|
|
58
46
|
name: 'root',
|
|
59
|
-
position:
|
|
47
|
+
position: IMenuPosition.Logo,
|
|
60
48
|
};
|
|
61
49
|
mappedMenuPaths.forEach(routeItem => {
|
|
62
|
-
var _a, _b, _c;
|
|
63
50
|
const children = routeItem.route.split('/');
|
|
64
51
|
children.shift();
|
|
65
52
|
// if the route is `/` then add this correction.
|
|
@@ -71,11 +58,10 @@ function getNavigation(path, routeData, authWrapper) {
|
|
|
71
58
|
let lastNode = root;
|
|
72
59
|
for (let i = 0; i < depth; i++) {
|
|
73
60
|
const lastIndex = (lastNode.children || []).findIndex(item => {
|
|
74
|
-
var _a;
|
|
75
61
|
const routePath = `${item._pathPrefix}${item.path}`;
|
|
76
62
|
if (routeItem.route.startsWith(routePath)) {
|
|
77
63
|
// only if the parent path has `exact: false` allows to nested
|
|
78
|
-
return routeItem.route[routePath.length] === '/' &&
|
|
64
|
+
return routeItem.route[routePath.length] === '/' && routeData[routePath]?.exact === false;
|
|
79
65
|
}
|
|
80
66
|
});
|
|
81
67
|
if (lastIndex === -1) {
|
|
@@ -88,17 +74,26 @@ function getNavigation(path, routeData, authWrapper) {
|
|
|
88
74
|
if (!lastNode.children) {
|
|
89
75
|
lastNode.children = [];
|
|
90
76
|
}
|
|
91
|
-
const { route: ignore, auth
|
|
92
|
-
const pathParams =
|
|
93
|
-
lastNode.children.push(
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
77
|
+
const { route: ignore, auth, ...rest } = routeItem;
|
|
78
|
+
const pathParams = formatSlash(routeItem.route);
|
|
79
|
+
lastNode.children.push({
|
|
80
|
+
...rest,
|
|
81
|
+
...(!isEmpty(rest.props) && {
|
|
82
|
+
props: {
|
|
83
|
+
...rest.props,
|
|
84
|
+
...(rest.props.component
|
|
85
|
+
&& {
|
|
86
|
+
component: (auth && authWrapper) ?
|
|
87
|
+
authWrapper(rest.props?.component, rest.props?.unauthenticatedComponent) : rest.props?.component
|
|
88
|
+
})
|
|
89
|
+
}
|
|
90
|
+
}),
|
|
91
|
+
// path: formatSlash(routeItem.route),
|
|
92
|
+
// path: routeItem.route,
|
|
93
|
+
...pathParams,
|
|
94
|
+
exact: routeData[routeItem.route].hasOwnProperty('exact') ? routeData[routeItem.route].exact : true,
|
|
95
|
+
});
|
|
100
96
|
});
|
|
101
97
|
return root.children;
|
|
102
98
|
}
|
|
103
|
-
exports.getNavigation = getNavigation;
|
|
104
99
|
//# sourceMappingURL=get-navigation-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-navigation-utils.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-navigation-utils.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,EAAc,aAAa,EAAe,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAWpD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,IAAY,EACZ,SAAqB,EACrB,WAAqD,EACrD,EAAE;IACF,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAC9E,OAAO,MAAM,CAAA;AACf,CAAC,CAAC;AAGF,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,EAAE;IAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,MAAM,GAAG,WAAW,CAAC;QACzB,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACpC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAA;SAC1B;QACD,IAAI,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE;YAC1B,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC9C,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;aAC9E;YACD,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;SAC5D;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,SAAc,EACd,WAAyF;IAEzF,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IACD,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;QACjC,UAAU,GAAG,IAAI,GAAG,GAAG,CAAC;KACzB;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACzD,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,QAAQ,KAAK,IAAI,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAuB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAChE,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,aAAa,CAAC,MAAM;YAC9B,GAAG,SAAS,CAAC,KAAK,CAAC;SACpB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAoC;QAC5C,wCAAwC;QACxC,6DAA6D;QAC7D,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,aAAa,CAAC,IAAI;KACtB,CAAC;IACT,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,gDAAgD;QAChD,IAAI,SAAS,CAAC,IAAI,KAAK,GAAG,EAAE;YAC1B,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBAC3D,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBAEpD,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBACzC,8DAA8D;oBAC9D,OAAO,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,KAAK,KAAK,CAAC;iBAC3F;YACH,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gBACpB,MAAM;aACP;YACD,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACxC,MAAM,YAAY,GAAG,GAAI,QAAgB,CAAC,WAAW,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;YACxE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SAC1G;QACD,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YACtB,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;SACxB;QACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;QACnD,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEhD,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YACrB,GAAG,IAAI;YACP,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC1B,KAAK,EAAE;oBACL,GAAG,IAAI,CAAC,KAAK;oBACb,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS;2BACnB;4BACH,SAAS,EAAE,CAAC,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC;gCAChC,WAAW,CACT,IAAI,CAAC,KAAK,EAAE,SAAS,EACrB,IAAI,CAAC,KAAK,EAAE,wBAAwB,CACrC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS;yBAC5B,CAAC;iBACH;aACF,CAAC;YACF,sCAAsC;YACtC,yBAAyB;YACzB,GAAG,UAAU;YACb,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;SACpG,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC"}
|