@nrwl/angular 13.10.2 → 14.0.0-beta.1

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 (146) hide show
  1. package/README.md +1 -1
  2. package/executors.json +10 -0
  3. package/generators.d.ts +2 -4
  4. package/generators.js +2 -4
  5. package/generators.js.map +1 -1
  6. package/generators.json +16 -40
  7. package/migrations.json +6 -0
  8. package/module-federation/index.d.ts +1 -0
  9. package/module-federation/index.js +2 -0
  10. package/module-federation/index.js.map +1 -1
  11. package/ng-package.json +1 -0
  12. package/package.json +8 -6
  13. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts +6 -0
  14. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +38 -0
  15. package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -0
  16. package/src/builders/module-federation-dev-server/schema.d.ts +20 -0
  17. package/src/builders/module-federation-dev-server/schema.json +108 -0
  18. package/src/generators/add-linting/schema.json +1 -0
  19. package/src/generators/application/files/tsconfig.editor.json__tpl__ +1 -7
  20. package/src/generators/application/lib/update-editor-tsconfig.d.ts +1 -1
  21. package/src/generators/application/lib/update-editor-tsconfig.js +14 -2
  22. package/src/generators/application/lib/update-editor-tsconfig.js.map +1 -1
  23. package/src/generators/application/schema.json +11 -5
  24. package/src/generators/component/schema.json +1 -1
  25. package/src/generators/component-cypress-spec/schema.json +1 -0
  26. package/src/generators/component-story/schema.json +1 -0
  27. package/src/generators/convert-to-with-mf/convert-to-with-mf.js +4 -4
  28. package/src/generators/convert-to-with-mf/convert-to-with-mf.js.map +1 -1
  29. package/src/generators/convert-to-with-mf/lib/write-new-webpack-config.js +1 -1
  30. package/src/generators/convert-to-with-mf/schema.json +1 -1
  31. package/src/generators/convert-tslint-to-eslint/schema.json +1 -1
  32. package/src/generators/downgrade-module/schema.json +1 -1
  33. package/src/generators/{mfe-host/mfe-host.compat.d.ts → host/host.compat.d.ts} +0 -0
  34. package/src/generators/host/host.compat.js +6 -0
  35. package/src/generators/host/host.compat.js.map +1 -0
  36. package/src/generators/host/host.d.ts +3 -0
  37. package/src/generators/host/host.js +34 -0
  38. package/src/generators/host/host.js.map +1 -0
  39. package/src/generators/{mfe-host → host}/schema.d.ts +0 -0
  40. package/src/generators/{mfe-host → host}/schema.json +5 -5
  41. package/src/generators/init/schema.json +1 -1
  42. package/src/generators/karma/karma.js +1 -0
  43. package/src/generators/karma/karma.js.map +1 -1
  44. package/src/generators/library/library.js +2 -7
  45. package/src/generators/library/library.js.map +1 -1
  46. package/src/generators/ng-add/migrate-from-angular-cli.js +32 -10
  47. package/src/generators/ng-add/migrate-from-angular-cli.js.map +1 -1
  48. package/src/generators/ng-add/schema.d.ts +0 -1
  49. package/src/generators/ng-add/schema.json +0 -7
  50. package/src/generators/ng-add/utilities/app.migrator.d.ts +2 -3
  51. package/src/generators/ng-add/utilities/app.migrator.js +92 -56
  52. package/src/generators/ng-add/utilities/app.migrator.js.map +1 -1
  53. package/src/generators/ng-add/utilities/{e2e-project.migrator.d.ts → e2e.migrator.d.ts} +5 -1
  54. package/src/generators/ng-add/utilities/e2e.migrator.js +298 -0
  55. package/src/generators/ng-add/utilities/e2e.migrator.js.map +1 -0
  56. package/src/generators/ng-add/utilities/lib.migrator.d.ts +26 -0
  57. package/src/generators/ng-add/utilities/lib.migrator.js +351 -0
  58. package/src/generators/ng-add/utilities/lib.migrator.js.map +1 -0
  59. package/src/generators/ng-add/utilities/logger.d.ts +8 -0
  60. package/src/generators/ng-add/utilities/logger.js +21 -0
  61. package/src/generators/ng-add/utilities/logger.js.map +1 -0
  62. package/src/generators/ng-add/utilities/normalize-options.js +5 -2
  63. package/src/generators/ng-add/utilities/normalize-options.js.map +1 -1
  64. package/src/generators/ng-add/utilities/project.migrator.d.ts +13 -2
  65. package/src/generators/ng-add/utilities/project.migrator.js +83 -3
  66. package/src/generators/ng-add/utilities/project.migrator.js.map +1 -1
  67. package/src/generators/ng-add/utilities/types.d.ts +13 -1
  68. package/src/generators/ng-add/utilities/validate-projects.d.ts +2 -0
  69. package/src/generators/ng-add/utilities/validate-projects.js +46 -0
  70. package/src/generators/ng-add/utilities/validate-projects.js.map +1 -0
  71. package/src/generators/ng-add/utilities/validation-logging.d.ts +2 -0
  72. package/src/generators/ng-add/utilities/validation-logging.js +20 -0
  73. package/src/generators/ng-add/utilities/validation-logging.js.map +1 -0
  74. package/src/generators/ng-add/utilities/workspace.d.ts +5 -3
  75. package/src/generators/ng-add/utilities/workspace.js +105 -67
  76. package/src/generators/ng-add/utilities/workspace.js.map +1 -1
  77. package/src/generators/{mfe-remote/mfe-remote.compat.d.ts → remote/remote.compat.d.ts} +0 -0
  78. package/src/generators/remote/remote.compat.js +6 -0
  79. package/src/generators/remote/remote.compat.js.map +1 -0
  80. package/src/generators/remote/remote.d.ts +3 -0
  81. package/src/generators/remote/remote.js +76 -0
  82. package/src/generators/remote/remote.js.map +1 -0
  83. package/src/generators/{mfe-remote → remote}/schema.d.ts +0 -0
  84. package/src/generators/{mfe-remote → remote}/schema.json +5 -5
  85. package/src/generators/scam/schema.json +1 -1
  86. package/src/generators/scam-directive/schema.json +1 -1
  87. package/src/generators/scam-pipe/schema.json +1 -1
  88. package/src/generators/setup-mfe/files/webpack/{mfe.config.js__tmpl__ → module-federation.config.js__tmpl__} +0 -0
  89. package/src/generators/setup-mfe/files/webpack/webpack.config.js__tmpl__ +1 -1
  90. package/src/generators/setup-mfe/files/webpack/webpack.prod.config.js__tmpl__ +1 -1
  91. package/src/generators/setup-mfe/lib/add-remote-to-host.js +10 -10
  92. package/src/generators/setup-mfe/lib/add-remote-to-host.js.map +1 -1
  93. package/src/generators/setup-mfe/lib/fix-bootstrap.js +3 -3
  94. package/src/generators/setup-mfe/lib/fix-bootstrap.js.map +1 -1
  95. package/src/generators/setup-mfe/lib/generate-config.js +1 -1
  96. package/src/generators/setup-mfe/lib/generate-config.js.map +1 -1
  97. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js +3 -3
  98. package/src/generators/setup-mfe/lib/setup-host-if-dynamic.js.map +1 -1
  99. package/src/generators/setup-mfe/lib/setup-serve-target.js +3 -23
  100. package/src/generators/setup-mfe/lib/setup-serve-target.js.map +1 -1
  101. package/src/generators/stories/schema.json +1 -1
  102. package/src/generators/utils/dependencies.d.ts +2 -0
  103. package/src/generators/utils/dependencies.js +15 -0
  104. package/src/generators/utils/dependencies.js.map +1 -0
  105. package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js +2 -2
  106. package/src/migrations/update-13-8-1/add-cypress-mfe-workaround.js.map +1 -1
  107. package/src/migrations/update-14-0-0/rename-mf-config.d.ts +2 -0
  108. package/src/migrations/update-14-0-0/rename-mf-config.js +27 -0
  109. package/src/migrations/update-14-0-0/rename-mf-config.js.map +1 -0
  110. package/src/utils/{get-mfe-projects.d.ts → get-mf-projects.d.ts} +1 -1
  111. package/src/utils/{get-mfe-projects.js → get-mf-projects.js} +4 -4
  112. package/src/utils/get-mf-projects.js.map +1 -0
  113. package/src/utils/mfe/mfe-webpack.js +3 -3
  114. package/src/utils/mfe/mfe-webpack.js.map +1 -1
  115. package/src/utils/versions.js +1 -1
  116. package/src/generators/mfe-host/mfe-host.compat.js +0 -6
  117. package/src/generators/mfe-host/mfe-host.compat.js.map +0 -1
  118. package/src/generators/mfe-host/mfe-host.d.ts +0 -3
  119. package/src/generators/mfe-host/mfe-host.js +0 -22
  120. package/src/generators/mfe-host/mfe-host.js.map +0 -1
  121. package/src/generators/mfe-remote/mfe-remote.compat.js +0 -6
  122. package/src/generators/mfe-remote/mfe-remote.compat.js.map +0 -1
  123. package/src/generators/mfe-remote/mfe-remote.d.ts +0 -3
  124. package/src/generators/mfe-remote/mfe-remote.js +0 -31
  125. package/src/generators/mfe-remote/mfe-remote.js.map +0 -1
  126. package/src/generators/ng-add/utilities/e2e-project.migrator.js +0 -186
  127. package/src/generators/ng-add/utilities/e2e-project.migrator.js.map +0 -1
  128. package/src/generators/ng-add/utilities/e2e-utils.d.ts +0 -7
  129. package/src/generators/ng-add/utilities/e2e-utils.js +0 -46
  130. package/src/generators/ng-add/utilities/e2e-utils.js.map +0 -1
  131. package/src/generators/storybook-migrate-defaults-5-to-6/compat.d.ts +0 -2
  132. package/src/generators/storybook-migrate-defaults-5-to-6/compat.js +0 -6
  133. package/src/generators/storybook-migrate-defaults-5-to-6/compat.js.map +0 -1
  134. package/src/generators/storybook-migrate-defaults-5-to-6/schema.d.ts +0 -5
  135. package/src/generators/storybook-migrate-defaults-5-to-6/schema.json +0 -30
  136. package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.d.ts +0 -4
  137. package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js +0 -14
  138. package/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.js.map +0 -1
  139. package/src/generators/storybook-migrate-stories-to-6-2/compat.d.ts +0 -2
  140. package/src/generators/storybook-migrate-stories-to-6-2/compat.js +0 -6
  141. package/src/generators/storybook-migrate-stories-to-6-2/compat.js.map +0 -1
  142. package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.d.ts +0 -3
  143. package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js +0 -13
  144. package/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.js.map +0 -1
  145. package/src/generators/storybook-migrate-stories-to-6-2/schema.json +0 -11
  146. package/src/utils/get-mfe-projects.js.map +0 -1
