From cfaab3cfae0b0878fead57c88b2db0d6665fc337 Mon Sep 17 00:00:00 2001 From: f0x Date: Mon, 22 Aug 2022 20:40:51 +0200 Subject: [PATCH 1/2] change flatten to Array#flat (Node 10.x EOL) --- package.json | 1 - src/api/validate-arguments/index.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index 939c95b..d77223d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "create-error": "^0.3.1", "default-value": "^1.0.0", "execall": "^2.0.0", - "flatten": "^1.0.3", "indent-string": "^4.0.0", "is-arguments": "^1.0.4", "supports-color": "^7.1.0", diff --git a/src/api/validate-arguments/index.js b/src/api/validate-arguments/index.js index 763cfb0..be91d93 100644 --- a/src/api/validate-arguments/index.js +++ b/src/api/validate-arguments/index.js @@ -1,7 +1,6 @@ "use strict"; const isArguments = require("is-arguments"); -const flatten = require("flatten"); const asExpression = require("as-expression"); const syncpipe = require("syncpipe"); @@ -68,7 +67,7 @@ function applyDefinitions(args, definitions, remainingArgumentsIndex) { return { errors: syncpipe(results, [ (_) => _.map((result) => result.errors), - (_) => flatten(_) // TODO: Switch to `Array#flat` once Node 10.x goes EOL (April 2021) + (_) => _.flat() ]), newValue: results.map((result) => result.newValue) }; From dc0ce46e7fcafa4092cd7017e689f626e9011d06 Mon Sep 17 00:00:00 2001 From: f0x Date: Tue, 18 Oct 2022 12:32:33 +0000 Subject: [PATCH 2/2] stacktrace parsing --- src/parse-stacktrace.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/parse-stacktrace.js b/src/parse-stacktrace.js index ccc7132..0660fff 100644 --- a/src/parse-stacktrace.js +++ b/src/parse-stacktrace.js @@ -97,10 +97,12 @@ function extractFramesGecko(stack) { function extractFrames(stack) { // TODO: Maybe make this code even more cautious, and match each stacktrace line individually, aborting as soon as any one line cannot be parsed? - return defaultValue( - extractFramesV8(stack), - extractFramesGecko(stack) - ); + let v8Frames = extractFramesV8(stack); + if (v8Frames != null) { + return v8Frames; + } else { + return extractFramesGecko(stack); + } } module.exports = function parseStackTrace(error) {