Skip to content

Commit b4fd150

Browse files
ELLIOTTCABLEELLIOTTCABLE
committed
(- meta) Update lib/. Plz explain why this is checked into source-control ... =/
1 parent be33cb6 commit b4fd150

File tree

9 files changed

+146
-66
lines changed

9 files changed

+146
-66
lines changed

‎lib/4.06.1/bsb_helper.ml‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2977,7 +2977,9 @@ val suffix_rei : string
29772977

29782978
val suffix_d : string
29792979
val suffix_js : string
2980+
val suffix_mjs : string
29802981
val suffix_bs_js : string
2982+
val suffix_bs_mjs : string
29812983
(* val suffix_re_js : string *)
29822984
val suffix_gen_js : string
29832985
val suffix_gen_tsx: string
@@ -3116,7 +3118,9 @@ let suffix_reiast = ".reiast"
31163118
let suffix_mliast_simple = ".mliast_simple"
31173119
let suffix_d = ".d"
31183120
let suffix_js = ".js"
3121+
let suffix_mjs = ".mjs"
31193122
let suffix_bs_js = ".bs.js"
3123+
let suffix_bs_mjs = ".bs.mjs"
31203124
(* let suffix_re_js = ".re.js" *)
31213125
let suffix_gen_js = ".gen.js"
31223126
let suffix_gen_tsx = ".gen.tsx"
@@ -3683,7 +3687,10 @@ val make : ?ns:string -> string -> string
36833687

36843688
val try_split_module_name : string -> (string * string) option
36853689

3686-
val change_ext_ns_suffix : string -> string -> string
3690+
val replace_namespace_with_extension : name:string -> ext:string -> string
3691+
(** [replace_namespace_with_extension ~name ~ext] removes the part of [name]
3692+
after [ns_sep_char], if any; and appends [ext].
3693+
*)
36873694

36883695
type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
36893696

@@ -3755,7 +3762,7 @@ let rec rindex_rec s i =
37553762
#1933 when removing ns suffix, don't pass the bound of basename
37563763
37573764
FIXME: micro-optimizaiton *)
3758-
let change_ext_ns_suffix name ext =
3765+
let replace_namespace_with_extension ~name ~ext =
37593766
let i = rindex_rec name (String.length name - 1) in
37603767
if i < 0 then name ^ ext else String.sub name 0 i ^ ext
37613768

@@ -3771,20 +3778,24 @@ type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
37713778

37723779

