Skip to content

Commit 27871f5

Browse files
glennslglennsl
committed
Added missing js string and js array functions up to and including ES2015
1 parent d5b17d8 commit 27871f5

9 files changed

+1865
-125
lines changed

‎jscomp/others/js_array.ml

+95-34
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
2-
*
2+
*
33
* This program is free software: you can redistribute it and/or modify
44
* it under the terms of the GNU Lesser General Public License as published by
55
* the Free Software Foundation, either version 3 of the License, or
@@ -17,61 +17,122 @@
1717
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1818
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1919
* GNU Lesser General Public License for more details.
20-
*
20+
*
2121
* You should have received a copy of the GNU Lesser General Public License
2222
* along with this program; if not, write to the Free Software
2323
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
2424

25-
2625
type 'a t = 'a array
26+
type 'a array_like
27+
type 'a array_iter = 'a array_like (* don't think this is very useful to implement wihtout language support *)
28+
29+
external make : int -> unit Js.undefined array = "Array" [@@bs.new]
30+
31+
external from : 'a array_like -> 'b array = "Array.from" [@@bs.val] (* es2015 *)
32+
external unsafeFrom : 'a -> 'b array = "Array.from" [@@bs.val] (* es2015 *)
33+
external fromMap : 'a array_like -> ('a -> 'b [@bs]) -> 'b array = "Array.from" [@@bs.val] (* es2015 *)
34+
external unsafeFromMap : 'a -> ('b -> 'c [@bs]) -> 'c array = "Array.from" [@@bs.val] (* es2015 *)
35+
external isArray : 'a -> Js.boolean = "Array.isArray" [@@bs.val] (* es2015 *)
36+
(* Array.of: seems pointless unless you can bind *) (* es2015 *)
37+
38+
external length : 'a array -> int = "" [@@bs.get]
39+
40+
41+
(* Mutator functions
42+
*)
43+
external copyWithin : to_:int -> 'this = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
44+
external copyWithinFrom : to_:int -> from:int -> 'this = "copyWithin" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
45+
external copyWithinFromRange : to_:int -> start:int -> end_:int -> 'this = "copyWithin" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
46+
47+
external fill : 'a -> 'this = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
48+
external fillFrom : 'a -> from:int -> 'this = "fill" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
49+
external fillRange : 'a -> start:int -> end_:int -> 'this = "fill" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
2750

28-
external toString : unit -> string = "" [@@bs.send.pipe: 'a t as 'this]
29-
external toLocaleString : unit -> string = "" [@@bs.send.pipe: 'a t as 'this]
30-
external concat : 'this -> 'this = "" [@@bs.send.pipe: 'a t as 'this]
51+
(** https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push *)
52+
external pop : 'a Js.undefined = "" [@@bs.send.pipe: 'a t as 'this]
53+
external push : 'a -> int = "" [@@bs.send.pipe: 'a t as 'this]
54+
external pushMany : 'a array -> int = "push" [@@bs.send.pipe: 'a t as 'this] [@@bs.splice]
55+
56+
external reverse : 'this = "" [@@bs.send.pipe: 'a t as 'this]
57+
58+
external shift : 'a Js.undefined = "" [@@bs.send.pipe: 'a t as 'this]
59+
60+
external sort : 'this = "" [@@bs.send.pipe: 'a t as 'this]
61+
external sortWith : ('a -> 'a -> int [@bs]) -> 'this = "sort" [@@bs.send.pipe: 'a t as 'this]
62+
63+
external splice : pos:int -> remove:int -> add:('a array) -> 'this = "" [@@bs.send.pipe: 'a t as 'this] [@@bs.splice]
64+
external removeFrom : pos:int -> 'this = "splice" [@@bs.send.pipe: 'a t as 'this]
65+
external removeCount : pos:int -> count:int -> 'this = "splice" [@@bs.send.pipe: 'a t as 'this]
66+
(* screwy naming, but screwy function *)
67+
68+
external unshift : 'a -> int = "" [@@bs.send.pipe: 'a t as 'this]
69+
external unshiftMany : 'a array -> int = "unshift" [@@bs.send.pipe: 'a t as 'this] [@@bs.splice]
70+
71+
72+
(* Accessor functions
73+
*)
3174
external append : 'a -> 'this = "concat" [@@bs.send.pipe: 'a t as 'this]
75+
external concat : 'this -> 'this = "" [@@bs.send.pipe: 'a t as 'this]
76+
external concatMany : 'this array -> 'this = "concat" [@@bs.send.pipe: 'a t as 'this] [@@bs.splice]
3277

33-
external slice : int -> int -> 'this = "" [@@bs.send.pipe: 'a t as 'this]
34-
external slice_copy : unit -> 'this = "slice"[@@bs.send.pipe: 'a t as 'this]
35-
external slice_start : int -> 'this = "slice"[@@bs.send.pipe: 'a t as 'this]
78+
(* TODO: Not available in Node V4 *)
79+
external includes : 'a -> Js.boolean = "" [@@bs.send.pipe: 'a t as 'this] (* es2016 *)
3680

3781
external indexOf : 'a -> int = "" [@@bs.send.pipe: 'a t as 'this]
38-
external indexOfFrom : 'a -> int -> int = "indexOf" [@@bs.send.pipe: 'a t as 'this]
82+
external indexOfFrom : 'a -> from:int -> int = "indexOf" [@@bs.send.pipe: 'a t as 'this]
3983

40-
(* TODO: Not available in Node V4 *)
41-
external includes : 'a -> Js.boolean = "" [@@bs.send.pipe: 'a t as 'this]
84+
external join : string = "" [@@bs.send.pipe: 'a t as 'this]
85+
external joinWith : string -> string = "join" [@@bs.send.pipe: 'a t as 'this]
86+
87+
external lastIndexOf : 'a -> int = "" [@@bs.send.pipe: 'a t as 'this]
88+
external lastIndexOfFrom : 'a -> from:int -> int = "lastIndexOf" [@@bs.send.pipe: 'a t as 'this]
89+
external lastIndexOf_start : 'a -> int = "lastIndexOf" [@@bs.send.pipe: 'a t as 'this]
90+
[@@ocaml.deprecated "Please use `lastIndexOf"]
91+
92+
external slice : start:int -> end_:int -> 'this = "" [@@bs.send.pipe: 'a t as 'this]
93+
external copy : 'this = "slice" [@@bs.send.pipe: 'a t as 'this]
94+
external slice_copy : unit -> 'this = "slice" [@@bs.send.pipe: 'a t as 'this]
95+
[@@ocaml.deprecated "Please use `copy`"]
96+
external sliceFrom : int -> 'this = "slice" [@@bs.send.pipe: 'a t as 'this]
97+
external slice_start : int -> 'this = "slice" [@@bs.send.pipe: 'a t as 'this]
98+
[@@ocaml.deprecated "Please use `sliceFrom`"]
99+
100+
external toString : string = "" [@@bs.send.pipe: 'a t as 'this]
101+
external toLocaleString : string = "" [@@bs.send.pipe: 'a t as 'this]
42102

43-
external lastIndexOf : 'a -> int -> int = "" [@@bs.send.pipe: 'a t as 'this]
44-
external lastIndexOf_start : 'a -> int = "lastIndex" [@@bs.send.pipe: 'a t as 'this]
103+
104+
(* Iteration functions
105+
*)
106+
external entries : (int * 'a) array_iter = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
45107

46108
external every : ('a -> Js.boolean [@bs]) -> Js.boolean = "" [@@bs.send.pipe: 'a t as 'this]
47109
external everyi : ('a -> int -> Js.boolean [@bs]) -> Js.boolean = "every" [@@bs.send.pipe: 'a t as 'this]
48110

49-
external some : ('a -> Js.boolean [@bs]) -> Js.boolean = "" [@@bs.send.pipe: 'a t as 'this]
50-
external somei : ('a -> int -> Js.boolean [@bs]) -> Js.boolean = "some" [@@bs.send.pipe: 'a t as 'this]
111+
(** should we use [bool] or [boolan] seems they are intechangeable here *)
112+
external filter : ('a -> bool [@bs]) -> 'this = "" [@@bs.send.pipe: 'a t as 'this]
113+
external filteri : ('a -> int -> Js.boolean[@bs]) -> 'this = "filter" [@@bs.send.pipe: 'a t as 'this]
114+
115+
external find : ('a -> bool [@bs]) -> 'a Js.undefined = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
116+
external findi : ('a -> int -> bool [@bs]) -> 'a Js.undefined = "find" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
51117

118+
external findIndex : ('a -> bool [@bs]) -> int = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
119+
external findIndexi : ('a -> int -> bool [@bs]) -> int = "findIndex" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
52120

53-
external forEach : ('a -> unit [@bs]) -> unit = "" [@@bs.send.pipe: 'a t as 'this]
121+
external forEach : ('a -> unit [@bs]) -> unit = "" [@@bs.send.pipe: 'a t as 'this]
54122
external forEachi : ('a -> int -> unit [@bs]) -> unit = "forEach" [@@bs.send.pipe: 'a t as 'this]
55123

56-
external map : ('a -> 'b [@bs]) -> 'b t = "" [@@bs.send.pipe: 'a t as 'this]
57-
external mapi : ('a -> int -> 'b [@bs]) -> 'b t = "map" [@@bs.send.pipe: 'a t as 'this]
124+
external keys : int array_iter = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)
58125

59-
(** should we use [bool] or [boolan] seems they are intechangeable here *)
60-
external filter : ('a -> bool [@bs]) -> 'this = "" [@@bs.send.pipe: 'a t as 'this]
61-
external filteri : ('a -> int -> Js.boolean[@bs]) -> 'this = "filter" [@@bs.send.pipe: 'a t as 'this]
126+
external map : ('a -> 'b [@bs]) -> 'b t = "" [@@bs.send.pipe: 'a t as 'this]
127+
external mapi : ('a -> int -> 'b [@bs]) -> 'b t = "map" [@@bs.send.pipe: 'a t as 'this]
62128

63-
external reducei : ('a -> 'a -> int -> 'a [@bs]) -> 'a -> 'a = "reduce" [@@bs.send.pipe: 'a t as 'this]
64-
external reduce : ('a -> 'a -> 'a [@bs]) -> 'a -> 'a = "reduce" [@@bs.send.pipe: 'a t as 'this]
129+
external reduce : ('b -> 'a -> 'b [@bs]) -> 'b -> 'b = "" [@@bs.send.pipe: 'a t as 'this]
130+
external reducei : ('b -> 'a -> int -> 'b [@bs]) -> 'b -> 'b = "reduce" [@@bs.send.pipe: 'a t as 'this]
65131

66-
external isArray : 'a -> Js.boolean = "Array.isArray" [@@bs.val]
132+
external reduceRight : ('b -> 'a -> 'b [@bs]) -> 'b -> 'b = "" [@@bs.send.pipe: 'a t as 'this]
133+
external reduceRighti : ('b -> 'a -> int -> 'b [@bs]) -> 'b -> 'b = "reduceRight" [@@bs.send.pipe: 'a t as 'this]
67134

68-
(** https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push *)
69-
external push : 'a array -> 'a -> int = ""
70-
[@@bs.send]
135+
external some : ('a -> Js.boolean [@bs]) -> Js.boolean = "" [@@bs.send.pipe: 'a t as 'this]
136+
external somei : ('a -> int -> Js.boolean [@bs]) -> Js.boolean = "some" [@@bs.send.pipe: 'a t as 'this]
71137

72-
external pop : 'a array -> 'a Js.undefined = ""
73-
[@@bs.send]
74-
75-
external length : 'a array -> int = ""
76-
[@@bs.get]
77-
138+
external values : 'a array_iter = "" [@@bs.send.pipe: 'a t as 'this] (* es2015 *)

‎jscomp/others/js_string.ml

+64-46
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,5 @@
11
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
2-
*
3-
* This program is free software: you can redistribute it and/or modify
4-
* it under the terms of the GNU Lesser General Public License as published by
5-
* the Free Software Foundation, either version 3 of the License, or
6-
* (at your option) any later version.
7-
*
8-
* In addition to the permissions granted to you by the LGPL, you may combine
9-
* or link a "work that uses the Library" with a publicly distributed version
10-
* of this file to produce a combined library or application, then distribute
11-
* that combined work under the terms of your choosing, with no requirement
12-
* to comply with the obligations normally placed on you by section 4 of the
13-
* LGPL version 3 (or the corresponding section of a later version of the LGPL
14-
* should you choose to use a later version).
152
*
16-
* This program is distributed in the hope that it will be useful,
17-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
* GNU Lesser General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU Lesser General Public License
22-
* along with this program; if not, write to the Free Software
23-
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
24-
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
25-
*
263
* This program is free software: you can redistribute it and/or modify
274
* it under the terms of the GNU Lesser General Public License as published by
285
* the Free Software Foundation, either version 3 of the License, or
@@ -40,46 +17,87 @@
4017
* but WITHOUT ANY WARRANTY; without even the implied warranty of
4118
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4219
* GNU Lesser General Public License for more details.
43-
*
20+
*
4421
* You should have received a copy of the GNU Lesser General Public License
4522
* along with this program; if not, write to the Free Software
4623
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
4724

4825
type t = string
4926

50-
external charAt : int -> t = "" [@@bs.send.pipe: t]
27+
external make : 'a -> t = "String" [@@bs.new]
28+
external fromCharCode : int -> t = "String.fromCharCode" [@@bs.val]
29+
external fromCharCodeMany : int array -> t = "String.fromCharCode" [@@bs.val] [@@bs.splice]
30+
external fromCodePoint : int -> t = "String.fromCodePoint" [@@bs.val] (* es2015 *)
31+
external fromCodePointMany : int array -> t = "String.fromCodePoint" [@@bs.val] [@@bs.splice] (* es2015 *)
32+
(* String.raw: es2015, meant to be used with template strings, not directly *)
33+
34+
external length : t -> int = "" [@@bs.get]
35+
external get : t -> int -> t = "" [@@bs.get_index]
5136

37+
external charAt : int -> t = "" [@@bs.send.pipe: t]
5238
external charCodeAt : int -> float = "" [@@bs.send.pipe: t]
5339
(** type it as [float] due to that it may return NAN *)
54-
external concat : t array -> t = ""
55-
[@@bs.send.pipe: t] [@@bs.splice]
40+
external codePointAt : int -> int Js.undefined = "" [@@bs.send.pipe: t] (* es2015 *)
41+
42+
external concat : t -> t = "" [@@bs.send.pipe: t]
43+
external concatMany : t array -> t = "concat" [@@bs.send.pipe: t] [@@bs.splice]
44+
45+
external endsWith : t -> Js.boolean = "" [@@bs.send.pipe: t] (* es2015 *)
46+
external endsWithFrom : t -> int -> Js.boolean = "endsWith" [@@bs.send.pipe: t] (* es2015 *)
47+
(* screwy name, but screwy function *)
48+
49+
external includes : t -> Js.boolean = "" [@@bs.send.pipe: t] (* es2015 *)
50+
external includesFrom : t -> int -> Js.boolean = "includes" [@@bs.send.pipe: t] (* es2015 *)
5651

57-
external indexOf : t -> int = "" [@@bs.send.pipe: t]
58-
external indexOfFrom : t -> int -> int = "indexOf" [@@bs.send.pipe: t]
52+
external indexOf : t -> int = "" [@@bs.send.pipe: t]
53+
external indexOfFrom : t -> int -> int = "indexOf" [@@bs.send.pipe: t]
5954

60-
external lastIndexOf : t -> int = "" [@@bs.send.pipe: t]
61-
external lastIndexOfFrom : t -> int -> int = "lastIndexOf" [@@bs.send.pipe: t]
55+
external lastIndexOf : t -> int = "" [@@bs.send.pipe: t]
56+
external lastIndexOfFrom : t -> int -> int = "lastIndexOf" [@@bs.send.pipe: t]
6257

63-
external localeCompare : t -> float = "" [@@bs.send.pipe: t]
58+
external localeCompare : t -> float = "" [@@bs.send.pipe: t]
59+
(* extended by ECMA-402 *)
6460

61+
external match_ : Js_re.t -> t array Js.null = "match" [@@bs.send.pipe: t]
62+
63+
external normalize : t = "" [@@bs.send.pipe: t] (* es2015 *)
64+
external normalizeByForm : t -> t = "normalize" [@@bs.send.pipe: t] (* es2015 *)
65+
66+
external repeat : int -> t = "" [@@bs.send.pipe: t] (* es2015 *)
67+
68+
external replace : t -> t -> t = "" [@@bs.send.pipe: t]
6569
external replaceByRe : Js_re.t -> t -> t = "replace" [@@bs.send.pipe: t]
66-
external replace : t -> t -> t = "" [@@bs.send.pipe: t]
6770

6871
external search : Js_re.t -> int = "" [@@bs.send.pipe: t]
69-
external slice : int -> int -> t = "" [@@bs.send.pipe: t]
70-
external sliceToEnd : int -> t = "slice" [@@bs.send.pipe: t]
7172

72-
external split : t -> t array = "" [@@bs.send.pipe: t]
73-
external splitLimited : t -> int -> t array = "split" [@@bs.send.pipe: t]
74-
external splitByRe : Js_re.t -> t array = "split" [@@bs.send.pipe: t]
73+
external slice : from:int -> to_:int -> t = "" [@@bs.send.pipe: t]
74+
external sliceToEnd : from:int -> t = "slice" [@@bs.send.pipe: t]
75+
76+
external split : t -> t array = "" [@@bs.send.pipe: t]
77+
external splitAtMost: t -> limit:int -> t array = "split" [@@bs.send.pipe: t]
78+
external splitLimited : t -> int -> t array = "split" [@@bs.send.pipe: t]
79+
[@@ocaml.deprecated "Please use splitAtMost"]
80+
external splitByRe : Js_re.t -> t array = "split" [@@bs.send.pipe: t]
81+
external splitByReAtMost : Js_re.t -> limit:int -> t array = "split" [@@bs.send.pipe: t]
7582
external splitRegexpLimited : Js_re.t -> int -> t array = "" [@@bs.send.pipe: t]
83+
[@@ocaml.deprecated "Please use splitByReAtMost"]
84+
85+
external startsWith : t -> Js.boolean = "" [@@bs.send.pipe: t] (* es2015 *)
86+
external startsWithFrom : t -> int -> Js.boolean = "startsWith" [@@bs.send.pipe: t] (* es2015 *)
87+
88+
external substr : from:int -> t = "" [@@bs.send.pipe: t]
89+
external substrAtMost : from:int -> length:int -> t = "substr" [@@bs.send.pipe: t]
90+
91+
external substring : from:int -> to_:int -> t = "" [@@bs.send.pipe: t]
92+
external substringToEnd : from:int -> t = "substring" [@@bs.send.pipe: t]
93+
94+
external toLowerCase : t = "" [@@bs.send.pipe: t]
95+
external toLocaleLowerCase : t = "" [@@bs.send.pipe: t]
96+
external toUpperCase : t = "" [@@bs.send.pipe: t]
97+
external toLocaleUpperCase : t = "" [@@bs.send.pipe: t]
7698

77-
external substring : int -> int -> t = "" [@@bs.send.pipe: t]
78-
external substringToEnd : int -> t = "substring" [@@bs.send.pipe: t]
79-
external toLowerCase : t = "" [@@bs.send.pipe: t]
80-
external toLocaleLowerCase : t = "" [@@bs.send.pipe: t]
81-
external toUpperCase : t = "" [@@bs.send.pipe: t]
82-
external toLocaleUpperCase : t = "" [@@bs.send.pipe: t]
83-
external trim : t = "" [@@bs.send.pipe: t]
99+
external trim : t = "" [@@bs.send.pipe: t]
84100

85-
external startsWith : t -> Js.boolean = "" [@@bs.send.pipe:t]
101+
(* HTML wrappers *)
102+
external anchor : t -> t = "" [@@bs.send.pipe: t] (* es2015 *)
103+
external link : t -> t = "" [@@bs.send.pipe: t] (* es2015 *)

‎jscomp/test/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
6767
ppx_this_obj_field single_module_alias \
6868
sexpm sexpm_test sexp js_json_test array_subtle_test \
6969
bytes_split_gpr_743_test module_splice_test hello.foo \
70-
ffi_splice_test node_path_test js_string_test string_unicode_test node_fs_test\
70+
ffi_splice_test node_path_test js_string_test js_array_test string_unicode_test node_fs_test\
7171
flow_parser_reg_test utf8_decode_test stream_parser_test condition_compilation_test semver_test update_record_test installation_test app_root_finder derive_projector_test\
7272
gpr_904_test gpr_858_unit2_test inner_unused \
7373
set_gen bal_tree string_set string_set_test \

‎jscomp/test/array_subtle_test.ml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
let suites : Mt.pair_suites ref = ref []
22
let test_id = ref 0
3-
let eq loc (x, y) =
4-
incr test_id ;
5-
suites :=
3+
let eq loc (x, y) =
4+
incr test_id ;
5+
suites :=
66
(loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
77

88
let v = [| 1 ; 2 ; 3; 3|]
99

1010

11-
let () =
11+
let () =
1212
eq __LOC__ (4,Array.length v)
1313

14-
let () =
15-
eq __LOC__ (5,Js.Array.push v 3 ); (* in Js array length can be changing .. *)
14+
let () =
15+
eq __LOC__ (5,Js.Array.push 3 v ); (* in Js array length can be changing .. *)
1616
eq __LOC__ (5, Array.length v );
1717
eq __LOC__ (5,Js.Array.length v )
1818

1919

20-
let () =
20+
let () =
2121
eq __LOC__ (3, v.(2));
2222
v.(2)<-4;
2323
eq __LOC__ (4,v.(2)) (* should not inline *)
2424

2525
let () =
26-
while Js.Array.length v > 0 do
26+
while Js.Array.length v > 0 do
2727
ignore @@ Js.Array.pop v
2828
done;
2929
eq __LOC__ (0, Js.Array.length v )

0 commit comments

Comments
 (0)