@skyux/packages 7.0.0-beta.16 → 7.0.0-beta.18

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.
Files changed (11) hide show
  1. package/package.json +51 -51
  2. package/src/schematics/migrations/migration-collection.json +1 -1
  3. package/src/schematics/migrations/update-7/add-autonumeric-dependency.js +4 -18
  4. package/src/schematics/migrations/update-7/add-autonumeric-dependency.js.map +1 -1
  5. package/src/schematics/migrations/update-7/add-axe-core-dependency.js +4 -18
  6. package/src/schematics/migrations/update-7/add-axe-core-dependency.js.map +1 -1
  7. package/src/schematics/migrations/update-7/add-moment-dependency.js +4 -18
  8. package/src/schematics/migrations/update-7/add-moment-dependency.js.map +1 -1
  9. package/src/schematics/rules/ensure-peers-installed.d.ts +15 -0
  10. package/src/schematics/rules/ensure-peers-installed.js +38 -0
  11. package/src/schematics/rules/ensure-peers-installed.js.map +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skyux/packages",
3
- "version": "7.0.0-beta.16",
3
+ "version": "7.0.0-beta.18",
4
4
  "author": "Blackbaud, Inc.",
5
5
  "description": "Handles the `ng update` command for SKY UX component libraries.",
6
6
  "keywords": [
@@ -27,66 +27,66 @@
27
27
  "@blackbaud/skyux-lib-code-block": "^7.0.0-beta.0",
28
28
  "@blackbaud/skyux-lib-media": "^7.0.0-beta.0",
29
29
  "@blackbaud/skyux-lib-stache": "^7.0.0-beta.0",
30
- "@skyux-sdk/prettier-schematics": "7.0.0-beta.16",
31
- "@skyux-sdk/testing": "7.0.0-beta.16",
32
- "@skyux/a11y": "7.0.0-beta.16",
33
- "@skyux/action-bars": "7.0.0-beta.16",
34
- "@skyux/ag-grid": "7.0.0-beta.16",
35
- "@skyux/angular-tree-component": "7.0.0-beta.16",
36
- "@skyux/animations": "7.0.0-beta.16",
37
- "@skyux/assets": "7.0.0-beta.16",
38
- "@skyux/autonumeric": "7.0.0-beta.16",
39
- "@skyux/avatar": "7.0.0-beta.16",
40
- "@skyux/colorpicker": "7.0.0-beta.16",
41
- "@skyux/config": "7.0.0-beta.16",
42
- "@skyux/core": "7.0.0-beta.16",
43
- "@skyux/data-manager": "7.0.0-beta.16",
44
- "@skyux/datetime": "7.0.0-beta.16",
30
+ "@skyux-sdk/prettier-schematics": "7.0.0-beta.18",
31
+ "@skyux-sdk/testing": "7.0.0-beta.18",
32
+ "@skyux/a11y": "7.0.0-beta.18",
33
+ "@skyux/action-bars": "7.0.0-beta.18",
34
+ "@skyux/ag-grid": "7.0.0-beta.18",
35
+ "@skyux/angular-tree-component": "7.0.0-beta.18",
36
+ "@skyux/animations": "7.0.0-beta.18",
37
+ "@skyux/assets": "7.0.0-beta.18",
38
+ "@skyux/autonumeric": "7.0.0-beta.18",
39
+ "@skyux/avatar": "7.0.0-beta.18",
40
+ "@skyux/colorpicker": "7.0.0-beta.18",
41
+ "@skyux/config": "7.0.0-beta.18",
42
+ "@skyux/core": "7.0.0-beta.18",
43
+ "@skyux/data-manager": "7.0.0-beta.18",
44
+ "@skyux/datetime": "7.0.0-beta.18",
45
45
  "@skyux/docs-tools": "^7.0.0-beta.0",
46
- "@skyux/errors": "7.0.0-beta.16",
47
- "@skyux/flyout": "7.0.0-beta.16",
48
- "@skyux/forms": "7.0.0-beta.16",
49
- "@skyux/grids": "7.0.0-beta.16",
50
- "@skyux/http": "7.0.0-beta.16",
51
- "@skyux/i18n": "7.0.0-beta.16",
46
+ "@skyux/errors": "7.0.0-beta.18",
47
+ "@skyux/flyout": "7.0.0-beta.18",
48
+ "@skyux/forms": "7.0.0-beta.18",
49
+ "@skyux/grids": "7.0.0-beta.18",
50
+ "@skyux/http": "7.0.0-beta.18",
51
+ "@skyux/i18n": "7.0.0-beta.18",
52
52
  "@skyux/icons": "^5.1.1",
53
- "@skyux/indicators": "7.0.0-beta.16",
54
- "@skyux/inline-form": "7.0.0-beta.16",
55
- "@skyux/layout": "7.0.0-beta.16",
56
- "@skyux/list-builder": "7.0.0-beta.16",
57
- "@skyux/list-builder-common": "7.0.0-beta.16",
58
- "@skyux/list-builder-view-checklist": "7.0.0-beta.16",
59
- "@skyux/list-builder-view-grids": "7.0.0-beta.16",
60
- "@skyux/lists": "7.0.0-beta.16",
61
- "@skyux/lookup": "7.0.0-beta.16",
62
- "@skyux/modals": "7.0.0-beta.16",
63
- "@skyux/navbar": "7.0.0-beta.16",
64
- "@skyux/omnibar-interop": "7.0.0-beta.16",
65
- "@skyux/pages": "7.0.0-beta.16",
66
- "@skyux/phone-field": "7.0.0-beta.16",
67
- "@skyux/popovers": "7.0.0-beta.16",
68
- "@skyux/progress-indicator": "7.0.0-beta.16",
69
- "@skyux/router": "7.0.0-beta.16",
70
- "@skyux/select-field": "7.0.0-beta.16",
71
- "@skyux/split-view": "7.0.0-beta.16",
72
- "@skyux/tabs": "7.0.0-beta.16",
73
- "@skyux/text-editor": "7.0.0-beta.16",
74
- "@skyux/theme": "7.0.0-beta.16",
75
- "@skyux/tiles": "7.0.0-beta.16",
76
- "@skyux/toast": "7.0.0-beta.16",
77
- "@skyux/validation": "7.0.0-beta.16",
53
+ "@skyux/indicators": "7.0.0-beta.18",
54
+ "@skyux/inline-form": "7.0.0-beta.18",
55
+ "@skyux/layout": "7.0.0-beta.18",
56
+ "@skyux/list-builder": "7.0.0-beta.18",
57
+ "@skyux/list-builder-common": "7.0.0-beta.18",
58
+ "@skyux/list-builder-view-checklist": "7.0.0-beta.18",
59
+ "@skyux/list-builder-view-grids": "7.0.0-beta.18",
60
+ "@skyux/lists": "7.0.0-beta.18",
61
+ "@skyux/lookup": "7.0.0-beta.18",
62
+ "@skyux/modals": "7.0.0-beta.18",
63
+ "@skyux/navbar": "7.0.0-beta.18",
64
+ "@skyux/omnibar-interop": "7.0.0-beta.18",
65
+ "@skyux/pages": "7.0.0-beta.18",
66
+ "@skyux/phone-field": "7.0.0-beta.18",
67
+ "@skyux/popovers": "7.0.0-beta.18",
68
+ "@skyux/progress-indicator": "7.0.0-beta.18",
69
+ "@skyux/router": "7.0.0-beta.18",
70
+ "@skyux/select-field": "7.0.0-beta.18",
71
+ "@skyux/split-view": "7.0.0-beta.18",
72
+ "@skyux/tabs": "7.0.0-beta.18",
73
+ "@skyux/text-editor": "7.0.0-beta.18",
74
+ "@skyux/theme": "7.0.0-beta.18",
75
+ "@skyux/tiles": "7.0.0-beta.18",
76
+ "@skyux/toast": "7.0.0-beta.18",
77
+ "@skyux/validation": "7.0.0-beta.18",
78
78
  "ag-grid-angular": "^28.2.1",
79
79
  "ag-grid-community": "^28.2.1",
80
80
  "ag-grid-enterprise": "^28.2.1"
81
81
  }
