Skip to content

Commit 63d2c40

Browse files
authored
Merge branch 'master' into console
2 parents f3e2895 + 8587c6d commit 63d2c40

File tree

11 files changed

+251
-240
lines changed

11 files changed

+251
-240
lines changed

baselines/dom.es6.generated.d.ts

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,35 @@ interface FileList {
3838
[Symbol.iterator](): IterableIterator<File>
3939
}
4040

41+
interface FormData {
42+
[Symbol.iterator](): IterableIterator<[string, FormDataEntryValue]>
43+
entries(): IterableIterator<[string, FormDataEntryValue]>;
44+
keys(): IterableIterator<string>;
45+
values(): IterableIterator<FormDataEntryValue>;
46+
}
47+
4148
interface HTMLAllCollection {
4249
[Symbol.iterator](): IterableIterator<Element>
4350
}
4451

45-
interface HTMLCollection {
52+
interface HTMLCollectionBase {
4653
[Symbol.iterator](): IterableIterator<Element>
4754
}
4855

56+
interface HTMLCollectionOf<T extends Element> {
57+
[Symbol.iterator](): IterableIterator<T>
58+
entries(): IterableIterator<[number, T]>;
59+
keys(): IterableIterator<number>;
60+
values(): IterableIterator<T>;
61+
}
62+
63+
interface Headers {
64+
[Symbol.iterator](): IterableIterator<[string, string]>
65+
entries(): IterableIterator<[string, string]>;
66+
keys(): IterableIterator<string>;
67+
values(): IterableIterator<string>;
68+
}
69+
4970
interface MediaList {
5071
[Symbol.iterator](): IterableIterator<string>
5172
}
@@ -62,6 +83,13 @@ interface NodeList {
6283
[Symbol.iterator](): IterableIterator<Node>
6384
}
6485

86+
interface NodeListOf<TNode extends Node> {
87+
[Symbol.iterator](): IterableIterator<TNode>
88+
entries(): IterableIterator<[number, TNode]>;
89+
keys(): IterableIterator<number>;
90+
values(): IterableIterator<TNode>;
91+
}
92+
6593
interface Plugin {
6694
[Symbol.iterator](): IterableIterator<MimeType>
6795
}
@@ -70,6 +98,9 @@ interface PluginArray {
7098
[Symbol.iterator](): IterableIterator<Plugin>
7199
}
72100

101+
interface RTCStatsReport extends ReadonlyMap<string, any> {
102+
}
103+
73104
interface SourceBufferList {
74105
[Symbol.iterator](): IterableIterator<SourceBuffer>
75106
}
@@ -90,6 +121,13 @@ interface TouchList {
90121
[Symbol.iterator](): IterableIterator<Touch>
91122
}
92123

124+
interface URLSearchParams {
125+
[Symbol.iterator](): IterableIterator<[string, string]>
126+
entries(): IterableIterator<[string, string]>;
127+
keys(): IterableIterator<string>;
128+
values(): IterableIterator<string>;
129+
}
130+
93131
interface VideoTrackList {
94132
[Symbol.iterator](): IterableIterator<VideoTrack>
95133
}

baselines/dom.generated.d.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3284,7 +3284,7 @@ declare var CountQueuingStrategy: {
32843284

32853285
interface Crypto {
32863286
readonly subtle: SubtleCrypto;
3287-
getRandomValues(array: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null): Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null;
3287+
getRandomValues<T extends Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null>(array: T): T;
32883288
}
32893289

32903290
declare var Crypto: {
@@ -5707,6 +5707,7 @@ declare var HTMLCollection: {
57075707
interface HTMLCollectionOf<T extends Element> extends HTMLCollectionBase {
57085708
item(index: number): T;
57095709
namedItem(name: string): T;
5710+
forEach(callbackfn: (value: T, key: number, parent: HTMLCollectionOf<T>) => void, thisArg?: any): void;
57105711
[index: number]: T;
57115712
}
57125713

@@ -9877,6 +9878,7 @@ declare var NodeList: {
98779878
interface NodeListOf<TNode extends Node> extends NodeList {
98789879
length: number;
98799880
item(index: number): TNode;
9881+
forEach(callbackfn: (value: TNode, key: number, parent: NodeListOf<TNode>) => void, thisArg?: any): void;
98809882
[index: number]: TNode;
98819883
}
98829884

@@ -11062,6 +11064,7 @@ declare var RTCStatsProvider: {
1106211064
};
1106311065

1106411066
interface RTCStatsReport {
11067+
forEach(callbackfn: (value: any, key: string, parent: RTCStatsReport) => void, thisArg?: any): void;
1106511068
}
1106611069

1106711070
declare var RTCStatsReport: {

baselines/webworker.generated.d.ts

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,20 +2032,8 @@ declare namespace console {
20322032

20332033
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
20342034

2035-
interface ErrorEventHandler {
2036-
(event: Event | string, source?: string, fileno?: number, columnNumber?: number, error?: Error): void;
2037-
}
2038-
2039-
interface ForEachCallback {
2040-
(keyId: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null, status: MediaKeyStatus): void;
2041-
}
2042-
2043-
interface FunctionStringCallback {
2044-
(data: string): void;
2045-
}
2046-
2047-
interface NotificationPermissionCallback {
2048-
(permission: NotificationPermission): void;
2035+
interface EventHandlerNonNull {
2036+
(event: Event): any;
20492037
}
20502038

20512039
interface PerformanceObserverCallback {
@@ -2087,43 +2075,20 @@ type HeadersInit = Headers | string[][] | Record<string, string>;
20872075
type BodyInit = Blob | BufferSource | FormData | URLSearchParams | ReadableStream | string;
20882076
type RequestInfo = Request | string;
20892077
type BlobPart = BufferSource | Blob | string;
2078+
type DOMHighResTimeStamp = number;
20902079
type PerformanceEntryList = PerformanceEntry[];
20912080
type PushMessageDataInit = BufferSource | string;
20922081
type VibratePattern = number | number[];
20932082
type BufferSource = ArrayBufferView | ArrayBuffer;
2083+
type DOMTimeStamp = number;
20942084
type FormDataEntryValue = File | string;
20952085
type IDBValidKey = number | string | Date | BufferSource | IDBArrayKey;
2096-
type AlgorithmIdentifier = string | Algorithm;
2097-
type AAGUID = string;
2098-
type ByteString = string;
2099-
type CryptoOperationData = ArrayBufferView;
2100-
type GLbitfield = number;
2101-
type GLboolean = boolean;
2102-
type GLbyte = number;
2103-
type GLclampf = number;
2104-
type GLenum = number;
2105-
type GLfloat = number;
2106-
type GLint = number;
2107-
type GLintptr = number;
2108-
type GLshort = number;
2109-
type GLsizei = number;
2110-
type GLsizeiptr = number;
2111-
type GLubyte = number;
2112-
type GLuint = number;
2113-
type GLushort = number;
2114-
type IDBKeyPath = string;
2115-
type USVString = string;
2116-
type payloadtype = number;
21172086
type MessageEventSource = object | MessagePort | ServiceWorker;
21182087
type BinaryType = "blob" | "arraybuffer";
21192088
type ClientTypes = "window" | "worker" | "sharedworker" | "all";
21202089
type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
21212090
type IDBRequestReadyState = "pending" | "done";
21222091
type IDBTransactionMode = "readonly" | "readwrite" | "versionchange";
2123-
type KeyFormat = "raw" | "spki" | "pkcs8" | "jwk";
2124-
type KeyType = "public" | "private" | "secret";
2125-
type KeyUsage = "encrypt" | "decrypt" | "sign" | "verify" | "deriveKey" | "deriveBits" | "wrapKey" | "unwrapKey";
2126-
type MediaKeyStatus = "usable" | "expired" | "output-downscaled" | "output-not-allowed" | "status-pending" | "internal-error";
21272092
type NotificationDirection = "auto" | "ltr" | "rtl";
21282093
type NotificationPermission = "default" | "denied" | "granted";
21292094
type PushEncryptionKeyName = "p256dh" | "auth";

inputfiles/addedTypes.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,13 @@
513513
"no-interface-object": "1",
514514
"overide-index-signatures": [
515515
"[index: number]: TNode"
516-
]
516+
],
517+
"iterator": {
518+
"kind": "iterable",
519+
"type": [{
520+
"override-type": "TNode"
521+
}]
522+
}
517523
},
518524
"HTMLCollectionOf<T extends Element>": {
519525
"name": "HTMLCollectionOf<T extends Element>",
@@ -538,7 +544,13 @@
538544
"no-interface-object": "1",
539545
"overide-index-signatures": [
540546
"[index: number]: T"
541-
]
547+
],
548+
"iterator": {
549+
"kind": "iterable",
550+
"type": [{
551+
"override-type": "T"
552+
}]
553+
}
542554
},
543555
"EventListenerObject": {
544556
"name": "EventListenerObject",

inputfiles/knownWorkerTypes.json

Lines changed: 3 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,7 @@
11
[
2-
"ClientQueryOptions",
3-
"ExtendableEventInit",
4-
"ExtendableMessageEventInit",
5-
"FetchEventInit",
6-
"NotificationEventInit",
7-
"PushEventInit",
8-
"SyncEventInit",
9-
"Algorithm",
10-
"CacheQueryOptions",
11-
"CloseEventInit",
12-
"EventInit",
13-
"GetNotificationOptions",
14-
"IDBIndexParameters",
15-
"IDBObjectStoreParameters",
16-
"KeyAlgorithm",
17-
"MessageEventInit",
18-
"NotificationOptions",
19-
"PushSubscriptionOptionsInit",
20-
"RequestInit",
21-
"ResponseInit",
22-
"DOMMatrixInit",
23-
"DOMMatrix2DInit",
24-
"DOMPointInit",
25-
"DOMQuadInit",
26-
"DOMRectInit",
27-
"BlobPart",
28-
"IDBKeyRange",
29-
"MessageEventSource",
30-
"MessagePort",
31-
"NavigationPreloadState",
32-
"NotificationAction",
33-
"PerformanceEntryList",
34-
"PerformanceObserverCallback",
35-
"PerformanceObserverInit",
36-
"PromiseRejectionEventInit",
37-
"PushSubscriptionJSON",
38-
"RegistrationOptions",
39-
"ServiceWorkerUpdateViaCache",
40-
"VibratePattern",
41-
"WorkerType",
42-
"AbstractWorker",
43-
"Body",
44-
"GlobalFetch",
45-
"NavigatorBeacon",
46-
"NavigatorConcurrentHardware",
47-
"NavigatorID",
48-
"NavigatorOnLine",
49-
"WindowBase64",
50-
"WindowConsole",
51-
"Client",
52-
"Clients",
53-
"DedicatedWorkerGlobalScope",
54-
"ServiceWorkerGlobalScope",
55-
"WindowClient",
56-
"WorkerGlobalScope",
57-
"WorkerLocation",
58-
"WorkerNavigator",
59-
"WorkerUtils",
60-
"EventListener",
61-
"ErrorEventHandler",
62-
"ForEachCallback",
63-
"FunctionStringCallback",
64-
"NotificationPermissionCallback",
65-
"PushMessageDataInit",
66-
"AAGUID",
67-
"AlgorithmIdentifier",
68-
"BodyInit",
69-
"ByteString",
70-
"CryptoOperationData",
71-
"GLbitfield",
72-
"GLboolean",
73-
"GLbyte",
74-
"GLclampf",
75-
"GLenum",
76-
"GLfloat",
77-
"GLint",
78-
"GLintptr",
79-
"GLshort",
80-
"GLsizei",
81-
"GLsizeiptr",
82-
"GLubyte",
83-
"GLuint",
84-
"GLushort",
85-
"HeadersInit",
86-
"IDBKeyPath",
87-
"JSON",
88-
"KeyFormat",
89-
"KeyType",
90-
"KeyUsage",
91-
"RequestInfo",
92-
"USVString",
93-
"payloadtype",
94-
"IDBCursorDirection",
95-
"IDBRequestReadyState",
96-
"IDBTransactionMode",
97-
"MediaKeyStatus",
98-
"NotificationDirection",
99-
"NotificationPermission",
100-
"PushEncryptionKeyName",
101-
"PushPermissionState",
102-
"ReferrerPolicy",
103-
"RequestCache",
104-
"RequestCredentials",
105-
"RequestDestination",
106-
"RequestMode",
107-
"RequestRedirect",
108-
"RequestType",
109-
"ResponseType",
110-
"ServiceWorkerState",
111-
"TextDecodeOptions",
112-
"TextDecoderOptions",
113-
"VisibilityState",
114-
"XMLHttpRequestResponseType",
1152
"ClientTypes",
116-
"FrameType",
117-
"BinaryType",
118-
"ProgressEventInit",
119-
"EventListenerOptions",
120-
"AddEventListenerOptions",
121-
"ErrorEventInit",
122-
"PushSubscriptionChangeEvent",
123-
"PushSubscriptionChangeInit",
124-
"ImageBitmap",
125-
"ImageBitmapOptions",
126-
"FormDataEntryValue",
127-
"EventListenerObject",
128-
"URLSearchParams",
129-
"BlobPropertyBag",
130-
"FilePropertyBag",
131-
"IDBValidKey",
1323
"IDBArrayKey",
133-
"IDBVersionChangeEventInit",
134-
"BufferSource"
4+
"IDBValidKey",
5+
"MessageEventSource",
6+
"PromiseRejectionEventInit"
1357
]

inputfiles/overridingTypes.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,6 +2079,19 @@
20792079
"Worker": {
20802080
"name": "Worker",
20812081
"override-exposed": "Window Worker"
2082+
},
2083+
"Crypto": {
2084+
"name": "Crypto",
2085+
"methods": {
2086+
"method": {
2087+
"getRandomValues": {
2088+
"name": "getRandomValues",
2089+
"override-signatures": [
2090+
"getRandomValues<T extends Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | null>(array: T): T"
2091+
]
2092+
}
2093+
}
2094+
}
20822095
}
20832096
}
20842097
},

0 commit comments

Comments
 (0)