Ignore async iterable declarations (#1134)

MattiasBuelens · web-flow · commit 40991f34b972 · 2021-09-04T23:50:13.000Z
diff --git a/baselines/audioworklet.generated.d.ts b/baselines/audioworklet.generated.d.ts
@@ -301,7 +301,6 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
-    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
diff --git a/baselines/audioworklet.iterable.generated.d.ts b/baselines/audioworklet.iterable.generated.d.ts
@@ -6,10 +6,3 @@ interface MessageEvent<T = any> {
     /** @deprecated */
     initMessageEvent(type: string, bubbles?: boolean, cancelable?: boolean, data?: any, origin?: string, lastEventId?: string, source?: MessageEventSource | null, ports?: Iterable<MessagePort>): void;
 }
-
-interface ReadableStream<R = any> {
-    [Symbol.iterator](): IterableIterator<any>;
-    entries(): IterableIterator<[number, any]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<any>;
-}
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -10912,7 +10912,6 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
-    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
diff --git a/baselines/dom.iterable.generated.d.ts b/baselines/dom.iterable.generated.d.ts
@@ -170,13 +170,6 @@ interface PluginArray {
 interface RTCStatsReport extends ReadonlyMap<string, any> {
 }
 
-interface ReadableStream<R = any> {
-    [Symbol.iterator](): IterableIterator<any>;
-    entries(): IterableIterator<[number, any]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<any>;
-}
-
 interface SVGLengthList {
     [Symbol.iterator](): IterableIterator<SVGLength>;
 }
diff --git a/baselines/serviceworker.generated.d.ts b/baselines/serviceworker.generated.d.ts
@@ -2446,7 +2446,6 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
-    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
diff --git a/baselines/serviceworker.iterable.generated.d.ts b/baselines/serviceworker.iterable.generated.d.ts
@@ -56,13 +56,6 @@ interface MessageEvent<T = any> {
     initMessageEvent(type: string, bubbles?: boolean, cancelable?: boolean, data?: any, origin?: string, lastEventId?: string, source?: MessageEventSource | null, ports?: Iterable<MessagePort>): void;
 }
 
-interface ReadableStream<R = any> {
-    [Symbol.iterator](): IterableIterator<any>;
-    entries(): IterableIterator<[number, any]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<any>;
-}
-
 interface SubtleCrypto {
     deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: AlgorithmIdentifier | AesDerivedKeyParams | HmacImportParams | HkdfParams | Pbkdf2Params, extractable: boolean, keyUsages: Iterable<KeyUsage>): Promise<CryptoKey>;
     generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair>;
diff --git a/baselines/sharedworker.generated.d.ts b/baselines/sharedworker.generated.d.ts
@@ -2332,7 +2332,6 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
-    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
diff --git a/baselines/sharedworker.iterable.generated.d.ts b/baselines/sharedworker.iterable.generated.d.ts
@@ -56,13 +56,6 @@ interface MessageEvent<T = any> {
     initMessageEvent(type: string, bubbles?: boolean, cancelable?: boolean, data?: any, origin?: string, lastEventId?: string, source?: MessageEventSource | null, ports?: Iterable<MessagePort>): void;
 }
 
-interface ReadableStream<R = any> {
-    [Symbol.iterator](): IterableIterator<any>;
-    entries(): IterableIterator<[number, any]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<any>;
-}
-
 interface SubtleCrypto {
     deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: AlgorithmIdentifier | AesDerivedKeyParams | HmacImportParams | HkdfParams | Pbkdf2Params, extractable: boolean, keyUsages: Iterable<KeyUsage>): Promise<CryptoKey>;
     generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair>;
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -2498,7 +2498,6 @@ interface ReadableStream<R = any> {
     pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;
     pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;
     tee(): [ReadableStream<R>, ReadableStream<R>];
-    forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;
 }
 
 declare var ReadableStream: {
diff --git a/baselines/webworker.iterable.generated.d.ts b/baselines/webworker.iterable.generated.d.ts
@@ -56,13 +56,6 @@ interface MessageEvent<T = any> {
     initMessageEvent(type: string, bubbles?: boolean, cancelable?: boolean, data?: any, origin?: string, lastEventId?: string, source?: MessageEventSource | null, ports?: Iterable<MessagePort>): void;
 }
 
-interface ReadableStream<R = any> {
-    [Symbol.iterator](): IterableIterator<any>;
-    entries(): IterableIterator<[number, any]>;
-    keys(): IterableIterator<number>;
-    values(): IterableIterator<any>;
-}
-
 interface SubtleCrypto {
     deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: AlgorithmIdentifier | AesDerivedKeyParams | HmacImportParams | HkdfParams | Pbkdf2Params, extractable: boolean, keyUsages: Iterable<KeyUsage>): Promise<CryptoKey>;
     generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair>;
diff --git a/src/build/widlprocess.ts b/src/build/widlprocess.ts
@@ -199,7 +199,7 @@ function convertInterfaceCommon(
         addComments(method[member.name], commentMap, i.name, member.name);
       }
     } else if (
-      member.type === "iterable" ||
+      (member.type === "iterable" && !member.async) ||
       member.type === "maplike" ||
       member.type === "setlike"
     ) {

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,6 @@ interface ReadableStream<R = any> {`
`301`	`301`	`pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;`
`302`	`302`	`pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;`
`303`	`303`	`tee(): [ReadableStream<R>, ReadableStream<R>];`
`304`		`- forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;`
`305`	`304`	`}`
`306`	`305`
`307`	`306`	`declare var ReadableStream: {`
Original file line number	Diff line number	Diff line change
`@@ -10912,7 +10912,6 @@ interface ReadableStream<R = any> {`
`10912`	`10912`	`pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;`
`10913`	`10913`	`pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;`
`10914`	`10914`	`tee(): [ReadableStream<R>, ReadableStream<R>];`
`10915`		`- forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;`
`10916`	`10915`	`}`
`10917`	`10916`
`10918`	`10917`	`declare var ReadableStream: {`
Original file line number	Diff line number	Diff line change
`@@ -170,13 +170,6 @@ interface PluginArray {`
`170`	`170`	`interface RTCStatsReport extends ReadonlyMap<string, any> {`
`171`	`171`	`}`
`172`	`172`
`173`		`-interface ReadableStream<R = any> {`
`174`		`- [Symbol.iterator](): IterableIterator<any>;`
`175`		`- entries(): IterableIterator<[number, any]>;`
`176`		`- keys(): IterableIterator<number>;`
`177`		`- values(): IterableIterator<any>;`
`178`		`-}`
`179`		`-`
`180`	`173`	`interface SVGLengthList {`
`181`	`174`	`[Symbol.iterator](): IterableIterator<SVGLength>;`
`182`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2446,7 +2446,6 @@ interface ReadableStream<R = any> {`
`2446`	`2446`	`pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;`
`2447`	`2447`	`pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;`
`2448`	`2448`	`tee(): [ReadableStream<R>, ReadableStream<R>];`
`2449`		`- forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;`
`2450`	`2449`	`}`
`2451`	`2450`
`2452`	`2451`	`declare var ReadableStream: {`
Original file line number	Diff line number	Diff line change
`@@ -2332,7 +2332,6 @@ interface ReadableStream<R = any> {`
`2332`	`2332`	`pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;`
`2333`	`2333`	`pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;`
`2334`	`2334`	`tee(): [ReadableStream<R>, ReadableStream<R>];`
`2335`		`- forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;`
`2336`	`2335`	`}`
`2337`	`2336`
`2338`	`2337`	`declare var ReadableStream: {`
Original file line number	Diff line number	Diff line change
`@@ -2498,7 +2498,6 @@ interface ReadableStream<R = any> {`
`2498`	`2498`	`pipeThrough<T>(transform: ReadableWritablePair<T, R>, options?: StreamPipeOptions): ReadableStream<T>;`
`2499`	`2499`	`pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>;`
`2500`	`2500`	`tee(): [ReadableStream<R>, ReadableStream<R>];`
`2501`		`- forEach(callbackfn: (value: any, key: number, parent: ReadableStream<R>) => void, thisArg?: any): void;`
`2502`	`2501`	`}`
`2503`	`2502`
`2504`	`2503`	`declare var ReadableStream: {`