Merge pull request #416 from a-tarasyuk/bug/23057-ts-wrong-webcrypto-algorithm-params

mhegazy · web-flow · commit 022bb3dc66dd · 2018-04-06T09:20:12.000-07:00
23057 - Fix WebCrypto Algorithm params
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -16,11 +16,11 @@ interface AddEventListenerOptions extends EventListenerOptions {
 }
 
 interface AesCbcParams extends Algorithm {
-    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
+    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
 }
 
 interface AesCtrParams extends Algorithm {
-    counter: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
+    counter: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
     length: number;
 }
 
@@ -29,8 +29,8 @@ interface AesDerivedKeyParams extends Algorithm {
 }
 
 interface AesGcmParams extends Algorithm {
-    additionalData?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
-    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
+    additionalData?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
     tagLength?: number;
 }
 
@@ -379,8 +379,8 @@ interface HashChangeEventInit extends EventInit {
 
 interface HkdfParams extends Algorithm {
     hash: string | Algorithm;
-    info: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
-    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
+    info: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
 }
 
 interface HmacImportParams extends Algorithm {
@@ -1020,7 +1020,7 @@ interface PaymentShippingOption {
 interface Pbkdf2Params extends Algorithm {
     hash: string | Algorithm;
     iterations: number;
-    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
+    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
 }
 
 interface PeriodicWaveConstraints {
@@ -1425,7 +1425,7 @@ interface RsaKeyGenParams extends Algorithm {
 }
 
 interface RsaOaepParams extends Algorithm {
-    label?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | null;
+    label?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
 }
 
 interface RsaOtherPrimesInfo {
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -2010,6 +2010,74 @@
                     }
                 }
             },
+            "AesGcmParams": {
+                "members": {
+                    "member": {
+                        "iv": {
+                            "name": "iv",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        },
+                        "additionalData": {
+                            "name": "additionalData",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        }
+                    }
+                }
+            },
+            "Pbkdf2Params": {
+                "members": {
+                    "member": {
+                        "salt": {
+                            "name": "salt",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        }
+                    }
+                }
+            },
+            "HkdfParams": {
+                "members": {
+                    "member": {
+                        "info": {
+                            "name": "info",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        },
+                        "salt": {
+                            "name": "salt",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        }
+                    }
+                }
+            },
+            "AesCbcParams": {
+                "members": {
+                    "member": {
+                        "iv": {
+                            "name": "iv",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        }
+                    }
+                }
+            },
+            "AesCtrParams": {
+                "members": {
+                    "member": {
+                        "counter": {
+                            "name": "counter",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        }
+                    }
+                }
+            },
+            "RsaOaepParams": {
+                "members": {
+                    "member": {
+                        "label": {
+                            "name": "label",
+                            "override-type": "Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer"
+                        }
+                    }
+                }
+            },
             "RequestInit": {
                 "name": "RequestInit",
                 "members": {

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,11 @@ interface AddEventListenerOptions extends EventListenerOptions {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`interface AesCbcParams extends Algorithm {`
`19`		`- iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
	`19`	`+ iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`interface AesCtrParams extends Algorithm {`
`23`		`- counter: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
	`23`	`+ counter: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`24`	`24`	`length: number;`
`25`	`25`	`}`
`26`	`26`
`@@ -29,8 +29,8 @@ interface AesDerivedKeyParams extends Algorithm {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`interface AesGcmParams extends Algorithm {`
`32`		`- additionalData?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
`33`		`- iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
	`32`	`+ additionalData?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`33`	`+ iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`34`	`34`	`tagLength?: number;`
`35`	`35`	`}`
`36`	`36`
`@@ -379,8 +379,8 @@ interface HashChangeEventInit extends EventInit {`
`379`	`379`
`380`	`380`	`interface HkdfParams extends Algorithm {`
`381`	`381`	`hash: string \| Algorithm;`
`382`		`- info: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
`383`		`- salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
	`382`	`+ info: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`383`	`+ salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`interface HmacImportParams extends Algorithm {`
`@@ -1020,7 +1020,7 @@ interface PaymentShippingOption {`
`1020`	`1020`	`interface Pbkdf2Params extends Algorithm {`
`1021`	`1021`	`hash: string \| Algorithm;`
`1022`	`1022`	`iterations: number;`
`1023`		`- salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
	`1023`	`+ salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`1024`	`1024`	`}`
`1025`	`1025`
`1026`	`1026`	`interface PeriodicWaveConstraints {`
`@@ -1425,7 +1425,7 @@ interface RsaKeyGenParams extends Algorithm {`
`1425`	`1425`	`}`
`1426`	`1426`
`1427`	`1427`	`interface RsaOaepParams extends Algorithm {`
`1428`		`- label?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer \| null;`
	`1428`	`+ label?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`1429`	`1429`	`}`
`1430`	`1430`
`1431`	`1431`	`interface RsaOtherPrimesInfo {`