lib: add primordials.SafeArrayIterator

aduh95 · danielleadams · commit 181bad58d31f · 2021-01-12T07:10:07.000-05:00
PR-URL: #36532 Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -13,6 +13,7 @@ const {
 ObjectGetOwnPropertyDescriptor,
 ObjectGetOwnPropertyDescriptors,
 ReflectApply,
+ SafeArrayIterator,
 SafeMap,
 String,
 Symbol,
@@ -653,6 +654,7 @@ function defineEventHandler(emitter, name) {
 const EventEmitterMixin = (Superclass) => {
 class MixedEventEmitter extends Superclass {
 constructor(...args) {
+ args = new SafeArrayIterator(args);
 super(...args);
 FunctionPrototypeCall(EventEmitter, this);
 }
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -462,7 +462,7 @@ function trySelf(parentPath, request) {
 const EXPORTS_PATTERN = /^((?:@[^/\\%]+\/)?[^./\\%][^/\\%]*)(\/.*)?$/;
 function resolveExports(nmPath, request) {
 // The implementation's behavior is meant to mirror resolution in ESM.
- const [, name, expansion = ''] =
+ const { 1: name, 2: expansion = '' } =
 StringPrototypeMatch(request, EXPORTS_PATTERN) || [];
 if (!name)
 return;
diff --git a/lib/internal/modules/esm/module_job.js b/lib/internal/modules/esm/module_job.js
@@ -10,6 +10,7 @@ const {
 PromiseResolve,
 PromisePrototypeCatch,
 ReflectApply,
+ SafeArrayIterator,
 SafeSet,
 StringPrototypeIncludes,
 StringPrototypeMatch,
@@ -60,9 +61,9 @@ class ModuleJob {
 });
 
 if (promises !== undefined)
- await PromiseAll(promises);
+ await PromiseAll(new SafeArrayIterator(promises));
 
- return PromiseAll(dependencyJobs);
+ return PromiseAll(new SafeArrayIterator(dependencyJobs));
 };
 // Promise for the list of all dependencyJobs.
 this.linked = link();
@@ -90,8 +91,8 @@ class ModuleJob {
 }
 jobsInGraph.add(moduleJob);
 const dependencyJobs = await moduleJob.linked;
- return PromiseAll(
- ArrayPrototypeMap(dependencyJobs, addJobsToDependencyGraph));
+ return PromiseAll(new SafeArrayIterator(
+ ArrayPrototypeMap(dependencyJobs, addJobsToDependencyGraph)));
 };
 await addJobsToDependencyGraph(this);
 
diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
@@ -242,6 +242,9 @@ primordials.SafeWeakSet = makeSafe(
 // Refs: https://tc39.es/ecma262/#sec-%typedarray%-intrinsic-object
 [
 { name: 'TypedArray', original: Reflect.getPrototypeOf(Uint8Array) },
+ { name: 'ArrayIterator', original: {
+ prototype: Reflect.getPrototypeOf(Array.prototype[Symbol.iterator]()),
+ } },
 { name: 'StringIterator', original: {
 prototype: Reflect.getPrototypeOf(String.prototype[Symbol.iterator]()),
 } },
@@ -253,6 +256,10 @@ primordials.SafeWeakSet = makeSafe(
 copyPrototype(original.prototype, primordials, `${name}Prototype`);
 });
 
+primordials.SafeArrayIterator = createSafeIterator(
+ primordials.ArrayPrototypeSymbolIterator,
+ primordials.ArrayIteratorPrototypeNext
+);
 primordials.SafeStringIterator = createSafeIterator(
 primordials.StringPrototypeSymbolIterator,
 primordials.StringIteratorPrototypeNext
diff --git a/lib/internal/url.js b/lib/internal/url.js
@@ -446,8 +446,8 @@ ObjectDefineProperties(URL.prototype, {
 if (ctx.host === null && ctx.path.length > 1 && ctx.path[0] === '') {
 ret += '/.';
 }
- for (const segment of ctx.path) {
- ret += '/' + segment;
+ if (ctx.path.length) {
+ ret += '/' + ArrayPrototypeJoin(ctx.path, '/');
 }
 }
 if (options.search && ctx.query !== null)
diff --git a/lib/internal/util/debuglog.js b/lib/internal/util/debuglog.js
@@ -6,6 +6,7 @@ const {
 ObjectDefineProperty,
 RegExp,
 RegExpPrototypeTest,
+ SafeArrayIterator,
 StringPrototypeToUpperCase
 } = primordials;
 
@@ -78,15 +79,15 @@ function debuglog(set, cb) {
 debug = debuglogImpl(enabled, set);
 if (typeof cb === 'function')
 cb(debug);
- debug(...args);
+ debug(...new SafeArrayIterator(args));
 };
 let enabled;
 let test = () => {
 init();
 test = () => enabled;
 return enabled;
 };
- const logger = (...args) => debug(...args);
+ const logger = (...args) => debug(...new SafeArrayIterator(args));
 ObjectDefineProperty(logger, 'enabled', {
 get() {
 return test();
diff --git a/test/parallel/test-require-delete-array-iterator.js b/test/parallel/test-require-delete-array-iterator.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const common = require('../common');
+
+
+const ArrayIteratorPrototype =
+ Object.getPrototypeOf(Array.prototype[Symbol.iterator]());
+
+delete Array.prototype[Symbol.iterator];
+delete ArrayIteratorPrototype.next;
+
+require('../common/fixtures');
+import('../fixtures/es-modules/test-esm-ok.mjs').then(common.mustCall());

-Original file line number
+Diff line change
  ObjectGetOwnPropertyDescriptor,
  ObjectGetOwnPropertyDescriptors,
  ReflectApply,
 + SafeArrayIterator,
  SafeMap,
  String,
  Symbol,
 constEventEmitterMixin=(Superclass)=>{
 classMixedEventEmitterextendsSuperclass{
 constructor(...args){
 +args=newSafeArrayIterator(args);
 super(...args);
 FunctionPrototypeCall(EventEmitter,this);
+}
-Original file line number
+Diff line change
 constEXPORTS_PATTERN=/^((?:@[^/\\%]+\/)?[^./\\%][^/\\%]*)(\/.*)?$/;
 functionresolveExports(nmPath,request){
 // The implementation's behavior is meant to mirror resolution in ESM.
 -const[,name,expansion='']=
 +const{1: name,2: expansion=''}=
 StringPrototypeMatch(request,EXPORTS_PATTERN)||[];
 if(!name)
 return;
-Original file line number
+Diff line change
  PromiseResolve,
  PromisePrototypeCatch,
  ReflectApply,
 + SafeArrayIterator,
  SafeSet,
  StringPrototypeIncludes,
  StringPrototypeMatch,
 });
 if(promises!==undefined)
 -awaitPromiseAll(promises);
 +awaitPromiseAll(newSafeArrayIterator(promises));
 -returnPromiseAll(dependencyJobs);
 +returnPromiseAll(newSafeArrayIterator(dependencyJobs));
 };
 // Promise for the list of all dependencyJobs.
 this.linked=link();
+}
 jobsInGraph.add(moduleJob);
 constdependencyJobs=awaitmoduleJob.linked;
 -returnPromiseAll(
 -ArrayPrototypeMap(dependencyJobs,addJobsToDependencyGraph));
 +returnPromiseAll(newSafeArrayIterator(
 +ArrayPrototypeMap(dependencyJobs,addJobsToDependencyGraph)));
 };
 awaitaddJobsToDependencyGraph(this);
Original file line number	Diff line number	Diff line change
`@@ -446,8 +446,8 @@ ObjectDefineProperties(URL.prototype, {`
`446`	`446`	`if(ctx.host===null&&ctx.path.length>1&&ctx.path[0]===''){`
`447`	`447`	`ret+='/.';`
`448`	`448`	`}`
`449`		`-for(constsegmentofctx.path){`
`450`		`-ret+='/'+segment;`
	`449`	`+if(ctx.path.length){`
	`450`	`+ret+='/'+ArrayPrototypeJoin(ctx.path,'/');`
`451`	`451`	`}`
`452`	`452`	`}`
`453`	`453`	`if(options.search&&ctx.query!==null)`
-Original file line number
+Diff line change
  ObjectDefineProperty,
  RegExp,
  RegExpPrototypeTest,
 + SafeArrayIterator,
  StringPrototypeToUpperCase
 }=primordials;
 debug=debuglogImpl(enabled,set);
 if(typeofcb==='function')
 cb(debug);
 -debug(...args);
 +debug(...newSafeArrayIterator(args));
 };
 letenabled;
 lettest=()=>{
 init();
 test=()=>enabled;
 returnenabled;
 };
 -constlogger=(...args)=>debug(...args);
 +constlogger=(...args)=>debug(...newSafeArrayIterator(args));
 ObjectDefineProperty(logger,'enabled',{
 get(){
 returntest();