From e1b7a12f40e980604659b7af13072faf7130c390 Mon Sep 17 00:00:00 2001 From: lublak Date: Mon, 1 Feb 2021 15:50:17 +0100 Subject: [PATCH 1/2] add s flag support for regex --- packages/core/test/Helpers.ts | 2 +- packages/nodes-base/nodes/If.node.ts | 2 +- packages/nodes-base/nodes/Switch.node.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/test/Helpers.ts b/packages/core/test/Helpers.ts index c52e3ef7f435b..992ebdd83b90a 100644 --- a/packages/core/test/Helpers.ts +++ b/packages/core/test/Helpers.ts @@ -301,7 +301,7 @@ class NodeTypesClass implements INodeTypes { startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string), isEmpty: (value1: NodeParameterValue) => [undefined, null, ''].includes(value1 as string), regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { - const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimy]*)$')); + const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimys]*)$')); let regex: RegExp; if (!regexMatch) { diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts index d36a8752956f5..f3b75ca4bd1d2 100644 --- a/packages/nodes-base/nodes/If.node.ts +++ b/packages/nodes-base/nodes/If.node.ts @@ -270,7 +270,7 @@ export class If implements INodeType { startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string), isEmpty: (value1: NodeParameterValue) => [undefined, null, ''].includes(value1 as string), regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { - const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimy]*)$')); + const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimys]*)$')); let regex: RegExp; if (!regexMatch) { diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts index c1c728d94f885..b5c29b67b1244 100644 --- a/packages/nodes-base/nodes/Switch.node.ts +++ b/packages/nodes-base/nodes/Switch.node.ts @@ -487,7 +487,7 @@ export class Switch implements INodeType { smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) <= (value2 || 0), startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string), regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { - const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimy]*)$')); + const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimys]*)$')); let regex: RegExp; if (!regexMatch) { From 02168b38429aeae9a1ed5cd5cd2ae2b42074daff Mon Sep 17 00:00:00 2001 From: lublak Date: Tue, 2 Feb 2021 08:19:35 +0100 Subject: [PATCH 2/2] add u flag (its supported since nodejs 6.4.0) --- packages/core/test/Helpers.ts | 2 +- packages/nodes-base/nodes/If.node.ts | 2 +- packages/nodes-base/nodes/Switch.node.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/test/Helpers.ts b/packages/core/test/Helpers.ts index 992ebdd83b90a..ed9897a771aa7 100644 --- a/packages/core/test/Helpers.ts +++ b/packages/core/test/Helpers.ts @@ -301,7 +301,7 @@ class NodeTypesClass implements INodeTypes { startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string), isEmpty: (value1: NodeParameterValue) => [undefined, null, ''].includes(value1 as string), regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { - const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimys]*)$')); + const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$')); let regex: RegExp; if (!regexMatch) { diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts index f3b75ca4bd1d2..1e35d43d41fe1 100644 --- a/packages/nodes-base/nodes/If.node.ts +++ b/packages/nodes-base/nodes/If.node.ts @@ -270,7 +270,7 @@ export class If implements INodeType { startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string), isEmpty: (value1: NodeParameterValue) => [undefined, null, ''].includes(value1 as string), regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { - const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimys]*)$')); + const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$')); let regex: RegExp; if (!regexMatch) { diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts index b5c29b67b1244..3d18abf16af57 100644 --- a/packages/nodes-base/nodes/Switch.node.ts +++ b/packages/nodes-base/nodes/Switch.node.ts @@ -487,7 +487,7 @@ export class Switch implements INodeType { smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) <= (value2 || 0), startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string), regex: (value1: NodeParameterValue, value2: NodeParameterValue) => { - const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimys]*)$')); + const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$')); let regex: RegExp; if (!regexMatch) {