GenType: fix issue with V3 compatibility mode

Fixes #5990

Author: cristianoc

CHANGELOG.md

@@ -58,6 +58,7 @@ These are only breaking changes for unformatted code.
 - Fix issue with nested async functions, where the inner function would be emitted without `async` https://github.com/rescript-lang/rescript-compiler/pull/5983
 - Fix issue with async context check, and printer, for async functions with locally abstract type https://github.com/rescript-lang/rescript-compiler/pull/5982
 - Fix support for recursive components in JSX V4 https://github.com/rescript-lang/rescript-compiler/pull/5986
+- 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/5991
 
 #### :nail_care: Polish
 

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -127,7 +127,8 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
         paramTranslation1.dependencies @ paramTranslation2.dependencies;
       type_ = variant;
     }
-  | ["React"; "callback"], [fromTranslation; toTranslation] ->
+  | ( (["React"; "callback"] | ["ReactV3"; "React"; "callback"]),
+      [fromTranslation; toTranslation] ) ->
     {
       dependencies = fromTranslation.dependencies @ toTranslation.dependencies;
       type_ =
@@ -140,7 +141,8 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
             uncurried = false;
           };
     }
-  | ["React"; "componentLike"], [propsTranslation; retTranslation] ->
+  | ( (["React"; "componentLike"] | ["ReactV3"; "React"; "componentLike"]),
+      [propsTranslation; retTranslation] ) ->
     {
       dependencies = propsTranslation.dependencies @ retTranslation.dependencies;
       type_ =
@@ -153,7 +155,8 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
             uncurried = false;
           };
     }
-  | ["React"; "component"], [propsTranslation] ->
+  | ( (["React"; "component"] | ["ReactV3"; "React"; "component"]),
+      [propsTranslation] ) ->
     {
       dependencies = propsTranslation.dependencies;
       type_ =
@@ -166,12 +169,17 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
             uncurried = false;
           };
     }
-  | ["React"; "Context"; "t"], [paramTranslation] ->
+  | ( (["React"; "Context"; "t"] | ["ReactV3"; "React"; "Context"; "t"]),
+      [paramTranslation] ) ->
     {
       dependencies = paramTranslation.dependencies;
       type_ = EmitType.typeReactContext ~type_:paramTranslation.type_;
     }
-  | (["React"; "Ref"; "t"] | ["React"; "ref"]), [paramTranslation] ->
+  | ( ( ["React"; "Ref"; "t"]
+      | ["React"; "ref"]
+      | ["ReactV3"; "React"; "Ref"; "t"]
+      | ["ReactV3"; "React"; "ref"] ),
+      [paramTranslation] ) ->
     {
       dependencies = paramTranslation.dependencies;
       type_ = EmitType.typeReactRef ~type_:paramTranslation.type_;
@@ -186,7 +194,10 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
     {dependencies = []; type_ = EmitType.typeAny}
   | ["ReactEvent"; "Mouse"; "t"], [] ->
     {dependencies = []; type_ = EmitType.typeReactEventMouseT}
-  | (["React"; "element"] | ["ReasonReact"; "reactElement"]), [] ->
+  | ( ( ["React"; "element"]
+      | ["ReactV3"; "React"; "element"]
+      | ["ReasonReact"; "reactElement"] ),
+      [] ) ->
     {dependencies = []; type_ = EmitType.typeReactElement}
   | (["FB"; "option"] | ["option"]), [paramTranslation] ->
     {paramTranslation with type_ = Option paramTranslation.type_}

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

@@ -3,8 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1"
+    "@rescript/react": "^0.11.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "scripts": {
     "start": "rescript build -w",
@@ -13,7 +14,6 @@
     "tsc": "tsc -p tsconfig.json"
   },
   "devDependencies": {
-    "@rescript/react": "^0.10.3",
     "@types/node": "^13.13.4",
     "@types/react-dom": "^16.9.7",
     "rescript": "file:../../..",

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

@@ -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.bs.js

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