@storm-software/workspace-tools 1.41.1 → 1.42.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.41.1](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.41.0...workspace-tools-v1.41.1) (2024-01-14)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Cleaned up dependanies and option defaulting in tsup ([0ae0dd3](https://github.com/storm-software/storm-ops/commit/0ae0dd327ed646e6dbcd1c33b44aef820403cd77))
+
 # [1.41.0](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.40.1...workspace-tools-v1.41.0) (2024-01-14)
 
 

package/README.md

@@ -16,7 +16,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.org" target="_blank">stormsoftware.org</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-1.39.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
+[![Version](https://img.shields.io/badge/version-1.41.1-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;
 [![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with docusaurus](https://img.shields.io/badge/documented_with-docusaurus-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://docusaurus.io/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <h3 align="center" bold="true">⚠️ <b>Attention</b> ⚠️ This repository, and the apps, libraries, and tools contained within, is still in it's initial development phase. As a result, bugs and issues are expected with it's usage. When the main development phase completes, a proper release will be performed, the packages will be availible through NPM (and other distributions), and this message will be removed. However, in the meantime, please feel free to report any issues you may come across.</h3><br />

package/config/nx.json

@@ -4,9 +4,6 @@
   "affected": {
     "defaultBase": "main"
   },
-  "workspaceLayout": {
-    "projectNameAndRootFormat": "as-provided"
-  },
   "tasksRunnerOptions": {
     "default": {
       "runner": "nx/tasks-runners/default",
@@ -26,9 +23,12 @@
   "namedInputs": {
     "globalBuildAffectingConfig": [
       "{workspaceRoot}/tsconfig.base.json",
-      "{workspaceRoot}/package.json"
+      "{workspaceRoot}/package.json",
+      "{workspaceRoot}/storm.json"
     ],
     "globalNonBuildAffectingConfig": [
+      "{workspaceRoot}/**/biome.json",
+      "{workspaceRoot}/**/lefthook.json",
       "{workspaceRoot}/.log4brains.yml",
       "{workspaceRoot}/.eslintrc.json",
       "{workspaceRoot}/.all-contributorsrc",
@@ -81,20 +81,15 @@
     },
     "lint": {
       "cache": true,
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": [
-          "{projectRoot}/**/*.ts",
-          "{projectRoot}/package.json"
-        ]
+        "commands": [
+          "npx biome lint --apply --no-errors-on-unmatched --files-ignore-unknown=true {projectRoot}"
+        ],
+        "color": true
       },
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json",
-        "{workspaceRoot}/.eslintignore",
-        "{workspaceRoot}/eslint.config.js"
-      ]
+      "inputs": ["default", "{workspaceRoot}/**/biome.json"]
     },
     "test": {
       "cache": true,

package/index.js

@@ -127893,7 +127893,9 @@ var getConfigFile = async (filePath) => {
     return void 0;
   }
   const config = cosmiconfigResult.config ?? {};
-  cosmiconfigResult.filepath && (config.configFile = cosmiconfigResult.filepath);
+  if (cosmiconfigResult.filepath) {
+    config.configFile = cosmiconfigResult.filepath;
+  }
   config.runtimeVersion = "0.0.1";
   _static_cache = config;
   return config;
@@ -132674,6 +132676,8 @@ ${commentStart} ----------------------------------------------------------------
 };
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
+var import_fs4 = require("fs");
+var import_path4 = require("path");
 var import_esbuild_decorators = __toESM(require_src2());
 var import_devkit3 = __toESM(require_devkit());
 var import_js2 = __toESM(require_src());
@@ -132722,7 +132726,6 @@ var environmentPlugin = (data) => ({
 });
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
-var import_fs4 = require("fs");
 var import_fs_extra = __toESM(require_lib6());
 var import_promises2 = require("fs/promises");
 
@@ -138902,7 +138905,6 @@ glob.glob = glob;
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_fileutils = require("nx/src/utils/fileutils");
-var import_path4 = require("path");
 var import_prettier = require("prettier");
 var import_tsup = __toESM(require_dist6());
 var ts = __toESM(require("typescript"));
@@ -138984,10 +138986,10 @@ var import_transform = __toESM(require_transform());
 var getTypiaTransform = (program, diagnostics) => (0, import_transform.default)(program, {}, { addDiagnostic: (input) => diagnostics.push(input) });
 
 // packages/workspace-tools/src/executors/tsup/executor.ts
-async function tsupExecutorFn(options, context) {
+async function tsupExecutorFn(options, context, config) {
   try {
     console.log("\u{1F4E6}  Running Storm build executor on the workspace");
-    options.verbose && console.log(
+    getLogLevel(config?.logLevel) >= LogLevel.TRACE && console.log(
       `\u2699\uFE0F  Executor options:
 ${Object.keys(options).map(
         (key) => `${key}: ${!options[key] || _isPrimitive(options[key]) ? options[key] : JSON.stringify(options[key])}`
@@ -139003,7 +139005,9 @@ ${Object.keys(options).map(
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot;
     if (options.clean !== false) {
-      console.log(`\u{1F9F9} Cleaning output path: ${options.outputPath}`);
+      if (getLogLevel(config?.logLevel) >= LogLevel.DEBUG) {
+        console.log(`\u{1F9F9} Cleaning output path: ${options.outputPath}`);
+      }
       (0, import_fs_extra.removeSync)(options.outputPath);
     }
     const assets = Array.from(options.assets);
@@ -139072,11 +139076,15 @@ ${Object.keys(options).map(
     const implicitDependencies = context.projectsConfigurations.projects[context.projectName].implicitDependencies;
     const internalDependencies = [];
     const projectConfigs = await Promise.resolve(getProjectConfigurations());
-    console.log("Project Configs:");
-    console.log(projectConfigs);
+    if (getLogLevel(config?.logLevel) >= LogLevel.TRACE) {
+      console.log("Project Configs:");
+      console.log(projectConfigs);
+    }
     if (implicitDependencies && implicitDependencies.length > 0) {
       options.external = implicitDependencies.reduce((ret, key) => {
-        console.log(`\u26A1 Adding implicit dependency: ${key}`);
+        if (getLogLevel(config?.logLevel) >= LogLevel.DEBUG) {
+          console.log(`\u26A1 Adding implicit dependency: ${key}`);
+        }
         const projectConfig = projectConfigs[key];
         if (projectConfig?.targets?.build) {
           const projectPackageJson = (0, import_devkit3.readJsonFile)(projectConfig.targets?.build.options.project);
@@ -139102,10 +139110,12 @@ ${Object.keys(options).map(
         }
       }
     }
-    console.log(`Building with the following dependencies marked as external:
+    if (getLogLevel(config?.logLevel) >= LogLevel.TRACE) {
+      console.log(`Building with the following dependencies marked as external:
 ${externalDependencies.map((dep) => {
-      return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
-    }).join("\n")}`);
+        return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
+      }).join("\n")}`);
+    }
     const prettierOptions = {
       plugins: ["prettier-plugin-packagejson"],
       trailingComma: "none",
@@ -139142,12 +139152,14 @@ ${externalDependencies.map((dep) => {
         while (propertyKey.startsWith("/")) {
           propertyKey = propertyKey.substring(1);
         }
-        console.debug(
-          `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
-            filePath.path,
-            filePath.name
-          )}"`
-        );
+        if (getLogLevel(config?.logLevel) >= LogLevel.DEBUG) {
+          console.debug(
+            `Trying to add entry point ${propertyKey} at "${(0, import_devkit3.joinPathFragments)(
+              filePath.path,
+              filePath.name
+            )}"`
+          );
+        }
         if (!(propertyKey in ret)) {
           ret[propertyKey] = (0, import_devkit3.joinPathFragments)(filePath.path, filePath.name);
         }
@@ -139263,7 +139275,9 @@ ${externalDependencies.map((dep) => {
       packageJson.repository ??= workspacePackageJson.repository;
       packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_path4.join)("packages", context.projectName);
       const packageJsonPath = (0, import_path4.join)(context.root, options.outputPath, "package.json");
-      console.log(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
+      if (getLogLevel(config?.logLevel) >= LogLevel.DEBUG) {
+        console.debug(`\u26A1 Writing package.json file to: ${packageJsonPath}`);
+      }
       (0, import_fs4.writeFileSync)(
         packageJsonPath,
         await (0, import_prettier.format)(JSON.stringify(packageJson), {
@@ -139350,21 +139364,26 @@ ${options.banner}
       getTransform: options.skipTypia ? void 0 : getTypiaTransform
     };
     if (options.getConfig) {
+      if (getLogLevel(config?.logLevel) >= LogLevel.INFO) {
+        console.log("\u26A1 Running the Build process");
+      }
       const getConfigFns = _isFunction(options.getConfig) ? [options.getConfig] : Object.keys(options.getConfig).map((key) => options.getConfig[key]);
-      const config = (0, import_tsup.defineConfig)(
+      const tsupConfig = (0, import_tsup.defineConfig)(
         getConfigFns.map(
           (getConfigFn) => getConfig(context.root, projectRoot, getConfigFn, getConfigOptions)
         )
       );
-      if (_isFunction(config)) {
-        await build(await Promise.resolve(config({})));
+      if (_isFunction(tsupConfig)) {
+        await build(await Promise.resolve(tsupConfig({})), config);
       } else {
-        await build(config);
+        await build(tsupConfig, config);
       }
-    } else {
-      console.log("The Build process did not run because no `getConfig` parameter was provided");
+    } else if (getLogLevel(config?.logLevel) >= LogLevel.WARN) {
+      console.warn("The Build process did not run because no `getConfig` parameter was provided");
+    }
+    if (getLogLevel(config?.logLevel) >= LogLevel.INFO) {
+      console.log("\u26A1 The Build process has completed successfully");
     }
-    console.log("\u26A1 The Build process has completed successfully");
     return {
       success: true
     };
@@ -139405,12 +139424,14 @@ function getNormalizedTsConfig(workspaceRoot, outputPath, options) {
   }
   return tsConfig;
 }
-var build = async (options) => {
+var build = async (options, config) => {
   try {
-    Array.isArray(options) ? options.length > 0 ? options[0].silent : false : options.silent && console.log("\u2699\uFE0F  Tsup build config: \n", options, "\n");
     if (Array.isArray(options)) {
-      await Promise.all(options.map((buildOptions) => (0, import_tsup.build)(buildOptions)));
+      await Promise.all(options.map((buildOptions) => build(buildOptions, config)));
     } else {
+      if (getLogLevel(config?.logLevel) >= LogLevel.TRACE && !options.silent) {
+        console.log("\u2699\uFE0F  Tsup build config: \n", options, "\n");
+      }
       await (0, import_tsup.build)(options);
     }
   } catch (e) {
@@ -139559,13 +139580,11 @@ var tsupNeutralBuildExecutorFn = (options, context, config) => {
     {
       ...options,
       getConfig: {
-        "dist": neutralConfig
+        dist: neutralConfig
       },
       platform: "neutral",
       banner: getFileBanner(
-        context.projectName ? context.projectName.split(/(?=[A-Z])|[\.\-\s_]/).map((s) => s.trim()).filter((s) => !!s).map(
-          (s) => s ? s.toUpperCase()[0] + s.toLowerCase().slice(1) : ""
-        ).join(" ") : "TypeScript (Neutral Platform)"
+        context.projectName ? context.projectName.split(/(?=[A-Z])|[\.\-\s_]/).map((s) => s.trim()).filter((s) => !!s).map((s) => s ? s.toUpperCase()[0] + s.toLowerCase().slice(1) : "").join(" ") : "TypeScript (Neutral Platform)"
       ),
       define: {
         ...options.define
@@ -139687,12 +139706,10 @@ var tsupNodeBuildExecutorFn = (options, context, config) => {
   return tsupExecutorFn(
     {
       ...options,
-      getConfig: { "dist": nodeConfig },
+      getConfig: { dist: nodeConfig },
       platform: "node",
       banner: getFileBanner(
-        context.projectName ? context.projectName.split(/(?=[A-Z])|[\.\-\s_]/).map((s) => s.trim()).filter((s) => !!s).map(
-          (s) => s ? s.toUpperCase()[0] + s.toLowerCase().slice(1) : ""
-        ).join(" ") : "TypeScript (NodeJs Platform)"
+        context.projectName ? context.projectName.split(/(?=[A-Z])|[\.\-\s_]/).map((s) => s.trim()).filter((s) => !!s).map((s) => s ? s.toUpperCase()[0] + s.toLowerCase().slice(1) : "").join(" ") : "TypeScript (NodeJs Platform)"
       ),
       define: {
         ...options.define
@@ -139701,7 +139718,8 @@ var tsupNodeBuildExecutorFn = (options, context, config) => {
         ...process.env
       }
     },
-    context
+    context,
+    config
   );
 };
 var applyDefaultOptions3 = (options) => {