Merge pull request #1174 from bloomberg/re_entrant_bsb

refactoring bsb, make sure it is parsing re-entrant, so that later we could have a better global view

Author: bobzhang

docs/Manual.html

@@ -518,7 +518,7 @@ <h1><a href="https://github.com/bloomberg/bucklescript">BuckleScript</a> User Ma
 <li><a href="#_an_example_with_multiple_modules">An example with multiple modules</a></li>
 </ul>
 </li>
-<li><a href="#_built_in_npm_support">Built in npm support</a>
+<li><a href="#_built_in_npm_support">Built in NPM support</a>
 <ul class="sectlevel2">
 <li><a href="#_build_ocaml_library_as_a_npm_package">Build OCaml library as a npm package</a></li>
 <li><a href="#_to_use_ocaml_library_as_a_npm_package">To use OCaml library as a npm package</a></li>
@@ -1216,16 +1216,35 @@ <h3 id="_an_example_with_multiple_modules"><a class="anchor" href="#_an_example_
 </div>
 </div>
 <div class="sect1">
-<h2 id="_built_in_npm_support"><a class="anchor" href="#_built_in_npm_support"></a>Built in npm support</h2>
+<h2 id="_built_in_npm_support"><a class="anchor" href="#_built_in_npm_support"></a>Built in NPM support</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_build_ocaml_library_as_a_npm_package"><a class="anchor" href="#_build_ocaml_library_as_a_npm_package"></a>Build OCaml library as a npm package</h3>
 <div class="paragraph">
+<p>BuckleScript build system has built in support for NPM packages,
+please checkout the section about the bsb for NPM support.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>This section covers some basics of how NPM is supported internally, normal users
+are safe to skip this section.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
 <p>BuckleScript extends the OCaml compiler options with several flags to
 provide better experience for NPM users.</p>
 </div>
 <div class="paragraph">
-<p>In general, you are expected to deploy two kinds of artifacts, the
+<p>In general, you are expected to see two kinds of build artifacts, the
 generated JS files and meta data which your OCaml dependencies rely
 on.</p>
 </div>
@@ -1261,7 +1280,7 @@ <h3 id="_to_use_ocaml_library_as_a_npm_package"><a class="anchor" href="#_to_use
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="sh">bsc.exe -bs-package-include ocaml-package-name -c a.ml</code></pre>
+<pre class="pygments highlight"><code data-lang="sh">bsc.exe -I path/to/ocaml/package/installed -c a.ml</code></pre>
 </div>
 </div>
 </div>
@@ -1272,7 +1291,7 @@ <h3 id="_together"><a class="anchor" href="#_together"></a>Together</h3>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="pygments highlight"><code data-lang="sh">bsc.exe -bs-package-include ocaml-package1 -bs-package-include ocaml-package2  -bs-package-name <span class="tok-nv">$npm_package_name</span> -bs-package-output commonjs:path/to/lib/js/ -c a.ml</code></pre>
+<pre class="pygments highlight"><code data-lang="sh">bsc.exe -I path/to/ocaml/package1/installed -I path/to/ocaml/package2/installed  -bs-package-name <span class="tok-nv">$npm_package_name</span> -bs-package-output commonjs:path/to/lib/js/ -c a.ml</code></pre>
 </div>
 </div>
 </div>

jscomp/Makefile

@@ -252,10 +252,13 @@ OTHER_CORE_SRCS= bsppx_main bspack_main jsoo_main  bspp_main js_cmi_datasets \
 OTHER_CORE_CMXS= $(addprefix core/, $(addsuffix .cmx, $(OTHER_CORE_SRCS)))
 BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util \
 	bsb_dir bsb_ninja \
-	bsb_build_ui bsb_default\
+	bsb_build_ui \
+	bsb_default\
 	bsb_dep_infos\
-	 bsb_gen\
-	 bsb_file\
+	bsb_gen\
+	bsb_file\
+	bsb_config_types\
+	bsb_config_parse\
 	bsb_unix
 
 BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))

jscomp/all.depend

@@ -571,9 +571,8 @@ core/bspp_main.cmx : core/bspp_main.cmi
 core/js_cmi_datasets.cmx : ext/string_map.cmx core/js_cmi_datasets.cmi
 core/js_main.cmx : core/ocaml_parse.cmx core/ocaml_options.cmx \
     core/ocaml_batch_compile.cmx core/js_implementation.cmx \
