Fix asconfig merge order

cli/asc.js

@@ -193,10 +193,11 @@ exports.main = function main(argv, options, callback) {
   if (!stdout) throw Error("'options.stdout' must be specified");
   if (!stderr) throw Error("'options.stderr' must be specified");
 
-  const opts = optionsUtil.parse(argv, exports.options);
+  // Parse command line options but do not populate option defaults yet
+  const opts = optionsUtil.parse(argv, exports.options, false);
   let args = opts.options;
-
   argv = opts.arguments;
+
   if (args.noColors) {
     colorsUtil.stdout.supported =
     colorsUtil.stderr.supported = false;
@@ -205,16 +206,18 @@ exports.main = function main(argv, options, callback) {
     colorsUtil.stderr = colorsUtil.from(stderr);
   }
 
-  // Check for unknown arguments
-  if (opts.unknown.length) {
-    opts.unknown.forEach(arg => {
+  // Check for unknown options
+  const unknownOpts = opts.unknown;
+  if (unknownOpts.length) {
+    unknownOpts.forEach(arg => {
       stderr.write(colorsUtil.stderr.yellow("WARNING ") + "Unknown option '" + arg + "'" + EOL);
     });
   }
 
   // Check for trailing arguments
-  if (opts.trailing.length) {
-    stderr.write(colorsUtil.stderr.yellow("WARNING ") + "Unsupported trailing arguments: " + opts.trailing.join(" ") + EOL);
+  const trailingArgv = opts.trailing;
+  if (trailingArgv.length) {
+    stderr.write(colorsUtil.stderr.yellow("WARNING ") + "Unsupported trailing arguments: " + trailingArgv.join(" ") + EOL);
   }
 
   // Use default callback if none is provided
@@ -271,23 +274,25 @@ exports.main = function main(argv, options, callback) {
 
   // Set up base directory
   const baseDir = args.baseDir ? path.resolve(args.baseDir) : ".";
-  const target = args.target;
 
-  // Once the baseDir is calculated, we can resolve the config, and its extensions
-  let asconfig = getAsconfig(args.config, baseDir, readFile);
+  // Load additional options from asconfig.json
+  let asconfigFile = args.config || "asconfig.json";
+  let asconfig = getAsconfig(asconfigFile, baseDir, readFile);
   let asconfigDir = baseDir;
 
   const seenAsconfig = new Set();
-  seenAsconfig.add(path.join(baseDir, args.config));
+  seenAsconfig.add(path.join(baseDir, asconfigFile));
 
+  const target = args.target || "release";
   while (asconfig) {
-    // merge target first, then merge options, then merge extended asconfigs
+    // Merge target first
     if (asconfig.targets && asconfig.targets[target]) {
-      args = optionsUtil.merge(exports.options, asconfig.targets[target], args);
+      args = optionsUtil.merge(exports.options, args, asconfig.targets[target]);
     }
+    // Merge general options
     if (asconfig.options) {
       if (asconfig.options.transform) {
-        // ensure that a transform's path is relative to the current config
+        // ensure that a transform's path is relative to the current asconfig
         asconfig.options.transform = asconfig.options.transform.map(p => {
           if (!path.isAbsolute(p)) {
             if (p.startsWith(".")) {
@@ -301,25 +306,22 @@ exports.main = function main(argv, options, callback) {
       args = optionsUtil.merge(exports.options, args, asconfig.options);
     }
 
-    // entries are added to the compilation
+    // Append entries
     if (asconfig.entries) {
       for (const entry of asconfig.entries) {
         argv.push(
           path.isAbsolute(entry)
             ? entry
-            // the entry is relative to the asconfig directory
-            : path.join(asconfigDir, entry)
+            : path.join(asconfigDir, entry) // relative to current asconfig
         );
       }
     }
 
-    // asconfig "extends" another config, merging options of it's parent
+    // Look up extended asconfig and repeat
     if (asconfig.extends) {
       asconfigDir = path.isAbsolute(asconfig.extends)
-        // absolute extension path means we know the exact directory and location
         ? path.dirname(asconfig.extends)
-        // relative means we need to calculate a relative asconfigDir
-        : path.join(asconfigDir, path.dirname(asconfig.extends));
+        : path.join(asconfigDir, path.dirname(asconfig.extends)); // relative to current asconfig
       const fileName = path.basename(asconfig.extends);
       const filePath = path.join(asconfigDir, fileName);
       if (seenAsconfig.has(filePath)) {
@@ -329,11 +331,14 @@ exports.main = function main(argv, options, callback) {
         asconfig = getAsconfig(fileName, asconfigDir, readFile);
       }
     } else {
-      asconfig = null; // finished resolving the configuration chain
+      asconfig = null;
     }
   }
 
-  // If showConfig print args and exit
+  // Populate option defaults once user-defined options are set
+  optionsUtil.addDefaults(exports.options, args);
+
+  // If showConfig print options and exit
   if (args.showConfig) {
     stderr.write(JSON.stringify(args, null, 2));
     return callback(null);

cli/asc.json

@@ -20,14 +20,12 @@
   "config": {
     "category": "General",
     "description": "Configuration file to apply. CLI arguments take precedence.",
-    "type": "s",
-    "default": "asconfig.json"
+    "type": "s"
   },
   "target": {
     "category": "General",
     "description": "Target configuration to use. Defaults to 'release'.",
-    "type": "s",
-    "default": "release"
+    "type": "s"
   },
 
   "optimize": {

cli/util/options.d.ts

@@ -61,4 +61,4 @@ export function help(config: Config, options?: HelpOptions): string;
 export function merge(config: Config, currentOptions: OptionSet, parentOptions: OptionSet): OptionSet;
 
 /** Populates default values on a parsed options result. */
-export function addDefaults(config: Config, options: OptionSet): OptionSet;
+export function addDefaults(config: Config, options: OptionSet): void;

cli/util/options.js

@@ -31,7 +31,7 @@ function parse(argv, config, propagateDefaults = true) {
       if (typeof option.alias === "string") aliases[option.alias] = key;
       else if (Array.isArray(option.alias)) option.alias.forEach(alias => aliases[alias] = key);
     }
-    if (option.default != null) options[key] = option.default;
+    if (propagateDefaults && option.default != null) options[key] = option.default;
   });
 
   // iterate over argv
@@ -229,7 +229,6 @@ function addDefaults(config, options) {
       options[key] = defaultValue;
     }
   }
-  return options;
 }
 
 exports.addDefaults = addDefaults;