@storm-software/workspace-tools 1.39.0 → 1.40.0

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 (15) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/README.md +2 -1
  3. package/index.js +132 -194
  4. package/meta.json +1 -1
  5. package/package.json +1 -1
  6. package/src/base/index.js +38 -72
  7. package/src/executors/tsup/executor.js +93 -138
  8. package/src/executors/tsup-browser/executor.js +98 -149
  9. package/src/executors/tsup-neutral/executor.js +95 -139
  10. package/src/executors/tsup-node/executor.js +94 -138
  11. package/src/generators/browser-library/generator.js +35 -49
  12. package/src/generators/config-schema/generator.js +17 -31
  13. package/src/generators/neutral-library/generator.js +35 -49
  14. package/src/generators/node-library/generator.js +35 -49
  15. package/src/generators/preset/generator.js +36 -55
package/src/generators/browser-library/generator.js CHANGED
@@ -41666,9 +41666,9 @@ var require_generator = __commonJS({
41666
41666
  }
41667
41667
  });
41668
41668
 
41669
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js
41669
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js
41670
41670
  var require_flat_config = __commonJS({
41671
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js"(exports) {
41671
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js"(exports) {
41672
41672
  "use strict";
41673
41673
  Object.defineProperty(exports, "__esModule", { value: true });
41674
41674
  exports.useFlatConfig = void 0;
@@ -41679,9 +41679,9 @@ var require_flat_config = __commonJS({
41679
41679
  }
41680
41680
  });
41681
41681
 
41682
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js
41682
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js
41683
41683
  var require_ast_utils2 = __commonJS({
41684
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js"(exports) {
41684
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js"(exports) {
41685
41685
  "use strict";
41686
41686
  Object.defineProperty(exports, "__esModule", { value: true });
41687
41687
  exports.generateAst = exports.mapFilePath = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
@@ -42153,9 +42153,9 @@ const compat = new FlatCompat({
42153
42153
  }
42154
42154
  });
42155
42155
 
42156
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js
42156
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js
42157
42157
  var require_eslint_file = __commonJS({
42158
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js"(exports) {
42158
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js"(exports) {
42159
42159
  "use strict";
42160
42160
  Object.defineProperty(exports, "__esModule", { value: true });
42161
42161
  exports.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToLintConfig = exports.addExtendsToLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.updateOverrideInLintConfig = exports.addOverrideToLintConfig = exports.updateRelativePathsInConfig = exports.isEslintConfigSupported = exports.findEslintFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.eslintConfigFileWhitelist = void 0;
@@ -42414,9 +42414,9 @@ var require_eslint_file = __commonJS({
42414
42414
  }
42415
42415
  });
42416
42416
 
42417
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json
42417
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json
42418
42418
  var require_package4 = __commonJS({
42419
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json"(exports, module2) {
42419
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json"(exports, module2) {
42420
42420
  module2.exports = {
42421
42421
  name: "@nx/eslint",
42422
42422
  version: "17.0.3",
@@ -42471,9 +42471,9 @@ var require_package4 = __commonJS({
42471
42471
  }
42472
42472
  });
42473
42473
 
42474
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js
42474
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js
42475
42475
  var require_versions4 = __commonJS({
42476
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js"(exports) {
42476
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js"(exports) {
42477
42477
  "use strict";
42478
42478
  Object.defineProperty(exports, "__esModule", { value: true });
42479
42479
  exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
@@ -42485,9 +42485,9 @@ var require_versions4 = __commonJS({
42485
42485
  }
42486
42486
  });
42487
42487
 
42488
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js
42488
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js
42489
42489
  var require_global_eslint_config = __commonJS({
42490
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js"(exports) {
42490
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js"(exports) {
42491
42491
  "use strict";
42492
42492
  Object.defineProperty(exports, "__esModule", { value: true });
42493
42493
  exports.getGlobalFlatEslintConfiguration = exports.getGlobalEsLintConfiguration = exports.javaScriptOverride = exports.typeScriptOverride = void 0;
@@ -42573,9 +42573,9 @@ var require_global_eslint_config = __commonJS({
42573
42573
  }
42574
42574
  });
42575
42575
 
42576
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js
42576
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js
42577
42577
  var require_init2 = __commonJS({
42578
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js"(exports) {
42578
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js"(exports) {
42579
42579
  "use strict";
42580
42580
  Object.defineProperty(exports, "__esModule", { value: true });
42581
42581
  exports.lintInitGenerator = void 0;
@@ -42639,9 +42639,9 @@ var require_init2 = __commonJS({
42639
42639
  }
42640
42640
  });
42641
42641
 
42642
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js
42642
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js
42643
42643
  var require_init_migration = __commonJS({
42644
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js"(exports) {
42644
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js"(exports) {
42645
42645
  "use strict";
42646
42646
  Object.defineProperty(exports, "__esModule", { value: true });
42647
42647
  exports.findLintTarget = exports.migrateConfigToMonorepoStyle = void 0;
@@ -42730,9 +42730,9 @@ var require_init_migration = __commonJS({
42730
42730
  }
42731
42731
  });
42732
42732
 
42733
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js
42733
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js
42734
42734
  var require_lint_project = __commonJS({
42735
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js"(exports) {
42735
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js"(exports) {
42736
42736
  "use strict";
42737
42737
  Object.defineProperty(exports, "__esModule", { value: true });
42738
42738
  exports.lintProjectGenerator = exports.mapLintPattern = void 0;
@@ -47588,14 +47588,13 @@ var applyWorkspaceTokens = (options, config, tokenizerFn) => {
47588
47588
  // packages/workspace-tools/src/base/base-generator.ts
47589
47589
  var withRunGenerator = (name, generatorFn, generatorOptions = {
47590
47590
  skipReadingConfig: false
47591
- }) => async (tree, options) => {
47591
+ }) => async (tree, _options) => {
47592
47592
  const startTime = Date.now();
47593
+ let options = _options;
47593
47594
  try {
47594
- console.info(
47595
- chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
47595
+ console.info(chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
47596
47596
 
47597
- `)
47598
- );
47597
+ `));
47599
47598
  let config;
47600
47599
  if (!generatorOptions.skipReadingConfig) {
47601
47600
  config = getDefaultConfig({
@@ -47611,58 +47610,45 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
47611
47610
  );
47612
47611
  }
47613
47612
  if (generatorOptions?.hooks?.applyDefaultOptions) {
47614
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the applyDefaultOptions hook...`));
47613
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the applyDefaultOptions hook..."));
47615
47614
  options = await Promise.resolve(
47616
47615
  generatorOptions.hooks.applyDefaultOptions(options, config)
47617
47616
  );
47618
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the applyDefaultOptions hook...`));
47617
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the applyDefaultOptions hook..."));
47619
47618
  }
47620
- getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(
47621
- chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F Generator schema options: \n"),
47622
- options
47623
- );
47619
+ getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F Generator schema options: \n"), options);
47624
47620
  const tokenized = applyWorkspaceTokens(
47625
47621
  options,
47626
47622
  { workspaceRoot: tree.root, config },
47627
47623
  applyWorkspaceGeneratorTokens
47628
47624
  );
47629
47625
  if (generatorOptions?.hooks?.preProcess) {
47630
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the preProcess hook...`));
47631
- await Promise.resolve(
47632
- generatorOptions.hooks.preProcess(options, config)
47633
- );
47634
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the preProcess hook...`));
47626
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the preProcess hook..."));
47627
+ await Promise.resolve(generatorOptions.hooks.preProcess(options, config));
47628
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the preProcess hook..."));
47635
47629
  }
47636
- const result = await Promise.resolve(
47637
- generatorFn(tree, tokenized, config)
47638
- );
47630
+ const result = await Promise.resolve(generatorFn(tree, tokenized, config));
47639
47631
  if (result && (!result.success || result.error && result?.error?.message && typeof result?.error?.message === "string" && result?.error?.name && typeof result?.error?.name === "string")) {
47640
47632
  throw new Error(`The ${name} generator failed to run`, {
47641
- cause: result.error
47633
+ cause: result?.error
47642
47634
  });
47643
47635
  }
47644
47636
  if (generatorOptions?.hooks?.postProcess) {
47645
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the postProcess hook...`));
47637
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the postProcess hook..."));
47646
47638
  await Promise.resolve(generatorOptions.hooks.postProcess(config));
47647
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the postProcess hook...`));
47639
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the postProcess hook..."));
47648
47640
  }
47649
47641
  console.info(
47650
- chalk.bold.hex("#087f5b")(
47651
- `
47642
+ chalk.bold.hex("#087f5b")(`
47652
47643
 
47653
- \u{1F389} Successfully completed running the ${name} generator!`
47654
- )
47644
+ \u{1F389} Successfully completed running the ${name} generator!`)
47655
47645
  );
47656
47646
  return {
47657
47647
  success: true
47658
47648
  };
47659
47649
  } catch (error) {
47660
47650
  console.error(
47661
- chalk.bold.hex("#7d1a1a")(
47662
- `\u274C An error occurred while running the generator
47663
-
47664
- `
47665
- ),
47651
+ chalk.bold.hex("#7d1a1a")("\u274C An error occurred while running the generator\n\n"),
47666
47652
  error
47667
47653
  );
47668
47654
  console.error(error);
package/src/generators/config-schema/generator.js CHANGED
@@ -31361,14 +31361,13 @@ var applyWorkspaceTokens = (options, config, tokenizerFn) => {
31361
31361
  // packages/workspace-tools/src/base/base-generator.ts
31362
31362
  var withRunGenerator = (name, generatorFn, generatorOptions = {
31363
31363
  skipReadingConfig: false
31364
- }) => async (tree, options) => {
31364
+ }) => async (tree, _options) => {
31365
31365
  const startTime = Date.now();
31366
+ let options = _options;
31366
31367
  try {
31367
- console.info(
31368
- chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
31368
+ console.info(chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
31369
31369
 
31370
- `)
31371
- );
31370
+ `));
31372
31371
  let config;
31373
31372
  if (!generatorOptions.skipReadingConfig) {
31374
31373
  config = getDefaultConfig({
@@ -31384,58 +31383,45 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
31384
31383
  );
31385
31384
  }
31386
31385
  if (generatorOptions?.hooks?.applyDefaultOptions) {
31387
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the applyDefaultOptions hook...`));
31386
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the applyDefaultOptions hook..."));
31388
31387
  options = await Promise.resolve(
31389
31388
  generatorOptions.hooks.applyDefaultOptions(options, config)
31390
31389
  );
31391
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the applyDefaultOptions hook...`));
31390
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the applyDefaultOptions hook..."));
31392
31391
  }
31393
- getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(
31394
- chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F Generator schema options: \n"),
31395
- options
31396
- );
31392
+ getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F Generator schema options: \n"), options);
31397
31393
  const tokenized = applyWorkspaceTokens(
31398
31394
  options,
31399
31395
  { workspaceRoot: tree.root, config },
31400
31396
  applyWorkspaceGeneratorTokens
31401
31397
  );
31402
31398
  if (generatorOptions?.hooks?.preProcess) {
31403
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the preProcess hook...`));
31404
- await Promise.resolve(
31405
- generatorOptions.hooks.preProcess(options, config)
31406
- );
31407
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the preProcess hook...`));
31399
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the preProcess hook..."));
31400
+ await Promise.resolve(generatorOptions.hooks.preProcess(options, config));
31401
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the preProcess hook..."));
31408
31402
  }
31409
- const result = await Promise.resolve(
31410
- generatorFn(tree, tokenized, config)
31411
- );
31403
+ const result = await Promise.resolve(generatorFn(tree, tokenized, config));
31412
31404
  if (result && (!result.success || result.error && result?.error?.message && typeof result?.error?.message === "string" && result?.error?.name && typeof result?.error?.name === "string")) {
31413
31405
  throw new Error(`The ${name} generator failed to run`, {
31414
- cause: result.error
31406
+ cause: result?.error
31415
31407
  });
31416
31408
  }
31417
31409
  if (generatorOptions?.hooks?.postProcess) {
31418
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the postProcess hook...`));
31410
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the postProcess hook..."));
31419
31411
  await Promise.resolve(generatorOptions.hooks.postProcess(config));
31420
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the postProcess hook...`));
31412
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the postProcess hook..."));
31421
31413
  }
31422
31414
  console.info(
31423
- chalk.bold.hex("#087f5b")(
31424
- `
31415
+ chalk.bold.hex("#087f5b")(`
31425
31416
 
31426
- \u{1F389} Successfully completed running the ${name} generator!`
31427
- )
31417
+ \u{1F389} Successfully completed running the ${name} generator!`)
31428
31418
  );
31429
31419
  return {
31430
31420
  success: true
31431
31421
  };
31432
31422
  } catch (error) {
31433
31423
  console.error(
31434
- chalk.bold.hex("#7d1a1a")(
31435
- `\u274C An error occurred while running the generator
31436
-
31437
- `
31438
- ),
31424
+ chalk.bold.hex("#7d1a1a")("\u274C An error occurred while running the generator\n\n"),
31439
31425
  error
31440
31426
  );
31441
31427
  console.error(error);
package/src/generators/neutral-library/generator.js CHANGED
@@ -41666,9 +41666,9 @@ var require_generator = __commonJS({
41666
41666
  }
41667
41667
  });
41668
41668
 
41669
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js
41669
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js
41670
41670
  var require_flat_config = __commonJS({
41671
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js"(exports) {
41671
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/flat-config.js"(exports) {
41672
41672
  "use strict";
41673
41673
  Object.defineProperty(exports, "__esModule", { value: true });
41674
41674
  exports.useFlatConfig = void 0;
@@ -41679,9 +41679,9 @@ var require_flat_config = __commonJS({
41679
41679
  }
41680
41680
  });
41681
41681
 
41682
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js
41682
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js
41683
41683
  var require_ast_utils2 = __commonJS({
41684
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js"(exports) {
41684
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/flat-config/ast-utils.js"(exports) {
41685
41685
  "use strict";
41686
41686
  Object.defineProperty(exports, "__esModule", { value: true });
41687
41687
  exports.generateAst = exports.mapFilePath = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
@@ -42153,9 +42153,9 @@ const compat = new FlatCompat({
42153
42153
  }
42154
42154
  });
42155
42155
 
42156
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js
42156
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js
42157
42157
  var require_eslint_file = __commonJS({
42158
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js"(exports) {
42158
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/utils/eslint-file.js"(exports) {
42159
42159
  "use strict";
42160
42160
  Object.defineProperty(exports, "__esModule", { value: true });
42161
42161
  exports.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToLintConfig = exports.addExtendsToLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.updateOverrideInLintConfig = exports.addOverrideToLintConfig = exports.updateRelativePathsInConfig = exports.isEslintConfigSupported = exports.findEslintFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.eslintConfigFileWhitelist = void 0;
@@ -42414,9 +42414,9 @@ var require_eslint_file = __commonJS({
42414
42414
  }
42415
42415
  });
42416
42416
 
42417
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json
42417
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json
42418
42418
  var require_package4 = __commonJS({
42419
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json"(exports, module2) {
42419
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/package.json"(exports, module2) {
42420
42420
  module2.exports = {
42421
42421
  name: "@nx/eslint",
42422
42422
  version: "17.0.3",
@@ -42471,9 +42471,9 @@ var require_package4 = __commonJS({
42471
42471
  }
42472
42472
  });
42473
42473
 
42474
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js
42474
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js
42475
42475
  var require_versions4 = __commonJS({
42476
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js"(exports) {
42476
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/utils/versions.js"(exports) {
42477
42477
  "use strict";
42478
42478
  Object.defineProperty(exports, "__esModule", { value: true });
42479
42479
  exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
@@ -42485,9 +42485,9 @@ var require_versions4 = __commonJS({
42485
42485
  }
42486
42486
  });
42487
42487
 
42488
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js
42488
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js
42489
42489
  var require_global_eslint_config = __commonJS({
42490
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js"(exports) {
42490
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/global-eslint-config.js"(exports) {
42491
42491
  "use strict";
42492
42492
  Object.defineProperty(exports, "__esModule", { value: true });
42493
42493
  exports.getGlobalFlatEslintConfiguration = exports.getGlobalEsLintConfiguration = exports.javaScriptOverride = exports.typeScriptOverride = void 0;
@@ -42573,9 +42573,9 @@ var require_global_eslint_config = __commonJS({
42573
42573
  }
42574
42574
  });
42575
42575
 
42576
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js
42576
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js
42577
42577
  var require_init2 = __commonJS({
42578
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js"(exports) {
42578
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init.js"(exports) {
42579
42579
  "use strict";
42580
42580
  Object.defineProperty(exports, "__esModule", { value: true });
42581
42581
  exports.lintInitGenerator = void 0;
@@ -42639,9 +42639,9 @@ var require_init2 = __commonJS({
42639
42639
  }
42640
42640
  });
42641
42641
 
42642
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js
42642
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js
42643
42643
  var require_init_migration = __commonJS({
42644
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js"(exports) {
42644
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/init/init-migration.js"(exports) {
42645
42645
  "use strict";
42646
42646
  Object.defineProperty(exports, "__esModule", { value: true });
42647
42647
  exports.findLintTarget = exports.migrateConfigToMonorepoStyle = void 0;
@@ -42730,9 +42730,9 @@ var require_init_migration = __commonJS({
42730
42730
  }
42731
42731
  });
42732
42732
 
42733
- // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js
42733
+ // node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js
42734
42734
  var require_lint_project = __commonJS({
42735
- "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_eslint@8.53.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js"(exports) {
42735
+ "node_modules/.pnpm/@nx+eslint@17.0.3_@swc-node+register@1.6.8_@swc+core@1.3.96_@types+node@20.9.0_nx@17.0.3_verdaccio@5.27.0/node_modules/@nx/eslint/src/generators/lint-project/lint-project.js"(exports) {
42736
42736
  "use strict";
42737
42737
  Object.defineProperty(exports, "__esModule", { value: true });
42738
42738
  exports.lintProjectGenerator = exports.mapLintPattern = void 0;
@@ -47588,14 +47588,13 @@ var applyWorkspaceTokens = (options, config, tokenizerFn) => {
47588
47588
  // packages/workspace-tools/src/base/base-generator.ts
47589
47589
  var withRunGenerator = (name, generatorFn, generatorOptions = {
47590
47590
  skipReadingConfig: false
47591
- }) => async (tree, options) => {
47591
+ }) => async (tree, _options) => {
47592
47592
  const startTime = Date.now();
47593
+ let options = _options;
47593
47594
  try {
47594
- console.info(
47595
- chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
47595
+ console.info(chalk.bold.hex("#1fb2a6")(`\u26A1 Running the ${name} generator...
47596
47596
 
47597
- `)
47598
- );
47597
+ `));
47599
47598
  let config;
47600
47599
  if (!generatorOptions.skipReadingConfig) {
47601
47600
  config = getDefaultConfig({
@@ -47611,58 +47610,45 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
47611
47610
  );
47612
47611
  }
47613
47612
  if (generatorOptions?.hooks?.applyDefaultOptions) {
47614
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the applyDefaultOptions hook...`));
47613
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the applyDefaultOptions hook..."));
47615
47614
  options = await Promise.resolve(
47616
47615
  generatorOptions.hooks.applyDefaultOptions(options, config)
47617
47616
  );
47618
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the applyDefaultOptions hook...`));
47617
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the applyDefaultOptions hook..."));
47619
47618
  }
47620
- getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(
47621
- chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F Generator schema options: \n"),
47622
- options
47623
- );
47619
+ getLogLevel(config.logLevel) >= LogLevel.INFO && console.info(chalk.hex("#0ea5e9").italic("\n\n \u2699\uFE0F Generator schema options: \n"), options);
47624
47620
  const tokenized = applyWorkspaceTokens(
47625
47621
  options,
47626
47622
  { workspaceRoot: tree.root, config },
47627
47623
  applyWorkspaceGeneratorTokens
47628
47624
  );
47629
47625
  if (generatorOptions?.hooks?.preProcess) {
47630
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the preProcess hook...`));
47631
- await Promise.resolve(
47632
- generatorOptions.hooks.preProcess(options, config)
47633
- );
47634
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the preProcess hook...`));
47626
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the preProcess hook..."));
47627
+ await Promise.resolve(generatorOptions.hooks.preProcess(options, config));
47628
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the preProcess hook..."));
47635
47629
  }
47636
- const result = await Promise.resolve(
47637
- generatorFn(tree, tokenized, config)
47638
- );
47630
+ const result = await Promise.resolve(generatorFn(tree, tokenized, config));
47639
47631
  if (result && (!result.success || result.error && result?.error?.message && typeof result?.error?.message === "string" && result?.error?.name && typeof result?.error?.name === "string")) {
47640
47632
  throw new Error(`The ${name} generator failed to run`, {
47641
- cause: result.error
47633
+ cause: result?.error
47642
47634
  });
47643
47635
  }
47644
47636
  if (generatorOptions?.hooks?.postProcess) {
47645
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Running the postProcess hook...`));
47637
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Running the postProcess hook..."));
47646
47638
  await Promise.resolve(generatorOptions.hooks.postProcess(config));
47647
- getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim(`Completed the postProcess hook...`));
47639
+ getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.debug(chalk.dim("Completed the postProcess hook..."));
47648
47640
  }
47649
47641
  console.info(
47650
- chalk.bold.hex("#087f5b")(
47651
- `
47642
+ chalk.bold.hex("#087f5b")(`
47652
47643
 
47653
- \u{1F389} Successfully completed running the ${name} generator!`
47654
- )
47644
+ \u{1F389} Successfully completed running the ${name} generator!`)
47655
47645
  );
47656
47646
  return {
47657
47647
  success: true
47658
47648
  };
47659
47649
  } catch (error) {
47660
47650
  console.error(
47661
- chalk.bold.hex("#7d1a1a")(
47662
- `\u274C An error occurred while running the generator
47663
-
47664
- `
47665
- ),
47651
+ chalk.bold.hex("#7d1a1a")("\u274C An error occurred while running the generator\n\n"),
47666
47652
  error
47667
47653
  );
47668
47654
  console.error(error);