Fix: support result in GenType.

rescript-lang · Nov 1, 2023 · a06c20c · a06c20c
1 parent 3e93173
commit a06c20c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,9 @@
 
 # 11.0.0-rc.6 (Unreleased)
 
+#### :bug: Bug Fix
+- Fix issue with GenType and `result` introduced in rc.5. https://github.com/rescript-lang/rescript-compiler/pull/6464
+
 # 11.0.0-rc.5
 
 #### :rocket: New Feature

diff --git a/jscomp/gentype/TranslateTypeExprFromTypes.ml b/jscomp/gentype/TranslateTypeExprFromTypes.ml
@@ -135,7 +135,7 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
               };
             ] );
     }
-  | ( (["Pervasives"; "result"] | ["Belt"; "Result"; "t"]),
+  | ( (["Pervasives"; "result"] | ["Belt"; "Result"; "t"] | ["result"]),
       [paramTranslation1; paramTranslation2] ) ->
     let case n name type_ =
       {case = {label = string_of_int n; labelJS = StringLabel name}; t = type_}

diff --git a/jscomp/gentype_tests/typescript-react-example/package-lock.json b/jscomp/gentype_tests/typescript-react-example/package-lock.json
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.bs.js b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.bs.js
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.bs.js b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.bs.js