82
82
  },
83
83
  "peerDependencies": {
84
- "@angular/cli": "^14.2.0"
84
+ "@angular/cli": "^14.2.10"
85
85
  },
86
86
  "dependencies": {
87
- "fs-extra": "10.0.0",
88
- "jsonc-parser": "3.0.0"
87
+ "fs-extra": "10.1.0",
88
+ "jsonc-parser": "3.2.0"
89
89
  },
90
90
  "main": "./src/index.js",
91
- "typings": "./src/index.d.ts"
91
+ "types": "./src/index.d.ts"
92
92
  }
package/src/schematics/migrations/migration-collection.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "schematics": {
3
3
  "noop": {
4
- "version": "7.0.0-beta.16",
4
+ "version": "7.0.0-beta.18",
5
5
  "factory": "./noop/noop.schematic",
6
6
  "description": "Update all SKY UX component packages"
7
7
  },
package/src/schematics/migrations/update-7/add-autonumeric-dependency.js CHANGED
@@ -1,25 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const tasks_1 = require("@angular-devkit/schematics/tasks");
4
3
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
5
- const tree_1 = require("../../utility/tree");
4
+ const ensure_peers_installed_1 = require("../../rules/ensure-peers-installed");
6
5
  function default_1() {
7
- return async (tree, context) => {
8
- const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
9
- const dependencies = {
10
- ...(packageJson.dependencies || {}),
11
- ...(packageJson.devDependencies || {}),
12
- };
13
- if (dependencies['@skyux/autonumeric']) {
14
- context.addTask(new tasks_1.NodePackageInstallTask());
15
- (0, dependencies_1.addPackageJsonDependency)(tree, {
16
- type: dependencies_1.NodeDependencyType.Default,
17
- name: 'autonumeric',
18
- version: '4.6.0',
19
- overwrite: false,
20
- });
21
- }
22
- };
6
+ return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/autonumeric', [
7
+ { name: 'autonumeric', version: '4.6.0', type: dependencies_1.NodeDependencyType.Default },
8
+ ]);
23
9
  }
