enforce direct import when types are incompatible with JS types

sokra · sokra · commit cb3a0ed08c68 · 2018-05-11T20:59:20.000+02:00
diff --git a/declarations.d.ts b/declarations.d.ts
@@ -53,8 +53,9 @@ declare module "@webassemblyjs/ast" {
 		module: string;
 		descr: {
 			type: string;
-			valtype: string;
-			id: string;
+			valtype?: string;
+			id?: Identifier;
+			signature?: Signature;
 		};
 		name: string;
 	}
@@ -64,16 +65,18 @@ declare module "@webassemblyjs/ast" {
 	export class IndexLiteral extends Node {}
 	export class NumberLiteral extends Node {}
 	export class Global extends Node {}
-	export class FuncParam extends Node {}
+	export class FuncParam extends Node {
+		valtype: string;
+	}
 	export class Instruction extends Node {}
 	export class CallInstruction extends Instruction {}
 	export class ObjectInstruction extends Instruction {}
 	export class Func extends Node {
 		signature: Signature;
 	}
 	export class Signature {
-		params: any;
-		result: any;
+		params: FuncParam[];
+		results: string[];
 	}
 	export class TypeInstructionFunc extends Node {}
 	export class IndexInFuncSection extends Node {}
@@ -90,7 +93,7 @@ declare module "@webassemblyjs/ast" {
 		init: Node[]
 	): ObjectInstruction;
 	export function func(initFuncId, funcParams, funcResults, funcBody): Func;
-	export function typeInstructionFunc(params, result): TypeInstructionFunc;
+	export function typeInstructionFunc(params: FuncParam[], results: string[]): TypeInstructionFunc;
 	export function indexInFuncSection(index: IndexLiteral): IndexInFuncSection;
 	export function moduleExport(
 		identifier: string,
diff --git a/lib/dependencies/WebAssemblyImportDependency.js b/lib/dependencies/WebAssemblyImportDependency.js
@@ -11,8 +11,11 @@ const UnsupportedWebAssemblyFeatureError = require("../wasm/UnsupportedWebAssemb
 class WebAssemblyImportDependency extends ModuleDependency {
 	constructor(request, name, description, onlyDirectImport) {
 		super(request);
+		/** @type {string} */
 		this.name = name;
+		/** @type {TODO} */
 		this.description = description;
+		/** @type {false | string} */
 		this.onlyDirectImport = onlyDirectImport;
 	}
 
@@ -27,10 +30,11 @@ class WebAssemblyImportDependency extends ModuleDependency {
 			this.module &&
 			!this.module.type.startsWith("webassembly")
 		) {
-			const type = this.description.type;
 			return [
 				new UnsupportedWebAssemblyFeatureError(
-					`${type} imports are only available for direct wasm to wasm dependencies`
+					`Import with ${
+						this.onlyDirectImport
+					} can only be used for direct wasm to wasm dependencies`
 				)
 			];
 		}
diff --git a/lib/wasm/WebAssemblyGenerator.js b/lib/wasm/WebAssemblyGenerator.js
@@ -275,7 +275,7 @@ const addInitFunction = ({
 	// Type section
 	const functype = t.typeInstructionFunc(
 		func.signature.params,
-		func.signature.result
+		func.signature.results
 	);
 
 	// Func section
diff --git a/lib/wasm/WebAssemblyParser.js b/lib/wasm/WebAssemblyParser.js
@@ -24,6 +24,25 @@ const isMemoryImport = n => n.descr.type === "Memory";
  */
 const isTableImport = n => n.descr.type === "Table";
 
+const JS_COMPAT_TYPES = new Set(["i32", "u32", "f32"]);
+
+/**
+ * @param {t.ModuleImport} moduleImport the import
+ * @returns {null | string} the type incompatible with js types
+ */
+const getJsIncompatibleType = moduleImport => {
+	if (moduleImport.descr.type !== "FuncImportDescr") return null;
+	const signature = moduleImport.descr.signature;
+	for (const param of signature.params) {
+		if (!JS_COMPAT_TYPES.has(param.valtype))
+			return `${param.valtype} as parameter`;
+	}
+	for (const type of signature.results) {
+		if (!JS_COMPAT_TYPES.has(type)) return `${type} as result`;
+	}
+	return null;
+};
+
 const decoderOpts = {
 	ignoreCodeSection: true,
 	ignoreDataSection: true
@@ -51,14 +70,18 @@ class WebAssemblyParser extends Tapable {
 			},
 
 			ModuleImport({ node }) {
+				/** @type {false | string} */
 				let onlyDirectImport = false;
 
 				if (isMemoryImport(node) === true) {
-					onlyDirectImport = true;
-				}
-
-				if (isTableImport(node) === true) {
-					onlyDirectImport = true;
+					onlyDirectImport = "Memory";
+				} else if (isTableImport(node) === true) {
+					onlyDirectImport = "Table";
+				} else {
+					const incompatibleType = getJsIncompatibleType(node);
+					if (incompatibleType) {
+						onlyDirectImport = `Non-JS-compatible Func Sigurature (${incompatibleType})`;
+					}
 				}
 
 				const dep = new WebAssemblyImportDependency(
diff --git a/test/cases/wasm/imports-complex-types/index.js b/test/cases/wasm/imports-complex-types/index.js
@@ -0,0 +1,6 @@
+it("should allow to run a WebAssembly module with non-js-compatible imports", function() {
+	return import("./wasm.wasm").then(function(wasm) {
+		const result = wasm.testI64();
+		expect(result).toEqual(42);
+	});
+});
diff --git a/test/cases/wasm/imports-complex-types/other.wasm b/test/cases/wasm/imports-complex-types/other.wasm
diff --git a/test/cases/wasm/imports-complex-types/test.filter.js b/test/cases/wasm/imports-complex-types/test.filter.js
@@ -0,0 +1,5 @@
+var supportsWebAssembly = require("../../../helpers/supportsWebAssembly");
+
+module.exports = function(config) {
+	return supportsWebAssembly();
+};
diff --git a/test/cases/wasm/imports-complex-types/wasm.wasm b/test/cases/wasm/imports-complex-types/wasm.wasm
