@dereekb/firebase 13.3.0 → 13.4.0

package/index.cjs.js

@@ -1929,11 +1929,8 @@ function getDataFromDocumentSnapshots(snapshots) {
  */ var firestoreQueryDocumentSnapshotPairsLoader = firestoreDocumentSnapshotPairsLoader;
 function documentData(snapshot) {
     var withId = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-    if (withId) {
-        return documentDataWithIdAndKey(snapshot);
-    } else {
-        return snapshot.data();
-    }
+    var result = withId ? documentDataWithIdAndKey(snapshot) : snapshot.data();
+    return result;
 }
 function documentDataFunction(withId) {
     return withId ? documentDataWithIdAndKey : function(snapshot) {
@@ -4240,18 +4237,20 @@ function whereStringValueHasPrefix(orderByFieldPath, value, sortDirection) {
 }
 function filterWithDateRange(fieldPath, dateRange, sortDirection) {
     var start = dateRange.start, end = dateRange.end;
+    var result;
     if (start && end) {
-        return whereDateIsBetween(fieldPath, {
+        result = whereDateIsBetween(fieldPath, {
             start: start,
             end: end
         }, sortDirection);
     } else if (start) {
-        return whereDateIsOnOrAfterWithSort(fieldPath, start, sortDirection);
+        result = whereDateIsOnOrAfterWithSort(fieldPath, start, sortDirection);
     } else if (end) {
-        return whereDateIsOnOrBeforeWithSort(fieldPath, end, sortDirection);
+        result = whereDateIsOnOrBeforeWithSort(fieldPath, end, sortDirection);
     } else {
-        return [];
+        result = [];
     }
+    return result;
 }
 function whereDateIsInRange(fieldPath, rangeInput, sortDirection) {
     var range = date.dateRange(rangeInput);
@@ -5604,22 +5603,22 @@ function _ts_generator$f(thisArg, body) {
         var iterateCheckpoint, inputFilterCheckpointSnapshot, inputHandleRepeatCursor, waitBetweenCheckpoints, useCheckpointResult, inputConstraintsFactory, inputDynamicConstraints, queryFactory, _config_maxParallelCheckpoints, maxParallelCheckpoints, inputLimitPerCheckpoint, inputTotalSnapshotsLimit, constraintsInputIsFactory, constraintsFactory, limitPerCheckpoint, totalSnapshotsLimit, currentIndex, hasReachedEnd, totalSnapshotsLimitReached, totalSnapshotsVisited, cursorDocument, visitedCursorPaths, handleRepeatCursor, filterCheckpointSnapshot, performTaskFn, result;
         function taskInputFactory() {
             return _async_to_generator$f(function() {
-                var constraints, startAfterFilter, totalPossibleNumberOfItemsLeftToLoad, nextLimit, query, docQuerySnapshot, docSnapshots, nextCursorDocument, cursorPath, shouldContinue, newSnapshotsVisited, i;
+                var result, constraints, startAfterFilter, shouldContinue, totalPossibleNumberOfItemsLeftToLoad, nextLimit, query, docQuerySnapshot, docSnapshots, nextCursorDocument, cursorPath, repeatResult, newSnapshotsVisited, i;
                 return _ts_generator$f(this, function(_state) {
                     switch(_state.label){
                         case 0:
                             // Perform another query, then pass the results to the task factory.
-                            if (hasReachedEnd) {
-                                return [
-                                    2,
-                                    null
-                                ]; // issue no more tasks
-                            }
+                            result = null;
+                            if (!!hasReachedEnd) return [
+                                3,
+                                5
+                            ];
                             constraints = constraintsFactory();
                             startAfterFilter = cursorDocument ? startAfter(cursorDocument) : undefined;
                             if (startAfterFilter) {
                                 constraints.push(startAfterFilter);
                             }
+                            shouldContinue = true;
                             if (limitPerCheckpoint != null) {
                                 totalPossibleNumberOfItemsLeftToLoad = Math.max(0, totalSnapshotsLimit - totalSnapshotsVisited);
                                 nextLimit = Math.min(limitPerCheckpoint, totalPossibleNumberOfItemsLeftToLoad);
@@ -5628,14 +5627,15 @@ function _ts_generator$f(thisArg, body) {
                                     cursorDocument = null;
                                     hasReachedEnd = true;
                                     totalSnapshotsLimitReached = true; // should have already been reached, but flag again just incase
-                                    return [
-                                        2,
-                                        null
-                                    ]; // exit immediately
+                                    shouldContinue = false;
                                 } else {
                                     constraints.push(limit(nextLimit));
                                 }
                             }
+                            if (!shouldContinue) return [
+                                3,
+                                5
+                            ];
                             query = queryFactory.query(constraints);
                             return [
                                 4,
@@ -5660,14 +5660,11 @@ function _ts_generator$f(thisArg, body) {
                                 handleRepeatCursor(nextCursorDocument)
                             ];
                         case 2:
-                            shouldContinue = _state.sent();
-                            if (shouldContinue === false) {
+                            repeatResult = _state.sent();
+                            if (repeatResult === false) {
                                 cursorDocument = null;
                                 hasReachedEnd = true;
-                                return [
-                                    2,
-                                    null
-                                ]; // exit immediately
+                                shouldContinue = false;
                             }
                             return [
                                 3,
@@ -5677,22 +5674,27 @@ function _ts_generator$f(thisArg, body) {
                             visitedCursorPaths.add(cursorPath);
                             _state.label = 4;
                         case 4:
-                            cursorDocument = nextCursorDocument; // set the next cursor document
-                            // update state
-                            newSnapshotsVisited = docSnapshots.length;
-                            totalSnapshotsVisited += newSnapshotsVisited;
-                            if (!cursorDocument || totalSnapshotsVisited > totalSnapshotsLimit) {
-                                hasReachedEnd = true; // mark as having reached the end
-                                totalSnapshotsLimitReached = true; // mark as having reached the limit
+                            if (shouldContinue) {
+                                cursorDocument = nextCursorDocument; // set the next cursor document
+                                // update state
+                                newSnapshotsVisited = docSnapshots.length;
+                                totalSnapshotsVisited += newSnapshotsVisited;
+                                if (!cursorDocument || totalSnapshotsVisited > totalSnapshotsLimit) {
+                                    hasReachedEnd = true; // mark as having reached the end
+                                    totalSnapshotsLimitReached = true; // mark as having reached the limit
+                                }
+                                i = currentIndex;
+                                currentIndex += 1; // increase our current index
+                                result = {
+                                    i: i,
+                                    docQuerySnapshot: docQuerySnapshot
+                                };
                             }
-                            i = currentIndex;
-                            currentIndex += 1; // increase our current index
+                            _state.label = 5;
+                        case 5:
                             return [
                                 2,
-                                {
-                                    i: i,
-                                    docQuerySnapshot: docQuerySnapshot
-                                }
+                                result
                             ];
                     }
                 });
@@ -6649,11 +6651,8 @@ function firestoreModelIdentity(parentOrModelName, collectionNameOrModelName, in
     } else {
         key = input;
     }
-    if (id) {
-        return id;
-    } else {
-        return util.lastValue(key.split(FIRESTORE_COLLECTION_NAME_SEPARATOR));
-    }
+    var result = id ? id : util.lastValue(key.split(FIRESTORE_COLLECTION_NAME_SEPARATOR));
+    return result;
 }
 /**
  * Returns the array of ids within a FirestoreModelKey.
@@ -6811,15 +6810,9 @@ function firestoreModelIdentity(parentOrModelName, collectionNameOrModelName, in
  * @param children
  * @returns
  */ function childFirestoreModelKeyPath(parent, children) {
-    if (Array.isArray(children)) {
-        return children.map(function(childPath) {
-            return "".concat(parent).concat(FIRESTORE_COLLECTION_NAME_SEPARATOR).concat(childPath);
-        });
-    } else {
-        return [
-            "".concat(parent).concat(FIRESTORE_COLLECTION_NAME_SEPARATOR).concat(children)
-        ];
-    }
+    return util.asArray(children).map(function(childPath) {
+        return "".concat(parent).concat(FIRESTORE_COLLECTION_NAME_SEPARATOR).concat(childPath);
+    });
 }
 function firestoreModelKeyPairObject(input) {
     var pairs = firestoreModelKeyPartPairs(input);

package/index.esm.js

@@ -1927,11 +1927,8 @@ function getDataFromDocumentSnapshots(snapshots) {
  */ var firestoreQueryDocumentSnapshotPairsLoader = firestoreDocumentSnapshotPairsLoader;
 function documentData(snapshot) {
     var withId = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
-    if (withId) {
-        return documentDataWithIdAndKey(snapshot);
-    } else {
-        return snapshot.data();
-    }
+    var result = withId ? documentDataWithIdAndKey(snapshot) : snapshot.data();
+    return result;
 }
 function documentDataFunction(withId) {
     return withId ? documentDataWithIdAndKey : function(snapshot) {
@@ -4238,18 +4235,20 @@ function whereStringValueHasPrefix(orderByFieldPath, value, sortDirection) {
 }
 function filterWithDateRange(fieldPath, dateRange, sortDirection) {
     var start = dateRange.start, end = dateRange.end;
+    var result;
     if (start && end) {
-        return whereDateIsBetween(fieldPath, {
+        result = whereDateIsBetween(fieldPath, {
             start: start,
             end: end
         }, sortDirection);
     } else if (start) {
-        return whereDateIsOnOrAfterWithSort(fieldPath, start, sortDirection);
+        result = whereDateIsOnOrAfterWithSort(fieldPath, start, sortDirection);
     } else if (end) {
-        return whereDateIsOnOrBeforeWithSort(fieldPath, end, sortDirection);
+        result = whereDateIsOnOrBeforeWithSort(fieldPath, end, sortDirection);
     } else {
-        return [];
+        result = [];
     }
+    return result;
 }
 function whereDateIsInRange(fieldPath, rangeInput, sortDirection) {
     var range = dateRange(rangeInput);
@@ -5602,22 +5601,22 @@ function _ts_generator$f(thisArg, body) {
         var iterateCheckpoint, inputFilterCheckpointSnapshot, inputHandleRepeatCursor, waitBetweenCheckpoints, useCheckpointResult, inputConstraintsFactory, inputDynamicConstraints, queryFactory, _config_maxParallelCheckpoints, maxParallelCheckpoints, inputLimitPerCheckpoint, inputTotalSnapshotsLimit, constraintsInputIsFactory, constraintsFactory, limitPerCheckpoint, totalSnapshotsLimit, currentIndex, hasReachedEnd, totalSnapshotsLimitReached, totalSnapshotsVisited, cursorDocument, visitedCursorPaths, handleRepeatCursor, filterCheckpointSnapshot, performTaskFn, result;
         function taskInputFactory() {
             return _async_to_generator$f(function() {
-                var constraints, startAfterFilter, totalPossibleNumberOfItemsLeftToLoad, nextLimit, query, docQuerySnapshot, docSnapshots, nextCursorDocument, cursorPath, shouldContinue, newSnapshotsVisited, i;
+                var result, constraints, startAfterFilter, shouldContinue, totalPossibleNumberOfItemsLeftToLoad, nextLimit, query, docQuerySnapshot, docSnapshots, nextCursorDocument, cursorPath, repeatResult, newSnapshotsVisited, i;
                 return _ts_generator$f(this, function(_state) {
                     switch(_state.label){
                         case 0:
                             // Perform another query, then pass the results to the task factory.
-                            if (hasReachedEnd) {
-                                return [
-                                    2,
-                                    null
-                                ]; // issue no more tasks
-                            }
+                            result = null;
+                            if (!!hasReachedEnd) return [
+                                3,
+                                5
+                            ];
                             constraints = constraintsFactory();
                             startAfterFilter = cursorDocument ? startAfter(cursorDocument) : undefined;
                             if (startAfterFilter) {
                                 constraints.push(startAfterFilter);
                             }
+                            shouldContinue = true;
                             if (limitPerCheckpoint != null) {
                                 totalPossibleNumberOfItemsLeftToLoad = Math.max(0, totalSnapshotsLimit - totalSnapshotsVisited);
                                 nextLimit = Math.min(limitPerCheckpoint, totalPossibleNumberOfItemsLeftToLoad);
@@ -5626,14 +5625,15 @@ function _ts_generator$f(thisArg, body) {
                                     cursorDocument = null;
                                     hasReachedEnd = true;
                                     totalSnapshotsLimitReached = true; // should have already been reached, but flag again just incase
-                                    return [
-                                        2,
-                                        null
-                                    ]; // exit immediately
+                                    shouldContinue = false;
                                 } else {
                                     constraints.push(limit(nextLimit));
                                 }
                             }
+                            if (!shouldContinue) return [
+                                3,
+                                5
+                            ];
                             query = queryFactory.query(constraints);
                             return [
                                 4,
@@ -5658,14 +5658,11 @@ function _ts_generator$f(thisArg, body) {
                                 handleRepeatCursor(nextCursorDocument)
                             ];
                         case 2:
-                            shouldContinue = _state.sent();
-                            if (shouldContinue === false) {
+                            repeatResult = _state.sent();
+                            if (repeatResult === false) {
                                 cursorDocument = null;
                                 hasReachedEnd = true;
-                                return [
-                                    2,
-                                    null
-                                ]; // exit immediately
+                                shouldContinue = false;
                             }
                             return [
                                 3,
@@ -5675,22 +5672,27 @@ function _ts_generator$f(thisArg, body) {
                             visitedCursorPaths.add(cursorPath);
                             _state.label = 4;
                         case 4:
-                            cursorDocument = nextCursorDocument; // set the next cursor document
-                            // update state
-                            newSnapshotsVisited = docSnapshots.length;
-                            totalSnapshotsVisited += newSnapshotsVisited;
-                            if (!cursorDocument || totalSnapshotsVisited > totalSnapshotsLimit) {
-                                hasReachedEnd = true; // mark as having reached the end
-                                totalSnapshotsLimitReached = true; // mark as having reached the limit
+                            if (shouldContinue) {
+                                cursorDocument = nextCursorDocument; // set the next cursor document
+                                // update state
+                                newSnapshotsVisited = docSnapshots.length;
+                                totalSnapshotsVisited += newSnapshotsVisited;
+                                if (!cursorDocument || totalSnapshotsVisited > totalSnapshotsLimit) {
+                                    hasReachedEnd = true; // mark as having reached the end
+                                    totalSnapshotsLimitReached = true; // mark as having reached the limit
+                                }
+                                i = currentIndex;
+                                currentIndex += 1; // increase our current index
+                                result = {
+                                    i: i,
+                                    docQuerySnapshot: docQuerySnapshot
+                                };
                             }
-                            i = currentIndex;
-                            currentIndex += 1; // increase our current index
+                            _state.label = 5;
+                        case 5:
                             return [
                                 2,
-                                {
-                                    i: i,
-                                    docQuerySnapshot: docQuerySnapshot
-                                }
+                                result
                             ];
                     }
                 });
@@ -6647,11 +6649,8 @@ function firestoreModelIdentity(parentOrModelName, collectionNameOrModelName, in
     } else {
         key = input;
     }
-    if (id) {
-        return id;
-    } else {
-        return lastValue(key.split(FIRESTORE_COLLECTION_NAME_SEPARATOR));
-    }
+    var result = id ? id : lastValue(key.split(FIRESTORE_COLLECTION_NAME_SEPARATOR));
+    return result;
 }
 /**
  * Returns the array of ids within a FirestoreModelKey.
@@ -6809,15 +6808,9 @@ function firestoreModelIdentity(parentOrModelName, collectionNameOrModelName, in
  * @param children
  * @returns
  */ function childFirestoreModelKeyPath(parent, children) {
-    if (Array.isArray(children)) {
-        return children.map(function(childPath) {
-            return "".concat(parent).concat(FIRESTORE_COLLECTION_NAME_SEPARATOR).concat(childPath);
-        });
-    } else {
-        return [
-            "".concat(parent).concat(FIRESTORE_COLLECTION_NAME_SEPARATOR).concat(children)
-        ];
-    }
+    return asArray(children).map(function(childPath) {
+        return "".concat(parent).concat(FIRESTORE_COLLECTION_NAME_SEPARATOR).concat(childPath);
+    });
 }
 function firestoreModelKeyPairObject(input) {
     var pairs = firestoreModelKeyPartPairs(input);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "exports": {
     "./test": {
       "module": "./test/index.esm.js",
@@ -17,10 +17,10 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/util": "13.3.0",
-    "@dereekb/date": "13.3.0",
-    "@dereekb/model": "13.3.0",
-    "@dereekb/rxjs": "13.3.0",
+    "@dereekb/util": "13.4.0",
+    "@dereekb/date": "13.4.0",
+    "@dereekb/model": "13.4.0",
+    "@dereekb/rxjs": "13.4.0",
     "@firebase/rules-unit-testing": "5.0.0",
     "arktype": "^2.2.0",
     "date-fns": "^4.0.0",

package/src/lib/common/auth/auth.context.d.ts

@@ -19,7 +19,7 @@ export interface FirebaseAuthContextInfo {
     /**
      * Current UID
      */
-    readonly uid: string;
+    readonly uid: FirebaseAuthUserId;
     /**
      * Returns true if the user is considered a system admin.
      */

package/src/lib/common/firestore/accessor/accessor.d.ts

@@ -184,7 +184,7 @@ export declare enum FirestoreAccessorStreamMode {
  * @param options - Options for how to format the document data
  * @returns An Observable that emits the document data or undefined if the document doesn't exist
  */
-export declare function snapshotStreamDataForAccessor<T>(accessor: FirestoreDocumentDataAccessor<T>, mode: FirestoreAccessorStreamMode, options?: SnapshotOptions): Observable<T | undefined>;
+export declare function snapshotStreamDataForAccessor<T>(accessor: FirestoreDocumentDataAccessor<T>, mode: FirestoreAccessorStreamMode, options?: SnapshotOptions): Observable<Maybe<T>>;
 /**
  * Creates an Observable that emits DocumentSnapshots based on the specified stream mode.
  *

package/src/lib/common/firestore/accessor/document.d.ts

@@ -27,11 +27,11 @@ import { type FirestoreDataConverterFactory, type FirestoreDataConverterFactoryR
  */
 export interface FirestoreDocument<T, I extends FirestoreModelIdentity = FirestoreModelIdentity> extends FirestoreDataConverterRef<T>, DocumentReferenceRef<T>, CollectionReferenceRef<T>, FirestoreModelIdentityRef<I>, FirestoreModelTypeRef<FirestoreModelIdentityModelType<I>>, FirestoreCollectionNameRef<FirestoreModelIdentityCollectionName<I>>, FirestoreModelKeyRef, FirestoreModelIdRef {
     readonly accessor: FirestoreDocumentDataAccessor<T>;
-    readonly id: string;
+    readonly id: FirestoreModelId;
     snapshotStream(mode: FirestoreAccessorStreamMode): Observable<DocumentSnapshot<T>>;
-    snapshotDataStream(mode: FirestoreAccessorStreamMode, options?: SnapshotOptions): Observable<T | undefined>;
+    snapshotDataStream(mode: FirestoreAccessorStreamMode, options?: SnapshotOptions): Observable<Maybe<T>>;
     snapshot(): Promise<DocumentSnapshot<T>>;
-    snapshotData(options?: SnapshotOptions): Promise<T | undefined>;
+    snapshotData(options?: SnapshotOptions): Promise<Maybe<T>>;
     exists(): Promise<boolean>;
     create(data: T): Promise<WriteResult | void>;
     update(data: Partial<T>): Promise<WriteResult | void>;
@@ -85,7 +85,7 @@ export declare abstract class AbstractFirestoreDocument<T, D extends AbstractFir
      * @param options
      * @returns
      */
-    snapshotDataStream(mode: FirestoreAccessorStreamMode, options?: SnapshotOptions): Observable<T | undefined>;
+    snapshotDataStream(mode: FirestoreAccessorStreamMode, options?: SnapshotOptions): Observable<Maybe<T>>;
     /**
      * Retrieves a DocumentSnapshot of the document.
      * @returns
@@ -96,7 +96,7 @@ export declare abstract class AbstractFirestoreDocument<T, D extends AbstractFir
      * @param options
      * @returns
      */
-    snapshotData(options?: SnapshotOptions): Promise<T | undefined>;
+    snapshotData(options?: SnapshotOptions): Promise<Maybe<T>>;
     /**
      * Returns true if the model exists.
      *

package/src/lib/common/firestore/query/watcher.d.ts

@@ -1,3 +1,11 @@
+/**
+ * @module Firestore Query Watcher
+ *
+ * This module provides functionality for watching changes to Firestore query results over time.
+ * It tracks document additions, modifications, and removals, and provides an event-based
+ * system for reacting to these changes in real-time.
+ */
+import { type Milliseconds } from '@dereekb/util';
 import { type Observable } from 'rxjs';
 import { type DocumentChange, type QuerySnapshot } from '../types';
 import { type FirestoreItemPageIteration } from './iterator';
@@ -26,7 +34,7 @@ export interface IterationQueryDocChangeWatcherConfig<T = unknown> {
      * This delay is applied after the first successful page result is received.
      * Default is 0 (start immediately).
      */
-    readonly delay?: number;
+    readonly delay?: Milliseconds;
 }
 /**
  * Interface for watching query result changes events.

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

@@ -201,7 +201,7 @@ export interface StorageListFilesResult<R = unknown> {
     /**
      * Options used to retrieve the result.
      */
-    readonly options: StorageListFilesOptions | undefined;
+    readonly options: Maybe<StorageListFilesOptions>;
     /**
      * Whether or not there are more results available.
      */

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

@@ -13,7 +13,7 @@ export interface StorageListFilesResultFactoryDelegate<S, R> {
     hasItems(result: R): boolean;
     hasNext(result: R): boolean;
     nextPageTokenFromResult(result: R): Maybe<StorageListFilesPageToken>;
-    next(storage: S, options: StorageListFilesOptions | undefined, folder: FirebaseStorageAccessorFolder, result: R): Promise<StorageListFilesResult>;
+    next(storage: S, options: Maybe<StorageListFilesOptions>, folder: FirebaseStorageAccessorFolder, result: R): Promise<StorageListFilesResult>;
     file(storage: S, fileResult: StorageListItemResult): FirebaseStorageAccessorFile;
     folder(storage: S, folderResult: StorageListItemResult): FirebaseStorageAccessorFolder;
     filesFromResult(result: R, folder: FirebaseStorageAccessorFolder): StorageListItemResult[];
@@ -22,7 +22,7 @@ export interface StorageListFilesResultFactoryDelegate<S, R> {
 /**
  * Factory function that transforms a raw SDK list result into a normalized {@link StorageListFilesResult}.
  */
-export type StorageListFilesResultFactory<S, R> = (storage: S, folder: FirebaseStorageAccessorFolder, options: StorageListFilesOptions | undefined, result: R) => StorageListFilesResult;
+export type StorageListFilesResultFactory<S, R> = (storage: S, folder: FirebaseStorageAccessorFolder, options: Maybe<StorageListFilesOptions>, result: R) => StorageListFilesResult;
 /**
  * Creates a {@link StorageListFilesResultFactory} from a platform-specific delegate.
  *

package/src/lib/common/storage/types.d.ts

@@ -1,4 +1,4 @@
-import { type ArrayOrValue, type DateOrUnixDateTimeMillisecondsNumber, type FileSize, type Milliseconds, type MimeTypeWithoutParameters, type ISO8601DateString, type Maybe, type ContentDispositionString, type ContentTypeMimeType } from '@dereekb/util';
+import { type ArrayOrValue, type DateOrUnixDateTimeMillisecondsNumber, type FileSize, type Milliseconds, type MimeTypeWithoutParameters, type ISO8601DateString, type Maybe, type ContentDispositionString, type ContentTypeMimeType, type WebsiteUrl } from '@dereekb/util';
 import { type Observable } from 'rxjs';
 /**
  * Minimal shape of the Firebase client-side Storage object.
@@ -9,18 +9,18 @@ export type FirebaseStorageLikeStorage = {
     /**
      * The maximum time to retry uploads in milliseconds.
      */
-    readonly maxUploadRetryTime: number;
+    readonly maxUploadRetryTime: Milliseconds;
     /**
      * The maximum time to retry operations other than uploads or downloads in
      * milliseconds.
      */
-    readonly maxOperationRetryTime: number;
+    readonly maxOperationRetryTime: Milliseconds;
 };
 /**
  * Minimal shape of the Google Cloud Storage (server-side) object.
  */
 export type GoogleCloudLikeStorage = {
-    readonly baseUrl: string;
+    readonly baseUrl: WebsiteUrl;
     readonly projectId: string;
 };
 /**
@@ -256,27 +256,27 @@ export interface ConfigurableStorageMetadata {
     /**
      * Served as the 'Cache-Control' header on object download.
      */
-    readonly cacheControl?: string | undefined;
+    readonly cacheControl?: string;
     /**
      * Served as the 'Content-Disposition' header on object download.
      */
-    readonly contentDisposition?: string | undefined;
+    readonly contentDisposition?: string;
     /**
      * Served as the 'Content-Encoding' header on object download.
      */
-    readonly contentEncoding?: string | undefined;
+    readonly contentEncoding?: string;
     /**
      * Served as the 'Content-Language' header on object download.
      */
-    readonly contentLanguage?: string | undefined;
+    readonly contentLanguage?: string;
     /**
      * Served as the 'Content-Type' header on object download.
      */
-    readonly contentType?: string | undefined;
+    readonly contentType?: string;
     /**
      * Any user-specified custom metdata.
      */
-    readonly customMetadata?: StorageCustomMetadata | undefined;
+    readonly customMetadata?: StorageCustomMetadata;
 }
 /**
  * Storage metadata for a Storage object.
@@ -312,7 +312,7 @@ export interface StorageMetadata extends ConfigurableStorageMetadata {
     /**
      * The size of this object, in bytes.
      */
-    readonly size: number;
+    readonly size: FileSize;
     /**
      * A date string representing when this object was created.
      */
@@ -324,7 +324,7 @@ export interface StorageMetadata extends ConfigurableStorageMetadata {
     /**
      * A Base64-encoded MD5 hash of the object being uploaded.
      */
-    readonly md5Hash?: string | undefined;
+    readonly md5Hash?: string;
 }
 /**
  * Additional user-defined custom metadata.

package/src/lib/model/notification/notification.api.d.ts

@@ -25,7 +25,7 @@ export declare const NOTIFICATION_MESSAGE_MAX_LENGTH = 1000;
  * Config entries are inserted, unless marked as remove.
  */
 export interface NotificationBoxRecipientTemplateConfigArrayEntryParam extends NotificationBoxRecipientTemplateConfigArrayEntry {
-    readonly type: string;
+    readonly type: NotificationTemplateType;
     readonly sd?: Maybe<boolean>;
     readonly se?: Maybe<boolean>;
     readonly st?: Maybe<boolean>;

package/src/lib/model/notification/notification.api.util.d.ts

@@ -17,7 +17,7 @@ import { type NotificationTemplateType } from './notification.id';
  * @param b - array of update params to apply
  * @param limitToAllowedConfigTypes - when provided, filters the result to only include these template types
  */
-export declare function updateNotificationBoxRecipientTemplateConfigRecord(a: NotificationBoxRecipientTemplateConfigRecord, b: NotificationBoxRecipientTemplateConfigArrayEntryParam[], limitToAllowedConfigTypes?: Maybe<Iterable<NotificationTemplateType>>): NotificationBoxRecipientTemplateConfigRecord | undefined;
+export declare function updateNotificationBoxRecipientTemplateConfigRecord(a: NotificationBoxRecipientTemplateConfigRecord, b: NotificationBoxRecipientTemplateConfigArrayEntryParam[], limitToAllowedConfigTypes?: Maybe<Iterable<NotificationTemplateType>>): Maybe<NotificationBoxRecipientTemplateConfigRecord>;
 /**
  * Applies {@link UpdateNotificationUserDefaultNotificationBoxRecipientConfigParams} to an existing
  * {@link NotificationUserDefaultNotificationBoxRecipientConfig}, producing an updated config.
@@ -33,7 +33,7 @@ export declare function updateNotificationUserDefaultNotificationBoxRecipientCon
  *
  * Automatically sets `ns = true` (needs sync) when changes are detected and the recipient has been indexed.
  */
-export declare function updateNotificationUserNotificationBoxRecipientConfigIfChanged(a: NotificationUserNotificationBoxRecipientConfig, b: UpdateNotificationUserNotificationBoxRecipientParams, limitToAllowedConfigTypes?: Maybe<Iterable<NotificationTemplateType>>): NotificationUserNotificationBoxRecipientConfig | undefined;
+export declare function updateNotificationUserNotificationBoxRecipientConfigIfChanged(a: NotificationUserNotificationBoxRecipientConfig, b: UpdateNotificationUserNotificationBoxRecipientParams, limitToAllowedConfigTypes?: Maybe<Iterable<NotificationTemplateType>>): Maybe<NotificationUserNotificationBoxRecipientConfig>;
 /**
  * Batch-applies an array of {@link UpdateNotificationUserNotificationBoxRecipientParams} to the user's
  * per-box config array. Only updates configs for boxes that already exist in the user's config.
@@ -43,4 +43,4 @@ export declare function updateNotificationUserNotificationBoxRecipientConfigIfCh
  *
  * Returns `undefined` if no changes were made.
  */
-export declare function updateNotificationUserNotificationBoxRecipientConfigs(a: NotificationUserNotificationBoxRecipientConfig[], b: UpdateNotificationUserNotificationBoxRecipientParams[], filterWithService?: AppNotificationTemplateTypeInfoRecordService): NotificationUserNotificationBoxRecipientConfig[] | undefined;
+export declare function updateNotificationUserNotificationBoxRecipientConfigs(a: NotificationUserNotificationBoxRecipientConfig[], b: UpdateNotificationUserNotificationBoxRecipientParams[], filterWithService?: AppNotificationTemplateTypeInfoRecordService): Maybe<NotificationUserNotificationBoxRecipientConfig[]>;

package/src/lib/model/oidcmodel/oidcmodel.d.ts

@@ -1,5 +1,5 @@
 import { type JsonSerializableObject, type Maybe } from '@dereekb/util';
-import { AbstractFirestoreDocument, type CollectionReference, type FirestoreCollection, type FirestoreContext, type FirebaseAuthOwnershipKey } from '../../common';
+import { AbstractFirestoreDocument, type CollectionReference, type FirestoreCollection, type FirestoreContext, type FirebaseAuthOwnershipKey, type FirebaseAuthUserId } from '../../common';
 import { type GrantedDeleteRole, type GrantedReadRole, type GrantedUpdateRole } from '@dereekb/model';
 /**
  * Union of model identity types used in the OIDC function map.
@@ -47,7 +47,7 @@ export interface OidcEntry {
     /**
      * The oidc-provider model type (e.g., 'Session', 'AccessToken', 'Client').
      */
-    type: string;
+    type: OidcEntryType;
     /**
      * Serialized JSON of the full oidc-provider AdapterPayload.
      *
@@ -65,7 +65,7 @@ export interface OidcEntry {
     /**
      * User identifier. Extracted from the payload for indexed queries.
      */
-    uid?: Maybe<string>;
+    uid?: Maybe<FirebaseAuthUserId>;
     /**
      * Grant identifier for revocation support. Extracted from the payload for indexed queries.
      */

package/src/lib/model/oidcmodel/oidcmodel.query.d.ts

@@ -1,20 +1,21 @@
-import { type FirebaseAuthOwnershipKey, type FirestoreQueryConstraint } from '../../common';
+import { type FirebaseAuthOwnershipKey, type FirebaseAuthUserId, type FirestoreQueryConstraint } from '../../common';
+import { type OidcEntryType } from './oidcmodel';
 /**
  * Query for OidcEntry documents with a specific type.
  */
-export declare function oidcEntriesWithTypeQuery(type: string): FirestoreQueryConstraint[];
+export declare function oidcEntriesWithTypeQuery(type: OidcEntryType): FirestoreQueryConstraint[];
 /**
  * Query for OidcEntry documents with a specific type and userCode.
  */
-export declare function oidcEntriesByUserCodeQuery(type: string, userCode: string): FirestoreQueryConstraint[];
+export declare function oidcEntriesByUserCodeQuery(type: OidcEntryType, userCode: string): FirestoreQueryConstraint[];
 /**
  * Query for OidcEntry documents with a specific type and uid.
  */
-export declare function oidcEntriesByUidQuery(type: string, uid: string): FirestoreQueryConstraint[];
+export declare function oidcEntriesByUidQuery(type: OidcEntryType, uid: FirebaseAuthUserId): FirestoreQueryConstraint[];
 /**
  * Query for OidcEntry documents with a specific type and grantId.
  */
-export declare function oidcEntriesByGrantIdQuery(type: string, grantId: string): FirestoreQueryConstraint[];
+export declare function oidcEntriesByGrantIdQuery(type: OidcEntryType, grantId: string): FirestoreQueryConstraint[];
 /**
  * Query for OidcEntry Client documents owned by a specific user.
  */

package/test/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dereekb/firebase/test",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "peerDependencies": {
-    "@dereekb/date": "13.3.0",
-    "@dereekb/firebase": "13.3.0",
-    "@dereekb/model": "13.3.0",
-    "@dereekb/rxjs": "13.3.0",
-    "@dereekb/util": "13.3.0",
+    "@dereekb/date": "13.4.0",
+    "@dereekb/firebase": "13.4.0",
+    "@dereekb/model": "13.4.0",
+    "@dereekb/rxjs": "13.4.0",
+    "@dereekb/util": "13.4.0",
     "@firebase/rules-unit-testing": "5.0.0",
     "date-fns": "^4.0.0",
     "firebase": "^12.0.0",