move Js_array Js_re under Js, add docs

bobzhang · bobzhang · commit 5377de14f7c5 · 2016-08-26T16:24:53.000-04:00
diff --git a/.gitattributes b/.gitattributes
@@ -3,4 +3,5 @@ jscomp/bin/compiler.ml binary
 jscomp/bin/reason.ml binary
 jscomp/bin/bs_ppx.ml binary
 docs/js-demo/exports.js binary
-docs/reason-demo/exports.js binary
+docs/reason-demo/exports.js binary
+docs/Manual.html binary
diff --git a/docs/Manual.html b/docs/Manual.html
@@ -2646,7 +2646,7 @@ <h3 id="_regex_support"><a class="anchor" href="#_regex_support"></a>Regex suppo
 </div>
 </div>
 <div class="paragraph">
-<p>The compiler will infer <code>f</code> has type <code>Js_re.t</code> and generate code as
+<p>The compiler will infer <code>f</code> has type <code>Js.Re.t</code> and generate code as
 below</p>
 </div>
 <div class="listingblock">
@@ -2661,7 +2661,7 @@ <h3 id="_regex_support"><a class="anchor" href="#_regex_support"></a>Regex suppo
 <div class="title">Note</div>
 </td>
 <td class="content">
-<code>Js_re.t</code> is an abstract type, we are working on providing
+<code>Js.Re.t</code> is an abstract type, we are working on providing
 bindings for it.
 </td>
 </tr>
diff --git a/jscomp/others/.depend b/jscomp/others/.depend
@@ -10,8 +10,8 @@ bs_node_module.cmj : bs_node.cmj bs_dict.cmj
 bs_node_module.cmx : bs_node.cmx bs_dict.cmx
 js_array.cmj :
 js_array.cmx :
-js_string.cmj : bs.cmj
-js_string.cmx : bs.cmx
+js_string.cmj : js_re.cmi
+js_string.cmx : js_re.cmx
 js_re.cmj : js_re.cmi
 js_re.cmx : js_re.cmi
 js_re.cmi :
@@ -27,7 +27,7 @@ bs_node_module.cmo : bs_node.cmo bs_dict.cmo
 bs_node_module.cmj : bs_node.cmj bs_dict.cmj
 js_array.cmo :
 js_array.cmj :
-js_string.cmo : bs.cmo
-js_string.cmj : bs.cmj
+js_string.cmo : js_re.cmi
+js_string.cmj : js_re.cmj
 js_re.cmo : js_re.cmi
 js_re.cmj : js_re.cmi
diff --git a/jscomp/others/Makefile b/jscomp/others/Makefile
@@ -2,11 +2,11 @@ include ../Makefile.shared
 
 COMPILER=../bin/bsc
 
-MAP_FILES= bs_node bs 
+MAP_FILES= bs_node 
 
 SOURCE_LIST=  bs_node_path bs_node_fs bs_node_process bs_dict bs_node_module js_array js_string js_re
 
-$(addsuffix .cmj, $(SOURCE_LIST)): bs_node.cmj bs.cmj # TODO
+$(addsuffix .cmj, $(SOURCE_LIST)): $(addsuffix .cmj, $(MAP_FILES))
 
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) 
 
diff --git a/jscomp/others/bs.ml b/jscomp/others/bs.ml
diff --git a/jscomp/others/js_string.ml b/jscomp/others/js_string.ml
@@ -61,17 +61,17 @@ external lastIndexOf_from :  t -> int -> int = "lastIndexOf" [@@bs.send.pipe: t]
 
 external localeCompare :  t -> float = "" [@@bs.send.pipe: t]
 
-external replace : Bs.Re.t ->  t ->  t = "" [@@bs.send.pipe: t]
+external replace : Js_re.t ->  t ->  t = "" [@@bs.send.pipe: t]
 external replace_string :  t ->  t ->  t = "replace" [@@bs.send.pipe: t]
 
-external search : Bs.Re.t -> int = "" [@@bs.send.pipe: t]
+external search : Js_re.t -> int = "" [@@bs.send.pipe: t]
 external slice : int -> int ->  t = "" [@@bs.send.pipe: t]
 external slice_end : int ->  t = "slice" [@@bs.send.pipe: t]
 
 external split :  t -> t array  = "" [@@bs.send.pipe: t]
 external split_limited :  t -> int -> t array = "split" [@@bs.send.pipe: t]
-external split_by_reg : Bs.Re.t  ->  t array = "split" [@@bs.send.pipe: t]
-external split_regExpLimited : Bs.Re.t -> int ->  t array = "" [@@bs.send.pipe: t]
+external split_by_reg : Js_re.t  ->  t array = "split" [@@bs.send.pipe: t]
+external split_regExpLimited : Js_re.t -> int ->  t array = "" [@@bs.send.pipe: t]
 
 external substring : int -> int ->  t = "" [@@bs.send.pipe: t]
 external substring_toEnd : int ->  t = "substring" [@@bs.send.pipe: t]
diff --git a/jscomp/runtime/Makefile b/jscomp/runtime/Makefile
@@ -24,7 +24,7 @@ $(addsuffix .cmi, $(OTHERS)): js.cmi js_unsafe.cmj js_unsafe.cmi
 
 RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST)) 
 
-BS_COMMON_FLAGS= -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name $(npm_package_name)
+BS_COMMON_FLAGS= -no-alias-deps -bs-no-version-header -bs-diagnose -bs-no-check-div-by-zero -bs-cross-module-opt -bs-package-name $(npm_package_name)
 
 ifdef BS_RELEASE_BUILD
 BS_FLAGS=  $(BS_COMMON_FLAGS) -bs-package-output lib/js -bs-package-output goog:lib/goog -bs-package-output amdjs:lib/amdjs
