@storm-software/workspace-tools 1.21.8 → 1.21.9

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.21.8](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.21.7...workspace-tools-v1.21.8) (2023-12-03)
+
+
+### Bug Fixes
+
+* **workspace-tools:** Resolved issues with logging styling ([cc1ce21](https://github.com/storm-software/storm-ops/commit/cc1ce2167cf8be22db62ea73ed11ec2753fd6a0c))
+
 ## [1.21.7](https://github.com/storm-software/storm-ops/compare/workspace-tools-v1.21.6...workspace-tools-v1.21.7) (2023-12-03)
 
 

package/index.js

@@ -109706,6 +109706,136 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${process.env[key]}`).join("\
   }
 };
 
+// node_modules/.pnpm/esbuild-plugin-pino@2.1.0_esbuild@0.19.5/node_modules/esbuild-plugin-pino/dist/index.mjs
+var import_module = require("module");
+var import_node_path = __toESM(require("node:path"), 1);
+var import_promises = require("node:fs/promises");
+var import_meta2 = {};
+var require$1 = true ? /* @__PURE__ */ (0, import_module.createRequire)(import_meta2.url) : require;
+function isStringArray(entryPoints) {
+  if (Array.isArray(entryPoints) && entryPoints.some((entrypoint) => typeof entrypoint === "string"))
+    return true;
+  return false;
+}
+function transformToObject(entryPoints, outbase) {
+  const separator = entryPoints[0].includes("\\") ? import_node_path.default.win32.sep : import_node_path.default.posix.sep;
+  if (!outbase) {
+    const hierarchy = entryPoints[0].split(separator);
+    let i = 0;
+    outbase = "";
+    let nextOutbase = "";
+    do {
+      outbase = nextOutbase;
+      i++;
+      nextOutbase = hierarchy.slice(0, i).join(separator);
+    } while (entryPoints.every(
+      (entrypoint) => entrypoint.startsWith(`${nextOutbase}${separator}`)
+    ));
+  }
+  const newEntrypoints = {};
+  for (const entrypoint of entryPoints) {
+    const destination = (outbase ? entrypoint.replace(`${outbase}${separator}`, "") : entrypoint).replace(/.(js|ts)$/, "");
+    newEntrypoints[destination] = entrypoint;
+  }
+  return newEntrypoints;
+}
+function transformToNewEntryPointsType(entryPoints) {
+  const newEntrypointsType = [];
+  for (const [key, value] of Object.entries(entryPoints)) {
+    newEntrypointsType.push({ in: value, out: key });
+  }
+  return newEntrypointsType;
+}
+function esbuildPluginPino({
+  transports = []
+}) {
+  return {
+    name: "pino",
+    setup(currentBuild) {
+      const pino = import_node_path.default.dirname(require$1.resolve("pino"));
+      const threadStream = import_node_path.default.dirname(require$1.resolve("thread-stream"));
+      const { entryPoints, outbase, outExtension: outExtension2 } = currentBuild.initialOptions;
+      const customEntrypoints = {
+        "thread-stream-worker": import_node_path.default.join(threadStream, "lib/worker.js"),
+        "pino-worker": import_node_path.default.join(pino, "lib/worker.js"),
+        "pino-pipeline-worker": import_node_path.default.join(pino, "lib/worker-pipeline.js"),
+        "pino-file": import_node_path.default.join(pino, "file.js")
+      };
+      const transportsEntrypoints = Object.fromEntries(
+        transports.map((transport) => [transport, require$1.resolve(transport)])
+      );
+      let newEntrypoints = [];
+      if (isStringArray(entryPoints)) {
+        newEntrypoints = transformToNewEntryPointsType({
+          ...transformToObject(entryPoints, outbase),
+          ...customEntrypoints,
+          ...transportsEntrypoints
+        });
+      } else if (Array.isArray(entryPoints)) {
+        newEntrypoints = [
+          ...entryPoints,
+          ...transformToNewEntryPointsType({
+            ...customEntrypoints,
+            ...transportsEntrypoints
+          })
+        ];
+      } else {
+        newEntrypoints = transformToNewEntryPointsType({
+          ...entryPoints,
+          ...customEntrypoints,
+          ...transportsEntrypoints
+        });
+      }
+      currentBuild.initialOptions.entryPoints = newEntrypoints;
+      let pinoBundlerRan = false;
+      currentBuild.onEnd(() => {
+        pinoBundlerRan = false;
+      });
+      currentBuild.onLoad({ filter: /pino\.js$/ }, async (args) => {
+        if (pinoBundlerRan)
+          return;
+        pinoBundlerRan = true;
+        const contents = await (0, import_promises.readFile)(args.path, "utf8");
+        let absoluteOutputPath = "";
+        const { outdir = "dist" } = currentBuild.initialOptions;
+        if (import_node_path.default.isAbsolute(outdir)) {
+          absoluteOutputPath = outdir.replace(/\\/g, "\\\\");
+        } else {
+          const workingDir = currentBuild.initialOptions.absWorkingDir ? `"${currentBuild.initialOptions.absWorkingDir.replace(/\\/g, "\\\\")}"` : "process.cwd()";
+          absoluteOutputPath = `\${${workingDir}}\${require('path').sep}${currentBuild.initialOptions.outdir || "dist"}`;
+        }
+        const functionDeclaration = `
+          function pinoBundlerAbsolutePath(p) {
+            try {
+              return require('path').join(\`${absoluteOutputPath}\`.replace(/\\\\/g, '/'), p)
+            } catch(e) {
+              const f = new Function('p', 'return new URL(p, import.meta.url).pathname');
+              return f(p)
+            }
+          }
+        `;
+        let extension = ".js";
+        if (outExtension2 && outExtension2[".js"]) {
+          extension = outExtension2[".js"];
+        }
+        const pinoOverrides = Object.keys({
+          ...customEntrypoints,
+          ...transportsEntrypoints
+        }).map(
+          (id) => `'${id === "pino-file" ? "pino/file" : id}': pinoBundlerAbsolutePath('./${id}${extension}')`
+        ).join(",");
+        const globalThisDeclaration = `
+          globalThis.__bundlerPathsOverrides = { ...(globalThis.__bundlerPathsOverrides || {}), ${pinoOverrides}}
+        `;
+        const code = functionDeclaration + globalThisDeclaration;
+        return {
+          contents: code + contents
+        };
+      });
+    }
+  };
+}
+
 // packages/workspace-tools/src/utils/get-file-banner.ts
 var getFileBanner = (name, commentStart = "//") => {
   let padding = "";
@@ -109789,7 +109919,7 @@ var environmentPlugin = (data) => ({
 // packages/workspace-tools/src/executors/tsup/executor.ts
 var import_fs3 = require("fs");
 var import_fs_extra = __toESM(require_lib4());
-var import_promises2 = require("fs/promises");
+var import_promises3 = require("fs/promises");
 
 // node_modules/.pnpm/minimatch@9.0.3/node_modules/minimatch/dist/mjs/index.js
 var import_brace_expansion = __toESM(require_brace_expansion2(), 1);
@@ -110460,11 +110590,11 @@ var qmarksTestNoExtDot = ([$0]) => {
   return (f) => f.length === len && f !== "." && f !== "..";
 };
 var defaultPlatform = typeof process === "object" && process ? typeof process.env === "object" && process.env && process.env.__MINIMATCH_TESTING_PLATFORM__ || process.platform : "posix";
-var path = {
+var path2 = {
   win32: { sep: "\\" },
   posix: { sep: "/" }
 };
-var sep = defaultPlatform === "win32" ? path.win32.sep : path.posix.sep;
+var sep = defaultPlatform === "win32" ? path2.win32.sep : path2.posix.sep;
 minimatch.sep = sep;
 var GLOBSTAR = Symbol("globstar **");
 minimatch.GLOBSTAR = GLOBSTAR;
@@ -112355,7 +112485,7 @@ var import_path2 = require("path");
 var import_url = require("url");
 var actualFS = __toESM(require("fs"), 1);
 var import_fs2 = require("fs");
-var import_promises = require("fs/promises");
+var import_promises2 = require("fs/promises");
 
 // node_modules/.pnpm/minipass@7.0.4/node_modules/minipass/dist/esm/index.js
 var import_events = require("events");
@@ -113244,10 +113374,10 @@ var defaultFS = {
   readlinkSync: import_fs2.readlinkSync,
   realpathSync,
   promises: {
-    lstat: import_promises.lstat,
-    readdir: import_promises.readdir,
-    readlink: import_promises.readlink,
-    realpath: import_promises.realpath
+    lstat: import_promises2.lstat,
+    readdir: import_promises2.readdir,
+    readlink: import_promises2.readlink,
+    realpath: import_promises2.realpath
   }
 };
 var fsFromOption = (fsOption) => !fsOption || fsOption === defaultFS || fsOption === actualFS ? defaultFS : {
@@ -115974,13 +116104,13 @@ var import_tsup2 = __toESM(require_dist6());
 var ts = __toESM(require("typescript"));
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
-var import_node_path = require("node:path");
+var import_node_path2 = require("node:path");
 var removeExtension = (filePath) => {
   return filePath.lastIndexOf(".") ? filePath.substring(0, filePath.lastIndexOf(".")) : filePath;
 };
 function findFileName(filePath) {
   return filePath?.split(
-    filePath?.includes(import_node_path.sep) ? import_node_path.sep : filePath?.includes("/") ? "/" : "\\"
+    filePath?.includes(import_node_path2.sep) ? import_node_path2.sep : filePath?.includes("/") ? "/" : "\\"
   )?.pop() ?? "";
 }
 
@@ -116456,7 +116586,7 @@ ${externalDependencies.map((dep) => {
       ]);
       await Promise.allSettled(
         files.map(
-          (file) => (0, import_promises2.writeFile)(
+          (file) => (0, import_promises3.writeFile)(
             file,
             `${options.banner ? options.banner.startsWith("//") ? options.banner : `// ${options.banner}` : ""}
 
@@ -116602,7 +116732,9 @@ var executor_default = withRunExecutor(
 
 // packages/workspace-tools/src/executors/tsup-neutral/executor.ts
 var tsNeutralBuildExecutorFn = (options, context, config) => {
-  options.plugins ??= [];
+  if (options.transports && Array.isArray(options.transports) && options.transports.length > 0) {
+    options.plugins.push(esbuildPluginPino({ transports: options.transports }));
+  }
   return tsupExecutorFn(
     {
       ...options,
@@ -116623,9 +116755,14 @@ var tsNeutralBuildExecutorFn = (options, context, config) => {
   );
 };
 var applyDefaultOptions2 = (options) => {
-  options = applyDefaultOptions({ ...options, platform: "neutral" });
-  options.plugins ??= [];
-  return options;
+  return {
+    ...applyDefaultOptions({
+      plugins: [],
+      ...options,
+      platform: "neutral"
+    }),
+    transports: ["pino-pretty"]
+  };
 };
 var executor_default2 = withRunExecutor(
   "TypeScript Build (Neutral Platform)",
@@ -116638,136 +116775,6 @@ var executor_default2 = withRunExecutor(
   }
 );
 
-// node_modules/.pnpm/esbuild-plugin-pino@2.1.0_esbuild@0.19.5/node_modules/esbuild-plugin-pino/dist/index.mjs
-var import_module = require("module");
-var import_node_path2 = __toESM(require("node:path"), 1);
-var import_promises3 = require("node:fs/promises");
-var import_meta2 = {};
-var require$1 = true ? /* @__PURE__ */ (0, import_module.createRequire)(import_meta2.url) : require;
-function isStringArray(entryPoints) {
-  if (Array.isArray(entryPoints) && entryPoints.some((entrypoint) => typeof entrypoint === "string"))
-    return true;
-  return false;
-}
-function transformToObject(entryPoints, outbase) {
-  const separator = entryPoints[0].includes("\\") ? import_node_path2.default.win32.sep : import_node_path2.default.posix.sep;
-  if (!outbase) {
-    const hierarchy = entryPoints[0].split(separator);
-    let i = 0;
-    outbase = "";
-    let nextOutbase = "";
-    do {
-      outbase = nextOutbase;
-      i++;
-      nextOutbase = hierarchy.slice(0, i).join(separator);
-    } while (entryPoints.every(
-      (entrypoint) => entrypoint.startsWith(`${nextOutbase}${separator}`)
-    ));
-  }
-  const newEntrypoints = {};
-  for (const entrypoint of entryPoints) {
-    const destination = (outbase ? entrypoint.replace(`${outbase}${separator}`, "") : entrypoint).replace(/.(js|ts)$/, "");
-    newEntrypoints[destination] = entrypoint;
-  }
-  return newEntrypoints;
-}
-function transformToNewEntryPointsType(entryPoints) {
-  const newEntrypointsType = [];
-  for (const [key, value] of Object.entries(entryPoints)) {
-    newEntrypointsType.push({ in: value, out: key });
-  }
-  return newEntrypointsType;
-}
-function esbuildPluginPino({
-  transports = []
-}) {
-  return {
-    name: "pino",
-    setup(currentBuild) {
-      const pino = import_node_path2.default.dirname(require$1.resolve("pino"));
-      const threadStream = import_node_path2.default.dirname(require$1.resolve("thread-stream"));
-      const { entryPoints, outbase, outExtension: outExtension2 } = currentBuild.initialOptions;
-      const customEntrypoints = {
-        "thread-stream-worker": import_node_path2.default.join(threadStream, "lib/worker.js"),
-        "pino-worker": import_node_path2.default.join(pino, "lib/worker.js"),
-        "pino-pipeline-worker": import_node_path2.default.join(pino, "lib/worker-pipeline.js"),
-        "pino-file": import_node_path2.default.join(pino, "file.js")
-      };
-      const transportsEntrypoints = Object.fromEntries(
-        transports.map((transport) => [transport, require$1.resolve(transport)])
-      );
-      let newEntrypoints = [];
-      if (isStringArray(entryPoints)) {
-        newEntrypoints = transformToNewEntryPointsType({
-          ...transformToObject(entryPoints, outbase),
-          ...customEntrypoints,
-          ...transportsEntrypoints
-        });
-      } else if (Array.isArray(entryPoints)) {
-        newEntrypoints = [
-          ...entryPoints,
-          ...transformToNewEntryPointsType({
-            ...customEntrypoints,
-            ...transportsEntrypoints
-          })
-        ];
-      } else {
-        newEntrypoints = transformToNewEntryPointsType({
-          ...entryPoints,
-          ...customEntrypoints,
-          ...transportsEntrypoints
-        });
-      }
-      currentBuild.initialOptions.entryPoints = newEntrypoints;
-      let pinoBundlerRan = false;
-      currentBuild.onEnd(() => {
-        pinoBundlerRan = false;
-      });
-      currentBuild.onLoad({ filter: /pino\.js$/ }, async (args) => {
-        if (pinoBundlerRan)
-          return;
-        pinoBundlerRan = true;
-        const contents = await (0, import_promises3.readFile)(args.path, "utf8");
-        let absoluteOutputPath = "";
-        const { outdir = "dist" } = currentBuild.initialOptions;
-        if (import_node_path2.default.isAbsolute(outdir)) {
-          absoluteOutputPath = outdir.replace(/\\/g, "\\\\");
-        } else {
-          const workingDir = currentBuild.initialOptions.absWorkingDir ? `"${currentBuild.initialOptions.absWorkingDir.replace(/\\/g, "\\\\")}"` : "process.cwd()";
-          absoluteOutputPath = `\${${workingDir}}\${require('path').sep}${currentBuild.initialOptions.outdir || "dist"}`;
-        }
-        const functionDeclaration = `
-          function pinoBundlerAbsolutePath(p) {
-            try {
-              return require('path').join(\`${absoluteOutputPath}\`.replace(/\\\\/g, '/'), p)
-            } catch(e) {
-              const f = new Function('p', 'return new URL(p, import.meta.url).pathname');
-              return f(p)
-            }
-          }
-        `;
-        let extension = ".js";
-        if (outExtension2 && outExtension2[".js"]) {
-          extension = outExtension2[".js"];
-        }
-        const pinoOverrides = Object.keys({
-          ...customEntrypoints,
-          ...transportsEntrypoints
-        }).map(
-          (id) => `'${id === "pino-file" ? "pino/file" : id}': pinoBundlerAbsolutePath('./${id}${extension}')`
-        ).join(",");
-        const globalThisDeclaration = `
-          globalThis.__bundlerPathsOverrides = { ...(globalThis.__bundlerPathsOverrides || {}), ${pinoOverrides}}
-        `;
-        const code = functionDeclaration + globalThisDeclaration;
-        return {
-          contents: code + contents
-        };
-      });
-    }
-  };
-}
-
 // packages/workspace-tools/src/executors/tsup-node/executor.ts
 var tsNodeBuildExecutorFn = (options, context, config) => {
   if (options.transports && Array.isArray(options.transports) && options.transports.length > 0) {
@@ -116793,10 +116800,10 @@ var tsNodeBuildExecutorFn = (options, context, config) => {
   );
 };
 var applyDefaultOptions3 = (options) => {
-  options = applyDefaultOptions({ ...options, platform: "node" });
-  options.plugins ??= [];
-  options.transports ??= ["pino-pretty", "pino-loki"];
-  return options;
+  return {
+    ...applyDefaultOptions({ plugins: [], ...options, platform: "node" }),
+    transports: ["pino-pretty", "pino-loki"]
+  };
 };
 var executor_default3 = withRunExecutor(
   "TypeScript Build (NodeJs Platform)",