-    common/js_config.cmx ext/ext_string.cmx ext/ext_filename.cmx \
-    common/bs_pkg.cmx depends/bs_exception.cmx \
-    core/bs_conditional_initial.cmx core/js_main.cmi
+    common/js_config.cmx ext/ext_string.cmx core/bs_conditional_initial.cmx \
+    core/js_main.cmi
 ounit/oUnit.cmi :
 ounit/oUnitDiff.cmi :
 ounit/oUnit.cmx : ounit/oUnitUtils.cmx ounit/oUnitTypes.cmx \
@@ -649,32 +648,38 @@ bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
     bsb/bsb_dir.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_build_ui.cmi
-bsb/bsb_build_util.cmx : ext/ext_sys.cmx ext/ext_string.cmx ext/ext_list.cmx \
-    ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_util.cmi
-bsb/bsb_config.cmx : ext/literals.cmx common/js_config.cmx \
-    ext/ext_string.cmx ext/ext_filename.cmx bsb/bsb_config.cmi
-bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_sys.cmx \
+bsb/bsb_build_util.cmx : ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx \
+    ext/ext_list.cmx ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx common/bs_pkg.cmx \
+    bsb/bsb_build_util.cmi
+bsb/bsb_config.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
+    ext/ext_filename.cmx bsb/bsb_config.cmi
+bsb/bsb_config_parse.cmx : ext/string_hash_set.cmx ext/literals.cmx \
     ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
-    common/bs_pkg.cmx bsb/bsb_default.cmi
+    ext/ext_file_pp.cmx bsb/bsb_default.cmx bsb/bsb_config_types.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx \
+    bsb/bsb_build_schemas.cmx bsb/bsb_config_parse.cmi
+bsb/bsb_config_types.cmx : ext/string_hash_set.cmx bsb/bsb_config.cmx \
+    bsb/bsb_build_ui.cmx
+bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx \
+    ext/ext_pervasives.cmx ext/ext_filename.cmx bsb/bsb_config_types.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_util.cmx common/bs_pkg.cmx \
+    bsb/bsb_default.cmi
 bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
 bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
 bsb/bsb_file.cmx : bsb/bsb_file.cmi
 bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_filename.cmx bsb/bsb_ninja.cmx bsb/bsb_config.cmx \
-    bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx \
-    common/binary_cache.cmx bsb/bsb_gen.cmi
+    ext/ext_filename.cmx bsb/bsb_ninja.cmx bsb/bsb_config_types.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx \
+    bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_gen.cmi
 bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
     bsb/bsb_helper_main.cmi
 bsb/bsb_main.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
-    ext/ext_string.cmx ext/ext_pervasives.cmx ext/ext_json.cmx \
-    ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
-    bsb/bsb_unix.cmx bsb/bsb_ninja.cmx bsb/bsb_gen.cmx bsb/bsb_file.cmx \
-    bsb/bsb_dep_infos.cmx bsb/bsb_default.cmx bsb/bsb_config.cmx \
-    bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx \
-    common/bs_pkg.cmx bsb/bsb_main.cmi
+    ext/ext_string.cmx ext/ext_filename.cmx ext/ext_array.cmx \
+    bsb/bsb_unix.cmx bsb/bsb_gen.cmx bsb/bsb_file.cmx bsb/bsb_dep_infos.cmx \
+    bsb/bsb_config_types.cmx bsb/bsb_config_parse.cmx bsb/bsb_config.cmx \
+    bsb/bsb_build_util.cmx bsb/bsb_main.cmi
 bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx \
     ext/string_hash_set.cmx ext/literals.cmx ext/ext_sys.cmx \
     ext/ext_string.cmx ext/ext_filename.cmx bsb/bsb_config.cmx \
@@ -685,15 +690,17 @@ bsb/bsb_unix.cmx : ext/ext_sys.cmx ext/ext_string.cmx bsb/bsb_unix.cmi
 bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/ext_json.cmi \
     ext/ext_file_pp.cmi common/binary_cache.cmi
 bsb/bsb_build_util.cmi : ext/ext_json.cmi
-bsb/bsb_config.cmi :
-bsb/bsb_default.cmi : ext/string_set.cmi ext/ext_json.cmi
+bsb/bsb_config.cmi : ext/string_set.cmi
+bsb/bsb_config_parse.cmi : bsb/bsb_config_types.cmx bsb/bsb_config.cmi
+bsb/bsb_default.cmi : ext/ext_json.cmi bsb/bsb_config_types.cmx \
+    bsb/bsb_config.cmi
 bsb/bsb_dep_infos.cmi :
 bsb/bsb_dir.cmi :
 bsb/bsb_file.cmi :
-bsb/bsb_gen.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
+bsb/bsb_gen.cmi : bsb/bsb_config_types.cmx
 bsb/bsb_helper_main.cmi :
 bsb/bsb_main.cmi :