diff --git a/jscomp/runtime/js.ml b/jscomp/runtime/js.ml
@@ -89,6 +89,12 @@ end
 
 
 
+module Dict = Bs_dict
+module Node = Bs_node  
+module Array = Js_array
+module String = Js_string
+module Re = Js_re
+
 
 
 
diff --git a/jscomp/test/.depend b/jscomp/test/.depend
@@ -83,12 +83,12 @@ bigarray_test.cmx : ../stdlib/int32.cmx ../stdlib/complex.cmx \
     ../stdlib/bigarray.cmx
 boolean_test.cmj : test_bool_equal.cmj mt.cmi
 boolean_test.cmx : test_bool_equal.cmx mt.cmx
-bs_array_test.cmj : ../runtime/js.cmj ../others/bs.cmj
-bs_array_test.cmx : ../runtime/js.cmx ../others/bs.cmx
+bs_array_test.cmj : ../runtime/js.cmj
+bs_array_test.cmx : ../runtime/js.cmx
 bs_rest_test.cmj :
 bs_rest_test.cmx :
-bs_string_test.cmj : ../runtime/js.cmj ../others/bs.cmj
-bs_string_test.cmx : ../runtime/js.cmx ../others/bs.cmx
+bs_string_test.cmj : ../runtime/js.cmj
+bs_string_test.cmx : ../runtime/js.cmx
 buffer_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/bytes.cmi \
     ../stdlib/buffer.cmi
 buffer_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/bytes.cmx \
@@ -867,12 +867,12 @@ bigarray_test.cmj : ../stdlib/int32.cmj ../stdlib/complex.cmj \
     ../stdlib/bigarray.cmj
 boolean_test.cmo : test_bool_equal.cmo mt.cmi
 boolean_test.cmj : test_bool_equal.cmj mt.cmj
-bs_array_test.cmo : ../runtime/js.cmo ../others/bs.cmo
-bs_array_test.cmj : ../runtime/js.cmj ../others/bs.cmj
+bs_array_test.cmo : ../runtime/js.cmo
+bs_array_test.cmj : ../runtime/js.cmj
 bs_rest_test.cmo :
 bs_rest_test.cmj :
-bs_string_test.cmo : ../runtime/js.cmo ../others/bs.cmo
-bs_string_test.cmj : ../runtime/js.cmj ../others/bs.cmj
+bs_string_test.cmo : ../runtime/js.cmo
+bs_string_test.cmj : ../runtime/js.cmj
 buffer_test.cmo : ../stdlib/string.cmi mt.cmi ../stdlib/bytes.cmi \
     ../stdlib/buffer.cmi
 buffer_test.cmj : ../stdlib/string.cmj mt.cmj ../stdlib/bytes.cmj \
diff --git a/jscomp/test/bs_array_test.ml b/jscomp/test/bs_array_test.ml
@@ -1,8 +1,8 @@
 
-type 'a t = 'a Bs.Array.t
+type 'a t = 'a Js.Array.t
 let () =
   [| 1; 2; 3; 4 |]
-  |> Bs.Array.filter (fun [@bs] x -> x > 2)
-  |> Bs.Array.mapi (fun [@bs] x i -> x + i)
-  |> Bs.Array.reduce (fun [@bs] x y -> x + y) 0 
+  |> Js.Array.filter (fun [@bs] x -> x > 2)
+  |> Js.Array.mapi (fun [@bs] x i -> x + i)
+  |> Js.Array.reduce (fun [@bs] x y -> x + y) 0 
   |> Js.log
diff --git a/jscomp/test/bs_string_test.ml b/jscomp/test/bs_string_test.ml
@@ -2,7 +2,7 @@
 
 let () =
   "ghso ghso g"
-  |> Bs.String.split " "
-  |> Bs.Array.reduce (fun [@bs] x y ->  x ^  "-" ^ y) ""
+  |> Js.String.split " "
+  |> Js.Array.reduce (fun [@bs] x y ->  x ^  "-" ^ y) ""
   |> Js.log 
 
diff --git a/lib/js/js.js b/lib/js/js.js
@@ -7,7 +7,22 @@ var Undefined = /* module */[];
 
 var Null_undefined = /* module */[];
 
+var Dict = 0;
+
+var Node = 0;
+
+var $$Array = 0;
+
+var $$String = 0;
+
+var Re = 0;
+
 exports.Null           = Null;
 exports.Undefined      = Undefined;
 exports.Null_undefined = Null_undefined;
+exports.Dict           = Dict;
+exports.Node           = Node;
+exports.$$Array        = $$Array;
+exports.$$String       = $$String;
+exports.Re             = Re;
 /* No side effect */
diff --git a/site/docsource/OCaml-call-JS.adoc b/site/docsource/OCaml-call-JS.adoc
@@ -1031,15 +1031,15 @@ We introduced `bs.re` for Javascript regex expression:
 let f  = [%bs.re "/b/g"]
 ------------------------
 
-The compiler will infer `f` has type `Js_re.t` and generate code as
+The compiler will infer `f` has type `Js.Re.t` and generate code as
 below
 
 ------------
 var f = /b/g
 ------------
 
 
-NOTE:  `Js_re.t` is an abstract type, we are working on providing
+NOTE:  `Js.Re.t` is an abstract type, we are working on providing
 bindings for it.
 
 
