Change npm imports to use browserify's resolve()

This uses https://github.com/browserify/resolve for resolution. A few reasons:

1. It has a clean API for giving a `basedir` argument
2. It is pure JavaScript and (given a working `fs` and `path` implementation),
can run in a webview/browser tab, rather than being node-internal

Then, use the basedir configuration to make sure `npm` imports are resolved
relative to the module containing the import (not relative to the compiler).

Also update the test to have a handwritten node_modules with pyret-test-files.
This ensures that when we run the _compiler_, whose working directory is the
root of the repo, it must be using this new infrastructure to find the
pyret-test-files module.

Author: jpolitz

package-lock.json

@@ -29,9 +29,9 @@
     "lockfile": "^1.0.4",
     "mkdirp": "^0.5.1",
     "node-uuid": "^1.4.8",
-    "pyret-test-files": "git://github.com/brownplt/pyret-test-files#main",
     "q": "~1.0.1",
     "requirejs": "^2.3.7",
+    "resolve": "^1.22.10",
     "s-expression": "~2.2.0",
     "seedrandom": "~2.3.10",
     "sha.js": "^2.4.11",

package.json

@@ -352,7 +352,7 @@ fun module-finder(ctxt :: CLIContext, dep :: CS.Dependency):
       else if protocol == "npm":
         package-name = args.get(0)
         path = args.get(1)
-        locator = NPM.make-npm-locator(package-name, path)
+        locator = NPM.make-npm-locator(package-name, path, ctxt.current-load-path)
         clp = ctxt.current-load-path
         real-path = get-real-path(clp, locator.path)
         new-context = ctxt.{current-load-path: Filesystem.dirname(real-path)}

src/arr/compiler/cli-module-loader.arr

@@ -5,8 +5,8 @@ import filesystem as FS
 import file("../compile-structs.arr") as CS
 import file("./file.arr") as F
 
-fun make-npm-locator(package-name, path):
-    package-path = R.resolve(package-name)
+fun make-npm-locator(package-name, path, current-load-path):
+    package-path = R.resolve(package-name, current-load-path)
     F.file-locator(
         FS.resolve(FS.join(FS.dirname(package-path), path)),
         CS.standard-globals

src/arr/compiler/locators/npm.arr

@@ -38,3 +38,5 @@ define("http", [], function () {return http;});
 ws = nodeRequire("ws");
 define("ws", [], function () { return ws });
 
+resolve = nodeRequire("resolve");
+define("resolve", [], function () { return resolve });

src/js/trove/require-node-compile-dependencies.js

@@ -44,3 +44,5 @@ define("path", [], function () { return path; });
 http = nodeRequire("http");
 define("http", [], function () {return http;});
 
+resolve = nodeRequire("resolve");
+define("resolve", [], function () {return resolve;});

src/js/trove/require-node-dependencies.js

@@ -6,14 +6,20 @@
         },
         types: {}
     },
-    nativeRequires: [],
-    theModule: function(runtime, _, _) {
-        function resolve(moduleName) {
-            runtime.checkArgsInternal1('require-util', 'resolve', moduleName, runtime.String);
+    nativeRequires: ["resolve"],
+    theModule: function(runtime, _, _, browserifyResolve) {
+        function resolve(moduleName, baseDir) {
+            console.log(moduleName, baseDir);
+            runtime.checkArgsInternal2('require-util', 'resolve', moduleName, runtime.String, baseDir, runtime.String);
             try {
-                return require.resolve(moduleName);
+                return runtime.pauseStack((restarter) => {
+                  browserifyResolve(moduleName, { basedir: baseDir }, (err, resolved) => {
+                      if(err) { restarter.error(runtime.makeMessageException(`Error resolving ${moduleName} from ${baseDir}: ${String(err)}`)); }
+                      restarter.resume(resolved);
+                  });
+                });
             } catch (err) {
-                throw runtime.throwMessageException(`Error resolving ${moduleName}: ${String(err)}`);
+                throw runtime.throwMessageException(`Error resolving ${moduleName} from ${baseDir}: ${String(err)}`);
             }
         }
         function cannotResolve(moduleName) {
@@ -29,4 +35,4 @@
             resolve: runtime.makeFunction(_resolve, 'resolve')
         }, {});
     }
-})
+})