24
10
  exports.default = default_1;
25
11
  //# sourceMappingURL=add-autonumeric-dependency.js.map
package/src/schematics/migrations/update-7/add-autonumeric-dependency.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-autonumeric-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-autonumeric-dependency.ts"],"names":[],"mappings":";;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,6CAAsD;AAEtD;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,IAAI,YAAY,CAAC,oBAAoB,CAAC,EAAE;YACtC,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAE9C,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;gBAChC,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAvBD,4BAuBC"}
1
+ {"version":3,"file":"add-autonumeric-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-autonumeric-dependency.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,+EAA0E;AAE1E;IACE,OAAO,IAAA,6CAAoB,EAAC,oBAAoB,EAAE;QAChD,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,iCAAkB,CAAC,OAAO,EAAE;KAC5E,CAAC,CAAC;AACL,CAAC;AAJD,4BAIC"}
package/src/schematics/migrations/update-7/add-axe-core-dependency.js CHANGED
@@ -1,25 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const tasks_1 = require("@angular-devkit/schematics/tasks");
4
3
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
5
- const tree_1 = require("../../utility/tree");
4
+ const ensure_peers_installed_1 = require("../../rules/ensure-peers-installed");
6
5
  function default_1() {
7
- return async (tree, context) => {
8
- const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
9
- const dependencies = {
10
- ...(packageJson.dependencies || {}),
11
- ...(packageJson.devDependencies || {}),
12
- };
13
- if (dependencies['@skyux-sdk/testing']) {
14
- context.addTask(new tasks_1.NodePackageInstallTask());
15
- (0, dependencies_1.addPackageJsonDependency)(tree, {
16
- type: dependencies_1.NodeDependencyType.Dev,
17
- name: 'axe-core',
18
- version: '3.5.6',
19
- overwrite: false,
20
- });
21
- }
22
- };
6
+ return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux-sdk/testing', [
7
+ { name: 'axe-core', version: '3.5.6', type: dependencies_1.NodeDependencyType.Dev },
8
+ ]);
23
9
  }
24
10
  exports.default = default_1;
25
11
  //# sourceMappingURL=add-axe-core-dependency.js.map
package/src/schematics/migrations/update-7/add-axe-core-dependency.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-axe-core-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-axe-core-dependency.ts"],"names":[],"mappings":";;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,6CAAsD;AAEtD;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,IAAI,YAAY,CAAC,oBAAoB,CAAC,EAAE;YACtC,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAE9C,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,iCAAkB,CAAC,GAAG;gBAC5B,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,OAAO;gBAChB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAvBD,4BAuBC"}
1
+ {"version":3,"file":"add-axe-core-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-axe-core-dependency.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,+EAA0E;AAE1E;IACE,OAAO,IAAA,6CAAoB,EAAC,oBAAoB,EAAE;QAChD,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,iCAAkB,CAAC,GAAG,EAAE;KACrE,CAAC,CAAC;AACL,CAAC;AAJD,4BAIC"}
package/src/schematics/migrations/update-7/add-moment-dependency.js CHANGED
@@ -1,25 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const tasks_1 = require("@angular-devkit/schematics/tasks");
4
3
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
5
- const tree_1 = require("../../utility/tree");
4
+ const ensure_peers_installed_1 = require("../../rules/ensure-peers-installed");
6
5
  function default_1() {
7
- return async (tree, context) => {
8
- const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
9
- const dependencies = {
10
- ...(packageJson.dependencies || {}),
11
- ...(packageJson.devDependencies || {}),
12
- };
13
- if (dependencies['@skyux/datetime']) {
14
- context.addTask(new tasks_1.NodePackageInstallTask());
15
- (0, dependencies_1.addPackageJsonDependency)(tree, {
16
- type: dependencies_1.NodeDependencyType.Default,
17
- name: 'moment',
18
- version: '2.29.4',
19
- overwrite: false,
20
- });
21
- }
22
- };
6
+ return (0, ensure_peers_installed_1.ensurePeersInstalled)('@skyux/datetime', [
7
+ { name: 'moment', version: '2.29.4', type: dependencies_1.NodeDependencyType.Default },
8
+ ]);
23
9
  }
