Skip to content

Commit

Permalink
fix: illegal return statement parsing error (#164)
Browse files Browse the repository at this point in the history
  • Loading branch information
fraxken authored Nov 28, 2023
1 parent b598587 commit c3caab9
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
8 changes: 6 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,19 @@ function parseScriptExtended(strToAnalyze, options = {}) {
return body;
}
catch (error) {
const isIllegalReturn = error.description.includes("Illegal return statement");

if (error.name === "SyntaxError" && (
error.description.includes("The import keyword") ||
error.description.includes("The export keyword")
error.description.includes("The export keyword") ||
isIllegalReturn
)) {
const { body } = meriyah.parseScript(
cleanedStrToAnalyze,
{
...kMeriyahDefaultOptions,
module: true
module: true,
globalReturn: isIllegalReturn
}
);

Expand Down
31 changes: 31 additions & 0 deletions test/illegalReturnStatement.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Import Node.js Dependencies
import { test } from "node:test";
import assert from "node:assert";

// Import Internal Dependencies
import { runASTAnalysis } from "../index.js";

/**
* @see https://github.com/NodeSecure/js-x-ray/issues/163
*/
// CONSTANTS
const kIncriminedCodeSample = `
const argv = process.argv.slice(2);
function foobar() {
console.log("foobar");
}
if (!argv.length) {
return foobar();
}
`;

test("it should not throw error whatever module is true or false", () => {
assert.doesNotThrow(() => {
runASTAnalysis(kIncriminedCodeSample, { module: false });
});
assert.doesNotThrow(() => {
runASTAnalysis(kIncriminedCodeSample, { module: true });
});
});

0 comments on commit c3caab9

Please sign in to comment.