switch to target flag, comments, small fix

Author: jtenner

cli/asc.js

@@ -272,18 +272,12 @@ exports.main = function main(argv, options, callback) {
   }
 
   // Set up base directory
-  const configOption = args.config || "asconfig.json:release";
-  const configSplitIndex = configOption.indexOf(":");
-  const configLocation = configSplitIndex === -1
-    ? configOption
-    : configOption.slice(0, configSplitIndex);
-  const configTarget = configSplitIndex === -1
-    ? "release"
-    : configOption.slice(configSplitIndex + 1) || "release";
+  const configOption = args.config;
+  const configTarget = args.target;
 
   // override all the configuration options with the asconfig values, unless specified by the cli
   exports.getASConfig(
-    configLocation,
+    configOption,
     configTarget,
     readFile,
     exports.options,

cli/asc.json

@@ -21,9 +21,14 @@
     "category": "General",
     "description": "Provide the location and the target configuration for this build.",
     "type": "s",
-    "default": "asconfig.json:release"
+    "default": "asconfig.json"
+  },
+  "target": {
+    "category": "General",
+    "description": "Provide a configuration target for this build as described in the asconfig.",
+    "type": "s",
+    "default": "release"
   },
-
   "optimize": {
     "category": "Optimization",
     "description": [

cli/asconfig.js

@@ -76,14 +76,14 @@ function getASConfig(asconfigPath, targetName, readFile, configuration, cliOptio
   //  }
 
   // if no options are provided in the configuration, return early
-  if (!config.options) return;
+  if (!config.options && !config.targets) return;
 
   // first reconcile the top level options
   if (config.options) {
     reconcile(cliOptions, config.options, configuration, overrides);
   }
 
-  // then reconvile the target
+  // then reconcile the target
   if (config.targets && config.targets[targetName]) {
     reconcile(cliOptions, config.targets[targetName], configuration, overrides);
   }
@@ -101,7 +101,7 @@ exports.getASConfig = getASConfig;
 // V    | array of values (provided in "values" property)
 
 function validateOptionsObject(options, configDefinition) {
-  for (const key of Object.keys(configDefinition)) {
+  for (const key of Object.getOwnPropertyNames(configDefinition)) {
     const type = configDefinition[key].type;
     if (!(key in options)) continue;
     switch (type) {
@@ -145,6 +145,11 @@ function validateOptionsObject(options, configDefinition) {
       default: throw new Error("Invalid asconfig option type '" + type + "'.");
     }
   }
+
+  for (const key of Object.getOwnPropertyNames(options)) {
+    // console.log(options);
+    if (!configDefinition[key]) throw new Error("Invalid asconfig option '" + key + "'.");
+  }
 }
 
 function validate(contents, configDefinition) {
@@ -157,10 +162,11 @@ function validate(contents, configDefinition) {
     //   if (path.extname(config.extends) !== ".json") throw new Error( "Configuration must extend a json file.");
     // }
     if (config.targets) {
-      if (!Array.isArray(config.targets)) throw new Error("Configuration targets value must be an Array.");
-      config.targets.forEach(target => {
-        if (typeof target.name !== "string") throw new Error("All configuration targets must have a name.");
-      });
+      if (typeof config.targets !== "object") throw new Error("Configuration property 'targets' must be an Object.");
+
+      for (const key of Object.getOwnPropertyNames(config.targets)) {
+        if (typeof config.targets[key] !== "object") throw new Error("Configuration target '" + key + "' must be an Object.");
+      }
     }
 
     // validate the options object