From 93dafcf8b4357cf55dc5e32209bddc5c329a0163 Mon Sep 17 00:00:00 2001 From: falsandtru Date: Sat, 16 Jan 2016 05:44:05 +0900 Subject: [PATCH 1/2] Update IndexedDB interfaces https://www.w3.org/TR/IndexedDB/ --- baselines/dom.generated.d.ts | 9 +++++---- baselines/webworker.generated.d.ts | 13 ++++++------- inputfiles/addedTypes.json | 6 ++++++ inputfiles/overridingTypes.json | 30 ++++++++++++++++++++++++++++++ inputfiles/removedTypes.json | 10 ++++++++++ 5 files changed, 57 insertions(+), 11 deletions(-) diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts index 449ece679..a5eeb42b5 100644 --- a/baselines/dom.generated.d.ts +++ b/baselines/dom.generated.d.ts @@ -6891,7 +6891,7 @@ interface IDBCursor { direction: string; key: any; primaryKey: any; - source: any; + source: IDBObjectStore | IDBIndex; advance(count: number): void; continue(key?: any): void; delete(): IDBRequest; @@ -6929,7 +6929,7 @@ interface IDBDatabase extends EventTarget { close(): void; createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; deleteObjectStore(name: string): void; - transaction(storeNames: any, mode?: string): IDBTransaction; + transaction(storeNames: string | string[], mode?: string): IDBTransaction; addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -6987,9 +6987,10 @@ declare var IDBKeyRange: { interface IDBObjectStore { indexNames: DOMStringList; - keyPath: string; + keyPath: string | string[]; name: string; transaction: IDBTransaction; + autoIncrement: boolean; add(value: any, key?: any): IDBRequest; clear(): IDBRequest; count(key?: any): IDBRequest; @@ -7028,7 +7029,7 @@ interface IDBRequest extends EventTarget { onsuccess: (ev: Event) => any; readyState: string; result: any; - source: any; + source: IDBObjectStore | IDBIndex | IDBCursor; transaction: IDBTransaction; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void; diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index 3c8574ccf..f8079eaa1 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -275,7 +275,7 @@ interface IDBCursor { direction: string; key: any; primaryKey: any; - source: any; + source: IDBObjectStore | IDBIndex; advance(count: number): void; continue(key?: any): void; delete(): IDBRequest; @@ -313,7 +313,7 @@ interface IDBDatabase extends EventTarget { close(): void; createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): IDBObjectStore; deleteObjectStore(name: string): void; - transaction(storeNames: any, mode?: string): IDBTransaction; + transaction(storeNames: string | string[], mode?: string): IDBTransaction; addEventListener(type: "abort", listener: (ev: Event) => any, useCapture?: boolean): void; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; @@ -371,9 +371,10 @@ declare var IDBKeyRange: { interface IDBObjectStore { indexNames: DOMStringList; - keyPath: string; + keyPath: string | string[]; name: string; transaction: IDBTransaction; + autoIncrement: boolean; add(value: any, key?: any): IDBRequest; clear(): IDBRequest; count(key?: any): IDBRequest; @@ -412,7 +413,7 @@ interface IDBRequest extends EventTarget { onsuccess: (ev: Event) => any; readyState: string; result: any; - source: any; + source: IDBObjectStore | IDBIndex | IDBCursor; transaction: IDBTransaction; addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void; addEventListener(type: "success", listener: (ev: Event) => any, useCapture?: boolean): void; @@ -880,9 +881,7 @@ interface DedicatedWorkerGlobalScope { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } -interface WorkerUtils extends Object, WindowBase64 { - indexedDB: IDBFactory; - msIndexedDB: IDBFactory; +interface WorkerUtils extends Object, WindowBase64, IDBEnvironment { navigator: WorkerNavigator; clearImmediate(handle: number): void; clearInterval(handle: number): void; diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json index 9eac7fa3a..96be4b7d3 100644 --- a/inputfiles/addedTypes.json +++ b/inputfiles/addedTypes.json @@ -360,5 +360,11 @@ "interface": "StorageEvent", "name": "storageArea?", "type": "Storage" + }, + { + "kind": "property", + "interface": "IDBObjectStore", + "name": "autoIncrement", + "type": "boolean" } ] diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index 56a6f5ebe..0b8e2774f 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -319,5 +319,35 @@ "signatures": [ "new (type: string, eventInitDict?: StorageEventInit): StorageEvent" ] + }, + { + "kind": "property", + "interface": "IDBCursor", + "name": "source", + "type": "IDBObjectStore | IDBIndex" + }, + { + "kind": "method", + "interface": "IDBDatabase", + "name": "transaction", + "signatures": ["transaction(storeNames: string | string[], mode?: string): IDBTransaction"] + }, + { + "kind": "property", + "interface": "IDBObjectStore", + "name": "keyPath", + "type": "string | string[]" + }, + { + "kind": "property", + "interface": "IDBRequest", + "name": "source", + "type": "IDBObjectStore | IDBIndex | IDBCursor" + }, + { + "kind": "interface", + "name": "WorkerUtils", + "flavor": "Worker", + "extends": "Object, WindowBase64, IDBEnvironment" } ] diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json index 77cd4f4e7..9a14dcf73 100644 --- a/inputfiles/removedTypes.json +++ b/inputfiles/removedTypes.json @@ -43,5 +43,15 @@ "kind": "property", "interface": "StorageEvent", "name": "storageArea" + }, + { + "kind": "property", + "interface": "WorkerUtils", + "name": "indexedDB" + }, + { + "kind": "property", + "interface": "WorkerUtils", + "name": "msIndexedDB" } ] From 51a812716a7e73f4268ade7baedd8cd82bb0df5d Mon Sep 17 00:00:00 2001 From: falsandtru Date: Sun, 24 Jan 2016 22:06:58 +0900 Subject: [PATCH 2/2] Remove changes of extending targets https://github.com/Microsoft/TSJS-lib-generator/issues/50 --- baselines/webworker.generated.d.ts | 4 +++- inputfiles/overridingTypes.json | 6 ------ inputfiles/removedTypes.json | 10 ---------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts index f8079eaa1..35dc82333 100644 --- a/baselines/webworker.generated.d.ts +++ b/baselines/webworker.generated.d.ts @@ -881,7 +881,9 @@ interface DedicatedWorkerGlobalScope { addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void; } -interface WorkerUtils extends Object, WindowBase64, IDBEnvironment { +interface WorkerUtils extends Object, WindowBase64 { + indexedDB: IDBFactory; + msIndexedDB: IDBFactory; navigator: WorkerNavigator; clearImmediate(handle: number): void; clearInterval(handle: number): void; diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json index 1ff3280fe..48f1b2ca5 100644 --- a/inputfiles/overridingTypes.json +++ b/inputfiles/overridingTypes.json @@ -344,12 +344,6 @@ "name": "source", "type": "IDBObjectStore | IDBIndex | IDBCursor" }, - { - "kind": "interface", - "name": "WorkerUtils", - "flavor": "Worker", - "extends": "Object, WindowBase64, IDBEnvironment" - }, { "kind": "method", "interface": "Window", diff --git a/inputfiles/removedTypes.json b/inputfiles/removedTypes.json index 9a14dcf73..77cd4f4e7 100644 --- a/inputfiles/removedTypes.json +++ b/inputfiles/removedTypes.json @@ -43,15 +43,5 @@ "kind": "property", "interface": "StorageEvent", "name": "storageArea" - }, - { - "kind": "property", - "interface": "WorkerUtils", - "name": "indexedDB" - }, - { - "kind": "property", - "interface": "WorkerUtils", - "name": "msIndexedDB" } ]