Skip to content

Commit

Permalink
fix: illegal return statement parsing error
Browse files Browse the repository at this point in the history
  • Loading branch information
fraxken committed Nov 28, 2023
1 parent b598587 commit 45c0433
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 2 deletions.
52 changes: 52 additions & 0 deletions foo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/usr/bin/env node

const which = require('../lib')
const argv = process.argv.slice(2)

const usage = (err) => {
if (err) {
console.error(`which: ${err}`)
}
console.error('usage: which [-as] program ...')
process.exit(1)
}

if (!argv.length) {
return usage()
}

let dashdash = false
const [commands, flags] = argv.reduce((acc, arg) => {
if (dashdash || arg === '--') {
dashdash = true
return acc
}

if (!/^-/.test(arg)) {
acc[0].push(arg)
return acc
}

for (const flag of arg.slice(1).split('')) {
if (flag === 's') {
acc[1].silent = true
} else if (flag === 'a') {
acc[1].all = true
} else {
usage(`illegal option -- ${flag}`)
}
}

return acc
}, [[], {}])

for (const command of commands) {
try {
const res = which.sync(command, { all: flags.all })
if (!flags.silent) {
console.log([].concat(res).join('\n'))
}
} catch (err) {
process.exitCode = 1
}
}
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
27 changes: 27 additions & 0 deletions test/illegalReturnStatement.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// 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", () => {
runASTAnalysis(kIncriminedCodeSample, { module: false });
runASTAnalysis(kIncriminedCodeSample, { module: true });
});

0 comments on commit 45c0433

Please sign in to comment.