@nrwl/workspace 13.5.3 → 13.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (98) hide show
  1. package/migrations.json +6 -591
  2. package/package.json +6 -6
  3. package/src/command-line/affected.js +15 -24
  4. package/src/command-line/affected.js.map +1 -1
  5. package/src/command-line/nx-commands.js +7 -6
  6. package/src/command-line/nx-commands.js.map +1 -1
  7. package/src/command-line/run-many.js +7 -20
  8. package/src/command-line/run-many.js.map +1 -1
  9. package/src/command-line/utils.js +6 -0
  10. package/src/command-line/utils.js.map +1 -1
  11. package/src/core/file-utils.d.ts +2 -2
  12. package/src/core/file-utils.js +6 -6
  13. package/src/core/file-utils.js.map +1 -1
  14. package/src/core/hasher/file-hasher-base.js +2 -2
  15. package/src/core/hasher/file-hasher-base.js.map +1 -1
  16. package/src/core/hasher/file-hasher.js +14 -2
  17. package/src/core/hasher/file-hasher.js.map +1 -1
  18. package/src/core/hasher/git-based-file-hasher.js +6 -7
  19. package/src/core/hasher/git-based-file-hasher.js.map +1 -1
  20. package/src/core/hasher/hasher.js +3 -4
  21. package/src/core/hasher/hasher.js.map +1 -1
  22. package/src/core/hasher/node-based-file-hasher.js +11 -21
  23. package/src/core/hasher/node-based-file-hasher.js.map +1 -1
  24. package/src/core/project-graph/build-project-graph.js +7 -2
  25. package/src/core/project-graph/build-project-graph.js.map +1 -1
  26. package/src/core/project-graph/daemon/client/client.js +4 -1
  27. package/src/core/project-graph/daemon/client/client.js.map +1 -1
  28. package/src/core/project-graph/daemon/tmp-dir.d.ts +1 -0
  29. package/src/core/project-graph/daemon/tmp-dir.js +7 -1
  30. package/src/core/project-graph/daemon/tmp-dir.js.map +1 -1
  31. package/src/core/project-graph/project-graph.js +19 -15
  32. package/src/core/project-graph/project-graph.js.map +1 -1
  33. package/src/generators/npm-package/npm-package.js +1 -1
  34. package/src/generators/npm-package/npm-package.js.map +1 -1
  35. package/src/migrations/update-13-6-0/remove-old-task-runner-options.d.ts +3 -0
  36. package/src/migrations/update-13-6-0/remove-old-task-runner-options.js +16 -0
  37. package/src/migrations/update-13-6-0/remove-old-task-runner-options.js.map +1 -0
  38. package/src/tasks-runner/cache.js +35 -37
  39. package/src/tasks-runner/cache.js.map +1 -1
  40. package/src/tasks-runner/run-command.js +0 -5
  41. package/src/tasks-runner/run-command.js.map +1 -1
  42. package/src/utils/versions.d.ts +4 -4
  43. package/src/utils/versions.js +5 -5
  44. package/src/utils/versions.js.map +1 -1
  45. package/src/migrations/update-8-10-0/fix-tslint-json.d.ts +0 -2
  46. package/src/migrations/update-8-10-0/fix-tslint-json.js +0 -45
  47. package/src/migrations/update-8-10-0/fix-tslint-json.js.map +0 -1
  48. package/src/migrations/update-8-12-0/add-implicit-e2e-deps.d.ts +0 -2
  49. package/src/migrations/update-8-12-0/add-implicit-e2e-deps.js +0 -32
  50. package/src/migrations/update-8-12-0/add-implicit-e2e-deps.js.map +0 -1
  51. package/src/migrations/update-8-12-0/update-enforce-boundary-lint-rule.d.ts +0 -4
  52. package/src/migrations/update-8-12-0/update-enforce-boundary-lint-rule.js +0 -41
  53. package/src/migrations/update-8-12-0/update-enforce-boundary-lint-rule.js.map +0 -1
  54. package/src/migrations/update-8-12-0/update-package-json-deps.d.ts +0 -2
  55. package/src/migrations/update-8-12-0/update-package-json-deps.js +0 -14
  56. package/src/migrations/update-8-12-0/update-package-json-deps.js.map +0 -1
  57. package/src/migrations/update-8-2-0/update-8-2-0.d.ts +0 -1
  58. package/src/migrations/update-8-2-0/update-8-2-0.js +0 -27
  59. package/src/migrations/update-8-2-0/update-8-2-0.js.map +0 -1
  60. package/src/migrations/update-8-3-0/rename-lint.d.ts +0 -1
  61. package/src/migrations/update-8-3-0/rename-lint.js +0 -18
  62. package/src/migrations/update-8-3-0/rename-lint.js.map +0 -1
  63. package/src/migrations/update-8-3-0/update-cypress-to-34.d.ts +0 -1
  64. package/src/migrations/update-8-3-0/update-cypress-to-34.js +0 -16
  65. package/src/migrations/update-8-3-0/update-cypress-to-34.js.map +0 -1
  66. package/src/migrations/update-8-3-0/update-ng-cli-8-1.d.ts +0 -1
  67. package/src/migrations/update-8-3-0/update-ng-cli-8-1.js +0 -28
  68. package/src/migrations/update-8-3-0/update-ng-cli-8-1.js.map +0 -1
  69. package/src/migrations/update-8-4-0/add-nx-script.d.ts +0 -1
  70. package/src/migrations/update-8-4-0/add-nx-script.js +0 -16
  71. package/src/migrations/update-8-4-0/add-nx-script.js.map +0 -1
  72. package/src/migrations/update-8-5-0/fix-tsconfig-lib-json.d.ts +0 -1
  73. package/src/migrations/update-8-5-0/fix-tsconfig-lib-json.js +0 -35
  74. package/src/migrations/update-8-5-0/fix-tsconfig-lib-json.js.map +0 -1
  75. package/src/migrations/update-9-0-0/update-9-0-0.d.ts +0 -1
  76. package/src/migrations/update-9-0-0/update-9-0-0.js +0 -11
  77. package/src/migrations/update-9-0-0/update-9-0-0.js.map +0 -1
  78. package/src/migrations/update-9-1-0/update-9-1-0.d.ts +0 -1
  79. package/src/migrations/update-9-1-0/update-9-1-0.js +0 -11
  80. package/src/migrations/update-9-1-0/update-9-1-0.js.map +0 -1
  81. package/src/migrations/update-9-1-0/update-lint-config.d.ts +0 -1
  82. package/src/migrations/update-9-1-0/update-lint-config.js +0 -45
  83. package/src/migrations/update-9-1-0/update-lint-config.js.map +0 -1
  84. package/src/migrations/update-9-2-0/update-9-2-0.d.ts +0 -1
  85. package/src/migrations/update-9-2-0/update-9-2-0.js +0 -44
  86. package/src/migrations/update-9-2-0/update-9-2-0.js.map +0 -1
  87. package/src/migrations/update-9-3-0/update-9-3-0.d.ts +0 -1
  88. package/src/migrations/update-9-3-0/update-9-3-0.js +0 -11
  89. package/src/migrations/update-9-3-0/update-9-3-0.js.map +0 -1
  90. package/src/migrations/update-9-4-0/add-decorate-cli.d.ts +0 -1
  91. package/src/migrations/update-9-4-0/add-decorate-cli.js +0 -36
  92. package/src/migrations/update-9-4-0/add-decorate-cli.js.map +0 -1
  93. package/src/migrations/update-9-4-0/update-eslint-config.d.ts +0 -1
  94. package/src/migrations/update-9-4-0/update-eslint-config.js +0 -37
  95. package/src/migrations/update-9-4-0/update-eslint-config.js.map +0 -1
  96. package/src/migrations/update-9-4-0/update-linters-exclude.d.ts +0 -1
  97. package/src/migrations/update-9-4-0/update-linters-exclude.js +0 -27
  98. package/src/migrations/update-9-4-0/update-linters-exclude.js.map +0 -1
