Skip to content

Commit 81c7caf

Browse files
nkrkvcristianoc
nkrkv
authored and
cristianoc
committed
Add extra variants for suffixes in bsconfig.json
- `.bs.mjs`, `.bs.cjs` to fill the gap between `.bs.js` and `.mjs` - `.res.js`, `.res.mjs`, `.res.cjs` to assist BS → ReScript rebranding
1 parent 145ec50 commit 81c7caf

File tree

9 files changed

+190
-8
lines changed

9 files changed

+190
-8
lines changed

‎jscomp/bsb/bsb_package_specs.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
188188
| Some (Str { str; loc }) ->
189189
let s = Ext_js_suffix.of_string str in
190190
if s = Unknown_extension then
191-
Bsb_exception.errorf ~loc "expect .bs.js, .js, .cjs, .mjs here"
191+
Bsb_exception.errorf ~loc
192+
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
192193
else s
193194
| Some config ->
194195
Bsb_exception.config_error config

‎jscomp/ext/ext_js_suffix.ml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
1-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
1+
type t =
2+
| Js
3+
| Bs_js
4+
| Res_js
5+
| Mjs
6+
| Bs_mjs
7+
| Res_mjs
8+
| Cjs
9+
| Bs_cjs
10+
| Res_cjs
11+
| Unknown_extension
212

313
let to_string (x : t) =
414
match x with
515
| Js -> Literals.suffix_js
616
| Bs_js -> Literals.suffix_bs_js
17+
| Res_js -> Literals.suffix_res_js
718
| Mjs -> Literals.suffix_mjs
19+
| Bs_mjs -> Literals.suffix_bs_mjs
20+
| Res_mjs -> Literals.suffix_res_mjs
821
| Cjs -> Literals.suffix_cjs
22+
| Bs_cjs -> Literals.suffix_bs_cjs
23+
| Res_cjs -> Literals.suffix_res_cjs
924
| Unknown_extension -> assert false
1025

1126
let of_string (x : string) : t =
1227
match () with
1328
| () when x = Literals.suffix_js -> Js
1429
| () when x = Literals.suffix_bs_js -> Bs_js
30+
| () when x = Literals.suffix_res_js -> Res_js
1531
| () when x = Literals.suffix_mjs -> Mjs
32+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
33+
| () when x = Literals.suffix_res_mjs -> Res_mjs
1634
| () when x = Literals.suffix_cjs -> Cjs
35+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
36+
| () when x = Literals.suffix_res_cjs -> Res_cjs
1737
| _ -> Unknown_extension

‎jscomp/ext/literals.ml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,20 @@ let suffix_js = ".js"
125125

126126
let suffix_bs_js = ".bs.js"
127127

128+
let suffix_res_js = ".res.js"
129+
128130
let suffix_mjs = ".mjs"
129131

132+
let suffix_bs_mjs = ".bs.mjs"
133+
134+
let suffix_res_mjs = ".res.mjs"
135+
130136
let suffix_cjs = ".cjs"
131137

138+
let suffix_bs_cjs = ".bs.cjs"
139+
140+
let suffix_res_cjs = ".res.cjs"
141+
132142
let suffix_gen_js = ".gen.js"
133143

134144
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/bsb_helper.ml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,10 +1313,20 @@ let suffix_js = ".js"
13131313

13141314
let suffix_bs_js = ".bs.js"
13151315

1316+
let suffix_res_js = ".res.js"
1317+
13161318
let suffix_mjs = ".mjs"
13171319

1320+
let suffix_bs_mjs = ".bs.mjs"
1321+
1322+
let suffix_res_mjs = ".res.mjs"
1323+
13181324
let suffix_cjs = ".cjs"
13191325

1326+
let suffix_bs_cjs = ".bs.cjs"
1327+
1328+
let suffix_res_cjs = ".res.cjs"
1329+
13201330
let suffix_gen_js = ".gen.js"
13211331

13221332
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/rescript.ml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7098,22 +7098,42 @@ end
70987098
module Ext_js_suffix
70997099
= struct
71007100
#1 "ext_js_suffix.ml"
7101-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
7101+
type t =
7102+
| Js
7103+
| Bs_js
7104+
| Res_js
7105+
| Mjs
7106+
| Bs_mjs
7107+
| Res_mjs
7108+
| Cjs
7109+
| Bs_cjs
7110+
| Res_cjs
7111+
| Unknown_extension
71027112

