@storm-software/workspace-tools 1.21.0 → 1.21.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/index.js +16 -26
  3. package/meta.json +1 -1
  4. package/package.json +1 -1
  5. package/src/base/index.js +14 -24
  6. package/src/executors/tsup/executor.js +7 -12
  7. package/src/executors/tsup-neutral/executor.js +7 -12
  8. package/src/executors/tsup-node/executor.js +7 -12
  9. package/src/generators/config-schema/generator.js +9 -14
  10. package/src/generators/node-library/generator.js +7 -12
  11. package/src/generators/preset/generator.js +7 -12
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storm-software/workspace-tools",
3
- "version": "1.21.0",
3
+ "version": "1.21.1",
4
4
  "private": false,
5
5
  "description": "⚡ A Nx plugin package that contains various executors and generators used in a Storm workspaces.",
6
6
  "keywords": [
package/src/base/index.js CHANGED
@@ -25,12 +25,7 @@ __export(base_exports, {
25
25
  module.exports = __toCommonJS(base_exports);
26
26
 
27
27
  // packages/workspace-tools/src/base/base-executor.ts
28
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
29
- var import_get_env = require("@storm-software/config-tools/env/get-env");
30
- var import_set_env = require("@storm-software/config-tools/env/set-env");
31
- var import_types = require("@storm-software/config-tools/types");
32
- var import_utilities = require("@storm-software/config-tools/utilities");
33
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
28
+ var import_config_tools = require("@storm-software/config-tools");
34
29
 
35
30
  // packages/workspace-tools/src/utils/get-workspace-root.ts
36
31
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -147,17 +142,17 @@ var withRunExecutor = (name, executorFn, executorOptions = {
147
142
  const projectName = context.projectsConfigurations.projects[context.projectName].name;
148
143
  let config;
149
144
  if (!executorOptions.skipReadingConfig) {
150
- config = await (0, import_get_default_config.getDefaultConfig)({
151
- ...await (0, import_get_config_file.getConfigFile)(),
152
- ...(0, import_get_env.getConfigEnv)()
145
+ config = await (0, import_config_tools.getDefaultConfig)({
146
+ ...await (0, import_config_tools.getConfigFile)(),
147
+ ...(0, import_config_tools.getConfigEnv)()
153
148
  });
154
- (0, import_set_env.setConfigEnv)(config);
155
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
149
+ (0, import_config_tools.setConfigEnv)(config);
150
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
156
151
  `Loaded Storm config into env:
157
152
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
158
153
  );
159
154
  }
160
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
155
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
161
156
  `, options);
162
157
  const tokenized = applyWorkspaceTokens(
163
158
  options,
@@ -196,12 +191,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
196
191
  };
197
192
 
198
193
  // packages/workspace-tools/src/base/base-generator.ts
199
- var import_get_config_file2 = require("@storm-software/config-tools/config-file/get-config-file");
200
- var import_get_env2 = require("@storm-software/config-tools/env/get-env");
201
- var import_set_env2 = require("@storm-software/config-tools/env/set-env");
202
- var import_types2 = require("@storm-software/config-tools/types");
203
- var import_get_default_config2 = require("@storm-software/config-tools/utilities/get-default-config");
204
- var import_get_log_level = require("@storm-software/config-tools/utilities/get-log-level");
194
+ var import_config_tools2 = require("@storm-software/config-tools");
205
195
  var withRunGenerator = (name, generatorFn, generatorOptions = {
206
196
  skipReadingConfig: false
207
197
  }) => async (tree, options) => {
@@ -213,19 +203,19 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
213
203
  }
214
204
  let config;
215
205
  if (!generatorOptions.skipReadingConfig) {
216
- const configFile = await (0, import_get_config_file2.getConfigFile)();
217
- const configEnv = (0, import_get_env2.getConfigEnv)();
218
- config = await (0, import_get_default_config2.getDefaultConfig)({
206
+ const configFile = await (0, import_config_tools2.getConfigFile)();
207
+ const configEnv = (0, import_config_tools2.getConfigEnv)();
208
+ config = await (0, import_config_tools2.getDefaultConfig)({
219
209
  ...configFile,
220
210
  ...configEnv
221
211
  });
222
- (0, import_set_env2.setConfigEnv)(config);
223
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types2.LogLevel.DEBUG && console.debug(
212
+ (0, import_config_tools2.setConfigEnv)(config);
213
+ (0, import_config_tools2.getLogLevel)(config.logLevel) >= import_config_tools2.LogLevel.DEBUG && console.debug(
224
214
  `Loaded Storm config into env:
225
215
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
226
216
  );
227
217
  }
228
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types2.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
218
+ (0, import_config_tools2.getLogLevel)(config.logLevel) >= import_config_tools2.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
229
219
  const tokenized = applyWorkspaceTokens(
230
220
  options,
231
221
  { workspaceRoot: tree.root, config },
package/src/executors/tsup/executor.js CHANGED
@@ -104824,12 +104824,7 @@ var import_tsup2 = __toESM(require_dist5());
104824
104824
  var ts = __toESM(require("typescript"));
104825
104825
 
104826
104826
  // packages/workspace-tools/src/base/base-executor.ts
104827
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
104828
- var import_get_env = require("@storm-software/config-tools/env/get-env");
104829
- var import_set_env = require("@storm-software/config-tools/env/set-env");
104830
- var import_types = require("@storm-software/config-tools/types");
104831
- var import_utilities = require("@storm-software/config-tools/utilities");
104832
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
104827
+ var import_config_tools = require("@storm-software/config-tools");
104833
104828
 
104834
104829
  // packages/workspace-tools/src/utils/get-workspace-root.ts
104835
104830
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -104933,17 +104928,17 @@ var withRunExecutor = (name, executorFn, executorOptions = {
104933
104928
  const projectName = context.projectsConfigurations.projects[context.projectName].name;
104934
104929
  let config;
104935
104930
  if (!executorOptions.skipReadingConfig) {
104936
- config = await (0, import_get_default_config.getDefaultConfig)({
104937
- ...await (0, import_get_config_file.getConfigFile)(),
104938
- ...(0, import_get_env.getConfigEnv)()
104931
+ config = await (0, import_config_tools.getDefaultConfig)({
104932
+ ...await (0, import_config_tools.getConfigFile)(),
104933
+ ...(0, import_config_tools.getConfigEnv)()
104939
104934
  });
104940
- (0, import_set_env.setConfigEnv)(config);
104941
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
104935
+ (0, import_config_tools.setConfigEnv)(config);
104936
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
104942
104937
  `Loaded Storm config into env:
104943
104938
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
104944
104939
  );
104945
104940
  }
104946
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
104941
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
104947
104942
  `, options);
104948
104943
  const tokenized = applyWorkspaceTokens(
104949
104944
  options,
package/src/executors/tsup-neutral/executor.js CHANGED
@@ -98588,12 +98588,7 @@ __export(executor_exports, {
98588
98588
  module.exports = __toCommonJS(executor_exports);
98589
98589
 
98590
98590
  // packages/workspace-tools/src/base/base-executor.ts
98591
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
98592
- var import_get_env = require("@storm-software/config-tools/env/get-env");
98593
- var import_set_env = require("@storm-software/config-tools/env/set-env");
98594
- var import_types = require("@storm-software/config-tools/types");
98595
- var import_utilities = require("@storm-software/config-tools/utilities");
98596
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
98591
+ var import_config_tools = require("@storm-software/config-tools");
98597
98592
 
98598
98593
  // packages/workspace-tools/src/utils/get-workspace-root.ts
98599
98594
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -98697,17 +98692,17 @@ var withRunExecutor = (name, executorFn, executorOptions = {
98697
98692
  const projectName = context.projectsConfigurations.projects[context.projectName].name;
98698
98693
  let config;
98699
98694
  if (!executorOptions.skipReadingConfig) {
98700
- config = await (0, import_get_default_config.getDefaultConfig)({
98701
- ...await (0, import_get_config_file.getConfigFile)(),
98702
- ...(0, import_get_env.getConfigEnv)()
98695
+ config = await (0, import_config_tools.getDefaultConfig)({
98696
+ ...await (0, import_config_tools.getConfigFile)(),
98697
+ ...(0, import_config_tools.getConfigEnv)()
98703
98698
  });
98704
- (0, import_set_env.setConfigEnv)(config);
98705
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
98699
+ (0, import_config_tools.setConfigEnv)(config);
98700
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
98706
98701
  `Loaded Storm config into env:
98707
98702
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
98708
98703
  );
98709
98704
  }
98710
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
98705
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
98711
98706
  `, options);
98712
98707
  const tokenized = applyWorkspaceTokens(
98713
98708
  options,
package/src/executors/tsup-node/executor.js CHANGED
@@ -98718,12 +98718,7 @@ function esbuildPluginPino({
98718
98718
  }
98719
98719
 
98720
98720
  // packages/workspace-tools/src/base/base-executor.ts
98721
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
98722
- var import_get_env = require("@storm-software/config-tools/env/get-env");
98723
- var import_set_env = require("@storm-software/config-tools/env/set-env");
98724
- var import_types = require("@storm-software/config-tools/types");
98725
- var import_utilities = require("@storm-software/config-tools/utilities");
98726
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
98721
+ var import_config_tools = require("@storm-software/config-tools");
98727
98722
 
98728
98723
  // packages/workspace-tools/src/utils/get-workspace-root.ts
98729
98724
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -98827,17 +98822,17 @@ var withRunExecutor = (name, executorFn, executorOptions = {
98827
98822
  const projectName = context.projectsConfigurations.projects[context.projectName].name;
98828
98823
  let config;
98829
98824
  if (!executorOptions.skipReadingConfig) {
98830
- config = await (0, import_get_default_config.getDefaultConfig)({
98831
- ...await (0, import_get_config_file.getConfigFile)(),
98832
- ...(0, import_get_env.getConfigEnv)()
98825
+ config = await (0, import_config_tools.getDefaultConfig)({
98826
+ ...await (0, import_config_tools.getConfigFile)(),
98827
+ ...(0, import_config_tools.getConfigEnv)()
98833
98828
  });
98834
- (0, import_set_env.setConfigEnv)(config);
98835
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
98829
+ (0, import_config_tools.setConfigEnv)(config);
98830
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
98836
98831
  `Loaded Storm config into env:
98837
98832
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
98838
98833
  );
98839
98834
  }
98840
- (0, import_utilities.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
98835
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(`\u2699\uFE0F Executor schema options:
98841
98836
  `, options);
98842
98837
  const tokenized = applyWorkspaceTokens(
98843
98838
  options,
package/src/generators/config-schema/generator.js CHANGED
@@ -18240,7 +18240,7 @@ __export(generator_exports, {
18240
18240
  });
18241
18241
  module.exports = __toCommonJS(generator_exports);
18242
18242
  var import_devkit = __toESM(require_devkit());
18243
- var import_schema = require("@storm-software/config-tools/schema");
18243
+ var import_config_tools2 = require("@storm-software/config-tools");
18244
18244
  var import_fs = require("fs");
18245
18245
  var import_path = require("path");
18246
18246
 
@@ -22836,12 +22836,7 @@ var zodToJsonSchema = (schema, options) => {
22836
22836
  };
22837
22837
 
22838
22838
  // packages/workspace-tools/src/base/base-generator.ts
22839
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
22840
- var import_get_env = require("@storm-software/config-tools/env/get-env");
22841
- var import_set_env = require("@storm-software/config-tools/env/set-env");
22842
- var import_types = require("@storm-software/config-tools/types");
22843
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
22844
- var import_get_log_level = require("@storm-software/config-tools/utilities/get-log-level");
22839
+ var import_config_tools = require("@storm-software/config-tools");
22845
22840
 
22846
22841
  // packages/workspace-tools/src/utils/get-workspace-root.ts
22847
22842
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -22900,19 +22895,19 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
22900
22895
  }
22901
22896
  let config;
22902
22897
  if (!generatorOptions.skipReadingConfig) {
22903
- const configFile = await (0, import_get_config_file.getConfigFile)();
22904
- const configEnv = (0, import_get_env.getConfigEnv)();
22905
- config = await (0, import_get_default_config.getDefaultConfig)({
22898
+ const configFile = await (0, import_config_tools.getConfigFile)();
22899
+ const configEnv = (0, import_config_tools.getConfigEnv)();
22900
+ config = await (0, import_config_tools.getDefaultConfig)({
22906
22901
  ...configFile,
22907
22902
  ...configEnv
22908
22903
  });
22909
- (0, import_set_env.setConfigEnv)(config);
22910
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
22904
+ (0, import_config_tools.setConfigEnv)(config);
22905
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
22911
22906
  `Loaded Storm config into env:
22912
22907
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
22913
22908
  );
22914
22909
  }
22915
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
22910
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
22916
22911
  const tokenized = applyWorkspaceTokens(
22917
22912
  options,
22918
22913
  { workspaceRoot: tree.root, config },
@@ -22983,7 +22978,7 @@ async function configSchemaGeneratorFn(tree, options) {
22983
22978
  )
22984
22979
  ).describe("Configuration of each used extension")
22985
22980
  });
22986
- const ModulesSchema = unionType([workspaceSchema, import_schema.StormConfigSchema]).describe(
22981
+ const ModulesSchema = unionType([workspaceSchema, import_config_tools2.StormConfigSchema]).describe(
22987
22982
  "The values set in the Storm config file. This file is expected to be named `storm.config.js` and be located in the root of the workspace"
22988
22983
  );
22989
22984
  (0, import_devkit.writeJson)(
package/src/generators/node-library/generator.js CHANGED
@@ -37248,12 +37248,7 @@ var import_init = __toESM(require_init());
37248
37248
  var import_generator = __toESM(require_generator());
37249
37249
 
37250
37250
  // packages/workspace-tools/src/base/base-generator.ts
37251
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
37252
- var import_get_env = require("@storm-software/config-tools/env/get-env");
37253
- var import_set_env = require("@storm-software/config-tools/env/set-env");
37254
- var import_types = require("@storm-software/config-tools/types");
37255
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
37256
- var import_get_log_level = require("@storm-software/config-tools/utilities/get-log-level");
37251
+ var import_config_tools = require("@storm-software/config-tools");
37257
37252
 
37258
37253
  // packages/workspace-tools/src/utils/get-workspace-root.ts
37259
37254
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -37312,19 +37307,19 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
37312
37307
  }
37313
37308
  let config;
37314
37309
  if (!generatorOptions.skipReadingConfig) {
37315
- const configFile = await (0, import_get_config_file.getConfigFile)();
37316
- const configEnv = (0, import_get_env.getConfigEnv)();
37317
- config = await (0, import_get_default_config.getDefaultConfig)({
37310
+ const configFile = await (0, import_config_tools.getConfigFile)();
37311
+ const configEnv = (0, import_config_tools.getConfigEnv)();
37312
+ config = await (0, import_config_tools.getDefaultConfig)({
37318
37313
  ...configFile,
37319
37314
  ...configEnv
37320
37315
  });
37321
- (0, import_set_env.setConfigEnv)(config);
37322
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
37316
+ (0, import_config_tools.setConfigEnv)(config);
37317
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
37323
37318
  `Loaded Storm config into env:
37324
37319
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
37325
37320
  );
37326
37321
  }
37327
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
37322
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
37328
37323
  const tokenized = applyWorkspaceTokens(
37329
37324
  options,
37330
37325
  { workspaceRoot: tree.root, config },
package/src/generators/preset/generator.js CHANGED
@@ -18243,12 +18243,7 @@ var import_devkit = __toESM(require_devkit());
18243
18243
  var path = __toESM(require("path"));
18244
18244
 
18245
18245
  // packages/workspace-tools/src/base/base-generator.ts
18246
- var import_get_config_file = require("@storm-software/config-tools/config-file/get-config-file");
18247
- var import_get_env = require("@storm-software/config-tools/env/get-env");
18248
- var import_set_env = require("@storm-software/config-tools/env/set-env");
18249
- var import_types = require("@storm-software/config-tools/types");
18250
- var import_get_default_config = require("@storm-software/config-tools/utilities/get-default-config");
18251
- var import_get_log_level = require("@storm-software/config-tools/utilities/get-log-level");
18246
+ var import_config_tools = require("@storm-software/config-tools");
18252
18247
 
18253
18248
  // packages/workspace-tools/src/utils/get-workspace-root.ts
18254
18249
  var import_find_workspace_root = require("nx/src/utils/find-workspace-root.js");
@@ -18307,19 +18302,19 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
18307
18302
  }
18308
18303
  let config;
18309
18304
  if (!generatorOptions.skipReadingConfig) {
18310
- const configFile = await (0, import_get_config_file.getConfigFile)();
18311
- const configEnv = (0, import_get_env.getConfigEnv)();
18312
- config = await (0, import_get_default_config.getDefaultConfig)({
18305
+ const configFile = await (0, import_config_tools.getConfigFile)();
18306
+ const configEnv = (0, import_config_tools.getConfigEnv)();
18307
+ config = await (0, import_config_tools.getDefaultConfig)({
18313
18308
  ...configFile,
18314
18309
  ...configEnv
18315
18310
  });
18316
- (0, import_set_env.setConfigEnv)(config);
18317
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug(
18311
+ (0, import_config_tools.setConfigEnv)(config);
18312
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug(
18318
18313
  `Loaded Storm config into env:
18319
18314
  ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\n")}`
18320
18315
  );
18321
18316
  }
18322
- (0, import_get_log_level.getLogLevel)(config.logLevel) >= import_types.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
18317
+ (0, import_config_tools.getLogLevel)(config.logLevel) >= import_config_tools.LogLevel.DEBUG && console.debug("\u2699\uFE0F Generator schema options: \n", options);
18323
18318
  const tokenized = applyWorkspaceTokens(
18324
18319
  options,
18325
18320
  { workspaceRoot: tree.root, config },