wasi: improve use of primordials

cjihrig · MylesBorins · commit bdaac04c1019 · 2020-01-16T01:34:32.000-05:00
PR-URL: #31212 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/wasi.js b/lib/wasi.js
@@ -2,10 +2,10 @@
 /* global WebAssembly */
 const {
 ArrayIsArray,
- ArrayPrototypeForEach,
 ArrayPrototypeMap,
+ ArrayPrototypePush,
 FunctionPrototypeBind,
- ObjectKeys,
+ ObjectEntries,
 Symbol,
 } = primordials;
 
@@ -40,7 +40,7 @@ class WASI {
 for (const key in env) {
 const value = env[key];
 if (value !== undefined)
- envPairs.push(`${key}=${value}`);
+ ArrayPrototypePush(envPairs, `${key}=${value}`);
 }
 } else if (env !== undefined) {
 throw new ERR_INVALID_ARG_TYPE('options.env', 'Object', env);
@@ -49,10 +49,9 @@ class WASI {
 const preopenArray = [];
 
 if (typeof preopens === 'object' && preopens !== null) {
- ArrayPrototypeForEach(ObjectKeys(preopens), (key) => {
- preopenArray.push(String(key));
- preopenArray.push(String(preopens[key]));
- });
+ for (const [key, value] of ObjectEntries(preopens)) {
+ ArrayPrototypePush(preopenArray, String(key), String(value));
+ }
 } else if (preopens !== undefined) {
 throw new ERR_INVALID_ARG_TYPE('options.preopens', 'Object', preopens);
 }

-Original file line number
+Diff line change
 /* global WebAssembly */
 const{
  ArrayIsArray,
 - ArrayPrototypeForEach,
  ArrayPrototypeMap,
 + ArrayPrototypePush,
  FunctionPrototypeBind,
 -ObjectKeys,
 +ObjectEntries,
  Symbol,
 }=primordials;
 for(constkeyinenv){
 constvalue=env[key];
 if(value!==undefined)
 -envPairs.push(`${key}=${value}`);
 +ArrayPrototypePush(envPairs,`${key}=${value}`);
+}
 }elseif(env!==undefined){
 thrownewERR_INVALID_ARG_TYPE('options.env','Object',env);
 constpreopenArray=[];
 if(typeofpreopens==='object'&&preopens!==null){
 -ArrayPrototypeForEach(ObjectKeys(preopens),(key)=>{
 -preopenArray.push(String(key));
 -preopenArray.push(String(preopens[key]));
 -});
 +for(const[key,value]ofObjectEntries(preopens)){
 +ArrayPrototypePush(preopenArray,String(key),String(value));
 +}
 }elseif(preopens!==undefined){
 thrownewERR_INVALID_ARG_TYPE('options.preopens','Object',preopens);
+}