fix: [#618] Tampering with original value casing + configurable property matching

Author: eonarheim

src/resource/filter-util.ts

@@ -1,6 +1,6 @@
 
 export const byNameCaseInsensitive = (name?: string) => {
-   return <TObject extends {name?: string}>(object: TObject) => {
+   return <TObject extends { name?: string }>(object: TObject) => {
       if (object?.name && name) {
          return object.name.toLocaleLowerCase().localeCompare(name.toLocaleLowerCase()) === 0;
       }
@@ -9,7 +9,7 @@ export const byNameCaseInsensitive = (name?: string) => {
 }
 
 export const byClassCaseInsensitive = (className?: string) => {
-   return <TObject extends {class?: string}>(object: TObject) => {
+   return <TObject extends { class?: string }>(object: TObject) => {
       if (object?.class && className) {
          return object.class.toLocaleLowerCase().localeCompare(className.toLocaleLowerCase()) === 0;
       }
@@ -20,17 +20,13 @@ export const byClassCaseInsensitive = (className?: string) => {
 const copyPropsLowerCase = (properties: Map<string, string | number | boolean>) => {
    const lowercase = new Map<string, string | number | boolean>();
    for (let [key, value] of properties) {
-      let normalizedValue = value;
-      if (typeof value === 'string') {
-         normalizedValue = value.toLocaleLowerCase();
-      }
-      lowercase.set(key.toLocaleLowerCase(), normalizedValue);
+      lowercase.set(key.toLocaleLowerCase(), value);
    }
    return lowercase;
 }
 
 export const byPropertyCaseInsensitive = (propertyName: string, value?: any) => {
-   return <TObject extends {properties: Map<string, string | number | boolean>}>(object: TObject) => {
+   return <TObject extends { properties: Map<string, string | number | boolean> }>(object: TObject) => {
       const lowercase = copyPropsLowerCase(object.properties);
 
       if (value !== undefined) {
@@ -39,9 +35,43 @@ export const byPropertyCaseInsensitive = (propertyName: string, value?: any) =>
             normalizedValue = value.toLocaleLowerCase();
          }
 
+         const maybeValue = lowercase.get(propertyName.toLocaleLowerCase());
+         if (typeof maybeValue === 'string') {
+            return maybeValue.toLocaleLowerCase() === normalizedValue;
+         }
+
+         return lowercase.get(propertyName.toLocaleLowerCase()) === normalizedValue;
+      } else {
+         return lowercase.has(propertyName.toLocaleLowerCase());
+      }
+   }
+}
+
+export const byProperty = (propertyName: string, value?: any, valueMatchInsensitve = true) => {
+   return <TObject extends { properties: Map<string, string | number | boolean> }>(object: TObject) => {
+      const lowercase = copyPropsLowerCase(object.properties);
+
+      if (value !== undefined) {
+         let normalizedValue = value;
+         if (typeof value === 'string') {
+            normalizedValue = valueMatchInsensitve ? value.toLocaleLowerCase() : value;
+         }
+
+         const maybeValue = lowercase.get(propertyName.toLocaleLowerCase());
+         if (typeof maybeValue === 'string') {
+            return (valueMatchInsensitve ? maybeValue.toLocaleLowerCase() : maybeValue) === normalizedValue;
+         }
+
          return lowercase.get(propertyName.toLocaleLowerCase()) === normalizedValue;
       } else {
          return lowercase.has(propertyName.toLocaleLowerCase());
       }
    }
-}
+}
+
+export const byPropertyMatcher = (propertyName: string, matchValue: (val: any) => boolean) => {
+   return <TObject extends { properties: Map<string, string | number | boolean> }>(object: TObject) => {
+      const lowercase = copyPropsLowerCase(object.properties);
+      return matchValue(lowercase.get(propertyName.toLocaleLowerCase()));
+   }
+}