@storm-software/workspace-tools 1.178.1 → 1.179.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/workspace-tools",
3
- "version": "1.178.1",
3
+ "version": "1.179.1",
4
4
  "type": "commonjs",
5
5
  "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
6
6
  "repository": {
@@ -11461,13 +11461,13 @@ function getChunkFileName(file, facadeChunkByModule) {
11461
11461
  }
11462
11462
  return error(logChunkNotGeneratedForFileName(file.fileName || file.name));
11463
11463
  }
11464
- function getLogHandler(level, code, logger2, pluginName, logLevel) {
11464
+ function getLogHandler(level, code, logger, pluginName, logLevel) {
11465
11465
  if (logLevelPriority[level] < logLevelPriority[logLevel]) {
11466
11466
  return doNothing;
11467
11467
  }
11468
11468
  return (log, pos) => {
11469
11469
  if (pos != null) {
11470
- logger2(LOGLEVEL_WARN, logInvalidLogPosition(pluginName));
11470
+ logger(LOGLEVEL_WARN, logInvalidLogPosition(pluginName));
11471
11471
  }
11472
11472
  log = normalizeLog(log);
11473
11473
  if (log.code && !log.pluginCode) {
@@ -11475,7 +11475,7 @@ function getLogHandler(level, code, logger2, pluginName, logLevel) {
11475
11475
  }
11476
11476
  log.code = code;
11477
11477
  log.plugin = pluginName;
11478
- logger2(level, log);
11478
+ logger(level, log);
11479
11479
  };
11480
11480
  }
11481
11481
  function getPluginContext(plugin, pluginCache, graph, options, fileEmitter, existingPluginNames) {
@@ -11634,7 +11634,7 @@ async function initWasm() {
11634
11634
  function getLogger(plugins, onLog, watchMode, logLevel) {
11635
11635
  plugins = getSortedValidatedPlugins("onLog", plugins);
11636
11636
  const minimalPriority = logLevelPriority[logLevel];
11637
- const logger2 = (level, log, skipped = EMPTY_SET) => {
11637
+ const logger = (level, log, skipped = EMPTY_SET) => {
11638
11638
  augmentLogMessage(log);
11639
11639
  const logPriority = logLevelPriority[level];
11640
11640
  if (logPriority < minimalPriority) {
@@ -11648,7 +11648,7 @@ function getLogger(plugins, onLog, watchMode, logLevel) {
11648
11648
  if (logLevelPriority[level2] < minimalPriority) {
11649
11649
  return doNothing;
11650
11650
  }
11651
- return (log2) => logger2(level2, normalizeLog(log2), new Set(skipped).add(plugin));
11651
+ return (log2) => logger(level2, normalizeLog(log2), new Set(skipped).add(plugin));
11652
11652
  };
11653
11653
  const handler = "handler" in pluginOnLog ? pluginOnLog.handler : pluginOnLog;
11654
11654
  if (handler.call({
@@ -11663,7 +11663,7 @@ function getLogger(plugins, onLog, watchMode, logLevel) {
11663
11663
  }
11664
11664
  onLog(level, log);
11665
11665
  };
11666
- return logger2;
11666
+ return logger;
11667
11667
  }
11668
11668
  function ensureArray(items) {
11669
11669
  if (Array.isArray(items)) {
@@ -11853,16 +11853,16 @@ async function getInputOptions(initialInputOptions, watchMode) {
11853
11853
  async function getProcessedInputOptions(inputOptions, watchMode) {
11854
11854
  const plugins = getSortedValidatedPlugins("options", await normalizePluginOption(inputOptions.plugins));
11855
11855
  const logLevel = inputOptions.logLevel || LOGLEVEL_INFO;
11856
- const logger2 = getLogger(plugins, getOnLog(inputOptions, logLevel), watchMode, logLevel);
11856
+ const logger = getLogger(plugins, getOnLog(inputOptions, logLevel), watchMode, logLevel);
11857
11857
  for (const plugin of plugins) {
11858
11858
  const { name, options } = plugin;
11859
11859
  const handler = "handler" in options ? options.handler : options;
11860
11860
  const processedOptions = await handler.call({
11861
- debug: getLogHandler(LOGLEVEL_DEBUG, "PLUGIN_LOG", logger2, name, logLevel),
11861
+ debug: getLogHandler(LOGLEVEL_DEBUG, "PLUGIN_LOG", logger, name, logLevel),
11862
11862
  error: (error_) => error(logPluginError(normalizeLog(error_), name, { hook: "onLog" })),
11863
- info: getLogHandler(LOGLEVEL_INFO, "PLUGIN_LOG", logger2, name, logLevel),
11863
+ info: getLogHandler(LOGLEVEL_INFO, "PLUGIN_LOG", logger, name, logLevel),
11864
11864
  meta: { rollupVersion: version, watchMode },
11865
- warn: getLogHandler(LOGLEVEL_WARN, "PLUGIN_WARNING", logger2, name, logLevel)
11865
+ warn: getLogHandler(LOGLEVEL_WARN, "PLUGIN_WARNING", logger, name, logLevel)
11866
11866
  }, inputOptions);
11867
11867
  if (processedOptions) {
11868
11868
  inputOptions = processedOptions;
@@ -33577,10 +33577,10 @@ Did you specify these with the most recent transformation maps first?`);
33577
33577
  });
33578
33578
  }
33579
33579
  if (flattenedConfigs.some(({ config: { options: { ignore, only } } }) => shouldIgnore(context, ignore, only, dirname8))) return null;
33580
- const chain = emptyChain(), logger2 = createLogger(input, context, baseLogger);
33580
+ const chain = emptyChain(), logger = createLogger(input, context, baseLogger);
33581
33581
  for (const { config, index, envName } of flattenedConfigs) {
33582
33582
  if (!(yield* mergeExtendsChain(chain, config.options, dirname8, context, files, baseLogger))) return null;
33583
- logger2(config, index, envName), yield* mergeChainOpts(chain, config);
33583
+ logger(config, index, envName), yield* mergeChainOpts(chain, config);
33584
33584
  }
33585
33585
  return chain;
33586
33586
  };
@@ -150863,7 +150863,7 @@ var require_config_chain = __commonJS({
150863
150863
  return null;
150864
150864
  }
150865
150865
  const chain = emptyChain();
150866
- const logger2 = createLogger(input, context, baseLogger);
150866
+ const logger = createLogger(input, context, baseLogger);
150867
150867
  for (const {
150868
150868
  config,
150869
150869
  index,
@@ -150872,7 +150872,7 @@ var require_config_chain = __commonJS({
150872
150872
  if (!(yield* mergeExtendsChain(chain, config.options, dirname8, context, files, baseLogger))) {
150873
150873
  return null;
150874
150874
  }
150875
- logger2(config, index, envName);
150875
+ logger(config, index, envName);
150876
150876
  yield* mergeChainOpts(chain, config);
150877
150877
  }
150878
150878
  return chain;
@@ -173988,8 +173988,8 @@ ${lanes.join("\n")}
173988
173988
  function sysLog(s2) {
173989
173989
  return curSysLog(s2);
173990
173990
  }
173991
- function setSysLog(logger2) {
173992
- curSysLog = logger2;
173991
+ function setSysLog(logger) {
173992
+ curSysLog = logger;
173993
173993
  }
173994
173994
  function createDirectoryWatcherSupportingRecursive({
173995
173995
  watchDirectory,
@@ -359247,13 +359247,13 @@ ${options.prefix}` : "\n" : options.prefix
359247
359247
  return [];
359248
359248
  }
359249
359249
  var ThrottledOperations = class _ThrottledOperations {
359250
- constructor(host, logger2) {
359250
+ constructor(host, logger) {
359251
359251
  this.host = host;
359252
359252
  this.pendingTimeouts = /* @__PURE__ */ new Map();
359253
- this.logger = logger2.hasLevel(
359253
+ this.logger = logger.hasLevel(
359254
359254
  3
359255
359255
  /* verbose */
359256
- ) ? logger2 : void 0;
359256
+ ) ? logger : void 0;
359257
359257
  }
359258
359258
  /**
359259
359259
  * Wait `number` milliseconds and then invoke `cb`. If, while waiting, schedule
@@ -359289,10 +359289,10 @@ ${options.prefix}` : "\n" : options.prefix
359289
359289
  }
359290
359290
  };
359291
359291
  var GcTimer = class _GcTimer {
359292
- constructor(host, delay, logger2) {
359292
+ constructor(host, delay, logger) {
359293
359293
  this.host = host;
359294
359294
  this.delay = delay;
359295
- this.logger = logger2;
359295
+ this.logger = logger;
359296
359296
  }
359297
359297
  scheduleCollect() {
359298
359298
  if (!this.host.gc || this.timerId !== void 0) {
@@ -366337,14 +366337,14 @@ Dynamic files must always be opened with service's current directory or service
366337
366337
  return edits.every((edit) => textSpanEnd(edit.span) < pos);
366338
366338
  }
366339
366339
  var CommandNames = CommandTypes;
366340
- function formatMessage2(msg, logger2, byteLength, newLine) {
366341
- const verboseLogging = logger2.hasLevel(
366340
+ function formatMessage2(msg, logger, byteLength, newLine) {
366341
+ const verboseLogging = logger.hasLevel(
366342
366342
  3
366343
366343
  /* verbose */
366344
366344
  );
366345
366345
  const json2 = JSON.stringify(msg);
366346
366346
  if (verboseLogging) {
366347
- logger2.info(`${msg.type}:${stringifyIndented(msg)}`);
366347
+ logger.info(`${msg.type}:${stringifyIndented(msg)}`);
366348
366348
  }
366349
366349
  const len = byteLength(json2, "utf8");
366350
366350
  return `Content-Length: ${1 + len}\r
@@ -366492,7 +366492,7 @@ ${json2}${newLine}`;
366492
366492
  const info = infos && firstOrUndefined(infos);
366493
366493
  return info && !info.isLocal ? { fileName: info.fileName, pos: info.textSpan.start } : void 0;
366494
366494
  }
366495
- function getReferencesWorker(projects, defaultProject, initialLocation, useCaseSensitiveFileNames2, logger2) {
366495
+ function getReferencesWorker(projects, defaultProject, initialLocation, useCaseSensitiveFileNames2, logger) {
366496
366496
  var _a, _b;
366497
366497
  const perProjectResults = getPerProjectReferences(
366498
366498
  projects,
@@ -366501,7 +366501,7 @@ ${json2}${newLine}`;
366501
366501
  /*isForRename*/
366502
366502
  false,
366503
366503
  (project, position) => {
366504
- logger2.info(`Finding references to ${position.fileName} position ${position.pos} in project ${project.getProjectName()}`);
366504
+ logger.info(`Finding references to ${position.fileName} position ${position.pos} in project ${project.getProjectName()}`);
366505
366505
  return project.getLanguageService().findReferences(position.fileName, position.pos);
366506
366506
  },
366507
366507
  (referencedSymbol, cb) => {
@@ -370760,9 +370760,9 @@ ${e2.message}`;
370760
370760
  }
370761
370761
  };
370762
370762
  var _TypingsInstallerAdapter = class _TypingsInstallerAdapter2 {
370763
- constructor(telemetryEnabled, logger2, host, globalTypingsCacheLocation, event, maxActiveRequestCount) {
370763
+ constructor(telemetryEnabled, logger, host, globalTypingsCacheLocation, event, maxActiveRequestCount) {
370764
370764
  this.telemetryEnabled = telemetryEnabled;
370765
- this.logger = logger2;
370765
+ this.logger = logger;
370766
370766
  this.host = host;
370767
370767
  this.globalTypingsCacheLocation = globalTypingsCacheLocation;
370768
370768
  this.event = event;
@@ -401457,6 +401457,10 @@ __export(executor_exports, {
401457
401457
  rollupExecutorFn: () => rollupExecutorFn
401458
401458
  });
401459
401459
  module.exports = __toCommonJS(executor_exports);
401460
+ var import_async_iterable = require("@nx/devkit/src/utils/async-iterable");
401461
+ var import_config_utils = require("@nx/devkit/src/utils/config-utils");
401462
+ var import_buildable_libs_utils2 = require("@nx/js/src/utils/buildable-libs-utils");
401463
+ var import_generate_package_json2 = require("@nx/rollup/src/plugins/package-json/generate-package-json");
401460
401464
  var import_fs_extra = __toESM(require_lib());
401461
401465
 
401462
401466
  // node_modules/.pnpm/minimatch@9.0.5/node_modules/minimatch/dist/esm/index.js
@@ -407745,12 +407749,6 @@ init_node_entry();
407745
407749
  init_parseAst();
407746
407750
  var import_native4 = __toESM(require_native(), 1);
407747
407751
 
407748
- // packages/workspace-tools/src/executors/rollup/executor.ts
407749
- var import_async_iterable = require("@nx/devkit/src/utils/async-iterable");
407750
- var import_config_utils = require("@nx/devkit/src/utils/config-utils");
407751
- var import_buildable_libs_utils2 = require("@nx/js/src/utils/buildable-libs-utils");
407752
- var import_generate_package_json2 = require("@nx/rollup/src/plugins/package-json/generate-package-json");
407753
-
407754
407752
  // packages/workspace-tools/src/base/base-executor.ts
407755
407753
  init_src2();
407756
407754
 
@@ -409522,7 +409520,8 @@ function analyze() {
409522
409520
  }
409523
409521
  };
409524
409522
  }
409525
- function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
409523
+ async function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
409524
+ const { writeWarning: writeWarning2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
409526
409525
  const finalConfig = { ...rollupConfig };
409527
409526
  const projectNode = getProjectNode();
409528
409527
  const projectRoot = (0, import_node_path13.join)(import_devkit2.workspaceRoot, projectNode.data.root);
@@ -409571,8 +409570,9 @@ function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
409571
409570
  options.format = readCompatibleFormats(tsConfig);
409572
409571
  }
409573
409572
  if (rollupConfig.input && (options.main || (options.additionalEntryPoints ?? []).length > 0)) {
409574
- import_devkit2.logger.warn(
409575
- `Setting "input" in rollup config overrides "main" and "additionalEntryPoints" options.`
409573
+ writeWarning2(
409574
+ `Setting "input" in rollup config overrides "main" and "additionalEntryPoints" options.`,
409575
+ config
409576
409576
  );
409577
409577
  }
409578
409578
  finalConfig.input = rollupConfig.input || createInput(options);
@@ -409583,8 +409583,9 @@ function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
409583
409583
  );
409584
409584
  }
409585
409585
  if (rollupConfig.output?.format || rollupConfig.output?.dir) {
409586
- import_devkit2.logger.warn(
409587
- `"output.dir" and "output.format" are overridden by "withNx".`
409586
+ writeWarning2(
409587
+ `"output.dir" and "output.format" are overridden by "withNx".`,
409588
+ config
409588
409589
  );
409589
409590
  }
409590
409591
  finalConfig.output = options.format.map((format3) => ({
@@ -409611,15 +409612,17 @@ function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
409611
409612
  packageJson = (0, import_devkit2.readJsonFile)(packageJsonPath);
409612
409613
  if (packageJson.type === "module") {
409613
409614
  if (options.format.includes("cjs")) {
409614
- import_devkit2.logger.warn(
409615
- `Package type is set to "module" but "cjs" format is included. Going to use "esm" format instead. You can change the package type to "commonjs" or remove type in the package.json file.`
409615
+ writeWarning2(
409616
+ `Package type is set to "module" but "cjs" format is included. Going to use "esm" format instead. You can change the package type to "commonjs" or remove type in the package.json file.`,
409617
+ config
409616
409618
  );
409617
409619
  }
409618
409620
  options.format = ["esm"];
409619
409621
  } else if (packageJson.type === "commonjs") {
409620
409622
  if (options.format.includes("esm")) {
409621
- import_devkit2.logger.warn(
409622
- `Package type is set to "commonjs" but "esm" format is included. Going to use "cjs" format instead. You can change the package type to "module" or remove type in the package.json file.`
409623
+ writeWarning2(
409624
+ `Package type is set to "commonjs" but "esm" format is included. Going to use "cjs" format instead. You can change the package type to "module" or remove type in the package.json file.`,
409625
+ config
409623
409626
  );
409624
409627
  }
409625
409628
  options.format = ["cjs"];
@@ -409658,7 +409661,7 @@ function withRollupConfig(rawOptions, rollupConfig = {}, dependencies, config) {
409658
409661
  check: !options.skipTypeCheck,
409659
409662
  tsconfig: options.tsConfig,
409660
409663
  tsconfigOverride: {
409661
- compilerOptions: createTsCompilerOptions(
409664
+ compilerOptions: await createTsCompilerOptions(
409662
409665
  tsConfig,
409663
409666
  options,
409664
409667
  dependencies,
@@ -409727,15 +409730,17 @@ function createInput(options) {
409727
409730
  });
409728
409731
  return input;
409729
409732
  }
409730
- function createTsCompilerOptions(parsedCommandLine, options, dependencies, config) {
409733
+ async function createTsCompilerOptions(parsedCommandLine, options, dependencies, config) {
409734
+ const { correctPaths: correctPaths2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
409731
409735
  const compilerOptionPaths = (0, import_buildable_libs_utils.computeCompilerOptionsPaths)(
409732
409736
  parsedCommandLine,
409733
409737
  dependencies ?? []
409734
409738
  );
409735
409739
  const compilerOptions = {
409736
- rootDir: config?.workspaceRoot,
409737
- allowJs: options.allowJs,
409740
+ rootDir: correctPaths2(config?.workspaceRoot),
409738
409741
  declaration: true,
409742
+ skipLibCheck: true,
409743
+ skipDefaultLibCheck: true,
409739
409744
  paths: compilerOptionPaths
409740
409745
  };
409741
409746
  if (parsedCommandLine.options.module === ts.ModuleKind.CommonJS) {
@@ -409840,10 +409845,10 @@ ${formatLogMessage2(options)}`, config);
409840
409845
  projectRoot: context.projectGraph?.nodes[context.projectName]?.data.root,
409841
409846
  skipTypeCheck: options.skipTypeCheck || false,
409842
409847
  logLevel: convertRollupLogLevel(config?.logLevel ?? "info"),
409843
- onLog: (level, log, defaultHandler) => {
409848
+ onLog: (level, log) => {
409844
409849
  writeTrace2(log, config);
409845
409850
  },
409846
- onwarn: (warning, defaultHandler) => {
409851
+ onwarn: (warning) => {
409847
409852
  writeWarning2(warning, config);
409848
409853
  },
409849
409854
  perf: true,
@@ -409869,7 +409874,7 @@ ${formatLogMessage2(options)}`, config);
409869
409874
  next({ success: false });
409870
409875
  }
409871
409876
  });
409872
- const processExitListener = (signal) => () => {
409877
+ const processExitListener = () => () => {
409873
409878
  watcher.close();
409874
409879
  };
409875
409880
  process.once("SIGTERM", processExitListener);
@@ -409907,6 +409912,21 @@ ${formatLogMessage2(options)}`, config);
409907
409912
  }
409908
409913
  }
409909
409914
  async function createRollupOptions(options, context, config) {
409915
+ if (!context.projectGraph) {
409916
+ throw new Error("Nx project graph was not found");
409917
+ }
409918
+ if (!context.root) {
409919
+ throw new Error("Nx root was not found");
409920
+ }
409921
+ if (!context.projectName) {
409922
+ throw new Error("Nx project name was not found");
409923
+ }
409924
+ if (!context.targetName) {
409925
+ throw new Error("Nx target name was not found");
409926
+ }
409927
+ if (!context.configurationName) {
409928
+ throw new Error("Nx configuration name was not found");
409929
+ }
409910
409930
  const { dependencies } = (0, import_buildable_libs_utils2.calculateProjectBuildableDependencies)(
409911
409931
  context.taskGraph,
409912
409932
  context.projectGraph,
@@ -409916,7 +409936,12 @@ async function createRollupOptions(options, context, config) {
409916
409936
  context.configurationName,
409917
409937
  true
409918
409938
  );
409919
- const rollupConfig = withRollupConfig(options, {}, dependencies, config);
409939
+ const rollupConfig = await withRollupConfig(
409940
+ options,
409941
+ {},
409942
+ dependencies,
409943
+ config
409944
+ );
409920
409945
  const generatePackageJsonPlugin = Array.isArray(rollupConfig.plugins) ? rollupConfig.plugins.find(
409921
409946
  (p2) => p2?.["name"] === import_generate_package_json2.pluginName
409922
409947
  ) : null;
@@ -2,4 +2,4 @@ import { DependentBuildableProjectNode } from "@nx/js/src/utils/buildable-libs-u
2
2
  import { StormConfig } from "@storm-software/config";
3
3
  import * as rollup from "rollup";
4
4
  import { RollupWithNxPluginOptions } from "./normalize-options";
5
- export declare function withRollupConfig(rawOptions: RollupWithNxPluginOptions, rollupConfig?: rollup.RollupOptions, dependencies?: DependentBuildableProjectNode[], config?: StormConfig): rollup.RollupOptions;
5
+ export declare function withRollupConfig(rawOptions: RollupWithNxPluginOptions, rollupConfig?: rollup.RollupOptions, dependencies?: DependentBuildableProjectNode[], config?: StormConfig): Promise<rollup.RollupOptions>;
@@ -9,6 +9,7 @@ export declare const DefaultCargoPluginProfileMap: {
9
9
  development: string;
10
10
  production: string;
11
11
  };
12
+ export declare const DEFAULT_ERROR_MESSAGE = "An error occurred in the Storm Rust Nx plugin.";
12
13
  export interface CargoPluginOptions {
13
14
  includeApps?: boolean;
14
15
  skipDocs?: boolean;