Merge branch 'rescript-lang:master' into master

Author: gwansikk

.github/workflows/ci.yml

@@ -373,33 +373,35 @@ jobs:
         if: matrix.benchmarks
         run: ./_build/install/default/bin/syntax_benchmarks | tee tests/benchmark-output.json
 
-      - name: Restore previous benchmark data
-        if: matrix.benchmarks
-        uses: actions/cache/restore@v4
-        with:
-          path: ./tests/benchmark-cache
-          key: syntax-benchmark-v1
-
-      - name: Create new benchmark data and comment on alert
-        # Do not run for PRs created from other repos as those won't be able to write to the pull request
-        if: ${{ matrix.benchmarks && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name) }}
-        uses: benchmark-action/github-action-benchmark@v1
-        with:
-          name: Syntax Benchmarks
-          tool: customSmallerIsBetter
-          output-file-path: tests/benchmark-output.json
-          external-data-json-path: ./tests/benchmark-cache/benchmark-data.json
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          alert-threshold: "105%"
-          comment-always: false
-          comment-on-alert: true
-
-      - name: Save benchmark data as new baseline
-        if: matrix.benchmarks && github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v4
-        with:
-          path: ./tests/benchmark-cache
-          key: syntax-benchmark-v1
+      # Benchmarking is disabled for now because of inconsistent run times on different runners
+      #
+      # - name: Restore previous benchmark data
+      #   if: matrix.benchmarks
+      #   uses: actions/cache/restore@v4
+      #   with:
+      #     path: ./tests/benchmark-cache
+      #     key: syntax-benchmark-v1
+
+      # - name: Create new benchmark data and comment on alert
+      #   # Do not run for PRs created from other repos as those won't be able to write to the pull request
+      #   if: ${{ matrix.benchmarks && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name) }}
+      #   uses: benchmark-action/github-action-benchmark@v1
+      #   with:
+      #     name: Syntax Benchmarks
+      #     tool: customSmallerIsBetter
+      #     output-file-path: tests/benchmark-output.json
+      #     external-data-json-path: ./tests/benchmark-cache/benchmark-data.json
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      #     alert-threshold: "105%"
+      #     comment-always: false
+      #     comment-on-alert: true
+
+      # - name: Save benchmark data as new baseline
+      #   if: matrix.benchmarks && github.ref == 'refs/heads/master'
+      #   uses: actions/cache/save@v4
+      #   with:
+      #     path: ./tests/benchmark-cache
+      #     key: syntax-benchmark-v1
 
       - name: Build playground compiler
         if: matrix.build_playground

.github/workflows/prepare_package_upload.js

@@ -1,7 +1,9 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 
-import packageSpec from "rescript/package.json" with { type: "json" };
+const packageSpec = JSON.parse(
+  fs.readFileSync(new URL("../../package.json", import.meta.url), "utf-8")
+);
 
 const { version } = packageSpec;
 

CHANGELOG.md

@@ -10,16 +10,34 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
-# 12.0.0-alpha.11 (Unreleased)
+# 12.0.0-alpha.12 (Unreleased)
+
+#### :bug: Bug fix
+
+- Fix node.js ExperimentalWarning. https://github.com/rescript-lang/rescript/pull/7379
+
+#### :house: Internal
+
+- Better representation of JSX in AST. https://github.com/rescript-lang/rescript/pull/7286
+
+# 12.0.0-alpha.11
 
 #### :bug: Bug fix
 
 - Fix `Error.fromException`. https://github.com/rescript-lang/rescript/pull/7364
+- Fix signature of `throw`. https://github.com/rescript-lang/rescript/pull/7365
+- Fix formatter adds superfluous parens in pipe chain. https://github.com/rescript-lang/rescript/pull/7370
 
 #### :house: Internal
 
 - Remove `Stdlib_Char` module for now. https://github.com/rescript-lang/rescript/pull/7367
 - Convert internal JavaScript codebase into ESM, ReScript package itself is now ESM (`"type": "module"`). https://github.com/rescript-lang/rescript/pull/6899
