This repository was archived by the owner on Jun 15, 2023. It is now read-only.
File tree 10 files changed +25
-21
lines changed
expressions/__snapshots__
printer/ffi/__snapshots__ 10 files changed +25
-21
lines changed Original file line number Diff line number Diff line change @@ -879,7 +879,7 @@ let rec walkStructure s t comments =
879
879
attach t.trailing expr2.pexp_loc trailing
880
880
)
881
881
| Pexp_extension (
882
- {txt = " bs.obj" },
882
+ {txt = " bs.obj" | " obj " },
883
883
PStr [{
884
884
pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (rows, _)}, [] )
885
885
}]
Original file line number Diff line number Diff line change @@ -2919,7 +2919,7 @@ and parseRecordExprWithStringKeys ~startPos firstRow p =
2919
2919
Ast_helper.Exp. record ~loc rows None
2920
2920
) in
2921
2921
Ast_helper.Exp. extension ~loc
2922
- (Location. mkloc " bs. obj" loc, Parsetree. PStr [recordStrExpr])
2922
+ (Location. mkloc " obj" loc, Parsetree. PStr [recordStrExpr])
2923
2923
2924
2924
and parseRecordExpr ~startPos ?(spread =None ) rows p =
2925
2925
let exprs =
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ let importDescr ~attrs ~scope ~importSpec ~loc = {
39
39
}
40
40
41
41
let toParsetree importDescr =
42
- let bsVal = (Location. mknoloc " bs. val" , Parsetree. PStr [] ) in
42
+ let bsVal = (Location. mknoloc " val" , Parsetree. PStr [] ) in
43
43
let attrs = match importDescr.jid_scope with
44
44
| Global -> [bsVal]
45
45
(* @genType.import("./MyMath"),
@@ -63,7 +63,7 @@ let toParsetree importDescr =
63
63
Ast_helper.Str. eval expr
64
64
in
65
65
let bsScope = (
66
- Location. mknoloc " bs. scope" ,
66
+ Location. mknoloc " scope" ,
67
67
Parsetree. PStr [structureItem]
68
68
) in
69
69
[bsVal; bsScope]
@@ -113,4 +113,4 @@ let toParsetree importDescr =
113
113
let jsFfiAttr = (Location. mknoloc " ns.jsFfi" , Parsetree. PStr [] ) in
114
114
Ast_helper.Mod. structure ~loc: importDescr.jid_loc valueDescrs
115
115
|> Ast_helper.Incl. mk ~attrs: [jsFfiAttr] ~loc: importDescr.jid_loc
116
- |> Ast_helper.Str. include_ ~loc: importDescr.jid_loc
116
+ |> Ast_helper.Str. include_ ~loc: importDescr.jid_loc
Original file line number Diff line number Diff line change @@ -193,7 +193,7 @@ let isHuggableExpression expr =
193
193
| Pexp_tuple _
194
194
| Pexp_constant (Pconst_string (_, Some _))
195
195
| Pexp_construct ({txt = Longident. Lident (" ::" | " []" )}, _)
196
- | Pexp_extension ({txt = " bs.obj" }, _)
196
+ | Pexp_extension ({txt = " bs.obj" | " obj " }, _)
197
197
| Pexp_record _ -> true
198
198
| _ when isBlockExpr expr -> true
199
199
| _ when isBracedExpr expr -> true
@@ -205,7 +205,7 @@ let isHuggableRhs expr =
205
205
| Pexp_array _
206
206
| Pexp_tuple _
207
207
| Pexp_construct ({txt = Longident. Lident (" ::" | " []" )}, _)
208
- | Pexp_extension ({txt = " bs.obj" }, _)
208
+ | Pexp_extension ({txt = " bs.obj" | " obj " }, _)
209
209
| Pexp_record _ -> true
210
210
| _ when isBracedExpr expr -> true
211
211
| _ -> false
Original file line number Diff line number Diff line change @@ -2709,7 +2709,7 @@ and printExpression (e : Parsetree.expression) cmtTbl =
2709
2709
| Pexp_extension extension ->
2710
2710
begin match extension with
2711
2711
| (
2712
- {txt = " bs.obj" },
2712
+ {txt = " bs.obj" | " obj " },
2713
2713
PStr [{
2714
2714
pstr_loc = loc;
2715
2715
pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (rows, _)}, [] )
Original file line number Diff line number Diff line change @@ -1086,6 +1086,9 @@ exports[`jsObject.re 1`] = `
1086
1086
"let component = props[\\"Component\\"]
1087
1087
1088
1088
let element = props[\\"element\\"]
1089
+
1090
+ let y = { \\" age\\ " : 30 }
1091
+ let y = { \\" age\\ " : 30 , \\" name\\ " : \\" steve\\ " }
1089
1092
"
1090
1093
`;
1091
1094
Original file line number Diff line number Diff line change 1
1
let component = props## "Component"
2
2
3
3
let element = props## element
4
+
5
+ let y = {"age" : 30 }
6
+ let y = {"age" : 30 , "name" : "steve" }
Original file line number Diff line number Diff line change @@ -281,10 +281,10 @@ let x = ((let a = 1 in let b = 2 in a + b)[@ns.braces ])
281
281
` ;
282
282
283
283
exports [` bsObject.js 1` ] = `
284
- "let x = [%bs. obj { age = 30 } ]
285
- let y = [%bs. obj { age = 30 } ]
286
- let y = [%bs. obj { age = 30 ; name = \\" steve\\ " } ]
287
- let y = [%bs. obj { age = 30 ; name = \\" steve\\ " } ]
284
+ "let x = [%obj { age = 30 } ]
285
+ let y = [%obj { age = 30 } ]
286
+ let y = [%obj { age = 30 ; name = \\" steve\\ " } ]
287
+ let y = [%obj { age = 30 ; name = \\" steve\\ " } ]
288
288
let x = ((\\ "age\\ ")[@ns.braces ])
289
289
let x = ((\\ "age\\ ".(0))[@ns.braces ])
290
290
let x = ((\\ "age\\ " |. Js.log)[@ns.braces ])
Original file line number Diff line number Diff line change @@ -62,27 +62,25 @@ exports[`jsFfiSugar.js 1`] = `
62
62
"include
63
63
struct
64
64
external setTimeout : (unit -> unit) -> unit -> float = \\ "setTimeout\\ "
65
- [@@bs. val ]
65
+ [@@val ]
66
66
end[@@ns.jsFfi ]
67
67
include
68
68
struct
69
- external timeout : (unit -> unit) -> unit -> float = \\ "setTimeout\\ "
70
- [@@bs.val ]
69
+ external timeout : (unit -> unit) -> unit -> float = \\ "setTimeout\\ "[@@val ]
71
70
end[@@ns.jsFfi ]
72
71
include
73
72
struct
74
73
external setTimeout : (unit -> unit) -> unit -> float = \\ "setTimeout\\ "
75
- [@@bs. val ]
76
- external clearTimeout : float -> unit = \\ "clearTimeout\\ "[@@bs. val ]
74
+ [@@val ]
75
+ external clearTimeout : float -> unit = \\ "clearTimeout\\ "[@@val ]
77
76
end[@@ns.jsFfi ]
78
77
include
79
78
struct
80
- external random : unit -> float = \\ "random\\ "[@@bs. val ][@@bs. scope \\ "Math\\ "]
79
+ external random : unit -> float = \\ "random\\ "[@@val ][@@scope \\ "Math\\ "]
81
80
end[@@ns.jsFfi ]
82
81
include
83
82
struct
84
- external href : string = \\ "href\\ "[@@bs.val ][@@bs.scope
85
- (\\ "window\\ ", \\ "location\\ ")]
83
+ external href : string = \\ "href\\ "[@@val ][@@scope (\\ "window\\ ", \\ "location\\ ")]
86
84
end[@@ns.jsFfi ]
87
85
include
88
86
struct
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ include {
36
36
37
37
@ns.jsFfi
38
38
include {
39
- @bs . val external document : Dom .document = \\" document\\ "
39
+ @val external document : Dom .document = \\" document\\ "
40
40
}
41
41
"
42
42
` ;
You can’t perform that action at this time.
0 commit comments