71037113
let to_string (x : t) =
71047114
match x with
71057115
| Js -> Literals.suffix_js
71067116
| Bs_js -> Literals.suffix_bs_js
7117+
| Res_js -> Literals.suffix_res_js
71077118
| Mjs -> Literals.suffix_mjs
7119+
| Bs_mjs -> Literals.suffix_bs_mjs
7120+
| Res_mjs -> Literals.suffix_res_mjs
71087121
| Cjs -> Literals.suffix_cjs
7122+
| Bs_cjs -> Literals.suffix_bs_cjs
7123+
| Res_cjs -> Literals.suffix_res_cjs
71097124
| Unknown_extension -> assert false
71107125

71117126
let of_string (x : string) : t =
71127127
match () with
71137128
| () when x = Literals.suffix_js -> Js
71147129
| () when x = Literals.suffix_bs_js -> Bs_js
7130+
| () when x = Literals.suffix_res_js -> Res_js
71157131
| () when x = Literals.suffix_mjs -> Mjs
7132+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
7133+
| () when x = Literals.suffix_res_mjs -> Res_mjs
71167134
| () when x = Literals.suffix_cjs -> Cjs
7135+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
7136+
| () when x = Literals.suffix_res_cjs -> Res_cjs
71177137
| _ -> Unknown_extension
71187138

71197139
end
@@ -7853,7 +7873,8 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
78537873
| Some (Str { str; loc }) ->
78547874
let s = Ext_js_suffix.of_string str in
78557875
if s = Unknown_extension then
7856-
Bsb_exception.errorf ~loc "expect .bs.js, .js, .cjs, .mjs here"
7876+
Bsb_exception.errorf ~loc
7877+
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
78577878
else s
78587879
| Some config ->
78597880
Bsb_exception.config_error config

‎lib/4.06.1/unstable/all_ounit_tests.ml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5806,10 +5806,20 @@ let suffix_js = ".js"
58065806

58075807
let suffix_bs_js = ".bs.js"
58085808

5809+
let suffix_res_js = ".res.js"
5810+
58095811
let suffix_mjs = ".mjs"
58105812

5813+
let suffix_bs_mjs = ".bs.mjs"
5814+
5815+
let suffix_res_mjs = ".res.mjs"
5816+
58115817
let suffix_cjs = ".cjs"
58125818

5819+
let suffix_bs_cjs = ".bs.cjs"
5820+
5821+
let suffix_res_cjs = ".res.cjs"
5822+
58135823
let suffix_gen_js = ".gen.js"
58145824

58155825
let suffix_gen_tsx = ".gen.tsx"
@@ -38348,22 +38358,42 @@ end
3834838358
module Ext_js_suffix
3834938359
= struct
3835038360
#1 "ext_js_suffix.ml"
38351-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
38361+
type t =
38362+
| Js
38363+
| Bs_js
38364+
| Res_js
38365+
| Mjs
38366+
| Bs_mjs
38367+
| Res_mjs
38368+
| Cjs
38369+
| Bs_cjs
38370+
| Res_cjs
38371+
| Unknown_extension
3835238372

3835338373
let to_string (x : t) =
3835438374
match x with
3835538375
| Js -> Literals.suffix_js
3835638376
| Bs_js -> Literals.suffix_bs_js
38377+
| Res_js -> Literals.suffix_res_js
3835738378
| Mjs -> Literals.suffix_mjs
38379+
| Bs_mjs -> Literals.suffix_bs_mjs
38380+
| Res_mjs -> Literals.suffix_res_mjs
3835838381
| Cjs -> Literals.suffix_cjs
38382+
| Bs_cjs -> Literals.suffix_bs_cjs
38383+
| Res_cjs -> Literals.suffix_res_cjs
3835938384
| Unknown_extension -> assert false
3836038385

3836138386
let of_string (x : string) : t =
3836238387
match () with
3836338388
| () when x = Literals.suffix_js -> Js
3836438389
| () when x = Literals.suffix_bs_js -> Bs_js
38390+
| () when x = Literals.suffix_res_js -> Res_js
3836538391
| () when x = Literals.suffix_mjs -> Mjs
38392+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
38393+
| () when x = Literals.suffix_res_mjs -> Res_mjs
3836638394
| () when x = Literals.suffix_cjs -> Cjs
38395+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
38396+
| () when x = Literals.suffix_res_cjs -> Res_cjs
3836738397
| _ -> Unknown_extension
3836838398

3836938399
end

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6502,10 +6502,20 @@ let suffix_js = ".js"
65026502

65036503
let suffix_bs_js = ".bs.js"
65046504

6505+
let suffix_res_js = ".res.js"
6506+
65056507
let suffix_mjs = ".mjs"
65066508

6509+
let suffix_bs_mjs = ".bs.mjs"
6510+
6511+
let suffix_res_mjs = ".res.mjs"
6512+
65076513
let suffix_cjs = ".cjs"
65086514

6515+
let suffix_bs_cjs = ".bs.cjs"
6516+
6517+
let suffix_res_cjs = ".res.cjs"
6518+
65096519
let suffix_gen_js = ".gen.js"
65106520