+- Add built-in support for the JavaScript `in` operator. https://github.com/rescript-lang/rescript/pull/7342
+- AST cleanup: add `Pexp_await` ast node instead of `res.await` attribute. (The attribute is still used for await on modules currently). https://github.com/rescript-lang/rescript/pull/7368
+
+#### :nail_care: Polish
+
+- More deprecations in `Pervasives`; add `Stdlib.Pair` and `Stdlib.Int.Ref`. https://github.com/rescript-lang/rescript/pull/7371
 
 # 12.0.0-alpha.10
 
@@ -60,7 +78,7 @@
 
 #### :bug: Bug fix
 
-- Fix recursive untagged variant type checking by delaying well-formedness checks until environment construction completes. [#7320](https://github.com/rescript-lang/rescript/pull/7320)
+- Fix recursive untagged variant type checking by delaying well-formedness checks until environment construction completes. https://github.com/rescript-lang/rescript/pull/7320
 - Fix incorrect expansion of polymorphic return types in uncurried function applications. https://github.com/rescript-lang/rescript/pull/7338
 
 # 12.0.0-alpha.9

CONTRIBUTING.md

@@ -123,19 +123,19 @@ After adding a new file to the repository that should go into the npm package -
 
 ```sh
 make lib # Build compiler and standard library
-./cli/bsc myTestFile.res
+./cli/bsc.js myTestFile.res
 ```
 
 To view the untyped tree of the file run:
 
 ```sh
-./cli/bsc -dparsetree myTestFile.res
+./cli/bsc.js -dparsetree myTestFile.res
 ```
 
 To view the typed tree of the file run:
 
 ```sh
-./cli/bsc -dtypedtree myTestFile.res
+./cli/bsc.js -dtypedtree myTestFile.res
 ```
 
 ### Project

analysis/src/CompletionFrontEnd.ml

@@ -312,11 +312,12 @@ let rec exprToContextPathInner ~(inJsxContext : bool) (e : Parsetree.expression)
     if List.length exprs = List.length exprsAsContextPaths then
       Some (CTuple exprsAsContextPaths)
     else None
+  | Pexp_await e -> exprToContextPathInner ~inJsxContext e
   | _ -> None
 
 and exprToContextPath ~(inJsxContext : bool) (e : Parsetree.expression) =
   match
-    ( Res_parsetree_viewer.has_await_attribute e.pexp_attributes,
+    ( Res_parsetree_viewer.expr_is_await e,
       exprToContextPathInner ~inJsxContext e )
   with
   | true, Some ctxPath -> Some (CPAwait ctxPath)
@@ -1232,8 +1233,6 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
                          then ValueOrField
                          else Value);
                     }))
-        | Pexp_construct ({txt = Lident ("::" | "()")}, _) ->
-          (* Ignore list expressions, used in JSX, unit, and more *) ()
         | Pexp_construct (lid, eOpt) -> (
           let lidPath = flattenLidCheckDot lid in
           if debug then
@@ -1324,10 +1323,29 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
                         inJsx = !inJsxContext;
                       }))
             | None -> ())
-        | Pexp_apply {funct = {pexp_desc = Pexp_ident compName}; args}
-          when Res_parsetree_viewer.is_jsx_expression expr ->
+        | Pexp_jsx_element
+            ( Jsx_unary_element
+                {
+                  jsx_unary_element_tag_name = compName;
+                  jsx_unary_element_props = props;
+                }
+            | Jsx_container_element
+                {
+                  jsx_container_element_tag_name_start = compName;
+                  jsx_container_element_props = props;
+                } ) ->
           inJsxContext := true;
-          let jsxProps = CompletionJsx.extractJsxProps ~compName ~args in
+          let children =
+            match expr.pexp_desc with
+            | Pexp_jsx_element
+                (Jsx_container_element
+                   {jsx_container_element_children = children}) ->
+              children
+            | _ -> JSXChildrenItems []
+          in
+          let jsxProps =
+            CompletionJsx.extractJsxProps ~compName ~props ~children
+          in
           let compNamePath = flattenLidCheckDot ~jsx:true compName in
           if debug then
             Printf.printf "JSX <%s:%s %s> _children:%s\n"
