From 35c0917c4b204ebc624dc2f1df4631dbb49580b7 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@gmail.com>
Date: Sat, 13 Dec 2025 18:45:06 +0000
Subject: [PATCH 1/4] Let switch node regex mode optionally return matches

and add tests
---
 .../nodes/core/function/10-switch.html        |  8 +++++--
 .../nodes/core/function/10-switch.js          | 24 ++++++++++++++++---
 .../nodes/locales/en-US/messages.json         |  1 +
 test/nodes/core/function/10-switch_spec.js    | 13 ++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index d83a8820a..77063f868 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -112,6 +112,7 @@
             }
             if (type === "regex") {
                 r.case = rule.find(".node-input-rule-case").prop("checked");
+                r.match = rule.find(".node-input-rule-match").prop("checked");
             }
         }
         return r;
@@ -230,12 +231,12 @@
         oneditprepare: function() {
             var node = this;
 
-
             $("#node-input-property").typedInput({default:this.propertyType||'msg',types:['msg','flow','global','jsonata','env']});
             var outputCount = $("#node-input-outputs").val("{}");
 
             var andLabel = this._("switch.and");
             var caseLabel = this._("switch.ignorecase");
+            var matchLabel = this._("switch.returnmatches");
 
             $("#node-input-rule-container").css('min-height','150px').css('min-width','450px').editableList({
                 addItem: function(container,i,opt) {
@@ -276,7 +277,7 @@
                     });
                     var inputRows = $('<div></div>',{style:"flex-grow:1"}).appendTo(container);
                     var row = $('<div></div>',{style:"display: flex;"}).appendTo(inputRows);
-                    var row2 = $('<div/>',{style:"display: flex; padding-top: 5px; padding-left: 175px;"}).appendTo(inputRows);
+                    var row2 = $('<div/>',{style:"display: flex; padding-top: 5px; padding-left: 155px;"}).appendTo(inputRows);
                     var row3 = $('<div/>',{style:"display: flex; padding-top: 5px; align-items: center"}).appendTo(inputRows);
 
                     var row4 = $('<div/>',{style:"visibility: hidden; height: 0px;"}).appendTo(inputRows);
@@ -316,6 +317,8 @@
 
                     var caseSensitive = $('<input/>',{id:"node-input-rule-case-"+i,class:"node-input-rule-case",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
                     $('<label/>',{for:"node-input-rule-case-"+i,style:"margin-left: 3px;"}).text(caseLabel).appendTo(row2);
+                    var returnMatch = $('<input/>',{id:"node-input-rule-match-"+i,class:"node-input-rule-match",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
+                    $('<label/>',{for:"node-input-rule-match-"+i,style:"margin-left: 3px;"}).text(matchLabel).appendTo(row2);
 
                     selectField.on("change", function() {
                         var fieldToFocus;
@@ -414,6 +417,7 @@
                         valueField.typedInput('value',rule.v);
                     }
                     caseSensitive.prop('checked',!!rule.case);
+                    returnMatch.prop('checked',!!rule.match);
                     selectField.change();
 
                     var currentOutputs = JSON.parse(outputCount.val()||"{}");
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.js b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
index 9d68f6b0b..d6c919a81 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
@@ -26,11 +26,14 @@ module.exports = function(RED) {
         'gte': function(a, b) { return a >= b; },
         'btwn': function(a, b, c) { return (a >= b && a <= c) || (a <= b && a >= c); },
         'cont': function(a, b) { return (a + "").indexOf(b) != -1; },
-        'regex': function(a, b, c, d) { return (a + "").match(new RegExp(b,d?'i':'')); },
         'true': function(a) { return a === true; },
         'false': function(a) { return a === false; },
         'null': function(a) { return (typeof a == "undefined" || a === null); },
         'nnull': function(a) { return (typeof a != "undefined" && a !== null); },
+        'regex': function(a, b, c, d, e, f) {
+            if (f) { return (a + "").matchAll(new RegExp(b,d?'ig':'g')); }
+            else { return (a + "").match(new RegExp(b,d?'i':'')); }
+        },
         'empty': function(a) {
             if (typeof a === 'string' || Array.isArray(a) || Buffer.isBuffer(a)) {
                 return a.length === 0;
@@ -197,7 +200,22 @@ module.exports = function(RED) {
                     state.elseflag = true;
                 }
                 try {
-                    if (operators[rule.t](property,v1,v2,rule.case,msg.parts)) {
+                    const r = operators[rule.t](property,v1,v2,rule.case,msg.parts,rule.match )
+                    if (r) {
+                        if (rule.match == true && rule.t === "regex") {
+                            msg.matches = [];
+                            for (const match of r) {
+                                const le = match.length
+                                const g = []
+                                for (let i = 1; i<le; i++) {
+                                    g.push(match[i])
+                                }
+                                msg.matches.push({match: match[0], index: match.index, groups: g });
+                            }
+                            if (msg.matches.length === 0) {
+                                state.onward.push(null);
+                            }
+                        }
                         state.onward.push(msg);
                         state.elseflag = false;
                         if (node.checkall == "false") {
@@ -216,7 +234,7 @@ module.exports = function(RED) {
         });
     }
 
-    function applyRules(node, msg, property,state,done) {
+    function applyRules(node, msg, property, state, done) {
         if (!state) {
             if (node.rules.length === 0) {
                 done(undefined, []);
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 34462a4aa..f1eb37fbd 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -760,6 +760,7 @@
         "checkall": "checking all rules",
         "stopfirst": "stopping after first match",
         "ignorecase": "ignore case",
+        "returnmatches": "return msg.matches",
         "rules": {
             "btwn": "is between",
             "cont": "contains",
diff --git a/test/nodes/core/function/10-switch_spec.js b/test/nodes/core/function/10-switch_spec.js
index 07896a9a4..acbe20e1b 100644
--- a/test/nodes/core/function/10-switch_spec.js
+++ b/test/nodes/core/function/10-switch_spec.js
@@ -468,6 +468,19 @@ describe('switch Node', function() {
                     {id:"helperNode1", type:"helper", wires:[]}];
         customFlowSwitchTest(flow, true, "oneTWOthree", done);
     });
+
+    it('should match regex with return-matches flag set true', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"(b[aio]..)","vt":"str","match":true}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+                    {id:"helperNode1", type:"helper", wires:[]}];
+        customFlowMessageSwitchTest(flow, true, {payload:"foobishbashboshpoo",matches:[{"match":"bish","index":3,"groups":["bish"]},{"match":"bash","index":7,"groups":["bash"]},{"match":"bosh","index":11,"groups":["bosh"]}]}, done);
+    });
+
+    it('should match regex with return-matches flag set true - 2', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"[b][iao]","vt":"str","match":true}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+                    {id:"helperNode1", type:"helper", wires:[]}];
+        customFlowMessageSwitchTest(flow, true, {payload:"foobishbashboshpoo",matches:[{"match":"bi","index":3,"groups":[]},{"match":"ba","index":7,"groups":[]},{"match":"bo","index":11,"groups":[]}]}, done);
+    });
+
     it('should not match regex with ignore-case flag unset', function(done) {
         var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"onetwothree"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
                     {id:"helperNode1", type:"helper", wires:[]}];

From f6f9343dd94992264360f946a4e9a2fc0217011b Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@gmail.com>
Date: Sat, 13 Dec 2025 21:02:50 +0000
Subject: [PATCH 2/4] let regex rule use regex typedinput (and thus editor)

---
 .../@node-red/nodes/core/function/10-switch.html            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index 77063f868..b894ec1b2 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -120,7 +120,7 @@
 
     function createValueField(row, defaultType){
         return $('<input/>',{class:"node-input-rule-value",type:"text",style:"width: 100%;"}).appendTo(row)
-            .typedInput({default:defaultType||'str',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+            .typedInput({default:defaultType||'str',types:['msg','flow','global','str','num','jsonata','env','re',previousValueType]});
     }
 
     function createNumValueField(row, defaultType){
@@ -365,6 +365,7 @@
                         if (type === "regex") {
                             row2.show();
                             row3.hide();
+                            valueField.typedInput('type','re');
                         } else if ((type === "btwn") || (type === "index")) {
                             row2.hide();
                             row3.show();
@@ -412,6 +413,9 @@
                     } else if (rule.t === "jsonata_exp") {
                         expValueField = createExpValueField(rowInputCell,rule.vt||'jsonata');
                         expValueField.typedInput('value',rule.v);
+                    } else if (rule.t === "regex") {
+                        valueField = createValueField(rowInputCell,'re');
+                        valueField.typedInput('value',rule.v);
                     } else if (typeof rule.v != "undefined") {
                         valueField = createValueField(rowInputCell,rule.vt||'str');
                         valueField.typedInput('value',rule.v);

From e71bfbd8ca128ecdb1fb4da114e7521a8c317a80 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@gmail.com>
Date: Sun, 14 Dec 2025 09:28:26 +0000
Subject: [PATCH 3/4] fix ui for regex value not to swap type unnecessarily

---
 .../@node-red/nodes/core/function/10-switch.html            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index b894ec1b2..be4e48a9b 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -365,7 +365,9 @@
                         if (type === "regex") {
                             row2.show();
                             row3.hide();
-                            valueField.typedInput('type','re');
+                            if ( valueField.typedInput('type') === "str") {
+                                valueField.typedInput('type','re');
+                            }
                         } else if ((type === "btwn") || (type === "index")) {
                             row2.hide();
                             row3.show();
@@ -414,7 +416,7 @@
                         expValueField = createExpValueField(rowInputCell,rule.vt||'jsonata');
                         expValueField.typedInput('value',rule.v);
                     } else if (rule.t === "regex") {
-                        valueField = createValueField(rowInputCell,'re');
+                        valueField = createValueField(rowInputCell,rule.vt||'re');
                         valueField.typedInput('value',rule.v);
                     } else if (typeof rule.v != "undefined") {
                         valueField = createValueField(rowInputCell,rule.vt||'str');

From 78fa6d81cbd04b5a80c1ad0032acc763ecda75d0 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <dceejay@gmail.com>
Date: Sun, 8 Feb 2026 10:22:07 +0000
Subject: [PATCH 4/4] Remove UI option to return regex matches

always return msg.matches for a regex.
---
 .../@node-red/nodes/core/function/10-switch.html         | 6 ------
 .../@node-red/nodes/core/function/10-switch.js           | 9 +++------
 .../@node-red/nodes/locales/en-US/messages.json          | 1 -
 test/nodes/core/function/10-switch_spec.js               | 8 ++++----
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
index be4e48a9b..434b50de5 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -112,7 +112,6 @@
             }
             if (type === "regex") {
                 r.case = rule.find(".node-input-rule-case").prop("checked");
-                r.match = rule.find(".node-input-rule-match").prop("checked");
             }
         }
         return r;
@@ -236,7 +235,6 @@
 
             var andLabel = this._("switch.and");
             var caseLabel = this._("switch.ignorecase");
-            var matchLabel = this._("switch.returnmatches");
 
             $("#node-input-rule-container").css('min-height','150px').css('min-width','450px').editableList({
                 addItem: function(container,i,opt) {
@@ -303,7 +301,6 @@
 
                     var rowInputCell = $('<div>',{style:"flex-grow:1; margin-left: 5px;"}).appendTo(row);
 
-
                     var valueField = null;
                     var numValueField = null;
                     var expValueField = null;
@@ -317,8 +314,6 @@
 
                     var caseSensitive = $('<input/>',{id:"node-input-rule-case-"+i,class:"node-input-rule-case",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
                     $('<label/>',{for:"node-input-rule-case-"+i,style:"margin-left: 3px;"}).text(caseLabel).appendTo(row2);
-                    var returnMatch = $('<input/>',{id:"node-input-rule-match-"+i,class:"node-input-rule-match",type:"checkbox",style:"width:auto;vertical-align:top"}).appendTo(row2);
-                    $('<label/>',{for:"node-input-rule-match-"+i,style:"margin-left: 3px;"}).text(matchLabel).appendTo(row2);
 
                     selectField.on("change", function() {
                         var fieldToFocus;
@@ -423,7 +418,6 @@
                         valueField.typedInput('value',rule.v);
                     }
                     caseSensitive.prop('checked',!!rule.case);
-                    returnMatch.prop('checked',!!rule.match);
                     selectField.change();
 
                     var currentOutputs = JSON.parse(outputCount.val()||"{}");
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.js b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
index d6c919a81..0e45f5f11 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.js
@@ -30,10 +30,7 @@ module.exports = function(RED) {
         'false': function(a) { return a === false; },
         'null': function(a) { return (typeof a == "undefined" || a === null); },
         'nnull': function(a) { return (typeof a != "undefined" && a !== null); },
-        'regex': function(a, b, c, d, e, f) {
-            if (f) { return (a + "").matchAll(new RegExp(b,d?'ig':'g')); }
-            else { return (a + "").match(new RegExp(b,d?'i':'')); }
-        },
+        'regex': function(a, b, c, d) { return (a + "").matchAll(new RegExp(b,d?'ig':'g')); },
         'empty': function(a) {
             if (typeof a === 'string' || Array.isArray(a) || Buffer.isBuffer(a)) {
                 return a.length === 0;
@@ -200,9 +197,9 @@ module.exports = function(RED) {
                     state.elseflag = true;
                 }
                 try {
-                    const r = operators[rule.t](property,v1,v2,rule.case,msg.parts,rule.match )
+                    const r = operators[rule.t](property,v1,v2,rule.case,msg.parts)
                     if (r) {
-                        if (rule.match == true && rule.t === "regex") {
+                        if (rule.t === "regex") {
                             msg.matches = [];
                             for (const match of r) {
                                 const le = match.length
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index f1eb37fbd..34462a4aa 100644
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -760,7 +760,6 @@
         "checkall": "checking all rules",
         "stopfirst": "stopping after first match",
         "ignorecase": "ignore case",
-        "returnmatches": "return msg.matches",
         "rules": {
             "btwn": "is between",
             "cont": "contains",
diff --git a/test/nodes/core/function/10-switch_spec.js b/test/nodes/core/function/10-switch_spec.js
index acbe20e1b..fe7726dc3 100644
--- a/test/nodes/core/function/10-switch_spec.js
+++ b/test/nodes/core/function/10-switch_spec.js
@@ -469,14 +469,14 @@ describe('switch Node', function() {
         customFlowSwitchTest(flow, true, "oneTWOthree", done);
     });
 
-    it('should match regex with return-matches flag set true', function(done) {
-        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"(b[aio]..)","vt":"str","match":true}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+    it('should match regex and return matches', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"(b[aio]..)","vt":"str"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
                     {id:"helperNode1", type:"helper", wires:[]}];
         customFlowMessageSwitchTest(flow, true, {payload:"foobishbashboshpoo",matches:[{"match":"bish","index":3,"groups":["bish"]},{"match":"bash","index":7,"groups":["bash"]},{"match":"bosh","index":11,"groups":["bosh"]}]}, done);
     });
 
-    it('should match regex with return-matches flag set true - 2', function(done) {
-        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"[b][iao]","vt":"str","match":true}],checkall:true,outputs:1,wires:[["helperNode1"]]},
+    it('should match regex and return matches - 2', function(done) {
+        var flow = [{id:"switchNode1",type:"switch",name:"switchNode",property:"payload",rules:[{"t":"regex","v":"[b][iao]","vt":"str"}],checkall:true,outputs:1,wires:[["helperNode1"]]},
                     {id:"helperNode1", type:"helper", wires:[]}];
         customFlowMessageSwitchTest(flow, true, {payload:"foobishbashboshpoo",matches:[{"match":"bi","index":3,"groups":[]},{"match":"ba","index":7,"groups":[]},{"match":"bo","index":11,"groups":[]}]}, done);
     });