Merge branch 'master' into componentWithProps-directive

Author: nojaf

.github/workflows/ci.yml

@@ -153,7 +153,7 @@ jobs:
       # matrix.ocaml_compiler may contain commas
       - name: Get OPAM cache key
         shell: bash
-        run: echo "opam_cache_key=opam-env-v6-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
+        run: echo "opam_cache_key=opam-env-v7-${{ matrix.os }}-${{ matrix.ocaml_compiler }}-${{ hashFiles('dune-project') }}" | sed 's/,/-/g' >> $GITHUB_ENV
 
       - name: Restore OPAM environment
         id: cache-opam-env
@@ -191,6 +191,10 @@ jobs:
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         run: opam install . --deps-only --with-test
 
+      - name: "Install reanalyze"
+        if: steps.cache-opam-env.outputs.cache-hit != 'true' && matrix.run_reanalyze
+        run: opam install reanalyze
+
       - name: Cache OPAM environment
         if: steps.cache-opam-env.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
@@ -303,9 +307,7 @@ jobs:
 
       - name: "Syntax: Run reanalyze"
         if: matrix.run_reanalyze
-        run: |
-          opam install reanalyze
-          opam exec -- make reanalyze
+        run: opam exec -- make reanalyze
 
       - name: Build runtime/stdlib
         run: ./scripts/buildRuntime.sh
@@ -324,7 +326,7 @@ jobs:
         run: git diff --ignore-cr-at-eol --exit-code tests
 
       - name: Run analysis / tools tests
-        if: runner.os != 'Windows' && matrix.os != 'ubuntu-24.04-arm'
+        if: runner.os != 'Windows' && runner.os != 'Linux'
         run: opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test
 
       - name: Run gentype tests

CHANGELOG.md

@@ -12,10 +12,16 @@
 
 # 12.0.0-alpha.9 (Unreleased)
 
+#### :boom: Breaking Change
+
+- Clean list API. https://github.com/rescript-lang/rescript/pull/7290
+
 #### :nail_care: Polish
 
 - Allow single newline in JSX. https://github.com/rescript-lang/rescript/pull/7269
 - Editor: Always complete from Core first. Use actual native regex syntax in code snippets for regexps. https://github.com/rescript-lang/rescript/pull/7295
+- Add `type t` to Stdlib modules. https://github.com/rescript-lang/rescript/pull/7302
+- Gentype: handle null/nullable/undefined from Stdlib. https://github.com/rescript-lang/rescript/pull/7132
 
 #### :bug: Bug fix
 
@@ -25,14 +31,19 @@
 - Fix completion for application with tagged template. https://github.com/rescript-lang/rescript/pull/7278
 - Fix error message for arity in the presence of optional arguments. https://github.com/rescript-lang/rescript/pull/7284
 - Fix issue in functors with more than one argument (which are curried): emit nested function always. https://github.com/rescript-lang/rescript/pull/7273
-- Fix dot completion issue with React primitives.  https://github.com/rescript-lang/rescript/pull/7292
+- Fix dot completion issue with React primitives. https://github.com/rescript-lang/rescript/pull/7292
+- Stdlib namespace for Core modules (fixes name clashes with user modules). https://github.com/rescript-lang/rescript/pull/7285
+- Fix runtime type check for Object in untagged variants when one variant case is `null`. https://github.com/rescript-lang/rescript/pull/7303
+- Fix files that were being truncated when sent to the CDN over FTP. https://github.com/rescript-lang/rescript/pull/7306
+- Fix better editor completion for applications. https://github.com/rescript-lang/rescript/pull/7291
 - Fix @react.componentWithProps no longer works with @directive("'use memo'"). https://github.com/rescript-lang/rescript/pull/7300
 
 #### :house: Internal
 
 - Remove ignore in res_scanner.ml . https://github.com/rescript-lang/rescript/pull/7280
 - Use the new stdlib modules in the analysis tests. https://github.com/rescript-lang/rescript/pull/7295
-- Build with OCaml 5.3.0. https://github.com/rescript-lang/rescript-compiler/pull/7294
+- Build with OCaml 5.3.0. https://github.com/rescript-lang/rescript/pull/7294
+- Simplify JSON.Decode implementation. https://github.com/rescript-lang/rescript/pull/7304
 
 # 12.0.0-alpha.8
 

analysis/src/CompletionBackEnd.ml

@@ -965,7 +965,8 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
         | [], [(Nolabel | Labelled _ | Optional _)] ->
           (* should not happen, but just ignore extra arguments *) []
       in
