provide bs_dict, more error checking on bs_set_index/get_index

Author: Hongbo Zhang

jscomp/.watchmanconfig

@@ -1,3 +1,3 @@
 {
-        "ignore_dirs": ["_build"]
+        "ignore_dirs": ["_build", "bin"]
 }

jscomp/bin/bs_ppx.ml

@@ -1,4 +1,4 @@
-(** Bundled by bspack 08/19-15:31 *)
+(** Bundled by bspack 08/22-17:28 *)
 module String_map : sig 
 #1 "string_map.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -4255,7 +4255,7 @@ type t  =
   | Bs of arg_kind list  * arg_type *   ffi
   | Normal 
 
-type prim =  Primitive.description
+
 
 
 
@@ -4349,7 +4349,7 @@ type ffi =
   | Js_get_index
   | Js_set_index
 
-type prim =  Primitive.description
+
 
 let valid_js_char =
   let a = Array.init 256 (fun i ->
@@ -4368,7 +4368,7 @@ let valid_first_js_char =
 (** Approximation could be improved *)
 let valid_ident (s : string) =
   let len = String.length s in
-  valid_js_char s.[0] && valid_first_js_char s.[0] &&
+  len > 0 && valid_js_char s.[0] && valid_first_js_char s.[0] &&
   (let module E = struct exception E end in
    try
      for i = 1 to len - 1 do
@@ -4379,21 +4379,18 @@ let valid_ident (s : string) =
    with E.E -> false )  
 
 let valid_global_name ?loc txt =
-  let error () =
-    Location.raise_errorf ?loc "Not a valid  name %s"  txt  in
-  if txt = "" then
-    error ()
-  else
+  if not (valid_ident txt) then
     let v = Ext_string.split_by ~keep_empty:true (fun x -> x = '.') txt in
     List.iter
       (fun s ->
-         if not (valid_ident s) then error ()
+         if not (valid_ident s) then
+           Location.raise_errorf ?loc "Not a valid  name %s"  txt
       ) v      
 
 let valid_method_name ?loc txt =         
-  let error () =
-    Location.raise_errorf ?loc "Not a valid  name %s"  txt  in
-  if not (valid_ident txt) then error ()
+  if not (valid_ident txt) then
+    Location.raise_errorf ?loc "Not a valid  name %s"  txt
+
 
 
 let check_external_module_name ?loc x = 
@@ -4597,13 +4594,17 @@ let handle_attributes
         Obj_create labels(* Need fetch label here, for better error message *)
       | {set_index = true} 
         ->
+        if String.length prim_name <> 0 then 
+          Location.raise_errorf ~loc "[@@bs.set_index] expect external names to be empty string";
         begin match arg_types with 
         | [_obj; _v ; _value] 
           -> 
           Js_set_index
         | _ -> Location.raise_errorf ~loc "Ill defined attribute [@@bs.set_index](arity of 3)"
         end
-      | {get_index = true} -> 
+      | {get_index = true} ->
+        if String.length prim_name <> 0 then 
+          Location.raise_errorf ~loc "[@@bs.get_index] expect external names to be empty string";
         begin match arg_types with 
         | [_obj; _v ] -> 
           Js_get_index

jscomp/bin/compiler.ml

@@ -66,4 +66,8 @@ echo "Done"
 
 echo "Make pack tools" >> ./build.compile
 make _build/bspack 2>> ./build.compile
+
+# make snapshot
+# generate new js_cmj_datasets
+make snapshotml
 echo "Done" >> ./build.compile

jscomp/build.sh

@@ -1,13 +1,20 @@
-bs_node.cmi : bs_node_process.cmj bs_node_path.cmj bs_node_fs.cmj
-bs_node_fs.cmj :
-bs_node_fs.cmx :
 bs_node_path.cmj :
 bs_node_path.cmx :
+bs_node_fs.cmj :
+bs_node_fs.cmx :
 bs_node_process.cmj :
 bs_node_process.cmx :
-bs_node_fs.cmo :
-bs_node_fs.cmj :
+bs_dict.cmj :
+bs_dict.cmx :
+bs_node_module.cmj : bs_node.cmi bs_dict.cmj
+bs_node_module.cmx : bs_node.cmi bs_dict.cmx
 bs_node_path.cmo :
 bs_node_path.cmj :
+bs_node_fs.cmo :
+bs_node_fs.cmj :
 bs_node_process.cmo :
 bs_node_process.cmj :
+bs_dict.cmo :
+bs_dict.cmj :
+bs_node_module.cmo : bs_node.cmi bs_dict.cmo
+bs_node_module.cmj : bs_node.cmi bs_dict.cmj

jscomp/js_cmj_datasets.ml

@@ -2,20 +2,23 @@ include ../Makefile.shared
 
 COMPILER=../bin/bsc
 
-SOURCE_LIST= bs_node bs_node_path bs_node_fs bs_node_process
+MAP_FILES= bs_node bs 
 
+SOURCE_LIST=  bs_node_path bs_node_fs bs_node_process bs_dict bs_node_module
+
+$(addsuffix .cmj, $(MAP_FILES)): bs_node.cmj bs.cmj
 
 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
 else
 BS_FLAGS=  $(BS_COMMON_FLAGS) -bs-package-output lib/js 
 endif
 
-COMPFLAGS += $(BS_FLAGS)  -I ../runtime -I ../stdlib -w -40
+COMPFLAGS += $(BS_FLAGS)  -I ../runtime -I ../stdlib -w -40 -w -49
 
 
 
@@ -35,9 +38,12 @@ clean::
 .ml.cmj:
 	$(COMPILER) $(INCLUDES) $(COMPFLAGS)  -c $<
 
+
 -include .depend
 
+ML_SOURCES=$(addsuffix .ml, $(SOURCE_LIST))
+MLI_SOURCES=$(addsuffix .mli, $(SOURCE_LIST))
 depend:
-	$(CAMLDEP) $(INCLUDES) *.mli *.ml | sed -e 's/\.cmo/.cmj/g' > .depend
-	$(CAMLDEP) $(INCLUDES) *.ml | sed -e 's/\.cmx/.cmj/g' >>.depend
+	$(CAMLDEP) $(INCLUDES) $(ML_SOURCES) $(MLI_SOURCES) | sed -e 's/\.cmo/.cmj/g' > .depend
+	$(CAMLDEP) $(INCLUDES) $(ML_SOURCES) | sed -e 's/\.cmx/.cmj/g' >>.depend
 

jscomp/others/.depend

@@ -0,0 +1,30 @@
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+
+
+module Dict = Bs_dict
+
+module Node = Bs_node  

jscomp/others/Makefile

@@ -0,0 +1,40 @@
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+
+type 'a t
+type key = string
+
+external get : 'a t -> key -> 'a = ""
+    [@@bs.get_index]
+
+external set : 'a t -> key -> 'a -> unit = ""
+    [@@bs.set_index]  
+
+external keys : 'a t -> string array = "Object.keys"
+    [@@bs.val]
+
+external empty : unit -> 'a t = "" [@@bs.obj]
+
+

jscomp/others/bs.ml

@@ -29,7 +29,8 @@ module Path = Bs_node_path
 module Fs = Bs_node_fs
 
 module Process = Bs_node_process
-  
+
+module Module =  Bs_node_module
 type node_exports 
 type node_module = <
        id : string ;