@storm-software/workspace-tools 1.62.6 → 1.62.8

package/src/executors/tsup-neutral/executor.js

@@ -4479,20 +4479,20 @@ var require_typescript = __commonJS({
           })();
         }
       });
-      var LogLevel4, Debug;
+      var LogLevel, Debug;
       var init_debug = __esm2({
         "src/compiler/debug.ts"() {
           "use strict";
           init_ts2();
           init_ts2();
-          LogLevel4 = /* @__PURE__ */ ((LogLevel32) => {
-            LogLevel32[LogLevel32["Off"] = 0] = "Off";
-            LogLevel32[LogLevel32["Error"] = 1] = "Error";
-            LogLevel32[LogLevel32["Warning"] = 2] = "Warning";
-            LogLevel32[LogLevel32["Info"] = 3] = "Info";
-            LogLevel32[LogLevel32["Verbose"] = 4] = "Verbose";
-            return LogLevel32;
-          })(LogLevel4 || {});
+          LogLevel = /* @__PURE__ */ ((LogLevel3) => {
+            LogLevel3[LogLevel3["Off"] = 0] = "Off";
+            LogLevel3[LogLevel3["Error"] = 1] = "Error";
+            LogLevel3[LogLevel3["Warning"] = 2] = "Warning";
+            LogLevel3[LogLevel3["Info"] = 3] = "Info";
+            LogLevel3[LogLevel3["Verbose"] = 4] = "Verbose";
+            return LogLevel3;
+          })(LogLevel || {});
           ((Debug2) => {
             let currentAssertionLevel = 0;
             Debug2.currentLogLevel = 2;
@@ -187061,12 +187061,12 @@ ${options8.prefix}` : "\n" : options8.prefix
         "src/server/utilitiesPublic.ts"() {
           "use strict";
           init_ts7();
-          LogLevel22 = /* @__PURE__ */ ((LogLevel32) => {
-            LogLevel32[LogLevel32["terse"] = 0] = "terse";
-            LogLevel32[LogLevel32["normal"] = 1] = "normal";
-            LogLevel32[LogLevel32["requestTime"] = 2] = "requestTime";
-            LogLevel32[LogLevel32["verbose"] = 3] = "verbose";
-            return LogLevel32;
+          LogLevel22 = /* @__PURE__ */ ((LogLevel3) => {
+            LogLevel3[LogLevel3["terse"] = 0] = "terse";
+            LogLevel3[LogLevel3["normal"] = 1] = "normal";
+            LogLevel3[LogLevel3["requestTime"] = 2] = "requestTime";
+            LogLevel3[LogLevel3["verbose"] = 3] = "verbose";
+            return LogLevel3;
           })(LogLevel22 || {});
           emptyArray22 = createSortedArray22();
           Msg2 = /* @__PURE__ */ ((Msg22) => {
@@ -198597,7 +198597,7 @@ ${e3.message}`;
         LanguageVariant: () => LanguageVariant,
         LexicalEnvironmentFlags: () => LexicalEnvironmentFlags,
         ListFormat: () => ListFormat,
-        LogLevel: () => LogLevel4,
+        LogLevel: () => LogLevel,
         MemberOverrideStatus: () => MemberOverrideStatus,
         ModifierFlags: () => ModifierFlags,
         ModuleDetectionKind: () => ModuleDetectionKind,
@@ -201001,7 +201001,7 @@ ${e3.message}`;
         LanguageVariant: () => LanguageVariant,
         LexicalEnvironmentFlags: () => LexicalEnvironmentFlags,
         ListFormat: () => ListFormat,
-        LogLevel: () => LogLevel4,
+        LogLevel: () => LogLevel,
         MemberOverrideStatus: () => MemberOverrideStatus,
         ModifierFlags: () => ModifierFlags,
         ModuleDetectionKind: () => ModuleDetectionKind,
@@ -448946,9 +448946,6 @@ __export(executor_exports, {
 });
 module.exports = __toCommonJS(executor_exports);
 
-// packages/workspace-tools/src/base/base-executor.ts
-var import_config_tools2 = require("@storm-software/config-tools");
-
 // packages/workspace-tools/src/utils/apply-workspace-tokens.ts
 var import_config_tools = require("@storm-software/config-tools");
 var applyWorkspaceExecutorTokens = (option, tokenizerOptions) => {
@@ -449022,23 +449019,34 @@ var applyWorkspaceTokens = (options8, config, tokenizerFn) => {
 
 // packages/workspace-tools/src/base/base-executor.ts
 var withRunExecutor = (name, executorFn, executorOptions) => async (_options, context) => {
-  const stopwatch = (0, import_config_tools2.getStopwatch)(name);
+  const {
+    getStopwatch,
+    writeDebug,
+    writeError,
+    writeFatal,
+    writeInfo,
+    writeSuccess,
+    writeTrace,
+    findWorkspaceRoot: findWorkspaceRoot3,
+    loadStormConfig
+  } = await import("@storm-software/config-tools");
+  const stopwatch = getStopwatch(name);
   let options8 = _options;
   let config;
   try {
-    (0, import_config_tools2.writeInfo)(config, `\u26A1 Running the ${name} executor...
+    writeInfo(config, `\u26A1 Running the ${name} executor...
 `);
     if (!context.projectsConfigurations?.projects || !context.projectName || !context.projectsConfigurations.projects[context.projectName]) {
       throw new Error(
         "The Build process failed because the context is not valid. Please run this command from a workspace."
       );
     }
-    const workspaceRoot = (0, import_config_tools2.findWorkspaceRoot)();
+    const workspaceRoot = findWorkspaceRoot3();
     const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
     const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
     if (!executorOptions.skipReadingConfig) {
-      (0, import_config_tools2.writeDebug)(
+      writeDebug(
         config,
         `Loading the Storm Config from environment variables and storm.config.js file...
  - workspaceRoot: ${workspaceRoot}
@@ -449047,8 +449055,8 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
  - projectName: ${projectName}
 `
       );
-      config = await (0, import_config_tools2.loadStormConfig)(workspaceRoot);
-      (0, import_config_tools2.writeTrace)(
+      config = await loadStormConfig(workspaceRoot);
+      writeTrace(
         config,
         `Loaded Storm config into env: 
 ${Object.keys(process.env).filter((key2) => key2.startsWith("STORM_")).map(
@@ -449057,11 +449065,11 @@ ${Object.keys(process.env).filter((key2) => key2.startsWith("STORM_")).map(
       );
     }
     if (executorOptions?.hooks?.applyDefaultOptions) {
-      (0, import_config_tools2.writeDebug)(config, "Running the applyDefaultOptions hook...");
+      writeDebug(config, "Running the applyDefaultOptions hook...");
       options8 = await Promise.resolve(executorOptions.hooks.applyDefaultOptions(options8, config));
-      (0, import_config_tools2.writeDebug)(config, "Completed the applyDefaultOptions hook");
+      writeDebug(config, "Completed the applyDefaultOptions hook");
     }
-    (0, import_config_tools2.writeTrace)(
+    writeTrace(
       config,
       `Executor schema options \u2699\uFE0F 
 ${Object.keys(options8).map(
@@ -449082,9 +449090,9 @@ ${Object.keys(options8).map(
       applyWorkspaceExecutorTokens
     );
     if (executorOptions?.hooks?.preProcess) {
-      (0, import_config_tools2.writeDebug)(config, "Running the preProcess hook...");
+      writeDebug(config, "Running the preProcess hook...");
       await Promise.resolve(executorOptions.hooks.preProcess(tokenized, config));
-      (0, import_config_tools2.writeDebug)(config, "Completed the preProcess hook");
+      writeDebug(config, "Completed the preProcess hook");
     }
     const result = await Promise.resolve(executorFn(tokenized, context, config));
     if (result && (!result.success || result.error && result?.error?.message && typeof result?.error?.message === "string" && result?.error?.name && typeof result?.error?.name === "string")) {
@@ -449093,21 +449101,21 @@ ${Object.keys(options8).map(
       });
     }
     if (executorOptions?.hooks?.postProcess) {
-      (0, import_config_tools2.writeDebug)(config, "Running the postProcess hook...");
+      writeDebug(config, "Running the postProcess hook...");
       await Promise.resolve(executorOptions.hooks.postProcess(config));
-      (0, import_config_tools2.writeDebug)(config, "Completed the postProcess hook");
+      writeDebug(config, "Completed the postProcess hook");
     }
-    (0, import_config_tools2.writeSuccess)(config, `Completed running the ${name} task executor!
+    writeSuccess(config, `Completed running the ${name} task executor!
 `);
     return {
       success: true
     };
   } catch (error) {
-    (0, import_config_tools2.writeFatal)(
+    writeFatal(
       config,
       "A fatal error occurred while running the executor - the process was forced to terminate"
     );
-    (0, import_config_tools2.writeError)(
+    writeError(
       config,
       `An exception was thrown in the executor's process 
  - Details: ${error.message}
@@ -449164,7 +449172,6 @@ var import_esbuild_decorators = __toESM(require_src());
 var import_devkit2 = __toESM(require_devkit());
 var import_get_custom_transformers_factory = __toESM(require_get_custom_transformers_factory());
 var import_normalize_options = __toESM(require_normalize_options());
-var import_config_tools3 = require("@storm-software/config-tools");
 
 // node_modules/.pnpm/esbuild-plugin-define@0.4.0_esbuild@0.19.12/node_modules/esbuild-plugin-define/dist/mjs/utils.js
 var makeKey = (...inputs) => inputs.filter((input) => !!input).join(".");
@@ -449365,7 +449372,8 @@ var applyDefaultOptions = (options8) => {
   return options8;
 };
 var runTsupBuild = async (context, config, options8) => {
-  const workspaceRoot = config?.workspaceRoot ?? (0, import_config_tools3.findWorkspaceRoot)();
+  const { LogLevel, getLogLevel, writeInfo, writeWarning, findWorkspaceRoot: findWorkspaceRoot3 } = await import("@storm-software/config-tools");
+  const workspaceRoot = config?.workspaceRoot ?? findWorkspaceRoot3();
   const stormEnv = Object.keys(options8.env ?? {}).filter((key2) => key2.startsWith("STORM_")).reduce((ret, key2) => {
     ret[key2] = options8.env?.[key2];
     return ret;
@@ -449424,7 +449432,7 @@ ${options8.banner}
     outputPath: options8.outputPath
   };
   if (options8.getConfig) {
-    (0, import_config_tools3.writeInfo)(config, "\u26A1 Running the Build process");
+    writeInfo(config, "\u26A1 Running the Build process");
     const getConfigFns = [options8.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
@@ -449437,8 +449445,8 @@ ${options8.banner}
     } else {
       await build(tsupConfig, config);
     }
-  } else if ((0, import_config_tools3.getLogLevel)(config?.logLevel ?? "debug") >= import_config_tools3.LogLevel.WARN) {
-    (0, import_config_tools3.writeWarning)(
+  } else if (getLogLevel(config?.logLevel ?? "debug") >= LogLevel.WARN) {
+    writeWarning(
       config,
       "The Build process did not run because no `getConfig` parameter was provided"
     );
@@ -449473,6 +449481,7 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options8) {
   return tsConfig;
 }
 var build = async (options8, config) => {
+  const { writeDebug } = await import("@storm-software/config-tools");
   if (Array.isArray(options8)) {
     await Promise.all(options8.map((buildOptions) => build(buildOptions, config)));
   } else {
@@ -449480,7 +449489,7 @@ var build = async (options8, config) => {
     if (_isFunction2(tsupOptions)) {
       tsupOptions = await Promise.resolve(tsupOptions({}));
     }
-    (0, import_config_tools3.writeDebug)(
+    writeDebug(
       config,
       `\u2699\uFE0F  Tsup Build options:
 ${!_isFunction2(tsupOptions) ? Object.keys(tsupOptions).map(
@@ -449522,7 +449531,6 @@ var createTypeScriptCompilationOptions = (normalizedOptions, projectName) => {
 var import_node_fs = require("node:fs");
 var import_devkit3 = __toESM(require_devkit());
 var import_js = __toESM(require_src6());
-var import_config_tools5 = require("@storm-software/config-tools");
 var import_fs_extra = __toESM(require_lib5());
 
 // node_modules/.pnpm/minimatch@9.0.3/node_modules/minimatch/dist/mjs/index.js
@@ -455704,8 +455712,8 @@ var import_fileutils = require("nx/src/utils/fileutils.js");
 
 // packages/workspace-tools/src/utils/get-project-configurations.ts
 var import_retrieve_workspace_files = require("nx/src/project-graph/utils/retrieve-workspace-files");
-var import_config_tools4 = require("@storm-software/config-tools");
-var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)((0, import_config_tools4.findWorkspaceRoot)());
+var import_config_tools2 = require("@storm-software/config-tools");
+var getProjectConfigurations = () => (0, import_retrieve_workspace_files.retrieveProjectConfigurationsWithoutPluginInference)((0, import_config_tools2.findWorkspaceRoot)());
 
 // packages/workspace-tools/src/utils/get-project-deps.ts
 function getExtraDependencies(projectName, graph) {
@@ -455742,8 +455750,18 @@ function getExtraDependencies(projectName, graph) {
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 async function tsupExecutorFn(options8, context, config) {
-  (0, import_config_tools5.writeInfo)(config, "\u{1F4E6}  Running Storm build executor on the workspace");
-  (0, import_config_tools5.getLogLevel)(config?.logLevel) >= import_config_tools5.LogLevel.TRACE && (0, import_config_tools5.writeDebug)(
+  const {
+    LogLevel,
+    getLogLevel,
+    writeDebug,
+    writeInfo,
+    writeSuccess,
+    writeTrace,
+    writeWarning,
+    findWorkspaceRoot: findWorkspaceRoot3
+  } = await import("@storm-software/config-tools");
+  writeInfo(config, "\u{1F4E6}  Running Storm build executor on the workspace");
+  writeDebug(
     config,
     `\u2699\uFE0F  Executor options:
 ${Object.keys(options8).map(
@@ -455756,11 +455774,11 @@ ${Object.keys(options8).map(
       "The Build process failed because the context is not valid. Please run this command from a workspace."
     );
   }
-  const workspaceRoot = (0, import_config_tools5.findWorkspaceRoot)();
+  const workspaceRoot = findWorkspaceRoot3();
   const projectRoot = context.projectsConfigurations.projects[context.projectName]?.root ?? workspaceRoot;
   const sourceRoot = context.projectsConfigurations.projects[context.projectName]?.sourceRoot ?? workspaceRoot;
   if (options8.clean !== false) {
-    (0, import_config_tools5.writeInfo)(config, `\u{1F9F9} Cleaning output path: ${options8.outputPath}`);
+    writeInfo(config, `\u{1F9F9} Cleaning output path: ${options8.outputPath}`);
     (0, import_fs_extra.removeSync)(options8.outputPath);
   }
   const assets = Array.from(options8.assets);
@@ -455829,13 +455847,13 @@ ${Object.keys(options8).map(
   const implicitDependencies = context.projectsConfigurations.projects[context.projectName]?.implicitDependencies;
   const internalDependencies = [];
   const projectConfigs = await Promise.resolve(getProjectConfigurations());
-  if ((0, import_config_tools5.getLogLevel)(config?.logLevel) >= import_config_tools5.LogLevel.TRACE) {
-    (0, import_config_tools5.writeDebug)(config, "Project Configs:");
+  if (getLogLevel(config?.logLevel) >= LogLevel.TRACE) {
+    writeDebug(config, "Project Configs:");
     console.log(projectConfigs);
   }
   if (implicitDependencies && implicitDependencies.length > 0) {
     options8.external = implicitDependencies.reduce((ret, key2) => {
-      (0, import_config_tools5.writeDebug)(config, `\u26A1 Adding implicit dependency: ${key2}`);
+      writeDebug(config, `\u26A1 Adding implicit dependency: ${key2}`);
       const projectConfig = projectConfigs[key2];
       if (projectConfig?.targets?.build) {
         const projectPackageJson = (0, import_devkit3.readJsonFile)(projectConfig.targets?.build.options.project);
@@ -455860,7 +455878,7 @@ ${Object.keys(options8).map(
       externalDependencies.push(thirdPartyDependency);
     }
   }
-  (0, import_config_tools5.writeTrace)(
+  writeTrace(
     config,
     `Building with the following dependencies marked as external:
 ${externalDependencies.map((dep) => {
@@ -455887,7 +455905,7 @@ ${externalDependencies.map((dep) => {
         while (propertyKey.startsWith("/")) {
           propertyKey = propertyKey.substring(1);
         }
-        (0, import_config_tools5.writeDebug)(
+        writeDebug(
           config,
           `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
             filePath.path,
@@ -456007,10 +456025,10 @@ ${externalDependencies.map((dep) => {
     packageJson.repository ??= workspacePackageJson.repository;
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit3.joinPathFragments)("packages", context.projectName);
     const packageJsonPath = (0, import_devkit3.joinPathFragments)(context.root, options8.outputPath, "package.json");
-    (0, import_config_tools5.writeDebug)(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
+    writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
     (0, import_node_fs.writeFileSync)(packageJsonPath, JSON.stringify(packageJson));
   } else {
-    (0, import_config_tools5.writeWarning)(config, "Skipping writing to package.json file");
+    writeWarning(config, "Skipping writing to package.json file");
   }
   if (options8.includeSrc === true) {
     const files = globSync([
@@ -456046,7 +456064,7 @@ ${(0, import_node_fs.readFileSync)(file, "utf-8")}`,
       )
     )
   );
-  (0, import_config_tools5.writeSuccess)(config, "\u26A1 The Build process has completed successfully");
+  writeSuccess(config, "\u26A1 The Build process has completed successfully");
   return {
     success: true
   };