@dereekb/firebase 10.1.7 → 10.1.8

package/index.cjs.js

@@ -4141,6 +4141,10 @@ function firestoreFieldConfigToModelMapFunctionsRef(config) {
  */
 function firestoreObjectArray(config) {
   var _a, _b;
+  const {
+    filterUnique: inputFilterUnique
+  } = config;
+  const filterUnique = inputFilterUnique !== null && inputFilterUnique !== void 0 ? inputFilterUnique : util.MAP_IDENTITY;
   const objectField = (_a = config.objectField) !== null && _a !== void 0 ? _a : firestoreFieldConfigToModelMapFunctionsRef(config.firestoreField);
   const sortFn = util.sortValuesFunctionOrMapIdentityWithSortRef(config);
   const {
@@ -4150,14 +4154,14 @@ function firestoreObjectArray(config) {
   const to = x => {
     // remove null/undefined values from each field when converting to in order to mirror firestore usage (undefined is treated like null)
     const base = baseTo(x);
-    const filtered = util.filterNullAndUndefinedValues(base);
-    return filtered;
+    const nullishfilteredOut = util.filterNullAndUndefinedValues(base);
+    return nullishfilteredOut;
   };
   return firestoreField({
     default: (_b = config.default) !== null && _b !== void 0 ? _b : () => [],
     defaultBeforeSave: config.defaultBeforeSave,
-    fromData: input => sortFn(input.map(x => from(x)), false),
-    toData: input => util.filterMaybeValues(sortFn(input, true)).map(x => to(x))
+    fromData: input => sortFn(filterUnique(input.map(x => from(x))), false),
+    toData: input => util.filterMaybeValues(sortFn(filterUnique(input), true)).map(x => to(x)) // filter then sort then map
   });
 }
 /**

package/index.esm.js

@@ -1,5 +1,5 @@
 import { increment, onSnapshot, getDoc, deleteDoc, setDoc, updateDoc, doc, collectionGroup, collection, runTransaction, writeBatch, limit as limit$1, limitToLast as limitToLast$1, orderBy as orderBy$1, documentId, where as where$1, startAt as startAt$1, startAfter as startAfter$1, endAt as endAt$1, endBefore as endBefore$1, getDocs, query } from 'firebase/firestore';
-import { cachedGetter, mergeModifiers, asArray, filterUndefinedValues, objectHasNoKeys, filterFalsyAndEmptyValues, build, wrapUseAsyncFunction, makeWithFactory, performMakeLoop, runAsyncTasksForValues, filterMaybeValues, useAsync, toModelFieldConversions, makeModelMapFunctions, modifyModelMapFunctions, assignValuesToPOJOFunction, KeyValueTypleValueFilter, asObjectCopyFactory, passThrough, isEqualToValueDecisionFunction, transformStringFunctionConfig, transformStringFunction, isDate, transformNumberFunction, sortValuesFunctionOrMapIdentityWithSortRef, unique, isMapIdentityFunction, chainMapSameFunctions, filterUniqueFunction, filterUniqueTransform, filterFromPOJOFunction, mapObjectMapFunction, copyObject, mapObjectMap, filterEmptyValues, modelFieldMapFunctions, toModelMapFunctions, latLngStringFunction, DEFAULT_LAT_LNG_STRING_VALUE, sortAscendingIndexNumberRefFunction, bitwiseSetDencoder, filterNullAndUndefinedValues, convertToArray, pushItemOrArrayItemsIntoArray, separateValues, UTF_8_START_CHARACTER, UTF_PRIVATE_USAGE_AREA_START, mergeArraysIntoArray, lastValue, flattenArrayOrValueArray, performAsyncTasks, batch, asGetter, getValueFromGetter, mapIdentityFunction, performTasksFromFactoryInParallelFunction, allowValueOnceFilter, flattenArray, groupValues, forEachInIterable, arrayToObject, takeFront, isOddNumber, objectToMap, ServerErrorResponse, toReadableError, capitalizeFirstLetter, lowercaseFirstLetter, toRelativeSlashPathStartType, mappedUseFunction, iterableToArray, setContainsAllValues, usePromise, slashPathFactory, errorMessageContainsString } from '@dereekb/util';
+import { cachedGetter, mergeModifiers, asArray, filterUndefinedValues, objectHasNoKeys, filterFalsyAndEmptyValues, build, wrapUseAsyncFunction, makeWithFactory, performMakeLoop, runAsyncTasksForValues, filterMaybeValues, useAsync, toModelFieldConversions, makeModelMapFunctions, modifyModelMapFunctions, assignValuesToPOJOFunction, KeyValueTypleValueFilter, asObjectCopyFactory, passThrough, isEqualToValueDecisionFunction, transformStringFunctionConfig, transformStringFunction, isDate, transformNumberFunction, sortValuesFunctionOrMapIdentityWithSortRef, unique, isMapIdentityFunction, chainMapSameFunctions, filterUniqueFunction, filterUniqueTransform, filterFromPOJOFunction, mapObjectMapFunction, copyObject, mapObjectMap, filterEmptyValues, modelFieldMapFunctions, toModelMapFunctions, latLngStringFunction, DEFAULT_LAT_LNG_STRING_VALUE, sortAscendingIndexNumberRefFunction, bitwiseSetDencoder, MAP_IDENTITY, filterNullAndUndefinedValues, convertToArray, pushItemOrArrayItemsIntoArray, separateValues, UTF_8_START_CHARACTER, UTF_PRIVATE_USAGE_AREA_START, mergeArraysIntoArray, lastValue, flattenArrayOrValueArray, performAsyncTasks, batch, asGetter, getValueFromGetter, mapIdentityFunction, performTasksFromFactoryInParallelFunction, allowValueOnceFilter, flattenArray, groupValues, forEachInIterable, arrayToObject, takeFront, isOddNumber, objectToMap, ServerErrorResponse, toReadableError, capitalizeFirstLetter, lowercaseFirstLetter, toRelativeSlashPathStartType, mappedUseFunction, iterableToArray, setContainsAllValues, usePromise, slashPathFactory, errorMessageContainsString } from '@dereekb/util';
 import { filterMaybe, lazyFrom, itemAccumulator, ItemPageIterator, MappedPageItemIterationInstance } from '@dereekb/rxjs';
 import { from, map, combineLatest, shareReplay, of, exhaustMap, Observable, switchMap, timer, skip } from 'rxjs';
 import { UNKNOWN_WEBSITE_LINK_TYPE, decodeWebsiteLinkEncodedDataToWebsiteFileLink, encodeWebsiteFileLinkToWebsiteLinkEncodedData, AbstractModelPermissionService, grantedRoleMapReader, noAccessRoleMap, fullAccessRoleMap } from '@dereekb/model';
@@ -4392,6 +4392,10 @@ function firestoreFieldConfigToModelMapFunctionsRef(config) {
  */
 function firestoreObjectArray(config) {
   var _objectField, _config$default9;
+  const {
+    filterUnique: inputFilterUnique
+  } = config;
+  const filterUnique = inputFilterUnique != null ? inputFilterUnique : MAP_IDENTITY;
   const objectField = (_objectField = config.objectField) != null ? _objectField : firestoreFieldConfigToModelMapFunctionsRef(config.firestoreField);
   const sortFn = sortValuesFunctionOrMapIdentityWithSortRef(config);
   const {
@@ -4401,14 +4405,15 @@ function firestoreObjectArray(config) {
   const to = x => {
     // remove null/undefined values from each field when converting to in order to mirror firestore usage (undefined is treated like null)
     const base = baseTo(x);
-    const filtered = filterNullAndUndefinedValues(base);
-    return filtered;
+    const nullishfilteredOut = filterNullAndUndefinedValues(base);
+    return nullishfilteredOut;
   };
   return firestoreField({
     default: (_config$default9 = config.default) != null ? _config$default9 : () => [],
     defaultBeforeSave: config.defaultBeforeSave,
-    fromData: input => sortFn(input.map(x => from(x)), false),
-    toData: input => filterMaybeValues(sortFn(input, true)).map(x => to(x))
+    fromData: input => sortFn(filterUnique(input.map(x => from(x))), false),
+    // map then filter then sort
+    toData: input => filterMaybeValues(sortFn(filterUnique(input), true)).map(x => to(x)) // filter then sort then map
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase",
-  "version": "10.1.7",
+  "version": "10.1.8",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",

package/src/lib/common/firestore/snapshot/snapshot.field.d.ts

@@ -325,7 +325,12 @@ export declare const firestoreModelIdGrantedRoleArrayMap: () => FirestoreModelFi
 /**
  * firestoreObjectArray configuration
  */
-export type FirestoreObjectArrayFieldConfig<T extends object, O extends object = FirestoreModelData<T>> = DefaultMapConfiguredFirestoreFieldConfig<T[], O[]> & (FirestoreObjectArrayFieldConfigObjectFieldInput<T, O> | FirestoreObjectArrayFieldConfigFirestoreFieldInput<T, O>) & Partial<SortCompareFunctionRef<T>>;
+export type FirestoreObjectArrayFieldConfig<T extends object, O extends object = FirestoreModelData<T>> = DefaultMapConfiguredFirestoreFieldConfig<T[], O[]> & (FirestoreObjectArrayFieldConfigObjectFieldInput<T, O> | FirestoreObjectArrayFieldConfigFirestoreFieldInput<T, O>) & Partial<SortCompareFunctionRef<T>> & {
+    /**
+     * Filters the objects array uniquely.
+     */
+    readonly filterUnique?: FilterUniqueFunction<T, any>;
+};
 export type FirestoreObjectArrayFieldConfigObjectFieldInput<T extends object, O extends object = FirestoreModelData<T>> = {
     /**
      * The field to use for conversion.

package/test/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [10.1.8](https://github.com/dereekb/dbx-components/compare/v10.1.7-dev...v10.1.8) (2024-04-02)
+
+
+
 ## [10.1.7](https://github.com/dereekb/dbx-components/compare/v10.1.6-dev...v10.1.7) (2024-03-28)
 
 

package/test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase/test",
-  "version": "10.1.7",
+  "version": "10.1.8",
   "type": "commonjs",
   "peerDependencies": {
     "@dereekb/util": "*",