@salesforce/core-bundle 7.4.0 → 7.5.0

package/lib/pino-worker.js

@@ -1945,7 +1945,7 @@ var require_package = __commonJS({
   "node_modules/thread-stream/package.json"(exports2, module2) {
     module2.exports = {
       name: "thread-stream",
-      version: "2.7.0",
+      version: "3.1.0",
       description: "A streaming way to send data to a Node.js Worker Thread",
       main: "index.js",
       types: "index.d.ts",
@@ -1960,7 +1960,7 @@ var require_package = __commonJS({
         fastbench: "^1.0.1",
         husky: "^9.0.6",
         "pino-elasticsearch": "^8.0.0",
-        "sonic-boom": "^3.0.0",
+        "sonic-boom": "^4.0.1",
         standard: "^17.0.0",
         tap: "^16.2.0",
         "ts-node": "^10.8.0",
@@ -1968,7 +1968,8 @@ var require_package = __commonJS({
         "why-is-node-running": "^2.2.2"
       },
       scripts: {
-        test: 'standard && npm run transpile && tap "test/**/*.test.*js" && tap --ts test/*.test.*ts',
+        build: "tsc --noEmit",
+        test: 'standard && npm run build && npm run transpile && tap "test/**/*.test.*js" && tap --ts test/*.test.*ts',
         "test:ci": "standard && npm run transpile && npm run test:ci:js && npm run test:ci:ts",
         "test:ci:js": 'tap --no-check-coverage --timeout=120 --coverage-report=lcovonly "test/**/*.test.*js"',
         "test:ci:ts": 'tap --ts --no-check-coverage --coverage-report=lcovonly "test/**/*.test.*ts"',
@@ -1978,7 +1979,8 @@ var require_package = __commonJS({
       },
       standard: {
         ignore: [
-          "test/ts/**/*"
+          "test/ts/**/*",
+          "test/syntax-error.mjs"
         ]
       },
       repository: {
@@ -2554,7 +2556,10 @@ var require_transport = __commonJS({
       stream.flushSync();
     }
     function transport(fullOptions) {
-      const { pipeline, targets, levels, dedupe, options = {}, worker = {}, caller = getCallers() } = fullOptions;
+      const { pipeline: pipeline2, targets, levels, dedupe, worker = {}, caller = getCallers() } = fullOptions;
+      const options = {
+        ...fullOptions.options
+      };
       const callers = typeof caller === "string" ? [caller] : caller;
       const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
       let target = fullOptions.target;
@@ -2563,20 +2568,30 @@ var require_transport = __commonJS({
       }
       if (targets) {
         target = bundlerOverrides["pino-worker"] || join(__dirname, "worker.js");
-        options.targets = targets.map((dest) => {
+        options.targets = targets.filter((dest) => dest.target).map((dest) => {
           return {
             ...dest,
             target: fixTarget(dest.target)
           };
         });
-      } else if (pipeline) {
-        target = bundlerOverrides["pino-pipeline-worker"] || join(__dirname, "worker-pipeline.js");
-        options.targets = pipeline.map((dest) => {
+        options.pipelines = targets.filter((dest) => dest.pipeline).map((dest) => {
+          return dest.pipeline.map((t) => {
+            return {
+              ...t,
+              level: dest.level,
+              // duplicate the pipeline `level` property defined in the upper level
+              target: fixTarget(t.target)
+            };
+          });
+        });
+      } else if (pipeline2) {
+        target = bundlerOverrides["pino-worker"] || join(__dirname, "worker.js");
+        options.pipelines = [pipeline2.map((dest) => {
           return {
             ...dest,
             target: fixTarget(dest.target)
           };
-        });
+        })];
       }
       if (levels) {
         options.levels = levels;
@@ -3159,7 +3174,7 @@ var require_levels = __commonJS({
 var require_meta = __commonJS({
   "node_modules/pino/lib/meta.js"(exports2, module2) {
     "use strict";
-    module2.exports = { version: "8.21.0" };
+    module2.exports = { version: "9.2.0" };
   }
 });
 
@@ -4123,7 +4138,7 @@ var require_pino = __commonJS({
         return f(p);
       }
     }
-    globalThis.__bundlerPathsOverrides = { ...globalThis.__bundlerPathsOverrides || {}, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };
+    globalThis.__bundlerPathsOverrides = { ...globalThis.__bundlerPathsOverrides || {}, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };
     var os = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
@@ -6750,12 +6765,12 @@ var require_legacy = __commonJS({
   "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/legacy.js"(exports2, module2) {
     "use strict";
     var { ArrayIsArray, ObjectSetPrototypeOf } = require_primordials();
-    var { EventEmitter: EE } = require("events");
+    var { EventEmitter: EE2 } = require("events");
     function Stream(opts) {
-      EE.call(this, opts);
+      EE2.call(this, opts);
     }
-    ObjectSetPrototypeOf(Stream.prototype, EE.prototype);
-    ObjectSetPrototypeOf(Stream, EE);
+    ObjectSetPrototypeOf(Stream.prototype, EE2.prototype);
+    ObjectSetPrototypeOf(Stream, EE2);
     Stream.prototype.pipe = function(dest, options) {
       const source = this;
       function ondata(chunk) {
@@ -6790,7 +6805,7 @@ var require_legacy = __commonJS({
       }
       function onerror(er) {
         cleanup();
-        if (EE.listenerCount(this, "error") === 0) {
+        if (EE2.listenerCount(this, "error") === 0) {
           this.emit("error", er);
         }
       }
@@ -7206,7 +7221,7 @@ var require_readable = __commonJS({
     } = require_primordials();
     module2.exports = Readable;
     Readable.ReadableState = ReadableState;
-    var { EventEmitter: EE } = require("events");
+    var { EventEmitter: EE2 } = require("events");
     var { Stream, prependListener } = require_legacy();
     var { Buffer: Buffer2 } = require("buffer");
     var { addAbortSignal } = require_add_abort_signal();
@@ -7362,7 +7377,7 @@ var require_readable = __commonJS({
     Readable.prototype._destroy = function(err, cb) {
       cb(err);
     };
-    Readable.prototype[EE.captureRejectionSymbol] = function(err) {
+    Readable.prototype[EE2.captureRejectionSymbol] = function(err) {
       this.destroy(err);
     };
     Readable.prototype[SymbolAsyncDispose] = function() {
@@ -8220,7 +8235,7 @@ var require_writable = __commonJS({
     } = require_primordials();
     module2.exports = Writable;
     Writable.WritableState = WritableState;
-    var { EventEmitter: EE } = require("events");
+    var { EventEmitter: EE2 } = require("events");
     var Stream = require_legacy().Stream;
     var { Buffer: Buffer2 } = require("buffer");
     var destroyImpl = require_destroy();
@@ -8828,7 +8843,7 @@ var require_writable = __commonJS({
     Writable.prototype._destroy = function(err, cb) {
       cb(err);
     };
-    Writable.prototype[EE.captureRejectionSymbol] = function(err) {
+    Writable.prototype[EE2.captureRejectionSymbol] = function(err) {
       this.destroy(err);
     };
     var webStreamsAdapters;
@@ -9424,16 +9439,16 @@ var require_passthrough = __commonJS({
   "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/passthrough.js"(exports2, module2) {
     "use strict";
     var { ObjectSetPrototypeOf } = require_primordials();
-    module2.exports = PassThrough;
+    module2.exports = PassThrough2;
     var Transform = require_transform();
-    ObjectSetPrototypeOf(PassThrough.prototype, Transform.prototype);
-    ObjectSetPrototypeOf(PassThrough, Transform);
-    function PassThrough(options) {
-      if (!(this instanceof PassThrough))
-        return new PassThrough(options);
+    ObjectSetPrototypeOf(PassThrough2.prototype, Transform.prototype);
+    ObjectSetPrototypeOf(PassThrough2, Transform);
+    function PassThrough2(options) {
+      if (!(this instanceof PassThrough2))
+        return new PassThrough2(options);
       Transform.call(this, options);
     }
-    PassThrough.prototype._transform = function(chunk, encoding, cb) {
+    PassThrough2.prototype._transform = function(chunk, encoding, cb) {
       cb(null, chunk);
     };
   }
@@ -9471,7 +9486,7 @@ var require_pipeline = __commonJS({
       isReadableFinished
     } = require_utils();
     var AbortController = globalThis.AbortController || require_abort_controller().AbortController;
-    var PassThrough;
+    var PassThrough2;
     var Readable;
     var addAbortListener;
     function destroyer(stream, reading, writing) {
@@ -9597,7 +9612,7 @@ var require_pipeline = __commonJS({
         }
       }
     }
-    function pipeline(...streams) {
+    function pipeline2(...streams) {
       return pipelineImpl(streams, once(popCallback(streams)));
     }
     function pipelineImpl(streams, callback, opts) {
@@ -9705,10 +9720,10 @@ var require_pipeline = __commonJS({
             }
           } else {
             var _ret2;
-            if (!PassThrough) {
-              PassThrough = require_passthrough();
+            if (!PassThrough2) {
+              PassThrough2 = require_passthrough();
             }
-            const pt = new PassThrough({
+            const pt = new PassThrough2({
               objectMode: true
             });
             const then = (_ret2 = ret) === null || _ret2 === void 0 ? void 0 : _ret2.then;
@@ -9863,7 +9878,7 @@ var require_pipeline = __commonJS({
     }
     module2.exports = {
       pipelineImpl,
-      pipeline
+      pipeline: pipeline2
     };
   }
 });
@@ -9872,7 +9887,7 @@ var require_pipeline = __commonJS({
 var require_compose = __commonJS({
   "node_modules/pino-abstract-transport/node_modules/readable-stream/lib/internal/streams/compose.js"(exports2, module2) {
     "use strict";
-    var { pipeline } = require_pipeline();
+    var { pipeline: pipeline2 } = require_pipeline();
     var Duplex = require_duplex();
     var { destroyer } = require_destroy();
     var {
@@ -9932,7 +9947,7 @@ var require_compose = __commonJS({
         }
       }
       const head = streams[0];
-      const tail = pipeline(streams, onfinished);
+      const tail = pipeline2(streams, onfinished);
       const writable = !!(isWritable(head) || isWritableStream(head) || isTransformStream(head));
       const readable = !!(isReadable(tail) || isReadableStream(tail) || isTransformStream(tail));
       d = new Duplex({
@@ -10476,7 +10491,7 @@ var require_promises = __commonJS({
     var { pipelineImpl: pl } = require_pipeline();
     var { finished } = require_end_of_stream();
     require_stream();
-    function pipeline(...streams) {
+    function pipeline2(...streams) {
       return new Promise2((resolve, reject) => {
         let signal;
         let end;
@@ -10504,7 +10519,7 @@ var require_promises = __commonJS({
     }
     module2.exports = {
       finished,
-      pipeline
+      pipeline: pipeline2
     };
   }
 });
@@ -10523,7 +10538,7 @@ var require_stream = __commonJS({
     } = require_errors();
     var compose = require_compose();
     var { setDefaultHighWaterMark, getDefaultHighWaterMark } = require_state2();
-    var { pipeline } = require_pipeline();
+    var { pipeline: pipeline2 } = require_pipeline();
     var { destroyer } = require_destroy();
     var eos = require_end_of_stream();
     var promises = require_promises();
@@ -10591,7 +10606,7 @@ var require_stream = __commonJS({
     Stream.Duplex = require_duplex();
     Stream.Transform = require_transform();
     Stream.PassThrough = require_passthrough();
-    Stream.pipeline = pipeline;
+    Stream.pipeline = pipeline2;
     var { addAbortSignal } = require_add_abort_signal();
     Stream.addAbortSignal = addAbortSignal;
     Stream.finished = eos;
@@ -10607,7 +10622,7 @@ var require_stream = __commonJS({
         return promises;
       }
     });
-    ObjectDefineProperty(pipeline, customPromisify, {
+    ObjectDefineProperty(pipeline2, customPromisify, {
       __proto__: null,
       enumerable: true,
       get() {
@@ -10836,7 +10851,7 @@ var require_transport_stream = __commonJS({
     async function loadTransportStreamBuilder2(target) {
       let fn;
       try {
-        const toLoad = "file://" + target;
+        const toLoad = target.startsWith("file://") ? target : "file://" + target;
         if (toLoad.endsWith(".ts") || toLoad.endsWith(".cts")) {
           if (process[Symbol.for("ts-node.register.instance")]) {
             realRequire("ts-node/register");
@@ -10850,7 +10865,7 @@ var require_transport_stream = __commonJS({
       } catch (error) {
         if (error.code === "ENOTDIR" || error.code === "ERR_MODULE_NOT_FOUND") {
           fn = realRequire(target);
-        } else if (error.code === void 0) {
+        } else if (error.code === void 0 || error.code === "ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING") {
           fn = realRequire(decodeURIComponent(target));
         } else {
           throw error;
@@ -10868,37 +10883,69 @@ var require_transport_stream = __commonJS({
 });
 
 // node_modules/pino/lib/worker.js
+var EE = require("events");
+var { pipeline, PassThrough } = require("stream");
 var pino = require_pino();
 var build = require_pino_abstract_transport();
 var loadTransportStreamBuilder = require_transport_stream();
-module.exports = async function({ targets, levels, dedupe }) {
-  targets = await Promise.all(targets.map(async (t) => {
-    const fn = await loadTransportStreamBuilder(t.target);
-    const stream = await fn(t.options);
-    return {
-      level: t.level,
-      stream
-    };
-  }));
-  return build(process2, {
-    parse: "lines",
-    metadata: true,
-    close(err, cb) {
-      let expected = 0;
-      for (const transport of targets) {
-        expected++;
-        transport.stream.on("close", closeCb);
-        transport.stream.end();
-      }
-      function closeCb() {
-        if (--expected === 0) {
-          cb(err);
+module.exports = async function({ targets, pipelines, levels, dedupe }) {
+  const targetStreams = [];
+  if (targets && targets.length) {
+    targets = await Promise.all(targets.map(async (t) => {
+      const fn = await loadTransportStreamBuilder(t.target);
+      const stream = await fn(t.options);
+      return {
+        level: t.level,
+        stream
+      };
+    }));
+    targetStreams.push(...targets);
+  }
+  if (pipelines && pipelines.length) {
+    pipelines = await Promise.all(
+      pipelines.map(async (p) => {
+        let level;
+        const pipeDests = await Promise.all(
+          p.map(
+            async (t) => {
+              level = t.level;
+              const fn = await loadTransportStreamBuilder(t.target);
+              const stream = await fn(t.options);
+              return stream;
+            }
+          )
+        );
+        return {
+          level,
+          stream: createPipeline(pipeDests)
+        };
+      })
+    );
+    targetStreams.push(...pipelines);
+  }
+  if (targetStreams.length === 1) {
+    return targetStreams[0].stream;
+  } else {
+    return build(process2, {
+      parse: "lines",
+      metadata: true,
+      close(err, cb) {
+        let expected = 0;
+        for (const transport of targetStreams) {
+          expected++;
+          transport.stream.on("close", closeCb);
+          transport.stream.end();
+        }
+        function closeCb() {
+          if (--expected === 0) {
+            cb(err);
+          }
         }
       }
-    }
-  });
+    });
+  }
   function process2(stream) {
-    const multi = pino.multistream(targets, { levels, dedupe });
+    const multi = pino.multistream(targetStreams, { levels, dedupe });
     stream.on("data", function(chunk) {
       const { lastTime, lastMsg, lastObj, lastLevel } = this;
       multi.lastLevel = lastLevel;
@@ -10908,4 +10955,22 @@ module.exports = async function({ targets, levels, dedupe }) {
       multi.write(chunk + "\n");
     });
   }
+  function createPipeline(streams) {
+    const ee = new EE();
+    const stream = new PassThrough({
+      autoDestroy: true,
+      destroy(_, cb) {
+        ee.on("error", cb);
+        ee.on("closed", cb);
+      }
+    });
+    pipeline(stream, ...streams, function(err) {
+      if (err && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
+        ee.emit("error", err);
+        return;
+      }
+      ee.emit("closed");
+    });
+    return stream;
+  }
 };

package/lib/thread-stream-worker.js

@@ -121,7 +121,11 @@ async function start() {
     if ((error.code === "ENOTDIR" || error.code === "ERR_MODULE_NOT_FOUND") && filename.startsWith("file://")) {
       worker = realRequire(decodeURIComponent(filename.replace("file://", "")));
     } else if (error.code === void 0 || error.code === "ERR_VM_DYNAMIC_IMPORT_CALLBACK_MISSING") {
-      worker = realRequire(decodeURIComponent(filename.replace(process.platform === "win32" ? "file:///" : "file://", "")));
+      try {
+        worker = realRequire(decodeURIComponent(filename.replace(process.platform === "win32" ? "file:///" : "file://", "")));
+      } catch {
+        throw error;
+      }
     } else {
       throw error;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core-bundle",
-  "version": "7.4.0",
+  "version": "7.5.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -37,9 +37,9 @@
   ],
   "dependencies": {
     "@jsforce/jsforce-node": "^3.2.0",
-    "@salesforce/kit": "^3.1.2",
+    "@salesforce/kit": "^3.1.6",
     "@salesforce/schemas": "^1.9.0",
-    "@salesforce/ts-types": "^2.0.9",
+    "@salesforce/ts-types": "^2.0.10",
     "ajv": "^8.15.0",
     "change-case": "^4.1.2",
     "fast-levenshtein": "^3.0.0",
@@ -48,16 +48,16 @@
     "js2xmlparser": "^4.0.1",
     "jsonwebtoken": "9.0.2",
     "jszip": "3.10.1",
-    "pino": "^8.21.0",
+    "pino": "^9.2.0",
     "pino-abstract-transport": "^1.2.0",
-    "pino-pretty": "^10.3.1",
+    "pino-pretty": "^11.2.1",
     "proper-lockfile": "^4.1.2",
     "semver": "^7.6.2",
     "ts-retry-promise": "^0.8.1"
   },
   "devDependencies": {
-    "@salesforce/dev-scripts": "^8.5.0",
-    "@salesforce/ts-sinon": "^1.4.19",
+    "@salesforce/dev-scripts": "^10.1.1",
+    "@salesforce/ts-sinon": "^1.4.22",
     "@types/benchmark": "^2.1.5",
     "@types/chai-string": "^1.4.5",
     "@types/fast-levenshtein": "^0.0.4",

package/lib/pino-pipeline-worker.js

@@ -1,87 +0,0 @@
-"use strict";
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-
-// node_modules/real-require/src/index.js
-var require_src = __commonJS({
-  "node_modules/real-require/src/index.js"(exports2, module2) {
-    var realImport = new Function("modulePath", "return import(modulePath)");
-    function realRequire(modulePath) {
-      if (typeof __non_webpack__require__ === "function") {
-        return __non_webpack__require__(modulePath);
-      }
-      return require(modulePath);
-    }
-    module2.exports = { realImport, realRequire };
-  }
-});
-
-// node_modules/pino/lib/transport-stream.js
-var require_transport_stream = __commonJS({
-  "node_modules/pino/lib/transport-stream.js"(exports2, module2) {
-    "use strict";
-    var { realImport, realRequire } = require_src();
-    module2.exports = loadTransportStreamBuilder2;
-    async function loadTransportStreamBuilder2(target) {
-      let fn;
-      try {
-        const toLoad = "file://" + target;
-        if (toLoad.endsWith(".ts") || toLoad.endsWith(".cts")) {
-          if (process[Symbol.for("ts-node.register.instance")]) {
-            realRequire("ts-node/register");
-          } else if (process.env && process.env.TS_NODE_DEV) {
-            realRequire("ts-node-dev");
-          }
-          fn = realRequire(decodeURIComponent(target));
-        } else {
-          fn = await realImport(toLoad);
-        }
-      } catch (error) {
-        if (error.code === "ENOTDIR" || error.code === "ERR_MODULE_NOT_FOUND") {
-          fn = realRequire(target);
-        } else if (error.code === void 0) {
-          fn = realRequire(decodeURIComponent(target));
-        } else {
-          throw error;
-        }
-      }
-      if (typeof fn === "object")
-        fn = fn.default;
-      if (typeof fn === "object")
-        fn = fn.default;
-      if (typeof fn !== "function")
-        throw Error("exported worker is not a function");
-      return fn;
-    }
-  }
-});
-
-// node_modules/pino/lib/worker-pipeline.js
-var EE = require("events");
-var loadTransportStreamBuilder = require_transport_stream();
-var { pipeline, PassThrough } = require("stream");
-module.exports = async function({ targets }) {
-  const streams = await Promise.all(targets.map(async (t) => {
-    const fn = await loadTransportStreamBuilder(t.target);
-    const stream2 = await fn(t.options);
-    return stream2;
-  }));
-  const ee = new EE();
-  const stream = new PassThrough({
-    autoDestroy: true,
-    destroy(_, cb) {
-      ee.on("error", cb);
-      ee.on("closed", cb);
-    }
-  });
-  pipeline(stream, ...streams, function(err) {
-    if (err && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
-      ee.emit("error", err);
-      return;
-    }
-    ee.emit("closed");
-  });
-  return stream;
-};