Skip to content

Commit a64c2b9

Browse files
nkrkvnkrkv
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 0012a83 commit a64c2b9

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
@@ -121,10 +121,20 @@ let suffix_js = ".js"
121121

122122
let suffix_bs_js = ".bs.js"
123123

124+
let suffix_res_js = ".res.js"
125+
124126
let suffix_mjs = ".mjs"
125127

128+
let suffix_bs_mjs = ".bs.mjs"
129+
130+
let suffix_res_mjs = ".res.mjs"
131+
126132
let suffix_cjs = ".cjs"
127133

134+
let suffix_bs_cjs = ".bs.cjs"
135+
136+
let suffix_res_cjs = ".res.cjs"
137+
128138
let suffix_gen_js = ".gen.js"
129139

130140
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
@@ -1309,10 +1309,20 @@ let suffix_js = ".js"
13091309

13101310
let suffix_bs_js = ".bs.js"
13111311

1312+
let suffix_res_js = ".res.js"
1313+
13121314
let suffix_mjs = ".mjs"
13131315

1316+
let suffix_bs_mjs = ".bs.mjs"
1317+
1318+
let suffix_res_mjs = ".res.mjs"
1319+
13141320
let suffix_cjs = ".cjs"
13151321

1322+
let suffix_bs_cjs = ".bs.cjs"
1323+
1324+
let suffix_res_cjs = ".res.cjs"
1325+
13161326
let suffix_gen_js = ".gen.js"
13171327

13181328
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
@@ -7094,22 +7094,42 @@ end
70947094
module Ext_js_suffix
70957095
= struct
70967096
#1 "ext_js_suffix.ml"
7097-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
7097+
type t =
7098+
| Js
7099+
| Bs_js
7100+
| Res_js
7101+
| Mjs
7102+
| Bs_mjs
7103+
| Res_mjs
7104+
| Cjs
7105+
| Bs_cjs
7106+
| Res_cjs
7107+
| Unknown_extension
70987108
70997109
let to_string (x : t) =
71007110
match x with
71017111
| Js -> Literals.suffix_js
71027112
| Bs_js -> Literals.suffix_bs_js
7113+
| Res_js -> Literals.suffix_res_js
71037114
| Mjs -> Literals.suffix_mjs
7115+
| Bs_mjs -> Literals.suffix_bs_mjs
7116+
| Res_mjs -> Literals.suffix_res_mjs
71047117
| Cjs -> Literals.suffix_cjs
7118+
| Bs_cjs -> Literals.suffix_bs_cjs
7119+
| Res_cjs -> Literals.suffix_res_cjs
71057120
| Unknown_extension -> assert false
71067121
71077122
let of_string (x : string) : t =
71087123
match () with
71097124
| () when x = Literals.suffix_js -> Js
71107125
| () when x = Literals.suffix_bs_js -> Bs_js
7126+
| () when x = Literals.suffix_res_js -> Res_js
71117127
| () when x = Literals.suffix_mjs -> Mjs
7128+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
7129+
| () when x = Literals.suffix_res_mjs -> Res_mjs
71127130
| () when x = Literals.suffix_cjs -> Cjs
7131+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
7132+
| () when x = Literals.suffix_res_cjs -> Res_cjs
71137133
| _ -> Unknown_extension
71147134
71157135
end
@@ -7849,7 +7869,8 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
78497869
| Some (Str { str; loc }) ->
78507870
let s = Ext_js_suffix.of_string str in
78517871
if s = Unknown_extension then
7852-
Bsb_exception.errorf ~loc "expect .bs.js, .js, .cjs, .mjs here"
7872+
Bsb_exception.errorf ~loc
7873+
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
78537874
else s
78547875
| Some config ->
78557876
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
@@ -5802,10 +5802,20 @@ let suffix_js = ".js"
58025802

58035803
let suffix_bs_js = ".bs.js"
58045804