-      match TypeUtils.extractFunctionType ~env ~package typ with
+
+      match TypeUtils.extractFunctionType ~env ~package ~digInto:false typ with
       | args, tRet when args <> [] ->
         let args = processApply args labels in
         let retType = reconstructFunctionType args tRet in
@@ -1452,6 +1453,7 @@ let rec completeTypedValue ?(typeArgContext : typeArgContext option) ~rawOpens
     let completionItems =
       match path with
       | Pdot (Pdot (Pident {name = "Js"}, "Re", _), "t", _)
+      | Pdot (Pdot (Pident {name = "Stdlib"}, "RegExp", _), "t", _)
       | Pdot (Pident {name = "RegExp"}, "t", _) ->
         (* regexps *)
         create "/<regexp>/g" ~insertText:"/$0/g" ~includesSnippets:true

analysis/src/Packages.ml

@@ -115,26 +115,35 @@ let newBsPackage ~rootPath =
                let path = [FindFiles.nameSpaceToName namespace] in
                [path]
            in
+           let bind f x = Option.bind x f in
+           let bsc_flags =
+             Json.get "bsc-flags" config
+             |> bind Json.array |> Option.value ~default:[]
+           in
+           let no_pervasives =
+             bsc_flags
+             |> List.exists (fun s -> Json.string s = Some "-nopervasives")
+           in
            let opens_from_bsc_flags =
-             let bind f x = Option.bind x f in
-             match Json.get "bsc-flags" config |> bind Json.array with
-             | Some l ->
-               List.fold_left
-                 (fun opens item ->
-                   match item |> Json.string with
-                   | None -> opens
-                   | Some s -> (
-                     let parts = String.split_on_char ' ' s in
-                     match parts with
-                     | "-open" :: name :: _ ->
-                       let path = name |> String.split_on_char '.' in
-                       path :: opens
-                     | _ -> opens))
-                 [] l
-             | None -> []
+             List.fold_left
+               (fun opens item ->
+                 match item |> Json.string with
+                 | None -> opens
+                 | Some s -> (
+                   let parts = String.split_on_char ' ' s in
+                   match parts with
+                   | "-open" :: name :: _ ->
+                     let path = name |> String.split_on_char '.' in
+                     path :: opens
+                   | _ -> opens))
+               [] bsc_flags
+           in
+           let opens_from_pervasives =
+             if no_pervasives then []
+             else [["Stdlib"]; ["Pervasives"; "JsxModules"]]
            in
            let opens =
-             ["Pervasives"; "JsxModules"] :: opens_from_namespace
+             opens_from_pervasives @ opens_from_namespace
              |> List.rev_append opens_from_bsc_flags
              |> List.map (fun path -> path @ ["place holder"])
            in

analysis/src/TypeUtils.ml

@@ -243,12 +243,12 @@ let rec extractObjectType ~env ~package (t : Types.type_expr) =
     | _ -> None)
   | _ -> None
 
-let extractFunctionType ~env ~package typ =
+let extractFunctionType ~env ~package ?(digInto = true) typ =
   let rec loop ~env acc (t : Types.type_expr) =
     match t.desc with
     | Tlink t1 | Tsubst t1 | Tpoly (t1, []) -> loop ~env acc t1
     | Tarrow (label, tArg, tRet, _, _) -> loop ~env ((label, tArg) :: acc) tRet
