From 0cf9b5f3df4991c8d614966da28ac83e48550d86 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 12 Jan 2022 21:56:38 +0000 Subject: [PATCH] Improve jsonata legacy mode detection regex Fixes #3290 --- .../@node-red/editor-client/src/js/ui/editors/expression.js | 2 +- packages/node_modules/@node-red/util/lib/util.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js index 51bba8159..7f8eb4265 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js @@ -247,7 +247,7 @@ var currentExpression = expressionEditor.getValue(); var expr; var usesContext = false; - var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression); + var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression); $(".red-ui-editor-type-expression-legacy").toggle(legacyMode); try { expr = jsonata(currentExpression); diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js index bfea58f0f..93dcd83cd 100644 --- a/packages/node_modules/@node-red/util/lib/util.js +++ b/packages/node_modules/@node-red/util/lib/util.js @@ -686,7 +686,7 @@ function prepareJSONataExpression(value,node) { return moment(arg1, arg2, arg3, arg4); }); expr.registerFunction('clone', cloneMessage, '<(oa)-:o>'); - expr._legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(value); + expr._legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(value); expr._node = node; return expr; }