@oclif/test 4.0.1-beta.0 → 4.0.1-beta.2

package/lib/index.js

@@ -9,47 +9,6 @@ const ansis_1 = __importDefault(require("ansis"));
 const debug_1 = __importDefault(require("debug"));
 const node_path_1 = require("node:path");
 const debug = (0, debug_1.default)('oclif-test');
-const RECORD_OPTIONS = {
-    print: false,
-    stripAnsi: true,
-};
-const originals = {
-    stderr: process.stderr.write,
-    stdout: process.stdout.write,
-};
-const output = {
-    stderr: [],
-    stdout: [],
-};
-function mockedStdout(str, encoding, cb) {
-    output.stdout.push(str);
-    if (!RECORD_OPTIONS.print)
-        return true;
-    if (typeof encoding === 'string') {
-        return originals.stdout.bind(process.stdout)(str, encoding, cb);
-    }
-    return originals.stdout.bind(process.stdout)(str, cb);
-}
-function mockedStderr(str, encoding, cb) {
-    output.stderr.push(str);
-    if (!RECORD_OPTIONS.print)
-        return true;
-    if (typeof encoding === 'string') {
-        return originals.stdout.bind(process.stderr)(str, encoding, cb);
-    }
-    return originals.stdout.bind(process.stderr)(str, cb);
-}
-const restore = () => {
-    process.stderr.write = originals.stderr;
-    process.stdout.write = originals.stdout;
-};
-const reset = () => {
-    output.stderr = [];
-    output.stdout = [];
-};
-const toString = (str) => RECORD_OPTIONS.stripAnsi ? ansis_1.default.strip(str.toString()) : str.toString();
-const getStderr = () => output.stderr.map((b) => toString(b)).join('');
-const getStdout = () => output.stdout.map((b) => toString(b)).join('');
 function traverseFilePathUntil(filename, predicate) {
     let current = filename;
     while (!predicate(current)) {
@@ -69,10 +28,36 @@ function makeLoadOptions(loadOpts) {
     return loadOpts ?? { root: findRoot() };
 }
 async function captureOutput(fn, opts) {
-    RECORD_OPTIONS.print = opts?.print ?? false;
-    RECORD_OPTIONS.stripAnsi = opts?.stripAnsi ?? true;
-    process.stderr.write = mockedStderr;
-    process.stdout.write = mockedStdout;
+    const print = opts?.print ?? false;
+    const stripAnsi = opts?.stripAnsi ?? true;
+    const originals = {
+        NODE_ENV: process.env.NODE_ENV,
+        stderr: process.stderr.write,
+        stdout: process.stdout.write,
+    };
+    const output = {
+        stderr: [],
+        stdout: [],
+    };
+    const toString = (str) => (stripAnsi ? ansis_1.default.strip(str.toString()) : str.toString());
+    const getStderr = () => output.stderr.map((b) => toString(b)).join('');
+    const getStdout = () => output.stdout.map((b) => toString(b)).join('');
+    const mock = (std) => (str, encoding, cb) => {
+        output[std].push(str);
+        if (print) {
+            if (encoding !== null && typeof encoding === 'function') {
+                cb = encoding;
+                encoding = undefined;
+            }
+            originals[std].apply(process[std], [str, encoding, cb]);
+        }
+        else if (typeof cb === 'function')
+            cb();
+        return true;
+    };
+    process.stdout.write = mock('stdout');
+    process.stderr.write = mock('stderr');
+    process.env.NODE_ENV = 'test';
     try {
         const result = await fn();
         return {
@@ -83,15 +68,16 @@ async function captureOutput(fn, opts) {
     }
     catch (error) {
         return {
-            ...(error instanceof core_1.Errors.CLIError && { error }),
-            ...(error instanceof Error && { error }),
+            ...(error instanceof core_1.Errors.CLIError && { error: { ...error, message: toString(error.message) } }),
+            ...(error instanceof Error && { error: { ...error, message: toString(error.message) } }),
             stderr: getStderr(),
             stdout: getStdout(),
         };
     }
     finally {
-        restore();
-        reset();
+        process.stderr.write = originals.stderr;
+        process.stdout.write = originals.stdout;
+        process.env.NODE_ENV = originals.NODE_ENV;
     }
 }
 exports.captureOutput = captureOutput;
@@ -100,14 +86,14 @@ async function runCommand(args, loadOpts, captureOpts) {
     const argsArray = (Array.isArray(args) ? args : [args]).join(' ').split(' ');
     const [id, ...rest] = argsArray;
     const finalArgs = id === '.' ? rest : argsArray;
-    debug('loadOpts: %O', loadOpts);
+    debug('loadOpts: %O', loadOptions);
     debug('args: %O', finalArgs);
     return captureOutput(async () => (0, core_1.run)(finalArgs, loadOptions), captureOpts);
 }
 exports.runCommand = runCommand;
 async function runHook(hook, options, loadOpts, recordOpts) {
     const loadOptions = makeLoadOptions(loadOpts);
-    debug('loadOpts: %O', loadOpts);
+    debug('loadOpts: %O', loadOptions);
     return captureOutput(async () => {
         const config = await core_1.Config.load(loadOptions);
         return config.runHook(hook, options);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/test",
   "description": "test helpers for oclif components",
-  "version": "4.0.1-beta.0",
+  "version": "4.0.1-beta.2",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/test/issues",
   "dependencies": {
@@ -9,7 +9,7 @@
     "debug": "^4.3.4"
   },
   "peerDependencies": {
-    "@oclif/core": "^4.0.0-beta.6"
+    "@oclif/core": "^4.0.0-beta.7"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^18.6.3",