@elderbyte/ngx-starter 19.13.1 → 19.13.2

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -6583,10 +6583,10 @@ class CuratedDataSource {
         return this._dataChanged;
     }
     findById(id) {
-        return this.originalSource.findById(id);
+        return this.readyUseCurated$.pipe(switchMap$1((useCurated) => this.curatedData.findById(id)), catchError((err) => this.originalSource.findById(id)));
     }
     findByIds(ids) {
-        return this.originalSource.findByIds(ids);
+        return this.readyUseCurated$.pipe(switchMap$1((useCurated) => this.findByIdsFirstCuratedThenOriginal(ids)));
     }
     getId(entity) {
         return this.originalSource.getId(entity);
@@ -6604,6 +6604,28 @@ class CuratedDataSource {
         const curatedEvents$ = this.curatedData.dataChanged.pipe(combineLatestWith(this.useCuratedData$), filter(([_, enabled]) => enabled), map(([event, _]) => event));
         return genericEvents$.pipe(mergeWith(curatedEvents$));
     }
+    findByIdsFirstCuratedThenOriginal(ids) {
+        const desiredIds = new Set(ids);
+        const curated = this.findAvailableCuratedByIds(desiredIds);
+        const missingIds = new Set(ids);
+        curated.forEach((entity, id) => missingIds.delete(id));
+        const curatedEntities = Array.from(curated.values());
+        if (missingIds.size > 0) {
+            return this.originalSource
+                .findByIds(Array.from(missingIds))
+                .pipe(map((missing) => [...missing, ...curatedEntities]));
+        }
+        else {
+            return of(curatedEntities);
+        }
+    }
+    findAvailableCuratedByIds(desiredIds) {
+        const map = new Map();
+        this.curatedData.data
+            .filter((e) => desiredIds.has(this.getId(e)))
+            .forEach((e) => map.set(this.getId(e), e));
+        return map;
+    }
 }
 
 /**