Compile stdlib rewatch - pt 2

Makefile

@@ -53,6 +53,9 @@ lib: build node_modules/.bin/semver
 	node scripts/ninja.js build
 	./scripts/prebuilt.js
 
+lib-rewatch: build rewatch node_modules/.bin/semver
+	./scripts/build-lib.sh && ./scripts/prebuilt.js
+
 artifacts: lib
 	./scripts/makeArtifactList.js
 

jscomp/others/Js_log.res

@@ -0,0 +1,16 @@
+/** Equivalent to console.log any value */
+@val @scope("console")
+external log: 'a => unit = "log"
+
+@val @scope("console")
+external log2: 'a => 'b => unit = "log"
+
+@val @scope("console")
+external log3: 'a => 'b => 'c => unit = "log"
+
+@val @scope("console")
+external log4: 'a => 'b => 'c => 'd => unit = "log"
+
+/** A convenience function to console.log more than 4 arguments */
+@val @scope("console") @variadic
+external logMany: array<'a> => unit = "log"

jscomp/others/Js_nullable.res

@@ -0,0 +1,5 @@
+@unboxed
+type t<+'a> =
+  | Value('a)
+  | @as(null) Null
+  | @as(undefined) Undefined

jscomp/others/Js_typeof.res

@@ -0,0 +1,5 @@
+/**
+`typeof x` will be compiled as `typeof x` in JS. Please consider functions in
+`Js.Types` for a type safe way of reflection.
+*/
+external typeof: 'a => string = "#typeof"

jscomp/others/belt_Array.res

@@ -22,7 +22,7 @@ external getUnsafe: (t<'a>, int) => 'a = "%array_unsafe_get"
 
 external setUnsafe: (t<'a>, int, 'a) => unit = "%array_unsafe_set"
 
-external getUndefined: (t<'a>, int) => Js.undefined<'a> = "%array_unsafe_get"
+external getUndefined: (t<'a>, int) => Js_undefined.t<'a> = "%array_unsafe_get"
 
 /* external get: 'a t -> int -> 'a = "%array_safe_get" */
 let get = (arr, i) =>
@@ -52,7 +52,7 @@ let setExn = (arr, i, v) => {
 
 @set external truncateToLengthUnsafe: (t<'a>, int) => unit = "length"
 
-@new external makeUninitialized: int => array<Js.undefined<'a>> = "Array"
+@new external makeUninitialized: int => array<Js_undefined.t<'a>> = "Array"
 
 @new external makeUninitializedUnsafe: int => array<'a> = "Array"
 

jscomp/others/belt_MutableQueue.res

@@ -66,8 +66,8 @@ let peek = q =>
 
 let peekUndefined = q =>
   switch q.first {
-  | None => Js.undefined
-  | Some(v) => Js.Undefined.return(v.content)
+  | None => Js_undefined.empty
+  | Some(v) => Js_undefined.return(v.content)
   }
 
 let peekExn = q =>
@@ -111,17 +111,17 @@ let popExn = q =>
 
 let popUndefined = q =>
   switch q.first {
-  | None => Js.undefined
+  | None => Js_undefined.empty
   | Some(x) =>
     let next = x.next
     if next == None {
       /* only one element */
       clear(q)
-      Js.Undefined.return(x.content)
+      Js_undefined.return(x.content)
     } else {
       q.length = q.length - 1
       q.first = next
-      Js.Undefined.return(x.content)
+      Js_undefined.return(x.content)
     }
   }
 

jscomp/others/belt_MutableStack.res

@@ -39,8 +39,8 @@ let push = (s, x) => s.root = Some({head: x, tail: s.root})
 
 let topUndefined = (s: t<'a>) =>
   switch s.root {
-  | None => Js.undefined
-  | Some(x) => Js.Undefined.return(x.head)
+  | None => Js_undefined.empty
+  | Some(x) => Js_undefined.return(x.head)
   }
 
 let top = s =>
@@ -53,10 +53,10 @@ let isEmpty = s => s.root == None
 
 let popUndefined = s =>
   switch s.root {
-  | None => Js.undefined
+  | None => Js_undefined.empty
   | Some(x) =>
     s.root = x.tail
-    Js.Undefined.return(x.head)
+    Js_undefined.return(x.head)
   }
 
 let pop = s =>

jscomp/others/belt_internalAVLset.res

@@ -136,8 +136,8 @@ let minimum = n =>
 
 let minUndefined = n =>
   switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(min0Aux(n))
+  | None => Js_undefined.empty
+  | Some(n) => Js_undefined.return(min0Aux(n))
   }
 
 let rec max0Aux = n =>
@@ -154,8 +154,8 @@ let maximum = n =>
 
 let maxUndefined = n =>
   switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(max0Aux(n))
+  | None => Js_undefined.empty
+  | Some(n) => Js_undefined.return(max0Aux(n))
   }
 
 let rec removeMinAuxWithRef = (n, v) =>
@@ -583,12 +583,12 @@ let rec get = (n: t<_>, x, ~cmp) =>
 
 let rec getUndefined = (n: t<_>, x, ~cmp) =>
   switch n {
-  | None => Js.Undefined.empty
+  | None => Js_undefined.empty
   | Some(t) /* Node(l, v, r, _) */ =>
     let v = t.value
     let c = Belt_Id.getCmpInternal(cmp)(. x, v)
     if c == 0 {
-      Js.Undefined.return(v)
+      Js_undefined.return(v)
     } else {
       getUndefined(
         ~cmp,

jscomp/others/belt_internalAVLtree.res

@@ -143,8 +143,8 @@ let minKey = n =>
 
 let minKeyUndefined = n =>
   switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(minKey0Aux(n))
+  | None => Js_undefined.empty
+  | Some(n) => Js_undefined.return(minKey0Aux(n))
   }
 
 let rec maxKey0Aux = n =>
@@ -161,8 +161,8 @@ let maxKey = n =>
 
 let maxKeyUndefined = n =>
   switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(maxKey0Aux(n))
+  | None => Js_undefined.empty
+  | Some(n) => Js_undefined.return(maxKey0Aux(n))
   }
 
 let rec minKV0Aux = n =>
@@ -179,8 +179,8 @@ let minimum = n =>
 
 let minUndefined = n =>
   switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(minKV0Aux(n))
+  | None => Js_undefined.empty
+  | Some(n) => Js_undefined.return(minKV0Aux(n))
   }
 
 let rec maxKV0Aux = n =>
@@ -197,8 +197,8 @@ let maximum = n =>
 
 let maxUndefined = n =>
   switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(maxKV0Aux(n))
+  | None => Js_undefined.empty
+  | Some(n) => Js_undefined.return(maxKV0Aux(n))
   }
 
 /* TODO: use kv ref */
@@ -714,12 +714,12 @@ let rec get = (n, x, ~cmp) =>
 
 let rec getUndefined = (n, x, ~cmp) =>
   switch n {
-  | None => Js.undefined
+  | None => Js_undefined.empty
   | Some(n) =>
     let v = n.key
     let c = Belt_Id.getCmpInternal(cmp)(. x, v)
     if c == 0 {
-      Js.Undefined.return(n.value)
+      Js_undefined.return(n.value)
     } else {
       getUndefined(
         ~cmp,

jscomp/others/belt_internalBuckets.res

@@ -128,7 +128,7 @@ let getBucketHistogram = h => {
 
 let logStats = h => {
   let histogram = getBucketHistogram(h)
-  Js.log({
+  Js_log.log({
     "bindings": h.C.size,
     "buckets": A.length(h.C.buckets),
     "histogram": histogram,

jscomp/others/belt_internalBucketsType.res

@@ -21,7 +21,7 @@
  * 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 opt<'a> = Js.undefined<'a>
+type opt<'a> = Js_undefined.t<'a>
 
 type container<'hash, 'eq, 'c> = {
   mutable size: int /* number of entries */,
@@ -34,7 +34,7 @@ module A = Belt_Array
 external toOpt: opt<'a> => option<'a> = "#undefined_to_opt"
 external return: 'a => opt<'a> = "%identity"
 
-let emptyOpt = Js.undefined
+let emptyOpt = Js_undefined.empty
 let rec power_2_above = (x, n) =>
   if x >= n {
     x