New module Runtime_package

Author: cknitt

analysis/src/ModuleResolution.ml

@@ -3,7 +3,7 @@ let ( /+ ) = Filename.concat
 let rec resolveNodeModulePath ~startPath name =
   if name = "@rescript/runtime" then
     (* Hack: we need a reliable way to resolve modules in monorepos. *)
-    Some Config.runtime_module_path
+    Some Runtime_package.path
   else
     let scope = Filename.dirname name in
     let name = Filename.basename name in

compiler/bsb/bsb_exception.ml

@@ -47,7 +47,7 @@ let print (fmt : Format.formatter) (x : error) =
       modname
   | Package_not_found name ->
     let name = Bsb_pkg_types.to_string name in
-    if Ext_string.equal name Bs_version.package_name then
+    if Ext_string.equal name Runtime_package.name then
       Format.fprintf fmt
         "File \"rescript.json\", line 1\n\
          @{<error>Error:@} package @{<error>%s@} is not found\n\

compiler/common/bs_version.ml

@@ -23,4 +23,3 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 let version = "12.0.0-beta.10"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
-let package_name = "@rescript/runtime"

compiler/common/bs_version.mli

@@ -25,5 +25,3 @@
 val version : string
 
 val header : string
-
-val package_name : string

compiler/core/js_name_of_module_id.ml

@@ -95,7 +95,7 @@ let get_runtime_module_path
           (*Invariant: the package path to rescript, it is used to 
             calculate relative js path
           *)
