eslint, simple fixes

Author: jtenner

cli/asconfig.js

@@ -44,7 +44,7 @@ const overrides = {
       cliOptions.options.optimizeLevel = asconfigOptions.optimizeLevel;
     }
   },
-}
+};
 
 function getASConfig(asconfigPath, targetName, readFile, configuration, cliOptions, required) {
   // calculate the directory and collect the asconfig
@@ -54,26 +54,26 @@ function getASConfig(asconfigPath, targetName, readFile, configuration, cliOptio
 
   // if no asconfig exists
   if (!contents) {
-    assert(!required, "No config was found at " + asconfigPath);
-    return;
+    if (required) throw new Error("No config was found at " + asconfigPath);
+    else return;
   }
 
   // validate here
   const config = validate(contents, configuration);
 
   // resolve each parent configuration first
-  if (config.extends) {
-    getASConfig(
-      path.isAbsolute(config.extends)
-        ? config.extends
-        : path.resolve(path.dirname(asconfigPath), config.extends),
-      targetName,
-      readFile,
-      configuration,
-      cliOptions,
-      true
-    );
-  }
+  //  if (config.extends) {
+  //    getASConfig(
+  //      path.isAbsolute(config.extends)
+  //        ? config.extends
+  //        : path.resolve(path.dirname(asconfigPath), config.extends),
+  //      targetName,
+  //      readFile,
+  //      configuration,
+  //      cliOptions,
+  //      true
+  //    );
+  //  }
 
   // if no options are provided in the configuration, return early
   if (!config.options) return;
@@ -103,42 +103,42 @@ exports.getASConfig = getASConfig;
 function validateOptionsObject(options, configDefinition) {
   for (const key of Object.keys(configDefinition)) {
     const type = configDefinition[key].type;
-    if (!options.hasOwnProperty(key)) continue;
+    if (!(key in options)) continue;
     switch (type) {
       case "b": {
-        assert(typeof options[key] === "boolean", "Invalid configuration option " + key + ", must be a boolean.");
+        if (typeof options[key] !== "boolean") throw new Error("Invalid configuration option " + key + ", must be a boolean.");
         break;
       }
       case "f": {
-        assert(typeof options[key] === "number", "Invalid configuration option " + key + ", must be a number.");
+        if (typeof options[key] !== "number") throw new Error("Invalid configuration option " + key + ", must be a number.");
         break;
       }
       case "F": {
-        assert(Array.isArray(options[key]), "Invalid configuration option " + key + ", must be an array.");
+        if (!Array.isArray(options[key])) throw new Error("Invalid configuration option " + key + ", must be an array.");
         for (const value of options[key]) {
-          assert(typeof value === "number", "Invalid configuration value in option " + key + ", " + value + " must be a number.");
+          if (typeof value !== "number") throw new Error("Invalid configuration value in option " + key + ", " + value + " must be a number.");
         }
         break;
       }
       case "i": {
-        assert(Number.isInteger(options[key]), "Invalid configuration option " + key + ", must be an integer.");
+        if (!Number.isInteger(options[key])) throw new Error("Invalid configuration option " + key + ", must be an integer.");
         break;
       }
       case "I": {
-        assert(Array.isArray(options[key]), "Invalid configuration option " + key + ", must be an array.");
+        if (!Array.isArray(options[key])) throw new Error("Invalid configuration option " + key + ", must be an array.");
         for (const value of options[key]) {
-          assert(Number.isInteger(value), "Invalid configuration value in option " + key + ", " + value + " must be an integer.");
+          if (!Number.isInteger(value)) throw new Error("Invalid configuration value in option " + key + ", " + value + " must be an integer.");
         }
         break;
       }
       case "s": {
-        assert(typeof options[key] === "string", "Invalid configuration option " + key + ", must be a string.");
+        if (typeof options[key] !== "string") throw new Error("Invalid configuration option " + key + ", must be a string.");
         break;
       }
       case "S": {
-        assert(Array.isArray(options[key]), "Invalid configuration option " + key + ", must be an array.");
+        if (!Array.isArray(options[key])) throw new Error("Invalid configuration option " + key + ", must be an array.");
         for (const value of options[key]) {
-          assert(typeof value === "string", "Invalid configuration value in option " + key + ", " + value + " must be a string.");
+          if (typeof value !== "string") throw new Error("Invalid configuration option " + key + ", must be a string.");
         }
         break;
       }
@@ -150,22 +150,23 @@ function validateOptionsObject(options, configDefinition) {
 function validate(contents, configDefinition) {
   let config;
   try {
-    config = assert(JSON.parse(contents), "Configuration must be an object.");
-    if (config.extends) {
-      assert(typeof config.extends === "string", "Configuration extends value must be a string.");
-      assert(path.extname(config.extends) === ".json", "Configuration must extend a json file.");
-    }
+    config = JSON.parse(contents);
+    if (!config) throw new Error("Configuration must be an object.");
+    // if (config.extends) {
+    //   if (typeof config.extends !== "string") throw new Error("Configuration extends value must be a string.");
+    //   if (path.extname(config.extends) !== ".json") throw new Error( "Configuration must extend a json file.");
+    // }
     if (config.targets) {
-      assert(Array.isArray(config.targets), "Configuration targets value must be an Array.");
+      if (!Array.isArray(config.targets)) throw new Error("Configuration targets value must be an Array.");
       config.targets.forEach(target => {
-        assert(typeof target.name === "string", "All configuration targets must have a name.");
+        if (typeof target.name !== "string") throw new Error("All configuration targets must have a name.");
       });
     }
 
     // validate the options object
     if (config.options) {
       const options = config.options;
-      assert(typeof options === "object", "Configuration options must be an object.");
+      if (typeof options !== "object") throw new Error("Configuration options must be an object.");
       validateOptionsObject(options, configDefinition);
     }
 
@@ -174,17 +175,17 @@ function validate(contents, configDefinition) {
 
       // targets must be an array
       const targets = config.targets;
-      assert(typeof targets === "object", "Configuration property 'targets' must be an object.");
+      if (typeof targets !== "object") throw new Error("Configuration property 'targets' must be an object.");
       for (const targetName of Object.keys(targets)) {
         const target = targets[targetName];
 
         // each target must be an object with a name and an options
-        assert(typeof target === "object", "Configuration target '" + targetName + "' must be an object.");
-        validateOptionsObject(options, configDefinition);
+        if (typeof target !== "object") throw new Error("Configuration target '" + targetName + "' must be an object.");
+        validateOptionsObject(target, configDefinition);
       }
     }
   } catch(ex) {
-    throw new Error("Invalid asconfig at location " + asconfigPath + ": " + ex.message);
+    throw new Error("Invalid asconfig: " + ex.message);
   }
   return config;
 }
@@ -222,4 +223,5 @@ function reconcile(cliOptions, asconfigOptions, asconfig, overrides) {
     }
   }
 }
+
 exports.reconcile = reconcile;

cli/util/options.js

@@ -88,7 +88,7 @@ function parse(argv, config) {
   }
   while (i < k) trailing.push(argv[i++]); // trailing
 
-  return { options, unknown, arguments, trailing, provides };
+  return { options, unknown, arguments: args, trailing, provides };
 }
 
 exports.parse = parse;

tests/parser.js

@@ -42,6 +42,7 @@ var tests = glob.sync("**/!(_*).ts", { cwd: basedir });
 
 // Run specific tests only if arguments are provided
 if (argv.length) {
+  console.log(argv);
   tests = tests.filter(filename => argv.indexOf(filename.replace(/\.ts$/, "")) >= 0);
   if (!tests.length) {
     console.error("No matching tests: " + argv.join(" "));