From 1777fc749d914c4a52536da963b7ff909592f256 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 1 Dec 2023 13:11:07 +0000
Subject: [PATCH 1/2] Fix switch validation of typeof field Fixes #4464

---
 .../nodes/core/function/10-switch.html          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 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 01ec78e19..c409f8d3b 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
@@ -176,14 +176,17 @@
                     for (var i=0;i<rules.length;i++) {
                         const opt = { label: RED._('node-red:switch.label.rule')+' '+(i+1) }
                         const r = rules[i];
-                        if (r.hasOwnProperty('v')) {
-                            if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) {
-                                errors.push(msg)
+                        if (r.t !== 'istype') {
+                            if (r.hasOwnProperty('v')) {
+                                if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) {
+                                    errors.push(msg)
+                                }
                             }
-                        }
-                        if (r.hasOwnProperty('v2')) {
-                            if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
-                                errors.push(msg)
+                            if (r.hasOwnProperty('v2')) {
+                                if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
+                                    console.log('HERE2', msg)
+                                    errors.push(msg)
+                                }
                             }
                         }
                     }

From 8a04eb2e29cdb9562922da1b8beb683ee89b0c41 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 1 Dec 2023 19:40:49 +0000
Subject: [PATCH 2/2] Update
 packages/node_modules/@node-red/nodes/core/function/10-switch.html

---
 .../node_modules/@node-red/nodes/core/function/10-switch.html    | 1 -
 1 file changed, 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 c409f8d3b..10fcf7356 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
@@ -184,7 +184,6 @@
                             }
                             if (r.hasOwnProperty('v2')) {
                                 if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
-                                    console.log('HERE2', msg)
                                     errors.push(msg)
                                 }
                             }