fix deep calling & find sibling module

飞羏 · 飞羏 · commit 84cef501bd32 · 2017-03-23T18:34:49.000+08:00
diff --git a/ftdetect/javascript.vim b/ftdetect/javascript.vim
@@ -8,15 +8,21 @@ let node#suffixesadd = [".js", ".json", ".es", ".jsx"]
 setlocal path-=/usr/include
 let &l:suffixesadd .= "," . join(g:node#suffixesadd, ",")
 
-let &l:include = '\<require(\(["'']\)\zs[^\1]\+\ze\1)\>'
-let &l:includeexpr = "javascript#find(v:fname)"
+au BufEnter *.js call javascript#findinit()
 
-let b:path = expand('<sfile>:p:h')
-let b:findJsFile = substitute(b:path, '[/\\]\?[^/\\]*$', '', '').'/javascript/find.js'
+fun! javascript#findinit()
+  let &l:include = '\<require(\(["'']\)\zs[^\1]\+\ze\1)\>'
+  let &l:includeexpr = "javascript#find(v:fname)"
+endfun
+
+let node_gf_js_path = substitute(expand('<sfile>:p:h'), '[/\\]\?[^/\\]*$', '', '').'/javascript/find.js'
 
 fun! javascript#find(name)
-  let cmd = 'node'.s:WrapString(b:findJsFile).s:WrapString(getcwd()).s:WrapString(expand('%:p')).s:WrapString(a:name)
-  return substitute(system(cmd), '^[ \n]\+\|[ \n]\+$', '', 'g')
+  let cmd = 'node'.s:WrapString(g:node_gf_js_path).s:WrapString(getcwd()).s:WrapString(expand('%:p')).s:WrapString(a:name)
+  let path = substitute(system(cmd), '^[ \n]\+\|[ \n]\+$', '', 'g')
+  if path != ''
+    return path
+  endif
 endfun
 
 fun! s:WrapString(str)
diff --git a/javascript/find.js b/javascript/find.js
@@ -1,13 +1,16 @@
 
 var path = require('path');
+var fs = require('fs');
 var relative = require('require-relative');
 
-var project = process.argv[2] || '';
-var file = process.argv[3] || '';
-var ref = process.argv[4] || '';
+var project = process.argv[2] || ''; // project root path
+var file = process.argv[3] || ''; // project file name eg: '/Users/project/index.js'
+var ref = process.argv[4] || ''; // ref name eg: 'react'
+
+// console.log(__dirname + '/a.txt', [project, file, ref].join('\n'));
 
-// require('/module/file')
 // project absolute path
+// eg: require('/module/file')
 if (ref.match(/^\//)) {
   ref = path.join(project, ref);
 }
@@ -19,4 +22,17 @@ try {
 } catch(ex) {
 }
 
+// sometimes module's ref is sibling
+// eg: 
+//  node_modules
+//     a/index.js
+//     b
+//  in a/index.js require('b')
+if (!ret && ref.match(/^[^\.\/]/) && file.match(/node_modules/)) {
+  try {
+    ret = relative.resolve(ref, file.replace(/\/node_modules\/.*?$/, ''));
+  } catch(ex) {
+  }
+}
+
 console.log(ret || '');