24
10
  exports.default = default_1;
25
11
  //# sourceMappingURL=add-moment-dependency.js.map
package/src/schematics/migrations/update-7/add-moment-dependency.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-moment-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-moment-dependency.ts"],"names":[],"mappings":";;AACA,4DAA0E;AAC1E,2EAGkD;AAElD,6CAAsD;AAEtD;IACE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,IAAI,YAAY,CAAC,iBAAiB,CAAC,EAAE;YACnC,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;YAE9C,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;gBAChC,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,QAAQ;gBACjB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAvBD,4BAuBC"}
1
+ {"version":3,"file":"add-moment-dependency.js","sourceRoot":"","sources":["../../../../../../../../libs/components/packages/src/schematics/migrations/update-7/add-moment-dependency.ts"],"names":[],"mappings":";;AACA,2EAA8E;AAE9E,+EAA0E;AAE1E;IACE,OAAO,IAAA,6CAAoB,EAAC,iBAAiB,EAAE;QAC7C,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,iCAAkB,CAAC,OAAO,EAAE;KACxE,CAAC,CAAC;AACL,CAAC;AAJD,4BAIC"}
package/src/schematics/rules/ensure-peers-installed.d.ts ADDED
@@ -0,0 +1,15 @@
1
+ import { Rule } from '@angular-devkit/schematics';
2
+ import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
3
+ declare type PackageDetails = {
4
+ name: string;
5
+ version: string;
6
+ type: NodeDependencyType;
7
+ };
8
+ /**
9
+ * Ensures peer dependencies for a given package are installed on the client's workspace.
10
+ * If the client does not use the target package, this function is skipped.
11
+ * @param targetPackageName The name of the package that has peer dependencies.
12
+ * @param peers The target package's peer dependencies to install on the client's workspace.
13
+ */
14
+ export declare function ensurePeersInstalled(targetPackageName: string, peers: PackageDetails[]): Rule;
15
+ export {};
package/src/schematics/rules/ensure-peers-installed.js ADDED
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ensurePeersInstalled = void 0;
4
+ const tasks_1 = require("@angular-devkit/schematics/tasks");
5
+ const dependencies_1 = require("@schematics/angular/utility/dependencies");
6
+ const tree_1 = require("../utility/tree");
7
+ function installPackages(packages) {
8
+ return (tree, context) => {
9
+ for (const details of packages) {
10
+ // Remove the package (if it exists) so we can ensure it's added to the appropriate section.
11
+ (0, dependencies_1.removePackageJsonDependency)(tree, details.name, '/package.json');
12
+ (0, dependencies_1.addPackageJsonDependency)(tree, {
13
+ type: details.type,
14
+ name: details.name,
15
+ version: details.version,
16
+ });
17
+ }
18
+ context.addTask(new tasks_1.NodePackageInstallTask());
19
+ };
20
+ }
21
+ /**
22
+ * Ensures peer dependencies for a given package are installed on the client's workspace.
23
+ * If the client does not use the target package, this function is skipped.
24
+ * @param targetPackageName The name of the package that has peer dependencies.
25
+ * @param peers The target package's peer dependencies to install on the client's workspace.
26
+ */
27
+ function ensurePeersInstalled(targetPackageName, peers) {
28
+ return (tree) => {
29
+ const packageJson = JSON.parse((0, tree_1.readRequiredFile)(tree, '/package.json'));
30
+ const dependencies = {
31
+ ...(packageJson.dependencies || {}),
32
+ ...(packageJson.devDependencies || {}),
33
+ };
34
+ return dependencies[targetPackageName] ? installPackages(peers) : undefined;
35
+ };
36
+ }
37
+ exports.ensurePeersInstalled = ensurePeersInstalled;
38
+ //# sourceMappingURL=ensure-peers-installed.js.map
package/src/schematics/rules/ensure-peers-installed.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ensure-peers-installed.js","sourceRoot":"","sources":["../../../../../../../libs/components/packages/src/schematics/rules/ensure-peers-installed.ts"],"names":[],"mappings":";;;AACA,4DAA0E;AAC1E,2EAIkD;AAElD,0CAAmD;AAQnD,SAAS,eAAe,CAAC,QAA0B;IACjD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,4FAA4F;YAC5F,IAAA,0CAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACjE,IAAA,uCAAwB,EAAC,IAAI,EAAE;gBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;SACJ;QAED,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAClC,iBAAyB,EACzB,KAAuB;IAEvB,OAAO,CAAC,IAAI,EAAE,EAAE;QACd,MAAM,WAAW,GAGb,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;QAExD,MAAM,YAAY,GAA2B;YAC3C,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;YACnC,GAAG,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE,CAAC;SACvC,CAAC;QAEF,OAAO,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AAjBD,oDAiBC"}