-bsb/bsb_ninja.cmi : ext/string_hash_set.cmi bsb/bsb_default.cmi \
+bsb/bsb_ninja.cmi : ext/string_hash_set.cmi bsb/bsb_config.cmi \
     bsb/bsb_build_ui.cmi
 bsb/bsb_unix.cmi :
 jscmj_main.cmx : common/js_config.cmx core/js_cmj_format.cmx \

jscomp/bin/bsb.d

@@ -11,17 +11,16 @@ bin/bsb.ml : ext/ext_string.ml
 bin/bsb.ml : ext/ext_string.mli
 bin/bsb.ml : ext/ext_filename.ml
 bin/bsb.ml : ext/ext_filename.mli
-bin/bsb.ml : ext/map_gen.ml
-bin/bsb.ml : ext/string_map.ml
-bin/bsb.ml : ext/string_map.mli
-bin/bsb.ml : common/binary_cache.ml
-bin/bsb.ml : common/binary_cache.mli
-bin/bsb.ml : common/js_config.ml
-bin/bsb.ml : common/js_config.mli
+bin/bsb.ml : ext/set_gen.ml
+bin/bsb.ml : ext/string_set.ml
+bin/bsb.ml : ext/string_set.mli
 bin/bsb.ml : bsb/bsb_config.ml
 bin/bsb.ml : bsb/bsb_config.mli
 bin/bsb.ml : ext/ext_array.ml
 bin/bsb.ml : ext/ext_array.mli
+bin/bsb.ml : ext/map_gen.ml
+bin/bsb.ml : ext/string_map.ml
+bin/bsb.ml : ext/string_map.mli
 bin/bsb.ml : ext/ext_json.ml
 bin/bsb.ml : ext/ext_json.mli
 bin/bsb.ml : ext/ext_list.ml
@@ -30,32 +29,34 @@ bin/bsb.ml : ext/ext_sys.ml
 bin/bsb.ml : ext/ext_sys.mli
 bin/bsb.ml : bsb/bsb_build_util.ml
 bin/bsb.ml : bsb/bsb_build_util.mli
+bin/bsb.ml : common/binary_cache.ml
+bin/bsb.ml : common/binary_cache.mli
 bin/bsb.ml : bsb/bsb_dir.ml
 bin/bsb.ml : bsb/bsb_dir.mli
 bin/bsb.ml : ext/ext_file_pp.ml
 bin/bsb.ml : ext/ext_file_pp.mli
-bin/bsb.ml : ext/set_gen.ml
-bin/bsb.ml : ext/string_set.ml
-bin/bsb.ml : ext/string_set.mli
 bin/bsb.ml : ext/vec_gen.ml
 bin/bsb.ml : ext/resize_array.ml
 bin/bsb.ml : ext/resize_array.mli
 bin/bsb.ml : ext/string_vec.ml
 bin/bsb.ml : ext/string_vec.mli
 bin/bsb.ml : bsb/bsb_build_ui.ml
 bin/bsb.ml : bsb/bsb_build_ui.mli
-bin/bsb.ml : bsb/bsb_default.ml
-bin/bsb.ml : bsb/bsb_default.mli
-bin/bsb.ml : bsb/bsb_dep_infos.ml
-bin/bsb.ml : bsb/bsb_dep_infos.mli
-bin/bsb.ml : bsb/bsb_file.ml
-bin/bsb.ml : bsb/bsb_file.mli
 bin/bsb.ml : stubs/bs_hash_stubs.ml
 bin/bsb.ml : ext/ext_util.ml
 bin/bsb.ml : ext/ext_util.mli
 bin/bsb.ml : ext/hash_set_gen.ml
 bin/bsb.ml : ext/string_hash_set.ml
 bin/bsb.ml : ext/string_hash_set.mli
+bin/bsb.ml : bsb/bsb_config_types.ml
+bin/bsb.ml : bsb/bsb_default.ml
+bin/bsb.ml : bsb/bsb_default.mli
+bin/bsb.ml : bsb/bsb_config_parse.ml
+bin/bsb.ml : bsb/bsb_config_parse.mli
+bin/bsb.ml : bsb/bsb_dep_infos.ml
+bin/bsb.ml : bsb/bsb_dep_infos.mli
+bin/bsb.ml : bsb/bsb_file.ml
+bin/bsb.ml : bsb/bsb_file.mli
 bin/bsb.ml : bsb/bsb_ninja.ml
 bin/bsb.ml : bsb/bsb_ninja.mli
 bin/bsb.ml : bsb/bsb_gen.ml