GenType: fix issue with V3 compatibility mode

CHANGELOG.md

@@ -23,6 +23,7 @@
 - Fix issue with printing async functions with locally abstract types https://github.com/rescript-lang/syntax/pull/732
 - Fix issue with async context and locally abstract types https://github.com/rescript-lang/rescript-compiler/pull/5985
 - Fix support for recursive components in JSX V4 https://github.com/rescript-lang/syntax/pull/733
+- GenType: fix issue with V3 compatibility mode (see https://github.com/rescript-lang/rescript-compiler/issues/5990) https://github.com/rescript-lang/rescript-compiler/pull/5992
 
 # 10.1.2
 

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -67,7 +67,10 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
           type_ = Ident { builtin = false; name = dep |> depToString; typeArgs };
         }
   in
-  match (path |> pathToList |> List.rev, paramsTranslation) with
+  let patchReactV3 path =
+    match path with "ReactV3" :: rest -> rest | _ -> path
+  in
+  match (path |> pathToList |> List.rev |> patchReactV3, paramsTranslation) with
   | ([ "FB"; "bool" ] | [ "bool" ]), [] ->
       { dependencies = []; type_ = booleanT }
   | ([ "FB"; "int" ] | [ "int" ]), [] -> { dependencies = []; type_ = numberT }
@@ -203,7 +206,7 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
       | [ "Js"; "null_undefined" ] ),
       [ paramTranslation ] ) ->
       { paramTranslation with type_ = Nullable paramTranslation.type_ }
-  | ([ "Js"; "Promise"; "t" ] | ["promise"]), [ paramTranslation ] ->
+  | ([ "Js"; "Promise"; "t" ] | [ "promise" ]), [ paramTranslation ] ->
       { paramTranslation with type_ = Promise paramTranslation.type_ }
   | ( [ "Js"; "Internal"; "fn" ],
       [ { dependencies = argsDependencies; type_ = Tuple ts }; ret ] ) ->

jscomp/gentype_tests/typescript-react-example/package.json

@@ -2,21 +2,21 @@
   "name": "typescript-react-example",
   "version": "0.1.0",
   "private": true,
-  "dependencies": {
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1"
-  },
   "scripts": {
     "start": "rescript build -w",
     "build": "rescript",
     "clean": "rescript clean -with-deps",
     "tsc": "tsc -p tsconfig.json"
   },
   "devDependencies": {
-    "@rescript/react": "^0.10.3",
     "@types/node": "^13.13.4",
     "@types/react-dom": "^16.9.7",
     "rescript": "file:../../..",
     "typescript": "3.9.2"
+  },
+  "dependencies": {
+    "@rescript/react": "^0.11.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }

jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx

@@ -0,0 +1,6 @@
+/* TypeScript file generated from V3Compatibility.res by genType. */
+/* eslint-disable import/first */
+
+
+// tslint:disable-next-line:interface-over-type-literal
+export type cb = (_1:number) => string;

jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res

@@ -0,0 +1,4 @@
+open ReactV3
+
+@genType
+type cb = React.callback<int, string>

lib/4.06.1/whole_compiler.ml

@@ -242402,7 +242402,10 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
           type_ = Ident { builtin = false; name = dep |> depToString; typeArgs };
         }
   in
-  match (path |> pathToList |> List.rev, paramsTranslation) with
+  let patchReactV3 path =
+    match path with "ReactV3" :: rest -> rest | _ -> path
+  in
+  match (path |> pathToList |> List.rev |> patchReactV3, paramsTranslation) with
   | ([ "FB"; "bool" ] | [ "bool" ]), [] ->
       { dependencies = []; type_ = booleanT }
   | ([ "FB"; "int" ] | [ "int" ]), [] -> { dependencies = []; type_ = numberT }
@@ -242538,7 +242541,7 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
       | [ "Js"; "null_undefined" ] ),
       [ paramTranslation ] ) ->
       { paramTranslation with type_ = Nullable paramTranslation.type_ }
-  | ([ "Js"; "Promise"; "t" ] | ["promise"]), [ paramTranslation ] ->
+  | ([ "Js"; "Promise"; "t" ] | [ "promise" ]), [ paramTranslation ] ->
       { paramTranslation with type_ = Promise paramTranslation.type_ }
   | ( [ "Js"; "Internal"; "fn" ],
       [ { dependencies = argsDependencies; type_ = Tuple ts }; ret ] ) ->