lib: move setupAllowedFlags() into per_thread.js

Because most of its code (the getter) has nothing to do with
the actual bootstrapping and it is run per-thread.
PR-URL: #24704
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Christopher Hiller <boneskull@boneskull.com>

Author: joyeecheung

lib/internal/bootstrap/node.js

@@ -223,7 +223,7 @@
 
 perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE);
 
-setupAllowedFlags();
+perThreadSetup.setupAllowedFlags();
 
 startExecution();
 }
@@ -739,128 +739,5 @@
 newvm.Script(source,{displayErrors: true, filename });
 }
 
-functionsetupAllowedFlags(){
-// This builds process.allowedNodeEnvironmentFlags
-// from data in the config binding
-
-constreplaceUnderscoresRegex=/_/g;
-constleadingDashesRegex=/^--?/;
-consttrailingValuesRegex=/=.*$/;
-
-// Save references so user code does not interfere
-constreplace=Function.call.bind(String.prototype.replace);
-consthas=Function.call.bind(Set.prototype.has);
-consttest=Function.call.bind(RegExp.prototype.test);
-
-constget=()=>{
-const{
-envSettings: { kAllowedInEnvironment }
-}=internalBinding('options');
-const{ options, aliases }=NativeModule.require('internal/options');
-
-constallowedNodeEnvironmentFlags=[];
-for(const[name,info]ofoptions){
-if(info.envVarSettings===kAllowedInEnvironment){
-allowedNodeEnvironmentFlags.push(name);
-}
-}
-
-for(const[from,expansion]ofaliases){
-letisAccepted=true;
-for(consttoofexpansion){
-if(!to.startsWith('-')||to==='--')continue;
-constrecursiveExpansion=aliases.get(to);
-if(recursiveExpansion){
-if(recursiveExpansion[0]===to)
-recursiveExpansion.splice(0,1);
-expansion.push(...recursiveExpansion);
-continue;
-}
-isAccepted=options.get(to).envVarSettings===kAllowedInEnvironment;
-if(!isAccepted)break;
-}
-if(isAccepted){
-letcanonical=from;
-if(canonical.endsWith('='))
-canonical=canonical.substr(0,canonical.length-1);
-if(canonical.endsWith(' <arg>'))
-canonical=canonical.substr(0,canonical.length-4);
-allowedNodeEnvironmentFlags.push(canonical);
-}
-}
-
-consttrimLeadingDashes=(flag)=>replace(flag,leadingDashesRegex,'');
-
-// Save these for comparison against flags provided to
-// process.allowedNodeEnvironmentFlags.has() which lack leading dashes.
-// Avoid interference w/ user code by flattening `Set.prototype` into
-// each object.
-constnodeFlags=Object.defineProperties(
-newSet(allowedNodeEnvironmentFlags.map(trimLeadingDashes)),
-Object.getOwnPropertyDescriptors(Set.prototype)
-);
-
-classNodeEnvironmentFlagsSetextendsSet{
-constructor(...args){
-super(...args);
-
-// the super constructor consumes `add`, but
-// disallow any future adds.
-this.add=()=>this;
-}
-
-delete(){
-// noop, `Set` API compatible
-returnfalse;
-}
-
-clear(){
-// noop
-}
-
-has(key){
-// This will return `true` based on various possible
-// permutations of a flag, including present/missing leading
-// dash(es) and/or underscores-for-dashes.
-// Strips any values after `=`, inclusive.
-// TODO(addaleax): It might be more flexible to run the option parser
-// on a dummy option set and see whether it rejects the argument or
-// not.
-if(typeofkey==='string'){
-key=replace(key,replaceUnderscoresRegex,'-');
-if(test(leadingDashesRegex,key)){
-key=replace(key,trailingValuesRegex,'');
-returnhas(this,key);
-}
-returnhas(nodeFlags,key);
-}
-returnfalse;
-}
-}
-
-Object.freeze(NodeEnvironmentFlagsSet.prototype.constructor);
-Object.freeze(NodeEnvironmentFlagsSet.prototype);
-
-returnprocess.allowedNodeEnvironmentFlags=Object.freeze(
-newNodeEnvironmentFlagsSet(
-allowedNodeEnvironmentFlags
-));
-};
-
-Object.defineProperty(process,'allowedNodeEnvironmentFlags',{
- get,
-set(value){
-Object.defineProperty(this,'allowedNodeEnvironmentFlags',{
- value,
-configurable: true,
-enumerable: true,
-writable: true
-});
-},
-enumerable: true,
-configurable: true
-});
-}
-
 startup();
 });

