chore(types): reduce redundant override-type in webcrypto

saschanaz · saschanaz · commit 5c1219f52f59 · 2020-12-23T23:25:31.000+01:00
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -22,11 +22,11 @@ interface AddressErrors {
 }
 
 interface AesCbcParams extends Algorithm {
-    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    iv: BufferSource;
 }
 
 interface AesCtrParams extends Algorithm {
-    counter: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    counter: BufferSource;
     length: number;
 }
 
@@ -35,8 +35,8 @@ interface AesDerivedKeyParams extends Algorithm {
 }
 
 interface AesGcmParams extends Algorithm {
-    additionalData?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
-    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    additionalData?: BufferSource;
+    iv: BufferSource;
     tagLength?: number;
 }
 
@@ -523,8 +523,8 @@ interface HashChangeEventInit extends EventInit {
 
 interface HkdfParams extends Algorithm {
     hash: HashAlgorithmIdentifier;
-    info: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
-    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    info: BufferSource;
+    salt: BufferSource;
 }
 
 interface HmacImportParams extends Algorithm {
@@ -1046,7 +1046,7 @@ interface PaymentValidationErrors {
 interface Pbkdf2Params extends Algorithm {
     hash: HashAlgorithmIdentifier;
     iterations: number;
-    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    salt: BufferSource;
 }
 
 interface PerformanceMarkOptions {
@@ -1545,7 +1545,7 @@ interface RsaKeyGenParams extends Algorithm {
 }
 
 interface RsaOaepParams extends Algorithm {
-    label?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    label?: BufferSource;
 }
 
 interface RsaOtherPrimesInfo {
@@ -18307,7 +18307,7 @@ declare function addEventListener<K extends keyof WindowEventMap>(type: K, liste
 declare function addEventListener(type: string, listener: EventListener, options?: boolean | AddEventListenerOptions): void;
 declare function removeEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
 declare function removeEventListener(type: string, listener: EventListener, options?: boolean | EventListenerOptions): void;
-type AlgorithmIdentifier = string | Algorithm;
+type AlgorithmIdentifier = Algorithm | string;
 type BigInteger = Uint8Array;
 type BinaryData = ArrayBuffer | ArrayBufferView;
 type BlobPart = BufferSource | Blob | string;
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -9,11 +9,11 @@ interface AddEventListenerOptions extends EventListenerOptions {
 }
 
 interface AesCbcParams extends Algorithm {
-    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    iv: BufferSource;
 }
 
 interface AesCtrParams extends Algorithm {
-    counter: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    counter: BufferSource;
     length: number;
 }
 
@@ -22,8 +22,8 @@ interface AesDerivedKeyParams extends Algorithm {
 }
 
 interface AesGcmParams extends Algorithm {
-    additionalData?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
-    iv: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    additionalData?: BufferSource;
+    iv: BufferSource;
     tagLength?: number;
 }
 
@@ -215,8 +215,8 @@ interface GetNotificationOptions {
 
 interface HkdfParams extends Algorithm {
     hash: HashAlgorithmIdentifier;
-    info: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
-    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    info: BufferSource;
+    salt: BufferSource;
 }
 
 interface HmacImportParams extends Algorithm {
@@ -361,7 +361,7 @@ interface NotificationOptions {
 interface Pbkdf2Params extends Algorithm {
     hash: HashAlgorithmIdentifier;
     iterations: number;
-    salt: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    salt: BufferSource;
 }
 
 interface PerformanceMarkOptions {
@@ -531,7 +531,7 @@ interface RsaKeyGenParams extends Algorithm {
 }
 
 interface RsaOaepParams extends Algorithm {
-    label?: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer;
+    label?: BufferSource;
 }
 
 interface RsaOtherPrimesInfo {
@@ -5822,7 +5822,7 @@ declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEven
 declare function addEventListener(type: string, listener: EventListener, options?: boolean | AddEventListenerOptions): void;
 declare function removeEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
 declare function removeEventListener(type: string, listener: EventListener, options?: boolean | EventListenerOptions): void;
-type AlgorithmIdentifier = string | Algorithm;
+type AlgorithmIdentifier = Algorithm | string;
 type BigInteger = Uint8Array;
 type BinaryData = ArrayBuffer | ArrayBufferView;
 type BlobPart = BufferSource | Blob | string;
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
@@ -2118,7 +2118,11 @@
                 "new-type": "IDBValidKey"
             },
             {
-                "override-type": "string | Algorithm",
+                "type": {
+                    "0": {
+                        "type": "Algorithm"
+                    }
+                },
                 "new-type": "AlgorithmIdentifier"
             },
             {
diff --git a/inputfiles/knownTypes.json b/inputfiles/knownTypes.json
@@ -6,7 +6,6 @@
         "AesGcmParams",
         "AesKeyAlgorithm",
         "AesKeyGenParams",
-        "Algorithm",
         "BigInteger",
         "CanvasRenderingContext2DSettings",
         "ClientQueryOptions",
@@ -61,7 +60,6 @@
         "AesGcmParams",
         "AesKeyAlgorithm",
         "AesKeyGenParams",
-        "Algorithm",
         "BigInteger",
         "CanvasRenderingContext2DSettings",
         "ClientTypes",
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -2879,74 +2879,6 @@
                     }
                 ]
             },
-            "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"
-                        }
-                    }
-                }
-            },
             "ClientQueryOptions": {
                 "name": "ClientQueryOptions",
                 "members": {

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ interface AddressErrors {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`interface AesCbcParams extends Algorithm {`
`25`		`- iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`25`	`+ iv: BufferSource;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`interface AesCtrParams extends Algorithm {`
`29`		`- counter: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`29`	`+ counter: BufferSource;`
`30`	`30`	`length: number;`
`31`	`31`	`}`
`32`	`32`
`@@ -35,8 +35,8 @@ interface AesDerivedKeyParams extends Algorithm {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`interface AesGcmParams extends Algorithm {`
`38`		`- additionalData?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`39`		`- iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`38`	`+ additionalData?: BufferSource;`
	`39`	`+ iv: BufferSource;`
`40`	`40`	`tagLength?: number;`
`41`	`41`	`}`
`42`	`42`
`@@ -523,8 +523,8 @@ interface HashChangeEventInit extends EventInit {`
`523`	`523`
`524`	`524`	`interface HkdfParams extends Algorithm {`
`525`	`525`	`hash: HashAlgorithmIdentifier;`
`526`		`- info: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`527`		`- salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`526`	`+ info: BufferSource;`
	`527`	`+ salt: BufferSource;`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`interface HmacImportParams extends Algorithm {`
`@@ -1046,7 +1046,7 @@ interface PaymentValidationErrors {`
`1046`	`1046`	`interface Pbkdf2Params extends Algorithm {`
`1047`	`1047`	`hash: HashAlgorithmIdentifier;`
`1048`	`1048`	`iterations: number;`
`1049`		`- salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`1049`	`+ salt: BufferSource;`
`1050`	`1050`	`}`
`1051`	`1051`
`1052`	`1052`	`interface PerformanceMarkOptions {`
`@@ -1545,7 +1545,7 @@ interface RsaKeyGenParams extends Algorithm {`
`1545`	`1545`	`}`
`1546`	`1546`
`1547`	`1547`	`interface RsaOaepParams extends Algorithm {`
`1548`		`- label?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`1548`	`+ label?: BufferSource;`
`1549`	`1549`	`}`
`1550`	`1550`
`1551`	`1551`	`interface RsaOtherPrimesInfo {`
`@@ -18307,7 +18307,7 @@ declare function addEventListener<K extends keyof WindowEventMap>(type: K, liste`
`18307`	`18307`	`declare function addEventListener(type: string, listener: EventListener, options?: boolean \| AddEventListenerOptions): void;`
`18308`	`18308`	`declare function removeEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean \| EventListenerOptions): void;`
`18309`	`18309`	`declare function removeEventListener(type: string, listener: EventListener, options?: boolean \| EventListenerOptions): void;`
`18310`		`-type AlgorithmIdentifier = string \| Algorithm;`
	`18310`	`+type AlgorithmIdentifier = Algorithm \| string;`
`18311`	`18311`	`type BigInteger = Uint8Array;`
`18312`	`18312`	`type BinaryData = ArrayBuffer \| ArrayBufferView;`
`18313`	`18313`	`type BlobPart = BufferSource \| Blob \| string;`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ interface AddEventListenerOptions extends EventListenerOptions {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`interface AesCbcParams extends Algorithm {`
`12`		`- iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`12`	`+ iv: BufferSource;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`interface AesCtrParams extends Algorithm {`
`16`		`- counter: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`16`	`+ counter: BufferSource;`
`17`	`17`	`length: number;`
`18`	`18`	`}`
`19`	`19`
`@@ -22,8 +22,8 @@ interface AesDerivedKeyParams extends Algorithm {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`interface AesGcmParams extends Algorithm {`
`25`		`- additionalData?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`26`		`- iv: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`25`	`+ additionalData?: BufferSource;`
	`26`	`+ iv: BufferSource;`
`27`	`27`	`tagLength?: number;`
`28`	`28`	`}`
`29`	`29`
`@@ -215,8 +215,8 @@ interface GetNotificationOptions {`
`215`	`215`
`216`	`216`	`interface HkdfParams extends Algorithm {`
`217`	`217`	`hash: HashAlgorithmIdentifier;`
`218`		`- info: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
`219`		`- salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`218`	`+ info: BufferSource;`
	`219`	`+ salt: BufferSource;`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`interface HmacImportParams extends Algorithm {`
`@@ -361,7 +361,7 @@ interface NotificationOptions {`
`361`	`361`	`interface Pbkdf2Params extends Algorithm {`
`362`	`362`	`hash: HashAlgorithmIdentifier;`
`363`	`363`	`iterations: number;`
`364`		`- salt: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`364`	`+ salt: BufferSource;`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`interface PerformanceMarkOptions {`
`@@ -531,7 +531,7 @@ interface RsaKeyGenParams extends Algorithm {`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`interface RsaOaepParams extends Algorithm {`
`534`		`- label?: Int8Array \| Int16Array \| Int32Array \| Uint8Array \| Uint16Array \| Uint32Array \| Uint8ClampedArray \| Float32Array \| Float64Array \| DataView \| ArrayBuffer;`
	`534`	`+ label?: BufferSource;`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`interface RsaOtherPrimesInfo {`
`@@ -5822,7 +5822,7 @@ declare function addEventListener<K extends keyof DedicatedWorkerGlobalScopeEven`
`5822`	`5822`	`declare function addEventListener(type: string, listener: EventListener, options?: boolean \| AddEventListenerOptions): void;`
`5823`	`5823`	`declare function removeEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean \| EventListenerOptions): void;`
`5824`	`5824`	`declare function removeEventListener(type: string, listener: EventListener, options?: boolean \| EventListenerOptions): void;`
`5825`		`-type AlgorithmIdentifier = string \| Algorithm;`
	`5825`	`+type AlgorithmIdentifier = Algorithm \| string;`
`5826`	`5826`	`type BigInteger = Uint8Array;`
`5827`	`5827`	`type BinaryData = ArrayBuffer \| ArrayBufferView;`
`5828`	`5828`	`type BlobPart = BufferSource \| Blob \| string;`
Original file line number	Diff line number	Diff line change
`@@ -2118,7 +2118,11 @@`
`2118`	`2118`	`"new-type": "IDBValidKey"`
`2119`	`2119`	`},`
`2120`	`2120`	`{`
`2121`		`- "override-type": "string \| Algorithm",`
	`2121`	`+ "type": {`
	`2122`	`+ "0": {`
	`2123`	`+ "type": "Algorithm"`
	`2124`	`+ }`
	`2125`	`+ },`
`2122`	`2126`	`"new-type": "AlgorithmIdentifier"`
`2123`	`2127`	`},`
`2124`	`2128`	`{`