Extract runtime functionality into separate Runtime_* modules (part 1)

jscomp/ext/js_runtime_modules.ml

@@ -70,3 +70,9 @@ let external_polyfill = "Caml_external_polyfill"
 let caml_js_exceptions = "Caml_js_exceptions"
 
 let caml_splice_call = "Caml_splice_call"
+
+let deriving = "Runtime_deriving"
+
+let promise = "Runtime_promise"
+
+let astExtensions = "Runtime_ast_extensions"

jscomp/frontend/ast_derive_js_mapper.ml

@@ -129,13 +129,12 @@ let app2 = Ast_compatible.app2
 
 let ( ->~ ) a b = Ast_compatible.arrow a b
 
-let js_mapper_rt = Longident.Ldot (Lident "Js", "MapperRt")
+let raise_when_not_found_ident =
+  Longident.Ldot (Lident Js_runtime_modules.deriving, "raiseWhenNotFound")
 
 let raise_when_not_found x =
-  app1
-    (Exp.ident
-       {loc = noloc; txt = Longident.Ldot (js_mapper_rt, "raiseWhenNotFound")})
-    x
+  app1 (Exp.ident {loc = noloc; txt = raise_when_not_found_ident}) x
+
 let deriving_name = "jsConverter"
 
 let init () =

jscomp/frontend/ast_exp_extension.ml

@@ -85,14 +85,21 @@ let handle_extension e (self : Bs_ast_mapper.mapper)
       Exp.sequence ~loc
         (Ast_compatible.app1 ~loc
            (Exp.ident ~loc
-              {loc; txt = Ldot (Ldot (Lident "Js", "Console"), "timeStart")})
+              {
+                loc;
+                txt = Ldot (Lident Js_runtime_modules.astExtensions, "timeStart");
+              })
            (Ast_compatible.const_exp_string ~loc loc_string))
         (Exp.let_ ~loc Nonrecursive
            [Vb.mk ~loc (Pat.var ~loc {loc; txt = "timed"}) e]
            (Exp.sequence ~loc
               (Ast_compatible.app1 ~loc
                  (Exp.ident ~loc
-                    {loc; txt = Ldot (Ldot (Lident "Js", "Console"), "timeEnd")})
+                    {
+                      loc;
+                      txt =
+                        Ldot (Lident Js_runtime_modules.astExtensions, "timeEnd");
+                    })
                  (Ast_compatible.const_exp_string ~loc loc_string))
               (Exp.ident ~loc {loc; txt = Lident "timed"})))
     | _ ->

jscomp/ml/ast_async.ml

@@ -6,7 +6,7 @@ let add_promise_type ?(loc = Location.none) ~async
   if async then
     let unsafe_async =
       Ast_helper.Exp.ident ~loc
-        {txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_async"); loc}
+        {txt = Ldot (Lident Js_runtime_modules.promise, "unsafe_async"); loc}
     in
     Ast_helper.Exp.apply ~loc unsafe_async [(Nolabel, result)]
   else result

jscomp/ml/ast_await.ml

@@ -5,7 +5,7 @@ let create_await_expression (e : Parsetree.expression) =
   let loc = {e.pexp_loc with loc_ghost = true} in
   let unsafe_await =
     Ast_helper.Exp.ident ~loc
-      {txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_await"); loc}
+      {txt = Ldot (Lident Js_runtime_modules.promise, "unsafe_await"); loc}
   in
   Ast_helper.Exp.apply ~loc unsafe_await [(Nolabel, e)]
 
@@ -24,7 +24,7 @@ let create_await_module_expression ~module_type_lid (e : Parsetree.module_expr)
            (Exp.apply ~loc:e.pmod_loc
               (Exp.ident ~loc:e.pmod_loc
                  {
-                   txt = Longident.Ldot (Lident "Js", "import");
+                   txt = Longident.Ldot (Lident Js_runtime_modules.promise, "import");
                    loc = e.pmod_loc;
                  })
               [

jscomp/others/js.res

@@ -77,8 +77,6 @@ Prefer `Js.Array2` over `Js.Array`, `Js.String2` over `Js.String`, etc. The latt
 /** JS object type */
 type t<'a> = {..} as 'a
 
-module MapperRt = Js_mapperRt
-
 module Internal = {
   external opaqueFullApply: 'a => 'a = "%uncurried_apply"
 

jscomp/others/js_promise.res

@@ -94,9 +94,6 @@ external catch: (@uncurry (error => promise<'a>)) => promise<'a> = "catch"
     https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/catch
 */
 
-external unsafe_async: 'a => promise<'a> = "%identity"
-external unsafe_await: promise<'a> => 'a = "?await"
-
 /*
 let errorAsExn (x :  error) (e  : (exn ->'a option))=
   if Caml_exceptions.isCamlExceptionOrOpenVariant (Obj.magic x ) then