String.startsWith() and String.endsWith() methods.

diff --git a/njs/njs_string.c b/njs/njs_string.c
index da15ec625f5e6538c08c3e5b39ce2a70824f18ce..2931168191b1769072f9a0fbc20f493010c27dd9 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -83,6 +83,8 @@ static nxt_noinline void njs_string_slice_args(njs_slice_prop_t *slice,
     njs_value_t *args, nxt_uint_t nargs);
 static njs_ret_t njs_string_from_char_code(njs_vm_t *vm,
     njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
+static njs_ret_t njs_string_starts_or_ends_with(njs_vm_t *vm, njs_value_t *args,
+    nxt_uint_t nargs, nxt_bool_t starts);
 static njs_ret_t njs_string_match_multiple(njs_vm_t *vm, njs_value_t *args,
     njs_regexp_pattern_t *pattern);
 static njs_ret_t njs_string_split_part_add(njs_vm_t *vm, njs_array_t *array,
@@ -1441,6 +1443,95 @@ done:
 }
 
 
+static njs_ret_t
+njs_string_prototype_starts_with(njs_vm_t *vm, njs_value_t *args,
+    nxt_uint_t nargs, njs_index_t unused)
+{
+    return njs_string_starts_or_ends_with(vm, args, nargs, 1);
+}
+
+
+static njs_ret_t
+njs_string_prototype_ends_with(njs_vm_t *vm, njs_value_t *args,
+    nxt_uint_t nargs, njs_index_t unused)
+{
+    return njs_string_starts_or_ends_with(vm, args, nargs, 0);
+}
+
+
+static njs_ret_t
+njs_string_starts_or_ends_with(njs_vm_t *vm, njs_value_t *args,
+    nxt_uint_t nargs, nxt_bool_t starts)
+{
+    ssize_t            index, length, search_length;
+    const u_char       *p, *end;
+    const njs_value_t  *retval;
+    njs_string_prop_t  string, search;
+
+    retval = &njs_value_true;
+
+    if (nargs > 1) {
+        search_length = njs_string_prop(&search, &args[1]);
+
+        if (search_length == 0) {
+            goto done;
+        }
+
+        length = njs_string_prop(&string, &args[0]);
+
+        index = (nargs > 2) ? args[2].data.u.number : -1;
+
+        if (starts) {
+            if (index < 0) {
+                index = 0;
+            }
+
+            if (length - index < search_length) {
+                goto small;
+            }
+
+        } else {
+            if (index < 0 || index > length) {
+                index = length;
+            }
+
+            index -= search_length;
+
+            if (index < 0) {
+                goto small;
+            }
+        }
+
+        end = string.start + string.size;
+
+        if (string.size == (size_t) length) {
+            /* Byte or ASCII string. */
+            p = string.start + index;
+
+        } else {
+            /* UTF-8 string. */
+            p = njs_string_offset(string.start, end, index);
+        }
+
+        if ((size_t) (end - p) >= search.size
+            && memcmp(p, search.start, search.size) == 0)
+        {
+            goto done;
+        }
+    }
+
+small:
+
+    retval = &njs_value_false;
+
+done:
+
+    vm->retval = *retval;
+
+    return NXT_OK;
+}
+
+
 /*
  * njs_string_offset() assumes that index is correct
  * and the optional offset map has been initialized.
@@ -3075,6 +3166,22 @@ static const njs_object_prop_t  njs_string_prototype_properties[] =
                      NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
     },
 
+    /* ES6. */
+    {
+        .type = NJS_METHOD,
+        .name = njs_string("startsWith"),
+        .value = njs_native_function(njs_string_prototype_starts_with, 0,
+                     NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
+    },
+
+    /* ES6. */
+    {
+        .type = NJS_METHOD,
+        .name = njs_string("endsWith"),
+        .value = njs_native_function(njs_string_prototype_ends_with, 0,
+                     NJS_STRING_OBJECT_ARG, NJS_STRING_ARG, NJS_INTEGER_ARG),
+    },
+
     {
         .type = NJS_METHOD,
         .name = njs_string("toLowerCase"),

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 203661bb3edc51f5b48dc51199e31320e80bf440..e5375a97f55db4747f3d06c8e9aa4b985be5eac2 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -3291,6 +3291,51 @@ static njs_unit_test_t  njs_test[] =
     { nxt_string("'абв абв абвгдежз'.includes('абвгд', 9)"),
       nxt_string("false") },
 
+    { nxt_string("''.startsWith('')"),
+      nxt_string("true") },
+
+    { nxt_string("'12345'.startsWith()"),
+      nxt_string("false") },
+
+    { nxt_string("'abc'.startsWith('abc')"),
+      nxt_string("true") },
+
+    { nxt_string("'abc'.startsWith('abc', 1)"),
+      nxt_string("false") },
+
+    { nxt_string("'abc'.startsWith('abc', -1)"),
+      nxt_string("true") },
+
+    { nxt_string("'абв абв абвгдежз'.startsWith('абвгд', 8)"),
+      nxt_string("true") },
+
+    { nxt_string("'абв абв абвгдежз'.startsWith('абвгд', 9)"),
+      nxt_string("false") },
+
+    { nxt_string("''.endsWith('')"),
+      nxt_string("true") },
+
+    { nxt_string("'12345'.endsWith()"),
+      nxt_string("false") },
+
+    { nxt_string("'abc'.endsWith('abc')"),
+      nxt_string("true") },
+
+    { nxt_string("'abc'.endsWith('abc', 4)"),
+      nxt_string("true") },
+
+    { nxt_string("'abc'.endsWith('abc', 1)"),
+      nxt_string("false") },
+
+    { nxt_string("'abc'.endsWith('abc', -1)"),
+      nxt_string("true") },
+
+    { nxt_string("'абв абв абвгдежз'.endsWith('абвгд', 13)"),
+      nxt_string("true") },
+
+    { nxt_string("'абв абв абвгдежз'.endsWith('абвгд', 14)"),
+      nxt_string("false") },
+
     { nxt_string("'ABC'.toLowerCase()"),
       nxt_string("abc") },