napkin: revert the rest of upstream PR#291

rescript-lang/syntax#291

Author: anmonteiro

jscomp/napkin/res_ast_conversion.ml

@@ -359,14 +359,6 @@ let normalize =
       | _ ->
         default_mapper.pat mapper p
     end;
-    typ = (fun mapper typ ->
-      match typ.ptyp_desc with
-      | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, [arg]) ->
-        (* Js.t({"a": b}) -> {"a": b}
-          Since compiler >9.0.1 objects don't need Js.t wrapping anymore *)
-         mapper.typ mapper arg
-      | _ -> default_mapper.typ mapper typ
-    );
     expr = (fun mapper expr ->
       match expr.pexp_desc with
       | Pexp_constant (Pconst_string (txt, None)) ->

jscomp/napkin/res_core.ml

@@ -375,6 +375,15 @@ let makeListPattern loc seq ext_opt =
       Ast_helper.Pat.mk ~loc (Ppat_construct(Location.mkloc (Longident.Lident "::") loc, Some arg))
   in
   handle_seq seq
+(* {"foo": bar} -> Js.t({. foo: bar})
+ * {.. "foo": bar} -> Js.t({.. foo: bar})
+ * {..} -> Js.t({..}) *)
+let makeBsObjType ~attrs ~loc ~closed rows =
+  let obj = Ast_helper.Typ.object_ ~loc rows closed in
+  let jsDotTCtor =
+    Location.mkloc (Longident.Ldot (Longident.Lident "Js", "t")) loc
+  in
+  Ast_helper.Typ.constr ~loc ~attrs jsDotTCtor [obj]
 
 (* TODO: diagnostic reporting *)
 let lidentOfPath longident =
@@ -3806,7 +3815,7 @@ and parseRecordOrBsObjectType ~attrs p =
   in
   Parser.expect Rbrace p;
   let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Typ.object_ ~loc ~attrs fields closedFlag
+  makeBsObjType ~attrs ~loc ~closed:closedFlag fields
 
 (* TODO: check associativity in combination with attributes *)
 and parseTypeAlias p typ =
@@ -4208,7 +4217,7 @@ and parseConstrDeclArgs p =
         in
         Parser.expect Rbrace p;
         let loc = mkLoc startPos p.prevEndPos in
-        let typ = Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag in
+        let typ = makeBsObjType ~attrs:[] ~loc ~closed:closedFlag fields in
         Parser.optional p Comma |> ignore;
         let moreArgs =
           parseCommaDelimitedRegion
@@ -4259,7 +4268,7 @@ and parseConstrDeclArgs p =
             ) in
             Parser.expect Rbrace p;
             let loc = mkLoc startPos p.prevEndPos in
-            let typ = Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag in
+            let typ = makeBsObjType ~attrs:[]  ~loc ~closed:closedFlag fields in
             Parser.optional p Comma |> ignore;
             let moreArgs =
               parseCommaDelimitedRegion
@@ -4591,7 +4600,7 @@ and parseRecordOrBsObjectDecl p =
     Parser.expect Rbrace p;
     let loc = mkLoc startPos p.prevEndPos in
     let typ =
-      Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag
+      makeBsObjType ~attrs:[] ~loc ~closed:closedFlag fields
       |> parseTypeAlias p
     in
     let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
@@ -4638,7 +4647,7 @@ and parseRecordOrBsObjectDecl p =
         Parser.expect Rbrace p;
         let loc = mkLoc startPos p.prevEndPos in
         let typ =
-          Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag |> parseTypeAlias p
+          makeBsObjType ~attrs:[] ~loc ~closed:closedFlag fields |> parseTypeAlias p
         in
         let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
         (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)

jscomp/napkin/res_printer.ml

@@ -1468,9 +1468,17 @@ and printTypExpr (typExpr : Parsetree.core_type) cmtTbl =
     in
     Doc.concat [typ; Doc.text " as "; Doc.concat [Doc.text "'"; printIdentLike alias]]
 
+  | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, [{ptyp_desc = Ptyp_object (_fields, _openFlag)} as typ]) ->
+    let bsObject = printTypExpr typ cmtTbl in
+    begin match typExpr.ptyp_attributes with
+    | [] -> bsObject
+    | attrs ->
+      Doc.concat [
+        printAttributes ~inline:true attrs cmtTbl;
+        printTypExpr typ cmtTbl;
+      ]
+    end
   (* object printings *)
-  | Ptyp_object (fields, openFlag) ->
-    printObject ~inline:false fields openFlag cmtTbl
   | Ptyp_constr(longidentLoc, [{ptyp_desc = Ptyp_object (fields, openFlag)}]) ->
     (* for foo<{"a": b}>, when the object is long and needs a line break, we
        want the <{ and }> to stay hugged together *)
@@ -1496,6 +1504,17 @@ and printTypExpr (typExpr : Parsetree.core_type) cmtTbl =
     let constrName = printLidentPath longidentLoc cmtTbl in
     begin match constrArgs with
     | [] -> constrName
+    | [{
+        Parsetree.ptyp_desc =
+          Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")},
+        [{ptyp_desc = Ptyp_object (fields, openFlag)}])
+      }] ->
+      Doc.concat([
+        constrName;
+        Doc.lessThan;
+        printObject ~inline:true fields openFlag cmtTbl;
+        Doc.greaterThan;
+      ])
     | _args -> Doc.group(
       Doc.concat([
         constrName;
@@ -1599,6 +1618,8 @@ and printTypExpr (typExpr : Parsetree.core_type) cmtTbl =
       )
     end
   | Ptyp_tuple types -> printTupleType ~inline:false types cmtTbl
+  | Ptyp_object (fields, openFlag) ->
+    printObject ~inline:false fields openFlag cmtTbl
   | Ptyp_poly([], typ) ->
     printTypExpr typ cmtTbl
   | Ptyp_poly(stringLocs, typ) ->