module: simplify ts under node_modules check

PR-URL: #55440 Backport-PR-URL: #56208 Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Chengzhong Wu <[email protected]>

Author: marco-ippolito

lib/internal/modules/cjs/loader.js

@@ -125,10 +125,10 @@ const{pathToFileURL, fileURLToPath, isURL } = require('internal/url');
 const{
  pendingDeprecate,
  emitExperimentalWarning,
- isUnderNodeModules,
  kEmptyObject,
  setOwnProperty,
  getLazy,
+ isUnderNodeModules,
  isWindows,
 }=require('internal/util');
 const{
@@ -170,7 +170,6 @@ const{
 ERR_REQUIRE_CYCLE_MODULE,
 ERR_REQUIRE_ESM,
 ERR_UNKNOWN_BUILTIN_MODULE,
-ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING,
 },
  setArrowMessage,
 }=require('internal/errors');
@@ -1348,9 +1347,6 @@ let emittedRequireModuleWarning = false;
 functionloadESMFromCJS(mod,filename){
 letsource=getMaybeCachedSource(mod,filename);
 if(getOptionValue('--experimental-strip-types')&&path.extname(filename)==='.mts'){
-if(isUnderNodeModules(filename)){
-thrownewERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING(filename);
-}
 source=stripTypeScriptTypes(source,filename);
 }
 constcascadedLoader=require('internal/modules/esm/loader').getOrInitializeCascadedLoader();
@@ -1587,9 +1583,6 @@ function getMaybeCachedSource(mod, filename){
 }
 
 functionloadCTS(module,filename){
-if(isUnderNodeModules(filename)){
-thrownewERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING(filename);
-}
 constsource=getMaybeCachedSource(module,filename);
 constcode=stripTypeScriptTypes(source,filename);
 module._compile(code,filename,'commonjs');
@@ -1601,9 +1594,6 @@ function loadCTS(module, filename){
  * @param{string} filename The file path of the module
  */
 functionloadTS(module,filename){
-if(isUnderNodeModules(filename)){
-thrownewERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING(filename);
-}
 // If already analyzed the source, then it will be cached.
 constsource=getMaybeCachedSource(module,filename);
 constcontent=stripTypeScriptTypes(source,filename);

lib/internal/modules/esm/load.js

@@ -4,7 +4,6 @@ const{
  RegExpPrototypeExec,
 }=primordials;
 const{
- isUnderNodeModules,
  kEmptyObject,
 }=require('internal/util');
 
@@ -23,7 +22,6 @@ const{
 ERR_INVALID_URL,
 ERR_UNKNOWN_MODULE_FORMAT,
 ERR_UNSUPPORTED_ESM_URL_SCHEME,
-ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING,
 }=require('internal/errors').codes;
 
 const{
@@ -131,12 +129,6 @@ async function defaultLoad(url, context = kEmptyObject){
 
 validateAttributes(url,format,importAttributes);
 
-if(getOptionValue('--experimental-strip-types')&&
-(format==='module-typescript'||format==='commonjs-typescript')&&
-isUnderNodeModules(url)){
-thrownewERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING(url);
-}
-
 return{
 __proto__: null,
  format,

lib/internal/modules/helpers.js

@@ -16,6 +16,7 @@ const{
 ERR_INVALID_ARG_TYPE,
 ERR_INVALID_RETURN_PROPERTY_VALUE,
 ERR_INVALID_TYPESCRIPT_SYNTAX,
+ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING,
 }=require('internal/errors').codes;
 const{ BuiltinModule }=require('internal/bootstrap/realm');
 
@@ -28,7 +29,7 @@ const assert = require('internal/assert');
 
 const{ Buffer }=require('buffer');
 const{ getOptionValue }=require('internal/options');
-const{ assertTypeScript, setOwnProperty, getLazy }=require('internal/util');
+const{ assertTypeScript, setOwnProperty, getLazy, isUnderNodeModules}=require('internal/util');
 const{ inspect }=require('internal/util/inspect');
 
 constlazyTmpdir=getLazy(()=>require('os').tmpdir());
@@ -358,6 +359,9 @@ function parseTypeScript(source, options){
  * @returns{TransformOutput} The stripped TypeScript code.
  */
 functionstripTypeScriptTypes(source,filename){
+if(isUnderNodeModules(filename)){
+thrownewERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING(filename);
+}
 assert(typeofsource==='string');
 constoptions={
 __proto__: null,