@storm-software/workspace-tools 1.49.23 → 1.49.25

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.49.25 (2024-01-26)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Moved the tsup config logging ([451d4fcc](https://github.com/storm-software/storm-ops/commit/451d4fcc))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.49.24 (2024-01-26)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Improvements to options printing process ([87342329](https://github.com/storm-software/storm-ops/commit/87342329))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.49.23 (2024-01-26)
 
 

package/index.js

@@ -132079,7 +132079,9 @@ var withRunExecutor = (name, executorFn, executorOptions) => async (_options, co
       writeTrace(
         config,
         `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`
+${Object.keys(process.env).map(
+          (key) => ` - ${key}=${_isFunction(process.env[key]) ? "<function>" : JSON.stringify(process.env[key])}`
+        ).join("\n")}`
       );
     }
     if (executorOptions?.hooks?.applyDefaultOptions) {
@@ -132090,7 +132092,9 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
     writeTrace(
       config,
       `Executor schema options \u2699\uFE0F 
-${Object.keys(options).map((key) => ` - ${key}=${JSON.stringify(options[key])}`).join("\n")}`
+${Object.keys(options).map(
+        (key) => ` - ${key}=${_isFunction(options[key]) ? "<function>" : JSON.stringify(options[key])}`
+      ).join("\n")}`
     );
     const tokenized = applyWorkspaceTokens(
       options,
@@ -132144,6 +132148,13 @@ ${Object.keys(options).map((key) => ` - ${key}=${JSON.stringify(options[key])}`)
     stopwatch();
   }
 };
+var _isFunction = (value) => {
+  try {
+    return value instanceof Function || typeof value === "function" || !!(value?.constructor && value?.call && value?.apply);
+  } catch (e) {
+    return false;
+  }
+};
 
 // packages/workspace-tools/src/base/base-generator.ts
 var withRunGenerator = (name, generatorFn, generatorOptions = {
@@ -132709,7 +132720,7 @@ ${commentStart}                         ${padding}Storm Software
 ${commentStart}                 \u26A1 ${process.env.STORM_NAMESPACE} - ${name}
 ${commentStart}
 ${commentStart} This code was released as part of the ${process.env.STORM_NAMESPACE} project. ${process.env.STORM_NAMESPACE}
-${commentStart} is maintained by Storm Software under the {${process.env.STORM_LICENSE ?? "Apache License 2.0"}, and is
+${commentStart} is maintained by Storm Software under the ${process.env.STORM_LICENSE ?? "Apache License 2.0"}, and is
 ${commentStart} free for commercial and private use. For more information, please visit
 ${commentStart} our licensing page.
 ${commentStart}
@@ -132804,7 +132815,9 @@ var applyDefaultOptions = (options) => {
   options.skipNativeModulesPlugin ??= false;
   options.define ??= {};
   options.env ??= {};
-  options.getConfig ??= defaultConfig;
+  if (options.getConfig) {
+    options.getConfig = defaultConfig;
+  }
   return options;
 };
 var runTsupBuild = async (context, config, options) => {
@@ -132863,21 +132876,21 @@ ${options.banner}
   };
   if (options.getConfig) {
     writeInfo(config, "\u26A1 Running the Build process");
-    writeDebug(
-      config,
-      `\u2699\uFE0F  Build options:
-  ${Object.keys(options).map(
-        (key) => `${key}: ${!options[key] || _isPrimitive(options[key]) ? options[key] : JSON.stringify(options[key])}`
-      ).join("\n")}
-  `
-    );
     const getConfigFns = [options.getConfig];
     const tsupConfig = (0, import_tsup.defineConfig)(
       getConfigFns.map(
         (getConfigFn) => getConfig(config.workspaceRoot, context.projectRoot, getConfigFn, getConfigOptions)
       )
     );
-    if (_isFunction(tsupConfig)) {
+    writeDebug(
+      config,
+      `\u2699\uFE0F  Build options:
+  ${_isFunction2(tsupConfig) ? Object.keys(tsupConfig).map(
+        (key) => `${key}: ${!tsupConfig[key] || _isPrimitive(tsupConfig[key]) ? tsupConfig[key] : _isFunction2(tsupConfig[key]) ? "<function>" : JSON.stringify(tsupConfig[key])}`
+      ).join("\n") : "<function>"}
+  `
+    );
+    if (_isFunction2(tsupConfig)) {
       await build(await Promise.resolve(tsupConfig({})), config);
     } else {
       await build(tsupConfig, config);
@@ -132927,7 +132940,6 @@ var build = async (options, config) => {
       console.log("\u2699\uFE0F  Tsup build config: \n", options, "\n");
     }
     await (0, import_tsup.build)(options);
-    await new Promise((r) => setTimeout(r, 100));
   }
 };
 var _isPrimitive = (value) => {
@@ -132937,7 +132949,7 @@ var _isPrimitive = (value) => {
     return false;
   }
 };
-var _isFunction = (value) => {
+var _isFunction2 = (value) => {
   try {
     return value instanceof Function || typeof value === "function" || !!(value?.constructor && value?.call && value?.apply);
   } catch (e) {
@@ -139148,9 +139160,7 @@ var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 function findFileName(filePath) {
-  return filePath?.split(
-    filePath?.includes(import_node_path6.sep) ? import_node_path6.sep : filePath?.includes("/") ? "/" : "\\"
-  )?.pop() ?? "";
+  return filePath?.split(filePath?.includes(import_node_path6.sep) ? import_node_path6.sep : filePath?.includes("/") ? "/" : "\\")?.pop() ?? "";
 }
 
 // packages/workspace-tools/src/utils/get-project-configurations.ts
@@ -139219,7 +139229,7 @@ async function tsupExecutorFn(options, context, config) {
     config,
     `\u2699\uFE0F  Executor options:
 ${Object.keys(options).map(
-      (key) => `${key}: ${!options[key] || _isPrimitive2(options[key]) ? options[key] : JSON.stringify(options[key])}`
+      (key) => `${key}: ${!options[key] || _isPrimitive2(options[key]) ? options[key] : _isFunction3(options[key]) ? "<function>" : JSON.stringify(options[key])}`
     ).join("\n")}
 `
   );
@@ -139547,7 +139557,8 @@ ${(0, import_node_fs5.readFileSync)(file, "utf-8")}`,
         config,
         {
           ...options,
-          outputPath
+          outputPath,
+          getConfig: options.getConfig
         }
       );
     })
@@ -139570,6 +139581,13 @@ var _isPrimitive2 = (value) => {
     return false;
   }
 };
+var _isFunction3 = (value) => {
+  try {
+    return value instanceof Function || typeof value === "function" || !!(value?.constructor && value?.call && value?.apply);
+  } catch (e) {
+    return false;
+  }
+};
 
 // packages/workspace-tools/src/executors/tsup-neutral/get-config.ts
 var import_devkit5 = __toESM(require_devkit());
@@ -141389,10 +141407,7 @@ function findCacheDirectory({
   if (!nodeModules) {
     throw new Error("Cannot find node_modules directory");
   }
-  return useDirectory(
-    (0, import_node_path7.join)(workspaceRoot, "node_modules", ".cache", name, cacheName),
-    { create }
-  );
+  return useDirectory((0, import_node_path7.join)(workspaceRoot, "node_modules", ".cache", name, cacheName), { create });
 }
 
 // packages/workspace-tools/src/utils/typia-transform.ts