nx 14.5.4 → 14.5.6

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 (57) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +4 -4
  3. package/src/adapter/compat.js +15 -2
  4. package/src/adapter/compat.js.map +1 -1
  5. package/src/command-line/generate.d.ts +1 -1
  6. package/src/command-line/generate.js +39 -18
  7. package/src/command-line/generate.js.map +1 -1
  8. package/src/command-line/list.js +5 -0
  9. package/src/command-line/list.js.map +1 -1
  10. package/src/command-line/migrate.js +44 -25
  11. package/src/command-line/migrate.js.map +1 -1
  12. package/src/command-line/repair.d.ts +1 -1
  13. package/src/command-line/repair.js +10 -5
  14. package/src/command-line/repair.js.map +1 -1
  15. package/src/command-line/report.d.ts +1 -1
  16. package/src/command-line/report.js +38 -20
  17. package/src/command-line/report.js.map +1 -1
  18. package/src/core/dep-graph/3rdpartylicenses.txt +0 -229
  19. package/src/core/dep-graph/main.esm.js +1 -1
  20. package/src/core/dep-graph/main.esm.js.LICENSE.txt +4 -9
  21. package/src/core/dep-graph/polyfills.esm.js +1 -1
  22. package/src/core/dep-graph/styles.css +2 -2
  23. package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +2 -1
  24. package/src/generators/testing-utils/create-tree-with-empty-workspace.js +13 -4
  25. package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -1
  26. package/src/hasher/hash-task.d.ts +6 -0
  27. package/src/hasher/hash-task.js +30 -0
  28. package/src/hasher/hash-task.js.map +1 -0
  29. package/src/hasher/hasher.d.ts +3 -1
  30. package/src/hasher/hasher.js +95 -64
  31. package/src/hasher/hasher.js.map +1 -1
  32. package/src/tasks-runner/cache.d.ts +1 -3
  33. package/src/tasks-runner/cache.js +12 -55
  34. package/src/tasks-runner/cache.js.map +1 -1
  35. package/src/tasks-runner/default-tasks-runner.js +1 -3
  36. package/src/tasks-runner/default-tasks-runner.js.map +1 -1
  37. package/src/tasks-runner/life-cycles/formatting-utils.js +12 -1
  38. package/src/tasks-runner/life-cycles/formatting-utils.js.map +1 -1
  39. package/src/tasks-runner/run-command.js +17 -0
  40. package/src/tasks-runner/run-command.js.map +1 -1
  41. package/src/tasks-runner/tasks-runner.d.ts +2 -0
  42. package/src/tasks-runner/tasks-schedule.d.ts +0 -1
  43. package/src/tasks-runner/tasks-schedule.js +4 -17
  44. package/src/tasks-runner/tasks-schedule.js.map +1 -1
  45. package/src/utils/nx-plugin.js +1 -1
  46. package/src/utils/nx-plugin.js.map +1 -1
  47. package/src/utils/package-json.d.ts +18 -0
  48. package/src/utils/package-json.js +28 -5
  49. package/src/utils/package-json.js.map +1 -1
  50. package/src/utils/package-manager.d.ts +0 -1
  51. package/src/utils/package-manager.js +16 -13
  52. package/src/utils/package-manager.js.map +1 -1
  53. package/src/utils/plugins/local-plugins.d.ts +4 -0
  54. package/src/utils/plugins/local-plugins.js +59 -0
  55. package/src/utils/plugins/local-plugins.js.map +1 -0
  56. package/src/utils/plugins/plugin-capabilities.js +2 -2
  57. package/src/utils/plugins/plugin-capabilities.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [14.5.4](https://github.com/nrwl/nx/compare/14.5.3...14.5.4) (2022-08-04)
6
+ ## [14.5.6](https://github.com/nrwl/nx/compare/14.5.5...14.5.6) (2022-08-14)
7
7
 
8
8
  **Note:** Version bump only for package nx
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nx",
3
- "version": "14.5.4",
3
+ "version": "14.5.6",
4
4
  "description": "Smart, Fast and Extensible Build System",
5
5
  "repository": {
6
6
  "type": "git",
@@ -31,8 +31,8 @@
31
31
  },
32
32
  "homepage": "https://nx.dev",
33
33
  "dependencies": {
34
- "@nrwl/cli": "14.5.4",
35
- "@nrwl/tao": "14.5.4",
34
+ "@nrwl/cli": "14.5.6",
35
+ "@nrwl/tao": "14.5.6",
36
36
  "@parcel/watcher": "2.0.4",
37
37
  "chalk": "4.1.0",
38
38
  "chokidar": "^3.5.1",
@@ -106,5 +106,5 @@
106
106
  "executors": "./executors.json",
107
107
  "main": "./bin/nx.js",
108
108
  "typings": "./bin/nx.d.ts",
109
- "gitHead": "bcc00c50e4e74ec991385d686493ff784817638c"
109
+ "gitHead": "608141ec7c3f8718419fc869f506196180e2bf2c"
110
110
  }
@@ -18,6 +18,17 @@ const allowedProjectExtensions = [
18
18
  '$schema',
19
19
  'generators',
20
20
  ];
21
+ const allowedWorkspaceExtensions = [
22
+ 'implicitDependencies',
23
+ 'affected',
24
+ 'npmScope',
25
+ 'tasksRunnerOptions',
26
+ 'workspaceLayout',
27
+ 'plugins',
28
+ 'targetDefaults',
29
+ 'files',
30
+ 'generators',
31
+ ];
21
32
  if (!patched) {
22
33
  Module.prototype.require = function () {
23
34
  const result = originalRequire.apply(this, arguments);
@@ -82,9 +93,11 @@ function mockWriteWorkspace(ngCoreWorkspace) {
82
93
  */
83
94
  function mockReadJsonWorkspace(readJsonUtils) {
84
95
  mockMember(readJsonUtils, 'readJsonWorkspace', (originalReadJsonWorkspace) => (path, host, options) => tslib_1.__awaiter(this, void 0, void 0, function* () {
96
+ const modifiedOptions = Object.assign(Object.assign({}, options), { allowedProjectExtensions,
97
+ allowedWorkspaceExtensions });
85
98
  try {
86
99
  // Attempt angular CLI default behaviour
87
- return yield originalReadJsonWorkspace(path, host, Object.assign(Object.assign({}, options), { allowedProjectExtensions }));
100
+ return yield originalReadJsonWorkspace(path, host, modifiedOptions);
88
101
  }
89
102
  catch (_a) {
90
103
  // This failed. Its most likely due to a lack of a workspace definition file,
@@ -104,7 +117,7 @@ function mockReadJsonWorkspace(readJsonUtils) {
104
117
  // second arg is a host, only method used is readFile
105
118
  readFile: () => JSON.stringify(workspaceConfiguration),
106
119
  },
107
- Object.assign(Object.assign({}, options), { allowedProjectExtensions }),
120
+ modifiedOptions,
108
121
  ]);
109
122
  }
110
123
  }));
@@ -1 +1 @@
1
- {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { Options, Schema } from '../utils/params';
2
1
  import { FileChange } from '../generators/tree';
2
+ import { Options, Schema } from '../utils/params';
3
3
  export interface GenerateOptions {
4
4
  collectionName: string;
5
5
  generatorName: string;
@@ -2,17 +2,18 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generate = exports.newWorkspace = exports.printGenHelp = exports.printChanges = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const params_1 = require("../utils/params");
6
- const workspaces_1 = require("../config/workspaces");
7
- const tree_1 = require("../generators/tree");
8
- const logger_1 = require("../utils/logger");
9
5
  const chalk = require("chalk");
10
- const workspace_root_1 = require("../utils/workspace-root");
11
- const print_help_1 = require("../utils/print-help");
12
6
  const enquirer_1 = require("enquirer");
13
7
  const fileutils_1 = require("nx/src/utils/fileutils");
14
- const project_graph_1 = require("../project-graph/project-graph");
15
8
  const configuration_1 = require("../config/configuration");
9
+ const workspaces_1 = require("../config/workspaces");
10
+ const tree_1 = require("../generators/tree");
11
+ const project_graph_1 = require("../project-graph/project-graph");
12
+ const logger_1 = require("../utils/logger");
13
+ const params_1 = require("../utils/params");
14
+ const local_plugins_1 = require("../utils/plugins/local-plugins");
15
+ const print_help_1 = require("../utils/print-help");
16
+ const workspace_root_1 = require("../utils/workspace-root");
16
17
  function printChanges(fileChanges) {
17
18
  fileChanges.forEach((f) => {
18
19
  if (f.type === 'CREATE') {
@@ -27,37 +28,57 @@ function printChanges(fileChanges) {
27
28
  });
28
29
  }
29
30
  exports.printChanges = printChanges;
30
- function promptForCollection(generatorName, ws, interactive) {
31
+ function promptForCollection(generatorName, ws, interactive, projectsConfiguration) {
31
32
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
32
33
  const packageJson = (0, fileutils_1.readJsonFile)(`${workspace_root_1.workspaceRoot}/package.json`);
33
- const collections = Array.from(new Set([
34
+ const localPlugins = (0, local_plugins_1.getLocalWorkspacePlugins)(projectsConfiguration);
35
+ const installedCollections = Array.from(new Set([
34
36
  ...Object.keys(packageJson.dependencies || {}),
35
37
  ...Object.keys(packageJson.devDependencies || {}),
36
38
  ]));
37
39
  const choicesMap = new Set();
38
- for (const collectionName of collections) {
40
+ for (const collectionName of installedCollections) {
39
41
  try {
40
42
  const { resolvedCollectionName, normalizedGeneratorName } = ws.readGenerator(collectionName, generatorName);
41
43
  choicesMap.add(`${resolvedCollectionName}:${normalizedGeneratorName}`);
42
44
  }
43
45
  catch (_a) { }
44
46
  }
45
- const choices = Array.from(choicesMap);
47
+ const choicesFromLocalPlugins = [];
48
+ for (const [name] of localPlugins) {
49
+ try {
50
+ const { resolvedCollectionName, normalizedGeneratorName } = ws.readGenerator(name, generatorName);
51
+ const value = `${resolvedCollectionName}:${normalizedGeneratorName}`;
52
+ if (!choicesMap.has(value)) {
53
+ choicesFromLocalPlugins.push({
54
+ name: value,
55
+ message: chalk.bold(value),
56
+ value,
57
+ });
58
+ }
59
+ }
60
+ catch (_b) { }
61
+ }
62
+ if (choicesFromLocalPlugins.length) {
63
+ choicesFromLocalPlugins[choicesFromLocalPlugins.length - 1].message += '\n';
64
+ }
65
+ const choices = choicesFromLocalPlugins.concat(...choicesMap);
46
66
  if (choices.length === 1) {
47
- return choices[0];
67
+ return typeof choices[0] === 'string' ? choices[0] : choices[0].value;
48
68
  }
49
69
  else if (!interactive && choices.length > 1) {
50
- throwInvalidInvocation(choices);
70
+ throwInvalidInvocation(Array.from(choicesMap));
51
71
  }
52
72
  else if (interactive && choices.length > 1) {
53
- const noneOfTheAbove = `None of the above`;
73
+ const noneOfTheAbove = `\nNone of the above`;
54
74
  choices.push(noneOfTheAbove);
55
75
  let { generator, customCollection } = yield (0, enquirer_1.prompt)([
56
76
  {
57
77
  name: 'generator',
58
78
  message: `Which generator would you like to use?`,
59
79
  type: 'autocomplete',
60
- choices,
80
+ // enquirer's typings are incorrect here... It supports (string | Choice)[], but is typed as (string[] | Choice[])
81
+ choices: choices,
61
82
  },
62
83
  {
63
84
  name: 'customCollection',
@@ -105,7 +126,7 @@ function parseGeneratorString(value) {
105
126
  };
106
127
  }
107
128
  }
108
- function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, mode) {
129
+ function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, mode, projectsConfiguration) {
109
130
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
110
131
  let collectionName = null;
111
132
  let generatorName = null;
@@ -118,7 +139,7 @@ function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, m
118
139
  generatorName = generator;
119
140
  }
120
141
  else if (!defaultCollectionName) {
121
- const generatorString = yield promptForCollection(generatorDescriptor, ws, interactive);
142
+ const generatorString = yield promptForCollection(generatorDescriptor, ws, interactive, projectsConfiguration);
122
143
  const parsedGeneratorString = parseGeneratorString(generatorString);
123
144
  collectionName = parsedGeneratorString.collection;
124
145
  generatorName = parsedGeneratorString.generator;
@@ -213,7 +234,7 @@ function generate(cwd, args) {
213
234
  const workspaceConfiguration = Object.assign(Object.assign({}, nxJson), projectsConfiguration);
214
235
  const isVerbose = args['verbose'];
215
236
  return (0, params_1.handleErrors)(isVerbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
216
- const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(nxJson), 'generate');
237
+ const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(nxJson), 'generate', projectsConfiguration);
217
238
  const { normalizedGeneratorName, schema, implementationFactory, aliases } = ws.readGenerator(opts.collectionName, opts.generatorName);
218
239
  logger_1.logger.info(`NX Generating ${opts.collectionName}:${normalizedGeneratorName}`);
219
240
  if (opts.help) {
@@ -1 +1 @@
1
- {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/generate.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
5
5
  const workspace_root_1 = require("../utils/workspace-root");
6
6
  const output_1 = require("../utils/output");
7
7
  const plugins_1 = require("../utils/plugins");
8
+ const local_plugins_1 = require("../utils/plugins/local-plugins");
9
+ const project_graph_1 = require("../project-graph/project-graph");
8
10
  /**
9
11
  * List available plugins or capabilities within a specific plugin
10
12
  *
@@ -27,7 +29,10 @@ function listHandler(args) {
27
29
  });
28
30
  return [];
29
31
  });
32
+ const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
33
+ const localPlugins = (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
30
34
  const installedPlugins = (0, plugins_1.getInstalledPluginsFromPackageJson)(workspace_root_1.workspaceRoot, corePlugins, communityPlugins);
35
+ (0, local_plugins_1.listLocalWorkspacePlugins)(localPlugins);
31
36
  (0, plugins_1.listInstalledPlugins)(installedPlugins);
32
37
  (0, plugins_1.listCorePlugins)(installedPlugins, corePlugins);
33
38
  (0, plugins_1.listCommunityPlugins)(installedPlugins, communityPlugins);
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/list.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,4CAAyC;AACzC,8CAQ0B;AAO1B;;;;;;;GAOG;AACH,SAAsB,WAAW,CAAC,IAAc;;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,8BAAa,EACb,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AA3BD,kCA2BC"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/list.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,4CAAyC;AACzC,8CAQ0B;AAC1B,kEAGwC;AACxC,kEAGwC;AAOxC;;;;;;;GAOG;AACH,SAAsB,WAAW,CAAC,IAAc;;QAC9C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAA,gCAAsB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;aAAM;YACL,MAAM,WAAW,GAAG,IAAA,0BAAgB,GAAE,CAAC;YACvC,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,GAAE,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChE,eAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,oBAAoB;oBAC3B,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAC;gBAEH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,IAAA,uCAAuB,GAAE,CAAC;YAErD,MAAM,YAAY,GAAG,IAAA,wCAAwB,EAC3C,IAAA,yDAAyC,EAAC,YAAY,CAAC,CACxD,CAAC;YACF,MAAM,gBAAgB,GAAG,IAAA,4CAAkC,EACzD,8BAAa,EACb,WAAW,EACX,gBAAgB,CACjB,CAAC;YAEF,IAAA,yCAAyB,EAAC,YAAY,CAAC,CAAC;YACxC,IAAA,8BAAoB,EAAC,gBAAgB,CAAC,CAAC;YACvC,IAAA,yBAAe,EAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAC/C,IAAA,8BAAoB,EAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC;YAEzD,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,yCAAyC;aACjD,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAjCD,kCAiCC"}
@@ -14,6 +14,7 @@ const package_json_1 = require("../utils/package-json");
14
14
  const package_manager_1 = require("../utils/package-manager");
15
15
  const params_1 = require("../utils/params");
16
16
  const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
17
+ const output_1 = require("../utils/output");
17
18
  const execAsync = (0, util_1.promisify)(child_process_1.exec);
18
19
  function normalizeVersion(version) {
19
20
  const [semver, prereleaseTag] = version.split('-');
@@ -559,27 +560,35 @@ function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
559
560
  if (migrations.length > 0) {
560
561
  createMigrationsFile(root, migrations);
561
562
  }
562
- logger_1.logger.info(`NX The migrate command has run successfully.`);
563
- logger_1.logger.info(`- package.json has been updated`);
564
- if (migrations.length > 0) {
565
- logger_1.logger.info(`- migrations.json has been generated`);
566
- }
567
- else {
568
- logger_1.logger.info(`- there are no migrations to run, so migrations.json has not been created.`);
569
- }
570
- logger_1.logger.info(`NX Next steps:`);
571
- logger_1.logger.info(`- Make sure package.json changes make sense and then run '${pmc.install}'`);
572
- if (migrations.length > 0) {
573
- logger_1.logger.info(`- Run '${pmc.exec} nx migrate --run-migrations'`);
574
- }
575
- logger_1.logger.info(`- To learn more go to https://nx.dev/using-nx/updating-nx`);
576
- if (showConnectToCloudMessage()) {
577
- const cmd = pmc.run('nx', 'connect-to-nx-cloud');
578
- logger_1.logger.info(`- You may run '${cmd}' to get faster builds, GitHub integration, and more. Check out https://nx.app`);
579
- }
563
+ output_1.output.success({
564
+ title: `The migrate command has run successfully.`,
565
+ bodyLines: [
566
+ `- Package.json has been updated.`,
567
+ migrations.length > 0
568
+ ? `- Migrations.json has been generated.`
569
+ : `- There are no migrations to run, so migrations.json has not been created.`,
570
+ ],
571
+ });
572
+ output_1.output.log({
573
+ title: 'Next steps:',
574
+ bodyLines: [
575
+ `- Make sure package.json changes make sense and then run '${pmc.install}',`,
576
+ ...(migrations.length > 0
577
+ ? [`- Run '${pmc.exec} nx migrate --run-migrations'`]
578
+ : []),
579
+ `- To learn more go to https://nx.dev/using-nx/updating-nx`,
580
+ ...(showConnectToCloudMessage()
581
+ ? [
582
+ `- You may run '${pmc.run('nx', 'connect-to-nx-cloud')}' to get faster builds, GitHub integration, and more. Check out https://nx.app`,
583
+ ]
584
+ : []),
585
+ ],
586
+ });
580
587
  }
581
588
  catch (e) {
582
- logger_1.logger.error(`NX The migrate command failed.`);
589
+ output_1.output.error({
590
+ title: `The migrate command failed.`,
591
+ });
583
592
  throw e;
584
593
  }
585
594
  });
@@ -598,7 +607,9 @@ function showConnectToCloudMessage() {
598
607
  }
599
608
  function runInstall() {
600
609
  const pmCommands = (0, package_manager_1.getPackageManagerCommand)();
601
- logger_1.logger.info(`NX Running '${pmCommands.install}' to make sure necessary packages are installed`);
610
+ output_1.output.log({
611
+ title: `Running '${pmCommands.install}' to make sure necessary packages are installed`,
612
+ });
602
613
  (0, child_process_1.execSync)(pmCommands.install, { stdio: [0, 1, 2] });
603
614
  }
604
615
  function executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix) {
@@ -647,7 +658,9 @@ function executeMigrations(root, migrations, isVerbose, shouldCreateCommits, com
647
658
  logger_1.logger.info(`---------------------------------------------------------`);
648
659
  }
649
660
  catch (e) {
650
- logger_1.logger.error(`NX Failed to run ${m.name} from ${m.package}. This workspace is NOT up to date!`);
661
+ output_1.output.error({
662
+ title: `Failed to run ${m.name} from ${m.package}. This workspace is NOT up to date!`,
663
+ });
651
664
  throw e;
652
665
  }
653
666
  }
@@ -664,15 +677,21 @@ function runMigrations(root, opts, isVerbose, shouldCreateCommits = false, commi
664
677
  if (!process.env.NX_MIGRATE_SKIP_INSTALL) {
665
678
  runInstall();
666
679
  }
667
- logger_1.logger.info(`NX Running migrations from '${opts.runMigrations}'` +
668
- (shouldCreateCommits ? ', with each applied in a dedicated commit' : ''));
680
+ output_1.output.log({
681
+ title: `Running migrations from '${opts.runMigrations}'` +
682
+ (shouldCreateCommits ? ', with each applied in a dedicated commit' : ''),
683
+ });
669
684
  const migrations = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, opts.runMigrations)).migrations;
670
685
  const migrationsWithNoChanges = yield executeMigrations(root, migrations, isVerbose, shouldCreateCommits, commitPrefix);
671
686
  if (migrationsWithNoChanges.length < migrations.length) {
672
- logger_1.logger.info(`NX Successfully finished running migrations from '${opts.runMigrations}'. This workspace is up to date!`);
687
+ output_1.output.success({
688
+ title: `Successfully finished running migrations from '${opts.runMigrations}'. This workspace is up to date!`,
689
+ });
673
690
  }
674
691
  else {
675
- logger_1.logger.info(`NX No changes were made from running '${opts.runMigrations}'. This workspace is up to date!`);
692
+ output_1.output.success({
693
+ title: `No changes were made from running '${opts.runMigrations}'. This workspace is up to date!`,
694
+ });
676
695
  }
677
696
  });
678
697
  }
@@ -1 +1 @@
1
- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":";;;;AAAA,+BAA+B;AAC/B,iDAA+C;AAC/C,+BAAqC;AACrC,mCAAmD;AACnD,+BAAiC;AAMjC,6CAAwE;AACxE,kDAK4B;AAC5B,4CAAyC;AACzC,wDAM+B;AAC/B,8DAOkC;AAClC,4CAA+C;AAC/C,+DAAgE;AAMhE,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC;AAElC,SAAgB,gBAAgB,CAAC,OAAe;IAC9C,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,GAAG,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;IAE9D,MAAM,UAAU,GAAG,aAAa;QAC9B,CAAC,CAAC,GAAG,SAAS,IAAI,aAAa,EAAE;QACjC,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC;IACrD,MAAM,oBAAoB,GAAG,GAAG,KAAK,IAAI,CAAC,MAAM,CAAC;IAEjD,MAAM,iBAAiB,GAAG;QACxB,UAAU;QACV,SAAS;QACT,YAAY;QACZ,oBAAoB;KACrB,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE;QACzC,IAAI;YACF,IAAI,IAAA,WAAE,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE;gBAC1B,OAAO,SAAS,CAAC;aAClB;SACF;QAAC,WAAM,GAAE;KACX;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA7BD,4CA6BC;AAED,SAAS,gBAAgB,CAAC,WAAmB;IAC3C,OAAO,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC;AAYD,MAAa,QAAQ;IAMnB,YAAY,IAAqB;QAgDzB,sBAAiB,GAA2B,EAAE,CAAC;QA/CrD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IACpB,CAAC;IAEK,iBAAiB,CAAC,aAAqB,EAAE,aAAqB;;YAClE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE;gBAC/D,OAAO,EAAE,aAAa;gBACtB,gBAAgB,EAAE,KAAK;aACxB,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAC9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;QACrC,CAAC;KAAA;IAEa,kBAAkB,CAC9B,QAAqD;;YAErD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;gBAC9C,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAClD,IAAI,cAAc,KAAK,IAAI;oBAAE,OAAO,EAAE,CAAC;gBAEvC,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC1C,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAE9D,IAAI,CAAC,UAAU;oBAAE,OAAO,EAAE,CAAC;gBAE3B,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;qBAC9B,MAAM,CACL,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAChB,SAAS,CAAC,OAAO;oBACjB,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,CAAC;oBAC1C,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CACvC;qBACA,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iCAChC,SAAS,KACZ,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,aAAa,IACnB,CAAC,CAAC;YACR,CAAC,CAAA,CAAC,CACH,CAAC;YAEF,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC;KAAA;IAIa,kBAAkB,CAC9B,aAAqB,EACrB,MAAmC;;;YAEnC,IAAI,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;YACnC,IAAI,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE;gBAC1B,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;aACxC;YAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;gBACjC,OAAO;oBACL,CAAC,aAAa,CAAC,EAAE;wBACf,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,KAAK;qBACpB;iBACjC,CAAC;aACH;YAED,IAAI,cAA8C,CAAC;YACnD,IAAI;gBACF,cAAc,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;gBAChE,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC;gBACvC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,aAAa,CAAC;aACvD;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,0CAAE,QAAQ,CAAC,qBAAqB,CAAC,EAAE;oBAC/C,MAAM,IAAI,KAAK,CACb,GAAG,CAAC,CAAC,OAAO,+DAA+D,CAC5E,CAAC;iBACH;qBAAM;oBACL,MAAM,CAAC,CAAC;iBACT;aACF;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CACpC,aAAa,EACb,aAAa,EACb,cAAc,CACf,CAAC;YAEF,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;iBAClB,MAAM,CACL,CAAC,WAAW,EAAE,EAAE,CACd,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC;gBACpC,IAAI,CAAC,EAAE,CACL,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAC7B,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CACpC,CACJ;iBACA,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACnB,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAC5D,CACJ,CAAC;YAEF,OAAO,sBAAsB,CAAC,MAAM,CAClC,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE;gBAC9B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;oBACxD,IACE,CAAC,UAAU,CAAC,aAAa,CAAC;wBAC1B,IAAI,CAAC,EAAE,CACL,eAAe,CAAC,aAAa,CAAC,CAAC,OAAO,EACtC,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,CAClC,EACD;wBACA,UAAU,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;qBAC5D;iBACF;gBACD,OAAO,UAAU,CAAC;YACpB,CAAC,EACD;gBACE,CAAC,aAAa,CAAC,EAAE;oBACf,OAAO,EAAE,cAAc,CAAC,OAAO;oBAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,KAAK;iBACnD;aAC6C,CACjD,CAAC;;KACH;IAEO,gBAAgB,CACtB,WAAmB,EACnB,aAAqB,EACrB,SAAyC;QAEzC,sDAAsD;QACtD,gDAAgD;;QAEhD,4CAA4C;QAC5C,oHAAoH;QACpH,IACE,WAAW,KAAK,iBAAiB;YACjC,IAAA,WAAE,EAAC,aAAa,EAAE,eAAe,CAAC,EAClC;YACA,SAAS,CAAC,YAAY,GAAG;gBACvB,iBAAiB,EAAE,aAAa;gBAChC,eAAe,EAAE,aAAa;gBAC9B,eAAe,EAAE,aAAa;gBAC9B,cAAc,EAAE,aAAa;gBAC7B,wBAAwB,EAAE,aAAa;gBACvC,eAAe,EAAE,aAAa;gBAC9B,YAAY,EAAE,aAAa;gBAC3B,cAAc,EAAE,aAAa;gBAC7B,YAAY,EAAE,aAAa;gBAC3B,YAAY,EAAE,aAAa;gBAC3B,YAAY,EAAE,aAAa;gBAC3B,iBAAiB,EAAE,aAAa;gBAChC,aAAa,EAAE,aAAa;gBAC5B,iBAAiB,EAAE,aAAa;gBAChC,WAAW,EAAE,aAAa;gBAC1B,UAAU,EAAE,aAAa;gBACzB,WAAW,EAAE,aAAa;gBAC1B,gBAAgB,EAAE,QAAQ;gBAC1B,oBAAoB,EAAE,aAAa;gBACnC,aAAa,EAAE,aAAa;aAC7B,CAAC;SACH;QAED,IAAI,SAAS,CAAC,YAAY,EAAE;YAC1B,MAAA,SAAS,CAAC,kBAAkB,oCAA5B,SAAS,CAAC,kBAAkB,GAAK,EAAE,EAAC;YAEpC,MAAM,YAAY,GAAG,qBAAqB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAEnE,SAAS,CAAC,kBAAkB,CAAC,aAAa,GAAG,gBAAgB,CAAC,GAAG;gBAC/D,OAAO,EAAE,aAAa;gBACtB,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE;oBACnD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAC7B,OAAO,aAAa,KAAK,QAAQ;wBAC/B,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE;wBACpD,CAAC,CAAC,aAAa,CAAC;oBAEpB,uCACK,GAAG,KACN,CAAC,GAAG,CAAC,EAAE;4BACL,OAAO;4BACP,sBAAsB,EAAE,KAAK;yBACC,IAChC;gBACJ,CAAC,EAAE,EAAE,CAAC;aACP,CAAC;SACH;QAED,IAAI,CAAC,SAAS,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,OAAO,EAAE,CAAC;QAE5E,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;aAC/C,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;YAChC,OAAO,CACL,QAAQ;gBACR,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC5C,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,aAAa,CAAC,CACjC,CAAC;QACJ,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YACpB,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;YAE3D,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;iBAC5B,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,EAAE;gBACvC,OAAO,CACL,CAAC,CAAC,aAAa,CAAC,kBAAkB;oBAChC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;oBAClD,CAAC,aAAa,CAAC,sBAAsB;wBACnC,aAAa,CAAC,gBAAgB;wBAC9B,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,WAAW,CAAC,CAAA;wBAC7B,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,WAAW,CAAC,CAAA,CAAC,CACpC,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CACL,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,EAAE,CAAC,iCAClC,GAAG,KACN,CAAC,WAAW,CAAC,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,gBAAgB,EAAE,aAAa,CAAC,sBAAsB;wBACpD,CAAC,CAAC,cAAc;wBAChB,CAAC,CAAC,aAAa,CAAC,gBAAgB,IAAI,KAAK;iBAC5C,IACD,EACF,EAAiD,CAClD,CAAC;QACN,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,CAAC,GAAK,CAAC,EAAG,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC;IAEO,EAAE,CAAC,EAAU,EAAE,EAAU;QAC/B,OAAO,IAAA,WAAE,EAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACxD,CAAC;IAEO,GAAG,CAAC,EAAU,EAAE,EAAU;QAChC,OAAO,IAAA,YAAG,EAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAnPD,4BAmPC;AAED,SAAS,qBAAqB,CAC5B,YAA0B;IAE1B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QAChC,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3D,OAAO,EAAE,GAAG;YACZ,OAAO;SACR,CAAC,CAAC,CAAC;KACL;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,4BAA4B,CAAC,OAAe;IACnD,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,MAAM;QAAE,OAAO,OAAO,CAAC;IAC/D,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAiB,EAAE,KAAa;IACxD,MAAM,GAAG,GAAG,EAAE,CAAC;IACf,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACjC,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,KAAK,KAAK,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,cAAc,KAAK,oBAAoB,KAAK,oBAAoB,CACjE,CAAC;SACH;QACD,MAAM,eAAe,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QACrD,MAAM,eAAe,GAAG,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,eAAe,IAAI,CAAC,eAAe,EAAE;YACxC,MAAM,IAAI,KAAK,CACb,cAAc,KAAK,oBAAoB,KAAK,oBAAoB,CACjE,CAAC;SACH;QACD,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;YACpC,4BAA4B,CAAC,eAAe,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,4BAA4B,CAAC,IAAY;IAChD,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;KACH;IAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;QAC1B,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,CAAC,EAAE;YACX,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,aAAa,GAAG,QAAQ,CAAC;YAC/B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC;SACzC;aAAM;YACL,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC3C,IAAI,CAAC,aAAa,IAAI,CAAC,YAAY,EAAE;gBACnC,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;aACH;YACD,MAAM,aAAa,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;YACjE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,CAAC;SACzC;KACF;SAAM;QACL,IACE,IAAI,KAAK,QAAQ;YACjB,IAAI,KAAK,MAAM;YACf,IAAA,cAAK,EAAC,IAAI,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,EACvC;YACA,MAAM,aAAa,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,aAAa,GACjB,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAA,WAAE,EAAC,aAAa,EAAE,eAAe,CAAC;gBACtE,CAAC,CAAC,iBAAiB;gBACnB,CAAC,CAAC,IAAI,CAAC;YAEX,OAAO;gBACL,aAAa;gBACb,aAAa;aACd,CAAC;SACH;aAAM;YACL,OAAO;gBACL,aAAa,EAAE,IAAI;gBACnB,aAAa,EAAE,QAAQ;aACxB,CAAC;SACH;KACF;AACH,CAAC;AAYD,SAAgB,sBAAsB,CAAC,OAEtC;IACC,IAAI,OAAO,CAAC,aAAa,KAAK,EAAE,EAAE;QAChC,OAAO,CAAC,aAAa,GAAG,iBAAiB,CAAC;KAC3C;IAED,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI;YACvB,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAc,EAAE,MAAM,CAAC;YAClD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,4BAA4B,CACnE,OAAO,CAAC,mBAAmB,CAAC,CAC7B,CAAC;QACF,OAAO;YACL,IAAI,EAAE,oBAAoB;YAC1B,aAAa,EAAE,gBAAgB,CAAC,aAAa,CAAC;YAC9C,aAAa;YACb,IAAI;YACJ,EAAE;SACH,CAAC;KACH;SAAM;QACL,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,aAAa,EAAE,OAAO,CAAC,aAAuB;SAC/C,CAAC;KACH;AACH,CAAC;AA5BD,wDA4BC;AAED,SAAS,QAAQ,CAAC,IAAY,EAAE,IAA4B;IAC1D,MAAM,KAAK,GAA2B,EAAE,CAAC;IAEzC,SAAS,cAAc,CAAC,WAAmB;QACzC,IAAI;YACF,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE;gBACrB,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;aAC1B;YAED,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBACvB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,oCAAqB,EAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnE,KAAK,CAAC,WAAW,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC;aAC1C;YAED,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC;SAC3B;QAAC,WAAM;YACN,sDAAsD;YACtD,IAAI,WAAW,KAAK,IAAI,EAAE;gBACxB,OAAO,cAAc,CAAC,iBAAiB,CAAC,CAAC;aAC1C;YACD,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,sBAAsB;AACtB,SAAS,aAAa;IACpB,MAAM,eAAe,GAGjB,EAAE,CAAC;IACP,MAAM,oBAAoB,GAAoC,EAAE,CAAC;IAEjE,SAAS,eAAe,CACtB,WAAW,EACX,cAAc,EACd,QAA+D;QAE/D,MAAM,QAAQ,GAAG,WAAW,GAAG,GAAG,GAAG,cAAc,CAAC;QACpD,OAAO,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;aACnD,IAAI,CAAC,CAAC,qBAAqB,EAAE,EAAE;YAC9B,IAAI,qBAAqB,EAAE;gBACzB,OAAO,qBAAqB,CAAC;aAC9B;YAED,oBAAoB,CAAC,QAAQ,CAAC,GAAG,IAAA,oDAAkC,EACjE,WAAW,EACX,cAAc,CACf,CAAC;YACF,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE;YACxB,IACE,eAAe,KAAK,cAAc;gBAClC,eAAe,CAAC,GAAG,WAAW,IAAI,eAAe,EAAE,CAAC,EACpD;gBACA,OAAO,eAAe,CAAC,GAAG,WAAW,IAAI,eAAe,EAAE,CAAC,CAAC;aAC7D;YACD,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YACvC,OAAO,iCAAiC,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QACzE,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE;YACV,eAAM,CAAC,IAAI,CAAC,YAAY,WAAW,IAAI,cAAc,EAAE,CAAC,CAAC;YAEzD,OAAO,gCAAgC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,SAAS,gBAAgB,CAC9B,WAAmB,EACnB,cAAsB;QAEtB,IAAI,eAAe,CAAC,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC,EAAE;YACvD,OAAO,eAAe,CAAC,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC,CAAC;SAC5D;QAED,IAAI,eAAe,GAAW,cAAc,CAAC;QAC7C,IAAI,UAAmD,CAAC;QACxD,SAAS,QAAQ,CAAC,WAAmB,EAAE,cAAsB;YAC3D,eAAe,CAAC,WAAW,GAAG,GAAG,GAAG,cAAc,CAAC,GAAG,UAAU,CAAC;QACnE,CAAC;QACD,UAAU,GAAG,eAAe,CAAC,WAAW,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC,IAAI,CACtE,CAAC,MAAM,EAAE,EAAE;YACT,IAAI,MAAM,CAAC,UAAU,EAAE;gBACrB,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;gBACtC,OAAO,MAAM,CAAC,UAAU,CAAC;aAC1B;YACD,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;YACjC,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,QAAQ,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAEtC,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AACD,oBAAoB;AAEpB,SAAe,iCAAiC,CAC9C,WAAmB,EACnB,cAAsB;;QAEtB,kEAAkE;QAClE,oBAAoB;QACpB,MAAM,gBAAgB,GAAG,MAAM,sCAAsC,CACnE,WAAW,EACX,cAAc,CACf,CAAC;QAEF,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO;gBACL,OAAO,EAAE,cAAc;aACxB,CAAC;SACH;QAED,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE;YAChC,OAAO;gBACL,OAAO,EAAE,cAAc;gBACvB,YAAY,EAAE,gBAAgB,CAAC,YAAY;aAC5C,CAAC;SACH;QAED,eAAM,CAAC,IAAI,CAAC,YAAY,WAAW,IAAI,cAAc,EAAE,CAAC,CAAC;QAEzD,0DAA0D;QAC1D,OAAO,MAAM,qCAAqC,CAChD,WAAW,EACX,cAAc,EACd,gBAAgB,CACjB,CAAC;IACJ,CAAC;CAAA;AAED,SAAe,sCAAsC,CACnD,WAAmB,EACnB,cAAsB;;QAEtB,MAAM,MAAM,GAAG,MAAM,IAAA,qCAAmB,EACtC,WAAW,EACX,cAAc,EACd,gCAAgC,CACjC,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAA,kCAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACjD,CAAC;CAAA;AAED,SAAe,qCAAqC,CAClD,WAAmB,EACnB,cAAsB,EACtB,EAAE,UAAU,EAAE,kBAAkB,EAAE,YAAY,EAA6B;;QAE3E,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAA,wCAAsB,GAAE,CAAC;QAElD,IAAI,MAAsC,CAAC;QAE3C,IAAI;YACF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,qCAAmB,EAC/C,GAAG,EACH,WAAW,EACX,cAAc,CACf,CAAC;YAEF,MAAM,UAAU,GAAG,MAAM,IAAA,kCAAsB,EAC7C,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,EACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,CAAC,EACnC,IAAA,WAAI,EAAC,GAAG,EAAE,kBAAkB,CAAC,CAC9B,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,wBAAY,EAAiB,IAAI,CAAC,CAAC,CAAC;YAErD,MAAM,mCAAQ,UAAU,KAAE,YAAY,EAAE,OAAO,EAAE,cAAc,GAAE,CAAC;SACnE;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CACb,mCAAmC,kBAAkB,iBAAiB,WAAW,IAAI,cAAc,IAAI,CACxG,CAAC;SACH;gBAAS;YACR,MAAM,OAAO,EAAE,CAAC;SACjB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AAED,SAAe,gCAAgC,CAC7C,WAAmB,EACnB,cAAsB;;QAEtB,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAA,wCAAsB,GAAE,CAAC;QAElD,IAAI,MAAsC,CAAC;QAE3C,IAAI;YACF,MAAM,GAAG,GAAG,IAAA,0CAAwB,EAAC,IAAA,sCAAoB,EAAC,GAAG,CAAC,CAAC,CAAC;YAEhE,MAAM,SAAS,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,WAAW,IAAI,cAAc,EAAE,EAAE;gBAC7D,GAAG,EAAE,GAAG;aACT,CAAC,CAAC;YAEH,MAAM,EACJ,UAAU,EAAE,kBAAkB,EAC9B,YAAY,EACZ,WAAW,GACZ,GAAG,0BAA0B,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAEjD,IAAI,UAAU,GAAmB,SAAS,CAAC;YAC3C,IAAI,kBAAkB,EAAE;gBACtB,UAAU,GAAG,IAAA,wBAAY,EAAiB,kBAAkB,CAAC,CAAC;aAC/D;YAED,MAAM,mCAAQ,UAAU,KAAE,YAAY,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,GAAE,CAAC;SACxE;gBAAS;YACR,MAAM,OAAO,EAAE,CAAC;SACjB;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AAMD,SAAS,0BAA0B,CACjC,WAAmB,EACnB,GAAW;IAEX,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAA,oCAAqB,EACxE,WAAW,EACX,CAAC,GAAG,CAAC,CACN,CAAC;IAEF,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;IAEzE,IAAI,CAAC,qBAAqB,EAAE;QAC1B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;KAClE;IAED,MAAM,gBAAgB,GACpB,OAAO,qBAAqB,KAAK,QAAQ;QACvC,CAAC,CAAC;YACE,UAAU,EAAE,qBAAqB;YACjC,YAAY,EAAE,EAAE;SACjB;QACH,CAAC,CAAC,qBAAqB,CAAC;IAE5B,IAAI;QACF,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,EAAE;YACjE,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;SAClC,CAAC,CAAC;QAEH,OAAO;YACL,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,aAAa;YACzB,YAAY,EAAE,gBAAgB,CAAC,YAAY;SAC5C,CAAC;KACH;IAAC,WAAM;QACN,OAAO;YACL,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,gBAAgB,CAAC,YAAY;SAC5C,CAAC;KACH;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,IAAY,EACZ,UAGG;IAEH,IAAA,yBAAa,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAY,EACZ,eAA4D;IAE5D,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,YAAY,GAAoB,EAAE,CAAC;IACzC,MAAM,IAAI,GAAG,IAAA,wBAAY,EAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAEzD,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;QACzC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,CAAC,CAAC,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACrD,OAAO;SACR;QAED,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,CAAC,CAAC,EAAE;YAC1B,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAClD,OAAO;SACR;QAED,MAAM,cAAc,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAC3D,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtC,MAAA,IAAI,CAAC,cAAc,qCAAnB,IAAI,CAAC,cAAc,IAAM,EAAE,EAAC;YAC5B,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;SACtD;IACH,CAAC,CAAC,CAAC;IAEH,IAAA,yBAAa,EAAC,eAAe,EAAE,IAAI,EAAE;QACnC,aAAa,EAAE,YAAY,CAAC,eAAe;KAC5C,CAAC,CAAC;AACL,CAAC;AAED,SAAe,qBAAqB,CAAC,IAAY,EAAE,EAAU;;QAC3D,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9B,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAA,cAAK,EAAC,IAAI,CAAC,EAAE;YAChB,IAAI,GAAG,MAAM,IAAA,oDAAkC,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,IAAA,cAAK,EAAC,EAAE,CAAC,EAAE;YACd,EAAE,GAAG,MAAM,IAAA,oDAAkC,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SACzD;QACD,OAAO,IAAA,cAAK,EAAC,IAAI,CAAC,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC;IACjC,CAAC;CAAA;AAED,SAAS,aAAa,CAAC,WAAwB;;IAC7C,OAAO,CACL,MAAA,MAAA,MAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,0CAAG,IAAI,CAAC,mCACpC,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,0CAAG,IAAI,CAAC,mCACjC,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,0CAAG,iBAAiB,CAAC,mCACjD,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,0CAAG,iBAAiB,CAAC,CAC/C,CAAC;AACJ,CAAC;AAED,SAAe,0CAA0C,CACvD,IAAY,EACZ,IAKC;;QAED,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAI;YACF,IAAI,mBAAmB,GAAG,IAAA,wBAAY,EACpC,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAC3B,CAAC;YAEF,IAAI;gBACF,IACE,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;oBACtD,CAAC,MAAM,qBAAqB,CAC1B,aAAa,CAAC,mBAAmB,CAAC,EAClC,IAAI,CAAC,aAAa,CACnB,CAAC,EACF;oBACA,MAAM,IAAA,6CAAuB,EAC3B,6MAA6M,CAC9M,CAAC;oBACF,mBAAmB,GAAG,IAAA,wBAAY,EAChC,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAC3B,CAAC;iBACH;aACF;YAAC,WAAM;gBACN,mGAAmG;gBACnG,iFAAiF;aAClF;YAED,eAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YAClD,eAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAE1C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC;gBAC5B,WAAW,EAAE,mBAAmB;gBAChC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC;gBACnC,KAAK,EAAE,aAAa,EAAE;gBACtB,EAAE,EAAE,IAAI,CAAC,EAAE;aACZ,CAAC,CAAC;YAEH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAClE,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,aAAa,CACnB,CAAC;YAEF,iBAAiB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAErC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;aACxC;YAED,eAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;YAC5D,eAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAC/C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;aACrD;iBAAM;gBACL,eAAM,CAAC,IAAI,CACT,4EAA4E,CAC7E,CAAC;aACH;YACD,eAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9B,eAAM,CAAC,IAAI,CACT,6DAA6D,GAAG,CAAC,OAAO,GAAG,CAC5E,CAAC;YACF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,eAAM,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,IAAI,+BAA+B,CAAC,CAAC;aAChE;YACD,eAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;YAEzE,IAAI,yBAAyB,EAAE,EAAE;gBAC/B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;gBACjD,eAAM,CAAC,IAAI,CACT,kBAAkB,GAAG,gFAAgF,CACtG,CAAC;aACH;SACF;QAAC,OAAO,CAAC,EAAE;YACV,eAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YAC/C,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CAAA;AAED,SAAS,yBAAyB;IAChC,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAsB,SAAS,CAAC,CAAC;QAC5D,MAAM,mBAAmB,GACvB,CAAC,MAAM,CAAC,kBAAkB;YAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC3C,CAAC,CAAM,EAAE,EAAE,CACT,CAAC,CAAC,MAAM,IAAI,uCAAuC;gBACnD,CAAC,CAAC,MAAM,IAAI,0BAA0B,CACzC,CAAC;QACJ,OAAO,CAAC,CAAC,mBAAmB,CAAC;KAC9B;IAAC,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,UAAU;IACjB,MAAM,UAAU,GAAG,IAAA,0CAAwB,GAAE,CAAC;IAC9C,eAAM,CAAC,IAAI,CACT,eAAe,UAAU,CAAC,OAAO,iDAAiD,CACnF,CAAC;IACF,IAAA,wBAAQ,EAAC,UAAU,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,SAAsB,iBAAiB,CACrC,IAAY,EACZ,UAMG,EACH,SAAkB,EAClB,mBAA4B,EAC5B,YAAoB;;QAEpB,MAAM,oBAAoB,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QAEjE,MAAM,uBAAuB,GAAsB,EAAE,CAAC;QACtD,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE;YAC1B,IAAI;gBACF,IAAI,CAAC,CAAC,GAAG,KAAK,IAAI,EAAE;oBAClB,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;oBAE9D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;wBACtB,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAChC,gEAAgE;wBAChE,SAAS;qBACV;oBAED,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC/C,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC;oBACpC,IAAA,mBAAY,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;iBAC7B;qBAAM;oBACL,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAC1C,2CAAa,0BAA0B,EAAC,CACzC,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBAEnD,IAAI,CAAC,WAAW,EAAE;wBAChB,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAChC,gEAAgE;wBAChE,SAAS;qBACV;oBAED,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC/C,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC;oBACpC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC;iBACxD;gBAED,IAAI,mBAAmB,EAAE;oBACvB,MAAM,aAAa,GAAG,GAAG,YAAY,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBACjD,IAAI;wBACF,MAAM,YAAY,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;wBAElD,IAAI,YAAY,EAAE;4BAChB,eAAM,CAAC,IAAI,CACT,KAAK,CAAC,GAAG,CAAC,iCAAiC,YAAY,EAAE,CAAC,CAC3D,CAAC;yBACH;6BAAM;4BACL,eAAM,CAAC,IAAI,CACT,KAAK,CAAC,GAAG,CACP,iEAAiE,CAClE,CACF,CAAC;yBACH;qBACF;oBAAC,OAAO,CAAC,EAAE;wBACV,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;qBAC1C;iBACF;gBACD,eAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;aAC1E;YAAC,OAAO,CAAC,EAAE;gBACV,eAAM,CAAC,KAAK,CACV,oBAAoB,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,OAAO,qCAAqC,CAClF,CAAC;gBACF,MAAM,CAAC,CAAC;aACT;SACF;QAED,MAAM,mBAAmB,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QAChE,IAAI,oBAAoB,KAAK,mBAAmB,EAAE;YAChD,UAAU,EAAE,CAAC;SACd;QACD,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AAhFD,8CAgFC;AAED,SAAe,aAAa,CAC1B,IAAY,EACZ,IAA+B,EAC/B,SAAkB,EAClB,mBAAmB,GAAG,KAAK,EAC3B,YAAoB;;QAEpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;YACxC,UAAU,EAAE,CAAC;SACd;QAED,eAAM,CAAC,IAAI,CACT,+BAA+B,IAAI,CAAC,aAAa,GAAG;YAClD,CAAC,mBAAmB,CAAC,CAAC,CAAC,2CAA2C,CAAC,CAAC,CAAC,EAAE,CAAC,CAC3E,CAAC;QAEF,MAAM,UAAU,GAKV,IAAA,wBAAY,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC;QAE9D,MAAM,uBAAuB,GAAG,MAAM,iBAAiB,CACrD,IAAI,EACJ,UAAU,EACV,SAAS,EACT,mBAAmB,EACnB,YAAY,CACb,CAAC;QAEF,IAAI,uBAAuB,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE;YACtD,eAAM,CAAC,IAAI,CACT,qDAAqD,IAAI,CAAC,aAAa,kCAAkC,CAC1G,CAAC;SACH;aAAM;YACL,eAAM,CAAC,IAAI,CACT,yCAAyC,IAAI,CAAC,aAAa,kCAAkC,CAC9F,CAAC;SACH;IACH,CAAC;CAAA;AAED,SAAS,6BAA6B,CAAC,IAAY;IACjD,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,wBAAY,EACpD,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAC3B,CAAC;IAEF,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,aAAa,CAAC,aAAqB;IAC1C,IAAI;QACF,IAAA,wBAAQ,EAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5D,IAAA,wBAAQ,EAAC,6BAA6B,EAAE;YACtC,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,aAAa;SACrB,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,8BAA8B,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;KAC7D;IAED,OAAO,kBAAkB,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,kBAAkB;IACzB,IAAI;QACF,OAAO,IAAA,wBAAQ,EAAC,oBAAoB,EAAE;YACpC,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC,IAAI,EAAE,CAAC;KACX;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAED,SAAe,cAAc,CAAC,IAAY,EAAE,WAAmB,EAAE,IAAY;;QAC3E,MAAM,cAAc,GAAG,0BAA0B,CAC/C,WAAW,EACX,IAAI,CACL,CAAC,UAAU,CAAC;QAEb,MAAM,UAAU,GAAG,IAAA,wBAAY,EAAiB,cAAc,CAAC,CAAC;QAChE,MAAM,CAAC,GAAG,UAAU,CAAC,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC;QACzD,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YACZ,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC;YACnE,MAAM,IAAI,KAAK,CACb,gDAAgD,cAAc,IAAI,IAAI,sBAAsB,MAAM,EAAE,CACrG,CAAC;SACH;QACD,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAEnE,IAAI,QAAgB,CAAC;QAErB,IAAI;YACF,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE;gBAC3C,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,cAAc,CAAC,CAAC;aACjC,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,kCAAkC;YAClC,QAAQ,GAAG,OAAO,CAAC,OAAO,CACxB,GAAG,IAAA,cAAO,EAAC,cAAc,CAAC,IAAI,gBAAgB,EAAE,CACjD,CAAC;SACH;QAED,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,aAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACrC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACnC,IAAA,mBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC5B,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA;AAED,SAAsB,OAAO,CAAC,IAAY,EAAE,IAA0B;;QACpE,OAAO,IAAA,qBAAY,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAS,EAAE;YAC9C,MAAM,IAAI,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,IAAI,CAAC,IAAI,KAAK,oBAAoB,EAAE;gBACtC,MAAM,0CAA0C,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC9D;iBAAM;gBACL,MAAM,aAAa,CACjB,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,SAAS,CAAC,EACf,IAAI,CAAC,eAAe,CAAC,EACrB,IAAI,CAAC,cAAc,CAAC,CACrB,CAAC;aACH;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AAfD,0BAeC"}
1
+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  export declare function repair(args: {
2
2
  verbose: boolean;
3
- }): Promise<any>;
3
+ }, extraMigrations?: any[]): Promise<any>;
@@ -2,14 +2,14 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.repair = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const logger_1 = require("../utils/logger");
6
5
  const params_1 = require("../utils/params");
7
6
  const migrationsJson = require("../../migrations.json");
8
7
  const migrate_1 = require("./migrate");
9
- function repair(args) {
8
+ const output_1 = require("../utils/output");
9
+ function repair(args, extraMigrations = []) {
10
10
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
11
  return (0, params_1.handleErrors)(args['verbose'], () => tslib_1.__awaiter(this, void 0, void 0, function* () {
12
- const migrations = Object.entries(migrationsJson.generators).map(([name, migration]) => {
12
+ const nxMigrations = Object.entries(migrationsJson.generators).map(([name, migration]) => {
13
13
  return {
14
14
  package: 'nx',
15
15
  cli: 'nx',
@@ -18,12 +18,17 @@ function repair(args) {
18
18
  version: migration.version,
19
19
  };
20
20
  });
21
+ const migrations = [...nxMigrations, ...extraMigrations];
21
22
  const migrationsThatMadeNoChanges = yield (0, migrate_1.executeMigrations)(process.cwd(), migrations, args['verbose'], false, '');
22
23
  if (migrationsThatMadeNoChanges.length < migrations.length) {
23
- logger_1.logger.info(`NX Successfully repaired your configuration. This workspace is up to date!`);
24
+ output_1.output.success({
25
+ title: `Successfully repaired your configuration. This workspace is up to date!`,
26
+ });
24
27
  }
25
28
  else {
26
- logger_1.logger.info(`NX No changes were necessary. This workspace is up to date!`);
29
+ output_1.output.success({
30
+ title: `No changes were necessary. This workspace is up to date!`,
31
+ });
27
32
  }
28
33
  }));
29
34
  });
@@ -1 +1 @@
1
- {"version":3,"file":"repair.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/repair.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,4CAA+C;AAC/C,wDAAwD;AACxD,uCAA8C;AAE9C,SAAsB,MAAM,CAAC,IAA0B;;QACrD,OAAO,IAAA,qBAAY,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAS,EAAE;YAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,GAAG,CAC9D,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE;gBACpB,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,GAAG,EAAE,IAAI;oBACT,IAAI;oBACJ,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,OAAO,EAAE,SAAS,CAAC,OAAO;iBAClB,CAAC;YACb,CAAC,CACF,CAAC;YACF,MAAM,2BAA2B,GAAG,MAAM,IAAA,2BAAiB,EACzD,OAAO,CAAC,GAAG,EAAE,EACb,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,EACf,KAAK,EACL,EAAE,CACH,CAAC;YAEF,IAAI,2BAA2B,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE;gBAC1D,eAAM,CAAC,IAAI,CACT,4EAA4E,CAC7E,CAAC;aACH;iBAAM;gBACL,eAAM,CAAC,IAAI,CACT,6DAA6D,CAC9D,CAAC;aACH;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AA/BD,wBA+BC"}
1
+ {"version":3,"file":"repair.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/repair.ts"],"names":[],"mappings":";;;;AAAA,4CAA+C;AAC/C,wDAAwD;AACxD,uCAA8C;AAC9C,4CAAyC;AAEzC,SAAsB,MAAM,CAC1B,IAA0B,EAC1B,kBAAkB,EAAW;;QAE7B,OAAO,IAAA,qBAAY,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAS,EAAE;YAC9C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,GAAG,CAChE,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE;gBACpB,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,GAAG,EAAE,IAAI;oBACT,IAAI;oBACJ,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,OAAO,EAAE,SAAS,CAAC,OAAO;iBAClB,CAAC;YACb,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,CAAC,GAAG,YAAY,EAAE,GAAG,eAAe,CAAC,CAAC;YACzD,MAAM,2BAA2B,GAAG,MAAM,IAAA,2BAAiB,EACzD,OAAO,CAAC,GAAG,EAAE,EACb,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,EACf,KAAK,EACL,EAAE,CACH,CAAC;YAEF,IAAI,2BAA2B,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,EAAE;gBAC1D,eAAM,CAAC,OAAO,CAAC;oBACb,KAAK,EAAE,yEAAyE;iBACjF,CAAC,CAAC;aACJ;iBAAM;gBACL,eAAM,CAAC,OAAO,CAAC;oBACb,KAAK,EAAE,0DAA0D;iBAClE,CAAC,CAAC;aACJ;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AApCD,wBAoCC"}
@@ -9,7 +9,7 @@ export declare const patternsWeIgnoreInCommunityReport: Array<string | RegExp>;
9
9
  * Must be run within an Nx workspace
10
10
  *
11
11
  */
12
- export declare function reportHandler(): void;
12
+ export declare function reportHandler(): Promise<void>;
13
13
  export declare function readPackageJson(p: string): PackageJson | null;
14
14
  export declare function readPackageVersion(p: string): string;
15
15
  export declare function findInstalledCommunityPlugins(): {