Use validator_wasm.js as default validator

validator/js/nodejs/index.js

@@ -217,8 +217,8 @@ function ValidationError() {
 
 /**
  * The validator instance is a proxy object to a precompiled
- * validator.js script - in practice the script was either downloaded
- * from 'https://cdn.ampproject.org/v0/validator.js' or read from a
+ * validator_wasm.js script - in practice the script was either downloaded
+ * from 'https://cdn.ampproject.org/v0/validator_wasm.js' or read from a
  * local file.
  * @param {string} scriptContents
  * @throws {!Error}
@@ -239,7 +239,8 @@ function Validator(scriptContents) {
   try {
     new vm.Script(scriptContents).runInContext(this.sandbox);
   } catch (error) {
-    throw new Error('Could not instantiate validator.js - ' + error.message);
+    throw new Error('Could not instantiate validator_wasm.js - ' +
+        error.message);
   }
 }
 
@@ -292,7 +293,7 @@ Validator.prototype.validateString = function(inputString, htmlFormat) {
 const instanceByValidatorJs = {};
 
 /**
- * Provided a URL or a filename from which to fetch the validator.js
+ * Provided a URL or a filename from which to fetch the validator_wasm.js
  * file, fetches, instantiates, and caches the validator instance
  * asynchronously.  If you prefer to implement your own fetching /
  * caching logic, you may want to consider newInstance() instead,
@@ -305,7 +306,7 @@ const instanceByValidatorJs = {};
  */
 function getInstance(opt_validatorJs, opt_userAgent) {
   const validatorJs =
-      opt_validatorJs || 'https://cdn.ampproject.org/v0/validator.js';
+      opt_validatorJs || 'https://cdn.ampproject.org/v0/validator_wasm.js';
   const userAgent = opt_userAgent || DEFAULT_USER_AGENT;
   if (instanceByValidatorJs.hasOwnProperty(validatorJs)) {
     return Promise.resolve(instanceByValidatorJs[validatorJs]);
@@ -326,15 +327,17 @@ function getInstance(opt_validatorJs, opt_userAgent) {
     }
     instanceByValidatorJs[validatorJs] = instance;
     return instance;
+  }).then(function(instance) {
+    return instance.init().then(() => instance);
   });
 }
 exports.getInstance = getInstance;
 
 /**
- * Provided the contents of the validator.js file, e.g. as downloaded from
- * 'https://cdn.ampproject.org/v0/validator.js', returns a new validator
+ * Provided the contents of the validator_wasm.js file, e.g. as downloaded from
+ * 'https://cdn.ampproject.org/v0/validator_wasm.js', returns a new validator
  * instance. The tradeoff between this function and getInstance() is that this
- * function is synchronous but requires the contents of the validator.js
+ * function is synchronous but requires the contents of the validator_wasm.js
  * file as a parameter, while getInstance is asynchronous, fetches files
  * from disk or the web, and caches them.
  *
@@ -401,7 +404,7 @@ function main() {
               '  Latest published version by default, or\n' +
               '  dist/validator_minified.js (built with build.py)\n' +
               '  for development.',
-          'https://cdn.ampproject.org/v0/validator.js')
+          'https://cdn.ampproject.org/v0/validator_wasm.js')
       .option(
           '--user-agent <userAgent>', 'User agent string to use in requests.',
           DEFAULT_USER_AGENT)
@@ -453,9 +456,6 @@ function main() {
     }
   }
   getInstance(opts.validator_js, opts.userAgent)
-      .then(function(validator) {
-        return validator.init().then(() => validator);
-      })
       .then(function(validator) {
         Promise.all(inputs)
             .then(function(resolvedInputs) {

validator/js/nodejs/index_test.js

@@ -30,7 +30,7 @@ const ampValidator = require('./index.js');
 
 it('deployed validator rejects the empty file', function(done) {
   // Note: This will fetch and use the validator from
-  // 'https://cdn.ampproject.org/v0/validator.js', since only one argument
+  // 'https://cdn.ampproject.org/v0/validator_wasm.js', since only one argument
   // is supplied to validateString.
   ampValidator.getInstance()
       .then(function(instance) {
@@ -163,7 +163,7 @@ it('handles syntax errors in validator file', function(done) {
       .catch(function(error) {
         expect(error.message)
             .toMatch(
-                /^Could not instantiate validator\.js -.*[Uu]nexpected token/);
+                /^Could not instantiate validator_wasm\.js -.*[Uu]nexpected token/);
         done();
       });
 });