Skip to content

Commit f7c9f80

Browse files
authored
Merge branch 'master' into nooverride-type
2 parents 8486581 + ca4a0da commit f7c9f80

39 files changed

+540
-419
lines changed

baselines/dom.generated.d.ts

Lines changed: 111 additions & 68 deletions
Large diffs are not rendered by default.

baselines/dom.iterable.generated.d.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,13 @@ interface Headers {
109109
values(): IterableIterator<string>;
110110
}
111111

112+
interface IDBDatabase {
113+
/**
114+
* Returns a new transaction with the given mode ("readonly" or "readwrite") and scope which can be a single object store name or an array of names.
115+
*/
116+
transaction(storeNames: string | Iterable<string>, mode?: IDBTransactionMode): IDBTransaction;
117+
}
118+
112119
interface IDBObjectStore {
113120
/**
114121
* Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.

baselines/webworker.generated.d.ts

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ interface GetNotificationOptions {
194194
tag?: string;
195195
}
196196

197+
interface HkdfParams extends Algorithm {
198+
hash: HashAlgorithmIdentifier;
199+
info: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
200+
salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
201+
}
202+
197203
interface HmacImportParams extends Algorithm {
198204
hash: HashAlgorithmIdentifier;
199205
length?: number;
@@ -1654,12 +1660,6 @@ declare var Headers: {
16541660
new(init?: HeadersInit): Headers;
16551661
};
16561662

1657-
interface HkdfCtrParams extends Algorithm {
1658-
context: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
1659-
hash: string | Algorithm;
1660-
label: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
1661-
}
1662-
16631663
interface IDBArrayKey extends Array<IDBValidKey> {
16641664
}
16651665

@@ -1761,7 +1761,7 @@ interface IDBDatabase extends EventTarget {
17611761
*
17621762
* Throws a "InvalidStateError" DOMException if not called within an upgrade transaction.
17631763
*/
1764-
createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore;
1764+
createObjectStore(name: string, options?: IDBObjectStoreParameters): IDBObjectStore;
17651765
/**
17661766
* Deletes the object store with the given name.
17671767
*
@@ -2199,8 +2199,8 @@ interface ImageData {
21992199

22002200
declare var ImageData: {
22012201
prototype: ImageData;
2202-
new(width: number, height: number): ImageData;
2203-
new(array: Uint8ClampedArray, width: number, height?: number): ImageData;
2202+
new(sw: number, sh: number): ImageData;
2203+
new(data: Uint8ClampedArray, sw: number, sh?: number): ImageData;
22042204
};
22052205

22062206
/** This Channel Messaging API interface allows us to create a new message channel and send data through it via its two MessagePort properties. */
@@ -2715,6 +2715,11 @@ interface ReadableByteStreamController {
27152715
error(error?: any): void;
27162716
}
27172717

2718+
declare var ReadableByteStreamController: {
2719+
prototype: ReadableByteStreamController;
2720+
new(): ReadableByteStreamController;
2721+
};
2722+
27182723
/** This Streams API interface represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object. */
27192724
interface ReadableStream<R = any> {
27202725
readonly locked: boolean;
@@ -2739,26 +2744,46 @@ interface ReadableStreamBYOBReader {
27392744
releaseLock(): void;
27402745
}
27412746

2747+
declare var ReadableStreamBYOBReader: {
2748+
prototype: ReadableStreamBYOBReader;
2749+
new(): ReadableStreamBYOBReader;
2750+
};
2751+
27422752
interface ReadableStreamBYOBRequest {
27432753
readonly view: ArrayBufferView;
27442754
respond(bytesWritten: number): void;
27452755
respondWithNewView(view: ArrayBufferView): void;
27462756
}
27472757

2758+
declare var ReadableStreamBYOBRequest: {
2759+
prototype: ReadableStreamBYOBRequest;
2760+
new(): ReadableStreamBYOBRequest;
2761+
};
2762+
27482763
interface ReadableStreamDefaultController<R = any> {
27492764
readonly desiredSize: number | null;
27502765
close(): void;
27512766
enqueue(chunk: R): void;
27522767
error(error?: any): void;
27532768
}
27542769

2770+
declare var ReadableStreamDefaultController: {
2771+
prototype: ReadableStreamDefaultController;
2772+
new(): ReadableStreamDefaultController;
2773+
};
2774+
27552775
interface ReadableStreamDefaultReader<R = any> {
27562776
readonly closed: Promise<void>;
27572777
cancel(reason?: any): Promise<void>;
27582778
read(): Promise<ReadableStreamReadResult<R>>;
27592779
releaseLock(): void;
27602780
}
27612781

2782+
declare var ReadableStreamDefaultReader: {
2783+
prototype: ReadableStreamDefaultReader;
2784+
new(): ReadableStreamDefaultReader;
2785+
};
2786+
27622787
interface ReadableStreamReader<R = any> {
27632788
cancel(): Promise<void>;
27642789
read(): Promise<ReadableStreamReadResult<R>>;
@@ -3034,16 +3059,16 @@ declare var StorageManager: {
30343059
/** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
30353060
interface SubtleCrypto {
30363061
decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise<ArrayBuffer>;
3037-
deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
3038-
deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
3062+
deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
3063+
deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
30393064
digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise<ArrayBuffer>;
30403065
encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): Promise<ArrayBuffer>;
30413066
exportKey(format: "jwk", key: CryptoKey): Promise<JsonWebKey>;
30423067
exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): Promise<ArrayBuffer>;
30433068
exportKey(format: string, key: CryptoKey): Promise<JsonWebKey | ArrayBuffer>;
3044-
generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair | CryptoKey>;
30453069
generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair>;
30463070
generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
3071+
generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKeyPair | CryptoKey>;
30473072
importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
30483073
importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
30493074
importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): Promise<CryptoKey>;
@@ -3236,6 +3261,11 @@ interface TransformStreamDefaultController<O = any> {
32363261
terminate(): void;
32373262
}
32383263

3264+
declare var TransformStreamDefaultController: {
3265+
prototype: TransformStreamDefaultController;
3266+
new(): TransformStreamDefaultController;
3267+
};
3268+
32393269
/** The URL interface represents an object providing static methods used for creating object URLs. */
32403270
interface URL {
32413271
hash: string;
@@ -5512,6 +5542,11 @@ interface WritableStreamDefaultController {
55125542
error(error?: any): void;
55135543
}
55145544

5545+
declare var WritableStreamDefaultController: {
5546+
prototype: WritableStreamDefaultController;
5547+
new(): WritableStreamDefaultController;
5548+
};
5549+
55155550
/** This Streams API interface is the object returned by WritableStream.getWriter() and once created locks the < writer to the WritableStream ensuring that no other streams can write to the underlying sink. */
55165551
interface WritableStreamDefaultWriter<W = any> {
55175552
readonly closed: Promise<void>;
@@ -5523,6 +5558,11 @@ interface WritableStreamDefaultWriter<W = any> {
55235558
write(chunk: W): Promise<void>;
55245559
}
55255560

5561+
declare var WritableStreamDefaultWriter: {
5562+
prototype: WritableStreamDefaultWriter;
5563+
new(): WritableStreamDefaultWriter;
5564+
};
5565+
55265566
interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
55275567
"readystatechange": Event;
55285568
}
Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
/////////////////////////////
2+
/// Worker Iterable APIs
3+
/////////////////////////////
4+
5+
interface Cache {
6+
addAll(requests: Iterable<RequestInfo>): Promise<void>;
7+
}
8+
9+
interface CanvasPathDrawingStyles {
10+
setLineDash(segments: Iterable<number>): void;
11+
}
12+
13+
interface DOMStringList {
14+
[Symbol.iterator](): IterableIterator<string>;
15+
}
16+
17+
interface FileList {
18+
[Symbol.iterator](): IterableIterator<File>;
19+
}
20+
21+
interface FormData {
22+
[Symbol.iterator](): IterableIterator<[string, FormDataEntryValue]>;
23+
/**
24+
* Returns an array of key, value pairs for every entry in the list.
25+
*/
26+
entries(): IterableIterator<[string, FormDataEntryValue]>;
27+
/**
28+
* Returns a list of keys in the list.
29+
*/
30+
keys(): IterableIterator<string>;
31+
/**
32+
* Returns a list of values in the list.
33+
*/
34+
values(): IterableIterator<FormDataEntryValue>;
35+
}
36+
37+
interface Headers {
38+
[Symbol.iterator](): IterableIterator<[string, string]>;
39+
/**
40+
* Returns an iterator allowing to go through all key/value pairs contained in this object.
41+
*/
42+
entries(): IterableIterator<[string, string]>;
43+
/**
44+
* Returns an iterator allowing to go through all keys of the key/value pairs contained in this object.
45+
*/
46+
keys(): IterableIterator<string>;
47+
/**
48+
* Returns an iterator allowing to go through all values of the key/value pairs contained in this object.
49+
*/
50+
values(): IterableIterator<string>;
51+
}
52+
53+
interface IDBObjectStore {
54+
/**
55+
* Creates a new index in store with the given name, keyPath and options and returns a new IDBIndex. If the keyPath and options define constraints that cannot be satisfied with the data already in store the upgrade transaction will abort with a "ConstraintError" DOMException.
56+
*
57+
* Throws an "InvalidStateError" DOMException if not called within an upgrade transaction.
58+
*/
59+
createIndex(name: string, keyPath: string | Iterable<string>, options?: IDBIndexParameters): IDBIndex;
60+
}
61+
62+
interface URLSearchParams {
63+
[Symbol.iterator](): IterableIterator<[string, string]>;
64+
/**
65+
* Returns an array of key, value pairs for every entry in the search params.
66+
*/
67+
entries(): IterableIterator<[string, string]>;
68+
/**
69+
* Returns a list of keys in the search params.
70+
*/
71+
keys(): IterableIterator<string>;
72+
/**
73+
* Returns a list of values in the search params.
74+
*/
75+
values(): IterableIterator<string>;
76+
}
77+
78+
interface WEBGL_draw_buffers {
79+
drawBuffersWEBGL(buffers: Iterable<GLenum>): void;
80+
}
81+
82+
interface WebGL2RenderingContextBase {
83+
clearBufferfv(buffer: GLenum, drawbuffer: GLint, values: Iterable<GLfloat>, srcOffset?: GLuint): void;
84+
clearBufferiv(buffer: GLenum, drawbuffer: GLint, values: Iterable<GLint>, srcOffset?: GLuint): void;
85+
clearBufferuiv(buffer: GLenum, drawbuffer: GLint, values: Iterable<GLuint>, srcOffset?: GLuint): void;
86+
drawBuffers(buffers: Iterable<GLenum>): void;
87+
getActiveUniforms(program: WebGLProgram, uniformIndices: Iterable<GLuint>, pname: GLenum): any;
88+
getUniformIndices(program: WebGLProgram, uniformNames: Iterable<string>): Iterable<GLuint> | null;
89+
invalidateFramebuffer(target: GLenum, attachments: Iterable<GLenum>): void;
90+
invalidateSubFramebuffer(target: GLenum, attachments: Iterable<GLenum>, x: GLint, y: GLint, width: GLsizei, height: GLsizei): void;
91+
transformFeedbackVaryings(program: WebGLProgram, varyings: Iterable<string>, bufferMode: GLenum): void;
92+
uniform1uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
93+
uniform2uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
94+
uniform3uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
95+
uniform4uiv(location: WebGLUniformLocation | null, data: Iterable<GLuint>, srcOffset?: GLuint, srcLength?: GLuint): void;
96+
uniformMatrix2x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
97+
uniformMatrix2x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
98+
uniformMatrix3x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
99+
uniformMatrix3x4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
100+
uniformMatrix4x2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
101+
uniformMatrix4x3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
102+
vertexAttribI4iv(index: GLuint, values: Iterable<GLint>): void;
103+
vertexAttribI4uiv(index: GLuint, values: Iterable<GLuint>): void;
104+
}
105+
106+
interface WebGL2RenderingContextOverloads {
107+
uniform1fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
108+
uniform1iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
109+
uniform2fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
110+
uniform2iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
111+
uniform3fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
112+
uniform3iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
113+
uniform4fv(location: WebGLUniformLocation | null, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
114+
uniform4iv(location: WebGLUniformLocation | null, data: Iterable<GLint>, srcOffset?: GLuint, srcLength?: GLuint): void;
115+
uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
116+
uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
117+
uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, data: Iterable<GLfloat>, srcOffset?: GLuint, srcLength?: GLuint): void;
118+
}
119+
120+
interface WebGLRenderingContextBase {
121+
vertexAttrib1fv(index: GLuint, values: Iterable<GLfloat>): void;
122+
vertexAttrib2fv(index: GLuint, values: Iterable<GLfloat>): void;
123+
vertexAttrib3fv(index: GLuint, values: Iterable<GLfloat>): void;
124+
vertexAttrib4fv(index: GLuint, values: Iterable<GLfloat>): void;
125+
}
126+
127+
interface WebGLRenderingContextOverloads {
128+
uniform1fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
129+
uniform1iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
130+
uniform2fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
131+
uniform2iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
132+
uniform3fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
133+
uniform3iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
134+
uniform4fv(location: WebGLUniformLocation | null, v: Iterable<GLfloat>): void;
135+
uniform4iv(location: WebGLUniformLocation | null, v: Iterable<GLint>): void;
136+
uniformMatrix2fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Iterable<GLfloat>): void;
137+
uniformMatrix3fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Iterable<GLfloat>): void;
138+
uniformMatrix4fv(location: WebGLUniformLocation | null, transpose: GLboolean, value: Iterable<GLfloat>): void;
139+
}

inputfiles/addedTypes.json

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -916,27 +916,6 @@
916916
},
917917
"no-interface-object": "1"
918918
},
919-
"HkdfCtrParams": {
920-
"name": "HkdfCtrParams",
921-
"extends": "Algorithm",
922-
"properties": {
923-
"property": {
924-
"hash": {
925-
"name": "hash",
926-
"override-type": "string | Algorithm"
927-
},
928-
"label": {
929-
"name": "label",
930-
"override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
931-
},
932-
"context": {
933-
"name": "context",
934-
"override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
935-
}
936-
}
937-
},
938-
"no-interface-object": "1"
939-
},
940919
"DataTransfer": {
941920
"name": "DataTransfer",
942921
"methods": {

0 commit comments

Comments
 (0)