@@ -1,46 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isProtractorE2eProject = exports.isCypressE2eProject = exports.getCypressConfigFile = exports.getE2eProject = exports.getE2eKey = void 0;
4
- const path_1 = require("path");
5
- function getE2eKey(projects) {
6
- var _a;
7
- for (const project of projects.apps) {
8
- if ((_a = project.config.targets) === null || _a === void 0 ? void 0 : _a.e2e) {
9
- return project.name;
10
- }
11
- }
12
- return null;
13
- }
14
- exports.getE2eKey = getE2eKey;
15
- function getE2eProject(projects) {
16
- var _a;
17
- for (const project of projects.apps) {
18
- if ((_a = project.config.targets) === null || _a === void 0 ? void 0 : _a.e2e) {
19
- return project;
20
- }
21
- }
22
- return null;
23
- }
24
- exports.getE2eProject = getE2eProject;
25
- function getCypressConfigFile(e2eProject) {
26
- let cypressConfig = 'cypress.json';
27
- const configFileOption = e2eProject.targets.e2e.options.configFile;
28
- if (configFileOption === false) {
29
- cypressConfig = undefined;
30
- }
31
- else if (typeof configFileOption === 'string') {
32
- cypressConfig = (0, path_1.basename)(configFileOption);
33
- }
34
- return cypressConfig;
35
- }
36
- exports.getCypressConfigFile = getCypressConfigFile;
37
- function isCypressE2eProject(e2eProject) {
38
- return e2eProject.targets.e2e.executor === '@cypress/schematic:cypress';
39
- }
40
- exports.isCypressE2eProject = isCypressE2eProject;
41
- function isProtractorE2eProject(e2eProject) {
42
- return (e2eProject.targets.e2e.executor ===
43
- '@angular-devkit/build-angular:protractor');
44
- }
45
- exports.isProtractorE2eProject = isProtractorE2eProject;
46
- //# sourceMappingURL=e2e-utils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"e2e-utils.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/e2e-utils.ts"],"names":[],"mappings":";;;AACA,+BAAgC;AAGhC,SAAgB,SAAS,CAAC,QAA2B;;IACnD,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACnC,IAAI,MAAA,OAAO,CAAC,MAAM,CAAC,OAAO,0CAAE,GAAG,EAAE;YAC/B,OAAO,OAAO,CAAC,IAAI,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,8BAQC;AAED,SAAgB,aAAa,CAC3B,QAA2B;;IAE3B,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;QACnC,IAAI,MAAA,OAAO,CAAC,MAAM,CAAC,OAAO,0CAAE,GAAG,EAAE;YAC/B,OAAO,OAAO,CAAC;SAChB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,sCAUC;AAED,SAAgB,oBAAoB,CAClC,UAAgC;IAEhC,IAAI,aAAa,GAAG,cAAc,CAAC;IACnC,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;IACnE,IAAI,gBAAgB,KAAK,KAAK,EAAE;QAC9B,aAAa,GAAG,SAAS,CAAC;KAC3B;SAAM,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;QAC/C,aAAa,GAAG,IAAA,eAAQ,EAAC,gBAAgB,CAAC,CAAC;KAC5C;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAZD,oDAYC;AAED,SAAgB,mBAAmB,CAAC,UAAgC;IAClE,OAAO,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,4BAA4B,CAAC;AAC1E,CAAC;AAFD,kDAEC;AAED,SAAgB,sBAAsB,CACpC,UAAgC;IAEhC,OAAO,CACL,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC/B,0CAA0C,CAC3C,CAAC;AACJ,CAAC;AAPD,wDAOC"}
@@ -1,2 +0,0 @@
1
- declare const _default: (generatorOptions: import("./schema").StorybookMigrateDefault5to6Schema) => (tree: any, context: any) => Promise<any>;
2
- export default _default;
@@ -1,6 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const devkit_1 = require("@nrwl/devkit");
4
- const storybook_migrate_defaults_5_to_6_1 = require("./storybook-migrate-defaults-5-to-6");
5
- exports.default = (0, devkit_1.convertNxGenerator)(storybook_migrate_defaults_5_to_6_1.storybookMigrateDefaults5To6Generator);
6
- //# sourceMappingURL=compat.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,2FAA4F;AAE5F,kBAAe,IAAA,2BAAkB,EAAC,yEAAqC,CAAC,CAAC"}
@@ -1,5 +0,0 @@
1
- export interface StorybookMigrateDefault5to6Schema {
2
- name?: string;
3
- all?: boolean;
4
- keepOld?: boolean;
5
- }
@@ -1,30 +0,0 @@
1
- {
2
- "$schema": "http://json-schema.org/schema",
3
- "$id": "NxStorybookMigrateDefaults5To6Generator",
4
- "title": "Storybook migrate default 5 to 6",
5
- "description": "Generates default Storybook configuration files using Storybook version `>=6.x` specs, for projects that already have Storybook instances and configurations of versions `<6.x.`",
6
- "cli": "nx",
7
- "type": "object",
8
- "properties": {
9
- "all": {
10
- "type": "boolean",
11
- "description": "Generate new Storybook configurations for all Storybook instances across all applications and libraries.",
12
- "default": true
13
- },
14
- "keepOld": {
15
- "type": "boolean",
16
- "description": "Keep the old configuration files by placing them in a folder called `.old_storybook`.",
17
- "default": true
18
- },
19
- "name": {
20
- "type": "string",
21
- "description": "Library or application name for which you want to generate the new Storybook configuration. Leave empty to upgrade all Storybook instances. Only use this if you want to do a gradual migration.",
22
- "$default": {
23
- "$source": "argv",
24
- "index": 0
25
- }
26
- }
27
- },
28
- "additionalProperties": false,
29
- "required": []
30
- }
@@ -1,4 +0,0 @@
1
- import type { GeneratorCallback, Tree } from '@nrwl/devkit';
2
- import type { StorybookMigrateDefault5to6Schema } from './schema';
3
- export declare function storybookMigrateDefaults5To6Generator(tree: Tree, options: StorybookMigrateDefault5to6Schema): GeneratorCallback;
4
- export default storybookMigrateDefaults5To6Generator;
@@ -1,14 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.storybookMigrateDefaults5To6Generator = void 0;
4
- const storybook_1 = require("@nrwl/storybook");
5
- function storybookMigrateDefaults5To6Generator(tree, options) {
6
- return (0, storybook_1.migrateDefaultsGenerator)(tree, {
7
- name: options.name,
8
- all: options.all,
9
- keepOld: options.keepOld,
10
- });
11
- }
12
- exports.storybookMigrateDefaults5To6Generator = storybookMigrateDefaults5To6Generator;
13
- exports.default = storybookMigrateDefaults5To6Generator;
14
- //# sourceMappingURL=storybook-migrate-defaults-5-to-6.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"storybook-migrate-defaults-5-to-6.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-defaults-5-to-6/storybook-migrate-defaults-5-to-6.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAG3D,SAAgB,qCAAqC,CACnD,IAAU,EACV,OAA0C;IAE1C,OAAO,IAAA,oCAAwB,EAAC,IAAI,EAAE;QACpC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;AACL,CAAC;AATD,sFASC;AAED,kBAAe,qCAAqC,CAAC"}
@@ -1,2 +0,0 @@
1
- declare const _default: (generatorOptions: any) => (tree: any, context: any) => Promise<any>;
2
- export default _default;
@@ -1,6 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const devkit_1 = require("@nrwl/devkit");
4
- const migrate_stories_to_6_2_1 = require("./migrate-stories-to-6-2");
5
- exports.default = (0, devkit_1.convertNxGenerator)(migrate_stories_to_6_2_1.angularMigrateStoriesTo62Generator);
6
- //# sourceMappingURL=compat.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-stories-to-6-2/compat.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,qEAA8E;AAE9E,kBAAe,IAAA,2BAAkB,EAAC,2DAAkC,CAAC,CAAC"}
@@ -1,3 +0,0 @@
1
- import type { Tree } from '@nrwl/devkit';
2
- export declare function angularMigrateStoriesTo62Generator(tree: Tree): Promise<void>;
3
- export default angularMigrateStoriesTo62Generator;
@@ -1,13 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.angularMigrateStoriesTo62Generator = void 0;
4
- const tslib_1 = require("tslib");
5
- const storybook_1 = require("@nrwl/storybook");
6
- function angularMigrateStoriesTo62Generator(tree) {
7
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
8
- yield (0, storybook_1.migrateStoriesTo62Generator)(tree);
9
- });
10
- }
11
- exports.angularMigrateStoriesTo62Generator = angularMigrateStoriesTo62Generator;
12
- exports.default = angularMigrateStoriesTo62Generator;
13
- //# sourceMappingURL=migrate-stories-to-6-2.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"migrate-stories-to-6-2.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/storybook-migrate-stories-to-6-2/migrate-stories-to-6-2.ts"],"names":[],"mappings":";;;;AACA,+CAA8D;AAE9D,SAAsB,kCAAkC,CAAC,IAAU;;QACjE,MAAM,IAAA,uCAA2B,EAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CAAA;AAFD,gFAEC;AAED,kBAAe,kCAAkC,CAAC"}
@@ -1,11 +0,0 @@
1
- {
2
- "$schema": "http://json-schema.org/schema",
3
- "$id": "NxAngularStorybookMigrateStoriesTo62Generator",
4
- "title": "Storybook migrate stories to 6.2",
5
- "description": "Migrates stories to match the new syntax in `v6.2` where the component declaration should be in the default export.",
6
- "type": "object",
7
- "cli": "nx",
8
- "properties": {},
9
- "additionalProperties": false,
10
- "required": []
11
- }
@@ -1 +0,0 @@
1
- {"version":3,"file":"get-mfe-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mfe-projects.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iGAA8F;AAE9F,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,MAAM,KAA0B,EAAE,MAAM,EAAE,KAAK,EAAE;IAEnD,MAAM,4BAA4B,GAAG,+BAA+B,CAAC;IACrE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,MAAM,4BAA4B,GAAG,MAAM;QACzC,CAAC,CAAC,yCAAyC;QAC3C,CAAC,CAAC,uCAAuC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAA,+CAAsB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;;QACpB,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,0CAAE,IAAI,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7C,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,6BAA6B,GAAG,IAAA,iBAAO,EAC3C,GAAG,EACH,4BAA4B,EAC5B;YACE,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,6BAA6B,CAAC,MAAM,KAAK,CAAC,EAC1C;YACA,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAxCD,wCAwCC"}