Change the type of IDBIndex.openCursor IDBIndex.openKeyCursor and IDBObjectStore.openCursor

Author: zhengbli

Shared.fsx

@@ -60,7 +60,15 @@ module JsonItems =
     // This is the kind of items in the external json files that are used as a
     // correction for the spec.
     type ItemKind =
-        Property | Method | Constant | Constructor | Interface | Callback | Indexer | SignatureOverload
+        | Property
+        | Method
+        | Constant
+        | Constructor
+        | Interface
+        | Callback
+        | Indexer
+        | SignatureOverload
+        | TypeDef
         override x.ToString() = (unionToString x).ToLower()
 
     let findItem (allItems: ItemsType.Root []) (itemName: string) (kind: ItemKind) otherFilter =

TS.fsx

@@ -6,6 +6,7 @@ open Shared
 open Shared.Comments
 open Shared.JsonItems
 open System.IO
+open System.Web
 
 // Global print target
 let Pt = StringPrinter()
@@ -61,7 +62,7 @@ let rec DomTypeToTsType (objDomType: string) =
                 if Seq.contains "any" allTypes then "any" else String.concat " | " allTypes
             else
                 // Check if is array type, which looks like "sequence<DOMString>"
-                let unescaped = objDomType.Replace("&lt;", "<").Replace("&gt;", ">")
+                let unescaped = System.Web.HttpUtility.HtmlDecode(objDomType)
                 let genericMatch = Regex.Match(unescaped, @"^(\w+)<(\w+)>$")
                 if genericMatch.Success then
                     let tName = DomTypeToTsType (genericMatch.Groups.[1].Value)
@@ -610,10 +611,17 @@ let EmitAddedInterface (ai: JsonItems.ItemsType.Root) =
         Pt.printl "}"
         Pt.printl ""
 
-let EmitTypeDefs () =
+let EmitTypeDefs flavor =
     let EmitTypeDef (typeDef: Browser.Typedef) =
         Pt.printl "type %s = %s;" typeDef.NewType (DomTypeToTsType typeDef.Type)
-    browser.Typedefs |> Array.iter EmitTypeDef
+    let EmitTypeDefFromJson (typeDef: ItemsType.Root) =
+        Pt.printl "type %s = %s;" typeDef.Name.Value typeDef.Type.Value
+
+    if flavor <> Flavor.Worker then
+        browser.Typedefs |> Array.iter EmitTypeDef
+
+    JsonItems.getAddedItems ItemKind.TypeDef flavor
+    |> Array.iter EmitTypeDefFromJson
 
 let EmitTheWholeThing flavor (target:TextWriter) =
     Pt.reset()
@@ -645,8 +653,7 @@ let EmitTheWholeThing flavor (target:TextWriter) =
         EmitEventHandlers "declare var " gp
     | _ -> ()
 
-    if flavor <> Flavor.Worker then
-        EmitTypeDefs()
+    EmitTypeDefs flavor
 
     fprintf target "%s" (Pt.getResult())
     target.Flush()

baselines/dom.generated.d.ts

@@ -7603,8 +7603,8 @@ interface IDBIndex {
     count(key?: any): IDBRequest;
     get(key: any): IDBRequest;
     getKey(key: any): IDBRequest;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    openKeyCursor(range?: any, direction?: string): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -7642,7 +7642,7 @@ interface IDBObjectStore {
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
     put(value: any, key?: any): IDBRequest;
 }
 
@@ -13663,6 +13663,9 @@ interface ClipboardEventInit extends EventInit {
     dataType?: string;
 }
 
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -14031,4 +14034,5 @@ type MSLocalClientEvent = MSLocalClientEventBase | MSAudioLocalClientEvent;
 type MSOutboundPayload = MSVideoSendPayload | MSAudioSendPayload;
 type RTCIceGatherCandidate = RTCIceCandidate | RTCIceCandidateComplete;
 type RTCTransport = RTCDtlsTransport | RTCSrtpSdesTransport;
-type payloadtype = number;
+type payloadtype = number;
+type IDBValidKey = number | string | Date | IDBArrayKey;

baselines/webworker.generated.d.ts

@@ -349,8 +349,8 @@ interface IDBIndex {
     count(key?: any): IDBRequest;
     get(key: any): IDBRequest;
     getKey(key: any): IDBRequest;
-    openCursor(range?: any, direction?: string): IDBRequest;
-    openKeyCursor(range?: any, direction?: string): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
 }
 
 declare var IDBIndex: {
@@ -388,7 +388,7 @@ interface IDBObjectStore {
     deleteIndex(indexName: string): void;
     get(key: any): IDBRequest;
     index(name: string): IDBIndex;
-    openCursor(range?: any, direction?: string): IDBRequest;
+    openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest;
     put(value: any, key?: any): IDBRequest;
 }
 
@@ -927,6 +927,9 @@ interface ProgressEventInit extends EventInit {
     total?: number;
 }
 
+interface IDBArrayKey extends Array<IDBValidKey> {
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -985,4 +988,5 @@ declare function postMessage(data: any): void;
 declare var console: Console;
 declare function addEventListener(type: "error", listener: (ev: ErrorEvent) => any, useCapture?: boolean): void;
 declare function addEventListener(type: "message", listener: (ev: MessageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
+type IDBValidKey = number | string | Date | IDBArrayKey;

inputfiles/addedTypes.json

@@ -362,5 +362,15 @@
                 "type": "string"
             }
         ]
+    },
+    {
+        "kind": "typedef",
+        "name": "IDBValidKey",
+        "type": "number | string | Date | IDBArrayKey"
+    },
+    {
+        "kind": "interface",
+        "name": "IDBArrayKey",
+        "extends": "Array<IDBValidKey>"
     }
 ]

inputfiles/overridingTypes.json

@@ -397,5 +397,23 @@
         "signatures": [
             "new(type: string, eventInitDict?: ClipboardEventInit): ClipboardEvent"
         ]
+    },
+    {
+        "kind": "method",
+        "interface": "IDBIndex",
+        "name": "openCursor",
+        "signatures": ["openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest"]
+    },
+    {
+        "kind": "method",
+        "interface": "IDBIndex",
+        "name": "openKeyCursor",
+        "signatures": ["openKeyCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest"]
+    },
+    {
+        "kind": "method",
+        "interface": "IDBObjectStore",
+        "name": "openCursor",
+        "signatures": ["openCursor(range?: IDBKeyRange | IDBValidKey, direction?: string): IDBRequest"]
     }
 ]

inputfiles/sample.json

@@ -325,5 +325,10 @@
         "name": "createElementNS",
         "interface": "Document",
         "signatures": [ "createElementNS(namespaceURI: \"http://www.w3.org/2000/svg\", qualifiedName: \"a\"): SVGAElement" ]
+    },
+    {
+        "kind": "typedef",
+        "name": "IDBValidKey",
+        "type": "number | string | Date | IDBArrayKey"
     }
 ]