make node path resolution node friendly, also versionize bucklescript header' (#313)

Author: bobzhang

.gitignore

@@ -59,4 +59,5 @@ boot
 coverage
 *.log
 ./jscomp/output
-*.g.js
+*.g.js
+dist

jscomp/ext_filename.ml

@@ -84,13 +84,37 @@ let relative_path file1 file2 =
 
 
 
+let node_modules = "node_modules"
+let node_modules_length = String.length "node_modules"
 (** path2: a/b 
     path1: a 
     result:  ./b 
     TODO: [Filename.concat] with care
  *)
 let node_relative_path path1 path2 = 
-  
+  let v = Ext_string.find  path2 ~sub:node_modules in 
+  let len = String.length path2 in 
+  if v >= 0 then 
+    let rec skip  i =       
+      if i >= len then
+        failwith ("invalid path: " ^ path2)
+      else 
+        match path2.[i] with 
+        | '/'
+        | '.' ->  skip (i + 1) 
+        | _ -> i
+        (*
+          TODO: we need do more than this suppose user 
+          input can be
+           {[
+           "xxxghsoghos/ghsoghso/node_modules/../buckle-stdlib/list.js"
+           ]}
+           This seems weird though
+        *)
+    in 
+    Ext_string.tail_from path2
+      (skip (v + node_modules_length)) 
+  else 
     (relative_path 
        (try_chop_extension (absolute_path path2))
        (try_chop_extension (absolute_path path1))

jscomp/ext_filename.mli

@@ -26,7 +26,10 @@
 
 (** Js_output is node style, which means 
     separator is only '/'
-    TODO: handle [node_modules]
+
+    if the path contains 'node_modules', 
+    [node_relative_path] will discard its prefix and 
+    just treat it as a library instead
  *)
 
 val node_relative_path : string -> string -> string

jscomp/js_config.ml

@@ -147,7 +147,7 @@ let gc = "Caml_gc"
 let int32 = "Caml_int32"
 let block = "Block"
 let js_primitive = "Js_primitive"
-
+let version = "0.3"
 let runtime_set = 
   [
     js_primitive;

jscomp/js_config.mli

@@ -38,7 +38,7 @@ val block : string
 val int32 : string
 val gc : string 
 val backtrace : string
-
+val version : string
 val builtin_exceptions : string
 val exceptions : string
 val io : string

jscomp/js_dump.ml

@@ -1593,9 +1593,14 @@ let amd_program f
   P.string f ")";
   v
 
+let bs_header = 
+  "// GENERATED CODE BY BUCKLESCRIPT VERSION " ^
+  Js_config.version ^
+  " , PLEASE EDIT WITH CARE"
+
 let pp_deps_program ( program  : J.deps_program) (f : Ext_pp.t) = 
   begin
-    P.string f "// Generated CODE, PLEASE EDIT WITH CARE";
+    P.string f bs_header;
     P.newline f; 
     P.string f L.strict_directive; 
     P.newline f ;    

jscomp/js_program_loader.ml

@@ -56,29 +56,29 @@ let string_of_module_id (x : Lam_module_ident.t) : string =
     | AmdJS
     | NodeJS -> 
       let filename = String.uncapitalize id.name in
-      if String_set.mem filename Js_config.runtime_set  then 
-        let path = 
-          (* For the runtime, only [JS] files are needed, and 
-             unlike the stdlib, [bsc] have some pre-built knowledge 
-             about where it is, since in general, [runtime] 
-             is *transparent* to the user
-          *)        
-          match Sys.getenv "OCAML_JS_RUNTIME_PATH" with 
-          | exception Not_found -> 
-            Filename.concat 
-              (Filename.dirname (Filename.dirname Sys.executable_name))
-              "runtime"
-          | f ->  f  in
-        Ext_filename.node_relative_path !Location.input_name
-          (Filename.concat path filename)        
-      else 
         begin match Config_util.find file with   
           (* for some primitive files, no cmj support *)
           | exception Not_found ->
-            Ext_log.warn __LOC__ "@[%s not found in search path - while compiling %s @] "
-              file !Location.input_name ;
-            Printf.sprintf "%s" 
-              (String.uncapitalize id.name) 
+            if String_set.mem filename Js_config.runtime_set  then 
+              let path = 
+                (* For the runtime, only [JS] files are needed, and 
+                   unlike the stdlib, [bsc] have some pre-built knowledge 
+                   about where it is, since in general, [runtime] 
+                   is *transparent* to the user
+                *)        
+                Filename.concat 
+                  (Filename.dirname (Filename.dirname Sys.executable_name))
+                  "runtime"
+              in
+              Ext_filename.node_relative_path !Location.input_name
+                (Filename.concat path filename)        
+            else
+              begin 
+                Ext_log.warn __LOC__ "@[%s not found in search path - while compiling %s @] "
+                  file !Location.input_name ;
+                Printf.sprintf "%s" 
+                  (String.uncapitalize id.name) 
+              end
           (* maybe from third party library*)
           (* Check: be consistent when generating js files
              A.ml -> a.js

jscomp/lib/bench.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Bench = require("benchmark");

jscomp/lib/fn.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/lib/js.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/lib/js_date.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/block.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_array.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_backtrace.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_builtin_exceptions.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_exceptions.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_float.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_format.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_int64              = require("./caml_int64");

jscomp/runtime/caml_gc.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_hash.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_int32.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_int64.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_io.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_lexer.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_md5.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_obj.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_oo.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_parser.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_primitive.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_queue.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_string.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_sys.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

jscomp/runtime/caml_utils.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/caml_weak.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_obj   = require("./caml_obj");

jscomp/runtime/curry.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_oo    = require("./caml_oo");

jscomp/runtime/fn.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/js.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/js_error.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/js_primitive.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/runtime/typed_array.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 

jscomp/stdlib/arg.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_obj                = require("../runtime/caml_obj");

jscomp/stdlib/array.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions");

jscomp/stdlib/arrayLabels.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var $$Array = require("./array");

jscomp/stdlib/bigarray.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions");

jscomp/stdlib/buffer.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Bytes                   = require("./bytes");

jscomp/stdlib/bytes.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Caml_builtin_exceptions = require("../runtime/caml_builtin_exceptions");

jscomp/stdlib/bytesLabels.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Bytes = require("./bytes");

jscomp/stdlib/callback.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Obj = require("./obj");

jscomp/stdlib/camlinternalFormat.js

@@ -1,4 +1,4 @@
-// Generated CODE, PLEASE EDIT WITH CARE
+// GENERATED CODE BY BUCKLESCRIPT VERSION 0.3 , PLEASE EDIT WITH CARE
 'use strict';
 
 var Bytes                    = require("./bytes");