@@ -1344,10 +1362,21 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
               | None -> "None"
               | Some childrenPosStart -> Pos.toString childrenPosStart);
           let jsxCompletable =
-            CompletionJsx.findJsxPropsCompletable ~jsxProps
-              ~endPos:(Loc.end_ expr.pexp_loc) ~posBeforeCursor
-              ~posAfterCompName:(Loc.end_ compName.loc)
-              ~firstCharBeforeCursorNoWhite ~charAtCursor
+            match expr.pexp_desc with
+            | Pexp_jsx_element
+                (Jsx_container_element
+                   {
+                     jsx_container_element_closing_tag = None;
+                     jsx_container_element_children =
+                       JSXChildrenSpreading _ | JSXChildrenItems (_ :: _);
+                   }) ->
+              (* This is a weird edge case where there is no closing tag but there are children *)
+              None
+            | _ ->
+              CompletionJsx.findJsxPropsCompletable ~jsxProps
+                ~endPos:(Loc.end_ expr.pexp_loc) ~posBeforeCursor
+                ~posAfterCompName:(Loc.end_ compName.loc)
+                ~firstCharBeforeCursorNoWhite ~charAtCursor
           in
           if jsxCompletable <> None then setResultOpt jsxCompletable
           else if compName.loc |> Loc.hasPos ~pos:posBeforeCursor then

analysis/src/CompletionJsx.ml

@@ -455,40 +455,39 @@ let findJsxPropsCompletable ~jsxProps ~endPos ~posBeforeCursor
   in
   loop jsxProps.props
 
-let extractJsxProps ~(compName : Longident.t Location.loc) ~args =
-  let thisCaseShouldNotHappen =
-    {
-      compName = Location.mknoloc (Longident.Lident "");
-      props = [];
-      childrenStart = None;
-    }
+let extractJsxProps ~(compName : Longident.t Location.loc) ~props ~children =
+  let open Parsetree in
+  let childrenStart =
+    match children with
+    | JSXChildrenItems [] -> None
+    | JSXChildrenSpreading child | JSXChildrenItems (child :: _) ->
+      if child.pexp_loc.loc_ghost then None else Some (Loc.start child.pexp_loc)
   in
-  let rec processProps ~acc args =
-    match args with
-    | (Asttypes.Labelled {txt = "children"}, {Parsetree.pexp_loc}) :: _ ->
-      {
-        compName;
-        props = List.rev acc;
-        childrenStart =
-          (if pexp_loc.loc_ghost then None else Some (Loc.start pexp_loc));
-      }
-    | ( (Labelled {txt = s; loc} | Optional {txt = s; loc}),
-        (eProp : Parsetree.expression) )
-      :: rest -> (
-      let namedArgLoc = if loc = Location.none then None else Some loc in
-      match namedArgLoc with
-      | Some loc ->
-        processProps
-          ~acc:
-            ({
-               name = s;
-               posStart = Loc.start loc;
-               posEnd = Loc.end_ loc;
-               exp = eProp;
-             }
-            :: acc)
-          rest
-      | None -> processProps ~acc rest)
-    | _ -> thisCaseShouldNotHappen
+  let props =
+    props
+    |> List.map (function
+         | JSXPropPunning (_, name) ->
+           {
+             name = name.txt;
+             posStart = Loc.start name.loc;
+             posEnd = Loc.end_ name.loc;
+             exp =
+               Ast_helper.Exp.ident ~loc:name.loc
+                 {txt = Longident.Lident name.txt; loc = name.loc};
+           }
+         | JSXPropValue (name, _, value) ->
+           {
+             name = name.txt;
+             posStart = Loc.start name.loc;
+             posEnd = Loc.end_ name.loc;
+             exp = value;
+           }
+         | JSXPropSpreading (loc, expr) ->
+           {
+             name = "_spreadProps";
+             posStart = Loc.start loc;
+             posEnd = Loc.end_ loc;
+             exp = expr;
+           })
   in
-  args |> processProps ~acc:[]
+  {compName; props; childrenStart}