concat(), repeat(), slice() and all "searchString" based String proto…

…type methods (#13) (#31)

* New concat() and repeat() String prototype implementations

Created new implementations for the JS String prototype which are added
in the string.rs file. Currently not tested.

* Add additional implementation of slice()

* Fix typo which mixed up start and end of slice

* Simplify slice() implementation

* Implementation of String.prototype.startsWith()

* Add implementation of endsWith()

* Implementation of String.prototype.includes()

* Implementation of String.prototype.{indexOf, lastIndexOf}()

* Fix merge conflict missing closing brace

src/lib/js/string.rs

@@ -3,6 +3,7 @@ use crate::js::object::{Property, PROTOTYPE};
 use crate::js::value::{from_value, to_value, ResultValue, Value, ValueData};
 use gc::Gc;
 use std::f64::NAN;
+use std::cmp::{min, max};
 
 /// Create new string
 /// https://searchfox.org/mozilla-central/source/js/src/vm/StringObject.h#19
@@ -77,6 +78,249 @@ pub fn char_code_at(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
     Ok(to_value(utf16_val as f64))
 }
 
+/// Returns a String that is the result of concatenating this String and all strings provided as
+/// arguments
+/// https://tc39.github.io/ecma262/#sec-string.prototype.concat
+pub fn concat(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //        ^^ represents instance  ^^ represents arguments 
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    let mut new_str = primitive_val.clone();
+
+    for arg in args {
+        let concat_str: String = from_value(arg).unwrap();
+        new_str.push_str(&concat_str);
+    }
+
+    Ok(to_value(new_str))
+}
+
+/// Returns a String that is the result of repeating this String the number of times given by the
+/// first argument
+/// https://tc39.github.io/ecma262/#sec-string.prototype.repeat
+pub fn repeat(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //        ^^ represents instance  ^^ represents arguments (only care about the first one in this case)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    let repeat_times: usize = from_value(args[0].clone()).unwrap();
+    Ok(to_value(primitive_val.repeat(repeat_times)))
+}
+
+/// Returns a String which contains the slice of the JS String from character at "start" index up
+/// to but not including character at "end" index
+/// https://tc39.github.io/ecma262/#sec-string.prototype.slice
+pub fn slice(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //       ^^ represents instance  ^^ represents arguments)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    let start: i32 = from_value(args[0].clone()).unwrap();
+    let end: i32 = from_value(args[1].clone()).unwrap();
+
+    // Calling .len() on a string would give the wrong result, as they are bytes not the number of unicode code points
+    // Note that this is an O(N) operation (because UTF-8 is complex) while getting the number of bytes is an O(1) operation.
+    let length: i32 = primitive_val.chars().count() as i32;
+
+    let from: i32 = if start < 0 {max(length + start, 0)} else {min(start, length)};
+    let to: i32 = if end < 0 {max(length + end, 0)} else {min(end, length)};
+
+    let span = max(to - from, 0);
+
+    let mut new_str = String::new();
+    for i in from..from + span {
+        new_str.push(primitive_val.chars().nth(i as usize).unwrap());
+    }
+    Ok(to_value(new_str))
+}
+
+/// Returns a Boolean indicating whether the sequence of code units of the
+/// "search string" is the same as the corresponding code units of this string
+/// starting at index "position"
+/// https://tc39.github.io/ecma262/#sec-string.prototype.startswith
+pub fn starts_with(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //             ^^ represents instance  ^^ represents arguments)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    // TODO: Should throw TypeError if pattern is regular expression
+    let search_string: String = from_value(args[0].clone()).unwrap();
+
+    let length: i32 = primitive_val.chars().count() as i32;
+    let search_length: i32 = search_string.chars().count() as i32;
+
+    // If less than 2 args specified, position is 'undefined', defaults to 0
+    let position: i32 = if args.len() < 2 {0} 
+                        else {from_value(args[1].clone()).unwrap()};
+
+    let start = min(max(position, 0), length);
+    let end = start + search_length;
+
+    if end > length {
+        Ok(to_value(false))
+    } else {
+        // Only use the part of the string from "start"
+        let this_string: String = primitive_val.chars()
+            .skip(start as usize).collect();
+        Ok(to_value(this_string.starts_with(&search_string)))
+    }
+}
+
+/// Returns a Boolean indicating whether the sequence of code units of the
+/// "search string"  is the same as the corresponding code units of this string
+/// starting at position "end position" - length
+/// https://tc39.github.io/ecma262/#sec-string.prototype.endswith
+pub fn ends_with(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //           ^^ represents instance  ^^ represents arguments)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    // TODO: Should throw TypeError if search_string is regular expression
+    let search_string: String = from_value(args[0].clone()).unwrap();
+
+    let length: i32 = primitive_val.chars().count() as i32;
+    let search_length: i32 = search_string.chars().count() as i32;
+
+    // If less than 2 args specified, end_position is 'undefined', defaults to
+    // length of this
+    let end_position: i32 = if args.len() < 2 {length} 
+                            else {from_value(args[1].clone()).unwrap()};
+
+    let end = min(max(end_position, 0), length);
+    let start = end - search_length;
+
+    if start < 0 {
+        Ok(to_value(false))
+    } else {
+        // Only use the part of the string up to "end"
+        let this_string: String = primitive_val.chars()
+            .take(end as usize).collect();
+        Ok(to_value(this_string.ends_with(&search_string)))
+    }
+}
+
+/// Returns a Boolean indicating whether searchString appears as a substring of
+/// the result of converting this object to a String, at one or more indices
+/// that are greater than or equal to position. If position is undefined, 0 is
+/// assumed, so as to search all of the String.
+/// https://tc39.github.io/ecma262/#sec-string.prototype.includes
+pub fn includes(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //          ^^ represents instance  ^^ represents arguments)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    // TODO: Should throw TypeError if search_string is regular expression
+    let search_string: String = from_value(args[0].clone()).unwrap();
+
+    let length: i32 = primitive_val.chars().count() as i32;
+
+    // If less than 2 args specified, position is 'undefined', defaults to 0
+    let position: i32 = if args.len() < 2 {0} 
+                        else {from_value(args[1].clone()).unwrap()};
+
+    let start = min(max(position, 0), length);
+
+    // Take the string from "this" and use only the part of it after "start"
+    let this_string: String = primitive_val.chars()
+        .skip(start as usize).collect();
+
+    Ok(to_value(this_string.contains(&search_string)))
+}
+
+/// If searchString appears as a substring of the result of converting this
+/// object to a String, at one or more indices that are greater than or equal to
+/// position, then the smallest such index is returned; otherwise, -1 is
+/// returned. If position is undefined, 0 is assumed, so as to search all of the
+/// String. 
+/// https://tc39.github.io/ecma262/#sec-string.prototype.includes
+pub fn index_of(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //          ^^ represents instance  ^^ represents arguments)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    // TODO: Should throw TypeError if search_string is regular expression
+    let search_string: String = from_value(args[0].clone()).unwrap();
+
+    let length: i32 = primitive_val.chars().count() as i32;
+
+    // If less than 2 args specified, position is 'undefined', defaults to 0
+    let position: i32 = if args.len() < 2 {0} 
+                        else {from_value(args[1].clone()).unwrap()};
+
+    let start = min(max(position, 0), length);
+
+    // Here cannot use the &str method "find", because this returns the byte
+    // index: we need to return the char index in the JS String
+    // Instead, iterate over the part we're checking until the slice we're
+    // checking "starts with" the search string
+    for index in start..length {
+        let this_string: String = primitive_val.chars()
+            .skip(index as usize).collect();
+        if this_string.starts_with(&search_string) {
+            // Explicitly return early with the index value
+            return Ok(to_value(index))
+        }
+    }
+    // Didn't find a match, so return -1
+    Ok(to_value(-1 as i32))
+}
+
+//// If searchString appears as a substring of the result of converting this
+/// object to a String at one or more indices that are smaller than or equal to
+/// position, then the greatest such index is returned; otherwise, -1 is
+/// returned. If position is undefined, the length of the String value is
+/// assumed, so as to search all of the String.
+/// https://tc39.github.io/ecma262/#sec-string.prototype.lastindexof
+pub fn last_index_of(this: Value, _: Value, args: Vec<Value>) -> ResultValue {
+    //               ^^ represents instance  ^^ represents arguments)
+    // First we get it the actual string a private field stored on the object only the engine has access to.
+    // Then we convert it into a Rust String by wrapping it in from_value
+    let primitive_val: String =
+        from_value(this.get_private_field(String::from("PrimitiveValue"))).unwrap();
+
+    // TODO: Should throw TypeError if search_string is regular expression
+    let search_string: String = from_value(args[0].clone()).unwrap();
+
+    let length: i32 = primitive_val.chars().count() as i32;
+
+    // If less than 2 args specified, position is 'undefined', defaults to 0
+    let position: i32 = if args.len() < 2 {0} 
+                        else {from_value(args[1].clone()).unwrap()};
+
+    let start = min(max(position, 0), length);
+
+    // Here cannot use the &str method "rfind", because this returns the last
+    // byte index: we need to return the last char index in the JS String
+    // Instead, iterate over the part we're checking keeping track of the higher
+    // index we found that "starts with" the search string
+    let mut highest_index: i32 = -1;
+    for index in start..length {
+        let this_string: String = primitive_val.chars()
+            .skip(index as usize).collect();
+        if this_string.starts_with(&search_string) {
+            highest_index = index;
+        }
+    }
+
+    // This will still be -1 if no matches were found, else with be >= 0
+    Ok(to_value(highest_index))
+}
+
 fn is_trimmable_whitespace(c: char) -> bool {
     // The rust implementation of `trim` does not regard the same characters whitespace as ecma standard does
     //
@@ -129,9 +373,16 @@ pub fn _create(global: &Value) -> Value {
     proto.set_field_slice("charAt", to_value(char_at as NativeFunctionData));
     proto.set_field_slice("charCodeAt", to_value(char_code_at as NativeFunctionData));
     proto.set_field_slice("toString", to_value(to_string as NativeFunctionData));
+    proto.set_field_slice("concat", to_value(concat as NativeFunctionData));
+    proto.set_field_slice("repeat", to_value(repeat as NativeFunctionData));
+    proto.set_field_slice("slice", to_value(slice as NativeFunctionData));
+    proto.set_field_slice("startsWith", to_value(starts_with as NativeFunctionData));
+    proto.set_field_slice("endsWith", to_value(ends_with as NativeFunctionData));
+    proto.set_field_slice("includes", to_value(includes as NativeFunctionData));
+    proto.set_field_slice("indexOf", to_value(index_of as NativeFunctionData));
+    proto.set_field_slice("lastIndexOf", to_value(last_index_of as NativeFunctionData));
     proto.set_field_slice("trim", to_value(trim as NativeFunctionData));
     proto.set_field_slice("trimStart", to_value(trim_start as NativeFunctionData));
-    proto.set_field_slice("trimEnd", to_value(trim_end as NativeFunctionData));
     string.set_field_slice(PROTOTYPE, proto);
     string
 }