Add node module resolution by default and use --path for custom package locations

.gitignore

@@ -4,3 +4,5 @@ node_modules/
 out/
 raw/
 .history
+
+tests/packages/lerna-debug\.log

cli/asc.js

@@ -228,6 +228,9 @@ exports.main = function main(argv, options, callback) {
 
   // Begin parsing
   var parser = null;
+
+  //maps package names to parent directory
+  let packages = new Map();
 
   // Include library files
   Object.keys(exports.libraryFiles).forEach(libPath => {
@@ -261,6 +264,7 @@ exports.main = function main(argv, options, callback) {
         let libText = readFile(libPath, libDir);
         if (libText === null) return callback(Error("Library file '" + libPath + "' not found."));
         stats.parseCount++;
+        exports.libraryFiles[libPath.replace(/\.ts$/, "")] = libText
         stats.parseTime += measure(() => {
           parser = assemblyscript.parseFile(
             libText,
@@ -342,7 +346,62 @@ exports.main = function main(argv, options, callback) {
           }
         }
       }
-      if (sourceText == null) {
+      /*
+      In this case the library wasn't found so we check paths
+      */
+      if (sourceText == null && args.path) {
+        writeStdout(`Looking for ${sourcePath}\n`)
+        for (let _path of args.path) {
+          let _package = sourcePath.replace(/\~lib\/([^\/]*).*/, `$1`);
+          if (args.traceResolution) {
+            writeStdout(`in ${_path}`);
+          }
+          let ascMain = (() => {
+            if (packages.has(_package)){
+              return packages.get(_package);
+            }
+            let p = path.join(_path, _package, "package.json");
+            let res = readFile(p, baseDir);
+            if (res){
+              let mainFile = JSON.parse(res).ascMain
+              if (mainFile){
+                let newPackage = mainFile.replace(/(.*)\/index\.ts/, '$1');
+                packages.set(_package, newPackage);
+                return newPackage;
+              }
+            }
+            return "assembly";
+          })()
+          let realPath = (_p) => {
+            return _p.replace(/\~lib\/([^/]*)\/(.*)/, `${_path}/$1/${ascMain}/$2`);
+          }
+          const plainName = sourcePath;
+          const indexName = sourcePath + "/index";
+          sourceText = readFile(realPath(plainName) + ".ts", baseDir);
+          if (sourceText !== null) {
+            sourcePath = plainName + ".ts";
+          } else {
+            sourceText = readFile(realPath(indexName) + ".ts", baseDir);
+            if (sourceText !== null) {
+              sourcePath = indexName + ".ts";
+            }
+          }
+          if (sourceText !== null) {
+            if (args.traceResolution) {
+              writeStdout(` -> Found at ${realPath(sourcePath)}\n`);
+            }
+            let newPath = path.join(_path, _package, "node_modules");
+            if (!args.path.includes(newPath)){
+              args.path.push(newPath);
+            }
+            break;
+          }
+          if (args.traceResolution) {
+            writeStdout('\n');
+          }
+        }
+      }
+      if (sourceText == null){
         return callback(Error("Import file '" + sourcePath + ".ts' not found."));
       }
       stats.parseCount++;
@@ -418,6 +477,12 @@ exports.main = function main(argv, options, callback) {
   // Finish parsing
   const program = assemblyscript.finishParsing(parser);
 
+  // Print files and exit if listFiles
+  if (args.listFiles) {
+    writeStdout(program.sources.map(s => s.normalizedPath).join("\n") + "\n");
+    callback(null);
+  }
+
   // Set up optimization levels
   var optimizeLevel = 0;
   var shrinkLevel = 0;
@@ -718,11 +783,13 @@ exports.main = function main(argv, options, callback) {
   return callback(null);
 
   function readFileNode(filename, baseDir) {
+    let dir = baseDir || "/"
+    let name = path.resolve(path.join(dir, filename));
     try {
       let text;
       stats.readCount++;
       stats.readTime += measure(() => {
-        text = fs.readFileSync(path.join(baseDir, filename), { encoding: "utf8" });
+        text = fs.readFileSync(name, { encoding: "utf8" });
       });
       return text;
     } catch (e) {

cli/asc.json

@@ -216,5 +216,22 @@
   "-O0z": { "value": { "optimizeLevel": 0, "shrinkLevel": 2 } },
   "-O1z": { "value": { "optimizeLevel": 1, "shrinkLevel": 2 } },
   "-O2z": { "value": { "optimizeLevel": 2, "shrinkLevel": 2 } },
-  "-O3z": { "value": { "optimizeLevel": 3, "shrinkLevel": 2 } }
+  "-O3z": { "value": { "optimizeLevel": 3, "shrinkLevel": 2 } },
+  "path": {
+    "description": [
+      "comma separated paths to look for dependencies.",
+      "Looks for folders with package.json that includes a 'ascMain' field",
+      "or defaults to having an '/assembly' folder"],
+    "type": "S"
+  },
+  "traceResolution": {
+    "description": "Enable tracing of package resolution",
+    "type": "b",
+    "default": false
+  },
+  "listFiles": {
+    "description": "List files to be compiled and exit",
+    "type": "b",
+    "default": false
+  }
 }

package.json

@@ -47,9 +47,10 @@
     "check": "npm run check:config && npm run check:compiler",
     "check:config": "tsc --noEmit -p src --diagnostics --listFiles",
     "check:compiler": "tslint -c tslint.json --project src --formatters-dir lib/lint/formatters --format as",
-    "test": "npm run test:parser && npm run test:compiler",
+    "test": "npm run test:parser && npm run test:compiler && npm run test:packages",
     "test:parser": "node tests/parser",
     "test:compiler": "node tests/compiler",
+    "test:packages": "node tests/packages",
     "make": "npm run clean && npm test && npm run build && npm test",
     "all": "npm run check && npm run make",
     "docs": "typedoc --tsconfig tsconfig-docs.json --mode modules --name \"AssemblyScript Compiler API\" --out ./docs/api --ignoreCompilerErrors --excludeNotExported --excludePrivate --excludeExternals --exclude **/std/** --includeDeclarations --readme src/README.md",

tests/packages/index.js

@@ -0,0 +1,20 @@
+var cp = require('child_process')
+
+// Determine OS and set command accordingly
+const cmd = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
+
+cp.spawn(cmd, ['i'], { env: process.env, cwd: __dirname, stdio: 'inherit' })
+  .on("error", () => exit(1))
+  .on("close", (code, signal) => {
+    if (code != 0 ){
+        exit(1);
+    }
+    cp.spawn(cmd, ['run', 'test'], { env: process.env, cwd: __dirname, stdio: 'inherit' })
+      .on("error", () => exit(1))
+      .on("close", (code, signal) => {
+       if (code != 0 ){
+          exit(1);
+        }
+      });
+});
+

tests/packages/lerna.json

@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}