-          (Config.runtime_module_path // dep_path // js_file)
+          (Runtime_package.path // dep_path // js_file)
 
 (* [output_dir] is decided by the command line argument *)
 let string_of_module_id 

compiler/core/js_packages_info.ml

@@ -48,7 +48,7 @@ let runtime_dir_of_module_system (ms : module_system) =
   | Esmodule | Es6_global -> "es6"
 
 let runtime_package_path (ms : module_system) js_file =
-  Bs_version.package_name // "lib" // runtime_dir_of_module_system ms // js_file
+  Runtime_package.name // "lib" // runtime_dir_of_module_system ms // js_file
 
 type t = {name: package_name; module_systems: package_info list}
 
@@ -85,8 +85,8 @@ let map (x : t) cb = Ext_list.map x.module_systems cb
 
 (* we don't want force people to use package *)
 
-(** 
-   TODO: not allowing user to provide such specific package name 
+(**
+   TODO: not allowing user to provide such specific package name
    For empty package, [-bs-package-output] does not make sense
    it is only allowed to generate commonjs file in the same directory
 *)
@@ -163,7 +163,7 @@ let query_package_infos ({name; module_systems} : t)
     with
     | Some k ->
       let rel_path = k.path in
-      let pkg_rel_path = Bs_version.package_name // rel_path in
+      let pkg_rel_path = Runtime_package.name // rel_path in
       Package_found {rel_path; pkg_rel_path; suffix = k.suffix}
     | None -> Package_not_found)
 

compiler/core/res_compmisc.ml

@@ -23,13 +23,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 let init_path () =
-  let dirs = !Clflags.include_dirs in
-  let exp_dirs =
-    List.map (Misc.expand_directory Config.standard_library) dirs
+  let stdlib_dir =
+    let ( // ) = Filename.concat in
+    Runtime_package.path // "lib" // "ocaml"
   in
+  let dirs = !Clflags.include_dirs in
+  let exp_dirs = List.map (Misc.expand_directory stdlib_dir) dirs in
   Config.load_path :=
     if !Js_config.no_stdlib then exp_dirs
-    else List.rev_append exp_dirs [Config.standard_library];
+    else List.rev_append exp_dirs [stdlib_dir];
   Env.reset_cache ()
 
 (* Return the initial environment in which compilation proceeds. *)

compiler/ext/config.ml

@@ -1,40 +1,3 @@
-(* This resolves the location of the standard library starting from the location of bsc.exe
-   (@rescript/{platform}/bin/bsc.exe), handling different supported package layouts. *)
-let runtime_module_path =
-  let build_path rest path =
-    String.concat Filename.dir_sep (List.rev_append rest path)
-  in
-  match
-    Sys.executable_name |> Filename.dirname
-    |> String.split_on_char Filename.dir_sep.[0]
-    |> List.rev
-  with
-  (* 1. Packages installed via pnpm
-     - bin:     node_modules/.pnpm/@[email protected]/node_modules/@rescript/darwin-arm64/bin
-     - runtime: node_modules/.pnpm/node_modules/@rescript/runtime (symlink)
-  *)
-  | "bin" :: _platform :: "@rescript" :: "node_modules" :: _package :: ".pnpm"
-    :: "node_modules" :: rest ->
-    build_path rest
-      ["node_modules"; ".pnpm"; "node_modules"; "@rescript"; "runtime"]
-  (* 2. Packages installed via npm
-     - bin:     node_modules/@rescript/{platform}/bin
-     - runtime: node_modules/@rescript/runtime
-  *)
-  | "bin" :: _platform :: "@rescript" :: "node_modules" :: rest ->
-    build_path rest ["node_modules"; "@rescript"; "runtime"]
-  (* 3. Several other cases that can occur in local development, e.g.
-     - bin:     <repo>/packages/@rescript/{platform}/bin, <repo>/_build/install/default/bin
-     - runtime: <repo>/packages/@rescript/runtime
-  *)
-  | _ :: _ :: _ :: _ :: rest ->
-    build_path rest ["packages"; "@rescript"; "runtime"]
-  | _ -> ""
-
-let standard_library =
-  let ( // ) = Filename.concat in
-  runtime_module_path // "lib" // "ocaml"
-
 let cmi_magic_number = "Caml1999I022"
 
 and ast_impl_magic_number = "Caml1999M022"

compiler/ext/config.mli

@@ -15,12 +15,6 @@
 
 (* System configuration *)
 
-(* The directory containing the runtime module (@rescript/runtime) *)
-val runtime_module_path : string
-
-(* The directory containing the runtime artifacts (@rescript/runtime/lib/ocaml) *)
-val standard_library : string
-
 (* Directories in the search path for .cmi and .cmo files *)
 val load_path : string list ref
 

compiler/ext/runtime_package.ml

@@ -0,0 +1,34 @@
+let name = "@rescript/runtime"
+
+(* This resolves the location of the standard library starting from the location of bsc.exe
+   (@rescript/{platform}/bin/bsc.exe), handling different supported package layouts. *)
+let path =
+  let build_path rest path =
+    String.concat Filename.dir_sep (List.rev_append rest path)
+  in
+  match
+    Sys.executable_name |> Filename.dirname
+    |> String.split_on_char Filename.dir_sep.[0]
+    |> List.rev
+  with
+  (* 1. Packages installed via pnpm
+     - bin:     node_modules/.pnpm/@[email protected]/node_modules/@rescript/darwin-arm64/bin
+     - runtime: node_modules/.pnpm/node_modules/@rescript/runtime (symlink)
+  *)
+  | "bin" :: _platform :: "@rescript" :: "node_modules" :: _package :: ".pnpm"
+    :: "node_modules" :: rest ->
+    build_path rest
+      ["node_modules"; ".pnpm"; "node_modules"; "@rescript"; "runtime"]
+  (* 2. Packages installed via npm
+     - bin:     node_modules/@rescript/{platform}/bin
+     - runtime: node_modules/@rescript/runtime
+  *)
+  | "bin" :: _platform :: "@rescript" :: "node_modules" :: rest ->
+    build_path rest ["node_modules"; "@rescript"; "runtime"]
+  (* 3. Several other cases that can occur in local development, e.g.
+     - bin:     <repo>/packages/@rescript/{platform}/bin, <repo>/_build/install/default/bin
+     - runtime: <repo>/packages/@rescript/runtime
+  *)
+  | _ :: _ :: _ :: _ :: rest ->
+    build_path rest ["packages"; "@rescript"; "runtime"]
+  | _ -> ""