lib/internal/process/per_thread.js

@@ -234,7 +234,132 @@ function setupUncaughtExceptionCapture(exceptionHandlerState,
 };
 }
 
+constreplaceUnderscoresRegex=/_/g;
+constleadingDashesRegex=/^--?/;
+consttrailingValuesRegex=/=.*$/;
+
+// Save references so user code does not interfere
+constreplace=Function.call.bind(String.prototype.replace);
+consthas=Function.call.bind(Set.prototype.has);
+consttest=Function.call.bind(RegExp.prototype.test);
+
+// This builds the initial process.allowedNodeEnvironmentFlags
+// from data in the config binding.
+functionbuildAllowedFlags(){
+const{
+envSettings: { kAllowedInEnvironment }
+}=internalBinding('options');
+const{ options, aliases }=require('internal/options');
+
+constallowedNodeEnvironmentFlags=[];
+for(const[name,info]ofoptions){
+if(info.envVarSettings===kAllowedInEnvironment){
+allowedNodeEnvironmentFlags.push(name);
+}
+}
+
+for(const[from,expansion]ofaliases){
+letisAccepted=true;
+for(consttoofexpansion){
+if(!to.startsWith('-')||to==='--')continue;
+constrecursiveExpansion=aliases.get(to);
+if(recursiveExpansion){
+if(recursiveExpansion[0]===to)
+recursiveExpansion.splice(0,1);
+expansion.push(...recursiveExpansion);
+continue;
+}
+isAccepted=options.get(to).envVarSettings===kAllowedInEnvironment;
+if(!isAccepted)break;
+}
+if(isAccepted){
+letcanonical=from;
+if(canonical.endsWith('='))
+canonical=canonical.substr(0,canonical.length-1);
+if(canonical.endsWith(' <arg>'))
+canonical=canonical.substr(0,canonical.length-4);
+allowedNodeEnvironmentFlags.push(canonical);
+}
+}
+
+consttrimLeadingDashes=(flag)=>replace(flag,leadingDashesRegex,'');
+
+// Save these for comparison against flags provided to
+// process.allowedNodeEnvironmentFlags.has() which lack leading dashes.
+// Avoid interference w/ user code by flattening `Set.prototype` into
+// each object.
+constnodeFlags=Object.defineProperties(
+newSet(allowedNodeEnvironmentFlags.map(trimLeadingDashes)),
+Object.getOwnPropertyDescriptors(Set.prototype)
+);
+
+classNodeEnvironmentFlagsSetextendsSet{
+constructor(...args){
+super(...args);
+
+// the super constructor consumes `add`, but
+// disallow any future adds.
+this.add=()=>this;
+}
+
+delete(){
+// noop, `Set` API compatible
+returnfalse;
+}
+
+clear(){
+// noop
+}
+
+has(key){
+// This will return `true` based on various possible
+// permutations of a flag, including present/missing leading
+// dash(es) and/or underscores-for-dashes.
+// Strips any values after `=`, inclusive.
+// TODO(addaleax): It might be more flexible to run the option parser
+// on a dummy option set and see whether it rejects the argument or
+// not.
+if(typeofkey==='string'){
+key=replace(key,replaceUnderscoresRegex,'-');
+if(test(leadingDashesRegex,key)){
+key=replace(key,trailingValuesRegex,'');
+returnhas(this,key);
+}
+returnhas(nodeFlags,key);
+}
+returnfalse;
+}
+}
+
+Object.freeze(NodeEnvironmentFlagsSet.prototype.constructor);
+Object.freeze(NodeEnvironmentFlagsSet.prototype);
+
+returnprocess.allowedNodeEnvironmentFlags=Object.freeze(
+newNodeEnvironmentFlagsSet(
+allowedNodeEnvironmentFlags
+));
+}
+
+functionsetupAllowedFlags(){
+Object.defineProperty(process,'allowedNodeEnvironmentFlags',{
+get: buildAllowedFlags,
+set(value){
+// If the user tries to set this to another value, override
+// this completely to that value.
+Object.defineProperty(this,'allowedNodeEnvironmentFlags',{
+ value,
+configurable: true,
+enumerable: true,
+writable: true
+});
+},
+enumerable: true,
+configurable: true
+});
+}
+
 module.exports={
+ setupAllowedFlags,
  setupAssert,
  setupCpuUsage,
  setupHrtime,