Skip to content

Pass the --module argument to the SM shell in the expected location #141

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.

Sign up for GitHub

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

Open
Ms2ger wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pass the --module argument to the SM shell in the expected location #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36d8671
Pass the --module argument to the SM shell in the expected location
Ms2ger Aug 23, 2024
a4de90a
Mutable state is evil
Ms2ger Aug 26, 2024
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
2 changes: 1 addition & 1 deletion lib/ConsoleAgent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ class ConsoleAgent extends Agent {
};
}

this[CHILD_PROCESS] = await this.createChildProcess([tempfile]);
this[CHILD_PROCESS] = await this.createChildProcess([...options.testHostArgs || [], tempfile]);
Copy link
Member

@gibson042 gibson042 Apr 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
this[CHILD_PROCESS] = await this.createChildProcess([...options.testHostArgs || [], tempfile]);
this[CHILD_PROCESS] = await this.createChildProcess([tempfile], options);

this.hasFinishedCreatingChildProcess = true;

if (this.isStopped && this[CHILD_PROCESS] === null) {
Expand Down
16 changes: 11 additions & 5 deletions lib/agents/jsshell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@ const stackRe = /^([\s\S]*?)\r?\nStack:\r?\n([\s\S]*)$/;
const stackFrameRe = /^(.*?)?@(.*?):(\d+):(\d+)?$/;

class JSShell extends ConsoleAgent {
async evalScript(code, options = {}) {
if (options.module && this.args[0] !== '--module') {
this.args.unshift('--module');
constructor(options) {
super(options);
if (this.args.indexOf('--module') !== -1) {
throw new Error("Passing --module as a SpiderMonkey host argument is not supported.")
}
}

if (!options.module && this.args[0] === '--module') {
this.args.shift();
async evalScript(code, options = {}) {
if (options.module) {
if (!options.testHostArgs) {
options.testHostArgs = [];
}
options.testHostArgs.push('--module');
}

return super.evalScript(code, options);
Comment on lines +21 to 29
Copy link
Member

@gibson042 gibson042 Apr 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than mutating options, I think I'd rather have this class override ConsoleAgent createChildProcess (which incidentally removes the need to override evalScript).

Suggested change
async evalScript(code, options = {}) {
if (options.module) {
if (!options.testHostArgs) {
options.testHostArgs = [];
}
options.testHostArgs.push('--module');
}
return super.evalScript(code, options);
async createChildProcess(args = [], options = {}) {
if (options.module) {
args = ['--module', ...args];
}
return super.createChildProcess(args, options);

Expand Down