@elderbyte/ngx-starter 19.1.12 → 19.1.13

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -2633,7 +2633,7 @@ class Filter {
 }
 
 class FilterUtil {
-    static { this.logger = LoggerFactory.getLogger(FilterUtil.constructor.name); }
+    static { this.log = LoggerFactory.getLogger(FilterUtil.constructor.name); }
     static equals(aFilters, bFilters) {
         if (aFilters.length !== bFilters.length) {
             return false;
@@ -2714,7 +2714,7 @@ class FilterUtil {
         return null;
     }
     static filterData(data, filters) {
-        FilterUtil.logger.debug('Filtering data with ' + data.length + ' items.', filters);
+        FilterUtil.log.debug('Filtering data with ' + data.length + ' items.', filters);
         if (filters && filters.length > 0) {
             for (const filter of filters) {
                 data = data.filter((e) => FilterUtil.matches(e, filter));
@@ -2726,16 +2726,7 @@ class FilterUtil {
         if (filter.value === null || filter.value === undefined) {
             return true;
         }
-        let value;
-        if (entity === null || entity === undefined) {
-            value = null;
-        }
-        else if (typeof entity === 'object') {
-            value = entity[filter.key];
-        }
-        else {
-            value = String(entity); // Support filtering primitive values
-        }
+        const value = FilterUtil.resolveValue(entity, filter);
         if (Array.isArray(filter.value)) {
             for (const val of filter.value) {
                 if (FilterUtil.matchesValue(value, val)) {
@@ -2748,6 +2739,37 @@ class FilterUtil {
             return FilterUtil.matchesValue(value, filter.value);
         }
     }
+    static resolveValue(entity, filter) {
+        let value;
+        if (entity === null || entity === undefined) {
+            value = null;
+        }
+        else if (typeof entity === 'object') {
+            value = FilterUtil.resolveObjectValue(entity, filter);
+        }
+        else {
+            value = String(entity); // Support filtering primitive values
+        }
+        return value;
+    }
+    static resolveObjectValue(entity, filter) {
+        const hops = filter.key.split('.');
+        let resolved = entity;
+        for (const hop of hops) {
+            if (resolved) {
+                resolved = resolved[hop];
+            }
+            else {
+                FilterUtil.log.warn('Could not resolve filter key "' +
+                    filter.key +
+                    '" as path, .' +
+                    hop +
+                    ' not found on null.', entity);
+                return undefined;
+            }
+        }
+        return resolved;
+    }
     static matchesValue(haystack, needle) {
         if (haystack === needle) {
             return true;