refactor: switch to wast

xtuc · xtuc · commit acc45fd80614 · 2018-05-24T14:12:11.000+02:00
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -73,11 +73,6 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 			{
 				test: /\.wasm$/i,
 				type: "webassembly/experimental"
-			},
-			{
-				test: /\.wast$/i,
-				loader: "@webassemblyjs/wast-loader",
-				type: "webassembly/experimental"
 			}
 		]);
 
diff --git a/package.json b/package.json
@@ -8,7 +8,6 @@
     "@webassemblyjs/ast": "1.4.3",
     "@webassemblyjs/wasm-edit": "1.4.3",
     "@webassemblyjs/wasm-parser": "1.4.3",
-    "@webassemblyjs/wast-loader": "^1.5.4",
     "acorn": "^5.0.0",
     "acorn-dynamic-import": "^3.0.0",
     "ajv": "^6.1.0",
@@ -73,6 +72,7 @@
     "url-loader": "^0.6.2",
     "val-loader": "^1.0.2",
     "vm-browserify": "~0.0.0",
+    "wast-loader": "^1.5.5",
     "webpack-dev-middleware": "^1.9.0",
     "worker-loader": "^1.1.1",
     "xxhashjs": "^0.2.1"
diff --git a/test/TestCases.template.js b/test/TestCases.template.js
@@ -141,6 +141,11 @@ const describeCases = config => {
 										{
 											test: /\.pug/,
 											loader: "pug-loader"
+										},
+										{
+											test: /\.wat$/i,
+											loader: "wast-loader",
+											type: "webassembly/experimental"
 										}
 									]
 								},
