new runtime resolution

Author: cometkim

Makefile

@@ -58,11 +58,11 @@ reanalyze:
 	reanalyze.exe -set-exit-code -all-cmt _build/default/compiler _build/default/tests -exclude-paths compiler/outcome_printer,compiler/ml,compiler/frontend,compiler/ext,compiler/depends,compiler/core,compiler/common,compiler/cmij,compiler/bsb_helper,compiler/bsb
 
 lib-bsb:
-	./scripts/buildRuntime.sh
+	yarn workspace @rescript/runtime build:bsb
 	./scripts/prebuilt.js
 
 lib:
-	./scripts/buildRuntimeRewatch.sh
+	yarn workspace @rescript/runtime build:rewatch
 	./scripts/prebuilt.js
 
 artifacts: lib
@@ -96,7 +96,7 @@ clean-rewatch:
 	cargo clean --manifest-path rewatch/Cargo.toml && rm -f rewatch/rewatch
 
 clean:
-	(cd runtime && ../cli/rescript.js clean)
+	yarn workspace @rescript/runtime clean
 	dune clean
 
 clean-all: clean clean-gentype clean-rewatch 

analysis/src/BuildSystem.ml

@@ -5,23 +5,21 @@ let namespacedName namespace name =
 
 let ( /+ ) = Filename.concat
 
-let getBsPlatformDir rootPath =
-  match !Cfg.isDocGenFromCompiler with
-  | false -> (
-    let result =
-      ModuleResolution.resolveNodeModulePath ~startPath:rootPath "rescript"
-    in
-    match result with
-    | Some path -> Some path
-    | None ->
-      let message = "rescript could not be found" in
-      Log.log message;
-      None)
-  | true -> Some rootPath
+let getRuntimeDir rootPath =
+  let result =
+    ModuleResolution.resolveNodeModulePath ~startPath:rootPath
+      "@rescript/runtime"
+  in
+  match result with
+  | Some path -> Some path
+  | None ->
+    let message = "@rescript/runtime could not be found" in
+    Log.log message;
+    None
 
 let getLibBs root = Files.ifExists (root /+ "lib" /+ "bs")
 
 let getStdlib base =
-  match getBsPlatformDir base with
+  match getRuntimeDir base with
   | None -> None
-  | Some bsPlatformDir -> Some (bsPlatformDir /+ "lib" /+ "ocaml")
+  | Some runtimeDir -> Some (runtimeDir /+ "lib" /+ "ocaml")

analysis/src/Files.ml

@@ -84,16 +84,26 @@ let rec collectDirs path =
        |> List.concat)
   | _ -> []
 
-let rec collect ?(checkDir = fun _ -> true) path test =
-  match maybeStat path with
-  | None -> []
-  | Some {Unix.st_kind = Unix.S_DIR} ->
+let rec collect ?(checkDir = fun _ -> true) ?maxDepth path test =
+  match (maxDepth, maybeStat path) with
+  | None, None -> []
+  | Some 0, _ -> []
+  | None, Some {Unix.st_kind = Unix.S_DIR} ->
     if checkDir path then
       readDirectory path
       |> List.map (fun name ->
              collect ~checkDir (Filename.concat path name) test)
       |> List.concat
     else []
+  | Some n, Some {Unix.st_kind = Unix.S_DIR} ->
+    if checkDir path then
+      readDirectory path
+      |> List.map (fun name ->
+             collect ~checkDir ~maxDepth:(n - 1)
+               (Filename.concat path name)
+               test)
+      |> List.concat
+    else []
   | _ -> if test path then [path] else []
 
 type classifiedFile = Res | Resi | Other

analysis/src/FindFiles.ml

@@ -142,7 +142,7 @@ let findProjectFiles ~public ~namespace ~path ~sourceDirectories ~libBs =
   in
   let files =
     dirs |> StringSet.elements
-    |> List.map (fun name -> Files.collect name isSourceFile)
+    |> List.map (fun name -> Files.collect ~maxDepth:1 name isSourceFile)
     |> List.concat |> StringSet.of_list
   in
   dirs

analysis/src/ModuleResolution.ml

@@ -1,6 +1,13 @@
 let ( /+ ) = Filename.concat
 
 let rec resolveNodeModulePath ~startPath name =
