Merge oldest parent first

cli/asc.js

@@ -280,11 +280,30 @@ exports.main = function main(argv, options, callback) {
   const seenAsconfig = new Set();
   seenAsconfig.add(path.join(baseDir, args.config));
 
-  while (asconfig) {
-    // merge target first, then merge options, then merge extended asconfigs
-    if (asconfig.targets && asconfig.targets[target]) {
-      args = optionsUtil.merge(exports.options, asconfig.targets[target], args);
+  // Keep array of configs
+  const configs = [asconfig];
+
+  // First find all parent configs and add them each to the front
+  while (asconfig && 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));
+    const fileName = path.basename(asconfig.extends);
+    const filePath = path.join(asconfigDir, fileName);
+    if (seenAsconfig.has(filePath)) {
+      asconfig = null;
+    } else {
+      seenAsconfig.add(filePath);
+      asconfig = getAsconfig(fileName, asconfigDir, readFile);
+      configs.unshift(asconfig);
     }
+  }
+  let entries = new Set();
+  asconfig = configs.shift();
+  while (asconfig) {
+    // First merge options as the targets can overwrite them later
     if (asconfig.options) {
       if (asconfig.options.transform) {
         // ensure that a transform's path is relative to the current config
@@ -298,43 +317,33 @@ exports.main = function main(argv, options, callback) {
           return p;
         });
       }
-      args = optionsUtil.merge(exports.options, args, asconfig.options);
+      args = optionsUtil.merge(exports.options, asconfig.options, args);
+    }
+
+    // merge targets
+    if (asconfig.targets && asconfig.targets[target]) {
+      args = optionsUtil.merge(exports.options, asconfig.targets[target], args);
     }
-
     // entries are added to the compilation
     if (asconfig.entries) {
       for (const entry of asconfig.entries) {
-        argv.push(
-          path.isAbsolute(entry)
+        entries.add(
+          path.relative(baseDir, path.isAbsolute(entry)
             ? entry
             // the entry is relative to the asconfig directory
             : path.join(asconfigDir, entry)
-        );
-      }
-    }
-
-    // asconfig "extends" another config, merging options of it's parent
-    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));
-      const fileName = path.basename(asconfig.extends);
-      const filePath = path.join(asconfigDir, fileName);
-      if (seenAsconfig.has(filePath)) {
-        asconfig = null;
-      } else {
-        seenAsconfig.add(filePath);
-        asconfig = getAsconfig(fileName, asconfigDir, readFile);
+          ));
       }
-    } else {
-      asconfig = null; // finished resolving the configuration chain
     }
+    asconfig = configs.shift();
   }
 
+  // Add entries
+  argv = argv.concat(Array.from(entries));
+
   // If showConfig print args and exit
   if (args.showConfig) {
+    args.argv = argv;
     stderr.write(JSON.stringify(args, null, 2));
     return callback(null);
   }

tests/asconfig/complicated/assembly/index.ts

@@ -3,4 +3,4 @@ assert(ASC_SHRINK_LEVEL == 1);
 assert(ASC_FEATURE_SIMD);
 let size = memory.size();
 trace("size", 1, size);
-assert(size == 30);
+assert(size == 30, "expected 30 got " + size.toString());

tests/asconfig/extends/asconfig.json

@@ -5,7 +5,9 @@
     }
   },
   "options": {
-    "enable": ["simd"]
+    "enable": ["simd"],
+    "runtime": "half",
+    "noEmit": false
   },
   "extends": "./extends.json"
 }

tests/asconfig/extends/expected.json

@@ -0,0 +1,6 @@
+{
+  "runtime": "half",
+  "noEmit": false,
+  "noAssert": true,
+  "enable": ["simd"]
+}

tests/asconfig/extends/extends.json

@@ -6,6 +6,8 @@
     }
   },
   "options": {
-    "disable": ["simd"]
+    "disable": ["simd"],
+    "noEmit": true,
+    "noAssert": true
   }
 }

tests/asconfig/extends/package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
   "scripts": {
-    "test": "node ../index.js"
+    "test": "node ../index.js --showConfig && node ../index.js"
   }
 }

tests/asconfig/index.js

@@ -1,7 +1,11 @@
 const asc = require("../../cli/asc");
 const loader = require("../../lib/loader");
 const args = process.argv.slice(2);
+const path = require('path');
+const fs = require("fs");
 
+/** @type {string} */
+let stderr;
 /** @type {Uint8Array} */
 let binary;
 asc.main(["assembly/index.ts", "--outFile", "output.wasm", "--explicitStart", ...args], {
@@ -11,13 +15,51 @@ asc.main(["assembly/index.ts", "--outFile", "output.wasm", "--explicitStart", ..
     } else if (name !== "output.wasm.map") {
       throw Error("Unexpected output file: " + name);
     }
+  },
+  stderr: {
+    write(s) {
+      stderr = s;
+    }
   }
+
 }, (err) => {
   if (err) {
     console.error(err);
+    console.error(stderr);
     process.exit(1);
   }
 
+  const jsonPath = path.join(process.cwd(), "expected.json");
+  if (fs.existsSync(jsonPath) && stderr) {
+    const actual = JSON.parse(stderr);
+    const expected = require(jsonPath);
+    let errored = false;
+    for (let name of Object.getOwnPropertyNames(expected)) {
+      if (actual[name] !== expected[name]) {
+        // If object check just first level
+        if (typeof actual[name] === 'object' && typeof expected[name] === 'object') {
+          let error = false;
+          for (let field of Object.getOwnPropertyNames(actual[name])) {
+            if (actual[name][field] !== expected[name][field]) {
+              error = true;
+              break;
+            }
+          }
+          if (!error) {
+            continue;
+          }
+        }
+        console.error(name + ": " + actual[name] + " expected " + expected[name]);
+        errored = true;
+      }
+    }
+    if (errored) {
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+
+
   if (!binary) {
     console.error("No binary was generated for the asconfig test in " + process.cwd());
     process.exit(1);
@@ -29,6 +71,7 @@ asc.main(["assembly/index.ts", "--outFile", "output.wasm", "--explicitStart", ..
     theModule.exports._start();
   } catch (err) {
     console.error("The wasm module _start() function failed in " + process.cwd());
+    console.error(err);
     process.exit(1);
   }
   return 0;

tests/asconfig/package.json

@@ -1,12 +1,13 @@
 {
   "private": true,
   "scripts": {
-    "test": "npm run test:use-consts && npm run test:target && npm run test:entry-points && npm run test:complicated",
+    "test": "npm run test:use-consts && npm run test:target && npm run test:entry-points && npm run test:complicated && npm run test:extends",
     "test:use-consts": "cd use-consts && npm run test",
     "test:entry-points": "cd entry-points && npm run test",
     "test:respect-inheritence": "cd respect-inheritence && npm run test",
     "test:target": "cd target && npm run test",
     "test:cyclical": "cd cyclical && npm run test",
-    "test:complicated": "cd complicated && npm run test"
+    "test:complicated": "cd complicated && npm run test",
+    "test:extends": "cd extends && npm run test"
   }
 }