From 3d9945b60cdeb86a43d8e3005e61ff5e5f165276 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 5 Feb 2020 14:44:39 +0000
Subject: [PATCH] Update to JSONata 1.8

---
 package.json                                                  | 2 +-
 .../@node-red/editor-client/locales/en-US/jsonata.json        | 4 ++++
 .../@node-red/editor-client/src/vendor/jsonata/formatter.js   | 1 +
 packages/node_modules/@node-red/util/package.json             | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 9aaeb8f9e..a6c4c5091 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "3.13.1",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.7.0",
+        "jsonata": "1.8.0",
         "media-typer": "1.1.0",
         "memorystore": "1.6.1",
         "mime": "2.4.4",
diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
index 8f516a289..d777d1919 100755
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/jsonata.json
@@ -262,5 +262,9 @@
     "$distinct": {
         "args": "array",
         "desc": "Returns an array with duplicate values removed from `array`"
+    },
+    "$type": {
+        "args": "value",
+        "desc": "Returns the type of `value` as a string. If `value` is undefined, this will return `undefined`"
     }
 }
diff --git a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
index 0cc69715a..382537be3 100644
--- a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
+++ b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
@@ -171,6 +171,7 @@
         '$sum':{ args:[ 'array' ]},
         '$toMillis':{args:['timestamp']}, // <-------------
         '$trim':{ args:[ 'str' ]},
+        '$type':{ args:['value']},
         '$uppercase':{ args:[ 'str' ]},
         '$zip':{ args:[ 'array1' ]}
     }
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 174db5bfd..411c35a7c 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -18,7 +18,7 @@
         "clone": "2.1.2",
         "i18next": "15.1.2",
         "json-stringify-safe": "5.0.1",
-        "jsonata": "1.7.0",
+        "jsonata": "1.8.0",
         "when": "3.7.8"
     }
 }