Skip to content

[v22.x backport] typescript syntax detection #56912

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

Merged
aduh95 merged 8 commits into from
Feb 6, 2025
Merged

[v22.x backport] typescript syntax detection #56912

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
174d88e
module: support eval with ts syntax detection
marco-ippolito Dec 24, 2024
3ac92ef
lib: add typescript support to STDIN eval
marco-ippolito Dec 29, 2024
f041742
test: remove empty lines from snapshots
marco-ippolito Dec 24, 2024
96ec862
lib: refactor execution.js
marco-ippolito Dec 24, 2024
e4f133c
test: add ts eval snapshots
marco-ippolito Dec 25, 2024
c658a8a
worker: add eval ts input
marco-ippolito Jan 3, 2025
1614e8e
module: add ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX
marco-ippolito Jan 17, 2025
bae4b2e
module: use more defensive code when handling SWC errors
aduh95 Jan 23, 2025
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
Prev Previous commit
Next Next commit
lib: refactor execution.js 
PR-URL: #56358
Backport-PR-URL: #56912
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Jacob Smith <jacob@frende.me>
  • Loading branch information
@marco-ippolito @aduh95
marco-ippolito authored and aduh95 committed Feb 6, 2025
commit 96ec862ce23b6332269a37cd023c5de433c56d33
63 changes: 22 additions & 41 deletions lib/internal/process/execution.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,38 +84,19 @@ function evalScript(name, body, breakFirstLine, print, shouldLoadESM = false) {
evalModuleEntryPoint(body, print);
}

const runScript = () => {
// Create wrapper for cache entry
const script = `
globalThis.module = module;
globalThis.exports = exports;
globalThis.__dirname = __dirname;
globalThis.require = require;
return (main) => main();
`;
globalThis.__filename = name;
RegExpPrototypeExec(/^/, ''); // Necessary to reset RegExp statics before user code runs.
const result = module._compile(script, `${name}-wrapper`)(() => {
const compiledScript = compileScript(name, body, baseUrl);
return runScriptInThisContext(compiledScript, true, !!breakFirstLine);
});
if (print) {
const { log } = require('internal/console/global');

process.on('exit', () => {
log(result);
});
}

if (origModule !== undefined)
globalThis.module = origModule;
};
const evalFunction = () => runScriptInContext(name,
body,
breakFirstLine,
print,
module,
baseUrl,
undefined,
origModule);

if (shouldLoadESM) {
require('internal/modules/run_main').runEntryPointWithESMLoader(runScript);
return;
return require('internal/modules/run_main').runEntryPointWithESMLoader(evalFunction);
}
runScript();
evalFunction();
}

const exceptionHandlerState = {
Expand Down Expand Up @@ -301,19 +282,19 @@ function evalTypeScript(name, source, breakFirstLine, print, shouldLoadESM = fal
}
}

const evalFunction = () => runScriptInContext(name,
sourceToRun,
breakFirstLine,
print,
module,
baseUrl,
compiledScript,
origModule);

if (shouldLoadESM) {
return require('internal/modules/run_main').runEntryPointWithESMLoader(
() => runScriptInContext(name,
sourceToRun,
breakFirstLine,
print,
module,
baseUrl,
compiledScript,
origModule));
return require('internal/modules/run_main').runEntryPointWithESMLoader(evalFunction);
}

runScriptInContext(name, sourceToRun, breakFirstLine, print, module, baseUrl, compiledScript, origModule);
evalFunction();
}

/**
Expand Down Expand Up @@ -476,7 +457,7 @@ function runScriptInContext(name, body, breakFirstLine, print, module, baseUrl,
const result = module._compile(script, `${name}-wrapper`)(() => {
// If the script was already compiled, use it.
return runScriptInThisContext(
compiledScript,
compiledScript ?? compileScript(name, body, baseUrl),
true, !!breakFirstLine);
});
if (print) {
Expand Down