diff --git a/test/cases/wasm/import-wasm-wasm/index.js b/test/cases/wasm/import-wasm-wasm/index.js
@@ -1,5 +1,5 @@
 it("should allow to run a WebAssembly module with imports", function() {
-	return import("./wasm.wasm").then(function(wasm) {
+	return import("./wasm.wat").then(function(wasm) {
 		const result = wasm.addNumber(20);
 		expect(result).toEqual(42);
 	});
diff --git a/test/cases/wasm/import-wasm-wasm/wasm.wasm b/test/cases/wasm/import-wasm-wasm/wasm.wasm
diff --git a/test/cases/wasm/import-wasm-wasm/wasm.wat b/test/cases/wasm/import-wasm-wasm/wasm.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./wasm2.wat" "getNumber" (func $./wasm2.wasm.getNumber (type $t0)))
+  (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (call $./wasm2.wasm.getNumber))))
+
diff --git a/test/cases/wasm/import-wasm-wasm/wasm2.wasm b/test/cases/wasm/import-wasm-wasm/wasm2.wasm
diff --git a/test/cases/wasm/import-wasm-wasm/wasm2.wat b/test/cases/wasm/import-wasm-wasm/wasm2.wat
@@ -0,0 +1,5 @@
+(module
+  (type $t0 (func (result i32)))
+  (func $getNumber (export "getNumber") (type $t0) (result i32)
+    (i32.const 22)))
+
diff --git a/test/cases/wasm/imports-circular/module.js b/test/cases/wasm/imports-circular/module.js
@@ -1,4 +1,4 @@
-import { addNumber } from "./wasm.wasm";
+import { addNumber } from "./wasm.wat";
 
 export var result = addNumber(22);
 
diff --git a/test/cases/wasm/imports-circular/wasm.wasm b/test/cases/wasm/imports-circular/wasm.wasm
diff --git a/test/cases/wasm/imports-circular/wasm.wat b/test/cases/wasm/imports-circular/wasm.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./module" "getNumber" (func $./module.getNumber (type $t0)))
+  (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (call $./module.getNumber))))
+
diff --git a/test/cases/wasm/imports/index.js b/test/cases/wasm/imports/index.js
@@ -1,5 +1,5 @@
 it("should allow to run a WebAssembly module with imports", function() {
-	return import("./wasm.wasm?1").then(function(wasm) {
+	return import("./wasm.wat?1").then(function(wasm) {
 		const result = wasm.addNumber(3);
 		expect(result).toEqual(11);
 	});
diff --git a/test/cases/wasm/imports/wasm.wasm b/test/cases/wasm/imports/wasm.wasm
diff --git a/test/cases/wasm/imports/wasm.wat b/test/cases/wasm/imports/wasm.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./module" "getNumber" (func $./module.getNumber (type $t0)))
+  (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (call $./module.getNumber))))
+
diff --git a/test/cases/wasm/memory/mem-access.wasm b/test/cases/wasm/memory/mem-access.wasm
diff --git a/test/cases/wasm/memory/mem-access.wat b/test/cases/wasm/memory/mem-access.wat
@@ -0,0 +1 @@
+(module  (type $t0 (func (result i32)))  (type $t1 (func (param i32)))  (import "./memory.wat" "memory" (memory $./memory.wasm.memory 1))  (func $get (export "get") (type $t0) (result i32)    (i32.load      (i32.const 0)))  (func $set (export "set") (type $t1) (param $p i32)    (i32.store      (i32.const 0)      (get_local $p))))
diff --git a/test/cases/wasm/memory/memory.wasm b/test/cases/wasm/memory/memory.wasm
diff --git a/test/cases/wasm/memory/memory.wat b/test/cases/wasm/memory/memory.wat
@@ -0,0 +1,4 @@
+(module
+  (memory $memory (export "memory") 1)
+  (data (i32.const 12) "\00\00\00\00"))
+
diff --git a/test/cases/wasm/memory/run.js b/test/cases/wasm/memory/run.js
@@ -1,5 +1,5 @@
-import * as a1 from "./mem-access.wasm?1";
-import * as a2 from "./mem-access.wasm?2";
+import * as a1 from "./mem-access.wat?1";
+import * as a2 from "./mem-access.wat?2";
 
 a1.set(42);
 export const x1 = a1.get();
diff --git a/test/cases/wasm/order/a.js b/test/cases/wasm/order/a.js
@@ -1,6 +1,6 @@
 import { trackA, results } from "./tracker";
 import "./b.js";
-import "./wasm.wasm";
+import "./wasm.wat";
 
 trackA();
 
diff --git a/test/cases/wasm/order/wasm.wasm b/test/cases/wasm/order/wasm.wasm
diff --git a/test/cases/wasm/simple/index.js b/test/cases/wasm/simple/index.js
@@ -6,7 +6,7 @@ it("should allow to run a WebAssembly module (indirect)", function() {
 });
 
 it("should allow to run a WebAssembly module (direct)", function() {
-	return import("./wasm.wasm?2").then(function(wasm) {
+	return import("./wasm.wat?2").then(function(wasm) {
 		const result = wasm.add(wasm.getNumber(), 2);
 		expect(result).toEqual(42);
 	});
diff --git a/test/cases/wasm/simple/module.js b/test/cases/wasm/simple/module.js
@@ -1,4 +1,4 @@
-import { add, getNumber } from "./wasm.wasm?1";
+import { add, getNumber } from "./wasm.wat?1";
 
 export function run() {
 	return add(getNumber(), 2);
diff --git a/test/cases/wasm/simple/wasm.wasm b/test/cases/wasm/simple/wasm.wasm
diff --git a/test/cases/wasm/simple/wasm.wat b/test/cases/wasm/simple/wasm.wat
@@ -0,0 +1,10 @@
+(module
+  (type $t0 (func (param i32 i32) (result i32)))
+  (type $t1 (func (result i32)))
+  (func $add (export "add") (type $t0) (param $p0 i32) (param $p1 i32) (result i32)
+    (i32.add
+      (get_local $p0)
+      (get_local $p1)))
+  (func $getNumber (export "getNumber") (type $t1) (result i32)
+    (i32.const 40)))
+
diff --git a/test/cases/wasm/table/index.js b/test/cases/wasm/table/index.js
@@ -2,15 +2,15 @@
 const UNKNOWN_FUNCTION_TABLE = /invalid index into function table|invalid function/;
 
 it("should support tables", function() {
-	return import("./wasm-table.wasm").then(function(wasm) {
+	return import("./wasm-table.wat").then(function(wasm) {
 		expect(wasm.callByIndex(0)).toEqual(42);
 		expect(wasm.callByIndex(1)).toEqual(13);
 		expect(() => wasm.callByIndex(2)).toThrow(UNKNOWN_FUNCTION_TABLE);
 	});
 });
 
 it("should support exported tables", function() {
-	return import("./wasm-table-export.wasm").then(function(wasm) {
+	return import("./wasm-table-export.wat").then(function(wasm) {
 		expect(wasm.table).toBeInstanceOf(WebAssembly.Table);
 		expect(wasm.table.length).toBe(2);
 		const e0 = wasm.table.get(0);
@@ -23,7 +23,7 @@ it("should support exported tables", function() {
 });
 
 it("should support imported tables", function() {
-	return import("./wasm-table-imported.wasm").then(function(wasm) {
+	return import("./wasm-table-imported.wat").then(function(wasm) {
 		expect(wasm.callByIndex(0)).toEqual(42);
 		expect(wasm.callByIndex(1)).toEqual(13);
 		expect(() => wasm.callByIndex(2)).toThrow(UNKNOWN_FUNCTION_TABLE);
diff --git a/test/cases/wasm/table/wasm-table-export.wasm b/test/cases/wasm/table/wasm-table-export.wasm
diff --git a/test/cases/wasm/table/wasm-table-export.wat b/test/cases/wasm/table/wasm-table-export.wat
@@ -0,0 +1,9 @@
+(module
+  (type $t0 (func (result i32)))
+  (func $f1 (type $t0) (result i32)
+    (i32.const 42))
+  (func $f2 (type $t0) (result i32)
+    (i32.const 13))
+  (table $table (export "table") 2 anyfunc)
+  (elem (i32.const 0) $f1 $f2))
+
diff --git a/test/cases/wasm/table/wasm-table-imported.wasm b/test/cases/wasm/table/wasm-table-imported.wasm
diff --git a/test/cases/wasm/table/wasm-table-imported.wat b/test/cases/wasm/table/wasm-table-imported.wat
@@ -0,0 +1,8 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (param i32) (result i32)))
+  (import "./wasm-table-export.wat" "table" (table $./wasm-table-export.wasm.table 2 anyfunc))
+  (func $callByIndex (export "callByIndex") (type $t1) (param $i i32) (result i32)
+    (call_indirect (type $t0)
+      (get_local $i))))
+
diff --git a/test/cases/wasm/table/wasm-table.wasm b/test/cases/wasm/table/wasm-table.wasm
diff --git a/test/cases/wasm/table/wasm-table.wat b/test/cases/wasm/table/wasm-table.wat
@@ -0,0 +1,14 @@
+(module
+  (type $t0 (func (result i32)))
+  (type $t1 (func (result i32)))
+  (type $t2 (func (param i32) (result i32)))
+  (func $f0 (type $t0) (result i32)
+    (i32.const 42))
+  (func $f1 (type $t0) (result i32)
+    (i32.const 13))
+  (func $callByIndex (export "callByIndex") (type $t2) (param $p0 i32) (result i32)
+    (call_indirect (type $t1)
+      (get_local $p0)))
+  (table $T0 2 anyfunc)
+  (elem (i32.const 0) $f0 $f1))
+
diff --git a/yarn.lock b/yarn.lock
@@ -125,12 +125,6 @@
     "@webassemblyjs/wasm-parser" "1.4.3"
     webassemblyjs "1.4.3"
 
-"@webassemblyjs/wast-loader@^1.5.4":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-loader/-/wast-loader-1.5.4.tgz#6db66671edc5955cb77cbf90a6c4f627f6335a6a"
-  dependencies:
-    wabt "^1.0.0"
-
 "@webassemblyjs/wast-parser@1.4.3":
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745"
@@ -6273,6 +6267,12 @@ walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
+wast-loader@^1.5.5:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/wast-loader/-/wast-loader-1.5.5.tgz#a1d6cdc468b6963a6e479de683dc74755f09b81a"
+  dependencies:
+    wabt "^1.0.0"
+
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"

Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,6 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {`
`73`	`73`	`{`
`74`	`74`	`test: /\.wasm$/i,`
`75`	`75`	`type: "webassembly/experimental"`
`76`		`- },`
`77`		`- {`
`78`		`- test: /\.wast$/i,`
`79`		`- loader: "@webassemblyjs/wast-loader",`
`80`		`- type: "webassembly/experimental"`
`81`	`76`	`}`
`82`	`77`	`]);`
`83`	`78`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,11 @@ const describeCases = config => {`
`141`	`141`	`{`
`142`	`142`	`test: /\.pug/,`
`143`	`143`	`loader: "pug-loader"`
	`144`	`+ },`
	`145`	`+ {`
	`146`	`+ test: /\.wat$/i,`
	`147`	`+ loader: "wast-loader",`
	`148`	`+ type: "webassembly/experimental"`
`144`	`149`	`}`
`145`	`150`	`]`
`146`	`151`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { addNumber } from "./wasm.wasm";`
	`1`	`+import { addNumber } from "./wasm.wat";`
`2`	`2`
`3`	`3`	`export var result = addNumber(22);`
`4`	`4`