1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: do not attempt to strip type when there's no source

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/54287
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Antoine du Hamel 2024-08-12 09:51:40 +02:00 committed by GitHub
parent d7f373075d
commit 9a4eb210ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/internal/modules/esm/get_format.js
View File

@ -161,8 +161,12 @@ function getFileProtocolModuleFormat(url, context = { __proto__: null }, ignoreE
default: { // The user did not pass `--experimental-default-type`. default: { // The user did not pass `--experimental-default-type`.
// `source` is undefined when this is called from `defaultResolve`; // `source` is undefined when this is called from `defaultResolve`;
// but this gets called again from `defaultLoad`/`defaultLoadSync`. // but this gets called again from `defaultLoad`/`defaultLoadSync`.
const { tsParse } = require('internal/modules/helpers'); let parsedSource;
const parsedSource = tsParse(source); if (source) {
// We do the type stripping only if `source` is not falsy.
const { tsParse } = require('internal/modules/helpers');
parsedSource = tsParse(source);
}
const detectedFormat = detectModuleFormat(parsedSource, url); const detectedFormat = detectModuleFormat(parsedSource, url);
// When source is undefined, default to module-typescript. // When source is undefined, default to module-typescript.
const format = detectedFormat ? `${detectedFormat}-typescript` : 'module-typescript'; const format = detectedFormat ? `${detectedFormat}-typescript` : 'module-typescript';

3
lib/internal/modules/helpers.js
View File

@ -331,8 +331,7 @@ function loadTypeScriptParser(parser) {
* @returns {string} JavaScript code. * @returns {string} JavaScript code.
*/ */
function tsParse(source) { function tsParse(source) {
// TODO(@marco-ippolito) Checking empty string or non string input should be handled in Amaro. assert(typeof source === 'string');
if (!source || typeof source !== 'string') { return ''; }
const parse = loadTypeScriptParser(); const parse = loadTypeScriptParser();
const { code } = parse(source); const { code } = parse(source);
return code; return code;