add DOMException (not provided by IDL)

saschanaz · saschanaz · commit 1fda2caafedc · 2017-04-28T19:37:40.000+09:00
diff --git a/TS.fsx b/TS.fsx
@@ -715,7 +715,8 @@ module Emit =
         | "any" -> "any"
         | "bool" | "boolean" | "Boolean" -> "boolean"
         | "Date" -> "Date"
-        | "DOMException" -> "Error"
+        | "Error" -> "Error"
+        | "DOMException" -> "DOMException"
         | "DOMHighResTimeStamp" -> "number"
         | "DOMString" | "USVString" | "ByteString" -> "string"
         | "DOMTimeStamp" -> "number"
@@ -787,7 +788,7 @@ module Emit =
                 | Some c' -> emitConstantFromJson c'
                 | None -> Pt.Printl "readonly %s: %s;" c.Name (DomTypeToTsType c.Type)
 
-        let addedConstants = getAddedItems ItemKind.Constant Flavor.All
+        let addedConstants = getAddedItemsByInterfaceName ItemKind.Constant Flavor.All i.Name
         Array.iter emitConstantFromJson addedConstants
 
         if i.Constants.IsSome then
@@ -1146,8 +1147,7 @@ module Emit =
                 else
                     Pt.Printl "new (): %s;" i.Name
 
-        getAddedItems ItemKind.Constructor Flavor.All
-        |> Array.filter (matchInterface i.Name)
+        getAddedItemsByInterfaceName ItemKind.Constructor Flavor.All i.Name
         |> Array.iter emitConstructorSigFromJson
 
     let EmitConstructor flavor (i:Browser.Interface) =
@@ -1473,10 +1473,13 @@ module Emit =
             | _ -> ()
             m.Signatures |> Array.iter (Pt.PrintWithAddedIndent "%s;")
 
+        let emitConstant (c: InputJsonType.Constant) =
+            Pt.PrintWithAddedIndent "readonly %s: %s;" c.Name c.Type
 
         ai.Properties |> Array.iter emitProperty
         ai.Methods |> Array.iter emitMethod
         ai.Indexer |> Array.collect (fun i -> i.Signatures) |> Array.iter (Pt.PrintWithAddedIndent "%s;")
+        ai.Constants |> Array.iter emitConstant
         Pt.Printl "}"
         Pt.Printl ""
 
@@ -1487,6 +1490,7 @@ module Emit =
             | Some comment -> Pt.PrintWithAddedIndent "%s" comment
             | _ -> ()
             ai.ConstructorSignatures |> Array.iter (Pt.PrintWithAddedIndent "%s;")