37733780
(* let js_name_of_basename bs_suffix s =
3774-
change_ext_ns_suffix s
3775-
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
3781+
replace_namespace_with_extension ~name:s
3782+
~ext:(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
37763783

37773784

37783785
let js_name_of_modulename s little =
37793786
match little with
37803787
| Little_js ->
3781-
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js
3788+
replace_namespace_with_extension
3789+
~name:(Ext_string.uncapitalize_ascii s)
3790+
~ext:Literals.suffix_js
37823791
| Little_bs ->
3783-
change_ext_ns_suffix
3784-
(Ext_string.uncapitalize_ascii s)
3785-
Literals.suffix_bs_js
3786-
| Upper_js -> change_ext_ns_suffix s Literals.suffix_js
3787-
| Upper_bs -> change_ext_ns_suffix s Literals.suffix_bs_js
3792+
replace_namespace_with_extension
3793+
~name:(Ext_string.uncapitalize_ascii s)
3794+
~ext:Literals.suffix_bs_js
3795+
| Upper_js -> replace_namespace_with_extension ~name:s ~ext:Literals.suffix_js
3796+
| Upper_bs ->
3797+
replace_namespace_with_extension ~name:s ~ext:Literals.suffix_bs_js
3798+
37883799

37893800
(* https://docs.npmjs.com/files/package.json
37903801
Some rules:

‎lib/4.06.1/bsdep.ml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37200,7 +37200,9 @@ val suffix_rei : string
3720037200

3720137201
val suffix_d : string
3720237202
val suffix_js : string
37203+
val suffix_mjs : string
3720337204
val suffix_bs_js : string
37205+
val suffix_bs_mjs : string
3720437206
(* val suffix_re_js : string *)
3720537207
val suffix_gen_js : string
3720637208
val suffix_gen_tsx: string
@@ -37339,7 +37341,9 @@ let suffix_reiast = ".reiast"
3733937341
let suffix_mliast_simple = ".mliast_simple"
3734037342
let suffix_d = ".d"
3734137343
let suffix_js = ".js"
37344+
let suffix_mjs = ".mjs"
3734237345
let suffix_bs_js = ".bs.js"
37346+
let suffix_bs_mjs = ".bs.mjs"
3734337347
(* let suffix_re_js = ".re.js" *)
3734437348
let suffix_gen_js = ".gen.js"
3734537349
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/bsppx.ml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294376,7 +294376,9 @@ val suffix_rei : string
294376294376

294377294377
val suffix_d : string
294378294378
val suffix_js : string
294379+
val suffix_mjs : string
294379294380
val suffix_bs_js : string
294381+
val suffix_bs_mjs : string
294380294382
(* val suffix_re_js : string *)
294381294383
val suffix_gen_js : string
294382294384
val suffix_gen_tsx: string
@@ -294515,7 +294517,9 @@ let suffix_reiast = ".reiast"
294515294517
let suffix_mliast_simple = ".mliast_simple"
294516294518
let suffix_d = ".d"
294517294519
let suffix_js = ".js"
294520+
let suffix_mjs = ".mjs"
294518294521
let suffix_bs_js = ".bs.js"
294522+
let suffix_bs_mjs = ".bs.mjs"
294519294523
(* let suffix_re_js = ".re.js" *)
294520294524
let suffix_gen_js = ".gen.js"
294521294525
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/unstable/all_ounit_tests.ml‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5106,7 +5106,9 @@ val suffix_rei : string
51065106

51075107
val suffix_d : string
51085108
val suffix_js : string
5109+
val suffix_mjs : string
51095110
val suffix_bs_js : string
5111+
val suffix_bs_mjs : string
51105112
(* val suffix_re_js : string *)
51115113
val suffix_gen_js : string
51125114
val suffix_gen_tsx: string
@@ -5245,7 +5247,9 @@ let suffix_reiast = ".reiast"
52455247
let suffix_mliast_simple = ".mliast_simple"
52465248
let suffix_d = ".d"
52475249
let suffix_js = ".js"
5250+
let suffix_mjs = ".mjs"
52485251
let suffix_bs_js = ".bs.js"
5252+
let suffix_bs_mjs = ".bs.mjs"
52495253
(* let suffix_re_js = ".re.js" *)
52505254
let suffix_gen_js = ".gen.js"
52515255
let suffix_gen_tsx = ".gen.tsx"
@@ -16314,7 +16318,10 @@ val make : ?ns:string -> string -> string
1631416318

1631516319
val try_split_module_name : string -> (string * string) option
1631616320

16317-
val change_ext_ns_suffix : string -> string -> string
16321+
val replace_namespace_with_extension : name:string -> ext:string -> string
16322+
(** [replace_namespace_with_extension ~name ~ext] removes the part of [name]
16323+
after [ns_sep_char], if any; and appends [ext].
16324+
*)
1631816325

1631916326
type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
1632016327

@@ -16386,7 +16393,7 @@ let rec rindex_rec s i =
1638616393
#1933 when removing ns suffix, don't pass the bound of basename
1638716394

1638816395
FIXME: micro-optimizaiton *)
16389-
let change_ext_ns_suffix name ext =
16396+
let replace_namespace_with_extension ~name ~ext =
1639016397
let i = rindex_rec name (String.length name - 1) in
1639116398
if i < 0 then name ^ ext else String.sub name 0 i ^ ext
1639216399

@@ -16402,20 +16409,24 @@ type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
1640216409

1640316410

1640416411
(* let js_name_of_basename bs_suffix s =
16405-
change_ext_ns_suffix s
16406-
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
16412+
replace_namespace_with_extension ~name:s
16413+
~ext:(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
1640716414

1640816415

1640916416
let js_name_of_modulename s little =
1641016417
match little with
1641116418
| Little_js ->
16412-
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js
16419+
replace_namespace_with_extension
16420+
~name:(Ext_string.uncapitalize_ascii s)
16421+
~ext:Literals.suffix_js
1641316422
| Little_bs ->
16414-
change_ext_ns_suffix
16415-
(Ext_string.uncapitalize_ascii s)
16416-
Literals.suffix_bs_js
16417-
| Upper_js -> change_ext_ns_suffix s Literals.suffix_js
16418-
| Upper_bs -> change_ext_ns_suffix s Literals.suffix_bs_js
16423+
replace_namespace_with_extension
16424+
~name:(Ext_string.uncapitalize_ascii s)
16425+
~ext:Literals.suffix_bs_js
16426+
| Upper_js -> replace_namespace_with_extension ~name:s ~ext:Literals.suffix_js
16427+
| Upper_bs ->
16428+
replace_namespace_with_extension ~name:s ~ext:Literals.suffix_bs_js
16429+
1641916430

1642016431
(* https://docs.npmjs.com/files/package.json
1642116432
Some rules:
@@ -16871,10 +16882,16 @@ let suites =
1687116882
=~"ABb"
1687216883
end;
1687316884
__LOC__ >:: begin fun _ ->
16874-
Ext_namespace.change_ext_ns_suffix "a-b" Literals.suffix_js =~ "a.js";
16875-
Ext_namespace.change_ext_ns_suffix "a-" Literals.suffix_js =~ "a.js";
16876-
Ext_namespace.change_ext_ns_suffix "a--" Literals.suffix_js =~ "a-.js";
16877-
Ext_namespace.change_ext_ns_suffix "AA-b" Literals.suffix_js =~ "AA.js";
16885+
Ext_namespace.replace_namespace_with_extension
16886+
~name:"a-b" ~ext:Literals.suffix_js =~ "a.js";
16887+
Ext_namespace.replace_namespace_with_extension
16888+
~name:"a-" ~ext:Literals.suffix_js =~ "a.js";
16889+
Ext_namespace.replace_namespace_with_extension
16890+
~name:"a--" ~ext:Literals.suffix_js =~ "a-.js";
16891+
Ext_namespace.replace_namespace_with_extension
16892+
~name:"AA-b" ~ext:Literals.suffix_js =~ "AA.js";
16893+
Ext_namespace.replace_namespace_with_extension
16894+
~name:"AA-b" ~ext:Literals.suffix_js =~ "AA.js";
1687816895
Ext_namespace.js_name_of_modulename "AA-b" Little_js =~ "aA.js";
1687916896
Ext_namespace.js_name_of_modulename "AA-b" Upper_js =~ "AA.js";
1688016897
Ext_namespace.js_name_of_modulename "AA-b" Upper_bs =~ "AA.bs.js"

‎lib/4.06.1/unstable/bspack.ml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9966,7 +9966,9 @@ val suffix_rei : string
99669966

99679967
val suffix_d : string
99689968
val suffix_js : string
9969+
val suffix_mjs : string
99699970
val suffix_bs_js : string
9971+
val suffix_bs_mjs : string
99709972
(* val suffix_re_js : string *)
99719973
val suffix_gen_js : string
99729974
val suffix_gen_tsx: string
@@ -10105,7 +10107,9 @@ let suffix_reiast = ".reiast"
1010510107
let suffix_mliast_simple = ".mliast_simple"
1010610108
let suffix_d = ".d"
1010710109
let suffix_js = ".js"
10110+
let suffix_mjs = ".mjs"
1010810111
let suffix_bs_js = ".bs.js"
10112+
let suffix_bs_mjs = ".bs.mjs"
1010910113
(* let suffix_re_js = ".re.js" *)
1011010114
let suffix_gen_js = ".gen.js"
1011110115
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/unstable/js_compiler.ml‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15178,7 +15178,9 @@ val suffix_rei : string
1517815178

1517915179
val suffix_d : string
1518015180
val suffix_js : string
15181+
val suffix_mjs : string
1518115182
val suffix_bs_js : string
15183+
val suffix_bs_mjs : string
1518215184
(* val suffix_re_js : string *)
1518315185
val suffix_gen_js : string
1518415186
val suffix_gen_tsx: string
@@ -15317,7 +15319,9 @@ let suffix_reiast = ".reiast"
1531715319
let suffix_mliast_simple = ".mliast_simple"
1531815320
let suffix_d = ".d"
1531915321
let suffix_js = ".js"
15322+
let suffix_mjs = ".mjs"
1532015323
let suffix_bs_js = ".bs.js"
15324+
let suffix_bs_mjs = ".bs.mjs"
1532115325
(* let suffix_re_js = ".re.js" *)
1532215326
let suffix_gen_js = ".gen.js"
1532315327
let suffix_gen_tsx = ".gen.tsx"
@@ -75488,7 +75492,10 @@ val make : ?ns:string -> string -> string
7548875492

7548975493
val try_split_module_name : string -> (string * string) option
7549075494

75491-
val change_ext_ns_suffix : string -> string -> string
75495+
val replace_namespace_with_extension : name:string -> ext:string -> string
75496+
(** [replace_namespace_with_extension ~name ~ext] removes the part of [name]
75497+
after [ns_sep_char], if any; and appends [ext].
75498+
*)
7549275499

7549375500
type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
7549475501

@@ -75560,7 +75567,7 @@ let rec rindex_rec s i =
7556075567
#1933 when removing ns suffix, don't pass the bound of basename
7556175568

7556275569
FIXME: micro-optimizaiton *)
75563-
let change_ext_ns_suffix name ext =
75570+
let replace_namespace_with_extension ~name ~ext =
7556475571
let i = rindex_rec name (String.length name - 1) in
7556575572
if i < 0 then name ^ ext else String.sub name 0 i ^ ext
7556675573

@@ -75576,20 +75583,24 @@ type file_kind = Upper_js | Upper_bs | Little_js | Little_bs
7557675583

7557775584

7557875585
(* let js_name_of_basename bs_suffix s =
75579-
change_ext_ns_suffix s
75580-
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
75586+
replace_namespace_with_extension ~name:s
75587+
~ext:(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) *)
7558175588

7558275589

7558375590
let js_name_of_modulename s little =
7558475591
match little with
7558575592
| Little_js ->
75586-
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js
75593+
replace_namespace_with_extension
75594+
~name:(Ext_string.uncapitalize_ascii s)
75595+
~ext:Literals.suffix_js
7558775596
| Little_bs ->
75588-
change_ext_ns_suffix
75589-
(Ext_string.uncapitalize_ascii s)
75590-
Literals.suffix_bs_js
75591-
| Upper_js -> change_ext_ns_suffix s Literals.suffix_js
75592-
| Upper_bs -> change_ext_ns_suffix s Literals.suffix_bs_js
75597+
replace_namespace_with_extension
75598+
~name:(Ext_string.uncapitalize_ascii s)
75599+
~ext:Literals.suffix_bs_js
75600+
| Upper_js -> replace_namespace_with_extension ~name:s ~ext:Literals.suffix_js
75601+
| Upper_bs ->
75602+
replace_namespace_with_extension ~name:s ~ext:Literals.suffix_bs_js
75603+
7559375604

7559475605
(* https://docs.npmjs.com/files/package.json
7559575606
Some rules:
@@ -128841,10 +128852,11 @@ let ( // ) = Filename.concat
128841128852
let lambda_as_module (lambda_output : J.deps_program) (output_prefix : string) :
128842128853
unit =
128843128854
let basename =
128844-
Ext_namespace.change_ext_ns_suffix
128845-
(Filename.basename output_prefix)
128846-
( if !Js_config.bs_suffix then Literals.suffix_bs_js
128847-
else Literals.suffix_js )
128855+
Ext_namespace.replace_namespace_with_extension
128856+
~name:(Filename.basename output_prefix)
128857+
~ext:
128858+
( if !Js_config.bs_suffix then Literals.suffix_bs_js
128859+
else Literals.suffix_js )
128848128860
in
128849128861
let package_info = Js_current_package_info.get_packages_info () in
128850128862
if Js_package_info.is_empty package_info && !Js_config.js_stdout then

0 commit comments

Comments
 (0)