Merge branch 'master' into autocomplete-null-nullable

Author: mediremi

CHANGELOG.md

@@ -21,6 +21,7 @@
 #### :bug: Bug fix
 
 - Show `Stdlib.Null` and `Stdlib.Nullable` completions for `Stdlib.null<'a>` and `Stdlib.nullable<'a>` types, respectively. https://github.com/rescript-lang/rescript/pull/7826
+- Fix generation of interfaces for module types containing multiple type constraints. https://github.com/rescript-lang/rescript/pull/7825
 
 #### :memo: Documentation
 

CONTRIBUTING.md

@@ -339,6 +339,36 @@ To generate the html:
 ../scripts/ninja docs
 ```
 
+## Contribute to JSX `domProps`
+
+The `domProps` type, defined in [packages/@rescript/runtime/JsxDOM.res](packages/@rescript/runtime/JsxDOM.res), dictates which properties can be used on DOM elements. This list isn't exhaustive, so you might want to contribute a missing prop.
+
+Adding a new entry there requires re-running the analysis tests. Follow these steps:
+
+1.  Compile your changes:
+    ```bash
+    make lib
+    ```
+2.  (Optional) If your local compiler is outdated, rebuild:
+    ```bash
+    make build
+    ```
+3.  Run the analysis tests. This will likely fail due to an outdated autocomplete test snapshot:
+    ```bash
+    make test-analysis
+    ```
+4.  Add the updated snapshot to Git:
+    ```bash
+    git add tests/analysis_tests
+    ```
+5.  Re-run the analysis tests. They should now pass:
+    ```bash
+    make test-analysis
+    ```
+
+(If a `make` command fails, consider using the [DevContainer](#b-devcontainer).)
+
+Finally, add a line to [CHANGELOG.md](CHANGELOG.md), using the `#### :nail_care: Polish` section.
 ## Code structure
 
 The highlevel architecture is illustrated as below:

compiler/syntax/src/res_outcome_printer.ml

@@ -217,14 +217,18 @@ let rec print_out_type_doc (out_type : Outcometree.out_type) =
           Doc.join ~sep:Doc.line
             ((List.map2 [@doesNotRaise])
                (fun lbl typ ->
-                 Doc.concat
-                   [
-                     Doc.text
-                       (if i.contents > 0 then "and type " else "with type ");
-                     Doc.text lbl;
-                     Doc.text " = ";
-                     print_out_type_doc typ;
-                   ])
+                 let result =
+                   Doc.concat
+                     [
+                       Doc.text
+                         (if i.contents > 0 then "and type " else "with type ");
+                       Doc.text lbl;
+                       Doc.text " = ";
+                       print_out_type_doc typ;
+                     ]
+                 in
+                 incr i;
+                 result)
                labels types)
         in
         Doc.indent (Doc.concat [Doc.line; package])

tests/analysis_tests/tests/src/CreateInterface.res

@@ -171,3 +171,24 @@ module ComponentWithPolyProp = {
     <div className />
   }
 }
+
+module OrderedSet = {
+  type t<'a, 'identity> = {
+    cmp: ('a, 'a) => int,
+    set: Belt.Set.t<'a, 'identity>,
+    array: array<'a>,
+  }
+
+  let make = (
+    type value identity,
+    ~id: module(Belt.Id.Comparable with type t = value and type identity = identity),
+  ): t<value, identity> => {
+    let module(M) = id
+
+    {
+      cmp: M.cmp->Belt.Id.getCmpInternal,
+      set: Belt.Set.make(~id),
+      array: [],
+    }
+  }
+}

tests/analysis_tests/tests/src/expected/CreateInterface.res.txt

@@ -124,4 +124,12 @@ module ComponentWithPolyProp: {
   @react.component
   let make: (~size: [< #large | #small]=?) => Jsx.element
 }
+module OrderedSet: {
+  type t<'a, 'identity> = {
+    cmp: ('a, 'a) => int,
+    set: Belt.Set.t<'a, 'identity>,
+    array: array<'a>,
+  }
+  let make: (~id: module(Belt.Id.Comparable with type identity = 'a and type t = 'b)) => t<'b, 'a>
+}