Merge pull request #1128 from bloomberg/fix_bsb

polish the schema and fix some typos

Author: bobzhang

bin/bsb

@@ -14,7 +14,8 @@ if (fs.existsSync(bsconfig)) {
     try {
         child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit' })
     } catch (e) {
-        console.error('Error happend when running command', bsb_exe, 'with args', delegate_args)
+        console.error('Error happened when running command', bsb_exe, 'with args', delegate_args)
+        process.exit(2)
     }
 } else {
     var path = require('path')
@@ -32,7 +33,8 @@ if (fs.existsSync(bsconfig)) {
         try {
             child_process.execFileSync(bsb_exe, delegate_args, { stdio: 'inherit', cwd: search_dir })
         } catch (e) {
-            console.error('Error happend when running command', bsb_exe, 'with args', delegate_args)
+            console.error('Error happened when running command', bsb_exe, 'with args', delegate_args)
+            process.exit(2)
         }
     }
 }

bsconfig.json

@@ -45,16 +45,9 @@
                     "a4_a5.ml",
                     "x.ml"
                 ]
-            },
-            {
-                "dir": "glob",
-                "files": {
-                    "slow-re": "glob.*\\.mli?",
-                    "excludes": [
-                        "glob_test_u.ml"
-                    ]
-                }
             }
+            , "glob"
+    
         ],
         "files": [
             // "ppx_lwt.ml",

docs/docson/build-schema.json

@@ -35,15 +35,22 @@
                 "$ref": "#/definitions/single-ppx-spec"
             }
         },
+        "bs-dependency" : {
+            "type" : "string",
+            "title": "dependency"
+         },
         "bs-dependencies": {
             "type": "array",
             "items": {
-                "type": "string"
+                "$ref": "#/definitions/bs-dependency"
             },
             "description": "Bucklescript package dependencies"
         },
         "sourceItem": {
             "title": "sourceItem",
+            "oneOf" : [ 
+                {
+                "type" : "object",
             "properties": {
                 "dir": {
                     "type": "string"
@@ -93,15 +100,18 @@
                         {
                             "enum": [
                                 "all"
-                            ]
+                            ],
+                            "description": "All modules in this directory"
                         },
                         {
                             "type": "array",
                             "items": {
                                 "type": "string"
-                            }
+                            },
+                            "description": "Selected modules, for example, [Module_a, Module_b] "
                         }
-                    ]
+                    ],
+                    "description": "default: export all modules by default, it is recommended for library developers to hide some interfaces"
                 },
                 "resources": {
                     "type": "array",
@@ -110,10 +120,8 @@
                     }
                 },
                 "subdirs": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/sourceItem"
-                    }
+                   "$ref" : "#/definitions/sources",
+                   "description": "nested specifications inside"
                 },
                 "group": {
                     "oneOf": [
@@ -132,7 +140,8 @@
                                 }
                             }
                         }
-                    ]
+                    ],
+                    "description": "Not implemented yet"
                 },
                 "internal-depends": {
                     "type": "array",
@@ -145,6 +154,29 @@
             "required": [
                 "dir"
             ]
+            },
+            {
+                "title": "single non nested directory",
+                "type" : "string",
+                "description": "directory name (no nested)"
+            }
+            ]
+        },
+        "sources" : {
+             "oneOf": [
+                {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/sourceItem"
+                    },
+                    "description" : "A list of source items"
+                },
+                {
+                    "$ref": "#/definitions/sourceItem",
+                    "description": "A single source item"
+                }
+            ],
+            "description": "can be either a single sourceItem or an array of sourceItems, sourceItem can be either a single string(non nested directory) or an detailed object config"
         },
         "stringArray": {
             "type": "array",
@@ -208,24 +240,13 @@
             "description": "external include directories, which will be applied -I to all compilation units, it is *not needed* in most cases"
         },
         "sources": {
-            "oneOf": [
-                {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/sourceItem"
-                    },
-                    "description" : "A list of source items"
-                },
-                {
-                    "$ref": "#/definitions/sourceItem",
-                    "description": "A single source item"
-                }
-            ]
+          "$ref" : "#/definitions/sources",
+          "description": "specication of where source code is "
         },
 
         "generate-merlin": {
             "type": "boolean",
-            "description": "default false (generate .merlin)"
+            "description": "default true (generate .merlin)"
         }
     },
     "additionalProperties": false,

jscomp/all.depend

@@ -673,8 +673,8 @@ bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
     bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
     bsb/bsb_ninja.cmi
 bsb/bsb_unix.cmx : bsb/bsb_unix.cmi
-bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/string_map.cmi \
-    ext/ext_json.cmi ext/ext_file_pp.cmi common/binary_cache.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

jscomp/bin/all_ounit_tests.ml

@@ -7540,6 +7540,7 @@ type callback =
   | `Arr_loc of (t array -> Lexing.position -> Lexing.position -> unit)
   | `Null of (unit -> unit)
   | `Not_found of (unit -> unit)
+  | `Id of (t -> unit )
   ]
 
 val test:
@@ -8243,6 +8244,7 @@ type callback =
   | `Arr_loc of (t array -> Lexing.position -> Lexing.position -> unit)
   | `Null of (unit -> unit)
   | `Not_found of (unit -> unit)
+  | `Id of (t -> unit )
   ]
 
 let test   ?(fail=(fun () -> ())) key 
@@ -8252,7 +8254,7 @@ let test   ?(fail=(fun () -> ())) key
        | exception Not_found  ->
         begin match cb with `Not_found f ->  f ()
         | _ -> fail ()
-        end
+        end      
        | `True, `Bool cb -> cb true
        | `False, `Bool cb  -> cb false 
        | `Flo s , `Flo cb  -> cb s 
@@ -8263,6 +8265,7 @@ let test   ?(fail=(fun () -> ())) key
        | `Null, `Null cb  -> cb ()
        | `Str {str = s }, `Str cb  -> cb s 
        | `Str {str = s ; loc }, `Str_loc cb -> cb s loc 
+       |  any  , `Id  cb -> cb any
        | _, _ -> fail () 
      end;
      m
@@ -8281,7 +8284,7 @@ let query path (json : t ) =
       end
   in aux [] path json
 
-# 733 "ext/ext_json.ml"
+# 735 "ext/ext_json.ml"
 
 end
 module Ounit_json_tests