65116521
let suffix_gen_tsx = ".gen.tsx"
@@ -46754,22 +46764,42 @@ end
4675446764
module Ext_js_suffix
4675546765
= struct
4675646766
#1 "ext_js_suffix.ml"
46757-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
46767+
type t =
46768+
| Js
46769+
| Bs_js
46770+
| Res_js
46771+
| Mjs
46772+
| Bs_mjs
46773+
| Res_mjs
46774+
| Cjs
46775+
| Bs_cjs
46776+
| Res_cjs
46777+
| Unknown_extension
4675846778

4675946779
let to_string (x : t) =
4676046780
match x with
4676146781
| Js -> Literals.suffix_js
4676246782
| Bs_js -> Literals.suffix_bs_js
46783+
| Res_js -> Literals.suffix_res_js
4676346784
| Mjs -> Literals.suffix_mjs
46785+
| Bs_mjs -> Literals.suffix_bs_mjs
46786+
| Res_mjs -> Literals.suffix_res_mjs
4676446787
| Cjs -> Literals.suffix_cjs
46788+
| Bs_cjs -> Literals.suffix_bs_cjs
46789+
| Res_cjs -> Literals.suffix_res_cjs
4676546790
| Unknown_extension -> assert false
4676646791

4676746792
let of_string (x : string) : t =
4676846793
match () with
4676946794
| () when x = Literals.suffix_js -> Js
4677046795
| () when x = Literals.suffix_bs_js -> Bs_js
46796+
| () when x = Literals.suffix_res_js -> Res_js
4677146797
| () when x = Literals.suffix_mjs -> Mjs
46798+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46799+
| () when x = Literals.suffix_res_mjs -> Res_mjs
4677246800
| () when x = Literals.suffix_cjs -> Cjs
46801+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46802+
| () when x = Literals.suffix_res_cjs -> Res_cjs
4677346803
| _ -> Unknown_extension
4677446804

4677546805
end

‎lib/4.06.1/unstable/js_playground_compiler.ml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6502,10 +6502,20 @@ let suffix_js = ".js"
65026502

65036503
let suffix_bs_js = ".bs.js"
65046504

6505+
let suffix_res_js = ".res.js"
6506+
65056507
let suffix_mjs = ".mjs"
65066508

6509+
let suffix_bs_mjs = ".bs.mjs"
6510+
6511+
let suffix_res_mjs = ".res.mjs"
6512+
65076513
let suffix_cjs = ".cjs"
65086514

6515+
let suffix_bs_cjs = ".bs.cjs"
6516+
6517+
let suffix_res_cjs = ".res.cjs"
6518+
65096519
let suffix_gen_js = ".gen.js"
65106520

65116521
let suffix_gen_tsx = ".gen.tsx"
@@ -46754,22 +46764,42 @@ end
4675446764
module Ext_js_suffix
4675546765
= struct
4675646766
#1 "ext_js_suffix.ml"
46757-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
46767+
type t =
46768+
| Js
46769+
| Bs_js
46770+
| Res_js
46771+
| Mjs
46772+
| Bs_mjs
46773+
| Res_mjs
46774+
| Cjs
46775+
| Bs_cjs
46776+
| Res_cjs
46777+
| Unknown_extension
4675846778

4675946779
let to_string (x : t) =
4676046780
match x with
4676146781
| Js -> Literals.suffix_js
4676246782
| Bs_js -> Literals.suffix_bs_js
46783+
| Res_js -> Literals.suffix_res_js
4676346784
| Mjs -> Literals.suffix_mjs
46785+
| Bs_mjs -> Literals.suffix_bs_mjs
46786+
| Res_mjs -> Literals.suffix_res_mjs
4676446787
| Cjs -> Literals.suffix_cjs
46788+
| Bs_cjs -> Literals.suffix_bs_cjs
46789+
| Res_cjs -> Literals.suffix_res_cjs
4676546790
| Unknown_extension -> assert false
4676646791

4676746792
let of_string (x : string) : t =
4676846793
match () with
4676946794
| () when x = Literals.suffix_js -> Js
4677046795
| () when x = Literals.suffix_bs_js -> Bs_js
46796+
| () when x = Literals.suffix_res_js -> Res_js
4677146797
| () when x = Literals.suffix_mjs -> Mjs
46798+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46799+
| () when x = Literals.suffix_res_mjs -> Res_mjs
4677246800
| () when x = Literals.suffix_cjs -> Cjs
46801+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46802+
| () when x = Literals.suffix_res_cjs -> Res_cjs
4677346803
| _ -> Unknown_extension
4677446804

4677546805
end

0 commit comments

Comments
 (0)