5805+
let suffix_res_js = ".res.js"
5806+
58055807
let suffix_mjs = ".mjs"
58065808

5809+
let suffix_bs_mjs = ".bs.mjs"
5810+
5811+
let suffix_res_mjs = ".res.mjs"
5812+
58075813
let suffix_cjs = ".cjs"
58085814

5815+
let suffix_bs_cjs = ".bs.cjs"
5816+
5817+
let suffix_res_cjs = ".res.cjs"
5818+
58095819
let suffix_gen_js = ".gen.js"
58105820

58115821
let suffix_gen_tsx = ".gen.tsx"
@@ -38344,22 +38354,42 @@ end
3834438354
module Ext_js_suffix
3834538355
= struct
3834638356
#1 "ext_js_suffix.ml"
38347-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
38357+
type t =
38358+
| Js
38359+
| Bs_js
38360+
| Res_js
38361+
| Mjs
38362+
| Bs_mjs
38363+
| Res_mjs
38364+
| Cjs
38365+
| Bs_cjs
38366+
| Res_cjs
38367+
| Unknown_extension
3834838368

3834938369
let to_string (x : t) =
3835038370
match x with
3835138371
| Js -> Literals.suffix_js
3835238372
| Bs_js -> Literals.suffix_bs_js
38373+
| Res_js -> Literals.suffix_res_js
3835338374
| Mjs -> Literals.suffix_mjs
38375+
| Bs_mjs -> Literals.suffix_bs_mjs
38376+
| Res_mjs -> Literals.suffix_res_mjs
3835438377
| Cjs -> Literals.suffix_cjs
38378+
| Bs_cjs -> Literals.suffix_bs_cjs
38379+
| Res_cjs -> Literals.suffix_res_cjs
3835538380
| Unknown_extension -> assert false
3835638381

3835738382
let of_string (x : string) : t =
3835838383
match () with
3835938384
| () when x = Literals.suffix_js -> Js
3836038385
| () when x = Literals.suffix_bs_js -> Bs_js
38386+
| () when x = Literals.suffix_res_js -> Res_js
3836138387
| () when x = Literals.suffix_mjs -> Mjs
38388+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
38389+
| () when x = Literals.suffix_res_mjs -> Res_mjs
3836238390
| () when x = Literals.suffix_cjs -> Cjs
38391+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
38392+
| () when x = Literals.suffix_res_cjs -> Res_cjs
3836338393
| _ -> Unknown_extension
3836438394

3836538395
end

‎lib/4.06.1/unstable/js_compiler.ml

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

64996499
let suffix_bs_js = ".bs.js"
65006500

6501+
let suffix_res_js = ".res.js"
6502+
65016503
let suffix_mjs = ".mjs"
65026504

6505+
let suffix_bs_mjs = ".bs.mjs"
6506+
6507+
let suffix_res_mjs = ".res.mjs"
6508+
65036509
let suffix_cjs = ".cjs"
65046510

6511+
let suffix_bs_cjs = ".bs.cjs"
6512+
6513+
let suffix_res_cjs = ".res.cjs"
6514+
65056515
let suffix_gen_js = ".gen.js"
65066516

65076517
let suffix_gen_tsx = ".gen.tsx"
@@ -46750,22 +46760,42 @@ end
4675046760
module Ext_js_suffix
4675146761
= struct
4675246762
#1 "ext_js_suffix.ml"
46753-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
46763+
type t =
46764+
| Js
46765+
| Bs_js
46766+
| Res_js
46767+
| Mjs
46768+
| Bs_mjs
46769+
| Res_mjs
46770+
| Cjs
46771+
| Bs_cjs
46772+
| Res_cjs
46773+
| Unknown_extension
4675446774

