Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(isOneLineRequire): must return true for a one line require with no export #284

Merged
merged 1 commit into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/utils/isOneLineExpressionExport.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,23 @@
import { exportAssignmentHasRequireLeave } from "./exportAssignmentHasRequireLeave.js";

export function isOneLineExpressionExport(body) {
if (body.length > 1) {
if (body.length === 0 || body.length > 1) {
return false;
}

if (body[0].type !== "ExpressionStatement") {
const [firstNode] = body;
if (firstNode.type !== "ExpressionStatement") {
return false;
}

if (body[0].expression.type !== "AssignmentExpression") {
return false;
switch (firstNode.expression.type) {
// module.exports = require('...');
case "AssignmentExpression":
return exportAssignmentHasRequireLeave(firstNode.expression.right);
// require('...');
case "CallExpression":
return exportAssignmentHasRequireLeave(firstNode.expression);
default:
return false;
}

return exportAssignmentHasRequireLeave(body[0].expression.right);
}
19 changes: 19 additions & 0 deletions test/issues/283-oneline-require-minified.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Import Node.js Dependencies
import { test } from "node:test";
import assert from "node:assert";

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

// Regression test for https://github.com/NodeSecure/js-x-ray/issues/283
test("Given a one line require (with no module.exports) then isOneLineRequire must equal true", () => {
const { isOneLineRequire } = runASTAnalysis(`require('foo.js');`);

assert.ok(isOneLineRequire);
});

test("Given an empty code then isOneLineRequire must equal false", () => {
const { isOneLineRequire } = runASTAnalysis(``);

assert.strictEqual(isOneLineRequire, false);
});
Loading