From 34b5df8468da15c6ca7994dc14482d7f0df0df4d Mon Sep 17 00:00:00 2001 From: Logan Mzz Date: Fri, 24 Mar 2017 09:54:22 +0100 Subject: [PATCH 01/11] Fixes Microsoft/TypeScript#14795 Adds method DataTransfer.setDragImage --- baselines/dom.generated.d.ts | 1 + inputfiles/addedTypes.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 3afab8954..95fad6275 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -2538,6 +2538,7 @@ interface DataTransfer { clearData(format?: string): boolean; getData(format: string): string; setData(format: string, data: string): boolean; + setDragImage(image: Element, x: number, y: number): void; } declare var DataTransfer: { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 0974962f4..61209eebc 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -1203,6 +1203,12 @@ "flavor": "Web", "type": "WheelEvent" }, + { + "kind": "method", + "interface": "DataTransfer", + "name": "setDragImage", + "signatures": ["setDragImage(image: Element, x: number, y: number): void"] + }, { "kind": "method", "interface": "Element", From c3f73f5eb858e04a9804d94ab167c775518d6204 Mon Sep 17 00:00:00 2001 From: ncoley Date: Sun, 26 Mar 2017 19:44:01 -0400 Subject: [PATCH 02/11] Add missing methods for FormData type --- baselines/dom.generated.d.ts | 7 ++++++- inputfiles/addedTypes.json | 35 +++++++++++++++++++++++++++++++++ inputfiles/overridingTypes.json | 7 +++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 95fad6275..a8051e89b 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -3796,7 +3796,12 @@ declare var FocusNavigationEvent: { } interface FormData { - append(name: any, value: any, blobName?: string): void; + append(name: any, value: any, fileName?: string): void; + delete(name: any): void; + get(name: any): any; + getAll(name: any): any; + has(name: any): any; + set(name: any, value: any, fileName?: string): void; } declare var FormData: { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 61209eebc..e4f01808e 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -1534,5 +1534,40 @@ "name": "getElementById", "flavor": "DOM", "signatures": ["getElementById(elementId: string): HTMLElement | null"] + }, + { + "kind": "method", + "interface": "FormData", + "name": "delete", + "flavor": "Web", + "signatures": ["delete(name: any): void"] + }, + { + "kind": "method", + "interface": "FormData", + "name": "get", + "flavor": "Web", + "signatures": ["get(name: any): any"] + }, + { + "kind": "method", + "interface": "FormData", + "name": "getAll", + "flavor": "Web", + "signatures": ["getAll(name: any): any"] + }, + { + "kind": "method", + "interface": "FormData", + "name": "has", + "flavor": "Web", + "signatures": ["has(name: any): any"] + }, + { + "kind": "method", + "interface": "FormData", + "name": "set", + "flavor": "Web", + "signatures": ["set(name: any, value: any, fileName?: string): void"] } ] diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index cb84c43a2..7aa373bbd 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -1016,5 +1016,12 @@ "interface": "DOMImplementation", "name": "createDocument", "signatures": ["createDocument(namespaceURI: string | null, qualifiedName: string | null, doctype: DocumentType | null): Document"] + }, + { + "kind": "method", + "interface": "FormData", + "name": "append", + "flavor": "Web", + "signatures": ["append(name: any, value: any, fileName?: string): void"] } ] From afd6de9c7056ee5670c0a4255e1fc76e3c327106 Mon Sep 17 00:00:00 2001 From: falsandtru Date: Mon, 27 Mar 2017 11:31:32 +0900 Subject: [PATCH 03/11] Improve method signatures returning Node type --- baselines/dom.generated.d.ts | 10 +++++----- inputfiles/overridingTypes.json | 30 +++++++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 95fad6275..dbf07a9e9 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -3208,7 +3208,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven * Gets or sets the version attribute specified in the declaration of an XML document. */ xmlVersion: string | null; - adoptNode(source: Node): Node; + adoptNode(source: T): T; captureEvents(): void; caretRangeFromPoint(x: number, y: number): Range; clear(): void; @@ -3385,7 +3385,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven * Gets a value indicating whether the object currently has focus. */ hasFocus(): boolean; - importNode(importedNode: Node, deep: boolean): Node; + importNode(importedNode: T, deep: boolean): T; msElementsFromPoint(x: number, y: number): NodeListOf; msElementsFromRect(left: number, top: number, width: number, height: number): NodeListOf; /** @@ -8254,15 +8254,15 @@ interface Node extends EventTarget { contains(child: Node): boolean; hasAttributes(): boolean; hasChildNodes(): boolean; - insertBefore(newChild: Node, refChild: Node | null): Node; + insertBefore(newChild: T, refChild: Node | null): T; isDefaultNamespace(namespaceURI: string | null): boolean; isEqualNode(arg: Node): boolean; isSameNode(other: Node): boolean; lookupNamespaceURI(prefix: string | null): string | null; lookupPrefix(namespaceURI: string | null): string | null; normalize(): void; - removeChild(oldChild: Node): Node; - replaceChild(newChild: Node, oldChild: Node): Node; + removeChild(oldChild: T): T; + replaceChild(newChild: Node, oldChild: T): T; readonly ATTRIBUTE_NODE: number; readonly CDATA_SECTION_NODE: number; readonly COMMENT_NODE: number; diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index cb84c43a2..855cdc909 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -12,9 +12,15 @@ }, { "kind": "method", - "interface": "Node", - "name": "insertBefore", - "signatures": ["insertBefore(newChild: Node, refChild: Node | null): Node"] + "interface": "Document", + "name": "adoptNode", + "signatures": ["adoptNode(source: T): T"] + }, + { + "kind": "method", + "interface": "Document", + "name": "importNode", + "signatures": ["importNode(importedNode: T, deep: boolean): T"] }, { "kind": "method", @@ -22,6 +28,24 @@ "name": "appendChild", "signatures": ["appendChild(newChild: T): T"] }, + { + "kind": "method", + "interface": "Node", + "name": "insertBefore", + "signatures": ["insertBefore(newChild: T, refChild: Node | null): T"] + }, + { + "kind": "method", + "interface": "Node", + "name": "removeChild", + "signatures": ["removeChild(oldChild: T): T"] + }, + { + "kind": "method", + "interface": "Node", + "name": "replaceChild", + "signatures": ["replaceChild(newChild: Node, oldChild: T): T"] + }, { "kind": "method", "interface": "HTMLCollection", From 33d0b2510452f7dc7d49f276b65dcbb6a5eb02cc Mon Sep 17 00:00:00 2001 From: VincentBel Date: Tue, 28 Mar 2017 22:32:30 +0800 Subject: [PATCH 04/11] add URL typing to webworker URL is also available in workder. --- baselines/dom.generated.d.ts | 20 ++++++++ baselines/webworker.generated.d.ts | 21 ++++++++ inputfiles/addedTypes.json | 80 +++++++++++++++++++++++++++++- 3 files changed, 120 insertions(+), 1 deletion(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 95fad6275..531a0f7c9 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -13232,6 +13232,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window readonly top: Window; readonly window: Window; URL: typeof URL; + URLSearchParams: typeof URLSearchParams; Blob: typeof Blob; customElements: CustomElementRegistry; alert(message?: any): void; @@ -13858,6 +13859,25 @@ interface ImageBitmap { close(): void; } +interface URL { + href: string; + readonly origin: string; + protocol: string; + username: string; + password: string; + host: string; + hostname: string; + port: string; + pathname: string; + search: string; + toJSON(): string; +} + +declare var URL: { + prototype: URL; + new (url: string, base?: string): URL; +} + interface URLSearchParams { /** * Appends a specified key/value pair as a new search parameter. diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index fb9358fc0..31a58f0e0 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -1406,6 +1406,8 @@ interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, Glo onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any; readonly performance: Performance; readonly self: WorkerGlobalScope; + URL: typeof URL; + URLSearchParams: typeof URLSearchParams; msWriteProfilerMark(profilerMarkName: string): void; createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise; createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise; @@ -1484,6 +1486,25 @@ interface ImageBitmap { close(): void; } +interface URL { + href: string; + readonly origin: string; + protocol: string; + username: string; + password: string; + host: string; + hostname: string; + port: string; + pathname: string; + search: string; + toJSON(): string; +} + +declare var URL: { + prototype: URL; + new (url: string, base?: string): URL; +} + interface BlobPropertyBag { type?: string; endings?: string; diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 61209eebc..21be15bdb 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -178,10 +178,67 @@ "name": "multiEntry", "type": "boolean" }, + { + "kind": "interface", + "name": "URL", + "flavor": "Worker", + "constructorSignatures": [ + "new (url: string, base?: string): URL" + ], + "properties": [ + { + "name": "href", + "type": "string" + }, + { + "name": "origin", + "type": "string", + "readonly": true + }, + { + "name": "protocol", + "type": "string" + }, + { + "name": "username", + "type": "string" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "host", + "type": "string" + }, + { + "name": "hostname", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "pathname", + "type": "string" + }, + { + "name": "search", + "type": "string" + } + ], + "methods": [ + { + "name": "toJSON", + "signatures": ["toJSON(): string"] + } + ] + }, { "kind": "interface", "name": "URLSearchParams", - "flavor": "Web", + "flavor": "All", "constructorSignatures": [ "new (init?: string | URLSearchParams): URLSearchParams" ], @@ -226,6 +283,27 @@ "name": "URL", "type": "typeof URL" }, + { + "kind": "property", + "interface": "WorkerGlobalScope", + "exposeGlobally": false, + "name": "URL", + "type": "typeof URL" + }, + { + "kind": "property", + "interface": "Window", + "exposeGlobally": false, + "name": "URLSearchParams", + "type": "typeof URLSearchParams" + }, + { + "kind": "property", + "interface": "WorkerGlobalScope", + "exposeGlobally": false, + "name": "URLSearchParams", + "type": "typeof URLSearchParams" + }, { "kind": "property", "interface": "Window", From 53ffc3fa20383a3026872e0a8d8bb3cb193172c2 Mon Sep 17 00:00:00 2001 From: ncoley Date: Tue, 28 Mar 2017 21:06:12 -0400 Subject: [PATCH 05/11] Update FormData methods to match XMLHttpRequest Standard --- baselines/dom.generated.d.ts | 12 ++++++------ inputfiles/addedTypes.json | 10 +++++----- inputfiles/overridingTypes.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index a8051e89b..a320b2125 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -3796,12 +3796,12 @@ declare var FocusNavigationEvent: { } interface FormData { - append(name: any, value: any, fileName?: string): void; - delete(name: any): void; - get(name: any): any; - getAll(name: any): any; - has(name: any): any; - set(name: any, value: any, fileName?: string): void; + append(name: string, value: any, fileName?: string): void; + delete(name: string): void; + get(name: string): any; + getAll(name: string): any[]; + has(name: string): boolean; + set(name: string, value: any, fileName?: string): void; } declare var FormData: { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index e4f01808e..66c6c155f 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -1540,34 +1540,34 @@ "interface": "FormData", "name": "delete", "flavor": "Web", - "signatures": ["delete(name: any): void"] + "signatures": ["delete(name: string): void"] }, { "kind": "method", "interface": "FormData", "name": "get", "flavor": "Web", - "signatures": ["get(name: any): any"] + "signatures": ["get(name: string): any"] }, { "kind": "method", "interface": "FormData", "name": "getAll", "flavor": "Web", - "signatures": ["getAll(name: any): any"] + "signatures": ["getAll(name: string): any[]"] }, { "kind": "method", "interface": "FormData", "name": "has", "flavor": "Web", - "signatures": ["has(name: any): any"] + "signatures": ["has(name: string): boolean"] }, { "kind": "method", "interface": "FormData", "name": "set", "flavor": "Web", - "signatures": ["set(name: any, value: any, fileName?: string): void"] + "signatures": ["set(name: string, value: any, fileName?: string): void"] } ] diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index 7aa373bbd..818be0e05 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -1022,6 +1022,6 @@ "interface": "FormData", "name": "append", "flavor": "Web", - "signatures": ["append(name: any, value: any, fileName?: string): void"] + "signatures": ["append(name: string, value: any, fileName?: string): void"] } ] From 2e50da8032076475a2c68d0fca394d7c2fdd48a7 Mon Sep 17 00:00:00 2001 From: ncoley Date: Tue, 28 Mar 2017 21:46:12 -0400 Subject: [PATCH 06/11] Replace any with appropriate types for FormData methods --- baselines/dom.generated.d.ts | 8 ++++---- inputfiles/addedTypes.json | 6 +++--- inputfiles/overridingTypes.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index a320b2125..67d0e5b0f 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -3796,12 +3796,12 @@ declare var FocusNavigationEvent: { } interface FormData { - append(name: string, value: any, fileName?: string): void; + append(name: string, value: string | blob, fileName?: string): void; delete(name: string): void; - get(name: string): any; - getAll(name: string): any[]; + get(name: string): FormDataEntryValue | null; + getAll(name: string): FormDataEntryValue[]; has(name: string): boolean; - set(name: string, value: any, fileName?: string): void; + set(name: string, value: string | blob, fileName?: string): void; } declare var FormData: { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 66c6c155f..e7ad839f3 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -1547,14 +1547,14 @@ "interface": "FormData", "name": "get", "flavor": "Web", - "signatures": ["get(name: string): any"] + "signatures": ["get(name: string): FormDataEntryValue | null"] }, { "kind": "method", "interface": "FormData", "name": "getAll", "flavor": "Web", - "signatures": ["getAll(name: string): any[]"] + "signatures": ["getAll(name: string): FormDataEntryValue[]"] }, { "kind": "method", @@ -1568,6 +1568,6 @@ "interface": "FormData", "name": "set", "flavor": "Web", - "signatures": ["set(name: string, value: any, fileName?: string): void"] + "signatures": ["set(name: string, value: string | blob, fileName?: string): void"] } ] diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index 818be0e05..b9012397e 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -1022,6 +1022,6 @@ "interface": "FormData", "name": "append", "flavor": "Web", - "signatures": ["append(name: string, value: any, fileName?: string): void"] + "signatures": ["append(name: string, value: string | blob, fileName?: string): void"] } ] From fa253649a04ab0f393ee10a95b6ac1e9b0d0e2e5 Mon Sep 17 00:00:00 2001 From: VincentBel Date: Wed, 29 Mar 2017 10:12:46 +0800 Subject: [PATCH 07/11] add URL and URLSearcParams to `knownWorkerInterfaces.json` --- baselines/dom.generated.d.ts | 19 -------- baselines/webworker.generated.d.ts | 69 +++++++++++++++++++++------ inputfiles/addedTypes.json | 58 ---------------------- inputfiles/knownWorkerInterfaces.json | 4 +- 4 files changed, 57 insertions(+), 93 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 531a0f7c9..8d599758a 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -13859,25 +13859,6 @@ interface ImageBitmap { close(): void; } -interface URL { - href: string; - readonly origin: string; - protocol: string; - username: string; - password: string; - host: string; - hostname: string; - port: string; - pathname: string; - search: string; - toJSON(): string; -} - -declare var URL: { - prototype: URL; - new (url: string, base?: string): URL; -} - interface URLSearchParams { /** * Appends a specified key/value pair as a new search parameter. diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 31a58f0e0..136b0e9e1 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -1008,6 +1008,29 @@ declare var SyncManager: { new(): SyncManager; } +interface URL { + hash: string; + host: string; + hostname: string; + href: string; + readonly origin: string; + password: string; + pathname: string; + port: string; + protocol: string; + search: string; + username: string; + readonly searchParams: URLSearchParams; + toString(): string; +} + +declare var URL: { + prototype: URL; + new(url: string, base?: string): URL; + createObjectURL(object: any, options?: ObjectURLOptions): string; + revokeObjectURL(url: string): void; +} + interface WebSocketEventMap { "close": CloseEvent; "error": Event; @@ -1486,23 +1509,39 @@ interface ImageBitmap { close(): void; } -interface URL { - href: string; - readonly origin: string; - protocol: string; - username: string; - password: string; - host: string; - hostname: string; - port: string; - pathname: string; - search: string; - toJSON(): string; +interface URLSearchParams { + /** + * Appends a specified key/value pair as a new search parameter. + */ + append(name: string, value: string): void; + /** + * Deletes the given search parameter, and its associated value, from the list of all search parameters. + */ + delete(name: string): void; + /** + * Returns the first value associated to the given search parameter. + */ + get(name: string): string | null; + /** + * Returns all the values association with a given search parameter. + */ + getAll(name: string): string[]; + /** + * Returns a Boolean indicating if such a search parameter exists. + */ + has(name: string): boolean; + /** + * Sets the value associated to a given search parameter to the given value. If there were several values, delete the others. + */ + set(name: string, value: string): void; } -declare var URL: { - prototype: URL; - new (url: string, base?: string): URL; +declare var URLSearchParams: { + prototype: URLSearchParams; + /** + * Constructor returning a URLSearchParams object. + */ + new (init?: string | URLSearchParams): URLSearchParams; } interface BlobPropertyBag { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 21be15bdb..976cb4967 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -178,67 +178,9 @@ "name": "multiEntry", "type": "boolean" }, - { - "kind": "interface", - "name": "URL", - "flavor": "Worker", - "constructorSignatures": [ - "new (url: string, base?: string): URL" - ], - "properties": [ - { - "name": "href", - "type": "string" - }, - { - "name": "origin", - "type": "string", - "readonly": true - }, - { - "name": "protocol", - "type": "string" - }, - { - "name": "username", - "type": "string" - }, - { - "name": "password", - "type": "string" - }, - { - "name": "host", - "type": "string" - }, - { - "name": "hostname", - "type": "string" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "pathname", - "type": "string" - }, - { - "name": "search", - "type": "string" - } - ], - "methods": [ - { - "name": "toJSON", - "signatures": ["toJSON(): string"] - } - ] - }, { "kind": "interface", "name": "URLSearchParams", - "flavor": "All", "constructorSignatures": [ "new (init?: string | URLSearchParams): URLSearchParams" ], diff --git a/inputfiles/knownWorkerInterfaces.json b/inputfiles/knownWorkerInterfaces.json index a56aea3ed..9cf72f611 100644 --- a/inputfiles/knownWorkerInterfaces.json +++ b/inputfiles/knownWorkerInterfaces.json @@ -91,6 +91,8 @@ "SyncEventInit", "SyncManager", "USVString", + "URL", + "URLSearchParams", "WebSocket", "WindowBase64", "WindowConsole", @@ -98,4 +100,4 @@ "XMLHttpRequest", "XMLHttpRequestEventTarget", "XMLHttpRequestUpload" -] \ No newline at end of file +] From 86cee0679b4f3b5b2440168e1e5e1bfaf98908d9 Mon Sep 17 00:00:00 2001 From: ncoley Date: Tue, 28 Mar 2017 22:02:33 -0400 Subject: [PATCH 08/11] Add typedef for FormDataEntryValue --- baselines/dom.generated.d.ts | 3 ++- baselines/webworker.generated.d.ts | 3 ++- inputfiles/addedTypes.json | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 67d0e5b0f..dec4420f4 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -14945,4 +14945,5 @@ type ScrollLogicalPosition = "start" | "center" | "end" | "nearest"; type IDBValidKey = number | string | Date | IDBArrayKey; type BufferSource = ArrayBuffer | ArrayBufferView; type MouseWheelEvent = WheelEvent; -type ScrollRestoration = "auto" | "manual"; \ No newline at end of file +type ScrollRestoration = "auto" | "manual"; +type FormDataEntryValue = string | File; \ No newline at end of file diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index fb9358fc0..4d9f37914 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -1745,4 +1745,5 @@ type IDBKeyPath = string; type RequestInfo = Request | string; type USVString = string; type IDBValidKey = number | string | Date | IDBArrayKey; -type BufferSource = ArrayBuffer | ArrayBufferView; \ No newline at end of file +type BufferSource = ArrayBuffer | ArrayBufferView; +type FormDataEntryValue = string | File; \ No newline at end of file diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index e7ad839f3..0870f229b 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -1535,6 +1535,11 @@ "flavor": "DOM", "signatures": ["getElementById(elementId: string): HTMLElement | null"] }, + { + "kind": "typedef", + "name": "FormDataEntryValue", + "type": "string | File" + }, { "kind": "method", "interface": "FormData", From e0f29868110fdcd390248bbffbd3d58350e2c99f Mon Sep 17 00:00:00 2001 From: VincentBel Date: Wed, 29 Mar 2017 10:44:43 +0800 Subject: [PATCH 09/11] don't add `URL` and `URLSearchParams` to WorkerGlobalScope --- baselines/webworker.generated.d.ts | 2 -- inputfiles/addedTypes.json | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 136b0e9e1..006415e18 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -1429,8 +1429,6 @@ interface WorkerGlobalScope extends EventTarget, WorkerUtils, WindowConsole, Glo onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any; readonly performance: Performance; readonly self: WorkerGlobalScope; - URL: typeof URL; - URLSearchParams: typeof URLSearchParams; msWriteProfilerMark(profilerMarkName: string): void; createImageBitmap(image: ImageBitmap | ImageData | Blob, options?: ImageBitmapOptions): Promise; createImageBitmap(image: ImageBitmap | ImageData | Blob, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise; diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 976cb4967..293035718 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -225,13 +225,6 @@ "name": "URL", "type": "typeof URL" }, - { - "kind": "property", - "interface": "WorkerGlobalScope", - "exposeGlobally": false, - "name": "URL", - "type": "typeof URL" - }, { "kind": "property", "interface": "Window", @@ -239,13 +232,6 @@ "name": "URLSearchParams", "type": "typeof URLSearchParams" }, - { - "kind": "property", - "interface": "WorkerGlobalScope", - "exposeGlobally": false, - "name": "URLSearchParams", - "type": "typeof URLSearchParams" - }, { "kind": "property", "interface": "Window", From 0fe9b6f0591f4c07174a95f62e98fa146be3a05d Mon Sep 17 00:00:00 2001 From: VincentBel Date: Wed, 29 Mar 2017 14:14:31 +0800 Subject: [PATCH 10/11] add `ObjectURLOptions` to webworker --- baselines/webworker.generated.d.ts | 4 ++++ inputfiles/knownWorkerInterfaces.json | 1 + 2 files changed, 5 insertions(+) diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 006415e18..0034d0a63 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -61,6 +61,10 @@ interface NotificationOptions { icon?: string; } +interface ObjectURLOptions { + oneTimeOnly?: boolean; +} + interface PushSubscriptionOptionsInit { userVisibleOnly?: boolean; applicationServerKey?: any; diff --git a/inputfiles/knownWorkerInterfaces.json b/inputfiles/knownWorkerInterfaces.json index 9cf72f611..7e35f48e6 100644 --- a/inputfiles/knownWorkerInterfaces.json +++ b/inputfiles/knownWorkerInterfaces.json @@ -66,6 +66,7 @@ "NotificationEventInit", "NotificationOptions", "NotificationPermissionCallback", + "ObjectURLOptions", "Performance", "PerformanceNavigation", "PerformanceTiming", From 0f76e1f01b43b671ff9e6f0f5341e50d8d8c128e Mon Sep 17 00:00:00 2001 From: ncoley Date: Wed, 29 Mar 2017 08:55:01 -0400 Subject: [PATCH 11/11] Capitalize Blob in FormData type methods --- baselines/dom.generated.d.ts | 4 ++-- inputfiles/addedTypes.json | 2 +- inputfiles/overridingTypes.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index dec4420f4..1bceb90b7 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -3796,12 +3796,12 @@ declare var FocusNavigationEvent: { } interface FormData { - append(name: string, value: string | blob, fileName?: string): void; + append(name: string, value: string | Blob, fileName?: string): void; delete(name: string): void; get(name: string): FormDataEntryValue | null; getAll(name: string): FormDataEntryValue[]; has(name: string): boolean; - set(name: string, value: string | blob, fileName?: string): void; + set(name: string, value: string | Blob, fileName?: string): void; } declare var FormData: { diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 0870f229b..2e3043f04 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -1573,6 +1573,6 @@ "interface": "FormData", "name": "set", "flavor": "Web", - "signatures": ["set(name: string, value: string | blob, fileName?: string): void"] + "signatures": ["set(name: string, value: string | Blob, fileName?: string): void"] } ] diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index b9012397e..59e285d8d 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -1022,6 +1022,6 @@ "interface": "FormData", "name": "append", "flavor": "Web", - "signatures": ["append(name: string, value: string | blob, fileName?: string): void"] + "signatures": ["append(name: string, value: string | Blob, fileName?: string): void"] } ]