Merge pull request #755 from RReverser/improve-wasm-imports-exports

Orta · web-flow · commit 4d0dbad7dd58 · 2019-09-23T11:40:46.000-04:00
Improve WebAssembly import/export types
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
@@ -19043,7 +19043,7 @@ declare namespace WebAssembly {
     };
     
     interface Instance {
-        readonly exports: any;
+        readonly exports: Exports;
     }
     
     var Instance: {
@@ -19134,10 +19134,16 @@ declare namespace WebAssembly {
     
     type ImportExportKind = "function" | "table" | "memory" | "global";
     type TableKind = "anyfunc";
+    type ValueType = "i32" | "i64" | "f32" | "f64";
+    type ExportValue = Function | Global | Memory | Table;
+    type Exports = Record<string, ExportValue>;
+    type ImportValue = ExportValue | number;
+    type ModuleImports = Record<string, ImportValue>;
+    type Imports = Record<string, ModuleImports>;
     function compile(bytes: BufferSource): Promise<Module>;
     function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
-    function instantiate(bytes: BufferSource, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
-    function instantiate(moduleObject: Module, importObject?: any): Promise<Instance>;
+    function instantiate(bytes: BufferSource, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>;
+    function instantiate(moduleObject: Module, importObject?: Imports): Promise<Instance>;
     function instantiateStreaming(source: Response | Promise<Response>, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
     function validate(bytes: BufferSource): boolean;
 }
@@ -20097,7 +20103,6 @@ type TouchType = "direct" | "stylus";
 type Transport = "usb" | "nfc" | "ble";
 type UserVerificationRequirement = "required" | "preferred" | "discouraged";
 type VRDisplayEventReason = "mounted" | "navigation" | "requested" | "unmounted";
-type ValueType = "i32" | "i64" | "f32" | "f64";
 type VideoFacingModeEnum = "user" | "environment" | "left" | "right";
 type VisibilityState = "hidden" | "visible" | "prerender";
 type WebGLPowerPreference = "default" | "low-power" | "high-performance";
diff --git a/baselines/webworker.generated.d.ts b/baselines/webworker.generated.d.ts
@@ -5604,7 +5604,7 @@ declare namespace WebAssembly {
     };
     
     interface Instance {
-        readonly exports: any;
+        readonly exports: Exports;
     }
     
     var Instance: {
@@ -5679,10 +5679,16 @@ declare namespace WebAssembly {
     
     type ImportExportKind = "function" | "table" | "memory" | "global";
     type TableKind = "anyfunc";
+    type ValueType = "i32" | "i64" | "f32" | "f64";
+    type ExportValue = Function | Global | Memory | Table;
+    type Exports = Record<string, ExportValue>;
+    type ImportValue = ExportValue | number;
+    type ModuleImports = Record<string, ImportValue>;
+    type Imports = Record<string, ModuleImports>;
     function compile(bytes: BufferSource): Promise<Module>;
     function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
-    function instantiate(bytes: BufferSource, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
-    function instantiate(moduleObject: Module, importObject?: any): Promise<Instance>;
+    function instantiate(bytes: BufferSource, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>;
+    function instantiate(moduleObject: Module, importObject?: Imports): Promise<Instance>;
     function instantiateStreaming(source: Response | Promise<Response>, importObject?: any): Promise<WebAssemblyInstantiatedSource>;
     function validate(bytes: BufferSource): boolean;
 }
@@ -5857,7 +5863,6 @@ type RequestRedirect = "follow" | "error" | "manual";
 type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
 type ServiceWorkerState = "installing" | "installed" | "activating" | "activated" | "redundant";
 type ServiceWorkerUpdateViaCache = "imports" | "all" | "none";
-type ValueType = "i32" | "i64" | "f32" | "f64";
 type VisibilityState = "hidden" | "visible" | "prerender";
 type WebGLPowerPreference = "default" | "low-power" | "high-performance";
 type WorkerType = "classic" | "module";
diff --git a/inputfiles/addedTypes.json b/inputfiles/addedTypes.json
@@ -2264,6 +2264,55 @@
             {
                 "new-type": "WindowProxy",
                 "type": "Window"
+            },
+            {
+                "new-type": "ExportValue",
+                "legacy-namespace": "WebAssembly",
+                "override-type": "Function | Global | Memory | Table"
+            },
+            {
+                "new-type": "Exports",
+                "legacy-namespace": "WebAssembly",
+                "type": "record",
+                "subtype": [
+                    {
+                        "type": "DOMString"
+                    },
+                    {
+                        "type": "ExportValue"
+                    }
+                ]
+            },
+            {
+                "new-type": "ImportValue",
+                "legacy-namespace": "WebAssembly",
+                "override-type": "ExportValue | number"
+            },
+            {
+                "new-type": "ModuleImports",
+                "legacy-namespace": "WebAssembly",
+                "type": "record",
+                "subtype": [
+                    {
+                        "type": "DOMString"
+                    },
+                    {
+                        "type": "ImportValue"
+                    }
+                ]
+            },
+            {
+                "new-type": "Imports",
+                "legacy-namespace": "WebAssembly",
+                "type": "record",
+                "subtype": [
+                    {
+                        "type": "DOMString"
+                    },
+                    {
+                        "type": "ModuleImports"
+                    }
+                ]
             }
         ]
     }
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
@@ -312,6 +312,9 @@
             },
             "TableKind": {
                 "legacy-namespace": "WebAssembly"
+            },
+            "ValueType": {
+                "legacy-namespace": "WebAssembly"
             }
         }
     },
@@ -2802,6 +2805,15 @@
                         }
                     }
                 }