4675546775
let to_string (x : t) =
4675646776
match x with
4675746777
| Js -> Literals.suffix_js
4675846778
| Bs_js -> Literals.suffix_bs_js
46779+
| Res_js -> Literals.suffix_res_js
4675946780
| Mjs -> Literals.suffix_mjs
46781+
| Bs_mjs -> Literals.suffix_bs_mjs
46782+
| Res_mjs -> Literals.suffix_res_mjs
4676046783
| Cjs -> Literals.suffix_cjs
46784+
| Bs_cjs -> Literals.suffix_bs_cjs
46785+
| Res_cjs -> Literals.suffix_res_cjs
4676146786
| Unknown_extension -> assert false
4676246787

4676346788
let of_string (x : string) : t =
4676446789
match () with
4676546790
| () when x = Literals.suffix_js -> Js
4676646791
| () when x = Literals.suffix_bs_js -> Bs_js
46792+
| () when x = Literals.suffix_res_js -> Res_js
4676746793
| () when x = Literals.suffix_mjs -> Mjs
46794+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46795+
| () when x = Literals.suffix_res_mjs -> Res_mjs
4676846796
| () when x = Literals.suffix_cjs -> Cjs
46797+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46798+
| () when x = Literals.suffix_res_cjs -> Res_cjs
4676946799
| _ -> Unknown_extension
4677046800

4677146801
end

‎lib/4.06.1/unstable/js_playground_compiler.ml

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

64996499
let suffix_bs_js = ".bs.js"
65006500

6501+
let suffix_res_js = ".res.js"
6502+
65016503
let suffix_mjs = ".mjs"
65026504

6505+
let suffix_bs_mjs = ".bs.mjs"
6506+
6507+
let suffix_res_mjs = ".res.mjs"
6508+
65036509
let suffix_cjs = ".cjs"
65046510

6511+
let suffix_bs_cjs = ".bs.cjs"
6512+
6513+
let suffix_res_cjs = ".res.cjs"
6514+
65056515
let suffix_gen_js = ".gen.js"
65066516

65076517
let suffix_gen_tsx = ".gen.tsx"
@@ -46750,22 +46760,42 @@ end
4675046760
module Ext_js_suffix
4675146761
= struct
4675246762
#1 "ext_js_suffix.ml"
46753-
type t = Js | Bs_js | Mjs | Cjs | Unknown_extension
46763+
type t =
46764+
| Js
46765+
| Bs_js
46766+
| Res_js
46767+
| Mjs
46768+
| Bs_mjs
46769+
| Res_mjs
46770+
| Cjs
46771+
| Bs_cjs
46772+
| Res_cjs
46773+
| Unknown_extension
4675446774

4675546775
let to_string (x : t) =
4675646776
match x with
4675746777
| Js -> Literals.suffix_js
4675846778
| Bs_js -> Literals.suffix_bs_js
46779+
| Res_js -> Literals.suffix_res_js
4675946780
| Mjs -> Literals.suffix_mjs
46781+
| Bs_mjs -> Literals.suffix_bs_mjs
46782+
| Res_mjs -> Literals.suffix_res_mjs
4676046783
| Cjs -> Literals.suffix_cjs
46784+
| Bs_cjs -> Literals.suffix_bs_cjs
46785+
| Res_cjs -> Literals.suffix_res_cjs
4676146786
| Unknown_extension -> assert false
4676246787

4676346788
let of_string (x : string) : t =
4676446789
match () with
4676546790
| () when x = Literals.suffix_js -> Js
4676646791
| () when x = Literals.suffix_bs_js -> Bs_js
46792+
| () when x = Literals.suffix_res_js -> Res_js
4676746793
| () when x = Literals.suffix_mjs -> Mjs
46794+
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46795+
| () when x = Literals.suffix_res_mjs -> Res_mjs
4676846796
| () when x = Literals.suffix_cjs -> Cjs
46797+
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46798+
| () when x = Literals.suffix_res_cjs -> Res_cjs
4676946799
| _ -> Unknown_extension
4677046800

4677146801
end

0 commit comments

Comments
 (0)