-    | Tconstr (path, typeArgs, _) -> (
+    | Tconstr (path, typeArgs, _) when digInto -> (
       match References.digConstructor ~env ~package path with
       | Some
           ( env,
@@ -1255,14 +1255,14 @@ let pathToBuiltin path =
 
 let completionPathFromMaybeBuiltin path =
   match pathToBuiltin path with
-  | Some ("array", _) -> Some ["Array"]
-  | Some ("option", _) -> Some ["Option"]
-  | Some ("string", _) -> Some ["String"]
-  | Some ("int", _) -> Some ["Int"]
-  | Some ("float", _) -> Some ["Float"]
-  | Some ("promise", _) -> Some ["Promise"]
-  | Some ("list", _) -> Some ["List"]
-  | Some ("result", _) -> Some ["Result"]
-  | Some ("dict", _) -> Some ["Dict"]
-  | Some ("char", _) -> Some ["Char"]
+  | Some ("array", _) -> Some ["Stdlib"; "Array"]
+  | Some ("option", _) -> Some ["Stdlib"; "Option"]
+  | Some ("string", _) -> Some ["Stdlib"; "String"]
+  | Some ("int", _) -> Some ["Stdlib"; "Int"]
+  | Some ("float", _) -> Some ["Stdlib"; "Float"]
+  | Some ("promise", _) -> Some ["Stdlib"; "Promise"]
+  | Some ("list", _) -> Some ["Stdlib"; "List"]
+  | Some ("result", _) -> Some ["Stdlib"; "Result"]
+  | Some ("dict", _) -> Some ["Stdlib"; "Dict"]
+  | Some ("char", _) -> Some ["Stdlib"; "Char"]
   | _ -> None

compiler/core/lam_compile.ml

@@ -638,14 +638,14 @@ let compile output_prefix =
           Some ((String name, lam) :: string_table)
         | _, _ -> None)
       table (Some [])
-  and compile_cases ?(untagged = false) ~cxt ~(switch_exp : E.t)
-      ?(default = NonComplete) ?(get_tag = fun _ -> None) ?(block_cases = [])
-      cases : initialization =
+  and compile_cases ?(untagged = false) ?(has_null_case = false) ~cxt
+      ~(switch_exp : E.t) ?(default = NonComplete) ?(get_tag = fun _ -> None)
+      ?(block_cases = []) cases : initialization =
     match use_compile_literal_cases cases ~get_tag with
     | Some string_cases ->
       if untagged then
         compile_untagged_cases ~cxt ~switch_exp ~block_cases ~default
-          string_cases
+          ~has_null_case string_cases
       else compile_string_cases ~cxt ~switch_exp ~default string_cases
     | None ->
       cases
@@ -718,7 +718,7 @@ let compile output_prefix =
         else
           (* [e] will be used twice  *)
           let dispatch e =
-            let is_a_literal_case =
+            let is_a_literal_case () =
               if untagged then
                 E.is_a_literal_case
                   ~literal_cases:(get_literal_cases sw_names)
@@ -740,13 +740,17 @@ let compile output_prefix =
               && List.length sw_consts = 0
               && eq_default sw_num_default sw_blocks_default
             then
+              let literal_cases = get_literal_cases sw_names in
+              let has_null_case =
+                List.mem Ast_untagged_variants.Null literal_cases
+              in
               compile_cases ~untagged ~cxt
                 ~switch_exp:(if untagged then e else E.tag ~name:tag_name e)
-                ~block_cases ~default:sw_blocks_default ~get_tag:get_block_tag
-                sw_blocks
+                ~block_cases ~has_null_case ~default:sw_blocks_default
+                ~get_tag:get_block_tag sw_blocks
             else
               [
-                S.if_ is_a_literal_case
+                S.if_ (is_a_literal_case ())
                   (compile_cases ~cxt ~switch_exp:e ~block_cases
                      ~default:sw_num_default ~get_tag:get_const_tag sw_consts)
                   ~else_:
@@ -789,16 +793,17 @@ let compile output_prefix =
          ~switch:(fun ?default ?declaration e clauses ->
            S.string_switch ?default ?declaration e clauses)
          ~switch_exp ~default
-  and compile_untagged_cases ~cxt ~switch_exp ~default ~block_cases cases =
+  and compile_untagged_cases ~cxt ~switch_exp ~default ~block_cases
+      ~has_null_case cases =
     let mk_eq (i : Ast_untagged_variants.tag_type option) x j y =
       let check =
         match (i, j) with
         | Some tag_type, _ ->
           Ast_untagged_variants.DynamicChecks.add_runtime_type_check ~tag_type
-            ~block_cases (Expr x) (Expr y)
+            ~has_null_case ~block_cases (Expr x) (Expr y)
         | _, Some tag_type ->
           Ast_untagged_variants.DynamicChecks.add_runtime_type_check ~tag_type
-            ~block_cases (Expr y) (Expr x)
+            ~has_null_case ~block_cases (Expr y) (Expr x)
         | _ -> Ast_untagged_variants.DynamicChecks.( == ) (Expr x) (Expr y)
       in
       E.emit_check check

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

@@ -81,36 +81,42 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
   | ( ( ["FB"; "string"]
       | ["string"]
       | ["String"; "t"]
+      | ["Stdlib"; "String"; "t"]
       | ["Js"; ("String" | "String2"); "t"] ),
       [] ) ->
     {dependencies = []; type_ = string_t}
-  | (["Js"; "Types"; "bigint_val"] | ["BigInt"; "t"]), [] ->
+  | ( ( ["Js"; "Types"; "bigint_val"]
+      | ["BigInt"; "t"]
+      | ["Stdlib"; "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] ->
+  | ( (["Map"; "t"] | ["Stdlib"; "Map"; "t"]),
+      [param_translation1; param_translation2] ) ->
     {
       dependencies =
         param_translation1.dependencies @ param_translation2.dependencies;
       type_ = map_t (param_translation1.type_, param_translation2.type_);
     }
-  | ["WeakMap"; "t"], [param_translation1; param_translation2] ->
+  | ( (["WeakMap"; "t"] | ["Stdlib"; "WeakMap"; "t"]),
+      [param_translation1; param_translation2] ) ->
     {
       dependencies =
         param_translation1.dependencies @ param_translation2.dependencies;
       type_ = weakmap_t (param_translation1.type_, param_translation2.type_);
     }
-  | ["Set"; "t"], [param_translation] ->
+  | (["Set"; "t"] | ["Stdlib"; "Set"; "t"]), [param_translation] ->
     {
       dependencies = param_translation.dependencies;
       type_ = set_t param_translation.type_;
     }
-  | ["WeakSet"; "t"], [param_translation] ->
+  | (["WeakSet"; "t"] | ["Stdlib"; "WeakSet"; "t"]), [param_translation] ->
     {
       dependencies = param_translation.dependencies;
       type_ = weakset_t param_translation.type_;
     }
-  | (["Js"; "Re"; "t"] | ["RegExp"; "t"]), [] ->
+  | (["Js"; "Re"; "t"] | ["RegExp"; "t"] | ["Stdlib"; "RegExp"; "t"]), [] ->
     {dependencies = []; type_ = regexp_t}
   | (["FB"; "unit"] | ["unit"]), [] -> {dependencies = []; type_ = unit_t}
   | ( (["FB"; "array"] | ["array"] | ["Js"; ("Array" | "Array2"); "t"]),
@@ -134,7 +140,10 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
               };
             ] );
     }
-  | ( (["Pervasives"; "result"] | ["Belt"; "Result"; "t"] | ["result"]),
+  | ( ( ["Pervasives"; "result"]
+      | ["Belt"; "Result"; "t"]
+      | ["result"]
+      | ["Stdlib"; "Result"; "t"] ),
       [param_translation1; param_translation2] ) ->
     let case name type_ = {case = {label_js = StringLabel name}; t = type_} in
     let variant =
@@ -213,23 +222,36 @@ let translate_constr ~config ~params_translation ~(path : Path.t) ~type_env =
     {dependencies = []; type_ = EmitType.type_react_element}
   | (["FB"; "option"] | ["option"]), [param_translation] ->
     {param_translation with type_ = Option param_translation.type_}
-  | ( (["Js"; "Undefined"; "t"] | ["Undefined"; "t"] | ["Js"; "undefined"]),
+  | ( ( ["Js"; "Undefined"; "t"]
+      | ["Undefined"; "t"]
+      | ["Js"; "undefined"]
+      | ["Stdlib"; "undefined"] ),
       [param_translation] ) ->
     {param_translation with type_ = Option param_translation.type_}
-  | (["Js"; "Null"; "t"] | ["Null"; "t"] | ["Js"; "null"]), [param_translation]
-    ->
+  | ( ( ["Js"; "Null"; "t"]
+      | ["Null"; "t"]
+      | ["Js"; "null"]
+      | ["Stdlib"; "Null"; "t"]
+      | ["Stdlib"; "null"] ),
+      [param_translation] ) ->
     {param_translation with type_ = Null param_translation.type_}
   | ( ( ["Js"; "Nullable"; "t"]
       | ["Nullable"; "t"]
       | ["Js"; "nullable"]
       | ["Js"; "Null_undefined"; "t"]
-      | ["Js"; "null_undefined"] ),
+      | ["Js"; "null_undefined"]
+      | ["Stdlib"; "Nullable"; "t"]
+      | ["Stdlib"; "nullable"] ),
       [param_translation] ) ->
     {param_translation with type_ = Nullable param_translation.type_}
-  | ( (["Js"; "Promise"; "t"] | ["Promise"; "t"] | ["promise"]),
+  | ( ( ["Js"; "Promise"; "t"]
+      | ["Promise"; "t"]
+      | ["promise"]
+      | ["Stdlib"; "Promise"; "t"] ),
       [param_translation] ) ->
     {param_translation with type_ = Promise param_translation.type_}
-  | (["Js"; "Dict"; "t"] | ["Dict"; "t"] | ["dict"]), [param_translation] ->
+  | ( (["Js"; "Dict"; "t"] | ["Dict"; "t"] | ["dict"] | ["Stdlib"; "Dict"; "t"]),
+      [param_translation] ) ->
     {param_translation with type_ = Dict param_translation.type_}
   | _ -> default_case ()