+  let scope = Filename.dirname name in
+  let name = Filename.basename name in
+  let name =
+    match scope.[0] with
+    | '@' -> scope /+ name
+    | _ -> name
+  in
   let path = startPath /+ "node_modules" /+ name in
   if Files.exists path then Some path
   else if Filename.dirname startPath = startPath then None

cli/common/bsb.js

@@ -6,8 +6,8 @@ import { createServer } from "node:http";
 import * as os from "node:os";
 import * as path from "node:path";
 
-import { WebSocket } from "./minisocket.js";
 import { rescript_exe } from "./bins.js";
+import { WebSocket } from "./minisocket.js";
 
 const cwd = process.cwd();
 const lockFileName = path.join(cwd, ".bsb.lock");

compiler/bsc/rescript_compiler_main.ml

@@ -184,12 +184,6 @@ let define_variable s =
       Bsc_args.bad_arg ("illegal definition: " ^ s)
   | _ -> Bsc_args.bad_arg ("illegal definition: " ^ s)
 
-let print_standard_library () =
-  let standard_library = Config.standard_library in
-  print_string standard_library;
-  print_newline ();
-  exit 0
-
 let bs_version_string = "ReScript " ^ Bs_version.version
 
 let print_version_string () =
@@ -366,9 +360,6 @@ let buckle_script_flags : (string * Bsc_args.spec * string) array =
     ( "-ignore-parse-errors",
       set Clflags.ignore_parse_errors,
       "*internal* continue after parse errors" );
-    ( "-where",
-      unit_call print_standard_library,
-      "*internal* Print location of standard library and exit" );
     ( "-verbose",
       set Clflags.verbose,
       "*internal* Print calls to external commands" );

compiler/common/bs_version.ml

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

compiler/ext/config.ml

@@ -1,25 +1,13 @@
 let version = "4.06.1+BS"
 
-(* FIXME: Unreliable resolution *)
 let standard_library =
   let ( // ) = Filename.concat in
+  (* @rescript/{platform}/bin/rescript.exe *)
   let exe_path = Sys.executable_name in
-  if Ext_string.contain_substring exe_path ("node_modules" // "@rescript") then
-    (* node_modules/@rescript/{platform}/bin *)
-    Filename.dirname exe_path // Filename.parent_dir_name
-    // Filename.parent_dir_name // Filename.parent_dir_name // "rescript"
-    // "lib" // "ocaml"
-  else if Ext_string.contain_substring exe_path ("node_modules" // "rescript")
-  then
-    (* node_modules/rescript/{platform} *)
-    Filename.dirname exe_path // Filename.parent_dir_name // "lib" // "ocaml"
-  else
-    (* git repo: rescript/packages/@rescript/{platform}/bin *)
-    Filename.dirname exe_path // Filename.parent_dir_name
-    // Filename.parent_dir_name // Filename.parent_dir_name
-    // Filename.parent_dir_name // "lib" // "ocaml"
-
-let standard_library_default = standard_library
+  let bin_dir = Filename.dirname exe_path in
+  let platform_dir = Filename.dirname bin_dir in
+  let rescript_dir = Filename.dirname platform_dir in
+  rescript_dir // "runtime" // "lib" // "ocaml"
 
 let unsafe_empty_array = ref false
 
@@ -32,20 +20,3 @@ and ast_intf_magic_number = "Caml1999N022"
 and cmt_magic_number = "Caml1999T022"
 
 let load_path = ref ([] : string list)
-
-(* This is normally the same as in obj.ml, but we have to define it
-   separately because it can differ when we're in the middle of a
-   bootstrapping phase. *)
-
-let print_config oc =
-  let p name valu = Printf.fprintf oc "%s: %s\n" name valu in
-  p "version" version;
-  p "standard_library_default" standard_library_default;
-  p "standard_library" standard_library;
-
-  (* print the magic number *)
-  p "cmi_magic_number" cmi_magic_number;
-  p "ast_impl_magic_number" ast_impl_magic_number;
-  p "ast_intf_magic_number" ast_intf_magic_number;
-  p "cmt_magic_number" cmt_magic_number;
-  flush oc

compiler/ext/config.mli

@@ -37,5 +37,3 @@ val ast_impl_magic_number : string
 (* Magic number for file holding an implementation syntax tree *)
 val cmt_magic_number : string
 (* Magic number for compiled interface files *)
-
-val print_config : out_channel -> unit