Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions docs/object-functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,27 @@ __Examples__
"Postcode: SO21 2JN"
]

## `$error()`
## `$error()`
__Signature:__`$error(message)`

Deliberately throws an error with an optional `message`

## `$assert()`
## `$assert()`
__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.

## `$type()`
__Signature:__`$type(value)`

Evaluates the type of `value` and returns one of the following strings:
* `"null"`
* `"number"`
* `"string"`
* `"boolean"`
* `"array"`
* `"object"`
* `"function"`
Returns (non-string) `undefined` when `value` is `undefined`.


39 changes: 38 additions & 1 deletion src/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -1841,6 +1841,43 @@ const functions = (() => {
return undefined;
}

/**
*
* @param {*} [value] - the input to which the type will be checked
* @returns {string} - the type of the input
*/
function type(value) {
if (value === undefined) {
return undefined;
}

if (value === null) {
return 'null';
}

if (isNumeric(value)) {
return 'number';
}

if (typeof value === 'string') {
return 'string';
}

if (typeof value === 'boolean') {
return 'boolean';
}

if(Array.isArray(value)) {
return 'array';
}

if(isFunction(value)) {
return 'function';
}

return 'object';
}

/**
* Implements the merge sort (stable) with optional comparator function
*
Expand Down Expand Up @@ -2014,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, sort, shuffle, distinct,
keys, lookup, append, exists, spread, merge, reverse, each, error, assert, type, sort, shuffle, distinct,
base64encode, base64decode, encodeUrlComponent, encodeUrl, decodeUrlComponent, decodeUrl
};
})();
Expand Down
1 change: 1 addition & 0 deletions src/jsonata.js
Original file line number Diff line number Diff line change
Expand Up @@ -1859,6 +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('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>'));
Expand Down
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case001.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= undefined; $type($var))",
"dataset": "dataset5",
"bindings": {},
"undefinedResult": true
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case002.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= null; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "null"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case003.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= 123; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "number"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case004.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= '123'; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "string"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case005.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= true; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "boolean"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case006.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= 'true'; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "string"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case007.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= []; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "array"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case008.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= ['a']; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "array"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case009.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= ['a','b']; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "array"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case010.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= function(){true}; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "function"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case011.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= (λ($v, $i, $a) {$v.price = $max($a.price)}); $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "function"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case012.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= {}; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "object"
}
6 changes: 6 additions & 0 deletions test/test-suite/groups/function-typeOf/case013.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"expr": "($var:= {\"foo\":\"bar\"}; $type($var))",
"dataset": "dataset5",
"bindings": {},
"result": "object"
}