Stdlib namespace for Core modules

Author: cknitt

compiler/core/res_compmisc.ml

@@ -54,7 +54,10 @@ let initial_env ?modulename () =
   let initial = Env.initial_safe_string in
   let env =
     if !Clflags.nopervasives then initial
-    else open_implicit_module "Pervasives" initial
+    else
+      initial
+      |> open_implicit_module "Pervasives"
+      |> open_implicit_module "Stdlib"
   in
   List.fold_left
     (fun env m -> open_implicit_module m env)

compiler/gentype/TranslateTypeExprFromTypes.ml

@@ -86,7 +86,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
     {dependencies = []; type_ = string_t}
   | (["Js"; "Types"; "bigint_val"] | ["BigInt"; "t"]), [] ->
     {dependencies = []; type_ = bigint_t}
-  | (["Js"; "Date"; "t"] | ["Date"; "t"]), [] ->
+  | (["Js"; "Date"; "t"] | ["Date"; "t"] | ["Stdlib_Date"; "t"]), [] ->
     {dependencies = []; type_ = date_t}
   | ["Map"; "t"], [param_translation1; param_translation2] ->
     {
@@ -110,7 +110,7 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
       dependencies = param_translation.dependencies;
       type_ = weakset_t param_translation.type_;
     }
-  | (["Js"; "Re"; "t"] | ["RegExp"; "t"]), [] ->
+  | (["Js"; "Re"; "t"] | ["Stdlib_RegExp"; "t"]), [] ->
     {dependencies = []; type_ = regexp_t}
   | (["FB"; "unit"] | ["unit"]), [] -> {dependencies = []; type_ = unit_t}
   | ( (["FB"; "array"] | ["array"] | ["Js"; ("Array" | "Array2"); "t"]),

compiler/ml/ast_untagged_variants.ml

@@ -179,8 +179,8 @@ let type_to_instanceof_backed_obj (t : Types.type_expr) =
   | Tconstr (path, _, _) when Path.same path Predef.path_array -> Some Array
   | Tconstr (path, _, _) -> (
     match Path.name path with
-    | "Js_date.t" -> Some Date
-    | "Js_re.t" -> Some RegExp
+    | "Stdlib_Date.t" -> Some Date
+    | "Stdlib_RegExp.t" -> Some RegExp
     | "Js_file.t" -> Some File
     | "Js_blob.t" -> Some Blob
     | _ -> None)

lib/es6/Int.js

@@ -1,6 +1,6 @@
 
 
-import * as $$Array from "./Array.js";
+import * as Stdlib_Array from "./Stdlib_Array.js";
 
 function fromString(x, radix) {
   let maybeInt = radix !== undefined ? parseInt(x, radix) : parseInt(x);
@@ -46,7 +46,7 @@ function range(start, end, optionsOpt) {
     let range$2 = options.inclusive === true ? range$1 + 1 | 0 : range$1;
     length = Math.ceil(range$2 / abs(step)) | 0;
   }
-  return $$Array.fromInitializer(length, i => start + Math.imul(i, step) | 0);
+  return Stdlib_Array.fromInitializer(length, i => start + Math.imul(i, step) | 0);
 }
 
 function rangeWithOptions(start, end, options) {

lib/es6/List.js

@@ -1,6 +1,6 @@
 
 
-import * as $$Array from "./Array.js";
+import * as Stdlib_Array from "./Stdlib_Array.js";
 import * as Primitive_int from "./Primitive_int.js";
 import * as Primitive_option from "./Primitive_option.js";
 
@@ -648,7 +648,7 @@ function toArray(x) {
 
 function toShuffled(xs) {
   let v = toArray(xs);
-  $$Array.shuffle(v);
+  Stdlib_Array.shuffle(v);
   return fromArray(v);
 }
 

lib/es6/Stdlib.js

@@ -0,0 +1,33 @@
+
+
+
+let $$Array;
+
+let $$Date;
+
+let Dict;
+
+let $$Promise;
+
+let $$RegExp;
+
+let Result;
+
+let $$Set;
+
+let $$String;
+
+let $$Symbol;
+
+export {
+  $$Array,
+  $$Date,
+  Dict,
+  $$Promise,
+  $$RegExp,
+  Result,
+  $$Set,
+  $$String,
+  $$Symbol,
+}
+/* No side effect */

lib/es6/Array.js renamed to lib/es6/Stdlib_Array.js

@@ -1,6 +1,6 @@
 'use strict';
 
-let $$Array = require("./Array.js");
+let Stdlib_Array = require("./Stdlib_Array.js");
 
 function fromString(x, radix) {
   let maybeInt = radix !== undefined ? parseInt(x, radix) : parseInt(x);
@@ -46,7 +46,7 @@ function range(start, end, optionsOpt) {
     let range$2 = options.inclusive === true ? range$1 + 1 | 0 : range$1;
     length = Math.ceil(range$2 / abs(step)) | 0;
   }
-  return $$Array.fromInitializer(length, i => start + Math.imul(i, step) | 0);
+  return Stdlib_Array.fromInitializer(length, i => start + Math.imul(i, step) | 0);
 }
 
 function rangeWithOptions(start, end, options) {

lib/es6/Date.js renamed to lib/es6/Stdlib_Date.js

@@ -1,6 +1,6 @@
 'use strict';
 
-let $$Array = require("./Array.js");
+let Stdlib_Array = require("./Stdlib_Array.js");
 let Primitive_int = require("./Primitive_int.js");
 let Primitive_option = require("./Primitive_option.js");
 
@@ -648,7 +648,7 @@ function toArray(x) {
 
 function toShuffled(xs) {
   let v = toArray(xs);
-  $$Array.shuffle(v);
+  Stdlib_Array.shuffle(v);
   return fromArray(v);
 }
 

lib/es6/Dict.js renamed to lib/es6/Stdlib_Dict.js

@@ -0,0 +1,31 @@
+'use strict';
+
+
+let $$Array;
+
+let $$Date;
+
+let Dict;
+
+let $$Promise;
+
+let $$RegExp;
+
+let Result;
+
+let $$Set;
+
+let $$String;
+
+let $$Symbol;
+
+exports.$$Array = $$Array;
+exports.$$Date = $$Date;
+exports.Dict = Dict;
+exports.$$Promise = $$Promise;
+exports.$$RegExp = $$RegExp;
+exports.Result = Result;
+exports.$$Set = $$Set;
+exports.$$String = $$String;
+exports.$$Symbol = $$Symbol;
+/* No side effect */

lib/es6/Promise.js renamed to lib/es6/Stdlib_Promise.js

@@ -75,7 +75,7 @@ let range = (start, end, ~options: rangeOptions={}) => {
     ceil(Float.fromInt(range) /. Float.fromInt(abs(step)))->Float.toInt
   }
 
-  Array.fromInitializer(~length, i => start + i * step)
+  Stdlib_Array.fromInitializer(~length, i => start + i * step)
 }
 
 @deprecated("Use `range` instead") @send

lib/es6/RegExp.js renamed to lib/es6/Stdlib_RegExp.js

@@ -113,13 +113,17 @@ external supportedLocalesOf: (array<string>, ~options: supportedLocalesOptions=?
 
 @send external resolvedOptions: t => resolvedOptions = "resolvedOptions"
 
-@send external format: (t, Date.t) => string = "format"
+@send external format: (t, Stdlib_Date.t) => string = "format"
 @send
-external formatToParts: (t, Date.t) => array<dateTimePart> = "formatToParts"
+external formatToParts: (t, Stdlib_Date.t) => array<dateTimePart> = "formatToParts"
 
 @send
-external formatRange: (t, ~startDate: Date.t, ~endDate: Date.t) => string = "formatRange"
+external formatRange: (t, ~startDate: Stdlib_Date.t, ~endDate: Stdlib_Date.t) => string =
+  "formatRange"
 
 @send
-external formatRangeToParts: (t, ~startDate: Date.t, ~endDate: Date.t) => array<dateTimeRangePart> =
-  "formatRangeToParts"
+external formatRangeToParts: (
+  t,
+  ~startDate: Stdlib_Date.t,
+  ~endDate: Stdlib_Date.t,
+) => array<dateTimeRangePart> = "formatRangeToParts"

lib/es6/Result.js renamed to lib/es6/Stdlib_Result.js

@@ -85,10 +85,14 @@ module Decode = {
   let string = (json: t) => Type.typeof(json) === #string ? Some((Obj.magic(json): string)) : None
   let float = (json: t) => Type.typeof(json) === #number ? Some((Obj.magic(json): float)) : None
   let object = (json: t) =>
-    if Type.typeof(json) === #object && !Array.isArray(json) && !(Obj.magic(json) === Null.null) {
+    if (
+      Type.typeof(json) === #object &&
+      !Stdlib_Array.isArray(json) &&
+      !(Obj.magic(json) === Null.null)
+    ) {
       Some((Obj.magic(json): dict<t>))
     } else {
       None
     }
-  let array = (json: t) => Array.isArray(json) ? Some((Obj.magic(json): array<t>)) : None
+  let array = (json: t) => Stdlib_Array.isArray(json) ? Some((Obj.magic(json): array<t>)) : None
 }

lib/es6/Set.js renamed to lib/es6/Stdlib_Set.js

@@ -29,7 +29,7 @@ on MDN.) JavaScript stores dates as the number of milliseconds since the UNIX
 *epoch*, midnight 1 January 1970, UTC.
 */
 
-type t
+type t = Stdlib_Date.t
 
 @send
 /**

lib/es6/String.js renamed to lib/es6/Stdlib_String.js

@@ -31,7 +31,7 @@ and subsequent uses will continue the search from the previous [`lastIndex`]().
 */
 
 /** The RegExp object. */
-type t
+type t = Stdlib_RegExp.t
 
 /** The result of a executing a RegExp on a string. */
 type result

lib/es6/Symbol.js renamed to lib/es6/Stdlib_Symbol.js

@@ -1,3 +1,3 @@
 /*** ES6 Set API */
 
-type t<'a>
+type t<'a> = Stdlib_Set.t<'a>

lib/js/Int.js

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /** Js symbol type only available in ES6 */
-type symbol
+type symbol = Stdlib_Symbol.t
 
 type obj_val
 /** This type has only one value `undefined` */

lib/js/List.js

@@ -25,7 +25,7 @@
 /*** Provide utilities for manipulating JS types. */
 
 /** Js symbol type (only available in ES6) */
-type symbol
+type symbol = Stdlib_Symbol.t
 
 type obj_val
 

lib/js/Stdlib.js

@@ -209,7 +209,7 @@ type domProps = {
   loop?: bool,
   low?: int,
   manifest?: string /* uri */,
-  max?: string /* should be int or Js.Date.t */,
+  max?: string /* should be int or Date.t */,
   maxLength?: int,
   media?: string /* a valid media query */,
   mediaGroup?: string,

lib/js/Array.js renamed to lib/js/Stdlib_Array.js

@@ -69,17 +69,17 @@ module A = {
 
   let reduceReverseU = (a, x, f) => {
     let r = ref(x)
-    for i in Array.length(a) - 1 downto 0 {
-      r.contents = f(r.contents, Array.getUnsafe(a, i))
+    for i in Stdlib_Array.length(a) - 1 downto 0 {
+      r.contents = f(r.contents, Stdlib_Array.getUnsafe(a, i))
     }
     r.contents
   }
 
   let reduceReverse2U = (a, b, x, f) => {
     let r = ref(x)
-    let len = min(Array.length(a), Array.length(b))
+    let len = min(Stdlib_Array.length(a), Stdlib_Array.length(b))
     for i in len - 1 downto 0 {
-      r.contents = f(r.contents, Array.getUnsafe(a, i), Array.getUnsafe(b, i))
+      r.contents = f(r.contents, Stdlib_Array.getUnsafe(a, i), Stdlib_Array.getUnsafe(b, i))
     }
     r.contents
   }
@@ -467,18 +467,18 @@ let rec fillAux = (arr, i, x) =>
   switch x {
   | list{} => ()
   | list{h, ...t} =>
-    Array.setUnsafe(arr, i, h)
+    Stdlib_Array.setUnsafe(arr, i, h)
     fillAux(arr, i + 1, t)
   }
 
 let rec fromArrayAux = (a, i, res) =>
   if i < 0 {
     res
   } else {
-    fromArrayAux(a, i - 1, list{Array.getUnsafe(a, i), ...res})
+    fromArrayAux(a, i - 1, list{Stdlib_Array.getUnsafe(a, i), ...res})
   }
 
-let fromArray = a => fromArrayAux(a, Array.length(a) - 1, list{})
+let fromArray = a => fromArrayAux(a, Stdlib_Array.length(a) - 1, list{})
 
 let toArray = (x: t<_>) => {
   let len = length(x)
@@ -489,7 +489,7 @@ let toArray = (x: t<_>) => {
 
 let toShuffled = xs => {
   let v = toArray(xs)
-  Array.shuffle(v)
+  Stdlib_Array.shuffle(v)
   fromArray(v)
 }
 
@@ -542,10 +542,10 @@ let concatMany = xs =>
   | [] => list{}
   | [x] => x
   | _ =>
-    let len = Array.length(xs)
-    let v = ref(Array.getUnsafe(xs, len - 1))
+    let len = Stdlib_Array.length(xs)
+    let v = ref(Stdlib_Array.getUnsafe(xs, len - 1))
     for i in len - 2 downto 0 {
-      v.contents = concat(Array.getUnsafe(xs, i), v.contents)
+      v.contents = concat(Stdlib_Array.getUnsafe(xs, i), v.contents)
     }
     v.contents
   }
@@ -761,7 +761,7 @@ let setAssoc = (xs, x, k, eq) =>
 
 let sort = (xs, cmp) => {
   let arr = toArray(xs)
-  Array.sort(arr, cmp)
+  Stdlib_Array.sort(arr, cmp)
   fromArray(arr)
 }
 

lib/js/Date.js renamed to lib/js/Stdlib_Date.js

@@ -123,9 +123,9 @@ x->Object.getSymbol(fruit) // Some("banana")
 ```
 */
 @get_index
-external getSymbol: ({..}, Symbol.t) => option<'a> = ""
+external getSymbol: ({..}, Stdlib_Symbol.t) => option<'a> = ""
 
-@get_index external getSymbolUnsafe: ({..}, Symbol.t) => 'a = ""
+@get_index external getSymbolUnsafe: ({..}, Stdlib_Symbol.t) => 'a = ""
 
 /**
 `set(name, value)` assigns a value to the named object property, overwriting the previous value if any. See [Working with Objects on MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Working_with_Objects#objects_and_properties)
@@ -141,7 +141,7 @@ external getSymbol: ({..}, Symbol.t) => option<'a> = ""
 @set_index
 external set: ({..}, string, 'a) => unit = ""
 
-@set_index external setSymbol: ({..}, Symbol.t, 'a) => unit = ""
+@set_index external setSymbol: ({..}, Stdlib_Symbol.t, 'a) => unit = ""
 
 /**
 `keysToArray` returns an array of an object's own enumerable string-keyed property names. See [ECMAScript Language Specification](https://tc39.es/ecma262/multipage/fundamental-objects.html#sec-object.keys) 

lib/js/Dict.js renamed to lib/js/Stdlib_Dict.js

@@ -109,11 +109,11 @@ let all = options => {
   let acc = []
   let hasNone = ref(false)
   let index = ref(0)
-  while hasNone.contents == false && index.contents < options->Array.length {
-    switch options->Array.getUnsafe(index.contents) {
+  while hasNone.contents == false && index.contents < options->Stdlib_Array.length {
+    switch options->Stdlib_Array.getUnsafe(index.contents) {
     | None => hasNone.contents = true
     | Some(value) =>
-      acc->Array.push(value)
+      acc->Stdlib_Array.push(value)
       index.contents = index.contents + 1
     }
   }

lib/js/Promise.js renamed to lib/js/Stdlib_Promise.js

@@ -0,0 +1,12 @@
+module Array = Stdlib_Array
+module Date = Stdlib_Date
+module Dict = Stdlib_Dict
+module Promise = Stdlib_Promise
+module RegExp = Stdlib_RegExp
+module Result = Stdlib_Result
+module Set = Stdlib_Set
+module String = Stdlib_String
+module Symbol = Stdlib_Symbol
+
+// Aliases for convenience
+type date = Date.t