+            },
+            "Instance": {
+                "properties": {
+                    "property": {
+                        "exports": {
+                            "type": "Exports"
+                        }
+                    }
+                }
             }
         }
     },
@@ -3190,5 +3202,25 @@
                 "new-type": "BodyInit"
             }
         ]
-    }
+    },
+    "namespaces": [
+        {
+            "name": "WebAssembly",
+            "methods": {
+                "method": {
+                    "instantiate": {
+                        "override-signatures": [
+                            "instantiate(bytes: BufferSource, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>",
+                            "instantiate(moduleObject: Module, importObject?: Imports): Promise<Instance>"
+                        ],
+                        "force-references": [
+                            {
+                                "type": "Imports"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    ]
 }
diff --git a/src/emitter.ts b/src/emitter.ts
@@ -1049,6 +1049,8 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
             namespace.nested.enums
                 .sort(compareName)
                 .forEach(emitEnum);
+            namespace.nested.typedefs
+                .forEach(emitTypeDef);
         }
 
         emitProperties("var ", EmitScope.InstanceOnly, namespace);
@@ -1097,7 +1099,9 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
 
     function emitTypeDefs() {
         if (webidl.typedefs) {
-            webidl.typedefs.typedef.forEach(emitTypeDef);
+            webidl.typedefs.typedef
+            .filter(i => !i["legacy-namespace"])
+            .forEach(emitTypeDef);
         }
     }
 
@@ -1272,7 +1276,7 @@ export function emitWebIdl(webidl: Browser.WebIdl, flavor: Flavor) {
             mapToArray(i.methods ? i.methods.method : {})
                 .filter(m => m.signature && !m["override-signatures"])
                 .map(m => ({
-                    ...m, 
+                    ...m,
                     signature: replaceTypedefsInSignatures(m.signature.filter(hasSequenceArgument))
                 }))
                 .filter(m => m.signature.length)
diff --git a/src/legacy-namespace.ts b/src/legacy-namespace.ts
@@ -22,6 +22,11 @@ export function collectLegacyNamespaceTypes(webidl: Browser.WebIdl): Browser.Int
       getNamespace(i["legacy-namespace"]).nested!.enums.push(i);
     }
   }
+  for (const i of webidl.typedefs!.typedef) {
+    if (i["legacy-namespace"]) {
+      getNamespace(i["legacy-namespace"]).nested!.typedefs.push(i);
+    }
+  }
 
   return mapToArray(namespaceMap);
 
@@ -44,7 +49,8 @@ function addEmptyNested(namespace: Browser.Interface): Browser.Interface {
     nested: {
       interfaces: [],
       enums: [],
-      dictionaries: []
+      dictionaries: [],
+      typedefs: [],
     }
   };
 }
diff --git a/src/types.d.ts b/src/types.d.ts
@@ -200,6 +200,7 @@ export interface Interface {
         interfaces: Interface[];
         enums: Enum[];
         dictionaries: Dictionary[];
+        typedefs: TypeDef[];
     }
 }
 
@@ -222,6 +223,7 @@ export interface Enum {
 export interface TypeDef extends Typed {
     "new-type": string;
     deprecated?: 1;
+    "legacy-namespace"?: string;
 }
 
 export interface Dictionary {

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,9 @@`
`312`	`312`	`},`
`313`	`313`	`"TableKind": {`
`314`	`314`	`"legacy-namespace": "WebAssembly"`
	`315`	`+ },`
	`316`	`+ "ValueType": {`
	`317`	`+ "legacy-namespace": "WebAssembly"`
`315`	`318`	`}`
`316`	`319`	`}`
`317`	`320`	`},`
`@@ -2802,6 +2805,15 @@`
`2802`	`2805`	`}`
`2803`	`2806`	`}`
`2804`	`2807`	`}`
	`2808`	`+ },`
	`2809`	`+ "Instance": {`
	`2810`	`+ "properties": {`
	`2811`	`+ "property": {`
	`2812`	`+ "exports": {`
	`2813`	`+ "type": "Exports"`
	`2814`	`+ }`
	`2815`	`+ }`
	`2816`	`+ }`
`2805`	`2817`	`}`
`2806`	`2818`	`}`
`2807`	`2819`	`},`
`@@ -3190,5 +3202,25 @@`
`3190`	`3202`	`"new-type": "BodyInit"`
`3191`	`3203`	`}`
`3192`	`3204`	`]`
`3193`		`- }`
	`3205`	`+ },`
	`3206`	`+ "namespaces": [`
	`3207`	`+ {`
	`3208`	`+ "name": "WebAssembly",`
	`3209`	`+ "methods": {`
	`3210`	`+ "method": {`
	`3211`	`+ "instantiate": {`
	`3212`	`+ "override-signatures": [`
	`3213`	`+ "instantiate(bytes: BufferSource, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>",`
	`3214`	`+ "instantiate(moduleObject: Module, importObject?: Imports): Promise<Instance>"`
	`3215`	`+ ],`
	`3216`	`+ "force-references": [`
	`3217`	`+ {`
	`3218`	`+ "type": "Imports"`
	`3219`	`+ }`
	`3220`	`+ ]`
	`3221`	`+ }`
	`3222`	`+ }`
	`3223`	`+ }`
	`3224`	`+ }`
	`3225`	`+ ]`
`3194`	`3226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,11 @@ export function collectLegacyNamespaceTypes(webidl: Browser.WebIdl): Browser.Int`
`22`	`22`	`getNamespace(i["legacy-namespace"]).nested!.enums.push(i);`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+ for (const i of webidl.typedefs!.typedef) {`
	`26`	`+ if (i["legacy-namespace"]) {`
	`27`	`+ getNamespace(i["legacy-namespace"]).nested!.typedefs.push(i);`
	`28`	`+ }`
	`29`	`+ }`
`25`	`30`
`26`	`31`	`return mapToArray(namespaceMap);`
`27`	`32`
`@@ -44,7 +49,8 @@ function addEmptyNested(namespace: Browser.Interface): Browser.Interface {`
`44`	`49`	`nested: {`
`45`	`50`	`interfaces: [],`
`46`	`51`	`enums: [],`
`47`		`- dictionaries: []`
	`52`	`+ dictionaries: [],`
	`53`	`+ typedefs: [],`
`48`	`54`	`}`
`49`	`55`	`};`
`50`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ export interface Interface {`
`200`	`200`	`interfaces: Interface[];`
`201`	`201`	`enums: Enum[];`
`202`	`202`	`dictionaries: Dictionary[];`
	`203`	`+ typedefs: TypeDef[];`
`203`	`204`	`}`
`204`	`205`	`}`
`205`	`206`
`@@ -222,6 +223,7 @@ export interface Enum {`
`222`	`223`	`export interface TypeDef extends Typed {`
`223`	`224`	`"new-type": string;`
`224`	`225`	`deprecated?: 1;`
	`226`	`+ "legacy-namespace"?: string;`
`225`	`227`	`}`
`226`	`228`
`227`	`229`	`export interface Dictionary {`