small tweaks to support jsType with default

Author: bobzhang

Diff for: jscomp/syntax/ast_derive_js_mapper.ml

@@ -46,8 +46,18 @@ let handle_config (config : Parsetree.expression option) =
      | Pexp_record (
          [ 
            {txt = Lident "jsType"}, 
-           {pexp_desc = Pexp_construct ({txt = Lident ("true" | "false" as x )}, None)}],None)
-       ->  x = "true"
+           {pexp_desc = 
+              (Pexp_construct 
+                 (
+                   {txt =
+                      Lident ("true" 
+                             | "false" 
+                               as x)}, None)
+              | Pexp_ident {txt = Lident ("jsType" as x)}
+              )
+           }
+         ],None)
+       ->  not (x = "false")
      | _ -> invalid_config config)
   | None -> false
 let noloc = Location.none

Diff for: jscomp/test/ast_abstract_test.ml

@@ -53,7 +53,7 @@ type c =
   | D1
   | D2 
   | D3 
-[@@bs.deriving {jsMapper = {jsType = true}}]       
+[@@bs.deriving {jsMapper = {jsType }}]       
 
 let c0 = cToJs D0 
 

Diff for: lib/bsdep.ml

@@ -30923,8 +30923,18 @@ let handle_config (config : Parsetree.expression option) =
      | Pexp_record (
          [ 
            {txt = Lident "jsType"}, 
-           {pexp_desc = Pexp_construct ({txt = Lident ("true" | "false" as x )}, None)}],None)
-       ->  x = "true"
+           {pexp_desc = 
+              (Pexp_construct 
+                 (
+                   {txt =
+                      Lident ("true" 
+                             | "false" 
+                               as x)}, None)
+              | Pexp_ident {txt = Lident ("jsType" as x)}
+              )
+           }
+         ],None)
+       ->  not (x = "false")
      | _ -> invalid_config config)
   | None -> false
 let noloc = Location.none

Diff for: lib/bsppx.ml

@@ -12871,8 +12871,18 @@ let handle_config (config : Parsetree.expression option) =
      | Pexp_record (
          [ 
            {txt = Lident "jsType"}, 
-           {pexp_desc = Pexp_construct ({txt = Lident ("true" | "false" as x )}, None)}],None)
-       ->  x = "true"
+           {pexp_desc = 
+              (Pexp_construct 
+                 (
+                   {txt =
+                      Lident ("true" 
+                             | "false" 
+                               as x)}, None)
+              | Pexp_ident {txt = Lident ("jsType" as x)}
+              )
+           }
+         ],None)
+       ->  not (x = "false")
      | _ -> invalid_config config)
   | None -> false
 let noloc = Location.none

Diff for: lib/whole_compiler.ml

@@ -105690,8 +105690,18 @@ let handle_config (config : Parsetree.expression option) =
      | Pexp_record (
          [ 
            {txt = Lident "jsType"}, 
-           {pexp_desc = Pexp_construct ({txt = Lident ("true" | "false" as x )}, None)}],None)
-       ->  x = "true"
+           {pexp_desc = 
+              (Pexp_construct 
+                 (
+                   {txt =
+                      Lident ("true" 
+                             | "false" 
+                               as x)}, None)
+              | Pexp_ident {txt = Lident ("jsType" as x)}
+              )
+           }
+         ],None)
+       ->  not (x = "false")
      | _ -> invalid_config config)
   | None -> false
 let noloc = Location.none