minor refactoring

iorate · Jun 12, 2024 · 4d48726 · 4d48726
1 parent c37116d
commit 4d48726
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/scripts/ruleset/ruleset.ts b/src/scripts/ruleset/ruleset.ts
@@ -340,35 +340,47 @@ function execExpression(
 ): boolean {
   if (expression[0] === "=") {
     const prop = props[expression[1]];
-    return prop === expression[2];
+    return prop != null && prop === expression[2];
   }
   if (expression[0] === "=i") {
     const prop = props[expression[1]];
     return prop != null && prop.toLowerCase() === expression[2].toLowerCase();
   }
   if (expression[0] === "^=") {
     const prop = props[expression[1]];
-    return prop?.startsWith(expression[2]) ?? false;
+    // biome-ignore lint/complexity/useOptionalChain: Return a boolean value
+    return prop != null && prop.startsWith(expression[2]);
   }
   if (expression[0] === "^=i") {
     const prop = props[expression[1]];
-    return prop?.toLowerCase().startsWith(expression[2].toLowerCase()) ?? false;
+    return (
+      // biome-ignore lint/complexity/useOptionalChain: Return a boolean value
+      prop != null && prop.toLowerCase().startsWith(expression[2].toLowerCase())
+    );
   }
   if (expression[0] === "$=") {
     const prop = props[expression[1]];
-    return prop?.endsWith(expression[2]) ?? false;
+    // biome-ignore lint/complexity/useOptionalChain: Return a boolean value
+    return prop != null && prop.endsWith(expression[2]);
   }
   if (expression[0] === "$=i") {
     const prop = props[expression[1]];
-    return prop?.toLowerCase().endsWith(expression[2].toLowerCase()) ?? false;
+    return (
+      // biome-ignore lint/complexity/useOptionalChain: Return a boolean value
+      prop != null && prop.toLowerCase().endsWith(expression[2].toLowerCase())
+    );
   }
   if (expression[0] === "*=") {
     const prop = props[expression[1]];
-    return prop?.includes(expression[2]) ?? false;
+    // biome-ignore lint/complexity/useOptionalChain: Return a boolean value
+    return prop != null && prop.includes(expression[2]);
   }
   if (expression[0] === "*=i") {
     const prop = props[expression[1]];
-    return prop?.toLowerCase().includes(expression[2].toLowerCase()) ?? false;
+    return (
+      // biome-ignore lint/complexity/useOptionalChain: Return a boolean value
+      prop != null && prop.toLowerCase().includes(expression[2].toLowerCase())
+    );
   }
   if (expression[0] === "=~") {
     const prop = props[expression[1]];