rescript-lang · bobzhang · Feb 12, 2018 · Feb 12, 2018 · Feb 12, 2018 · Feb 12, 2018
diff --git a/.npmignore b/.npmignore
@@ -1,15 +1,16 @@
-/*.o
-/*.a
-/*.so
-/*.obj
-/*.lib
-/*.dll
-/*.cm[ioxatj]
-/*.cmx[as]
-/*.cmti
-/*.annot
-
-docs/
+*.o
+*.a
+*.so
+*.obj
+*.lib
+*.dll
+*.cm[ioxatj]
+*.cmx[as]
+*.cmti
+*.annot
+docs/*
+docs/docson/*
+!docs/docson/build-schema.json
 site/
 .vscode/
 .github/

diff --git a/jscomp/bsb/bsb_templates.ml b/jscomp/bsb/bsb_templates.ml
@@ -128,47 +128,9 @@ let root = OCamlRes.Res.([
        *.mlast\n\
        *.mliast\n\
        .vscode\n\
-       .merlin")]) ;
+       .merlin\n\
+       .bsb.lock")]) ;
   Dir ("basic-reason", [
-    File ("tasks.json",
-      "{\n\
-      \    \"version\": \"${bsb:proj-version}\",\n\
-      \    \"command\": \"npm\",\n\
-      \    \"options\": {\n\
-      \        \"cwd\": \"${workspaceRoot}\"\n\
-      \    },\n\
-      \    \"isShellCommand\": true,\n\
-      \    \"args\": [\n\
-      \        \"run\",\n\
-      \        \"watch\"\n\
-      \    ],\n\
-      \    \"showOutput\": \"always\",\n\
-      \    \"isBackground\": true,\n\
-      \    \"problemMatcher\": {\n\
-      \        \"fileLocation\": \"absolute\",\n\
-      \        \"owner\": \"ocaml\",\n\
-      \        \"watching\": {\n\
-      \            \"activeOnStart\": false,\n\
-      \            \"beginsPattern\": \">>>> Start compiling\",\n\
-      \            \"endsPattern\": \">>>> Finish compiling\"\n\
-      \        },\n\
-      \        \"pattern\": [\n\
-      \            {\n\
-      \                \"regexp\": \"^File \\\"(.*)\\\", line (\\\\d+)(?:, characters (\\\\d+)-(\\\\d+))?:$\",\n\
-      \                \"file\": 1,\n\
-      \                \"line\": 2,\n\
-      \                \"column\": 3,\n\
-      \                \"endColumn\": 4\n\
-      \            },\n\
-      \            {\n\
-      \                \"regexp\": \"^(?:(?:Parse\\\\s+)?(Warning|[Ee]rror)(?:\\\\s+\\\\d+)?:)?\\\\s+(.*)$\",\n\
-      \                \"severity\": 1,\n\
-      \                \"message\": 2,\n\
-      \                \"loop\": true\n\
-      \            }\n\
-      \        ]\n\
-      \    }\n\
-       }") ;
     Dir ("src", [
       File ("Demo.re",
         "Js.log(\"Hello, BuckleScript and Reason!\");\n\
@@ -237,6 +199,51 @@ let root = OCamlRes.Res.([
       \  \"refmt\": 3\n\
        }\n\
        ") ;
+    Dir (".vscode", [
+      File ("tasks.json",
+        "{\n\
+        \    \"version\": \"${bsb:proj-version}\",\n\
+        \    \"command\": \"npm\",\n\
+        \    \"options\": {\n\
+        \      \"cwd\": \"${workspaceRoot}\"\n\
+        \    },\n\
+        \    \"type\": \"shell\",\n\
+        \    \"args\": [\"run\", \"start\"],\n\
+        \    \"presentation\": {\n\
+        \      \"echo\": true,\n\
+        \      \"reveal\": \"always\",\n\
+        \      \"focus\": false,\n\
+        \      \"panel\": \"shared\"\n\
+        \    },\n\
+        \    \"isBackground\": true,\n\
+        \    \"problemMatcher\": {\n\
+        \      \"fileLocation\": \"absolute\",\n\
+        \      \"owner\": \"ocaml\",\n\
+        \      \"background\": {\n\
+        \        \"activeOnStart\": false,\n\
+        \        \"beginsPattern\": \">>>> Start compiling\",\n\
+        \        \"endsPattern\": \">>>> Finish compiling\"\n\
+        \      },\n\
+        \      \"pattern\": [\n\
+        \        {\n\
+        \          \"regexp\":\n\
+        \            \"^File \\\"(.*)\\\", line (\\\\d+)(?:, characters (\\\\d+)-(\\\\d+))?:$\",\n\
+        \          \"file\": 1,\n\
+        \          \"line\": 2,\n\
+        \          \"column\": 3,\n\
+        \          \"endColumn\": 4\n\
+        \        },\n\
+        \        {\n\
+        \          \"regexp\":\n\
+        \            \"^(?:(?:Parse\\\\s+)?(Warning|[Ee]rror)(?:\\\\s+\\\\d+)?:)?\\\\s+(.*)$\",\n\
+        \          \"severity\": 1,\n\
+        \          \"message\": 2,\n\
+        \          \"loop\": true\n\
+        \        }\n\
+        \      ]\n\
+        \    }\n\
+        \  }\n\
+         ")]) ;
     File (".gitignore",
       ".DS_Store\n\
        .merlin\n\
@@ -341,7 +348,8 @@ let root = OCamlRes.Res.([
        *.mlast\n\
        *.mliast\n\
        .vscode\n\
-       .merlin")]) ;
+       .merlin\n\
+       .bsb.lock")]) ;
   Dir ("minimal", [
     Dir ("src", [ File ("main.ml", "")]) ;
     File ("README.md",
@@ -463,7 +471,8 @@ let root = OCamlRes.Res.([
        *.mlast\n\
        *.mliast\n\
        .vscode\n\
-       .merlin")]) ;
+       .merlin\n\
+       .bsb.lock")]) ;
   Dir ("react", [
     File ("webpack.config.js",
       "const path = require('path');\n\

diff --git a/jscomp/bsb/templates/basic/.gitignore b/jscomp/bsb/templates/basic/.gitignore
@@ -22,4 +22,5 @@ lib/bs
 *.mlast
 *.mliast
 .vscode
-.merlin
+.merlin
+.bsb.lock
diff --git a/jscomp/bsb/templates/generator/.gitignore b/jscomp/bsb/templates/generator/.gitignore
@@ -22,4 +22,5 @@ lib/bs
 *.mlast
 *.mliast
 .vscode
-.merlin
+.merlin
+.bsb.lock
diff --git a/jscomp/bsb/templates/node/.gitignore b/jscomp/bsb/templates/node/.gitignore
@@ -22,4 +22,5 @@ lib/bs
 *.mlast
 *.mliast
 .vscode
-.merlin
+.merlin
+.bsb.lock
diff --git a/jscomp/outcome_printer/outcome_printer_ns.ml b/jscomp/outcome_printer/outcome_printer_ns.ml
@@ -75,31 +75,43 @@ let out_ident ppf s =
       -> "Js.List"
     | "Js_vector"
       -> "Js.Vector"
-    | "Bs_Cmp" -> "Bs.Cmp"
-    | "Bs_Hash" -> "Bs.Hash"
-    | "Bs_Array" -> "Bs.Array"
-    | "Bs_Queue" -> "Bs.Queue"
-    | "Bs_HashMap" -> "Bs.HashMap"
-    | "Bs_HashSet" -> "Bs.HashSet"
-    | "Bs_HashSetInt" -> "Bs.HashSetInt"
-    | "Bs_HashSetString" -> "Bs.HashSetString"
-    | "Bs_HashMapString" -> "Bs.HashMapString"
-    | "Bs_HashMapInt" -> "Bs.HashMapInt"
-    | "Bs_Sort" -> "Bs.Sort"
-    | "Bs_SortInt" -> "Bs.SortInt"
-    | "Bs_SortString" -> "Bs.SortString"
-    | "Bs_Stack" -> "Bs.Stack"
-    | "Bs_Range" -> "Bs.Range"
-    | "Bs_Map" -> "Bs.Map"
-    | "Bs_MapM" -> "Bs.MapM"
-    | "Bs_Set" -> "Bs.Set"
-    | "Bs_SetM" -> "Bs.SetM"
-    | "Bs_MapInt" -> "Bs.MapInt"
-    | "Bs_MapString" -> "Bs.MapString"
-    | "Bs_SetInt" -> "Bs.SetInt"
-    | "Bs_SetIntM" -> "Bs.SetIntM"
-    | "Bs_SetString" -> "Bs.SetString"
-    | "Bs_List" -> "Bs.List"        
+(* Belt_libs  *)        
+    | "Belt_Id" -> "Belt.Id"
+    | "Belt_Array" -> "Belt.Array"
+
+    | "Belt_SortArray" -> "Belt.SortArray"
+    | "Belt_SortArrayInt" -> "Belt.SortArray.Int"
+    | "Belt_SortArrayString" -> "Belt.SortArray.String"
+
+    | "Belt_MutableQueue" -> "Belt.MutableQueue"
+    | "Belt_MutableStack" -> "Belt.MutableStack"      
+    | "Belt_List" -> "Belt.List"        
+    | "Belt_Range" -> "Belt.Range"
+
+    | "Belt_Set" -> "Belt.Set"
+    | "Belt_SetInt" -> "Belt.Set.Int"
+    | "Belt_SetString" -> "Belt.Set.String"
+
+    | "Belt_Map" -> "Belt.Map"
+    | "Belt_MapInt" -> "Belt.Map.Int"
+    | "Belt_MapString" -> "Belt.Map.String"
+
+    | "Belt_MutableSet" -> "Belt.MutableSet"
+    | "Belt_MutableSetInt" -> "Belt.MutableSet.Int"
+    | "Belt_MutableSetString" -> "Belt.MutableSet.String"
+
+    | "Belt_MutableMap" -> "Belt.MutableMap"
+    | "Belt_MutableMapInt" -> "Belt.MutableMap.Int"
+    | "Belt_MutableMapString" -> "Belt.MutableMap.String"
+
+    | "Belt_HashSet" -> "Belt.HashSet"
+    | "Belt_HashSetInt" -> "Belt.HashSet.Int"
+    | "Belt_HashSetString" -> "Belt.HashSet.String"
+
+    | "Belt_HashMap" -> "Belt.HashMap"
+    | "Belt_HashMapString" -> "Belt.HashMap.String"
+    | "Belt_HashMapInt" -> "Belt.HashMap.Int"
+
     | s -> 
       (match Ext_namespace.try_split_module_name s with 
        | None -> s 

diff --git a/lib/bsb.ml b/lib/bsb.ml
@@ -13061,47 +13061,9 @@ let root = OCamlRes.Res.([
        *.mlast\n\
        *.mliast\n\
        .vscode\n\
-       .merlin")]) ;
+       .merlin\n\
+       .bsb.lock")]) ;
   Dir ("basic-reason", [
-    File ("tasks.json",
-      "{\n\
-      \    \"version\": \"${bsb:proj-version}\",\n\
-      \    \"command\": \"npm\",\n\
-      \    \"options\": {\n\
-      \        \"cwd\": \"${workspaceRoot}\"\n\
-      \    },\n\
-      \    \"isShellCommand\": true,\n\
-      \    \"args\": [\n\
-      \        \"run\",\n\
-      \        \"watch\"\n\
-      \    ],\n\
-      \    \"showOutput\": \"always\",\n\
-      \    \"isBackground\": true,\n\
-      \    \"problemMatcher\": {\n\
-      \        \"fileLocation\": \"absolute\",\n\
-      \        \"owner\": \"ocaml\",\n\
-      \        \"watching\": {\n\
-      \            \"activeOnStart\": false,\n\
-      \            \"beginsPattern\": \">>>> Start compiling\",\n\
-      \            \"endsPattern\": \">>>> Finish compiling\"\n\
-      \        },\n\
-      \        \"pattern\": [\n\
-      \            {\n\
-      \                \"regexp\": \"^File \\\"(.*)\\\", line (\\\\d+)(?:, characters (\\\\d+)-(\\\\d+))?:$\",\n\
-      \                \"file\": 1,\n\
-      \                \"line\": 2,\n\
-      \                \"column\": 3,\n\
-      \                \"endColumn\": 4\n\
-      \            },\n\
-      \            {\n\
-      \                \"regexp\": \"^(?:(?:Parse\\\\s+)?(Warning|[Ee]rror)(?:\\\\s+\\\\d+)?:)?\\\\s+(.*)$\",\n\
-      \                \"severity\": 1,\n\
-      \                \"message\": 2,\n\
-      \                \"loop\": true\n\
-      \            }\n\
-      \        ]\n\
-      \    }\n\
-       }") ;
     Dir ("src", [
       File ("Demo.re",
         "Js.log(\"Hello, BuckleScript and Reason!\");\n\
@@ -13170,6 +13132,51 @@ let root = OCamlRes.Res.([
       \  \"refmt\": 3\n\
        }\n\
        ") ;
+    Dir (".vscode", [
+      File ("tasks.json",
+        "{\n\
+        \    \"version\": \"${bsb:proj-version}\",\n\
+        \    \"command\": \"npm\",\n\
+        \    \"options\": {\n\
+        \      \"cwd\": \"${workspaceRoot}\"\n\
+        \    },\n\
+        \    \"type\": \"shell\",\n\
+        \    \"args\": [\"run\", \"start\"],\n\
+        \    \"presentation\": {\n\
+        \      \"echo\": true,\n\
+        \      \"reveal\": \"always\",\n\
+        \      \"focus\": false,\n\
+        \      \"panel\": \"shared\"\n\
+        \    },\n\
+        \    \"isBackground\": true,\n\
+        \    \"problemMatcher\": {\n\
+        \      \"fileLocation\": \"absolute\",\n\
+        \      \"owner\": \"ocaml\",\n\
+        \      \"background\": {\n\
+        \        \"activeOnStart\": false,\n\
+        \        \"beginsPattern\": \">>>> Start compiling\",\n\
+        \        \"endsPattern\": \">>>> Finish compiling\"\n\
+        \      },\n\
+        \      \"pattern\": [\n\
+        \        {\n\
+        \          \"regexp\":\n\
+        \            \"^File \\\"(.*)\\\", line (\\\\d+)(?:, characters (\\\\d+)-(\\\\d+))?:$\",\n\
+        \          \"file\": 1,\n\
+        \          \"line\": 2,\n\
+        \          \"column\": 3,\n\
+        \          \"endColumn\": 4\n\
+        \        },\n\
+        \        {\n\
+        \          \"regexp\":\n\
+        \            \"^(?:(?:Parse\\\\s+)?(Warning|[Ee]rror)(?:\\\\s+\\\\d+)?:)?\\\\s+(.*)$\",\n\
+        \          \"severity\": 1,\n\
+        \          \"message\": 2,\n\
+        \          \"loop\": true\n\
+        \        }\n\
+        \      ]\n\
+        \    }\n\
+        \  }\n\
+         ")]) ;
     File (".gitignore",
       ".DS_Store\n\
        .merlin\n\
@@ -13274,7 +13281,8 @@ let root = OCamlRes.Res.([
        *.mlast\n\
        *.mliast\n\
        .vscode\n\
-       .merlin")]) ;
+       .merlin\n\
+       .bsb.lock")]) ;
   Dir ("minimal", [
     Dir ("src", [ File ("main.ml", "")]) ;
     File ("README.md",
@@ -13396,7 +13404,8 @@ let root = OCamlRes.Res.([
        *.mlast\n\
        *.mliast\n\
        .vscode\n\
-       .merlin")]) ;
+       .merlin\n\
+       .bsb.lock")]) ;
   Dir ("react", [
     File ("webpack.config.js",
       "const path = require('path');\n\
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,5 @@ lib/bs @@
     *.mlast
     *.mliast
     .vscode
-    .merlin
+    .merlin
+    .bsb.lock