@dereekb/firebase 10.0.4 → 10.0.6

package/package.json

@@ -1,26 +1,25 @@
 {
   "name": "@dereekb/firebase",
-  "version": "10.0.4",
+  "version": "10.0.6",
+  "type": "module",
   "exports": {
     ".": {
-      "types": "./src/index.d.ts",
-      "main": "./src/index.js",
-      "require": "./src/index.js",
-      "default": "./src/index.js"
+      "module": "./index.esm.js",
+      "import": "./index.cjs.mjs",
+      "default": "./index.cjs.js"
     },
     "./test": {
       "types": "./test/index.d.ts",
       "main": "./test/index.js",
       "require": "./test/index.js",
       "default": "./test/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
-  "main": "./src/index.js",
+  "main": "./index.cjs.js",
   "types": "./src/index.d.ts",
   "peerDependencies": {
-    "@firebase/firestore": "4.4.0",
     "@dereekb/util": "*",
-    "@firebase/storage": "0.12.0",
     "@dereekb/rxjs": "*",
     "@dereekb/model": "*",
     "@dereekb/date": "*",
@@ -31,5 +30,5 @@
     "class-validator": "^0.14.0"
   },
   "dependencies": {},
-  "type": "commonjs"
+  "module": "./index.esm.js"
 }

package/src/lib/client/firestore/driver.accessor.batch.d.ts

@@ -1,5 +1,5 @@
-import { DocumentReference, WriteBatch as FirebaseFirestoreWriteBatch } from '@firebase/firestore';
-import { FirestoreDocumentContext, UpdateData, WithFieldValue, FirestoreDocumentContextType, FirestoreDocumentDataAccessor, FirestoreDocumentDataAccessorFactory, SetOptions } from '../../common/firestore';
+import { type DocumentReference, type WriteBatch as FirebaseFirestoreWriteBatch } from 'firebase/firestore';
+import { type FirestoreDocumentContext, type UpdateData, type WithFieldValue, FirestoreDocumentContextType, type FirestoreDocumentDataAccessor, type FirestoreDocumentDataAccessorFactory, type SetOptions } from '../../common/firestore';
 import { DefaultFirestoreDocumentDataAccessor } from './driver.accessor.default';
 /**
  * FirestoreDocumentDataAccessor implementation for a batch.

package/src/lib/client/firestore/driver.accessor.create.d.ts

@@ -1,3 +1,3 @@
-import { FirestoreDocumentDataAccessor } from '../../common/firestore/accessor/accessor';
-import { WithFieldValue, WriteResult } from '../../common/firestore/types';
+import { type FirestoreDocumentDataAccessor } from '../../common/firestore/accessor/accessor';
+import { type WithFieldValue, type WriteResult } from '../../common/firestore/types';
 export declare function createWithAccessor<T>(accessor: FirestoreDocumentDataAccessor<T>): (data: WithFieldValue<T>) => Promise<void | WriteResult>;

package/src/lib/client/firestore/driver.accessor.d.ts

@@ -1,2 +1,2 @@
-import { FirestoreAccessorDriver } from '../../common/firestore/driver/accessor';
+import { type FirestoreAccessorDriver } from '../../common/firestore/driver/accessor';
 export declare function firestoreClientAccessorDriver(): FirestoreAccessorDriver;

package/src/lib/client/firestore/driver.accessor.default.d.ts

@@ -1,6 +1,6 @@
-import { DocumentReference, DocumentSnapshot, UpdateData, WithFieldValue } from '@firebase/firestore';
-import { Observable } from 'rxjs';
-import { DocumentData, FirestoreAccessorIncrementUpdate, FirestoreDataConverter, FirestoreDocumentContext, FirestoreDocumentDataAccessor, FirestoreDocumentDataAccessorFactory, SetOptions, WriteResult } from '../../common/firestore';
+import { type DocumentReference, type DocumentSnapshot, type UpdateData, type WithFieldValue } from 'firebase/firestore';
+import { type Observable } from 'rxjs';
+import { type DocumentData, type FirestoreAccessorIncrementUpdate, type FirestoreDataConverter, type FirestoreDocumentContext, type FirestoreDocumentDataAccessor, type FirestoreDocumentDataAccessorFactory, type SetOptions, type WriteResult } from '../../common/firestore';
 export declare class DefaultFirestoreDocumentDataAccessor<T> implements FirestoreDocumentDataAccessor<T> {
     readonly documentRef: DocumentReference<T>;
     constructor(documentRef: DocumentReference<T>);

package/src/lib/client/firestore/driver.accessor.transaction.d.ts

@@ -1,6 +1,6 @@
-import { DocumentReference, DocumentSnapshot, Transaction as FirebaseFirestoreTransaction, UpdateData, WithFieldValue } from '@firebase/firestore';
-import { Observable } from 'rxjs';
-import { FirestoreDocumentDataAccessor, FirestoreDocumentDataAccessorFactory, FirestoreDocumentContext, FirestoreDocumentContextType, SetOptions, DocumentData, FirestoreDataConverter, WriteResult, FirestoreAccessorIncrementUpdate } from '../../common/firestore';
+import { type DocumentReference, type DocumentSnapshot, type Transaction as FirebaseFirestoreTransaction, type UpdateData, type WithFieldValue } from 'firebase/firestore';
+import { type Observable } from 'rxjs';
+import { type FirestoreDocumentDataAccessor, type FirestoreDocumentDataAccessorFactory, type FirestoreDocumentContext, FirestoreDocumentContextType, type SetOptions, type DocumentData, type FirestoreDataConverter, type WriteResult, type FirestoreAccessorIncrementUpdate } from '../../common/firestore';
 /**
  * FirestoreDocumentDataAccessor implementation for a transaction.
  */

package/src/lib/client/firestore/driver.d.ts

@@ -1,3 +1,3 @@
-import { FirestoreDrivers } from '../../common/firestore/driver/driver';
+import { type FirestoreDrivers } from '../../common/firestore/driver/driver';
 export type FirebaseFirestoreClientDrivers = FirestoreDrivers;
 export declare function firebaseFirestoreClientDrivers(): FirebaseFirestoreClientDrivers;

package/src/lib/client/firestore/driver.query.d.ts

@@ -1,8 +1,8 @@
-import { ArrayOrValue } from '@dereekb/util';
-import { QueryConstraint } from 'firebase/firestore';
-import { FullFirestoreQueryConstraintHandlersMapping } from './../../common/firestore/query/constraint';
-import { FirestoreQueryConstraintFunctionsDriver, FirestoreQueryDriver } from '../../common/firestore/driver/query';
-import { Query } from '../../common/firestore/types';
+import { type ArrayOrValue } from '@dereekb/util';
+import { type QueryConstraint } from 'firebase/firestore';
+import { type FullFirestoreQueryConstraintHandlersMapping } from './../../common/firestore/query/constraint';
+import { type FirestoreQueryConstraintFunctionsDriver, type FirestoreQueryDriver } from '../../common/firestore/driver/query';
+import { type Query } from '../../common/firestore/types';
 export interface FirebaseFirestoreQueryBuilder {
     query: Query;
     constraints: QueryConstraint[];

package/src/lib/client/firestore/firestore.d.ts

@@ -1,4 +1,4 @@
-import { FirestoreContextFactory } from '../../common/firestore/context';
+import { type FirestoreContextFactory } from '../../common/firestore/context';
 /**
  * Creates a FirestoreContextFactory that uses the @firebase/firebase package.
  */

package/src/lib/client/firestore/increment.d.ts

@@ -1,5 +1,5 @@
-import { UpdateData } from '@firebase/firestore';
-import { FirestoreAccessorIncrementUpdate } from '../../common/firestore/accessor/accessor';
+import { type UpdateData } from 'firebase/firestore';
+import { type FirestoreAccessorIncrementUpdate } from '../../common/firestore/accessor/accessor';
 /**
  * Creates UpdateData corresponding to the input increment update.
  *

package/src/lib/client/function/development.function.d.ts

@@ -1,5 +1,5 @@
-import { ScheduledFunctionDevelopmentFirebaseFunctionParams, ScheduledFunctionDevelopmentFirebaseFunctionResult } from '../../common/development/function.schedule';
-import { FirebaseFunction } from './function';
+import { type ScheduledFunctionDevelopmentFirebaseFunctionParams, type ScheduledFunctionDevelopmentFirebaseFunctionResult } from '../../common/development/function.schedule';
+import { type FirebaseFunction } from './function';
 /**
  * The default functions key for the FirebaseDevelopmentFunctionTypeMap/Functions, used in an app's functions map.
  */

package/src/lib/client/function/development.function.factory.d.ts

@@ -1,6 +1,6 @@
-import { Functions } from 'firebase/functions';
-import { FirebaseFunctionTypeMap, FirebaseFunctionMap } from './function';
-import { FirebaseFunctionTypeConfigMap } from './function.factory';
+import { type Functions } from 'firebase/functions';
+import { type FirebaseFunctionTypeMap, type FirebaseFunctionMap } from './function';
+import { type FirebaseFunctionTypeConfigMap } from './function.factory';
 export type DevelopmentFirebaseFunctionTypeMap = FirebaseFunctionTypeMap;
 /**
  * The configuration for a types map.

package/src/lib/client/function/error.d.ts

@@ -1,5 +1,5 @@
-import { ServerError, ServerErrorResponse, ServerErrorResponseData } from '@dereekb/util';
-import { FirebaseError } from 'firebase/app';
+import { type ServerError, ServerErrorResponse, type ServerErrorResponseData } from '@dereekb/util';
+import { type FirebaseError } from 'firebase/app';
 export declare class FirebaseServerError<T extends ServerErrorResponseData = ServerErrorResponseData> extends ServerErrorResponse<T> {
     readonly firebaseError: FirebaseError;
     static fromFirebaseError(error: FirebaseError): FirebaseServerError;

package/src/lib/client/function/function.callable.d.ts

@@ -1,5 +1,5 @@
-import { FactoryWithInput, Maybe, PromiseOrValue } from '@dereekb/util';
-import { HttpsCallable } from 'firebase/functions';
+import { type FactoryWithInput, type Maybe, type PromiseOrValue } from '@dereekb/util';
+import { type HttpsCallable } from 'firebase/functions';
 export interface MapHttpsCallable<I, O, A, B> {
     mapInput?: FactoryWithInput<PromiseOrValue<A>, Maybe<I>>;
     mapOutput?: FactoryWithInput<PromiseOrValue<O>, Maybe<B>>;

package/src/lib/client/function/function.factory.d.ts

@@ -1,6 +1,6 @@
-import { ClassLikeType, Getter, Maybe } from '@dereekb/util';
-import { Functions, HttpsCallableOptions } from 'firebase/functions';
-import { FirebaseFunctionMap, FirebaseFunctionTypeMap } from './function';
+import { type ClassLikeType, type Getter, type Maybe } from '@dereekb/util';
+import { type Functions, type HttpsCallableOptions } from 'firebase/functions';
+import { type FirebaseFunctionMap, type FirebaseFunctionTypeMap } from './function';
 export interface FirebaseFunctionTypeConfig {
     options?: HttpsCallableOptions;
 }

package/src/lib/client/function/model.function.factory.d.ts

@@ -1,9 +1,10 @@
-import { MaybeNot, ValuesTypesAsArray, CommaSeparatedKeysOfObject } from '@dereekb/util';
-import { Functions } from 'firebase/functions';
-import { NonNever } from 'ts-essentials';
-import { FirestoreModelIdentity, FirestoreModelTypes, OnCallCreateModelResult } from '../../common';
-import { FirebaseFunctionTypeMap, FirebaseFunctionMap, FirebaseFunction } from './function';
-import { FirebaseFunctionTypeConfigMap } from './function.factory';
+import { type MaybeNot, type ValuesTypesAsArray, type CommaSeparatedKeysOfObject } from '@dereekb/util';
+import { type Functions } from 'firebase/functions';
+import { type NonNever } from 'ts-essentials';
+import { type FirestoreModelIdentity, type FirestoreModelTypes } from '../../common/firestore/collection';
+import { type FirebaseFunctionTypeMap, type FirebaseFunctionMap, type FirebaseFunction } from './function';
+import { type FirebaseFunctionTypeConfigMap } from './function.factory';
+import { type OnCallCreateModelResult } from '../../common/model/function';
 /**
  * Used to specify which function to direct requests to.
  */

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

@@ -1,7 +1,7 @@
-import { FirebaseStorageAccessorDriver, FirebaseStorageAccessorFile, FirebaseStorageAccessorFolder, StorageListFilesOptions } from '../../common/storage/driver/accessor';
-import { StoragePath } from '../../common/storage/storage';
-import { ListResult, StorageReference, FirebaseStorage as ClientFirebaseStorage } from '@firebase/storage';
-import { ErrorInput, Maybe } from '@dereekb/util';
+import { type FirebaseStorageAccessorDriver, type FirebaseStorageAccessorFile, type FirebaseStorageAccessorFolder, type StorageListFilesOptions } from '../../common/storage/driver/accessor';
+import { type StoragePath } from '../../common/storage/storage';
+import { type ListResult, type StorageReference, type FirebaseStorage as ClientFirebaseStorage } from 'firebase/storage';
+import { type ErrorInput, type Maybe } from '@dereekb/util';
 export declare function isFirebaseStorageObjectNotFoundError(input: Maybe<ErrorInput | string>): boolean;
 export declare function firebaseStorageRefForStorageFilePath(storage: ClientFirebaseStorage, path: StoragePath): StorageReference;
 export declare function firebaseStorageFileExists(ref: StorageReference): Promise<boolean>;

package/src/lib/client/storage/driver.d.ts

@@ -1,3 +1,3 @@
-import { FirebaseStorageDrivers } from '../../common/storage/driver/driver';
+import { type FirebaseStorageDrivers } from '../../common/storage/driver/driver';
 export type FirebaseStorageClientDrivers = FirebaseStorageDrivers;
 export declare function firebaseStorageClientDrivers(): FirebaseStorageClientDrivers;

package/src/lib/client/storage/storage.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseStorageContextFactory } from '../../common/storage/context';
+import { type FirebaseStorageContextFactory } from '../../common/storage/context';
 /**
  * Creates a FirebaseStorageContextFactory that uses the client @firebase/storage package.
  */

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

@@ -1,5 +1,5 @@
-import { AuthClaims, AuthClaimsObject, AuthRoleSet, MappedUseFunction, Maybe, UseValue } from '@dereekb/util';
-import { FirebaseAuthToken, FirebaseAuthUserId } from './auth';
+import { type AuthClaims, type AuthClaimsObject, type AuthRoleSet, type MappedUseFunction, type Maybe, type UseValue } from '@dereekb/util';
+import { type FirebaseAuthToken, type FirebaseAuthUserId } from './auth';
 /**
  * Provides a context containing FirebaseAuthContextInfo
  */

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

@@ -1,4 +1,4 @@
-import { ISO8601DateString, Maybe, PasswordString, PhoneNumber, WebsiteUrl } from '@dereekb/util';
+import { type ISO8601DateString, type Maybe, type PasswordString, type PhoneNumber, type WebsiteUrl } from '@dereekb/util';
 /**
  * Don't use passwords smaller tahn 6.
  */

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

@@ -1,5 +1,5 @@
-import { ReadableError } from '@dereekb/util';
-import { FirebaseErrorCode } from '../error';
+import { type ReadableError } from '@dereekb/util';
+import { type FirebaseErrorCode } from '../error';
 export interface FirebaseAuthError {
     code: FirebaseErrorCode;
     name: string;

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

@@ -1,3 +1,3 @@
-import { WriteBatch } from '../types';
-import { FirestoreDocumentDataAccessorFactory } from './accessor';
+import { type WriteBatch } from '../types';
+import { type FirestoreDocumentDataAccessorFactory } from './accessor';
 export type WriteBatchAccessorFactory = <T>(writeBatch: WriteBatch) => FirestoreDocumentDataAccessorFactory<T>;

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

@@ -1,8 +1,8 @@
-import { KeyValueTransformMap, Maybe } from '@dereekb/util';
-import { WriteResult, SnapshotOptions, DocumentReference, DocumentSnapshot, UpdateData, WithFieldValue, PartialWithFieldValue, SetOptions, Precondition, DocumentData, FirestoreDataConverter } from '../types';
-import { Observable, OperatorFunction } from 'rxjs';
-import { DocumentReferenceRef } from '../reference';
-import { PickProperties } from 'ts-essentials';
+import { type KeyValueTransformMap, type Maybe } from '@dereekb/util';
+import { type WriteResult, type SnapshotOptions, type DocumentReference, type DocumentSnapshot, type UpdateData, type WithFieldValue, type PartialWithFieldValue, type SetOptions, type Precondition, type DocumentData, type FirestoreDataConverter } from '../types';
+import { type Observable, type OperatorFunction } from 'rxjs';
+import { type DocumentReferenceRef } from '../reference';
+import { type PickProperties } from 'ts-essentials';
 export interface FirestoreDocumentDeleteParams {
     precondition?: Precondition;
 }

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

@@ -1,2 +1,2 @@
-import { FirestoreDocumentDataAccessorFactory } from './accessor';
+import { type FirestoreDocumentDataAccessorFactory } from './accessor';
 export type DefaultFirestoreAccessorFactory<T> = () => FirestoreDocumentDataAccessorFactory<T>;

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

@@ -1,3 +1,3 @@
-import { Transaction } from '../types';
-import { FirestoreDocumentDataAccessorFactory } from './accessor';
+import { type Transaction } from '../types';
+import { type FirestoreDocumentDataAccessorFactory } from './accessor';
 export type TransactionAccessorFactory<T = unknown> = (transaction: Transaction) => FirestoreDocumentDataAccessorFactory<T>;

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

@@ -1,6 +1,6 @@
-import { Observable } from 'rxjs';
-import { DocumentData, DocumentReference, DocumentSnapshot, FirestoreDataConverter, PartialWithFieldValue, SetOptions, UpdateData, WithFieldValue, WriteResult } from '../types';
-import { FirestoreAccessorIncrementUpdate, FirestoreDocumentDataAccessor, FirestoreDocumentDataAccessorFactory, FirestoreDocumentDeleteParams, FirestoreDocumentUpdateParams } from './accessor';
+import { type Observable } from 'rxjs';
+import { type DocumentData, type DocumentReference, type DocumentSnapshot, type FirestoreDataConverter, type PartialWithFieldValue, type SetOptions, type UpdateData, type WithFieldValue, type WriteResult } from '../types';
+import { type FirestoreAccessorIncrementUpdate, type FirestoreDocumentDataAccessor, type FirestoreDocumentDataAccessorFactory, type FirestoreDocumentDeleteParams, type FirestoreDocumentUpdateParams } from './accessor';
 /**
  * Abstract wrapper for a FirestoreDocumentDataAccessor.
  *

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

@@ -1,9 +1,9 @@
-import { ArrayOrValue, ModifierFunction } from '@dereekb/util';
-import { UserRelated } from '../../../model/user';
-import { DocumentReferenceRef } from '../reference';
-import { DocumentData, SetOptions } from '../types';
-import { FirestoreDocumentDataAccessor, FirestoreDocumentDataAccessorSetFunction } from './accessor';
-import { AbstractFirestoreDocumentDataAccessorWrapper, InterceptAccessorFactoryFunction } from './accessor.wrap';
+import { type ArrayOrValue, type ModifierFunction } from '@dereekb/util';
+import { type UserRelated } from '../../../model/user';
+import { type DocumentReferenceRef } from '../reference';
+import { type DocumentData, type SetOptions } from '../types';
+import { type FirestoreDocumentDataAccessor, type FirestoreDocumentDataAccessorSetFunction } from './accessor';
+import { AbstractFirestoreDocumentDataAccessorWrapper, type InterceptAccessorFactoryFunction } from './accessor.wrap';
 /**
  * Data accessor modes.
  * - always: Always modifies on update, set, or create.

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

@@ -1,5 +1,5 @@
-import { WriteBatch } from '../types';
-import { FirestoreDocumentContext, FirestoreDocumentContextType } from './context';
+import { type WriteBatch } from '../types';
+import { type FirestoreDocumentContext, type FirestoreDocumentContextType } from './context';
 export type WriteBatchFirestoreDocumentContextFactory = <T>(writeBatch: WriteBatch) => WriteBatchFirestoreDocumentContext<T>;
 export interface WriteBatchFirestoreDocumentContext<T> extends FirestoreDocumentContext<T> {
     readonly contextType: FirestoreDocumentContextType.BATCH;

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

@@ -1,4 +1,4 @@
-import { FirestoreDocumentDataAccessorFactory } from './accessor';
+import { type FirestoreDocumentDataAccessorFactory } from './accessor';
 /**
  * A specific document context type.
  *

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

@@ -1,4 +1,4 @@
-import { FirestoreDocumentContext, FirestoreDocumentContextType } from './context';
+import { type FirestoreDocumentContext, type FirestoreDocumentContextType } from './context';
 export type DefaultFirestoreDocumentContextFactory = <T>() => FirestoreDocumentContext<T>;
 export interface DefaultFirestoreDocumentContext<T> extends FirestoreDocumentContext<T> {
     readonly contextType: FirestoreDocumentContextType.NONE;

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

@@ -1,5 +1,5 @@
-import { Transaction } from '../types';
-import { FirestoreDocumentContext, FirestoreDocumentContextType } from './context';
+import { type Transaction } from '../types';
+import { type FirestoreDocumentContext, type FirestoreDocumentContextType } from './context';
 export type TransactionFirestoreDocumentContextFactory = <T>(transaction: Transaction) => TransactionFirestoreDocumentContext<T>;
 export interface TransactionFirestoreDocumentContext<T> extends FirestoreDocumentContext<T> {
     readonly contextType: FirestoreDocumentContextType.TRANSACTION;

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

@@ -1,5 +1,5 @@
-import { FactoryWithInput, FactoryWithRequiredInput, Maybe } from '@dereekb/util';
-import { DocumentReference, FirestoreDataConverter } from '../types';
+import { type FactoryWithInput, type FactoryWithRequiredInput, type Maybe } from '@dereekb/util';
+import { type DocumentReference, type FirestoreDataConverter } from '../types';
 /**
  * Factory used to provide an FirestoreDataConverter based on the input reference.
  */

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

@@ -1,14 +1,14 @@
-import { Observable } from 'rxjs';
-import { FirestoreAccessorDriverRef } from '../driver/accessor';
-import { FirestoreCollectionNameRef, FirestoreModelId, FirestoreModelIdentityCollectionName, FirestoreModelIdentityModelType, FirestoreModelIdentityRef, FirestoreModelIdRef, FirestoreModelKey, FirestoreModelKeyRef } from './../collection/collection';
-import { DocumentReference, CollectionReference, Transaction, WriteBatch, DocumentSnapshot, SnapshotOptions, WriteResult, FirestoreDataConverter } from '../types';
-import { FirestoreAccessorIncrementUpdate, FirestoreDocumentDataAccessor, FirestoreDocumentUpdateParams, FirestoreAccessorStreamMode } from './accessor';
-import { CollectionReferenceRef, DocumentReferenceRef, FirestoreContextReference, FirestoreDataConverterRef } from '../reference';
-import { FirestoreDocumentContext } from './context';
-import { Building, Maybe } from '@dereekb/util';
-import { FirestoreModelTypeRef, FirestoreModelIdentity, FirestoreModelTypeModelIdentityRef } from '../collection/collection';
-import { InterceptAccessorFactoryFunction } from './accessor.wrap';
-import { FirestoreDataConverterFactory, FirestoreDataConverterFactoryRef, InterceptFirestoreDataConverterFactory } from './converter';
+import { type Observable } from 'rxjs';
+import { type FirestoreAccessorDriverRef } from '../driver/accessor';
+import { type FirestoreCollectionNameRef, type FirestoreModelId, type FirestoreModelIdentityCollectionName, type FirestoreModelIdentityModelType, type FirestoreModelIdentityRef, type FirestoreModelIdRef, type FirestoreModelKey, type FirestoreModelKeyRef } from './../collection/collection';
+import { type DocumentReference, type CollectionReference, type Transaction, type WriteBatch, type DocumentSnapshot, type SnapshotOptions, type WriteResult, type FirestoreDataConverter } from '../types';
+import { type FirestoreAccessorIncrementUpdate, type FirestoreDocumentDataAccessor, type FirestoreDocumentUpdateParams, type FirestoreAccessorStreamMode } from './accessor';
+import { type CollectionReferenceRef, type DocumentReferenceRef, type FirestoreContextReference, type FirestoreDataConverterRef } from '../reference';
+import { type FirestoreDocumentContext } from './context';
+import { type Building, type Maybe } from '@dereekb/util';
+import { type FirestoreModelTypeRef, type FirestoreModelIdentity, type FirestoreModelTypeModelIdentityRef } from '../collection/collection';
+import { type InterceptAccessorFactoryFunction } from './accessor.wrap';
+import { type FirestoreDataConverterFactory, type FirestoreDataConverterFactoryRef, type InterceptFirestoreDataConverterFactory } from './converter';
 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;

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

@@ -1,6 +1,6 @@
-import { Observable, OperatorFunction } from 'rxjs';
-import { DocumentDataWithIdAndKey, DocumentSnapshot } from '../types';
-import { FirestoreDocument, FirestoreDocumentData } from './document';
+import { type Observable, type OperatorFunction } from 'rxjs';
+import { type DocumentDataWithIdAndKey, type DocumentSnapshot } from '../types';
+import { type FirestoreDocument, type FirestoreDocumentData } from './document';
 export declare function latestSnapshotsFromDocuments<D extends FirestoreDocument<any>>(documents: D[]): Observable<DocumentSnapshot<FirestoreDocumentData<D>>[]>;
 export declare function latestDataFromDocuments<D extends FirestoreDocument<any>>(documents: D[]): Observable<DocumentDataWithIdAndKey<FirestoreDocumentData<D>>[]>;
 export declare function dataFromDocumentSnapshots<T>(): OperatorFunction<DocumentSnapshot<T>[], DocumentDataWithIdAndKey<T>[]>;

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

@@ -1,7 +1,7 @@
-import { AsyncGetterOrValue, Maybe, UseAsync } from '@dereekb/util';
-import { FirestoreModelId, FirestoreModelIdRef, FirestoreModelKey, FirestoreModelKeyRef } from '../collection';
-import { DocumentDataWithIdAndKey, DocumentReference, DocumentSnapshot, QuerySnapshot, Transaction } from '../types';
-import { FirestoreDocumentData, FirestoreDocument, FirestoreDocumentAccessor, LimitedFirestoreDocumentAccessor, LimitedFirestoreDocumentAccessorContextExtension } from './document';
+import { type AsyncGetterOrValue, type Maybe, type UseAsync } from '@dereekb/util';
+import { type FirestoreModelId, type FirestoreModelIdRef, type FirestoreModelKey, type FirestoreModelKeyRef } from '../collection';
+import { type DocumentDataWithIdAndKey, type DocumentReference, type DocumentSnapshot, type QuerySnapshot, type Transaction } from '../types';
+import { type FirestoreDocumentData, type FirestoreDocument, type FirestoreDocumentAccessor, type LimitedFirestoreDocumentAccessor, type LimitedFirestoreDocumentAccessorContextExtension } from './document';
 export declare function newDocuments<T, D extends FirestoreDocument<T>>(documentAccessor: FirestoreDocumentAccessor<T, D>, count: number): D[];
 export interface MakeDocumentsParams<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> {
     readonly count: number;

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

@@ -1,5 +1,5 @@
-import { WriteResult } from '../types';
-import { FirestoreAccessorIncrementUpdate, FirestoreDocumentDataAccessor } from './accessor';
+import { type WriteResult } from '../types';
+import { type FirestoreAccessorIncrementUpdate, type FirestoreDocumentDataAccessor } from './accessor';
 export type IncrementUpdateWithAccessorFunction<T> = (data: FirestoreAccessorIncrementUpdate<T>) => Promise<WriteResult | void>;
 /**
  * https://cloud.google.com/firestore/docs/samples/firestore-data-set-numeric-increment

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

@@ -1,10 +1,10 @@
-import { CollectionReferenceRef, DocumentReferenceRef, FirestoreContextReference, QueryLikeReferenceRef } from '../reference';
-import { FirestoreDocument, FirestoreDocumentAccessorFactory, FirestoreDocumentAccessorFactoryConfig, FirestoreDocumentAccessorForTransactionFactory, FirestoreDocumentAccessorForWriteBatchFactory, LimitedFirestoreDocumentAccessorFactory, LimitedFirestoreDocumentAccessorForTransactionFactory, LimitedFirestoreDocumentAccessorForWriteBatchFactory, LimitedFirestoreDocumentAccessor, FirestoreDocumentAccessor } from '../accessor/document';
-import { FirestoreItemPageIterationBaseConfig, FirestoreItemPageIterationFactory } from '../query/iterator';
-import { FirestoreQueryFactory } from '../query/query';
-import { FirestoreDrivers } from '../driver/driver';
-import { FirestoreCollectionQueryFactory } from './collection.query';
-import { ArrayOrValue, Maybe, ModelKey, ModelTypeString } from '@dereekb/util';
+import { type CollectionReferenceRef, type DocumentReferenceRef, type FirestoreContextReference, type QueryLikeReferenceRef } from '../reference';
+import { type FirestoreDocument, type FirestoreDocumentAccessorFactory, type FirestoreDocumentAccessorFactoryConfig, type FirestoreDocumentAccessorForTransactionFactory, type FirestoreDocumentAccessorForWriteBatchFactory, type LimitedFirestoreDocumentAccessorFactory, type LimitedFirestoreDocumentAccessorForTransactionFactory, type LimitedFirestoreDocumentAccessorForWriteBatchFactory, type LimitedFirestoreDocumentAccessor, type FirestoreDocumentAccessor } from '../accessor/document';
+import { type FirestoreItemPageIterationBaseConfig, type FirestoreItemPageIterationFactory } from '../query/iterator';
+import { type FirestoreQueryFactory } from '../query/query';
+import { type FirestoreDrivers } from '../driver/driver';
+import { type FirestoreCollectionQueryFactory } from './collection.query';
+import { type ArrayOrValue, type Maybe, type ModelKey, type ModelTypeString } from '@dereekb/util';
 /**
  * The camelCase model name/type.
  */

package/src/lib/common/firestore/collection/collection.group.d.ts

@@ -1,8 +1,8 @@
-import { FirestoreDocument, LimitedFirestoreDocumentAccessorFactoryConfig } from '../accessor/document';
-import { FirestoreItemPageIterationBaseConfig } from '../query/iterator';
-import { FirestoreContextReference } from '../reference';
-import { FirestoreDrivers } from '../driver/driver';
-import { FirestoreCollectionLike } from './collection';
+import { type FirestoreDocument, type LimitedFirestoreDocumentAccessorFactoryConfig } from '../accessor/document';
+import { type FirestoreItemPageIterationBaseConfig } from '../query/iterator';
+import { type FirestoreContextReference } from '../reference';
+import { type FirestoreDrivers } from '../driver/driver';
+import { type FirestoreCollectionLike } from './collection';
 /**
  * FirestoreCollection configuration
  */

package/src/lib/common/firestore/collection/collection.key.d.ts

@@ -1,6 +1,6 @@
-import { GrantedRole } from '@dereekb/model';
-import { FirebaseAuthUserId } from '../../auth';
-import { FirestoreModelId, FirestoreModelKey } from './collection';
+import { type GrantedRole } from '@dereekb/model';
+import { type FirebaseAuthUserId } from '../../auth';
+import { type FirestoreModelId, type FirestoreModelKey } from './collection';
 export type FirestoreModelKeyMap<T> = {
     [key: FirestoreModelKey]: T;
 };

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

@@ -1,10 +1,10 @@
-import { LimitedFirestoreDocumentAccessorContextExtension } from './../accessor/document';
-import { ArrayOrValue, Maybe } from '@dereekb/util';
-import { FirestoreDocument } from '../accessor/document';
-import { FirestoreExecutableQuery, FirestoreQueryFactory } from '../query';
-import { FirestoreQueryConstraint } from '../query/constraint';
-import { Transaction } from '../types';
-import { Observable } from 'rxjs';
+import { type LimitedFirestoreDocumentAccessorContextExtension } from './../accessor/document';
+import { type ArrayOrValue, type Maybe } from '@dereekb/util';
+import { type FirestoreDocument } from '../accessor/document';
+import { type FirestoreExecutableQuery, type FirestoreQueryFactory } from '../query';
+import { type FirestoreQueryConstraint } from '../query/constraint';
+import { type Transaction } from '../types';
+import { type Observable } from 'rxjs';
 export interface FirestoreCollectionExecutableDocumentQuery<T, D extends FirestoreDocument<T>> {
     readonly baseQuery: FirestoreExecutableQuery<T>;
     /**

package/src/lib/common/firestore/collection/collection.single.d.ts

@@ -1,5 +1,5 @@
-import { FirestoreDocument, FirestoreSingleDocumentAccessor, SingleItemFirestoreCollectionDocumentIdentifierRef } from '../accessor/document';
-import { FirestoreCollection, FirestoreCollectionConfig } from './collection';
+import { type FirestoreDocument, type FirestoreSingleDocumentAccessor, type SingleItemFirestoreCollectionDocumentIdentifierRef } from '../accessor/document';
+import { type FirestoreCollection, type FirestoreCollectionConfig } from './collection';
 export interface RootSingleItemFirestoreCollectionConfig<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends FirestoreCollectionConfig<T, D>, Partial<SingleItemFirestoreCollectionDocumentIdentifierRef> {
 }
 export interface RootSingleItemFirestoreCollection<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends FirestoreCollection<T, D>, FirestoreSingleDocumentAccessor<T, D> {

package/src/lib/common/firestore/collection/subcollection.d.ts

@@ -1,5 +1,5 @@
-import { FirestoreDocument } from '../accessor/document';
-import { FirestoreCollection, FirestoreCollectionConfig } from './collection';
+import { type FirestoreDocument } from '../accessor/document';
+import { type FirestoreCollection, type FirestoreCollectionConfig } from './collection';
 /**
  * Used for collections that are a subcollection of a document.
  */

package/src/lib/common/firestore/collection/subcollection.single.d.ts

@@ -1,5 +1,5 @@
-import { FirestoreDocument, FirestoreSingleDocumentAccessor, SingleItemFirestoreCollectionDocumentIdentifierRef } from '../accessor/document';
-import { FirestoreCollectionWithParent, FirestoreCollectionWithParentConfig } from './subcollection';
+import { type FirestoreDocument, type FirestoreSingleDocumentAccessor, type SingleItemFirestoreCollectionDocumentIdentifierRef } from '../accessor/document';
+import { type FirestoreCollectionWithParent, type FirestoreCollectionWithParentConfig } from './subcollection';
 export interface SingleItemFirestoreCollectionConfig<T, PT, D extends FirestoreDocument<T> = FirestoreDocument<T>, PD extends FirestoreDocument<PT> = FirestoreDocument<PT>> extends FirestoreCollectionWithParentConfig<T, PT, D, PD>, Partial<SingleItemFirestoreCollectionDocumentIdentifierRef> {
 }
 export interface SingleItemFirestoreCollection<T, PT, D extends FirestoreDocument<T> = FirestoreDocument<T>, PD extends FirestoreDocument<PT> = FirestoreDocument<PT>> extends FirestoreCollectionWithParent<T, PT, D, PD>, FirestoreSingleDocumentAccessor<T, D> {

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

@@ -1,9 +1,9 @@
-import { FirestoreDocument, SingleItemFirestoreCollectionDocumentIdentifierRef } from './accessor/document';
-import { FirestoreCollection, FirestoreCollectionConfig, FirestoreCollectionWithParent, SingleItemFirestoreCollection, FirestoreCollectionGroup, RootSingleItemFirestoreCollection } from './collection';
-import { FirestoreDrivers } from './driver/driver';
-import { WriteBatchFactoryReference, RunTransactionFactoryReference } from './driver';
-import { DocumentReference, CollectionReference, DocumentData, Firestore, CollectionGroup } from './types';
-import { QueryLikeReferenceRef } from './reference';
+import { type FirestoreDocument, type SingleItemFirestoreCollectionDocumentIdentifierRef } from './accessor/document';
+import { type FirestoreCollection, type FirestoreCollectionConfig, type FirestoreCollectionWithParent, type SingleItemFirestoreCollection, type FirestoreCollectionGroup, type RootSingleItemFirestoreCollection } from './collection';
+import { type FirestoreDrivers } from './driver/driver';
+import { type WriteBatchFactoryReference, type RunTransactionFactoryReference } from './driver';
+import { type DocumentReference, type CollectionReference, type DocumentData, type Firestore, type CollectionGroup } from './types';
+import { type QueryLikeReferenceRef } from './reference';
 /**
  * A @dereekb/firebase FirestoreContext. Wraps the main Firestore context and the drivers, as well as utility/convenience functions.
  */

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

@@ -1,10 +1,10 @@
-import { FirestoreCollectionName } from './../collection/collection';
-import { DocumentData, CollectionReference, CollectionGroup, DocumentReference, Firestore } from '../types';
-import { DefaultFirestoreDocumentContextFactory } from '../accessor/context.default';
-import { WriteBatchFirestoreDocumentContextFactory } from '../accessor/context.batch';
-import { TransactionFirestoreDocumentContextFactory } from '../accessor/context.transaction';
-import { FirestoreWriteBatchFactoryDriver } from './batch';
-import { FirestoreTransactionFactoryDriver } from './transaction';
+import { type FirestoreCollectionName } from './../collection/collection';
+import { type DocumentData, type CollectionReference, type CollectionGroup, type DocumentReference, type Firestore } from '../types';
+import { type DefaultFirestoreDocumentContextFactory } from '../accessor/context.default';
+import { type WriteBatchFirestoreDocumentContextFactory } from '../accessor/context.batch';
+import { type TransactionFirestoreDocumentContextFactory } from '../accessor/context.transaction';
+import { type FirestoreWriteBatchFactoryDriver } from './batch';
+import { type FirestoreTransactionFactoryDriver } from './transaction';
 export type FirestoreAccessorDriverCollectionGroupFunction = <T = DocumentData>(firestore: Firestore, collectionId: string) => CollectionGroup<T>;
 export type FirestoreAccessorDriverCollectionRefFunction = <T = DocumentData>(firestore: Firestore, path: string, ...pathSegments: string[]) => CollectionReference<T>;
 export type FirestoreAccessorDriverSubcollectionRefFunction = <T = DocumentData>(document: DocumentReference, path: string, ...pathSegments: string[]) => CollectionReference<T>;

package/src/lib/common/firestore/driver/batch.d.ts

@@ -1,5 +1,5 @@
-import { Factory } from '@dereekb/util';
-import { Firestore, WriteBatch } from '../types';
+import { type Factory } from '@dereekb/util';
+import { type Firestore, type WriteBatch } from '../types';
 /**
  * Factory for a WriteBatch.
  */

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

@@ -1,5 +1,5 @@
-import { FirestoreAccessorDriverRef } from './accessor';
-import { FirestoreQueryDriverRef } from './query';
+import { type FirestoreAccessorDriverRef } from './accessor';
+import { type FirestoreQueryDriverRef } from './query';
 export type FirestoreDriverIdentifier = string;
 export type FirestoreDriverType = 'production' | 'testing';
 /**