@@ -1 +0,0 @@
1
- {"version":3,"file":"update-9-2-0.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-9-2-0/update-9-2-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,+CAIyB;AACzB,+BAA4B;AAE5B,MAAM,cAAc,GAAG,IAAA,uCAA2B,EAChD,IAAA,WAAI,EAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAC/C,OAAO,CACR,CAAC;AAEF,MAAM,sBAAsB,GAAG,IAAA,4BAAgB,EAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;IACpE,MAAM,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC;IAE5D,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE;QACtC,MAAM,CAAC,kBAAkB,CAAC,OAAO,GAAG;YAClC,MAAM,EAAE,uCAAuC;YAC/C,OAAO,EAAE;gBACP,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;aACtD;SACF,CAAC;QAEF,OAAO,MAAM,CAAC;KACf;SAAM,IACL,MAAM,CAAC,kBAAkB,CAAC,OAAO;QACjC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM;YACvC,sDAAsD;YACtD,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM;gBACtC,kDAAkD,CAAC,EACvD;QACA,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM;YACtC,uCAAuC,CAAC;QAE1C,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO;YACvC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QAClD,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB;YAC3D,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,IAAI,EAAE,CAAC;QAEtE,MAAM,mBAAmB,GAAG,IAAI,GAAG,CACjC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAC9D,CAAC;QACF,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE/B,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB;YAC3D,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAElC,OAAO,MAAM,CAAC;KACf;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,cAAc,EAAE,sBAAsB,EAAE,IAAA,uBAAW,GAAE,CAAC,CAAC,CAAC;AACxE,CAAC;AAFD,4BAEC"}
@@ -1 +0,0 @@
1
- export default function (): import("@angular-devkit/schematics").Rule;
@@ -1,11 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const schematics_1 = require("@angular-devkit/schematics");
4
- const workspace_1 = require("@nrwl/workspace");
5
- const path_1 = require("path");
6
- const updatePackages = (0, workspace_1.updatePackagesInPackageJson)((0, path_1.join)(__dirname, '../../../', 'migrations.json'), '9.3.0');
7
- function default_1() {
8
- return (0, schematics_1.chain)([updatePackages, (0, workspace_1.formatFiles)()]);
9
- }
10
- exports.default = default_1;
11
- //# sourceMappingURL=update-9-3-0.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"update-9-3-0.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-9-3-0/update-9-3-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,+CAA2E;AAC3E,+BAA4B;AAE5B,MAAM,cAAc,GAAG,IAAA,uCAA2B,EAChD,IAAA,WAAI,EAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAC/C,OAAO,CACR,CAAC;AAEF;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,cAAc,EAAE,IAAA,uBAAW,GAAE,CAAC,CAAC,CAAC;AAChD,CAAC;AAFD,4BAEC"}
@@ -1 +0,0 @@
1
- export default function (): import("@angular-devkit/schematics").Rule;
@@ -1,36 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const schematics_1 = require("@angular-devkit/schematics");
4
- const format_files_1 = require("../../utils/rules/format-files");
5
- const fs_1 = require("fs");
6
- const workspace_1 = require("@nrwl/workspace");
7
- const path_1 = require("path");
8
- const decorateAngularClI = (host, context) => {
9
- if (host.exists('angular.json')) {
10
- const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', '..', 'generators', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
11
- host.create('decorate-angular-cli.js', decorateCli);
12
- (0, workspace_1.updateJsonInTree)('package.json', (json) => {
13
- if (json.scripts &&
14
- json.scripts.postinstall &&
15
- !json.scripts.postinstall.includes('decorate-angular-cli.js')) {
16
- // if exists, add execution of this script
17
- json.scripts.postinstall += ' && node ./decorate-angular-cli.js';
18
- }
19
- else {
20
- if (!json.scripts)
21
- json.scripts = {};
22
- // if doesn't exist, set to execute this script
23
- json.scripts.postinstall = 'node ./decorate-angular-cli.js';
24
- }
25
- if (json.scripts.ng) {
26
- json.scripts.ng = 'nx';
27
- }
28
- return json;
29
- })(host, context);
30
- }
31
- };
32
- function default_1() {
33
- return (0, schematics_1.chain)([decorateAngularClI, (0, format_files_1.formatFiles)()]);
34
- }
35
- exports.default = default_1;
36
- //# sourceMappingURL=add-decorate-cli.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"add-decorate-cli.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-9-4-0/add-decorate-cli.ts"],"names":[],"mappings":";;AAAA,2DAA2E;AAC3E,iEAA6D;AAC7D,2BAAkC;AAClC,+CAAmD;AACnD,+BAAwC;AAExC,MAAM,kBAAkB,GAAG,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;IACnE,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/B,MAAM,WAAW,GAAG,IAAA,iBAAY,EAC9B,IAAA,WAAQ,EACN,SAAgB,EAChB,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,OAAO,EACP,iCAAiC,CAClC,CACF,CAAC,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,WAAW,CAAC,CAAC;QACpD,IAAA,4BAAgB,EAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IACE,IAAI,CAAC,OAAO;gBACZ,IAAI,CAAC,OAAO,CAAC,WAAW;gBACxB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAC7D;gBACA,0CAA0C;gBAC1C,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,oCAAoC,CAAC;aAClE;iBAAM;gBACL,IAAI,CAAC,IAAI,CAAC,OAAO;oBAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;gBACrC,+CAA+C;gBAC/C,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,gCAAgC,CAAC;aAC7D;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE;gBACnB,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;aACxB;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACnB;AACH,CAAC,CAAC;AAEF;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,kBAAkB,EAAE,IAAA,0BAAW,GAAE,CAAC,CAAC,CAAC;AACpD,CAAC;AAFD,4BAEC"}
@@ -1 +0,0 @@
1
- export default function (): import("@angular-devkit/schematics").Rule;
@@ -1,37 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const schematics_1 = require("@angular-devkit/schematics");
4
- const format_files_1 = require("../../utils/rules/format-files");
5
- const ast_utils_1 = require("../../utils/ast-utils");
6
- function removeEslintConfigOption(host, context) {
7
- return (0, ast_utils_1.updateWorkspaceInTree)((json) => {
8
- Object.values(json.projects).forEach((project) => {
9
- if (!project.architect) {
10
- return;
11
- }
12
- Object.values(project.architect).forEach((target) => {
13
- var _a;
14
- if (target.builder !== '@nrwl/linter:lint') {
15
- return;
16
- }
17
- if (((_a = target === null || target === void 0 ? void 0 : target.options) === null || _a === void 0 ? void 0 : _a.config) === `${project.root}/.eslintrc`) {
18
- delete target.options.config;
19
- }
20
- if (!target.configurations) {
21
- return;
22
- }
23
- Object.values(target.configurations).forEach((options) => {
24
- if (options.config === `${project.root}/.eslintrc`) {
25
- delete options.config;
26
- }
27
- });
28
- });
29
- });
30
- return json;
31
- });
32
- }
33
- function default_1() {
34
- return (0, schematics_1.chain)([removeEslintConfigOption, (0, format_files_1.formatFiles)()]);
35
- }
36
- exports.default = default_1;
37
- //# sourceMappingURL=update-eslint-config.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"update-eslint-config.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-9-4-0/update-eslint-config.ts"],"names":[],"mappings":";;AAAA,2DAA2E;AAC3E,iEAA6D;AAC7D,qDAA8D;AAE9D,SAAS,wBAAwB,CAAC,IAAU,EAAE,OAAyB;IACrE,OAAO,IAAA,iCAAqB,EAAC,CAAC,IAAI,EAAE,EAAE;QACpC,MAAM,CAAC,MAAM,CAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACpD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBACtB,OAAO;aACR;YACD,MAAM,CAAC,MAAM,CAAM,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;gBACvD,IAAI,MAAM,CAAC,OAAO,KAAK,mBAAmB,EAAE;oBAC1C,OAAO;iBACR;gBACD,IAAI,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,MAAM,MAAK,GAAG,OAAO,CAAC,IAAI,YAAY,EAAE;oBAC3D,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;iBAC9B;gBACD,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;oBAC1B,OAAO;iBACR;gBACD,MAAM,CAAC,MAAM,CAAM,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC5D,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,YAAY,EAAE;wBAClD,OAAO,OAAO,CAAC,MAAM,CAAC;qBACvB;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,wBAAwB,EAAE,IAAA,0BAAW,GAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,4BAEC"}
@@ -1 +0,0 @@
1
- export default function (): import("@angular-devkit/schematics").Rule;
@@ -1,27 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const schematics_1 = require("@angular-devkit/schematics");
4
- const format_files_1 = require("../../utils/rules/format-files");
5
- const workspace_1 = require("../../utils/workspace");
6
- function updateExcludePattern(host, context) {
7
- const builders = [
8
- '@nrwl/linter:lint',
9
- '@angular-devkit/build-angular:tslint',
10
- ];
11
- return (0, workspace_1.updateBuilderConfig)((options, target, project) => {
12
- if (!(options === null || options === void 0 ? void 0 : options.exclude)) {
13
- return options;
14
- }
15
- const faultyPattern = `!${project.root}/**`;
16
- if ((options === null || options === void 0 ? void 0 : options.exclude).includes(faultyPattern)) {
17
- const index = (options === null || options === void 0 ? void 0 : options.exclude).indexOf(faultyPattern);
18
- (options === null || options === void 0 ? void 0 : options.exclude)[index] = `${faultyPattern}/*`;
19
- }
20
- return options;
21
- }, ...builders);
22
- }
23
- function default_1() {
24
- return (0, schematics_1.chain)([updateExcludePattern, (0, format_files_1.formatFiles)()]);
25
- }
26
- exports.default = default_1;
27
- //# sourceMappingURL=update-linters-exclude.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"update-linters-exclude.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-9-4-0/update-linters-exclude.ts"],"names":[],"mappings":";;AAAA,2DAA2E;AAC3E,iEAA6D;AAC7D,qDAA6E;AAG7E,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACjE,MAAM,QAAQ,GAAG;QACf,mBAAmB;QACnB,sCAAsC;KACvC,CAAC;IACF,OAAO,IAAA,+BAAmB,EAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAA,EAAE;YACrB,OAAO,OAAO,CAAC;SAChB;QACD,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;QAC5C,IAAI,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAqB,CAAA,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YAC3D,MAAM,KAAK,GAAW,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAqB,CAAA,CAAC,OAAO,CAC3D,aAAa,CACd,CAAC;YACF,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAqB,CAAA,CAAC,KAAK,CAAC,GAAG,GAAG,aAAa,IAAI,CAAC;SAC/D;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC;AAClB,CAAC;AAED;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,oBAAoB,EAAE,IAAA,0BAAW,GAAE,CAAC,CAAC,CAAC;AACtD,CAAC;AAFD,4BAEC"}