+            ai.Constants |> Array.iter emitConstant
             Pt.Printl "}"
             Pt.Printl ""
 
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -1470,7 +1470,7 @@ interface ScrollToOptions extends ScrollOptions {
 }
 
 interface SensorErrorEventInit extends EventInit {
-    error?: any;
+    error?: Error;
 }
 
 interface SensorOptions {
@@ -8538,7 +8538,7 @@ declare var Sensor: {
 }
 
 interface SensorErrorEvent extends Event {
-    readonly error: any;
+    readonly error: Error;
 }
 
 declare var SensorErrorEvent: {
@@ -12728,13 +12728,73 @@ interface AssignedNodesOptions {
     flatten?: boolean;
 }
 
+interface DOMException extends Error {
+    readonly name: string;
+    readonly code: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+}
+
+declare var DOMException: {
+    prototype: DOMException;
+    new (message?: string, name?: string): DOMException;
+    readonly INDEX_SIZE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface BlobCallback {
     (blob: Blob | null): void;
 }
 interface DecodeErrorCallback {
-    (error: Error): void;
+    (error: DOMException): void;
 }
 interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
@@ -12785,7 +12845,7 @@ interface PositionErrorCallback {
     (positionError: PositionError): void;
 }
 interface RTCPeerConnectionErrorCallback {
-    (error: Error): void;
+    (error: DOMException): void;
 }
 interface RTCSessionDescriptionCallback {
     (description: RTCSessionDescriptionInit): void;
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -1466,10 +1466,70 @@ interface ProgressEventInit extends EventInit {
 interface IDBArrayKey extends Array<IDBValidKey> {
 }
 
+interface DOMException extends Error {
+    readonly name: string;
+    readonly code: number;
+    readonly INDEX_SIZE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+}
+
+declare var DOMException: {
+    prototype: DOMException;
+    new (message?: string, name?: string): DOMException;
+    readonly INDEX_SIZE_ERR: number;
+    readonly DOMSTRING_SIZE_ERR: number;
+    readonly HIERARCHY_REQUEST_ERR: number;
+    readonly WRONG_DOCUMENT_ERR: number;
+    readonly INVALID_CHARACTER_ERR: number;
+    readonly NO_DATA_ALLOWED_ERR: number;
+    readonly NO_MODIFICATION_ALLOWED_ERR: number;
+    readonly NOT_FOUND_ERR: number;
+    readonly NOT_SUPPORTED_ERR: number;
+    readonly INUSE_ATTRIBUTE_ERR: number;
+    readonly INVALID_STATE_ERR: number;
+    readonly SYNTAX_ERR: number;
+    readonly INVALID_MODIFICATION_ERR: number;
+    readonly NAMESPACE_ERR: number;
+    readonly INVALID_ACCESS_ERR: number;
+    readonly VALIDATION_ERR: number;
+    readonly TYPE_MISMATCH_ERR: number;
+    readonly SECURITY_ERR: number;
+    readonly NETWORK_ERR: number;
+    readonly ABORT_ERR: number;
+    readonly URL_MISMATCH_ERR: number;
+    readonly QUOTA_EXCEEDED_ERR: number;
+    readonly TIMEOUT_ERR: number;
+    readonly INVALID_NODE_TYPE_ERR: number;
+    readonly DATA_CLONE_ERR: number;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface DecodeErrorCallback {
-    (error: Error): void;
+    (error: DOMException): void;
 }
 interface DecodeSuccessCallback {
     (decodedData: AudioBuffer): void;
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
@@ -632,5 +632,128 @@
         "name": "formData",
         "flavor": "Web",
         "signatures": ["formData(): Promise<FormData>"]
+    },
+    
+    {
+        "kind": "interface",
+        "name": "DOMException",
+        "extends": "Error",
+        "properties": [
+            {
+                "name": "name",
+                "type": "string",
+                "readonly": true
+            },
+            {
+                "name": "code",
+                "type": "number",
+                "readonly": true
+            }
+        ],
+        "constructorSignatures": [
+            "new (message?: string, name?: string): DOMException"
+        ],
+        "constants": [
+            {
+                "name": "INDEX_SIZE_ERR",
+                "type": "number"
+            },
+            {
+                "name": "DOMSTRING_SIZE_ERR",
+                "type": "number"
+            },
+            {
+                "name": "HIERARCHY_REQUEST_ERR",
+                "type": "number"
+            },
+            {
+                "name": "WRONG_DOCUMENT_ERR",
+                "type": "number"
+            },
+            {
+                "name": "INVALID_CHARACTER_ERR",
+                "type": "number"
+            },
+            {
+                "name": "NO_DATA_ALLOWED_ERR",
+                "type": "number"
+            },
+            {
+                "name": "NO_MODIFICATION_ALLOWED_ERR",
+                "type": "number"
+            },
+            {
+                "name": "NOT_FOUND_ERR",
+                "type": "number"
+            },
+            {
+                "name": "NOT_SUPPORTED_ERR",
+                "type": "number"
+            },
+            {
+                "name": "INUSE_ATTRIBUTE_ERR",
+                "type": "number"
+            },
+            {
+                "name": "INVALID_STATE_ERR",
+                "type": "number"
+            },
+            {
+                "name": "SYNTAX_ERR",
+                "type": "number"
+            },
+            {
+                "name": "INVALID_MODIFICATION_ERR",
+                "type": "number"
+            },
+            {
+                "name": "NAMESPACE_ERR",
+                "type": "number"
+            },
+            {
+                "name": "INVALID_ACCESS_ERR",
+                "type": "number"
+            },
+            {
+                "name": "VALIDATION_ERR",
+                "type": "number"
+            },
+            {
+                "name": "TYPE_MISMATCH_ERR",
+                "type": "number"
+            },
+            {
+                "name": "SECURITY_ERR",
+                "type": "number"
+            },
+            {
+                "name": "NETWORK_ERR",
+                "type": "number"
+            },
+            {
+                "name": "ABORT_ERR",
+                "type": "number"
+            },
+            {
+                "name": "URL_MISMATCH_ERR",
+                "type": "number"
+            },
+            {
+                "name": "QUOTA_EXCEEDED_ERR",
+                "type": "number"
+            },
+            {
+                "name": "TIMEOUT_ERR",
+                "type": "number"
+            },
+            {
+                "name": "INVALID_NODE_TYPE_ERR",
+                "type": "number"
+            },
+            {
+                "name": "DATA_CLONE_ERR",
+                "type": "number"
+            }
+        ]
     }
 ]
diff --git a/inputfiles/sample.json b/inputfiles/sample.json
@@ -348,5 +348,31 @@
                 "type": "HTMLCollection"
             }
         ]
+    },
+    {
+        "kind": "interface",
+        "name": "DOMException",
+        "extends": "Error",
+        "properties": [
+            {
+                "name": "name",
+                "type": "string",
+                "readonly": true
+            },
+            {
+                "name": "code",
+                "type": "number",
+                "readonly": true
+            }
+        ],
+        "constructorSignatures": [
+            "new (message?: string, name?: string): DOMException"
+        ],
+        "constants": [
+            {
+                "name": "INDEX_SIZE_ERR",
+                "type": "number"
+            }
+        ]
     }
 ]
