@dereekb/firebase 13.14.0 → 13.16.0

package/eslint/index.cjs.js

@@ -11999,7 +11999,7 @@ var IDENTIFIER_RE = /^[A-Za-z_]\w*$/;
  * @param source - Raw rules source.
  * @returns The source with line comments replaced by equal-length whitespace (so offsets are preserved).
  */ function stripLineComments(source) {
-    return source.replace(/\/\/[^\n]*/g, function(match) {
+    return source.replaceAll(/\/\/[^\n]*/g, function(match) {
         return ' '.repeat(match.length);
     });
 }
@@ -12012,7 +12012,7 @@ var IDENTIFIER_RE = /^[A-Za-z_]\w*$/;
  * @param source - The (comment-stripped) source.
  * @returns The source with path-variable braces masked.
  */ function maskPathVariables(source) {
-    return source.replace(PATH_VARIABLE_RE, function(_match, inner) {
+    return source.replaceAll(PATH_VARIABLE_RE, function(_match, inner) {
         return "".concat(MASK_OPEN_CHAR).concat(inner).concat(MASK_CLOSE_CHAR);
     });
 }
@@ -12023,7 +12023,7 @@ var IDENTIFIER_RE = /^[A-Za-z_]\w*$/;
  * @param text - Text containing masked path variables.
  * @returns The text with `{name}` braces restored.
  */ function unmaskPathVariables(text) {
-    return text.replace(UNMASK_RE, function(_match, inner) {
+    return text.replaceAll(UNMASK_RE, function(_match, inner) {
         return "{".concat(inner, "}");
     });
 }
@@ -13520,9 +13520,9 @@ function fragListsToStrings(items) {
                 break;
             }
             var str = fragsToConcreteString(item);
-            result = str != null ? _to_consumable_array$3(result).concat([
+            result = str == null ? null : _to_consumable_array$3(result).concat([
                 str
-            ]) : null;
+            ]);
         }
     } catch (err) {
         _didIteratorError = true;
@@ -15140,9 +15140,9 @@ var identityRegistryCache = new Map();
             result = _object_spread({
                 modelName: modelName1,
                 collectionName: collectionName1
-            }, parentModelName != null ? {
+            }, parentModelName == null ? {} : {
                 parentModelName: parentModelName
-            } : {});
+            });
         }
     }
     return result;

package/eslint/index.esm.js

@@ -11997,7 +11997,7 @@ var IDENTIFIER_RE = /^[A-Za-z_]\w*$/;
  * @param source - Raw rules source.
  * @returns The source with line comments replaced by equal-length whitespace (so offsets are preserved).
  */ function stripLineComments(source) {
-    return source.replace(/\/\/[^\n]*/g, function(match) {
+    return source.replaceAll(/\/\/[^\n]*/g, function(match) {
         return ' '.repeat(match.length);
     });
 }
@@ -12010,7 +12010,7 @@ var IDENTIFIER_RE = /^[A-Za-z_]\w*$/;
  * @param source - The (comment-stripped) source.
  * @returns The source with path-variable braces masked.
  */ function maskPathVariables(source) {
-    return source.replace(PATH_VARIABLE_RE, function(_match, inner) {
+    return source.replaceAll(PATH_VARIABLE_RE, function(_match, inner) {
         return "".concat(MASK_OPEN_CHAR).concat(inner).concat(MASK_CLOSE_CHAR);
     });
 }
@@ -12021,7 +12021,7 @@ var IDENTIFIER_RE = /^[A-Za-z_]\w*$/;
  * @param text - Text containing masked path variables.
  * @returns The text with `{name}` braces restored.
  */ function unmaskPathVariables(text) {
-    return text.replace(UNMASK_RE, function(_match, inner) {
+    return text.replaceAll(UNMASK_RE, function(_match, inner) {
         return "{".concat(inner, "}");
     });
 }
@@ -13518,9 +13518,9 @@ function fragListsToStrings(items) {
                 break;
             }
             var str = fragsToConcreteString(item);
-            result = str != null ? _to_consumable_array$3(result).concat([
+            result = str == null ? null : _to_consumable_array$3(result).concat([
                 str
-            ]) : null;
+            ]);
         }
     } catch (err) {
         _didIteratorError = true;
@@ -15138,9 +15138,9 @@ var identityRegistryCache = new Map();
             result = _object_spread({
                 modelName: modelName1,
                 collectionName: collectionName1
-            }, parentModelName != null ? {
+            }, parentModelName == null ? {} : {
                 parentModelName: parentModelName
-            } : {});
+            });
         }
     }
     return result;

package/eslint/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dereekb/firebase/eslint",
-  "version": "13.14.0",
+  "version": "13.16.0",
   "peerDependencies": {
-    "@dereekb/util": "13.14.0",
+    "@dereekb/util": "13.16.0",
     "@marcbachmann/cel-js": "^7.6.1",
     "@typescript-eslint/parser": "8.59.3",
     "@typescript-eslint/utils": "8.59.3"
   },
   "devDependencies": {
-    "@dereekb/firebase": "13.14.0",
+    "@dereekb/firebase": "13.16.0",
     "eslint": "10.4.0",
     "firebase": "^12.12.1"
   },

package/index.cjs.js

@@ -715,7 +715,7 @@ function _ts_generator$n(thisArg, body) {
                 if (!util.objectHasNoKeys(updateData)) {
                     return [
                         2,
-                        params != null ? accessor.update(updateData, params) : accessor.update(updateData)
+                        params == null ? accessor.update(updateData) : accessor.update(updateData, params)
                     ];
                 }
                 return [
@@ -3186,7 +3186,7 @@ function documentDataWithIdAndKey(snapshot) {
                         return [
                             2,
                             util.filterMaybeArrayValues(pairs.map(function(pair) {
-                                return pair.data != null ? pair : undefined;
+                                return pair.data == null ? undefined : pair;
                             }))
                         ];
                 }
@@ -4115,11 +4115,11 @@ function _object_spread_props$k(target, source) {
  */ function firestoreField(config) {
     var _config_defaultBeforeSave;
     return {
-        from: config.default != null ? {
-            default: util.asObjectCopyFactory(config.default),
+        from: config.default == null ? {
+            defaultInput: util.asObjectCopyFactory(config.defaultData),
             convert: config.fromData
         } : {
-            defaultInput: util.asObjectCopyFactory(config.defaultData),
+            default: util.asObjectCopyFactory(config.default),
             convert: config.fromData
         },
         to: {
@@ -4183,11 +4183,11 @@ function optionalFirestoreField(config) {
         var transformData = inputTransformData !== null && inputTransformData !== void 0 ? inputTransformData : util.passThrough;
         var transformFrom = transformFromData !== null && transformFromData !== void 0 ? transformFromData : transformData;
         var baseTransformTo = transformToData !== null && transformToData !== void 0 ? transformToData : transformData;
-        var dontStoreValueIf = inputDontStoreValueIf != null ? util.isEqualToValueDecisionFunction(inputDontStoreValueIf) : null;
-        var transformTo = dontStoreValueIf != null ? function(value) {
+        var dontStoreValueIf = inputDontStoreValueIf == null ? null : util.isEqualToValueDecisionFunction(inputDontStoreValueIf);
+        var transformTo = dontStoreValueIf == null ? baseTransformTo : function(value) {
             var dontStoreCheck = dontStoreValueIf(value);
             return dontStoreCheck ? null : baseTransformTo(value);
-        } : baseTransformTo;
+        };
         var loadDefaultReadValueFn; // set if a default read value is provided
         // setup fromData
         var fromData;
@@ -4202,12 +4202,12 @@ function optionalFirestoreField(config) {
             fromData = function fromData(x) {
                 return transformFrom(x !== null && x !== void 0 ? x : loadDefaultReadValueFn());
             };
-        } else if (transformFrom !== util.passThrough) {
+        } else if (transformFrom === util.passThrough) {
+            fromData = util.passThrough;
+        } else {
             fromData = function fromData(x) {
-                return x != null ? transformFrom(x) : x;
+                return x == null ? x : transformFrom(x);
             };
-        } else {
-            fromData = util.passThrough;
         }
         // setup toData
         var dontStoreIf;
@@ -4220,7 +4220,12 @@ function optionalFirestoreField(config) {
             };
         }
         var toData;
-        if (dontStoreIf != null) {
+        if (dontStoreIf == null) {
+            toData = function toData(x) {
+                var _transformTo;
+                return x == null ? x : (_transformTo = transformTo(x)) !== null && _transformTo !== void 0 ? _transformTo : null;
+            };
+        } else {
             var dontStoreValue = dontStoreIf;
             toData = function toData(x) {
                 var result = x;
@@ -4230,11 +4235,6 @@ function optionalFirestoreField(config) {
                 }
                 return result;
             };
-        } else {
-            toData = function toData(x) {
-                var _transformTo;
-                return x != null ? (_transformTo = transformTo(x)) !== null && _transformTo !== void 0 ? _transformTo : null : x;
-            };
         }
         result = firestoreField({
             default: null,
@@ -4745,19 +4745,19 @@ function optionalFirestoreField(config) {
     var inputDontStoreIf = config === null || config === void 0 ? void 0 : config.dontStoreIf;
     var shouldNotStoreIfEmpty = (_ref = config === null || config === void 0 ? void 0 : config.dontStoreIfEmpty) !== null && _ref !== void 0 ? _ref : false;
     var dontStoreIf;
-    if (inputDontStoreIf != null) {
-        dontStoreIf = shouldNotStoreIfEmpty ? function(x) {
-            return x.length === 0 || inputDontStoreIf(x);
-        } : inputDontStoreIf;
-    } else {
+    if (inputDontStoreIf == null) {
         dontStoreIf = shouldNotStoreIfEmpty ? function(x) {
             return x.length === 0;
         } : undefined;
+    } else {
+        dontStoreIf = shouldNotStoreIfEmpty ? function(x) {
+            return x.length === 0 || inputDontStoreIf(x);
+        } : inputDontStoreIf;
     }
     var inputFilterUnique = (config === null || config === void 0 ? void 0 : config.filterUnique) === true ? util.unique : config === null || config === void 0 ? void 0 : config.filterUnique;
-    var filterUniqueValuesFn = inputFilterUnique != null ? function(x) {
+    var filterUniqueValuesFn = inputFilterUnique == null ? undefined : function(x) {
         return inputFilterUnique(x);
-    } : undefined;
+    };
     var inputTransformData = config === null || config === void 0 ? void 0 : config.transformData;
     var sortArrayFn = util.isMapIdentityFunction(sortFn) ? undefined : function(x) {
         return sortFn(x, true);
@@ -4843,7 +4843,7 @@ function optionalFirestoreField(config) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function firestoreUniqueStringArray(config) {
-    var filterUnique = config != null ? util.filterUniqueTransform(config) : util.unique;
+    var filterUnique = config == null ? util.unique : util.filterUniqueTransform(config);
     return firestoreUniqueArray(_object_spread_props$k(_object_spread$o({}, config), {
         filterUnique: filterUnique
     }));
@@ -5841,7 +5841,7 @@ function where(fieldPath, opStr, value) {
     switch(opStr){
         case 'array-contains':
             if (Array.isArray(value)) {
-                throw new Error('array-contains does not accept array values. Did you mean "array-contains-any"?');
+                throw new TypeError('array-contains does not accept array values. Did you mean "array-contains-any"?');
             }
             break;
         case 'in':
@@ -10045,7 +10045,7 @@ function _define_property$m(obj, key, value) {
         {
             key: "getWithConverter",
             value: function getWithConverter(converter) {
-                var withConverter = converter != null ? this.documentRef.withConverter(converter) : this.documentRef.withConverter(null);
+                var withConverter = converter == null ? this.documentRef.withConverter(null) : this.documentRef.withConverter(converter);
                 return firestore.getDoc(withConverter);
             }
         },
@@ -10413,7 +10413,7 @@ function _define_property$k(obj, key, value) {
         {
             key: "getWithConverter",
             value: function getWithConverter(converter) {
-                var withConverter = converter != null ? this.documentRef.withConverter(converter) : this.documentRef.withConverter(null);
+                var withConverter = converter == null ? this.documentRef.withConverter(null) : this.documentRef.withConverter(converter);
                 return this.transaction.get(withConverter);
             }
         },
@@ -15075,7 +15075,7 @@ function _object_spread_props$8(target, source) {
         n: util.updateMaybeValue(a.n, inputN),
         e: util.updateMaybeValue(a.e, inputE),
         t: util.updateMaybeValue(a.t, inputT),
-        s: uid != null ? null : util.updateMaybeValue(a.s, inputS) // null if uid is defined
+        s: uid == null ? util.updateMaybeValue(a.s, inputS) : null // null if uid is defined
     };
 }
 /**
@@ -16457,7 +16457,7 @@ function _object_spread_props$7(target, source) {
  */ function updateNotificationUserDefaultNotificationBoxRecipientConfig(a, b, limitToAllowedConfigTypes) {
     var _ref;
     var inputC = b.configs, inputF = b.f, inputBk = b.bk, inputLk = b.lk;
-    var c = (_ref = inputC != null ? updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes) : undefined) !== null && _ref !== void 0 ? _ref : a.c;
+    var c = (_ref = inputC == null ? undefined : updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes)) !== null && _ref !== void 0 ? _ref : a.c;
     return _object_spread_props$7(_object_spread$9({}, updateNotificationRecipient(a, b)), {
         c: c,
         f: util.updateMaybeValue(a.f, inputF),
@@ -16478,7 +16478,7 @@ function _object_spread_props$7(target, source) {
  */ function updateNotificationUserNotificationBoxRecipientConfigIfChanged(a, b, limitToAllowedConfigTypes) {
     var _ref;
     var inputC = b.configs, inputRm = b.rm, inputLk = b.lk, inputBk = b.bk;
-    var c = (_ref = inputC != null ? updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes) : undefined) !== null && _ref !== void 0 ? _ref : a.c;
+    var c = (_ref = inputC == null ? undefined : updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes)) !== null && _ref !== void 0 ? _ref : a.c;
     var nextConfig = _object_spread_props$7(_object_spread$9({}, updateNotificationRecipient(a, b)), {
         c: c,
         rm: util.updateMaybeValue(a.rm, inputRm),
@@ -19822,7 +19822,7 @@ function _ts_generator$2(thisArg, body) {
     var inputDefaultCreationType = config.defaultCreationType, inputDefaultShouldBeProcessed = config.defaultShouldBeProcessed, inputDefaultPurposeSubgroup = config.defaultPurposeSubgroup;
     var defaultCreationType = inputDefaultCreationType !== null && inputDefaultCreationType !== void 0 ? inputDefaultCreationType : exports.StorageFileCreationType.DIRECTLY_CREATED;
     var defaultShouldBeProcessed = inputDefaultShouldBeProcessed !== null && inputDefaultShouldBeProcessed !== void 0 ? inputDefaultShouldBeProcessed : false;
-    var defaultPurposeSubgroup = inputDefaultPurposeSubgroup != null ? inputDefaultPurposeSubgroup === true ? EMPTY_STORAGE_FILE_PURPOSE_SUBGROUP : inputDefaultPurposeSubgroup : undefined;
+    var defaultPurposeSubgroup = inputDefaultPurposeSubgroup == null ? undefined : inputDefaultPurposeSubgroup === true ? EMPTY_STORAGE_FILE_PURPOSE_SUBGROUP : inputDefaultPurposeSubgroup;
     return function(input) {
         return _async_to_generator$2(function() {
             var _ref, _ref1, _ref2, _ref3, _ref4, _input_file, _input_storagePathRef, inputTemplate, inputAccessor, transaction, context, inputNow, displayName, uploadedBy, user, ownershipKey, purpose, purposeSubgroup, metadata, shouldBeProcessed, parentStorageFileGroup, storageFileGroupIds, flagForStorageFileGroupsSync, now, accessor, storageFileCollection, storagePath, storageFileDocument, p, pg, ct, storageFileGroupId, storageFileKey, g, gs, template;
@@ -19844,7 +19844,7 @@ function _ts_generator$2(thisArg, body) {
                             throw new Error('createStorageFileDocumentPair() failed as neither a file, storagePathRef, or storagePath was provided.');
                         }
                         p = purpose !== null && purpose !== void 0 ? purpose : inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.p;
-                        pg = (_ref2 = purposeSubgroup !== null && purposeSubgroup !== void 0 ? purposeSubgroup : inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.pg) !== null && _ref2 !== void 0 ? _ref2 : p != null ? defaultPurposeSubgroup : undefined;
+                        pg = (_ref2 = purposeSubgroup !== null && purposeSubgroup !== void 0 ? purposeSubgroup : inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.pg) !== null && _ref2 !== void 0 ? _ref2 : p == null ? undefined : defaultPurposeSubgroup;
                         ct = (_ref3 = inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.ct) !== null && _ref3 !== void 0 ? _ref3 : defaultCreationType;
                         if (ct === exports.StorageFileCreationType.FOR_STORAGE_FILE_GROUP) {
                             if (!parentStorageFileGroup || !p) {

package/index.esm.js

@@ -1,5 +1,5 @@
 import { increment, arrayRemove, arrayUnion, onSnapshot, getDoc, deleteDoc, setDoc, updateDoc, collection, collectionGroup, doc, writeBatch, runTransaction, 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, query, getDocs, getCountFromServer } from 'firebase/firestore';
-import { cachedGetter, mergeModifiers, asArray, filterUndefinedValues, objectHasNoKeys, filterFalsyAndEmptyValues, build, compareStringsNumeric, wrapUseAsyncFunction, runAsyncTasksForValues, filterMaybeArrayValues, performMakeLoop, makeWithFactory, useAsync, MAP_IDENTITY, toModelFieldConversions, makeModelMapFunctions, modifyModelMapFunctions, assignValuesToPOJOFunction, KeyValueTypleValueFilter, toModelMapFunctions, asObjectCopyFactory, isEqualToValueDecisionFunction, passThrough, filterUniqueTransform, unique, transformStringFunctionConfig, transformStringFunction, sortValuesFunctionOrMapIdentityWithSortRef, bitwiseSetDencoder, sortAscendingIndexNumberRefFunction, filterFromPOJOFunction, mapObjectMap, copyObject, modelFieldMapFunctions, latLngStringFunction, DEFAULT_LAT_LNG_STRING_VALUE, mapObjectMapFunction, filterEmptyArrayValues, transformNumberFunction, filterUniqueFunction, dateFromDateOrTimeSecondsNumber, unixDateTimeSecondsNumberFromDate, isMapIdentityFunction, chainMapSameFunctions, isDate, filterNullAndUndefinedValues, pushItemOrArrayItemsIntoArray, separateValues, convertToArray, UTF_PRIVATE_USAGE_AREA_START, UTF_8_START_CHARACTER, mergeArraysIntoArray, lastValue, flattenArrayOrValueArray, allowValueOnceFilter, asGetter, getValueFromGetter, mapIdentityFunction, performTasksFromFactoryInParallelFunction, performAsyncTasks, batch, flattenArray, calculateExpirationDate, groupValues, forEachInIterable, arrayToObject, takeFront, stringContains, isOddNumber, objectToMap, ServerErrorResponse, toReadableError, capitalizeFirstLetter, lowercaseFirstLetter, toRelativeSlashPathStartType, splitStringAtFirstCharacterOccurence, mappedUseFunction, iterableToArray, setContainsAllValues, usePromise, slashPathFactory, errorMessageContainsString, bitwiseObjectDencoder, mergeObjectsFunction, mergeObjects, forEachKeyValue, updateMaybeValue, UNSET_INDEX_NUMBER, ModelRelationUtility, filterKeysOnPOJOFunction, areEqualPOJOValuesUsingPojoFilter, filterOnlyUndefinedValues, makeModelMap, isThrottled, MS_IN_HOUR, multiValueMapBuilder, mergeSlashPaths, slashPathDetails, toAbsoluteSlashPathStartType, SLASH_PATH_FILE_TYPE_SEPARATOR, slashPathPathMatcher, decisionFunction, slashPathSubPathMatcher } from '@dereekb/util';
+import { cachedGetter, mergeModifiers, asArray, filterUndefinedValues, objectHasNoKeys, filterFalsyAndEmptyValues, build, compareStringsNumeric, wrapUseAsyncFunction, runAsyncTasksForValues, filterMaybeArrayValues, performMakeLoop, makeWithFactory, useAsync, MAP_IDENTITY, toModelFieldConversions, makeModelMapFunctions, modifyModelMapFunctions, assignValuesToPOJOFunction, KeyValueTypleValueFilter, toModelMapFunctions, asObjectCopyFactory, isEqualToValueDecisionFunction, passThrough, unique, filterUniqueTransform, transformStringFunctionConfig, transformStringFunction, sortValuesFunctionOrMapIdentityWithSortRef, bitwiseSetDencoder, sortAscendingIndexNumberRefFunction, filterFromPOJOFunction, mapObjectMap, copyObject, modelFieldMapFunctions, latLngStringFunction, DEFAULT_LAT_LNG_STRING_VALUE, mapObjectMapFunction, filterEmptyArrayValues, transformNumberFunction, filterUniqueFunction, dateFromDateOrTimeSecondsNumber, unixDateTimeSecondsNumberFromDate, isMapIdentityFunction, chainMapSameFunctions, isDate, filterNullAndUndefinedValues, pushItemOrArrayItemsIntoArray, separateValues, convertToArray, UTF_PRIVATE_USAGE_AREA_START, UTF_8_START_CHARACTER, mergeArraysIntoArray, lastValue, flattenArrayOrValueArray, allowValueOnceFilter, asGetter, getValueFromGetter, mapIdentityFunction, performTasksFromFactoryInParallelFunction, performAsyncTasks, batch, flattenArray, calculateExpirationDate, groupValues, forEachInIterable, arrayToObject, takeFront, stringContains, isOddNumber, objectToMap, ServerErrorResponse, toReadableError, capitalizeFirstLetter, lowercaseFirstLetter, toRelativeSlashPathStartType, splitStringAtFirstCharacterOccurence, mappedUseFunction, iterableToArray, setContainsAllValues, usePromise, slashPathFactory, errorMessageContainsString, bitwiseObjectDencoder, mergeObjectsFunction, mergeObjects, forEachKeyValue, updateMaybeValue, UNSET_INDEX_NUMBER, ModelRelationUtility, filterKeysOnPOJOFunction, areEqualPOJOValuesUsingPojoFilter, filterOnlyUndefinedValues, makeModelMap, isThrottled, MS_IN_HOUR, multiValueMapBuilder, mergeSlashPaths, slashPathDetails, toAbsoluteSlashPathStartType, SLASH_PATH_FILE_TYPE_SEPARATOR, slashPathPathMatcher, decisionFunction, slashPathSubPathMatcher } from '@dereekb/util';
 import { filterMaybe, lazyFrom, itemAccumulator, ItemPageIterator, mappedPageItemIteration } from '@dereekb/rxjs';
 import { map, from, EMPTY, tap, combineLatest, of, Subject, filter, exhaustMap, Observable, switchMap, timer, skip, shareReplay } from 'rxjs';
 import { UNKNOWN_WEBSITE_LINK_TYPE, encodeWebsiteFileLinkToWebsiteLinkEncodedData, decodeWebsiteLinkEncodedDataToWebsiteFileLink, clearable, AbstractModelPermissionService, grantedRoleMapReader, noAccessRoleMap, fullAccessRoleMap, e164PhoneNumberType, ARKTYPE_DATE_DTO_TYPE } from '@dereekb/model';
@@ -713,7 +713,7 @@ function _ts_generator$n(thisArg, body) {
                 if (!objectHasNoKeys(updateData)) {
                     return [
                         2,
-                        params != null ? accessor.update(updateData, params) : accessor.update(updateData)
+                        params == null ? accessor.update(updateData) : accessor.update(updateData, params)
                     ];
                 }
                 return [
@@ -3184,7 +3184,7 @@ function documentDataWithIdAndKey(snapshot) {
                         return [
                             2,
                             filterMaybeArrayValues(pairs.map(function(pair) {
-                                return pair.data != null ? pair : undefined;
+                                return pair.data == null ? undefined : pair;
                             }))
                         ];
                 }
@@ -4113,11 +4113,11 @@ function _object_spread_props$k(target, source) {
  */ function firestoreField(config) {
     var _config_defaultBeforeSave;
     return {
-        from: config.default != null ? {
-            default: asObjectCopyFactory(config.default),
+        from: config.default == null ? {
+            defaultInput: asObjectCopyFactory(config.defaultData),
             convert: config.fromData
         } : {
-            defaultInput: asObjectCopyFactory(config.defaultData),
+            default: asObjectCopyFactory(config.default),
             convert: config.fromData
         },
         to: {
@@ -4181,11 +4181,11 @@ function optionalFirestoreField(config) {
         var transformData = inputTransformData !== null && inputTransformData !== void 0 ? inputTransformData : passThrough;
         var transformFrom = transformFromData !== null && transformFromData !== void 0 ? transformFromData : transformData;
         var baseTransformTo = transformToData !== null && transformToData !== void 0 ? transformToData : transformData;
-        var dontStoreValueIf = inputDontStoreValueIf != null ? isEqualToValueDecisionFunction(inputDontStoreValueIf) : null;
-        var transformTo = dontStoreValueIf != null ? function(value) {
+        var dontStoreValueIf = inputDontStoreValueIf == null ? null : isEqualToValueDecisionFunction(inputDontStoreValueIf);
+        var transformTo = dontStoreValueIf == null ? baseTransformTo : function(value) {
             var dontStoreCheck = dontStoreValueIf(value);
             return dontStoreCheck ? null : baseTransformTo(value);
-        } : baseTransformTo;
+        };
         var loadDefaultReadValueFn; // set if a default read value is provided
         // setup fromData
         var fromData;
@@ -4200,12 +4200,12 @@ function optionalFirestoreField(config) {
             fromData = function fromData(x) {
                 return transformFrom(x !== null && x !== void 0 ? x : loadDefaultReadValueFn());
             };
-        } else if (transformFrom !== passThrough) {
+        } else if (transformFrom === passThrough) {
+            fromData = passThrough;
+        } else {
             fromData = function fromData(x) {
-                return x != null ? transformFrom(x) : x;
+                return x == null ? x : transformFrom(x);
             };
-        } else {
-            fromData = passThrough;
         }
         // setup toData
         var dontStoreIf;
@@ -4218,7 +4218,12 @@ function optionalFirestoreField(config) {
             };
         }
         var toData;
-        if (dontStoreIf != null) {
+        if (dontStoreIf == null) {
+            toData = function toData(x) {
+                var _transformTo;
+                return x == null ? x : (_transformTo = transformTo(x)) !== null && _transformTo !== void 0 ? _transformTo : null;
+            };
+        } else {
             var dontStoreValue = dontStoreIf;
             toData = function toData(x) {
                 var result = x;
@@ -4228,11 +4233,6 @@ function optionalFirestoreField(config) {
                 }
                 return result;
             };
-        } else {
-            toData = function toData(x) {
-                var _transformTo;
-                return x != null ? (_transformTo = transformTo(x)) !== null && _transformTo !== void 0 ? _transformTo : null : x;
-            };
         }
         result = firestoreField({
             default: null,
@@ -4743,19 +4743,19 @@ function optionalFirestoreField(config) {
     var inputDontStoreIf = config === null || config === void 0 ? void 0 : config.dontStoreIf;
     var shouldNotStoreIfEmpty = (_ref = config === null || config === void 0 ? void 0 : config.dontStoreIfEmpty) !== null && _ref !== void 0 ? _ref : false;
     var dontStoreIf;
-    if (inputDontStoreIf != null) {
-        dontStoreIf = shouldNotStoreIfEmpty ? function(x) {
-            return x.length === 0 || inputDontStoreIf(x);
-        } : inputDontStoreIf;
-    } else {
+    if (inputDontStoreIf == null) {
         dontStoreIf = shouldNotStoreIfEmpty ? function(x) {
             return x.length === 0;
         } : undefined;
+    } else {
+        dontStoreIf = shouldNotStoreIfEmpty ? function(x) {
+            return x.length === 0 || inputDontStoreIf(x);
+        } : inputDontStoreIf;
     }
     var inputFilterUnique = (config === null || config === void 0 ? void 0 : config.filterUnique) === true ? unique : config === null || config === void 0 ? void 0 : config.filterUnique;
-    var filterUniqueValuesFn = inputFilterUnique != null ? function(x) {
+    var filterUniqueValuesFn = inputFilterUnique == null ? undefined : function(x) {
         return inputFilterUnique(x);
-    } : undefined;
+    };
     var inputTransformData = config === null || config === void 0 ? void 0 : config.transformData;
     var sortArrayFn = isMapIdentityFunction(sortFn) ? undefined : function(x) {
         return sortFn(x, true);
@@ -4841,7 +4841,7 @@ function optionalFirestoreField(config) {
  *
  * @__NO_SIDE_EFFECTS__
  */ function firestoreUniqueStringArray(config) {
-    var filterUnique = config != null ? filterUniqueTransform(config) : unique;
+    var filterUnique = config == null ? unique : filterUniqueTransform(config);
     return firestoreUniqueArray(_object_spread_props$k(_object_spread$o({}, config), {
         filterUnique: filterUnique
     }));
@@ -5839,7 +5839,7 @@ function where(fieldPath, opStr, value) {
     switch(opStr){
         case 'array-contains':
             if (Array.isArray(value)) {
-                throw new Error('array-contains does not accept array values. Did you mean "array-contains-any"?');
+                throw new TypeError('array-contains does not accept array values. Did you mean "array-contains-any"?');
             }
             break;
         case 'in':
@@ -10043,7 +10043,7 @@ function _define_property$m(obj, key, value) {
         {
             key: "getWithConverter",
             value: function getWithConverter(converter) {
-                var withConverter = converter != null ? this.documentRef.withConverter(converter) : this.documentRef.withConverter(null);
+                var withConverter = converter == null ? this.documentRef.withConverter(null) : this.documentRef.withConverter(converter);
                 return getDoc(withConverter);
             }
         },
@@ -10411,7 +10411,7 @@ function _define_property$k(obj, key, value) {
         {
             key: "getWithConverter",
             value: function getWithConverter(converter) {
-                var withConverter = converter != null ? this.documentRef.withConverter(converter) : this.documentRef.withConverter(null);
+                var withConverter = converter == null ? this.documentRef.withConverter(null) : this.documentRef.withConverter(converter);
                 return this.transaction.get(withConverter);
             }
         },
@@ -15073,7 +15073,7 @@ function _object_spread_props$8(target, source) {
         n: updateMaybeValue(a.n, inputN),
         e: updateMaybeValue(a.e, inputE),
         t: updateMaybeValue(a.t, inputT),
-        s: uid != null ? null : updateMaybeValue(a.s, inputS) // null if uid is defined
+        s: uid == null ? updateMaybeValue(a.s, inputS) : null // null if uid is defined
     };
 }
 /**
@@ -16455,7 +16455,7 @@ function _object_spread_props$7(target, source) {
  */ function updateNotificationUserDefaultNotificationBoxRecipientConfig(a, b, limitToAllowedConfigTypes) {
     var _ref;
     var inputC = b.configs, inputF = b.f, inputBk = b.bk, inputLk = b.lk;
-    var c = (_ref = inputC != null ? updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes) : undefined) !== null && _ref !== void 0 ? _ref : a.c;
+    var c = (_ref = inputC == null ? undefined : updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes)) !== null && _ref !== void 0 ? _ref : a.c;
     return _object_spread_props$7(_object_spread$9({}, updateNotificationRecipient(a, b)), {
         c: c,
         f: updateMaybeValue(a.f, inputF),
@@ -16476,7 +16476,7 @@ function _object_spread_props$7(target, source) {
  */ function updateNotificationUserNotificationBoxRecipientConfigIfChanged(a, b, limitToAllowedConfigTypes) {
     var _ref;
     var inputC = b.configs, inputRm = b.rm, inputLk = b.lk, inputBk = b.bk;
-    var c = (_ref = inputC != null ? updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes) : undefined) !== null && _ref !== void 0 ? _ref : a.c;
+    var c = (_ref = inputC == null ? undefined : updateNotificationBoxRecipientTemplateConfigRecord(a.c, inputC, limitToAllowedConfigTypes)) !== null && _ref !== void 0 ? _ref : a.c;
     var nextConfig = _object_spread_props$7(_object_spread$9({}, updateNotificationRecipient(a, b)), {
         c: c,
         rm: updateMaybeValue(a.rm, inputRm),
@@ -19820,7 +19820,7 @@ function _ts_generator$2(thisArg, body) {
     var inputDefaultCreationType = config.defaultCreationType, inputDefaultShouldBeProcessed = config.defaultShouldBeProcessed, inputDefaultPurposeSubgroup = config.defaultPurposeSubgroup;
     var defaultCreationType = inputDefaultCreationType !== null && inputDefaultCreationType !== void 0 ? inputDefaultCreationType : StorageFileCreationType.DIRECTLY_CREATED;
     var defaultShouldBeProcessed = inputDefaultShouldBeProcessed !== null && inputDefaultShouldBeProcessed !== void 0 ? inputDefaultShouldBeProcessed : false;
-    var defaultPurposeSubgroup = inputDefaultPurposeSubgroup != null ? inputDefaultPurposeSubgroup === true ? EMPTY_STORAGE_FILE_PURPOSE_SUBGROUP : inputDefaultPurposeSubgroup : undefined;
+    var defaultPurposeSubgroup = inputDefaultPurposeSubgroup == null ? undefined : inputDefaultPurposeSubgroup === true ? EMPTY_STORAGE_FILE_PURPOSE_SUBGROUP : inputDefaultPurposeSubgroup;
     return function(input) {
         return _async_to_generator$2(function() {
             var _ref, _ref1, _ref2, _ref3, _ref4, _input_file, _input_storagePathRef, inputTemplate, inputAccessor, transaction, context, inputNow, displayName, uploadedBy, user, ownershipKey, purpose, purposeSubgroup, metadata, shouldBeProcessed, parentStorageFileGroup, storageFileGroupIds, flagForStorageFileGroupsSync, now, accessor, storageFileCollection, storagePath, storageFileDocument, p, pg, ct, storageFileGroupId, storageFileKey, g, gs, template;
@@ -19842,7 +19842,7 @@ function _ts_generator$2(thisArg, body) {
                             throw new Error('createStorageFileDocumentPair() failed as neither a file, storagePathRef, or storagePath was provided.');
                         }
                         p = purpose !== null && purpose !== void 0 ? purpose : inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.p;
-                        pg = (_ref2 = purposeSubgroup !== null && purposeSubgroup !== void 0 ? purposeSubgroup : inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.pg) !== null && _ref2 !== void 0 ? _ref2 : p != null ? defaultPurposeSubgroup : undefined;
+                        pg = (_ref2 = purposeSubgroup !== null && purposeSubgroup !== void 0 ? purposeSubgroup : inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.pg) !== null && _ref2 !== void 0 ? _ref2 : p == null ? undefined : defaultPurposeSubgroup;
                         ct = (_ref3 = inputTemplate === null || inputTemplate === void 0 ? void 0 : inputTemplate.ct) !== null && _ref3 !== void 0 ? _ref3 : defaultCreationType;
                         if (ct === StorageFileCreationType.FOR_STORAGE_FILE_GROUP) {
                             if (!parentStorageFileGroup || !p) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase",
-  "version": "13.14.0",
+  "version": "13.16.0",
   "sideEffects": false,
   "exports": {
     "./test": {
@@ -24,10 +24,10 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/date": "13.14.0",
-    "@dereekb/model": "13.14.0",
-    "@dereekb/rxjs": "13.14.0",
-    "@dereekb/util": "13.14.0",
+    "@dereekb/date": "13.16.0",
+    "@dereekb/model": "13.16.0",
+    "@dereekb/rxjs": "13.16.0",
+    "@dereekb/util": "13.16.0",
     "@firebase/rules-unit-testing": "5.0.0",
     "@marcbachmann/cel-js": "^7.6.1",
     "@typescript-eslint/parser": "8.59.3",

package/src/lib/common/storage/driver/accessor.d.ts

@@ -1,7 +1,7 @@
 import { type StorageBucketId, type StoragePathInput, type StoragePath, type StoragePathRef, type StorageSlashPath } from '../storage';
 import { type ConfigurableStorageMetadata, type StorageAccessControlObject, type StorageAclMetadata, type StorageMakePrivateOptions, type StorageMoveOptions, type StorageSignedDownloadUrl, type StorageSignedDownloadUrlConfig, type FirebaseStorage, type StorageClientUploadBytesInput, type StorageDeleteFileOptions, type StorageDownloadUrl, type StorageMetadata, type StorageUploadInput, type StorageUploadOptions, type StorageUploadResult, type StorageUploadTask } from '../types';
 import { type ArrayOrValue, type Maybe } from '@dereekb/util';
-import { type Readable } from 'stream';
+import { type Readable } from 'node:stream';
 /**
  * Core interface for accessing files and folders in Firebase Cloud Storage.
  *

package/src/lib/common/storage/driver/accessor.util.d.ts

@@ -1,4 +1,4 @@
-import { type Readable } from 'stream';
+import { type Readable } from 'node:stream';
 import { type StorageUploadOptions } from '../types';
 import { type FirebaseStorageAccessorFile } from './accessor';
 /**

package/test/index.cjs.js

@@ -9,7 +9,7 @@ var rxjs$1 = require('rxjs');
 var rxjs = require('@dereekb/rxjs');
 var dateFns = require('date-fns');
 var date = require('@dereekb/date');
-var stream = require('stream');
+var node_stream = require('node:stream');
 var node_fs = require('node:fs');
 
 function _array_like_to_array$2(arr, len) {
@@ -263,7 +263,7 @@ function _ts_generator$6(thisArg, body) {
  * ```
  */ function makeTestingFirestoreAccesorDriver(driver) {
     var fuzzerKey = 0;
-    var time = new Date().getTime();
+    var time = Date.now();
     var fuzzedMap = new Map();
     var collection = driver.collection, subcollection = driver.subcollection, collectionGroup = driver.collectionGroup;
     var fuzzedPathForPath = function fuzzedPathForPath(path) {
@@ -419,7 +419,7 @@ var bucketTestNameKey = 0;
     var useTestDefaultBucket = (config !== null && config !== void 0 ? config : {}).useTestDefaultBucket;
     // The default bucket is only used if another bucket is not input.
     var defaultBucket = !driver.getDefaultBucket && useTestDefaultBucket !== false || useTestDefaultBucket === true ? util.cachedGetter(function() {
-        var time = new Date().getTime();
+        var time = Date.now();
         var random = Math.ceil(Math.random() * 999999) % 999999;
         return "test-bucket-".concat(time, "-").concat(random, "-").concat(bucketTestNameKey += 1);
     }) : driver.getDefaultBucket;
@@ -1063,11 +1063,11 @@ function _ts_generator$5(thisArg, body) {
 // MARK: Internal
 function rulesTestContextForConfig(rulesTestEnv, testingRulesConfig) {
     var rulesTestContext;
-    if (testingRulesConfig != null) {
+    if (testingRulesConfig == null) {
+        rulesTestContext = rulesTestEnv.unauthenticatedContext();
+    } else {
         var _testingRulesConfig_tokenOptions;
         rulesTestContext = rulesTestEnv.authenticatedContext(testingRulesConfig.userId, (_testingRulesConfig_tokenOptions = testingRulesConfig.tokenOptions) !== null && _testingRulesConfig_tokenOptions !== void 0 ? _testingRulesConfig_tokenOptions : undefined);
-    } else {
-        rulesTestContext = rulesTestEnv.unauthenticatedContext();
     }
     return rulesTestContext;
 }
@@ -12234,7 +12234,7 @@ function _ts_generator(thisArg, body) {
                                         ];
                                         myText = 'This is a test string.';
                                         // Create a readable stream from the string
-                                        readableStream = stream.Readable.from(myText, {
+                                        readableStream = node_stream.Readable.from(myText, {
                                             encoding: 'utf-8'
                                         });
                                         return [

package/test/index.esm.js

@@ -7,7 +7,7 @@ import { firstValueFrom, filter, skip, from, first, map, switchMap } from 'rxjs'
 import { SubscriptionObject, isLoadingStateFinishedLoading, flattenAccumulatorResultItemArray, iteratorNextPageUntilPage, accumulatorCurrentPageListLoadingState, accumulatorFlattenPageListLoadingState } from '@dereekb/rxjs';
 import { addDays, startOfDay, addHours } from 'date-fns';
 import { DateRangeType } from '@dereekb/date';
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 import { createReadStream } from 'node:fs';
 
 function _array_like_to_array$2(arr, len) {
@@ -261,7 +261,7 @@ function _ts_generator$6(thisArg, body) {
  * ```
  */ function makeTestingFirestoreAccesorDriver(driver) {
     var fuzzerKey = 0;
-    var time = new Date().getTime();
+    var time = Date.now();
     var fuzzedMap = new Map();
     var collection = driver.collection, subcollection = driver.subcollection, collectionGroup = driver.collectionGroup;
     var fuzzedPathForPath = function fuzzedPathForPath(path) {
@@ -417,7 +417,7 @@ var bucketTestNameKey = 0;
     var useTestDefaultBucket = (config !== null && config !== void 0 ? config : {}).useTestDefaultBucket;
     // The default bucket is only used if another bucket is not input.
     var defaultBucket = !driver.getDefaultBucket && useTestDefaultBucket !== false || useTestDefaultBucket === true ? cachedGetter(function() {
-        var time = new Date().getTime();
+        var time = Date.now();
         var random = Math.ceil(Math.random() * 999999) % 999999;
         return "test-bucket-".concat(time, "-").concat(random, "-").concat(bucketTestNameKey += 1);
     }) : driver.getDefaultBucket;
@@ -1061,11 +1061,11 @@ function _ts_generator$5(thisArg, body) {
 // MARK: Internal
 function rulesTestContextForConfig(rulesTestEnv, testingRulesConfig) {
     var rulesTestContext;
-    if (testingRulesConfig != null) {
+    if (testingRulesConfig == null) {
+        rulesTestContext = rulesTestEnv.unauthenticatedContext();
+    } else {
         var _testingRulesConfig_tokenOptions;
         rulesTestContext = rulesTestEnv.authenticatedContext(testingRulesConfig.userId, (_testingRulesConfig_tokenOptions = testingRulesConfig.tokenOptions) !== null && _testingRulesConfig_tokenOptions !== void 0 ? _testingRulesConfig_tokenOptions : undefined);
-    } else {
-        rulesTestContext = rulesTestEnv.unauthenticatedContext();
     }
     return rulesTestContext;
 }

package/test/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/firebase/test",
-  "version": "13.14.0",
+  "version": "13.16.0",
   "peerDependencies": {
-    "@dereekb/date": "13.14.0",
-    "@dereekb/firebase": "13.14.0",
-    "@dereekb/model": "13.14.0",
-    "@dereekb/rxjs": "13.14.0",
-    "@dereekb/util": "13.14.0",
+    "@dereekb/date": "13.16.0",
+    "@dereekb/firebase": "13.16.0",
+    "@dereekb/model": "13.16.0",
+    "@dereekb/rxjs": "13.16.0",
+    "@dereekb/util": "13.16.0",
     "@firebase/rules-unit-testing": "5.0.0",
     "date-fns": "^4.1.0",
     "firebase": "^12.12.1",