npm - @dereekb/firebase - Versions diffs - 8.1.1 → 8.3.0 - Mend

@dereekb/firebase 8.1.1 → 8.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,29 @@
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
+# [8.3.0](https://github.com/dereekb/dbx-components/compare/v8.2.0-dev...v8.3.0) (2022-06-20)
+### Features
+* added DbxFirebaseDocumentLoaderInstance ([523d1df](https://github.com/dereekb/dbx-components/commit/523d1dff22ac979b75bd310677770665ec76ff63))
+* added getDocumentSnapshotsData() ([dc26340](https://github.com/dereekb/dbx-components/commit/dc26340972df9f1a7a8b8767e2929ca956e9e4a5))
+# [8.2.0](https://github.com/dereekb/dbx-components/compare/v8.1.2-dev...v8.2.0) (2022-06-20)
+### Features
+* added DbxRouteParamReader ([a855283](https://github.com/dereekb/dbx-components/commit/a8552835aabbfa85814984a8fdafd7bd1fb2963e))
+## [8.1.2](https://github.com/dereekb/dbx-components/compare/v8.1.1-dev...v8.1.2) (2022-06-19)
 ## [8.1.1](https://github.com/dereekb/dbx-components/compare/v8.1.0-dev...v8.1.1) (2022-06-18)

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase",
-  "version": "8.1.1",
+  "version": "8.3.0",
   "devDependencies": {
     "@firebase/rules-unit-testing": "^2.0.0"
   },
@@ -23,16 +23,16 @@
     "rxfire": "^6.0.3",
     "rxjs": "^7.0.0",
     "firebase": "^9.8.0",
-    "@dereekb/util": "8.1.1",
+    "@dereekb/util": "8.3.0",
     "make-error": "^1.3.0",
     "ts-essentials": "^9.1.2",
     "extra-set": "^2.2.11",
-    "@dereekb/rxjs": "8.1.1",
+    "@dereekb/rxjs": "8.3.0",
     "ms": "^3.0.0-canary.1",
-    "@dereekb/model": "8.1.1",
+    "@dereekb/model": "8.3.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "@dereekb/date": "8.1.1",
+    "@dereekb/date": "8.3.0",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^1.3.0",
     "rrule": "2.7.0",

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

@@ -1,28 +1,29 @@
 import { Observable } from 'rxjs';
 import { FirestoreAccessorDriverRef } from '../driver/accessor';
-import { FirestoreModelId, FirestoreModelIdRef, FirestoreModelKey, FirestoreModelKeyRef, FirestoreModelName } from './../collection/collection';
+import { FirestoreCollectionNameRef, FirestoreModelId, FirestoreModelIdentityCollectionName, FirestoreModelIdentityModelType, FirestoreModelIdentityRef, FirestoreModelIdRef, FirestoreModelKey, FirestoreModelKeyRef } from './../collection/collection';
 import { DocumentReference, CollectionReference, Transaction, WriteBatch, DocumentSnapshot, SnapshotOptions, WriteResult } from '../types';
 import { FirestoreDocumentDataAccessor } from './accessor';
 import { CollectionReferenceRef, DocumentReferenceRef, FirestoreContextReference, FirestoreDataConverterRef } from '../reference';
 import { FirestoreDocumentContext } from './context';
 import { Maybe } from '@dereekb/util';
-import { FirestoreModelNameRef, FirestoreModelIdentity, FirestoreModelIdentityRef } from '../collection/collection';
+import { FirestoreModelTypeRef, FirestoreModelIdentity, FirestoreModelTypeModelIdentityRef } from '../collection/collection';
 import { InterceptAccessorFactoryFunction } from './accessor.wrap';
-export interface FirestoreDocument<T, M extends FirestoreModelName = FirestoreModelName> extends DocumentReferenceRef<T>, CollectionReferenceRef<T>, FirestoreModelIdentityRef<M>, FirestoreModelNameRef<M>, FirestoreModelKeyRef, FirestoreModelIdRef {
+export interface FirestoreDocument<T, I extends FirestoreModelIdentity = FirestoreModelIdentity> extends DocumentReferenceRef<T>, CollectionReferenceRef<T>, FirestoreModelIdentityRef<I>, FirestoreModelTypeRef<FirestoreModelIdentityModelType<I>>, FirestoreCollectionNameRef<FirestoreModelIdentityCollectionName<I>>, FirestoreModelKeyRef, FirestoreModelIdRef {
     readonly accessor: FirestoreDocumentDataAccessor<T>;
     readonly id: string;
 }
 /**
  * Abstract FirestoreDocument implementation that extends a FirestoreDocumentDataAccessor.
  */
-export declare abstract class AbstractFirestoreDocument<T, D extends AbstractFirestoreDocument<T, any, M>, M extends FirestoreModelName = FirestoreModelName> implements FirestoreDocument<T>, LimitedFirestoreDocumentAccessorRef<T, D>, CollectionReferenceRef<T> {
+export declare abstract class AbstractFirestoreDocument<T, D extends AbstractFirestoreDocument<T, any, I>, I extends FirestoreModelIdentity = FirestoreModelIdentity> implements FirestoreDocument<T>, LimitedFirestoreDocumentAccessorRef<T, D>, CollectionReferenceRef<T> {
     readonly accessor: FirestoreDocumentDataAccessor<T>;
     readonly documentAccessor: LimitedFirestoreDocumentAccessor<T, D>;
     readonly stream$: Observable<DocumentSnapshot<T>>;
     readonly data$: Observable<T>;
     constructor(accessor: FirestoreDocumentDataAccessor<T>, documentAccessor: LimitedFirestoreDocumentAccessor<T, D>);
-    abstract get modelIdentity(): FirestoreModelIdentity<M>;
-    get modelType(): M;
+    abstract get modelIdentity(): I;
+    get modelType(): FirestoreModelIdentityModelType<I>;
+    get collectionName(): FirestoreModelIdentityCollectionName<I>;
     get id(): FirestoreModelId;
     get key(): FirestoreModelKey;
     get documentRef(): DocumentReference<T>;
@@ -41,7 +42,7 @@ export interface LimitedFirestoreDocumentAccessorRef<T, D extends FirestoreDocum
     readonly documentAccessor: A;
 }
 export declare type FirestoreDocumentAccessorRef<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> = LimitedFirestoreDocumentAccessorRef<T, D, FirestoreDocumentAccessor<T, D>>;
-export interface LimitedFirestoreDocumentAccessor<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends FirestoreModelIdentityRef, FirestoreAccessorDriverRef {
+export interface LimitedFirestoreDocumentAccessor<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends FirestoreModelTypeModelIdentityRef, FirestoreAccessorDriverRef {
     readonly databaseContext: FirestoreDocumentContext<T>;
     /**
      * Loads a document from the datastore.
@@ -110,7 +111,7 @@ export interface LimitedFirestoreDocumentAccessorFactory<T, D extends FirestoreD
 /**
  * FirestoreDocumentAccessor configuration.
  */
-export interface LimitedFirestoreDocumentAccessorFactoryConfig<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends FirestoreDataConverterRef<T>, FirestoreModelIdentityRef, FirestoreContextReference, FirestoreAccessorDriverRef {
+export interface LimitedFirestoreDocumentAccessorFactoryConfig<T, D extends FirestoreDocument<T> = FirestoreDocument<T>> extends FirestoreDataConverterRef<T>, FirestoreModelTypeModelIdentityRef, FirestoreContextReference, FirestoreAccessorDriverRef {
     /**
      * Optional InterceptAccessorFactoryFunction to intercept/return a modified accessor factory.
      */
@@ -159,10 +160,10 @@ export interface FirestoreDocumentAccessorContextExtension<T, D extends Firestor
 }
 export declare function firestoreDocumentAccessorContextExtension<T, D extends FirestoreDocument<T> = FirestoreDocument<T>>({ documentAccessor, firestoreAccessorDriver }: FirestoreDocumentAccessorContextExtensionConfig<T, D>): FirestoreDocumentAccessorContextExtension<T, D>;
 export declare function firestoreDocumentAccessorContextExtension<T, D extends FirestoreDocument<T> = FirestoreDocument<T>>({ documentAccessor, firestoreAccessorDriver }: LimitedFirestoreDocumentAccessorContextExtensionConfig<T, D>): LimitedFirestoreDocumentAccessorContextExtension<T, D>;
-export interface FirestoreDocumentWithParent<P, T> extends FirestoreDocument<T> {
+export interface FirestoreDocumentWithParent<P, T, I extends FirestoreModelIdentity = FirestoreModelIdentity> extends FirestoreDocument<T, I> {
     readonly parent: DocumentReference<P>;
 }
-export declare abstract class AbstractFirestoreDocumentWithParent<P, T, D extends AbstractFirestoreDocument<T, any>> extends AbstractFirestoreDocument<T, D> implements FirestoreDocumentWithParent<P, T> {
+export declare abstract class AbstractFirestoreDocumentWithParent<P, T, D extends AbstractFirestoreDocument<T, any, I>, I extends FirestoreModelIdentity = FirestoreModelIdentity> extends AbstractFirestoreDocument<T, D, I> implements FirestoreDocumentWithParent<P, T> {
     get parent(): DocumentReference<P>;
     constructor(accessor: FirestoreDocumentDataAccessor<T>, documentAccessor: LimitedFirestoreDocumentAccessor<T, D>);
 }

package/src/lib/common/firestore/accessor/document.js CHANGED Viewed

@@ -18,6 +18,9 @@ class AbstractFirestoreDocument {
     get modelType() {
         return this.modelIdentity.modelType;
     }
+    get collectionName() {
+        return this.modelIdentity.collectionName;
+    }
     get id() {
         return this.documentRef.id;
     }
@@ -49,7 +52,7 @@ class AbstractFirestoreDocument {
 exports.AbstractFirestoreDocument = AbstractFirestoreDocument;
 function limitedFirestoreDocumentAccessorFactory(config) {
     const { firestoreContext, firestoreAccessorDriver, makeDocument, accessorFactory: interceptAccessorFactory, converter, modelIdentity } = config;
-    const expectedCollectionName = firestoreAccessorDriver.fuzzedPathForPath ? firestoreAccessorDriver.fuzzedPathForPath(modelIdentity.collection) : modelIdentity.collection;
+    const expectedCollectionName = firestoreAccessorDriver.fuzzedPathForPath ? firestoreAccessorDriver.fuzzedPathForPath(modelIdentity.collectionName) : modelIdentity.collectionName;
     return (context) => {
         const databaseContext = context !== null && context !== void 0 ? context : config.firestoreAccessorDriver.defaultContextFactory();
         const dataAccessorFactory = interceptAccessorFactory ? interceptAccessorFactory(databaseContext.accessorFactory) : databaseContext.accessorFactory;
@@ -64,7 +67,7 @@ function limitedFirestoreDocumentAccessorFactory(config) {
             var _a;
             const ref = firestoreAccessorDriver.docAtPath(firestoreContext.firestore, fullPath);
             if (((_a = ref.parent) === null || _a === void 0 ? void 0 : _a.id) !== expectedCollectionName) {
-                throw new Error(`unexpected key/path "${fullPath}" for expected type "${modelIdentity.collection}"/"${modelIdentity.modelType}".`);
+                throw new Error(`unexpected key/path "${fullPath}" for expected type "${modelIdentity.collectionName}"/"${modelIdentity.modelType}".`);
             }
             return ref.withConverter(converter);
         }

package/src/lib/common/firestore/accessor/document.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"document.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/accessor/document.ts"],"names":[],"mappings":";AAAA,mDAAmD;AACnD,0GAA0G;;;AAM1G,yCAAkH;AAGlH,wCAA6C;AAS7C;;GAEG;AACH,MAAsB,yBAAyB;IAI7C,YAAqB,QAA0C,EAAW,gBAAwD;QAA7G,aAAQ,GAAR,QAAQ,CAAkC;QAAW,qBAAgB,GAAhB,gBAAgB,CAAwC;QAHzH,YAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACjC,UAAK,GAAkB,IAAA,iCAAsB,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEgE,CAAC;IAItI,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,aAAa,CAAC,~~SAAS~~,CAAC;~~IACtC~~,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAgC,CAAC;IACpE,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC7B,CAAC;IAED,YAAY,CAAC,OAAyB;QACpC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,CAAC;IAED;;;;;OAKG;IACH,cAAc,CAAC,IAAgB;QAC7B,OAAO,IAAA,wCAA6B,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;CACF;~~AA7CD~~,~~8DA6CC~~;AAkGD,SAAgB,uCAAuC,CAA2D,MAA2D;IAC3K,MAAM,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAChJ,MAAM,sBAAsB,GAAG,uBAAuB,CAAC,iBAAiB,CAAC,CAAC,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,aAAa,CAAC,~~UAAU~~,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,~~UAAU~~,CAAC;~~IAE1K~~,OAAO,CAAC,OAAqC,EAAE,EAAE;QAC/C,MAAM,eAAe,GAAgC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,MAAM,CAAC,uBAAuB,CAAC,qBAAqB,EAAE,CAAC;QACvH,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,CAAC,CAAC,wBAAwB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC;QAEnJ,SAAS,YAAY,CAAC,GAAyB;YAC7C,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/E,OAAO,YAAY,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,SAAS,iBAAiB,CAAC,QAA2B;;YACpD,MAAM,GAAG,GAAyB,uBAAuB,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAE1G,IAAI,CAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,EAAE,MAAK,sBAAsB,EAAE;gBAC7C,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,wBAAwB,aAAa,CAAC,~~UAAU~~,MAAM,aAAa,CAAC,SAAS,IAAI,CAAC,CAAC;~~aACpI~~;YAED,OAAO,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,SAAS,kBAAkB,CAAC,QAA2B;YACrD,MAAM,GAAG,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,gBAAgB,GAA2C;YAC/D,aAAa;YACb,gBAAgB,CAAC,QAA8B;gBAC7C,OAAO,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC;YACD,YAAY;YACZ,iBAAiB;YACjB,kBAAkB;YAClB,uBAAuB;YACvB,eAAe;SAChB,CAAC;QAEF,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC;AA9CD,0FA8CC;AAoBD,SAAgB,gCAAgC,CAA2D,MAAoD;IAC7J,MAAM,EAAE,uBAAuB,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAClE,MAAM,gCAAgC,GAAG,uCAAuC,CAAC,MAAM,CAAC,CAAC;IAEzF,SAAS,gBAAgB,CAAC,IAAY;QACpC,OAAO,uBAAuB,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,CAAC,OAAqC,EAAE,EAAE;QAC/C,MAAM,gBAAgB,GAAoC,IAAA,YAAK,EAAkC;YAC/F,IAAI,EAAE,gCAAgC,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE;gBACX,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC;gBAE1B,CAAC,CAAC,WAAW,GAAG,GAAM,EAAE;oBACtB,MAAM,SAAS,GAAG,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBAC1D,OAAO,gBAAgB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAClD,CAAC,CAAC;gBAEF,CAAC,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;gBAEtC,CAAC,CAAC,iBAAiB,GAAG,CAAC,IAAY,EAAK,EAAE;oBACxC,IAAI,CAAC,IAAI,EAAE;wBACT,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAC;qBAC1G;oBAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/D,CAAC,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QAEH,OAAO,gBAAgB,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC;AAjCD,4EAiCC;AAgCD,SAAgB,yCAAyC,CAA2D,EAAE,gBAAgB,EAAE,uBAAuB,EAAwH;IACrR,OAAO;QACL,gBAAgB;QAChB,8BAA8B,CAAC,WAA+B;YAC5D,MAAM,OAAO,GAAuC,WAAW,CAAC,CAAC,CAAC,uBAAuB,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7I,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QACD,6BAA6B,CAAC,UAA6B;YACzD,MAAM,OAAO,GAAuC,UAAU,CAAC,CAAC,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1I,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;KACF,CAAC;AACJ,CAAC;AAZD,8FAYC;AAOD,MAAsB,~~mCAAuF~~,SAAQ,~~yBAA+B~~;~~IAClJ~~,IAAI,MAAM;QACR,OAAQ,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAiC,CAAC,MAA8B,CAAC;IACrG,CAAC;IAED,YAAY,QAA0C,EAAE,gBAAwD;QAC9G,KAAK,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IACpC,CAAC;CACF;AARD,kFAQC;AAcD,SAAgB,+BAA+B,CAA2D,MAAmD;IAC3J,MAAM,EAAE,oBAAoB,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAE/D,OAAO;QACL,YAAY;YACV,OAAO,SAAS,CAAC,gBAAgB,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACpE,CAAC;QACD,0BAA0B,CAAC,WAA+B;YACxD,OAAO,SAAS,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC7F,CAAC;QACD,yBAAyB,CAAC,UAA6B;YACrD,OAAO,SAAS,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC3F,CAAC;KACF,CAAC;AACJ,CAAC;AAdD,0EAcC"}
1	+ {"version":3,"file":"document.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/accessor/document.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,5 @@
 import { AsyncGetterOrValue, Maybe, UseAsync } from '@dereekb/util';
+import { FirestoreModelId, FirestoreModelKey } from '../collection';
 import { DocumentDataWithId, DocumentReference, DocumentSnapshot, QuerySnapshot, Transaction } from '../types';
 import { FirestoreDocument, FirestoreDocumentAccessor, LimitedFirestoreDocumentAccessor, LimitedFirestoreDocumentAccessorContextExtension } from './document';
 export declare function newDocuments<T, D extends FirestoreDocument<T>>(documentAccessor: FirestoreDocumentAccessor<T, D>, count: number): D[];
@@ -24,9 +25,22 @@ export interface MakeDocumentsParams<T, D extends FirestoreDocument<T> = Firesto
  */
 export declare function makeDocuments<T, D extends FirestoreDocument<T>>(documentAccessor: FirestoreDocumentAccessor<T, D>, make: MakeDocumentsParams<T, D>): Promise<D[]>;
 export declare function getDocumentSnapshots<T, D extends FirestoreDocument<T>>(documents: D[]): Promise<DocumentSnapshot<T>[]>;
+export declare function getDocumentSnapshotsData<T, D extends FirestoreDocument<T>>(documents: D[]): Promise<DocumentDataWithId<T>[]>;
+export declare function getDocumentSnapshotsData<T, D extends FirestoreDocument<T>>(documents: D[], withId: true): Promise<DocumentDataWithId<T>[]>;
+export declare function getDocumentSnapshotsData<T, D extends FirestoreDocument<T>>(documents: D[], withId: false): Promise<T[]>;
+export declare function getDocumentSnapshotsData<T, D extends FirestoreDocument<T>>(documents: D[], withId?: boolean): Promise<DocumentDataWithId<T>[] | T[]>;
+export declare function getDataFromDocumentSnapshots<T>(snapshots: DocumentSnapshot<T>[]): DocumentDataWithId<T>[];
+export declare function getDataFromDocumentSnapshots<T>(snapshots: DocumentSnapshot<T>[], withId: true): DocumentDataWithId<T>[];
+export declare function getDataFromDocumentSnapshots<T>(snapshots: DocumentSnapshot<T>[], withId: false): T[];
+export declare function getDataFromDocumentSnapshots<T>(snapshots: DocumentSnapshot<T>[], withId?: boolean): DocumentDataWithId<T>[] | T[];
 export declare function loadDocumentsForSnapshots<T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, snapshots: QuerySnapshot<T>): D[];
+export declare function loadDocumentsForDocumentReferencesFromValues<I, T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, values: I[], getRef: (value: I) => DocumentReference<T>): D[];
+export declare const loadDocumentsForValues: typeof loadDocumentsForDocumentReferencesFromValues;
 export declare function loadDocumentsForDocumentReferences<T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, refs: DocumentReference<T>[]): D[];
-export declare function loadDocumentsForValues<I, T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, values: I[], getRef: (value: I) => DocumentReference<T>): D[];
+export declare function loadDocumentsForKeysFromValues<I, T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, values: I[], getKey: (value: I) => FirestoreModelKey): D[];
+export declare function loadDocumentsForKeys<T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, keys: FirestoreModelKey[]): D[];
+export declare function loadDocumentsForIdsFromValues<I, T, D extends FirestoreDocument<T>>(accessor: LimitedFirestoreDocumentAccessor<T, D>, values: I[], getId: (value: I) => FirestoreModelId): D[];
+export declare function loadDocumentsForIds<T, D extends FirestoreDocument<T>>(accessor: FirestoreDocumentAccessor<T, D>, ids: FirestoreModelId[]): D[];
 /**
  * Used for loading documents for the input references.
  */
@@ -38,6 +52,20 @@ export declare type FirestoreDocumentLoader<T, D extends FirestoreDocument<T>> =
  * @returns
  */
 export declare function firestoreDocumentLoader<T, D extends FirestoreDocument<T>>(accessorContext: LimitedFirestoreDocumentAccessorContextExtension<T, D>): FirestoreDocumentLoader<T, D>;
+/**
+ * Creates the document data from the snapshot.
+ *
+ * @param snapshot
+ * @returns
+ */
+export declare function documentData<T>(snapshot: DocumentSnapshot<T>): Maybe<DocumentDataWithId<T>>;
+export declare function documentData<T>(snapshot: DocumentSnapshot<T>, withId: true): Maybe<DocumentDataWithId<T>>;
+export declare function documentData<T>(snapshot: DocumentSnapshot<T>, withId: false): Maybe<T>;
+export declare type DocumentDataFunction<T> = (snapshot: DocumentSnapshot<T>) => Maybe<T>;
+export declare type DocumentDataWithIdFunction<T> = (snapshot: DocumentSnapshot<T>) => Maybe<DocumentDataWithId<T>>;
+export declare function documentDataFunction<T>(withId: true): DocumentDataWithIdFunction<T>;
+export declare function documentDataFunction<T>(withId: false): DocumentDataFunction<T>;
+export declare function documentDataFunction<T>(withId: boolean): DocumentDataWithIdFunction<T> | DocumentDataFunction<T>;
 /**
  * Creates a DocumentDataWithId from the input DocumentSnapshot. If the data does not exist, returns undefined.
  *
@@ -57,4 +85,10 @@ export declare function useDocumentSnapshot<T, D extends FirestoreDocument<T>, O
 /**
  * MappedUseAsyncFunction to load snapshot data from the input document and use it.
  */
-export declare const useDocumentSnapshotData: import("@dereekb/util").MappedUseAsyncFunction<FirestoreDocument<unknown, string>, unknown>;
+export declare const useDocumentSnapshotData: import("@dereekb/util").MappedUseAsyncFunction<FirestoreDocument<unknown, import("../collection").FirestoreModelIdentity<string, string>>, unknown>;
+export declare function firestoreModelIdFromDocument<T, D extends FirestoreDocument<T>>(document: D): FirestoreModelId;
+export declare function firestoreModelIdsFromDocuments<T, D extends FirestoreDocument<T>>(documents: D[]): FirestoreModelId[];
+export declare function firestoreModelKeyFromDocument<T, D extends FirestoreDocument<T>>(document: D): FirestoreModelKey;
+export declare function firestoreModelKeysFromDocuments<T, D extends FirestoreDocument<T>>(documents: D[]): FirestoreModelKey[];
+export declare function documentReferenceFromDocument<T, D extends FirestoreDocument<T>>(document: D): DocumentReference<T>;
+export declare function documentReferencesFromDocuments<T, D extends FirestoreDocument<T>>(documents: D[]): DocumentReference<T>[];

package/src/lib/common/firestore/accessor/document.utility.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useDocumentSnapshotData = exports.useDocumentSnapshot = exports.documentDataWithId = exports.firestoreDocumentLoader = exports.loadDocumentsForValues = exports.loadDocumentsForDocumentReferences = exports.loadDocumentsForSnapshots = exports.getDocumentSnapshots = exports.makeDocuments = exports.newDocuments = void 0;
+exports.documentReferencesFromDocuments = exports.documentReferenceFromDocument = exports.firestoreModelKeysFromDocuments = exports.firestoreModelKeyFromDocument = exports.firestoreModelIdsFromDocuments = exports.firestoreModelIdFromDocument = exports.useDocumentSnapshotData = exports.useDocumentSnapshot = exports.documentDataWithId = exports.documentDataFunction = exports.documentData = exports.firestoreDocumentLoader = exports.loadDocumentsForIds = exports.loadDocumentsForIdsFromValues = exports.loadDocumentsForKeys = exports.loadDocumentsForKeysFromValues = exports.loadDocumentsForDocumentReferences = exports.loadDocumentsForValues = exports.loadDocumentsForDocumentReferencesFromValues = exports.loadDocumentsForSnapshots = exports.getDataFromDocumentSnapshots = exports.getDocumentSnapshotsData = exports.getDocumentSnapshots = exports.makeDocuments = exports.newDocuments = void 0;
 const tslib_1 = require("tslib");
 const util_1 = require("@dereekb/util");
 function newDocuments(documentAccessor, count) {
@@ -34,18 +34,44 @@ function getDocumentSnapshots(documents) {
     return util_1.PromiseUtility.runTasksForValues(documents, (x) => x.accessor.get());
 }
 exports.getDocumentSnapshots = getDocumentSnapshots;
+function getDocumentSnapshotsData(documents, withId = true) {
+    return getDocumentSnapshots(documents).then((x) => getDataFromDocumentSnapshots(x, withId));
+}
+exports.getDocumentSnapshotsData = getDocumentSnapshotsData;
+function getDataFromDocumentSnapshots(snapshots, withId = true) {
+    const mapFn = documentDataFunction(withId);
+    return (0, util_1.filterMaybeValues)(snapshots.map(mapFn));
+}
+exports.getDataFromDocumentSnapshots = getDataFromDocumentSnapshots;
 function loadDocumentsForSnapshots(accessor, snapshots) {
     return snapshots.docs.map((x) => accessor.loadDocument(x.ref));
 }
 exports.loadDocumentsForSnapshots = loadDocumentsForSnapshots;
+function loadDocumentsForDocumentReferencesFromValues(accessor, values, getRef) {
+    return loadDocumentsForDocumentReferences(accessor, values.map(getRef));
+}
+exports.loadDocumentsForDocumentReferencesFromValues = loadDocumentsForDocumentReferencesFromValues;
+exports.loadDocumentsForValues = loadDocumentsForDocumentReferencesFromValues;
 function loadDocumentsForDocumentReferences(accessor, refs) {
     return refs.map((x) => accessor.loadDocument(x));
 }
 exports.loadDocumentsForDocumentReferences = loadDocumentsForDocumentReferences;
-function loadDocumentsForValues(accessor, values, getRef) {
-    return values.map((x) => accessor.loadDocument(getRef(x)));
+function loadDocumentsForKeysFromValues(accessor, values, getKey) {
+    return loadDocumentsForKeys(accessor, values.map(getKey));
+}
+exports.loadDocumentsForKeysFromValues = loadDocumentsForKeysFromValues;
+function loadDocumentsForKeys(accessor, keys) {
+    return keys.map((x) => accessor.loadDocumentForKey(x));
 }
-exports.loadDocumentsForValues = loadDocumentsForValues;
+exports.loadDocumentsForKeys = loadDocumentsForKeys;
+function loadDocumentsForIdsFromValues(accessor, values, getId) {
+    return loadDocumentsForKeys(accessor, values.map(getId));
+}
+exports.loadDocumentsForIdsFromValues = loadDocumentsForIdsFromValues;
+function loadDocumentsForIds(accessor, ids) {
+    return ids.map((x) => accessor.loadDocumentForId(x));
+}
+exports.loadDocumentsForIds = loadDocumentsForIds;
 /**
  * Used to make a FirestoreDocumentLoader.
  *
@@ -59,6 +85,19 @@ function firestoreDocumentLoader(accessorContext) {
     };
 }
 exports.firestoreDocumentLoader = firestoreDocumentLoader;
+function documentData(snapshot, withId = false) {
+    if (withId) {
+        return documentDataWithId(snapshot);
+    }
+    else {
+        return snapshot.data();
+    }
+}
+exports.documentData = documentData;
+function documentDataFunction(withId) {
+    return withId ? documentDataWithId : (snapshot) => snapshot.data();
+}
+exports.documentDataFunction = documentDataFunction;
 /**
  * Creates a DocumentDataWithId from the input DocumentSnapshot. If the data does not exist, returns undefined.
  *
@@ -92,4 +131,29 @@ exports.useDocumentSnapshot = useDocumentSnapshot;
  * MappedUseAsyncFunction to load snapshot data from the input document and use it.
  */
 exports.useDocumentSnapshotData = (0, util_1.wrapUseAsyncFunction)(useDocumentSnapshot, (x) => x.data());
+// MARK: Key Accessors
+function firestoreModelIdFromDocument(document) {
+    return document.id;
+}
+exports.firestoreModelIdFromDocument = firestoreModelIdFromDocument;
+function firestoreModelIdsFromDocuments(documents) {
+    return documents.map(firestoreModelIdFromDocument);
+}
+exports.firestoreModelIdsFromDocuments = firestoreModelIdsFromDocuments;
+function firestoreModelKeyFromDocument(document) {
+    return document.key;
+}
+exports.firestoreModelKeyFromDocument = firestoreModelKeyFromDocument;
+function firestoreModelKeysFromDocuments(documents) {
+    return documents.map(firestoreModelKeyFromDocument);
+}
+exports.firestoreModelKeysFromDocuments = firestoreModelKeysFromDocuments;
+function documentReferenceFromDocument(document) {
+    return document.documentRef;
+}
+exports.documentReferenceFromDocument = documentReferenceFromDocument;
+function documentReferencesFromDocuments(documents) {
+    return documents.map(documentReferenceFromDocument);
+}
+exports.documentReferencesFromDocuments = documentReferencesFromDocuments;
 //# sourceMappingURL=document.utility.js.map

package/src/lib/common/firestore/accessor/document.utility.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"document.utility.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/accessor/document.utility.ts"],"names":[],"mappings":";;;;AAAA,~~wCAAsJ~~;~~AAItJ~~,SAAgB,YAAY,CAAoC,gBAAiD,EAAE,KAAa;IAC9H,OAAO,IAAA,sBAAe,EAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;AACtE,CAAC;AAFD,oCAEC;AAkBD;;;;;;GAMG;AACH,SAAgB,aAAa,CAAoC,gBAAiD,EAAE,IAA+B;;IACjJ,MAAM,aAAa,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC;IACjF,OAAO,IAAA,sBAAe,EAAC;QACrB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,IAAI,EAAE,CAAO,CAAS,EAAE,EAAE;YACxB,MAAM,QAAQ,GAAM,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;YAE1C,IAAI,IAAI,IAAI,IAAI,EAAE;gBAChB,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aACnC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAfD,sCAeC;AAED,SAAgB,oBAAoB,CAAoC,SAAc;IACpF,OAAO,qBAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;AAC9E,CAAC;AAFD,oDAEC;AAED,SAAgB,yBAAyB,CAAoC,QAAgD,EAAE,SAA2B;IACxJ,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,8DAEC;AAED,SAAgB,kCAAkC,CAAoC,QAAgD,EAAE,IAA4B;IAClK,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,gFAEC;AAED,SAAgB,~~sBAAsB~~,CAAuC,QAAgD,EAAE,MAAW,EAAE,~~MAA0C~~;~~IACpL~~,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,~~YAAY~~,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~AAC7D~~,CAAC;AAFD,~~wDAEC~~;AAOD;;;;;GAKG;AACH,SAAgB,uBAAuB,CAAoC,eAAuE;IAChJ,OAAO,CAAC,UAAkC,EAAE,WAAyB,EAAE,EAAE;QACvE,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAChI,OAAO,kCAAkC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAClE,CAAC,CAAC;AACJ,CAAC;AALD,0DAKC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAI,QAA6B;IACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAA2B,CAAC;IAEtD,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,wBAAwB;KAChD;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AARD,gDAQC;AAED;;;;;;;GAOG;AACH,SAAsB,mBAAmB,CAA8C,QAAkB,EAAE,GAAqC,EAAE,YAA2C;;QAC3L,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAC,GAAG,EAAE,CAAA,CAAC;QAChD,OAAO,IAAA,eAAQ,EAAC,QAAQ,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAC/C,CAAC;CAAA;AAHD,kDAGC;AAED;;GAEG;AACU,QAAA,uBAAuB,GAAG,IAAA,2BAAoB,EAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC"}
1	+ {"version":3,"file":"document.utility.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/accessor/document.utility.ts"],"names":[],"mappings":"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"}

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

@@ -4,7 +4,7 @@ import { FirestoreItemPageIterationBaseConfig, FirestoreItemPageIterationFactory
 import { FirestoreQueryFactory } from '../query/query';
 import { FirestoreDrivers } from '../driver/driver';
 import { FirestoreCollectionQueryFactory } from './collection.query';
-import { ModelKey, ModelTypeString } from '@dereekb/util';
+import { ArrayOrValue, ModelKey, ModelTypeString } from '@dereekb/util';
 /**
  * The camelCase model name/type.
  */
@@ -21,14 +21,23 @@ export declare type FirestoreModelIdentityType = 'root' | 'nested';
 /**
  * A firestore model's identity
  */
-export declare type FirestoreModelIdentity<M extends FirestoreModelType = FirestoreModelType, C extends FirestoreCollectionName = FirestoreCollectionName> = FirestoreModelTypeRef<M> & {
+export declare type FirestoreModelIdentity<M extends FirestoreModelType = FirestoreModelType, C extends FirestoreCollectionName = FirestoreCollectionName> = FirestoreModelTypeRef<M> & FirestoreCollectionNameRef<C> & {
     readonly type: FirestoreModelIdentityType;
+    /**
+     * @deprecated use collectionName instead.
+     *
+     * Will be removed in the future.
+     */
     readonly collection: C;
     /**
      * @deprecated use modelType instead.
+     *
+     * Will be removed in the future.
      */
     readonly model: M;
 };
+export declare type FirestoreModelIdentityModelType<I> = I extends FirestoreModelIdentity<infer M> ? M : never;
+export declare type FirestoreModelIdentityCollectionName<I> = I extends FirestoreModelIdentity<infer M, infer C> ? C : never;
 /**
  * A root-level FirestoreModelIdentity
  */
@@ -58,7 +67,7 @@ export declare function firestoreModelIdentity<P extends FirestoreModelIdentity<
 export declare function firestoreModelIdentity<M extends FirestoreModelType, C extends FirestoreCollectionName = FirestoreCollectionName>(modelName: M, collectionName: C): RootFirestoreModelIdentity<M, C>;
 export declare function firestoreModelIdentity<P extends FirestoreModelIdentity<string, string>, M extends FirestoreModelType, C extends FirestoreCollectionName = FirestoreCollectionName>(parent: P, modelName: M, collectionName: C): FirestoreModelIdentityWithParent<P, M, C>;
 /**
- * Reference to a FirestoreCollectionName
+ * Reference to a FirestoreModelType
  */
 export interface FirestoreModelTypeRef<M extends FirestoreModelType = FirestoreModelType> {
     /**
@@ -76,20 +85,29 @@ export declare function firestoreModelType(modelTypeInput: FirestoreModelType |
 /**
  * Reference to a FirestoreCollectionName
  */
-export interface FirestoreCollectionNameRef {
+export interface FirestoreCollectionNameRef<C extends FirestoreCollectionName = FirestoreCollectionName> {
     /**
      * Returns the FirestoreCollectionName for this context.
      */
-    readonly collectionName: FirestoreCollectionName;
+    readonly collectionName: C;
+}
+/**
+ * Reference to a FirestoreModelIdentity via the FirestoreModelType and FirestoreCollectionName
+ */
+export interface FirestoreModelTypeModelIdentityRef<M extends FirestoreModelType = FirestoreModelType, C extends FirestoreCollectionName = FirestoreCollectionName> {
+    /**
+     * Returns the FirestoreModelIdentity for this context.
+     */
+    readonly modelIdentity: FirestoreModelIdentity<M, C>;
 }
 /**
  * Reference to a FirestoreModelIdentity
  */
-export interface FirestoreModelIdentityRef<M extends FirestoreModelType = FirestoreModelType> {
+export interface FirestoreModelIdentityRef<I extends FirestoreModelIdentity> {
     /**
      * Returns the FirestoreModelIdentity for this context.
      */
-    readonly modelIdentity: FirestoreModelIdentity<M>;
+    readonly modelIdentity: I;
 }
 /**
  * The model's id within a collection.
@@ -118,15 +136,54 @@ export interface FirestoreModelIdRef {
  * collection/12345/subcollection/67890
  */
 export declare type FirestoreModelKey = ModelKey;
-export declare type FirestoreIdentityModelKey<I extends RootFirestoreModelIdentity, K extends FirestoreModelId = FirestoreModelId> = I extends RootFirestoreModelIdentity<infer M, infer C> ? `${C}/${K}` : never;
 /**
- * Creates a firestoreModelKey for root identities.
+ * A part of a FirestoreModelKey.
+ */
+export declare type FirestoreModelKeyPart<C extends FirestoreCollectionName = FirestoreCollectionName, K extends FirestoreModelId = FirestoreModelId> = `${C}/${K}`;
+/**
+ * One part of a FirestoreModelKe
+ */
+export declare type FirestoreCollectionModelKeyPart<N extends FirestoreCollectionNameRef = FirestoreCollectionNameRef, K extends FirestoreModelId = FirestoreModelId> = N extends FirestoreCollectionNameRef<infer C> ? FirestoreModelKeyPart<C, K> : never;
+export declare type FirestoreCollectionModelKey<N extends FirestoreCollectionNameRef = FirestoreCollectionNameRef, K extends FirestoreModelId = FirestoreModelId> = FirestoreCollectionModelKeyPart<N, K>;
+/**
+ * Creates a firestoreModelKeyPart
  *
  * @param identity
  * @param id
  * @returns
  */
-export declare function firestoreModelKey<I extends RootFirestoreModelIdentity, K extends FirestoreModelId = FirestoreModelId>(identity: I, id: K): FirestoreIdentityModelKey<I, K>;
+export declare function firestoreModelKeyPart<N extends FirestoreCollectionNameRef, K extends FirestoreModelId = FirestoreModelId>(identity: N, id: K): FirestoreCollectionModelKeyPart<N, K>;
+/**
+ * Creates a firestoreModelKey for RootFirestoreModelIdentity values.
+ *
+ * @param identity
+ * @param id
+ * @returns
+ */
+export declare const firestoreModelKey: <I extends RootFirestoreModelIdentity<string, string>, K extends string = string>(identity: I, id: K) => FirestoreCollectionModelKeyPart<I, K>;
+/**
+ * Creates an array of FirestoreCollectionModelKey values from the input ids.
+ *
+ * @param identity
+ * @param ids
+ * @returns
+ */
+export declare function firestoreModelKeys<I extends RootFirestoreModelIdentity, K extends FirestoreModelId = FirestoreModelId>(identity: I, ids: K[]): FirestoreCollectionModelKey<I, K>[];
+/**
+ * Joins together a number of FirestoreModelKeyPart values.
+ *
+ * @param parts
+ * @returns
+ */
+export declare function firestoreModelKeyPath(...parts: FirestoreModelKeyPart[]): FirestoreModelKey;
+/**
+ * Creates a number of child paths from the parent path.
+ *
+ * @param parent
+ * @param children
+ * @returns
+ */
+export declare function childFirestoreModelKeyPath(parent: FirestoreModelKeyPart, children: ArrayOrValue<FirestoreModelKeyPart>): FirestoreModelKey[];
 /**
  * Reference to a FirestoreModelKey
  */
@@ -166,10 +223,15 @@ export interface FirestoreCollectionRef<T, D extends FirestoreDocument<T> = Fire
 export declare function makeFirestoreCollection<T, D extends FirestoreDocument<T>>(inputConfig: FirestoreCollectionConfig<T, D>): FirestoreCollection<T, D>;
 /**
  * Alternative name for FirestoreModelType.
+ *
+ * @deprecated replaced by FirestoreModelType
  */
 export declare type FirestoreModelName = FirestoreModelType;
 /**
  * @deprecated replaced by FirestoreModelTypeRef
  */
 export declare type FirestoreModelNameRef<M extends FirestoreModelType = FirestoreModelType> = FirestoreModelTypeRef<M>;
+/**
+ * @deprecated replaced by FirestoreModelTypes
+ */
 export declare type FirestoreModelNames<I extends FirestoreModelIdentity> = FirestoreModelTypes<I>;

package/src/lib/common/firestore/collection/collection.js CHANGED Viewed

@@ -1,25 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeFirestoreCollection = exports.firestoreModelKey = exports.firestoreModelType = exports.firestoreModelIdentity = void 0;
+exports.makeFirestoreCollection = exports.childFirestoreModelKeyPath = exports.firestoreModelKeyPath = exports.firestoreModelKeys = exports.firestoreModelKey = exports.firestoreModelKeyPart = exports.firestoreModelType = exports.firestoreModelIdentity = void 0;
 const document_1 = require("../accessor/document");
 const iterator_1 = require("../query/iterator");
 const query_1 = require("../query/query");
 const collection_query_1 = require("./collection.query");
-function firestoreModelIdentity(parentOrModelName, collectionNameOrModelName, collectionName) {
+function firestoreModelIdentity(parentOrModelName, collectionNameOrModelName, inputCollectionName) {
     var _a, _b;
     if (typeof parentOrModelName === 'object') {
+        const collectionName = (_a = inputCollectionName) !== null && _a !== void 0 ? _a : collectionNameOrModelName.toLowerCase();
         return {
             type: 'nested',
             parent: parentOrModelName,
-            collection: (_a = collectionName) !== null && _a !== void 0 ? _a : collectionNameOrModelName.toLowerCase(),
+            collectionName,
+            collection: collectionName,
             model: collectionNameOrModelName,
             modelType: collectionNameOrModelName
         };
     }
     else {
+        const collectionName = (_b = collectionNameOrModelName) !== null && _b !== void 0 ? _b : parentOrModelName.toLowerCase();
         return {
             type: 'root',
-            collection: (_b = collectionNameOrModelName) !== null && _b !== void 0 ? _b : parentOrModelName.toLowerCase(),
+            collectionName,
+            collection: collectionName,
             model: parentOrModelName,
             modelType: parentOrModelName
         };
@@ -41,16 +45,61 @@ function firestoreModelType(modelTypeInput) {
 }
 exports.firestoreModelType = firestoreModelType;
 /**
- * Creates a firestoreModelKey for root identities.
+ * Creates a firestoreModelKeyPart
  *
  * @param identity
  * @param id
  * @returns
  */
-function firestoreModelKey(identity, id) {
-    return `${identity.collection}/${id}`;
+function firestoreModelKeyPart(identity, id) {
+    return `${identity.collectionName}/${id}`;
 }
-exports.firestoreModelKey = firestoreModelKey;
+exports.firestoreModelKeyPart = firestoreModelKeyPart;
+/**
+ * Creates a firestoreModelKey for RootFirestoreModelIdentity values.
+ *
+ * @param identity
+ * @param id
+ * @returns
+ */
+exports.firestoreModelKey = firestoreModelKeyPart;
+/**
+ * Creates an array of FirestoreCollectionModelKey values from the input ids.
+ *
+ * @param identity
+ * @param ids
+ * @returns
+ */
+function firestoreModelKeys(identity, ids) {
+    return ids.map((x) => (0, exports.firestoreModelKey)(identity, x));
+}
+exports.firestoreModelKeys = firestoreModelKeys;
+/**
+ * Joins together a number of FirestoreModelKeyPart values.
+ *
+ * @param parts
+ * @returns
+ */
+function firestoreModelKeyPath(...parts) {
+    return parts.join('/');
+}
+exports.firestoreModelKeyPath = firestoreModelKeyPath;
+/**
+ * Creates a number of child paths from the parent path.
+ *
+ * @param parent
+ * @param children
+ * @returns
+ */
+function childFirestoreModelKeyPath(parent, children) {
+    if (Array.isArray(children)) {
+        return children.map((childPath) => `${parent}/${childPath}`);
+    }
+    else {
+        return [`${parent}/${children}`];
+    }
+}
+exports.childFirestoreModelKeyPath = childFirestoreModelKeyPath;
 /**
  * Creates a new FirestoreCollection from the input config.
  */

package/src/lib/common/firestore/collection/collection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/collection/collection.ts"],"names":[],"mappings":";;;AACA,mDAc8B;AAC9B,gDAA0L;AAC1L,0CAA8E;AAE9E,yDAAsG;~~AA+DtG~~,SAAgB,sBAAsB,CAA8I,iBAAwB,EAAE,yBAAiC,EAAE,~~cAAkB~~;;~~IACjQ~~,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;QACzC,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,iBAAsB;YAC9B,UAAU,EAAE,~~MAAC,cAAoB,mCAAM,yBAA+B,CAAC,WAAW,EAAQ~~;~~YAC1F~~,KAAK,EAAE,yBAA8B;YACrC,SAAS,EAAE,yBAA8B;SAC1C,CAAC;KACH;SAAM;QACL,~~OAAO;YACL,IAAI,EAAE,~~MAAM~~;YACZ~~,~~UAAU~~,~~EAAE~~,MAAC,yBAA+B,mCAAK,iBAAiB,CAAC,WAAW,EAAQ;~~YACtF~~,KAAK,EAAE,iBAAiB;YACxB,SAAS,EAAE,iBAAiB;SAC7B,CAAC;KACH;AACH,CAAC;~~AAjBD~~,~~wDAiBC~~;AAYD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,cAA0D;IAC3F,MAAM,SAAS,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC;IAEjG,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC3C;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AARD,gDAQC;~~AAsDD~~;;;;;;GAMG;AACH,SAAgB,~~iBAAiB~~,CAAsF,QAAW,EAAE,EAAK;~~IACvI~~,OAAO,GAAG,QAAQ,CAAC,~~UAAU~~,IAAI,EAAE,~~EAAqC~~,CAAC;~~AAC3E~~,CAAC;AAFD,~~8CAEC~~;AAgDD;;GAEG;AACH,SAAgB,uBAAuB,CAAoC,WAA4C;IACrH,MAAM,MAAM,GAAG,WAAyE,CAAC;IAEzF,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,GAAG,MAAM,CAAC;IACxE,MAAwD,CAAC,SAAS,GAAG,UAAU,CAAC;IAEjF,MAAM,kBAAkB,GAAiD,IAAA,4CAAiC,EAAC,MAAM,CAAC,CAAC;IACnH,MAAM,gBAAgB,GAAmD,IAAA,2CAAgC,EAAC,MAAM,CAAC,CAAC;IAClH,MAAM,YAAY,GAA6B,IAAA,6BAAqB,EAAC,MAAM,CAAC,CAAC;IAE7E,MAAM,yBAAyB,GAAG,IAAA,oDAAyC,EAAC,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,CAAC,CAAC;IAC3H,MAAM,EAAE,aAAa,EAAE,GAAG,IAAA,kDAA+B,EAAC,YAAY,EAAE,yBAAyB,CAAC,CAAC;IACnG,MAAM,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC;IAE/B,qCACE,MAAM;QACN,UAAU,EACV,SAAS,EAAE,UAAU,EACrB,gBAAgB,IACb,yBAAyB,KAC5B,kBAAkB;QAClB,KAAK;QACL,aAAa,IACb;AACJ,CAAC;AAxBD,0DAwBC"}
1	+ {"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/collection/collection.ts"],"names":[],"mappings":"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"}

package/src/lib/common/firestore/query/accumulator.d.ts CHANGED Viewed

@@ -21,4 +21,5 @@ export declare function firebaseQuerySnapshotAccumulator<O, T>(iteration: Firest
  * @param iteration
  */
 export declare function firebaseQueryItemAccumulator<T>(iteration: FirestoreItemPageIterationInstance<T>): FirebaseQueryItemAccumulator<T>;
-export declare function firebaseQueryItemAccumulator<U, T>(iteration: FirestoreItemPageIterationInstance<T>, mapItem?: MapFunction<DocumentDataWithId<T>, U>): MappedFirebaseQuerySnapshotAccumulator<U[], T>;
+export declare function firebaseQueryItemAccumulator<U, T>(iteration: FirestoreItemPageIterationInstance<T>, mapItem: MapFunction<DocumentDataWithId<T>, U>): MappedFirebaseQuerySnapshotAccumulator<U[], T>;
+export declare function firebaseQueryItemAccumulator<U, T>(iteration: FirestoreItemPageIterationInstance<T>, mapItem?: MapFunction<DocumentDataWithId<T>, U>): FirebaseQueryItemAccumulator<T> | MappedFirebaseQuerySnapshotAccumulator<U[], T>;

package/src/lib/common/firestore/query/accumulator.js CHANGED Viewed

@@ -2,18 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firebaseQueryItemAccumulator = exports.firebaseQuerySnapshotAccumulator = void 0;
 const rxjs_1 = require("@dereekb/rxjs");
+const util_1 = require("@dereekb/util");
+const accessor_1 = require("../accessor");
 function firebaseQuerySnapshotAccumulator(iteration, mapSnapshots) {
     return (0, rxjs_1.itemAccumulator)(iteration, mapSnapshots);
 }
 exports.firebaseQuerySnapshotAccumulator = firebaseQuerySnapshotAccumulator;
 function firebaseQueryItemAccumulator(iteration, mapItem) {
     mapItem = mapItem !== null && mapItem !== void 0 ? mapItem : ((x) => x);
+    const snapshotData = (0, accessor_1.documentDataFunction)(true);
     const mapFn = (x) => {
-        const result = x.map((y) => {
-            const data = y.data();
-            data.id = y.id;
-            return mapItem(data);
-        });
+        const result = (0, util_1.filterMaybeValues)(x.map((y) => {
+            const data = snapshotData(y);
+            return data ? mapItem(data) : undefined;
+        }));
         return result;
     };
     return firebaseQuerySnapshotAccumulator(iteration, mapFn);

package/src/lib/common/firestore/query/accumulator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"accumulator.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/query/accumulator.ts"],"names":[],"mappings":";;;AAAA,wCAAwH;~~AAoBxH~~,SAAgB,gCAAgC,CAAO,SAAgD,EAAE,YAA2E;IAClL,OAAO,IAAA,sBAAe,EAAqF,SAAS,EAAE,YAAY,CAAC,CAAC;AACtI,CAAC;AAFD,4EAEC;~~AASD~~,SAAgB,4BAA4B,CAAO,SAAgD,EAAE,OAA+C;IAClJ,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAK,CAAC,CAAC,CAAwB,EAAE,EAAE,CAAC,CAAC,CAAsD,CAAC;IAE7G,MAAM,KAAK,GAAmE,CAAC,CAAgC,EAAE,EAAE;QACjH,MAAM,MAAM,GAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;~~YAC9B~~,MAAM,IAAI,GAAG,CAAC,CAAC,~~IAAI~~,~~EAA2B,~~CAAC;~~YAC/C~~,IAAI,CAAC,~~EAAE~~,~~GAAG~~,~~CAAC~~,CAAC,~~EAAE~~,CAAC~~;YACf~~,~~OAAQ~~,~~OAAiD~~,CAAC,~~IAAI~~,CAAC~~,CAAC~~;~~QAClE~~,CAAC,CAAC,CAAC;~~QAEH~~,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,gCAAgC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5D,CAAC;~~AAdD~~,~~oEAcC~~"}
1	+ {"version":3,"file":"accumulator.js","sourceRoot":"","sources":["../../../../../../../../packages/firebase/src/lib/common/firestore/query/accumulator.ts"],"names":[],"mappings":";;;AAAA,wCAAwH;AACxH,wCAA+D;AAC/D,0CAAmD;AAmBnD,SAAgB,gCAAgC,CAAO,SAAgD,EAAE,YAA2E;IAClL,OAAO,IAAA,sBAAe,EAAqF,SAAS,EAAE,YAAY,CAAC,CAAC;AACtI,CAAC;AAFD,4EAEC;AAUD,SAAgB,4BAA4B,CAAO,SAAgD,EAAE,OAA+C;IAClJ,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAK,CAAC,CAAC,CAAwB,EAAE,EAAE,CAAC,CAAC,CAAsD,CAAC;IAE7G,MAAM,YAAY,GAAG,IAAA,+BAAoB,EAAI,IAAI,CAAC,CAAC;IACnD,MAAM,KAAK,GAAmE,CAAC,CAAgC,EAAE,EAAE;QACjH,MAAM,MAAM,GAAQ,IAAA,wBAAiB,EACnC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC,CAAC,CAAE,OAAiD,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrF,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,gCAAgC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAC5D,CAAC;AAhBD,oEAgBC"}

package/test/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,23 @@
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
+# [8.3.0](https://github.com/dereekb/dbx-components/compare/v8.2.0-dev...v8.3.0) (2022-06-20)
+# [8.2.0](https://github.com/dereekb/dbx-components/compare/v8.1.2-dev...v8.2.0) (2022-06-20)
+### Features
+* added DbxRouteParamReader ([a855283](https://github.com/dereekb/dbx-components/commit/a8552835aabbfa85814984a8fdafd7bd1fb2963e))
+## [8.1.2](https://github.com/dereekb/dbx-components/compare/v8.1.1-dev...v8.1.2) (2022-06-19)
 ## [8.1.1](https://github.com/dereekb/dbx-components/compare/v8.1.0-dev...v8.1.1) (2022-06-18)

package/test/package.json CHANGED Viewed

@@ -1,25 +1,25 @@
 {
   "name": "@dereekb/firebase/test",
-  "version": "8.1.1",
+  "version": "8.3.0",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "@dereekb/util/test": "8.1.1",
-    "@dereekb/util": "8.1.1",
+    "@dereekb/util/test": "8.3.0",
+    "@dereekb/util": "8.3.0",
     "make-error": "^1.3.0",
     "ts-essentials": "^9.1.2",
     "extra-set": "^2.2.11",
-    "@dereekb/firebase": "8.1.1",
+    "@dereekb/firebase": "8.3.0",
     "rxfire": "^6.0.3",
     "rxjs": "^7.0.0",
     "firebase": "^9.8.0",
-    "@dereekb/rxjs": "8.1.1",
+    "@dereekb/rxjs": "8.3.0",
     "ms": "^3.0.0-canary.1",
-    "@dereekb/model": "8.1.1",
+    "@dereekb/model": "8.3.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
-    "@dereekb/date": "8.1.1",
+    "@dereekb/date": "8.3.0",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^1.3.0",
     "rrule": "2.7.0",

package/test/src/lib/common/firestore.mock.item.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Maybe } from '@dereekb/util';
-import { CollectionReference, FirestoreCollection, FirestoreContext, AbstractFirestoreDocument, SingleItemFirestoreCollection, FirestoreCollectionWithParent, AbstractFirestoreDocumentWithParent, ExpectedFirestoreModelData, FirestoreModelData, CollectionGroup, FirestoreCollectionGroup, FirestoreModelIdentity, UserRelated, UserRelatedById } from '@dereekb/firebase';
+import { CollectionReference, FirestoreCollection, FirestoreContext, AbstractFirestoreDocument, SingleItemFirestoreCollection, FirestoreCollectionWithParent, AbstractFirestoreDocumentWithParent, ExpectedFirestoreModelData, FirestoreModelData, CollectionGroup, FirestoreCollectionGroup, UserRelated, UserRelatedById } from '@dereekb/firebase';
 import { GrantedReadRole } from '@dereekb/model';
 export declare type MockItemTypes = typeof mockItemIdentity | typeof mockItemPrivateIdentity | typeof mockItemUserIdentity | typeof mockItemSubItemIdentity | typeof mockItemSubItemDeepIdentity;
 export declare const mockItemIdentity: import("@dereekb/firebase").RootFirestoreModelIdentity<"mockItem", "mi">;
@@ -14,7 +14,7 @@ export interface MockItem {
     test: boolean;
 }
 export declare type MockItemRoles = GrantedReadRole | 'admin';
-export declare class MockItemDocument extends AbstractFirestoreDocument<MockItem, MockItemDocument> {
+export declare class MockItemDocument extends AbstractFirestoreDocument<MockItem, MockItemDocument, typeof mockItemIdentity> {
     get modelIdentity(): import("@dereekb/firebase").RootFirestoreModelIdentity<"mockItem", "mi">;
 }
 /**
@@ -61,7 +61,7 @@ export declare type MockItemPrivateRoles = GrantedReadRole | 'admin';
 /**
  * FirestoreDocument for MockItem
  */
-export declare class MockItemPrivateDocument extends AbstractFirestoreDocument<MockItemPrivate, MockItemPrivateDocument> {
+export declare class MockItemPrivateDocument extends AbstractFirestoreDocument<MockItemPrivate, MockItemPrivateDocument, typeof mockItemPrivateIdentity> {
     get modelIdentity(): import("@dereekb/firebase").FirestoreModelIdentityWithParent<import("@dereekb/firebase").RootFirestoreModelIdentity<"mockItem", "mi">, "mockItemPrivate", "mip">;
 }
 export declare type MockItemPrivateData = FirestoreModelData<MockItemPrivate, {}>;
@@ -102,7 +102,7 @@ export declare type MockItemUserRoles = GrantedReadRole | 'admin';
 /**
  * FirestoreDocument for MockItem
  */
-export declare class MockItemUserDocument extends AbstractFirestoreDocument<MockItemUser, MockItemUserDocument> {
+export declare class MockItemUserDocument extends AbstractFirestoreDocument<MockItemUser, MockItemUserDocument, typeof mockItemUserIdentity> {
     get modelIdentity(): import("@dereekb/firebase").FirestoreModelIdentityWithParent<import("@dereekb/firebase").RootFirestoreModelIdentity<"mockItem", "mi">, "mockItemUser", "miu">;
 }
 export declare type MockItemUserData = FirestoreModelData<MockItemUser, {}>;
@@ -148,8 +148,8 @@ export declare type MockItemSubItemRoles = GrantedReadRole | 'admin';
 /**
  * FirestoreDocument for MockItem
  */
-export declare class MockItemSubItemDocument extends AbstractFirestoreDocumentWithParent<MockItem, MockItemSubItem, MockItemSubItemDocument> {
-    get modelIdentity(): FirestoreModelIdentity;
+export declare class MockItemSubItemDocument extends AbstractFirestoreDocumentWithParent<MockItem, MockItemSubItem, MockItemSubItemDocument, typeof mockItemSubItemIdentity> {
+    get modelIdentity(): import("@dereekb/firebase").FirestoreModelIdentityWithParent<import("@dereekb/firebase").RootFirestoreModelIdentity<"mockItem", "mi">, "mockItemSub", "misi">;
 }
 export declare type MockItemSubItemData = ExpectedFirestoreModelData<MockItemSubItem>;
 /**
@@ -176,7 +176,7 @@ export declare type MockItemSubItemDeepRoles = GrantedReadRole | 'admin';
 /**
  * FirestoreDocument for MockSubItem
  */
-export declare class MockItemSubItemDeepDocument extends AbstractFirestoreDocumentWithParent<MockItemSubItem, MockItemSubItemDeep, MockItemSubItemDeepDocument> {
+export declare class MockItemSubItemDeepDocument extends AbstractFirestoreDocumentWithParent<MockItemSubItem, MockItemSubItemDeep, MockItemSubItemDeepDocument, typeof mockItemSubItemDeepIdentity> {
     get modelIdentity(): import("@dereekb/firebase").FirestoreModelIdentityWithParent<import("@dereekb/firebase").FirestoreModelIdentityWithParent<import("@dereekb/firebase").RootFirestoreModelIdentity<"mockItem", "mi">, "mockItemSub", "misi">, "mockItemSubItemDeep", "misid">;
 }
 export declare type MockItemSubItemDeepData = ExpectedFirestoreModelData<MockItemSubItemDeep>;

package/test/src/lib/common/firestore.mock.item.js CHANGED Viewed

@@ -27,7 +27,7 @@ exports.mockItemConverter = (0, firebase_1.snapshotConverterFunctions)({
  * @returns
  */
 function mockItemCollectionReference(context) {
-    return context.collection(exports.mockItemIdentity.collection);
+    return context.collection(exports.mockItemIdentity.collectionName);
 }
 exports.mockItemCollectionReference = mockItemCollectionReference;
 function mockItemFirestoreCollection(firestoreContext) {
@@ -71,7 +71,7 @@ exports.mockItemPrivateConverter = (0, firebase_1.snapshotConverterFunctions)({
  */
 function mockItemPrivateCollectionReferenceFactory(context) {
     return (parent) => {
-        return context.subcollection(parent.documentRef, exports.mockItemPrivateIdentity.collection);
+        return context.subcollection(parent.documentRef, exports.mockItemPrivateIdentity.collectionName);
     };
 }
 exports.mockItemPrivateCollectionReferenceFactory = mockItemPrivateCollectionReferenceFactory;
@@ -92,7 +92,7 @@ function mockItemPrivateFirestoreCollection(firestoreContext) {
 }
 exports.mockItemPrivateFirestoreCollection = mockItemPrivateFirestoreCollection;
 function mockItemPrivateCollectionReference(context) {
-    return context.collectionGroup(exports.mockItemPrivateIdentity.collection);
+    return context.collectionGroup(exports.mockItemPrivateIdentity.collectionName);
 }
 exports.mockItemPrivateCollectionReference = mockItemPrivateCollectionReference;
 function mockItemPrivateFirestoreCollectionGroup(firestoreContext) {
@@ -197,7 +197,7 @@ exports.mockItemSubItemConverter = (0, firebase_1.snapshotConverterFunctions)({
 });
 function mockItemSubItemCollectionReferenceFactory(context) {
     return (parent) => {
-        return context.subcollection(parent.documentRef, exports.mockItemSubItemIdentity.collection);
+        return context.subcollection(parent.documentRef, exports.mockItemSubItemIdentity.collectionName);
     };
 }
 exports.mockItemSubItemCollectionReferenceFactory = mockItemSubItemCollectionReferenceFactory;
@@ -217,7 +217,7 @@ function mockItemSubItemFirestoreCollection(firestoreContext) {
 }
 exports.mockItemSubItemFirestoreCollection = mockItemSubItemFirestoreCollection;
 function mockItemSubItemCollectionReference(context) {
-    return context.collectionGroup(exports.mockItemSubItemIdentity.collection);
+    return context.collectionGroup(exports.mockItemSubItemIdentity.collectionName);
 }
 exports.mockItemSubItemCollectionReference = mockItemSubItemCollectionReference;
 function mockItemSubItemFirestoreCollectionGroup(firestoreContext) {
@@ -252,7 +252,7 @@ exports.mockItemSubItemDeepConverter = (0, firebase_1.snapshotConverterFunctions
 });
 function mockItemSubItemDeepCollectionReferenceFactory(context) {
     return (parent) => {
-        return context.subcollection(parent.documentRef, exports.mockItemSubItemDeepIdentity.collection);
+        return context.subcollection(parent.documentRef, exports.mockItemSubItemDeepIdentity.collectionName);
     };
 }
 exports.mockItemSubItemDeepCollectionReferenceFactory = mockItemSubItemDeepCollectionReferenceFactory;
@@ -272,7 +272,7 @@ function mockItemSubItemDeepFirestoreCollection(firestoreContext) {
 }
 exports.mockItemSubItemDeepFirestoreCollection = mockItemSubItemDeepFirestoreCollection;
 function mockItemSubItemDeepCollectionReference(context) {
-    return context.collectionGroup(exports.mockItemSubItemDeepIdentity.collection);
+    return context.collectionGroup(exports.mockItemSubItemDeepIdentity.collectionName);
 }
 exports.mockItemSubItemDeepCollectionReference = mockItemSubItemDeepCollectionReference;
 function mockItemSubItemDeepFirestoreCollectionGroup(firestoreContext) {

package/test/src/lib/common/firestore.mock.item.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"firestore.mock.item.js","sourceRoot":"","sources":["../../../../../../../packages/firebase/test/src/lib/common/firestore.mock.item.ts"],"names":[],"mappings":";;;AAAA,wCAA6D;AAC7D,~~gDAyB2B~~;AAM3B,kBAAkB;AACL,QAAA,gBAAgB,GAAG,IAAA,iCAAsB,EAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAgBzE,MAAa,gBAAiB,SAAQ,~~oCAAqD~~;~~IACzF~~,IAAI,aAAa;QACf,OAAO,wBAAgB,CAAC;IAC1B,CAAC;CACF;AAJD,4CAIC;AAiBD;;GAEG;AACU,QAAA,iBAAiB,GAAG,IAAA,qCAA0B,EAAyB;IAClF,MAAM,EAAE;QACN,KAAK,EAAE,IAAA,kCAAuB,GAAE;QAChC,IAAI,EAAE,IAAA,2BAAgB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;KAC1C;CACF,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAgB,2BAA2B,CAAC,OAAyB;IACnE,OAAO,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,~~UAAU~~,CAAC,CAAC;~~AACzD~~,CAAC;AAFD,kEAEC;AAID,SAAgB,2BAA2B,CAAC,gBAAkC;IAC5E,OAAO,gBAAgB,CAAC,mBAAmB,CAAC;QAC1C,SAAS,EAAE,yBAAiB;QAC5B,aAAa,EAAE,wBAAgB;QAC/B,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,2BAA2B,CAAC,gBAAgB,CAAC;QACzD,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;QAClD,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AATD,kEASC;AAED,wBAAwB;AACX,QAAA,uBAAuB,GAAG,IAAA,iCAAsB,EAAC,wBAAgB,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;AAe1G;;GAEG;AACH,MAAa,uBAAwB,SAAQ,~~oCAAmE~~;~~IAC9G~~,IAAI,aAAa;QACf,OAAO,+BAAuB,CAAC;IACjC,CAAC;CACF;AAJD,0DAIC;AAIY,QAAA,yBAAyB,GAAG,GAAG,CAAC;AAE7C;;GAEG;AACU,QAAA,wBAAwB,GAAG,IAAA,qCAA0B,EAAC;IACjE,gBAAgB,EAAE,IAAA,4BAAqB,EAAuC;QAC5E,QAAQ,EAAE,IAAA,kCAAuB,GAAE;QACnC,MAAM,EAAE,IAAA,qCAA0B,GAAE;QACpC,SAAS,EAAE,IAAA,wBAAa,EAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;KACrD,CAAC;CACH,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAgB,yCAAyC,CAAC,OAAyB;IACjF,OAAO,CAAC,MAAwB,EAAE,EAAE;QAClC,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,+BAAuB,CAAC,~~UAAU~~,CAAC,CAAC;~~IACvF~~,CAAC,CAAC;AACJ,CAAC;AAJD,8FAIC;AAKD,SAAgB,kCAAkC,CAAC,gBAAkC;IACnF,MAAM,OAAO,GAAG,yCAAyC,CAAC,gBAAgB,CAAC,CAAC;IAE5E,OAAO,CAAC,MAAwB,EAAE,EAAE;QAClC,OAAO,gBAAgB,CAAC,6BAA6B,CAAC;YACpD,aAAa,EAAE,+BAAuB;YACtC,SAAS,EAAE,gCAAwB;YACnC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;YAC3B,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;YACzD,gBAAgB;YAChB,MAAM;YACN,oBAAoB,EAAE,iCAAyB;SAChD,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAfD,gFAeC;AAED,SAAgB,kCAAkC,CAAC,OAAyB;IAC1E,OAAO,OAAO,CAAC,eAAe,CAAC,+BAAuB,CAAC,~~UAAU~~,CAAC,CAAC;~~AACrE~~,CAAC;AAFD,gFAEC;AAID,SAAgB,uCAAuC,CAAC,gBAAkC;IACxF,OAAO,gBAAgB,CAAC,wBAAwB,CAAC;QAC/C,aAAa,EAAE,+BAAuB;QACtC,SAAS,EAAE,gCAAwB;QACnC,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,kCAAkC,CAAC,gBAAgB,CAAC;QAC/D,YAAY,EAAE,CAAC,QAAQ,EAAE,gBAAgB,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QACrG,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AATD,0FASC;AAED,qBAAqB;AACR,QAAA,oBAAoB,GAAG,IAAA,iCAAsB,EAAC,wBAAgB,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;AAWpG;;GAEG;AACH,MAAa,oBAAqB,SAAQ,~~oCAA6D~~;~~IACrG~~,IAAI,aAAa;QACf,OAAO,4BAAoB,CAAC;IAC9B,CAAC;CACF;AAJD,oDAIC;AAID;;GAEG;AACU,QAAA,0BAA0B,GAAG,cAAc,CAAC;AAC5C,QAAA,sBAAsB,GAAG,GAAG,CAAC;AAE1C;;GAEG;AACU,QAAA,qBAAqB,GAAG,IAAA,qCAA0B,EAAC;IAC9D,gBAAgB,EAAE,IAAA,4BAAqB,EAAiC;QACtE,GAAG,EAAE,IAAA,uBAAY,GAAE;QACnB,IAAI,EAAE,IAAA,0BAAe,GAAE;KACxB,CAAC;CACH,CAAC,CAAC;AAEH;;;;;GAKG;AACH,SAAgB,sCAAsC,CAAC,OAAyB;IAC9E,OAAO,CAAC,MAAwB,EAAE,EAAE;QAClC,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,kCAA0B,CAAC,CAAC;IAC/E,CAAC,CAAC;AACJ,CAAC;AAJD,wFAIC;AAEY,QAAA,2BAA2B,GAAG,IAAA,qDAA0C,GAAgB,CAAC;AAKtG,SAAgB,+BAA+B,CAAC,gBAAkC;IAChF,MAAM,OAAO,GAAG,sCAAsC,CAAC,gBAAgB,CAAC,CAAC;IAEzE,OAAO,CAAC,MAAwB,EAAE,EAAE;QAClC,OAAO,gBAAgB,CAAC,6BAA6B,CAAC;YACpD,aAAa,EAAE,4BAAoB;YACnC,SAAS,EAAE,6BAAqB;YAChC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;YAC3B,eAAe,EAAE,mCAA2B;YAC5C,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC;YACtD,gBAAgB;YAChB,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAfD,0EAeC;AAED,SAAgB,+BAA+B,CAAC,OAAyB;IACvE,OAAO,OAAO,CAAC,eAAe,CAAC,kCAA0B,CAAC,CAAC;AAC7D,CAAC;AAFD,0EAEC;AAID,SAAgB,oCAAoC,CAAC,gBAAkC;IACrF,OAAO,gBAAgB,CAAC,wBAAwB,CAAC;QAC/C,aAAa,EAAE,4BAAoB;QACnC,SAAS,EAAE,6BAAqB;QAChC,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,+BAA+B,CAAC,gBAAgB,CAAC;QAC5D,eAAe,EAAE,mCAA2B;QAC5C,YAAY,EAAE,CAAC,QAAQ,EAAE,gBAAgB,EAAE,EAAE,CAAC,IAAI,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QAClG,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AAVD,oFAUC;AAED,wBAAwB;AACX,QAAA,uBAAuB,GAAG,IAAA,iCAAsB,EAAC,wBAAgB,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;AAavG;;GAEG;AACH,MAAa,uBAAwB,SAAQ,~~8CAAuF~~;~~IAClI~~,IAAI,aAAa;QACf,OAAO,+BAAuB,CAAC;IACjC,CAAC;CACF;AAJD,0DAIC;AAID;;GAEG;AACU,QAAA,wBAAwB,GAAG,IAAA,qCAA0B,EAAuC;IACvG,MAAM,EAAE;QACN,KAAK,EAAE,IAAA,kCAAuB,GAAE;KACjC;CACF,CAAC,CAAC;AAEH,SAAgB,yCAAyC,CAAC,OAAyB;IACjF,OAAO,CAAC,MAAwB,EAAE,EAAE;QAClC,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,+BAAuB,CAAC,~~UAAU~~,CAAC,CAAC;~~IACvF~~,CAAC,CAAC;AACJ,CAAC;AAJD,8FAIC;AAKD,SAAgB,kCAAkC,CAAC,gBAAkC;IACnF,MAAM,OAAO,GAAG,yCAAyC,CAAC,gBAAgB,CAAC,CAAC;IAE5E,OAAO,CAAC,MAAwB,EAAE,EAAE;QAClC,OAAO,gBAAgB,CAAC,6BAA6B,CAAC;YACpD,aAAa,EAAE,+BAAuB;YACtC,SAAS,EAAE,gCAAwB;YACnC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;YAC3B,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC;YACzD,gBAAgB;YAChB,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAdD,gFAcC;AAED,SAAgB,kCAAkC,CAAC,OAAyB;IAC1E,OAAO,OAAO,CAAC,eAAe,CAAC,+BAAuB,CAAC,~~UAAU~~,CAAC,CAAC;~~AACrE~~,CAAC;AAFD,gFAEC;AAID,SAAgB,uCAAuC,CAAC,gBAAkC;IACxF,OAAO,gBAAgB,CAAC,wBAAwB,CAAC;QAC/C,aAAa,EAAE,+BAAuB;QACtC,SAAS,EAAE,gCAAwB;QACnC,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,kCAAkC,CAAC,gBAAgB,CAAC;QAC/D,YAAY,EAAE,CAAC,QAAQ,EAAE,gBAAgB,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QACrG,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AATD,0FASC;AAED,qBAAqB;AACR,QAAA,2BAA2B,GAAG,IAAA,iCAAsB,EAAC,+BAAuB,EAAE,qBAAqB,EAAE,OAAO,CAAC,CAAC;AAa3H;;GAEG;AACH,MAAa,2BAA4B,SAAQ,~~8CAAsG~~;~~IACrJ~~,IAAI,aAAa;QACf,OAAO,mCAA2B,CAAC;IACrC,CAAC;CACF;AAJD,kEAIC;AAID;;GAEG;AACU,QAAA,4BAA4B,GAAG,IAAA,qCAA0B,EAA+C;IACnH,MAAM,EAAE;QACN,KAAK,EAAE,IAAA,kCAAuB,GAAE;KACjC;CACF,CAAC,CAAC;AAEH,SAAgB,6CAA6C,CAAC,OAAyB;IACrF,OAAO,CAAC,MAA+B,EAAE,EAAE;QACzC,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,mCAA2B,CAAC,~~UAAU~~,CAAC,CAAC;~~IAC3F~~,CAAC,CAAC;AACJ,CAAC;AAJD,sGAIC;AAKD,SAAgB,sCAAsC,CAAC,gBAAkC;IACvF,MAAM,OAAO,GAAG,6CAA6C,CAAC,gBAAgB,CAAC,CAAC;IAEhF,OAAO,CAAC,MAA+B,EAAE,EAAE;QACzC,OAAO,gBAAgB,CAAC,6BAA6B,CAAC;YACpD,aAAa,EAAE,mCAA2B;YAC1C,SAAS,EAAE,oCAA4B;YACvC,YAAY,EAAE,EAAE;YAChB,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;YAC3B,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,2BAA2B,CAAC,CAAC,EAAE,CAAC,CAAC;YAC7D,gBAAgB;YAChB,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAdD,wFAcC;AAED,SAAgB,sCAAsC,CAAC,OAAyB;IAC9E,OAAO,OAAO,CAAC,eAAe,CAAC,mCAA2B,CAAC,~~UAAU~~,CAAC,CAAC;~~AACzE~~,CAAC;AAFD,wFAEC;AAID,SAAgB,2CAA2C,CAAC,gBAAkC;IAC5F,OAAO,gBAAgB,CAAC,wBAAwB,CAAC;QAC/C,aAAa,EAAE,mCAA2B;QAC1C,SAAS,EAAE,oCAA4B;QACvC,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,sCAAsC,CAAC,gBAAgB,CAAC;QACnE,YAAY,EAAE,CAAC,QAAQ,EAAE,gBAAgB,EAAE,EAAE,CAAC,IAAI,2BAA2B,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QACzG,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC;AATD,kGASC"}
1	+ {"version":3,"file":"firestore.mock.item.js","sourceRoot":"","sources":["../../../../../../../packages/firebase/test/src/lib/common/firestore.mock.item.ts"],"names":[],"mappings":"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"}