FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

lib: add Iterator global to primordials · nodejs/node@7f4af55 · GitHub

/ node Public

Commit 7f4af55

Browse files
Renegade334
authored and
aduh95
committed
lib: add Iterator global to primordials
Signed-off-by: Renegade334 <contact.9a5d6388@renegade334.me.uk> PR-URL: #63698 Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 85c6d46 commit 7f4af55

3 files changed

Lines changed: 81 additions & 31 deletions

File tree

‎lib/eslint.config_partial.mjs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,6 @@ export default [
148148
name: 'Intl',
149149
message: 'Use `const { Intl } = globalThis;` instead of the global.',
150150
},
151-
{
152-
name: 'Iterator',
153-
message: 'Use `const { Iterator } = globalThis;` instead of the global.',
154-
},
155151
{
156152
name: 'MessageChannel',
157153
message: "Use `const { MessageChannel } = require('internal/worker/io');` instead of the global.",
@@ -441,6 +437,7 @@ export default [
441437
{ name: 'Int16Array' },
442438
{ name: 'Int32Array' },
443439
{ name: 'Int8Array' },
440+
{ name: 'Iterator' },
444441
{
445442
name: 'isFinite',
446443
into: 'Number',

‎lib/internal/per_context/primordials.js‎

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ function copyPrototype(src, dest, prefix) {
202202
'Int16Array',
203203
'Int32Array',
204204
'Int8Array',
205+
'Iterator',
205206
'Map',
206207
'Number',
207208
'Object',
@@ -230,10 +231,10 @@ function copyPrototype(src, dest, prefix) {
230231
});
231232

232233

233-
// Create copies of intrinsic objects that require a valid `this` to call
234-
// static methods.
235-
// Refs: https://www.ecma-international.org/ecma-262/#sec-promise.all
234+
// Create copies of intrinsic objects whose static methods require the
235+
// constructor to be passed as the receiver.
236236
[
237+
// Refs: https://tc39.es/ecma-262/#sec-promise.all
237238
'Promise',
238239
].forEach((name) => {
239240
// eslint-disable-next-line no-restricted-globals
@@ -244,25 +245,56 @@ function copyPrototype(src, dest, prefix) {
244245
});
245246

246247
// Create copies of abstract intrinsic objects that are not directly exposed
247-
// on the global object.
248-
// Refs: https://tc39.es/ecma262/#sec-%typedarray%-intrinsic-object
248+
// on the global object, and whose static methods require a valid subclass
249+
// constructor to be passed as the receiver.
249250
[
251+
// Refs: https://tc39.es/ecma262/#sec-%typedarray%-intrinsic-object
250252
{ name: 'TypedArray', original: Reflect.getPrototypeOf(Uint8Array) },
251-
{ name: 'ArrayIterator', original: {
252-
prototype: Reflect.getPrototypeOf(Array.prototype[Symbol.iterator]()),
253-
} },
254-
{ name: 'StringIterator', original: {
255-
prototype: Reflect.getPrototypeOf(String.prototype[Symbol.iterator]()),
256-
} },
257253
].forEach(({ name, original }) => {
258254
primordials[name] = original;
259-
// The static %TypedArray% methods require a valid `this`, but can't be bound,
260-
// as they need a subclass constructor as the receiver:
261255
copyPrototype(original, primordials, name);
262256
copyPrototype(original.prototype, primordials, `${name}Prototype`);
263257
});
264258

265-
primordials.IteratorPrototype = Reflect.getPrototypeOf(primordials.ArrayIteratorPrototype);
259+
// Create copies of abstract intrinsic prototypes that are not directly exposed
260+
// on the global object and which do not have corresponding constructors.
261+
[
262+
{
263+
name: 'ArrayIteratorPrototype',
264+
original: Reflect.getPrototypeOf(Array.prototype[Symbol.iterator]()),
265+
},
266+
{
267+
name: 'AsyncIteratorPrototype',
268+
original: Reflect.getPrototypeOf(Reflect.getPrototypeOf(async function*() {}).prototype),
269+
},
270+
{
271+
name: 'IteratorHelperPrototype',
272+
original: Reflect.getPrototypeOf(primordials.IteratorPrototypeDrop({ __proto__: null }, null)),
273+
},
274+
{
275+
name: 'MapIteratorPrototype',
276+
original: Reflect.getPrototypeOf(new primordials.Map()[Symbol.iterator]()),
277+
},
278+
{
279+
name: 'RegExpStringIteratorPrototype',
280+
original: Reflect.getPrototypeOf(primordials.RegExp.prototype[Symbol.matchAll]()),
281+
},
282+
{
283+
name: 'SetIteratorPrototype',
284+
original: Reflect.getPrototypeOf(new primordials.Set()[Symbol.iterator]()),
285+
},
286+
{
287+
name: 'StringIteratorPrototype',
288+
original: Reflect.getPrototypeOf(String.prototype[Symbol.iterator]()),
289+
},
290+
{
291+
name: 'WrapForValidIteratorPrototype',
292+
original: Reflect.getPrototypeOf(primordials.IteratorFrom({ __proto__: null })),
293+
},
294+
].forEach(({ name, original }) => {
295+
primordials[name] = original;
296+
copyPrototype(original, primordials, name);
297+
});
266298

267299
/* eslint-enable node-core/prefer-primordials */
268300

@@ -366,21 +398,18 @@ const copyProps = (src, dest) => {
366398
/**
367399
* @type {typeof primordials.makeSafe}
368400
*/
369-
const makeSafe = (unsafe, safe) => {
370-
if (SymbolIterator in unsafe.prototype) {
401+
const makeSafe = (unsafe, safe, next) => {
402+
if (next) {
371403
const dummy = new unsafe();
372-
let next; // We can reuse the same `next` method.
373-
374404
ArrayPrototypeForEach(ReflectOwnKeys(unsafe.prototype), (key) => {
375405
if (!ReflectGetOwnPropertyDescriptor(safe.prototype, key)) {
376406
const desc = ReflectGetOwnPropertyDescriptor(unsafe.prototype, key);
377407
if (
378408
typeof desc.value === 'function' &&
379409
desc.value.length === 0 &&
380-
SymbolIterator in (FunctionPrototypeCall(desc.value, dummy) ?? {})
410+
FunctionPrototypeCall(desc.value, dummy)?.next === next
381411
) {
382412
const createIterator = uncurryThis(desc.value);
383-
next ??= uncurryThis(createIterator(dummy).next);
384413
const SafeIterator = createSafeIterator(createIterator, next);
385414
desc.value = function() {
386415
return new SafeIterator(this);
@@ -406,6 +435,7 @@ primordials.makeSafe = makeSafe;
406435
primordials.SafeMap = makeSafe(
407436
Map,
408437
class SafeMap extends Map {},
438+
primordials.MapIteratorPrototypeNext,
409439
);
410440
primordials.SafeWeakMap = makeSafe(
411441
WeakMap,
@@ -415,6 +445,7 @@ primordials.SafeWeakMap = makeSafe(
415445
primordials.SafeSet = makeSafe(
416446
Set,
417447
class SafeSet extends Set {},
448+
primordials.SetIteratorPrototypeNext,
418449
);
419450
primordials.SafeWeakSet = makeSafe(
420451
WeakSet,
@@ -453,11 +484,6 @@ primordials.SafePromisePrototypeFinally = (thisPromise, onFinally) =>
453484
.then(a, b),
454485
);
455486

456-
primordials.AsyncIteratorPrototype =
457-
primordials.ReflectGetPrototypeOf(
458-
primordials.ReflectGetPrototypeOf(
459-
async function* () {}).prototype);
460-
461487
const arrayToSafePromiseIterable = (promises, mapFn) =>
462488
new primordials.SafeArrayIterator(
463489
ArrayPrototypeMap(

‎typings/primordials.d.ts‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type TypedArrayContentType<T extends TypedArrayConstructor> = InstanceType<T>[nu
4040
*/
4141
declare namespace primordials {
4242
export function uncurryThis<T extends (...args: unknown[]) => unknown>(fn: T): UncurryThis<T>;
43-
export function makeSafe<T extends NewableFunction>(unsafe: NewableFunction, safe: T): T;
43+
export function makeSafe<T extends NewableFunction>(unsafe: NewableFunction, safe: T, next?: Function): T;
4444

4545
export import decodeURI = globalThis.decodeURI;
4646
export import decodeURIComponent = globalThis.decodeURIComponent;
@@ -168,7 +168,6 @@ declare namespace primordials {
168168
export const ArrayBufferPrototypeSlice: UncurryThis<typeof ArrayBuffer.prototype.slice>
169169
export const ArrayBufferPrototypeTransfer: UncurryThis<typeof ArrayBuffer.prototype.transfer>
170170
export const ArrayBufferPrototypeGetByteLength: UncurryGetter<typeof ArrayBuffer.prototype , "byteLength">;
171-
export const AsyncIteratorPrototype: AsyncIterable<any>;
172171
export import BigInt = globalThis.BigInt;
173172
export const BigIntPrototype: typeof BigInt.prototype
174173
export const BigIntAsUintN: typeof BigInt.asUintN
@@ -545,6 +544,34 @@ declare namespace primordials {
545544
export const PromisePrototypeFinally: UncurryThis<typeof Promise.prototype.finally>
546545
export const PromiseWithResolvers: typeof Promise.withResolvers
547546
export import Proxy = globalThis.Proxy
547+
export import Iterator = globalThis.Iterator
548+
export const IteratorFrom: typeof Iterator.from
549+
export const IteratorPrototype: typeof Iterator.prototype
550+
export const IteratorPrototypeDrop: UncurryThis<typeof Iterator.prototype.drop>
551+
export const IteratorPrototypeEvery: UncurryThis<typeof Iterator.prototype.every>
552+
export const IteratorPrototypeFilter: UncurryThis<typeof Iterator.prototype.filter>
553+
export const IteratorPrototypeFind: UncurryThis<typeof Iterator.prototype.find>
554+
export const IteratorPrototypeFlatMap: UncurryThis<typeof Iterator.prototype.flatMap>
555+
export const IteratorPrototypeForEach: UncurryThis<typeof Iterator.prototype.forEach>
556+
export const IteratorPrototypeMap: UncurryThis<typeof Iterator.prototype.map>
557+
export const IteratorPrototypeReduce: UncurryThis<typeof Iterator.prototype.reduce>
558+
export const IteratorPrototypeSome: UncurryThis<typeof Iterator.prototype.some>
559+
export const IteratorPrototypeTake: UncurryThis<typeof Iterator.prototype.take>
560+
export const IteratorPrototypeToArray: UncurryThis<typeof Iterator.prototype.toArray>
561+
export const IteratorPrototypeSymbolIterator: UncurryMethod<typeof Iterator.prototype, typeof Symbol.iterator>
562+
export const ArrayIteratorPrototype: ReturnType<typeof Array.prototype[typeof Symbol.iterator]>
563+
export const ArrayIteratorPrototypeNext: UncurryThis<typeof ArrayIteratorPrototype.next>
564+
export const AsyncIteratorPrototype: AsyncIterable<any>
565+
export const IteratorHelperPrototype: ReturnType<typeof Iterator.prototype.drop>
566+
export const MapIteratorPrototype: ReturnType<typeof Map.prototype[typeof Symbol.iterator]>
567+
export const MapIteratorPrototypeNext: UncurryThis<typeof MapIteratorPrototype.next>
568+
export const RegExpStringIteratorPrototype: ReturnType<typeof RegExp.prototype[typeof Symbol.matchAll]>
569+
export const RegExpStringIteratorPrototypeNext: UncurryThis<typeof RegExpStringIteratorPrototype.next>
570+
export const SetIteratorPrototype: ReturnType<typeof Set.prototype[typeof Symbol.iterator]>
571+
export const SetIteratorPrototypeNext: UncurryThis<typeof SetIteratorPrototype.next>
572+
export const StringIteratorPrototype: ReturnType<typeof String.prototype[typeof Symbol.iterator]>
573+
export const StringIteratorPrototypeNext: UncurryThis<typeof StringIteratorPrototype.next>
574+
export const WrapForValidIteratorPrototype: ReturnType<typeof Iterator.from>
548575
import _globalThis = globalThis
549576
export { _globalThis as globalThis }
550577
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL