Support Map and WeakMap

Author: cristianoc

jscomp/gentype/GenTypeCommon.ml

@@ -217,10 +217,12 @@ let unknown = ident "unknown"
 let bigintT = ident "BigInt"
 let booleanT = ident "boolean"
 let dateT = ident "Date"
+let mapT (x,y) = ident ~typeArgs:[x;y] "Map"
 let numberT = ident "number"
 let regexpT = ident "RegExp"
 let stringT = ident "string"
 let unitT = ident "void"
+let weakmapT (x,y) = ident ~typeArgs:[x;y] "WeakMap"
 let int64T = Tuple [numberT; numberT]
 
 module NodeFilename = struct

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -84,6 +84,18 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
     {dependencies = []; type_ = bigintT}
   | (["Js"; "Date"; "t"] | ["Date"; "t"]), [] ->
     {dependencies = []; type_ = dateT}
+  | ["Map"; "t"], [paramTranslation1; paramTranslation2] ->
+    {
+      dependencies =
+        paramTranslation1.dependencies @ paramTranslation2.dependencies;
+      type_ = mapT (paramTranslation1.type_, paramTranslation2.type_);
+    }
+  | ["WeakMap"; "t"], [paramTranslation1; paramTranslation2] ->
+    {
+      dependencies =
+        paramTranslation1.dependencies @ paramTranslation2.dependencies;
+      type_ = weakmapT (paramTranslation1.type_, paramTranslation2.type_);
+    }
   | (["Js"; "Re"; "t"] | ["RegExp"; "t"]), [] ->
     {dependencies = []; type_ = regexpT}
   | (["FB"; "unit"] | ["unit"]), [] -> {dependencies = []; type_ = unitT}

jscomp/gentype_tests/typescript-react-example/src/Core.bs.js

@@ -43,3 +43,7 @@ export const bigint1: (x:BigInt) => BigInt = CoreBS.bigint1;
 export const regexp0: (x:RegExp) => RegExp = CoreBS.regexp0;
 
 export const regexp1: (x:RegExp) => RegExp = CoreBS.regexp1;
+
+export const map1: (x:Map<string,number>) => Map<string,number> = CoreBS.map1;
+
+export const weakmap1: (x:WeakMap<number[],number>) => WeakMap<number[],number> = CoreBS.weakmap1;

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

@@ -45,3 +45,11 @@ let regexp0 = (x: Js.Re.t) => x
 
 @genType
 let regexp1 = (x: RegExp.t) => x
+
+module Map = Map_
+
+@genType
+let map1 = (x: Map.t<string, int>) => x
+
+@genType
+let weakmap1 = (x: WeakMap.t<array<int>, int>) => x

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

@@ -0,0 +1 @@
+type t<'k, 'v>

jscomp/gentype_tests/typescript-react-example/src/Map_.bs.js

@@ -0,0 +1 @@
+type t<'k, 'v>