Fix Obj.magic, String.length etc. appearing in JS output (#7087)

lib/es6/js_exn.js

@@ -5,9 +5,8 @@ import * as Primitive_option from "./primitive_option.js";
 let $$Error = "JsError";
 
 function asJsExn(exn) {
-  let t = exn;
-  if (t.RE_EXN_ID === $$Error) {
-    return Primitive_option.some(t._1);
+  if (exn.RE_EXN_ID === $$Error) {
+    return Primitive_option.some(exn._1);
   }
 
 }

lib/es6/obj.js

@@ -1,51 +1 @@
-
-
-
-function magic(prim) {
-  return prim;
-}
-
-function repr(prim) {
-  return prim;
-}
-
-function obj(prim) {
-  return prim;
-}
-
-function tag(prim) {
-  return prim.TAG;
-}
-
-function size(prim) {
-  return prim.length | 0;
-}
-
-function field(prim0, prim1) {
-  return prim0[prim1];
-}
-
-function set_field(prim0, prim1, prim2) {
-  prim0[prim1] = prim2;
-}
-
-function dup(prim) {
-  return {...prim};
-}
-
-function update_dummy(prim0, prim1) {
-  Object.assign(prim0, prim1);
-}
-
-export {
-  magic,
-  repr,
-  obj,
-  tag,
-  size,
-  field,
-  set_field,
-  dup,
-  update_dummy,
-}
-/* No side effect */
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

lib/es6/string.js

@@ -17,18 +17,6 @@ function concat(sep, xs) {
   return $$Array.of_list(xs).join(sep);
 }
 
-function length(prim) {
-  return prim.length;
-}
-
-function get(prim0, prim1) {
-  return prim0.codePointAt(prim1);
-}
-
-function unsafe_get(prim0, prim1) {
-  return prim0.codePointAt(prim1);
-}
-
 function bos(str) {
   return $$Array.map(str => str.codePointAt(0), Array.from(str));
 }
@@ -306,8 +294,6 @@ function split_on_char(sep, s) {
 }
 
 export {
-  length,
-  get,
   make,
   init,
   sub,
@@ -333,6 +319,5 @@ export {
   capitalize_ascii,
   uncapitalize_ascii,
   split_on_char,
-  unsafe_get,
 }
 /* No side effect */

lib/js/js_exn.js

@@ -5,9 +5,8 @@ let Primitive_option = require("./primitive_option.js");
 let $$Error = "JsError";
 
 function asJsExn(exn) {
-  let t = exn;
-  if (t.RE_EXN_ID === $$Error) {
-    return Primitive_option.some(t._1);
+  if (exn.RE_EXN_ID === $$Error) {
+    return Primitive_option.some(exn._1);
   }
 
 }

lib/js/obj.js

@@ -1,49 +1 @@
-'use strict';
-
-
-function magic(prim) {
-  return prim;
-}
-
-function repr(prim) {
-  return prim;
-}
-
-function obj(prim) {
-  return prim;
-}
-
-function tag(prim) {
-  return prim.TAG;
-}
-
-function size(prim) {
-  return prim.length | 0;
-}
-
-function field(prim0, prim1) {
-  return prim0[prim1];
-}
-
-function set_field(prim0, prim1, prim2) {
-  prim0[prim1] = prim2;
-}
-
-function dup(prim) {
-  return {...prim};
-}
-
-function update_dummy(prim0, prim1) {
-  Object.assign(prim0, prim1);
-}
-
-exports.magic = magic;
-exports.repr = repr;
-exports.obj = obj;
-exports.tag = tag;
-exports.size = size;
-exports.field = field;
-exports.set_field = set_field;
-exports.dup = dup;
-exports.update_dummy = update_dummy;
-/* No side effect */
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

lib/js/string.js

@@ -17,18 +17,6 @@ function concat(sep, xs) {
   return $$Array.of_list(xs).join(sep);
 }
 
-function length(prim) {
-  return prim.length;
-}
-
-function get(prim0, prim1) {
-  return prim0.codePointAt(prim1);
-}
-
-function unsafe_get(prim0, prim1) {
-  return prim0.codePointAt(prim1);
-}
-
 function bos(str) {
   return $$Array.map(str => str.codePointAt(0), Array.from(str));
 }
@@ -305,8 +293,6 @@ function split_on_char(sep, s) {
   };
 }
 
-exports.length = length;
-exports.get = get;
 exports.make = make;
 exports.init = init;
 exports.sub = sub;
@@ -332,5 +318,4 @@ exports.lowercase_ascii = lowercase_ascii;
 exports.capitalize_ascii = capitalize_ascii;
 exports.uncapitalize_ascii = uncapitalize_ascii;
 exports.split_on_char = split_on_char;
-exports.unsafe_get = unsafe_get;
 /* No side effect */

runtime/char.res

@@ -14,7 +14,7 @@ let chr = unsafe_chr
 
 external bytes_create: int => array<char> = "Array"
 
-let bytes_unsafe_set = Primitive_array_extern.setUnsafe
+external bytes_unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
 
 @scope("String") @variadic
 external unsafe_to_string: array<char> => string = "fromCodePoint"

runtime/obj.res

@@ -4,28 +4,28 @@
 
 type t = Primitive_object_extern.t
 
-let magic = Primitive_object_extern.magic
+external magic: 'a => 'b = "%identity"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let repr = Primitive_object_extern.repr
+external repr: 'a => t = "%identity"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let obj = Primitive_object_extern.obj
+external obj: t => 'a = "%identity"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let tag = Primitive_object_extern.tag
+external tag: t => int = "%obj_tag"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let size = Primitive_object_extern.size
+external size: t => int = "%obj_size"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let field = Primitive_object_extern.getField
+external getField: (t, 'a) => t = "%obj_get_field"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let set_field = Primitive_object_extern.setField
+external setField: (t, 'a, t) => unit = "%obj_set_field"
 
 @deprecated("Do not use directly. This will be removed in v13")
-let dup = Primitive_object_extern.dup
+external dup: t => t = "%obj_dup"
 
-@deprecated("Do not use directly. This will be removed in v13")
-let update_dummy = Primitive_object_extern.updateDummy
+@deprecated("Do not use directly. This will be removed in v13") @scope("Object")
+external updateDummy: (t, t) => unit = "assign"

runtime/primitive_object.res

@@ -27,6 +27,8 @@ module Js = Primitive_js_extern
 
 type t = Primitive_object_extern.t
 
+// Note: this only works as intended as long as the runtime is compiled
+// with -bs-cross-module-opt.
 let repr = Primitive_object_extern.repr
 let magic = Primitive_object_extern.magic
 let tag = Primitive_object_extern.tag

runtime/string.res

@@ -30,11 +30,11 @@ module B = {
 
 let concat = (sep: string, xs: list<string>) => xs->Array.of_list->join(sep)
 
-let length = Primitive_string_extern.length
+external length: string => int = "%string_length"
 
-let get = Primitive_string_extern.getCharUnsafe
+@send external get: (string, int) => char = "codePointAt"
 
-let unsafe_get = Primitive_string_extern.getCharUnsafe
+@send external unsafe_get: (string, int) => char = "codePointAt"
 
 @scope("Array") external bos: string => array<string> = "from"
 let bos = str => B.map(str => str->unsafe_get(0), str->bos)

runtime/string.resi

@@ -6,14 +6,15 @@
 
 /** Return the length (number of characters) of the given string. */
 @deprecated("Use Core instead. This will be removed in v13")
-let length: string => int
+external length: string => int = "%string_length"
 
 /** [String.get s n] returns the character at index [n] in string [s].
    You can also write [s.[n]] instead of [String.get s n].
 
    Raise [Invalid_argument] if [n] not a valid index in [s]. */
 @deprecated("Use Core instead. This will be removed in v13")
-let get: (string, int) => char
+@send
+external get: (string, int) => char = "codePointAt"
 
 /** [String.make n c] returns a fresh string of length [n],
    filled with the character [c]. */
@@ -245,5 +246,5 @@ external equal: (t, t) => bool = "%equal"
 let split_on_char: (char, string) => list<string>
 
 /* The following is for system use only. Do not call directly. */
-@deprecated("Use Core instead. This will be removed in v13")
-let unsafe_get: (string, int) => char
+@deprecated("Use Core instead. This will be removed in v13") @send
+external unsafe_get: (string, int) => char = "codePointAt"