Respond to PR comments:

* Rename `typeOf()` to `type()`
* Avoid use of Array.includes()

Author: jhorbulyk

docs/object-functions.md

@@ -63,8 +63,8 @@ __Signature:__`$assert(condition, message)`
 
 If condition is true, the function returns undefined. If the condition is false, an exception is thrown with the message as the message of the exception.
 
-## `$typeOf()`
-__Signature:__`$typeOf(value)`
+## `$type()`
+__Signature:__`$type(value)`
 
 Evaluates the type of `value` and returns one of the following strings:
 * `"null"`

src/functions.js

@@ -1846,7 +1846,7 @@ const functions = (() => {
      * @param {*} [value] - the input to which the type will be checked
      * @returns {string} - the type of the input
      */
-    function typeOf(value) {
+    function type(value) {
         if (value === undefined) {
             return undefined;
         }
@@ -1859,8 +1859,12 @@ const functions = (() => {
             return 'number';
         }
 
-        if(['string', 'boolean'].includes(typeof value)) {
-            return typeof value;
+        if (typeof value === 'string') {
+            return 'string';
+        }
+
+        if (typeof value === 'boolean') {
+            return 'boolean';
         }
 
         if(Array.isArray(value)) {
@@ -2047,7 +2051,7 @@ const functions = (() => {
         formatNumber, formatBase, number, floor, ceil, round, abs, sqrt, power, random,
         boolean, not,
         map, zip, filter, single, foldLeft, sift,
-        keys, lookup, append, exists, spread, merge, reverse, each, error, assert, typeOf, sort, shuffle, distinct,
+        keys, lookup, append, exists, spread, merge, reverse, each, error, assert, type, sort, shuffle, distinct,
         base64encode, base64decode,  encodeUrlComponent, encodeUrl, decodeUrlComponent, decodeUrl
     };
 })();

src/jsonata.js

@@ -1859,7 +1859,7 @@ var jsonata = (function() {
     staticFrame.bind('each', defineFunction(fn.each, '<o-f:a>'));
     staticFrame.bind('error', defineFunction(fn.error, '<s?:x>'));
     staticFrame.bind('assert', defineFunction(fn.assert, '<bs?:x>'));
-    staticFrame.bind('typeOf', defineFunction(fn.typeOf, '<x:s>'));
+    staticFrame.bind('type', defineFunction(fn.type, '<x:s>'));
     staticFrame.bind('sort', defineFunction(fn.sort, '<af?:a>'));
     staticFrame.bind('shuffle', defineFunction(fn.shuffle, '<a:a>'));
     staticFrame.bind('distinct', defineFunction(fn.distinct, '<x:x>'));

test/test-suite/groups/function-typeOf/case001.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= undefined; $typeOf($var))",
+    "expr": "($var:= undefined; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "undefinedResult": true

test/test-suite/groups/function-typeOf/case002.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= null; $typeOf($var))",
+    "expr": "($var:= null; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "result": "null" 

test/test-suite/groups/function-typeOf/case003.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= 123; $typeOf($var))",
+    "expr": "($var:= 123; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "result": "number" 

test/test-suite/groups/function-typeOf/case004.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= '123'; $typeOf($var))",
+    "expr": "($var:= '123'; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "result": "string" 

test/test-suite/groups/function-typeOf/case005.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= true; $typeOf($var))",
+    "expr": "($var:= true; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "result": "boolean" 

test/test-suite/groups/function-typeOf/case006.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= 'true'; $typeOf($var))",
+    "expr": "($var:= 'true'; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "result": "string" 

test/test-suite/groups/function-typeOf/case007.json

@@ -1,5 +1,5 @@
 {
-    "expr": "($var:= []; $typeOf($var))",
+    "expr": "($var:= []; $type($var))",
     "dataset": "dataset5",
     "bindings": {},
     "result": "array"