lib: no need to strip BOM or shebang for scripts

Backport-PR-URL: #31228 PR-URL: #27375 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Author: refack

lib/internal/main/check_syntax.js

@@ -13,10 +13,6 @@ const{
 
 const{ pathToFileURL }=require('url');
 
-const{
- stripShebangOrBOM,
-}=require('internal/modules/cjs/helpers');
-
 const{
 Module: {
 _resolveFilename: resolveCJSModuleName,
@@ -68,5 +64,5 @@ function checkSyntax(source, filename){
 }
 }
 
-wrapSafe(filename,stripShebangOrBOM(source));
+wrapSafe(filename,source);
 }

lib/internal/modules/cjs/helpers.js

@@ -111,37 +111,6 @@ function stripBOM(content){
 returncontent;
 }
 
-/**
- * Find end of shebang line and slice it off
- */
-functionstripShebang(content){
-// Remove shebang
-if(content.charAt(0)==='#'&&content.charAt(1)==='!'){
-// Find end of shebang line and slice it off
-letindex=content.indexOf('\n',2);
-if(index===-1)
-return'';
-if(content.charAt(index-1)==='\r')
-index--;
-// Note that this actually includes the newline character(s) in the
-// new output. This duplicates the behavior of the regular expression
-// that was previously used to replace the shebang line.
-content=content.slice(index);
-}
-returncontent;
-}
-
-// Strip either the shebang or UTF BOM of a file.
-// Note that this only processes one. If both occur in
-// either order, the one that comes second is not
-// significant.
-functionstripShebangOrBOM(content){
-if(content.charCodeAt(0)===0xFEFF){
-returncontent.slice(1);
-}
-returnstripShebang(content);
-}
-
 constbuiltinLibs=[
 'assert','async_hooks','buffer','child_process','cluster','crypto',
 'dgram','dns','domain','events','fs','http','http2','https','net',
@@ -208,6 +177,4 @@ module.exports ={
  makeRequireFunction,
  normalizeReferrerURL,
  stripBOM,
- stripShebang,
- stripShebangOrBOM,
 };

lib/internal/modules/cjs/loader.js

@@ -51,7 +51,7 @@ const{
  makeRequireFunction,
  normalizeReferrerURL,
  stripBOM,
-stripShebangOrBOM,
+loadNativeModule
 }=require('internal/modules/cjs/helpers');
 const{ getOptionValue }=require('internal/options');
 constenableSourceMaps=getOptionValue('--enable-source-maps');
@@ -961,9 +961,9 @@ function wrapSafe(filename, content){
 });
 }
 
-letcompiledWrapper;
+letcompiled;
 try{
-compiledWrapper=compileFunction(
+compiled=compileFunction(
 content,
 filename,
 0,
@@ -981,36 +981,39 @@ function wrapSafe(filename, content){
 ]
 );
 }catch(err){
-enrichCJSError(err);
+if(experimentalModules){
+enrichCJSError(err);
+}
 throwerr;
 }
 
 if(experimentalModules){
 const{ callbackMap }=internalBinding('module_wrap');
-callbackMap.set(compiledWrapper,{
+callbackMap.set(compiled.cacheKey,{
 importModuleDynamically: async(specifier)=>{
 constloader=awaitasyncESM.loaderPromise;
 returnloader.import(specifier,normalizeReferrerURL(filename));
 }
 });
 }
 
-returncompiledWrapper;
+returncompiled.function;
 }
 
 // Run the file contents in the correct scope or sandbox. Expose
 // the correct helper variables (require, module, exports) to
 // the file.
 // Returns exception, if any.
 Module.prototype._compile=function(content,filename){
+letmoduleURL;
+letredirects;
 if(manifest){
-constmoduleURL=pathToFileURL(filename);
+moduleURL=pathToFileURL(filename);
+redirects=manifest.getRedirector(moduleURL);
 manifest.assertIntegrity(moduleURL,content);
 }
 
-// Strip after manifest integrity check
-content=stripShebangOrBOM(content);
-
+maybeCacheSourceMap(filename,content,this);
 constcompiledWrapper=wrapSafe(filename,content);
 
 varinspectorWrapper=null;

lib/internal/modules/esm/translators.js

@@ -12,7 +12,8 @@ const{
 const{ Buffer }=require('buffer');
 
 const{
- stripBOM
+ stripBOM,
+ loadNativeModule
 }=require('internal/modules/cjs/helpers');
 constCJSModule=require('internal/modules/cjs/loader').Module;
 constinternalURLModule=require('internal/url');
@@ -78,9 +79,8 @@ translators.set('module', async function moduleStrategy(url){
 constsource=`${awaitgetSource(url)}`;
 maybeCacheSourceMap(url,source);
 debug(`Translating StandardModule ${url}`);
-const{ ModuleWrap, callbackMap }=internalBinding('module_wrap');
 constmodule=newModuleWrap(source,url);
-callbackMap.set(module,{
+moduleWrap.callbackMap.set(module,{
  initializeImportMeta,
  importModuleDynamically,
 });

test/fixtures/utf8-bom-shebang-shebang.js

@@ -0,0 +1,3 @@
+ #!shebang
+#!shebang
+module.exports=42;

test/parallel/test-internal-modules-strip-shebang.js

@@ -355,7 +355,7 @@ assert.strictEqual(require('../fixtures/utf8-bom.json'), 42);
 // Loading files with BOM + shebang.
 // See https://github.com/nodejs/node/issues/27767
 assert.throws(()=>{
-require('../fixtures/utf8-bom-shebang.js');
+require('../fixtures/utf8-bom-shebang-shebang.js');
 },{name: 'SyntaxError'});
 assert.strictEqual(require('../fixtures/utf8-shebang-bom.js'),42);