From 4d487269ee68562dc2353c9ec70c40e29993c586 Mon Sep 17 00:00:00 2001 From: iorate <682043+iorate@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:20:54 +0900 Subject: [PATCH] minor refactoring --- src/scripts/ruleset/ruleset.ts | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/scripts/ruleset/ruleset.ts b/src/scripts/ruleset/ruleset.ts index 8e8c72313..6988bc8c0 100644 --- a/src/scripts/ruleset/ruleset.ts +++ b/src/scripts/ruleset/ruleset.ts @@ -340,7 +340,7 @@ 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]]; @@ -348,27 +348,39 @@ function execExpression( } 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]];