- support modules from parent node_modeuls

- bump version
plotdb · Dec 16, 2022 · 7c9b036 · 7c9b036
1 parent 01ef5e1
commit 7c9b036
Show file tree

Hide file tree

Showing 5 changed files with 261 additions and 222 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Logs
 
+## v1.1.8
+
+ - support modules from parent `node_modeuls`
+
+
 ## v1.1.7
 
  - fix bug: dup installation of local module: ext modules incorrect due to local module filtering bug.

diff --git a/cli.js b/cli.js
@@ -61,7 +61,7 @@ cmds['default'] = {
       }));
     }
     return (fed.modules || []).map(function(obj){
-      var localModule, root, info, id, mainFile, ref$, i$, name, version, ret, that, desdir, maindir, p, srcdir, realSrcdir, srcFile, desFile;
+      var localModule, root, base, info, id, mainFile, ref$, i$, name, version, ret, that, desdir, maindir, p, srcdir, realSrcdir, srcFile, desFile;
       obj = typeof obj === 'string' ? {
         name: obj
       } : obj;
@@ -74,7 +74,14 @@ cmds['default'] = {
       if (localModule) {
         root = localModule.path;
       } else {
-        root = path.join("node_modules", obj.name);
+        base = '.';
+        while (root !== '/') {
+          root = path.resolve(path.join(base, 'node_modules', obj.name));
+          if (fs.existsSync(root)) {
+            break;
+          }
+          base = path.join(base, '..');
+        }
       }
       info = JSON.parse(fs.readFileSync(path.join(root, "package.json")).toString());
       id = info._id || info.name + "@" + info.version;

diff --git a/lib/main.ls b/lib/main.ls
@@ -41,7 +41,13 @@ cmds.default =
       local-module = local-modules.filter(-> it.name == obj.name).0
       if local-modules.length and !local-module => return
       if local-module => root = local-module.path
-      else root = path.join("node_modules", obj.name)
+      else
+        base = '.'
+        while root != \/
+          root = path.resolve(path.join base, \node_modules, obj.name)
+          if fs.exists-sync(root) => break
+          base = path.join(base, \..)
+
       info = JSON.parse(fs.read-file-sync path.join(root, "package.json") .toString!)
       id = info._id or "#{info.name}@#{info.version}"