Validate modules by default (#1258)

Author: dcodeIO

bin/asinit

@@ -249,8 +249,8 @@ function ensureGitignore() {
 function ensurePackageJson() {
   console.log("- Making sure that 'package.json' contains the build commands...")
   const entryPath = path.relative(projectDir, entryFile).replace(/\\/g, "/");
-  const buildUntouched = "asc " + entryPath + " -b build/untouched.wasm -t build/untouched.wat --validate --sourceMap --debug";
-  const buildOptimized = "asc " + entryPath + " -b build/optimized.wasm -t build/optimized.wat --validate --sourceMap --optimize";
+  const buildUntouched = "asc " + entryPath + " -b build/untouched.wasm -t build/untouched.wat --sourceMap --debug";
+  const buildOptimized = "asc " + entryPath + " -b build/optimized.wasm -t build/optimized.wat --sourceMap --optimize";
   const buildAll = "npm run asbuild:untouched && npm run asbuild:optimized";
   if (!fs.existsSync(packageFile)) {
     fs.writeFileSync(packageFile, JSON.stringify({

cli/asc.d.ts

@@ -69,8 +69,6 @@ interface CompilerOptions {
   shrinkLevel?: number;
   /** Re-optimizes until no further improvements can be made. */
   converge?: boolean;
-  /** Validates the module using Binaryen. Exits if invalid. */
-  validate?: boolean;
   /** Specifies the base directory of input and output files. */
   baseDir?: string;
   /** Specifies the output file. File extension indicates format. */
@@ -119,6 +117,8 @@ interface CompilerOptions {
   trapMode?: "allow" | "clamp" | "js";
   /** Specifies additional Binaryen passes to run. */
   runPasses?: string | string[];
+  /** Skips validating the module using Binaryen. */
+  noValidate?: boolean;
   /** Enables WebAssembly features that are disabled by default. */
   enable?: string | string[];
   /** Disables WebAssembly features that are enabled by default. */

cli/asc.js

@@ -638,7 +638,7 @@ exports.main = function main(argv, options, callback) {
   }
 
   // Validate the module if requested
-  if (args.validate) {
+  if (!args.noValidate) {
     stats.validateCount++;
     stats.validateTime += measure(() => {
       if (!module.validate()) {

cli/asc.json

@@ -218,13 +218,6 @@
     "type": "S"
   },
 
-  "validate": {
-    "category": "Binaryen",
-    "description": "Validates the module using Binaryen. Exits if invalid.",
-    "type": "b",
-    "alias": "c",
-    "default": false
-  },
   "trapMode": {
     "category": "Binaryen",
     "description": [
@@ -246,6 +239,13 @@
     ],
     "type": "s"
   },
+  "noValidate": {
+    "category": "Binaryen",
+    "description": "Skips validating the module using Binaryen.",
+    "type": "b",
+    "alias": "c",
+    "default": false
+  },
 
   "baseDir": {
     "description": "Specifies the base directory of input and output files.",

lib/parse/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "asbuild": "asc assembly/index.ts -O3 -b build/index.wasm -t build/index.wat --importMemory --runtime none --sourceMap --validate",
+    "asbuild": "asc assembly/index.ts -O3 -b build/index.wasm -t build/index.wat --importMemory --runtime none --sourceMap",
     "build": "npm run asbuild && webpack --mode production --display-modules",
     "test": "ts-node tests/"
   },

lib/webpack/index.js

@@ -23,7 +23,6 @@ function compile() {
     "--baseDir", path.dirname(this.resourcePath),
     "--binaryFile", basePath + ".wasm",
     "--textFile", basePath + ".wat",
-    "--validate",
     "--optimize"
   ];
   if (this.sourceMap)

package.json

@@ -66,8 +66,8 @@
     "prepublishOnly": "node scripts/prepublish",
     "postpublish": "node scripts/postpublish",
     "asbuild": "npm run asbuild:untouched && npm run asbuild:optimized",
-    "asbuild:untouched": "node bin/asc src/glue/wasm/index.ts src/index.ts -t out/assemblyscript.untouched.wat -b out/assemblyscript.untouched.wasm -d out/assemblyscript.d.ts --validate --debug --measure --runtime stub",
-    "asbuild:optimized": "node bin/asc src/glue/wasm/index.ts src/index.ts -t out/assemblyscript.optimized.wat -b out/assemblyscript.optimized.wasm -O3 --validate --measure --runtime stub",
+    "asbuild:untouched": "node bin/asc src/glue/wasm/index.ts src/index.ts -t out/assemblyscript.untouched.wat -b out/assemblyscript.untouched.wasm -d out/assemblyscript.d.ts --debug --measure --runtime stub",
+    "asbuild:optimized": "node bin/asc src/glue/wasm/index.ts src/index.ts -t out/assemblyscript.optimized.wat -b out/assemblyscript.optimized.wasm -O3 --measure --runtime stub",
     "astest": "ts-node tests/bootstrap"
   },
   "releaseFiles": [

tests/allocators/buddy/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "node ../../../bin/asc assembly/index.ts -t untouched.wat -b untouched.wasm --runtime none --validate --sourceMap --measure",
-    "build:optimized": "node ../../../bin/asc assembly/index.ts -t optimized.wat -b optimized.wasm --runtime none --validate --sourceMap --measure --noAssert --optimize"
+    "build:untouched": "node ../../../bin/asc assembly/index.ts -t untouched.wat -b untouched.wasm --runtime none --sourceMap --measure",
+    "build:optimized": "node ../../../bin/asc assembly/index.ts -t optimized.wat -b optimized.wasm --runtime none --sourceMap --measure --noAssert --optimize"
   }
 }

tests/allocators/rt-full/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "node ../../../bin/asc assembly/index.ts -t untouched.wat -b untouched.wasm --runtime full --validate --sourceMap --measure",
-    "build:optimized": "node ../../../bin/asc assembly/index.ts -t optimized.wat -b optimized.wasm --runtime full --validate --sourceMap --measure --noAssert --optimize"
+    "build:untouched": "node ../../../bin/asc assembly/index.ts -t untouched.wat -b untouched.wasm --runtime full --sourceMap --measure",
+    "build:optimized": "node ../../../bin/asc assembly/index.ts -t optimized.wat -b optimized.wasm --runtime full --sourceMap --measure --noAssert --optimize"
   }
 }

tests/allocators/rt-stub/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "node ../../../bin/asc assembly/index.ts -t untouched.wat -b untouched.wasm --runtime stub --validate --sourceMap --measure",
-    "build:optimized": "node ../../../bin/asc assembly/index.ts -t optimized.wat -b optimized.wasm --runtime stub --validate --sourceMap --measure --noAssert --optimize"
+    "build:untouched": "node ../../../bin/asc assembly/index.ts -t untouched.wat -b untouched.wasm --runtime stub --sourceMap --measure",
+    "build:optimized": "node ../../../bin/asc assembly/index.ts -t optimized.wat -b optimized.wasm --runtime stub --sourceMap --measure --noAssert --optimize"
   }
 }