0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 09:31:22 -05:00

Fix iterators on UrlSearchParams (#3044)

This commit is contained in:
Kitson Kelly 2019-10-04 08:20:12 +10:00 committed by Ryan Dahl
parent d9acc5b17e
commit 403bdfc3ec
3 changed files with 14 additions and 14 deletions

View file

@ -100,7 +100,7 @@ export interface ProgressEventInit extends EventInit {
total?: number;
}
export interface URLSearchParams {
export interface URLSearchParams extends DomIterable<string, string> {
/**
* Appends a specified key/value pair as a new search parameter.
*/
@ -142,7 +142,7 @@ export interface URLSearchParams {
* and invokes the given function.
*/
forEach(
callbackfn: (value: string, key: string, parent: URLSearchParams) => void,
callbackfn: (value: string, key: string, parent: this) => void,
thisArg?: any
): void;
}

View file

@ -1459,7 +1459,7 @@ declare namespace domTypes {
loaded?: number;
total?: number;
}
export interface URLSearchParams {
export interface URLSearchParams extends DomIterable<string, string> {
/**
* Appends a specified key/value pair as a new search parameter.
*/
@ -1501,7 +1501,7 @@ declare namespace domTypes {
* and invokes the given function.
*/
forEach(
callbackfn: (value: string, key: string, parent: URLSearchParams) => void,
callbackfn: (value: string, key: string, parent: this) => void,
thisArg?: any
): void;
}
@ -2495,7 +2495,7 @@ declare namespace urlSearchParams {
*
*/
forEach(
callbackfn: (value: string, key: string, parent: URLSearchParams) => void,
callbackfn: (value: string, key: string, parent: this) => void,
thisArg?: any
): void;
/** Returns an iterator allowing to go through all keys contained
@ -2505,7 +2505,7 @@ declare namespace urlSearchParams {
* console.log(key);
* }
*/
keys(): Iterable<string>;
keys(): IterableIterator<string>;
/** Returns an iterator allowing to go through all values contained
* in this object.
*
@ -2513,7 +2513,7 @@ declare namespace urlSearchParams {
* console.log(value);
* }
*/
values(): Iterable<string>;
values(): IterableIterator<string>;
/** Returns an iterator allowing to go through all key/value
* pairs contained in this object.
*
@ -2521,7 +2521,7 @@ declare namespace urlSearchParams {
* console.log(key, value);
* }
*/
entries(): Iterable<[string, string]>;
entries(): IterableIterator<[string, string]>;
/** Returns an iterator allowing to go through all key/value
* pairs contained in this object.
*
@ -2529,7 +2529,7 @@ declare namespace urlSearchParams {
* console.log(key, value);
* }
*/
[Symbol.iterator](): Iterable<[string, string]>;
[Symbol.iterator](): IterableIterator<[string, string]>;
/** Returns a query string suitable for use in a URL.
*
* searchParams.toString();

View file

@ -184,7 +184,7 @@ export class URLSearchParams {
*
*/
forEach(
callbackfn: (value: string, key: string, parent: URLSearchParams) => void,
callbackfn: (value: string, key: string, parent: this) => void,
// eslint-disable-next-line @typescript-eslint/no-explicit-any
thisArg?: any
): void {
@ -206,7 +206,7 @@ export class URLSearchParams {
* console.log(key);
* }
*/
*keys(): Iterable<string> {
*keys(): IterableIterator<string> {
for (const entry of this.params) {
yield entry[0];
}
@ -219,7 +219,7 @@ export class URLSearchParams {
* console.log(value);
* }
*/
*values(): Iterable<string> {
*values(): IterableIterator<string> {
for (const entry of this.params) {
yield entry[1];
}
@ -232,7 +232,7 @@ export class URLSearchParams {
* console.log(key, value);
* }
*/
*entries(): Iterable<[string, string]> {
*entries(): IterableIterator<[string, string]> {
yield* this.params;
}
@ -243,7 +243,7 @@ export class URLSearchParams {
* console.log(key, value);
* }
*/
*[Symbol.iterator](): Iterable<[string, string]> {
*[Symbol.iterator](): IterableIterator<[string, string]> {
yield* this.params;
}