Skip to content

Commit aa297a3

Browse files
authored
Improve some error message in rescript.conf parsing (#6469)
1 parent 6fc7130 commit aa297a3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

jscomp/bsb/bsb_package_specs.ml

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ let rec from_array suffix (arr : Ext_json_types.t array) : Spec_set.t =
6464
if not !has_in_source then has_in_source := true
6565
else
6666
Bsb_exception.errorf ~loc:(Ext_json.loc_of x)
67-
"package-specs: we've detected two module formats that are both \
67+
"package-specs: detected two module formats that are both \
6868
configured to be in-source.";
6969
spec := Spec_set.add result !spec);
7070
!spec
@@ -87,11 +87,11 @@ and from_json_single suffix (x : Ext_json_types.t) : Bsb_spec_set.spec =
8787
| Some (Str { str = suffix; loc }) ->
8888
let s = Ext_js_suffix.of_string suffix in
8989
if s = Unknown_extension then
90-
Bsb_exception.errorf ~loc "expect .js,.bs.js,.mjs or .cjs"
90+
Bsb_exception.errorf ~loc "expected .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs"
9191
else s
9292
| Some _ ->
9393
Bsb_exception.errorf ~loc:(Ext_json.loc_of x)
94-
"expect a string field"
94+
"expected a string field"
9595
| None -> suffix
9696
in
9797
{ format = supported_format format loc; in_source; suffix }
@@ -107,7 +107,7 @@ and from_json_single suffix (x : Ext_json_types.t) : Bsb_spec_set.spec =
107107
field is mandatory.")
108108
| _ ->
109109
Bsb_exception.errorf ~loc:(Ext_json.loc_of x)
110-
"package-specs: we expect either a string or an object."
110+
"package-specs: expected either a string or an object."
111111

112112
let from_json suffix (x : Ext_json_types.t) : Spec_set.t =
113113
match x with
@@ -189,11 +189,11 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
189189
let s = Ext_js_suffix.of_string str in
190190
if s = Unknown_extension then
191191
Bsb_exception.errorf ~loc
192-
"expect .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here"
192+
"expected .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs"
193193
else s
194194
| Some config ->
195195
Bsb_exception.config_error config
196-
"expect a string exteion like \".js\" here"
196+
"expected a string extension like \".js\""
197197

198198
let from_map ~(cwd : string) map =
199199
let suffix = extract_bs_suffix_exn map in

0 commit comments

Comments
 (0)