@firebase/firestore 3.8.0 → 3.8.1-canary.0bab0b7a7

package/dist/index.d.ts

@@ -974,7 +974,8 @@ export declare function getDocFromServer<T>(reference: DocumentReference<T>): Pr
 export declare function getDocs<T>(query: Query<T>): Promise<QuerySnapshot<T>>;
 /**
  * Executes the query and returns the results as a `QuerySnapshot` from cache.
- * Returns an error if the document is not currently cached.
+ * Returns an empty result set if no documents matching the query are currently
+ * cached.
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */

package/dist/index.esm2017.js

@@ -66,7 +66,7 @@ P.MOCK_USER = new P("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-let v = "9.15.0";
+let v = "9.16.0-canary.0bab0b7a7";
 
 /**
  * @license
@@ -2994,6 +2994,14 @@ function De(t) {
     // the same description, such as the int 3 and the string "3". So we should
     // add the types in here somehow, too.
     return t.field.canonicalString() + t.op.toString() + oe(t.value);
+    if (Ve(t)) 
+    // Older SDK versions use an implicit AND operation between their filters.
+    // In the new SDK versions, the developer may use an explicit AND filter.
+    // To stay consistent with the old usages, we add a special case to ensure
+    // the canonical ID for these two are the same. For example:
+    // `col.whereEquals("a", 1).whereEquals("b", 2)` should have the same
+    // canonical ID as `col.where(and(equals("a",1), equals("b",2)))`.
+    return t.filters.map((t => De(t))).join(",");
     {
         // filter instanceof CompositeFilter
         const e = t.filters.map((t => De(t))).join(",");
@@ -9546,15 +9554,17 @@ function uo(t, e) {
             for (;o; ) n(o, null), o = r.hasNext() ? r.getNext() : null;
         }));
     }
-    getAllFromCollection(t, e, n) {
-        const s = [ e.popLast().toArray(), e.lastSegment(), Xi(n.readTime), n.documentKey.path.isEmpty() ? "" : n.documentKey.path.lastSegment() ], i = [ e.popLast().toArray(), e.lastSegment(), [ Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER ], "" ];
-        return _o(t).W(IDBKeyRange.bound(s, i, !0)).next((t => {
-            let e = ds();
-            for (const n of t) {
-                const t = this.jn(ct.fromSegments(n.prefixPath.concat(n.collectionGroup, n.documentId)), n);
-                e = e.insert(t.key, t);
+    getDocumentsMatchingQuery(t, e, n, s) {
+        const i = e.path, r = [ i.popLast().toArray(), i.lastSegment(), Xi(n.readTime), n.documentKey.path.isEmpty() ? "" : n.documentKey.path.lastSegment() ], o = [ i.popLast().toArray(), i.lastSegment(), [ Number.MAX_SAFE_INTEGER, Number.MAX_SAFE_INTEGER ], "" ];
+        return _o(t).W(IDBKeyRange.bound(r, o, !0)).next((t => {
+            let n = ds();
+            for (const i of t) {
+                const t = this.jn(ct.fromSegments(i.prefixPath.concat(i.collectionGroup, i.documentId)), i);
+                t.isFoundDocument() && (An(e, t) || s.has(t.key)) && (
+                // Either the document matches the given query, or it is mutated.
+                n = n.insert(t.key, t));
             }
-            return e;
+            return n;
         }));
     }
     getAllFromCollectionGroup(t, e, n, s) {
@@ -9769,8 +9779,10 @@ function mo(t, e) {
 class yo {
     constructor(t, 
     /**
-     * The fields that are locally mutated by patch mutations. If the overlayed
-     * document is from set or delete mutations, this returns null.
+     * The fields that are locally mutated by patch mutations.
+     *
+     * If the overlayed	document is from set or delete mutations, this is `null`.
+     * If there is no overlay (mutation) for the document, this is an empty `FieldMask`.
      */
     e) {
         this.overlayedDocument = t, this.mutatedFields = e;
@@ -9883,8 +9895,11 @@ class yo {
             // NOTE: we recalculate when `overlay` is undefined as well, because there
             // might be a patch mutation whose precondition does not match before the
             // change (hence overlay is undefined), but would now match.
-                        s.has(e.key) && (void 0 === o || o.mutation instanceof ts) ? i = i.insert(e.key, e) : void 0 !== o && (r.set(e.key, o.mutation.getFieldMask()), 
-            Jn(o.mutation, e, o.mutation.getFieldMask(), nt.now()));
+                        s.has(e.key) && (void 0 === o || o.mutation instanceof ts) ? i = i.insert(e.key, e) : void 0 !== o ? (r.set(e.key, o.mutation.getFieldMask()), 
+            Jn(o.mutation, e, o.mutation.getFieldMask(), nt.now())) : 
+            // no overlay exists
+            // Using EMPTY to indicate there is no overlay for the document.
+            r.set(e.key, Je.empty());
         })), this.recalculateAndSaveOverlays(t, i).next((t => (t.forEach(((t, e) => r.set(t, e))), 
         e.forEach(((t, e) => {
             var n;
@@ -9997,21 +10012,21 @@ class yo {
     getDocumentsMatchingCollectionQuery(t, e, n) {
         // Query the remote documents and overlay mutations.
         let s;
-        return this.remoteDocumentCache.getAllFromCollection(t, e.path, n).next((i => (s = i, 
-        this.documentOverlayCache.getOverlaysForCollection(t, e.path, n.largestBatchId)))).next((t => {
+        return this.documentOverlayCache.getOverlaysForCollection(t, e.path, n.largestBatchId).next((i => (s = i, 
+        this.remoteDocumentCache.getDocumentsMatchingQuery(t, e, n, s)))).next((t => {
             // As documents might match the query because of their overlay we need to
             // include documents for all overlays in the initial document set.
-            t.forEach(((t, e) => {
-                const n = e.getKey();
-                null === s.get(n) && (s = s.insert(n, Ze.newInvalidDocument(n)));
+            s.forEach(((e, n) => {
+                const s = n.getKey();
+                null === t.get(s) && (t = t.insert(s, Ze.newInvalidDocument(s)));
             }));
             // Apply the overlays and match against the query.
             let n = ws();
-            return s.forEach(((s, i) => {
-                const r = t.get(s);
+            return t.forEach(((t, i) => {
+                const r = s.get(t);
                 void 0 !== r && Jn(r.mutation, i, Je.empty(), nt.now()), 
                 // Finally, insert the documents that still match the query
-                An(e, i) && (n = n.insert(s, i));
+                An(e, i) && (n = n.insert(t, i));
             })), n;
         }));
     }
@@ -10472,17 +10487,17 @@ class bo {
             n = n.insert(t, e ? e.document.mutableCopy() : Ze.newInvalidDocument(t));
         })), At.resolve(n);
     }
-    getAllFromCollection(t, e, n) {
-        let s = ds();
+    getDocumentsMatchingQuery(t, e, n, s) {
+        let i = ds();
         // Documents are ordered by key, so we can use a prefix scan to narrow down
         // the documents we need to match the query against.
-                const i = new ct(e.child("")), r = this.docs.getIteratorFrom(i);
-        for (;r.hasNext(); ) {
-            const {key: t, value: {document: i}} = r.getNext();
-            if (!e.isPrefixOf(t.path)) break;
-            t.path.length > e.length + 1 || (pt(gt(i), n) <= 0 || (s = s.insert(i.key, i.mutableCopy())));
+                const r = e.path, o = new ct(r.child("")), u = this.docs.getIteratorFrom(o);
+        for (;u.hasNext(); ) {
+            const {key: t, value: {document: o}} = u.getNext();
+            if (!r.isPrefixOf(t.path)) break;
+            t.path.length > r.length + 1 || (pt(gt(o), n) <= 0 || (s.has(o.key) || An(e, o)) && (i = i.insert(o.key, o.mutableCopy())));
         }
-        return At.resolve(s);
+        return At.resolve(i);
     }
     getAllFromCollectionGroup(t, e, n, s) {
         // This method should only be called from the IndexBackfiller if persistence
@@ -19040,13 +19055,14 @@ function sl(t, e, ...n) {
 }
 
 /**
- * Creates a {@link QueryCompositeFilterConstraint} that performs a logical OR
- * of all the provided {@link QueryFilterConstraint}s.
+ * Creates a new {@link QueryCompositeFilterConstraint} that is a disjunction of
+ * the given filter constraints. A disjunction filter includes a document if it
+ * satisfies any of the given filters.
  *
- * @param queryConstraints - Optional. The {@link QueryFilterConstraint}s
- * for OR operation. These must be created with calls to {@link where},
- * {@link or}, or {@link and}.
- * @returns The created {@link QueryCompositeFilterConstraint}.
+ * @param queryConstraints - Optional. The list of
+ * {@link QueryFilterConstraint}s to perform a disjunction for. These must be
+ * created with calls to {@link where}, {@link or}, or {@link and}.
+ * @returns The newly created {@link QueryCompositeFilterConstraint}.
  * @internal TODO remove this internal tag with OR Query support in the server
  */ function ul(...t) {
     // Only support QueryFilterConstraints
@@ -19054,13 +19070,14 @@ function sl(t, e, ...n) {
 }
 
 /**
- * Creates a {@link QueryCompositeFilterConstraint} that performs a logical AND
- * of all the provided {@link QueryFilterConstraint}s.
+ * Creates a new {@link QueryCompositeFilterConstraint} that is a conjunction of
+ * the given filter constraints. A conjunction filter includes a document if it
+ * satisfies all of the given filters.
  *
- * @param queryConstraints - Optional. The {@link QueryFilterConstraint}s
- * for AND operation. These must be created with calls to {@link where},
- * {@link or}, or {@link and}.
- * @returns The created {@link QueryCompositeFilterConstraint}.
+ * @param queryConstraints - Optional. The list of
+ * {@link QueryFilterConstraint}s to perform a conjunction for. These must be
+ * created with calls to {@link where}, {@link or}, or {@link and}.
+ * @returns The newly created {@link QueryCompositeFilterConstraint}.
  * @internal TODO remove this internal tag with OR Query support in the server
  */ function cl(...t) {
     // Only support QueryFilterConstraints
@@ -19840,7 +19857,8 @@ class Ml extends Pl {
 
 /**
  * Executes the query and returns the results as a `QuerySnapshot` from cache.
- * Returns an error if the document is not currently cached.
+ * Returns an empty result set if no documents matching the query are currently
+ * cached.
  *
  * @returns A `Promise` that will be resolved with the results of the query.
  */ function Ll(t) {
@@ -20512,9 +20530,9 @@ function lf(t, e) {
         return s = Object.assign({
             useFetchStreams: e
         }, s), r._setSettings(s), r;
-    }), "PUBLIC").setMultipleInstances(!0)), registerVersion(b, "3.8.0", t), 
+    }), "PUBLIC").setMultipleInstances(!0)), registerVersion(b, "3.8.1-canary.0bab0b7a7", t), 
     // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
-    registerVersion(b, "3.8.0", "esm2017");
+    registerVersion(b, "3.8.1-canary.0bab0b7a7", "esm2017");
 }();
 
 export { Pl as AbstractUserDataWriter, Sa as AggregateField, Da as AggregateQuerySnapshot, Ih as Bytes, sh as CACHE_SIZE_UNLIMITED, Ia as CollectionReference, ya as DocumentReference, Dl as DocumentSnapshot, Th as FieldPath, Ah as FieldValue, ih as Firestore, L as FirestoreError, Rh as GeoPoint, nh as LoadBundleTask, pa as Query, ol as QueryCompositeFilterConstraint, nl as QueryConstraint, Cl as QueryDocumentSnapshot, gl as QueryEndAtConstraint, il as QueryFieldFilterConstraint, ll as QueryLimitConstraint, al as QueryOrderByConstraint, xl as QuerySnapshot, _l as QueryStartAtConstraint, Sl as SnapshotMetadata, nt as Timestamp, ef as Transaction, Zl as WriteBatch, Ft as _DatabaseId, ct as _DocumentKey, J as _EmptyAppCheckTokenProvider, K as _EmptyAuthCredentialsProvider, ut as _FieldPath, fa as _cast, F as _debugAssert, Gt as _isBase64Available, N as _logWarn, ca as _validateIsNotUsedTogether, Ql as addDoc, Jl as aggregateQuerySnapshotEqual, cl as and, uf as arrayRemove, of as arrayUnion, fh as clearIndexedDbPersistence, Ta as collection, Ea as collectionGroup, ga as connectFirestoreEmulator, Gl as deleteDoc, sf as deleteField, wh as disableNetwork, Aa as doc, Eh as documentId, ah as enableIndexedDbPersistence, hh as enableMultiTabIndexedDbPersistence, _h as enableNetwork, pl as endAt, yl as endBefore, uh as ensureFirestoreConfigured, zl as executeWrite, Yl as getCountFromServer, Ol as getDoc, Fl as getDocFromCache, $l as getDocFromServer, Bl as getDocs, Ll as getDocsFromCache, ql as getDocsFromServer, oh as getFirestore, cf as increment, rh as initializeFirestore, fl as limit, dl as limitToLast, gh as loadBundle, yh as namedQuery, jl as onSnapshot, Wl as onSnapshotsInSync, ul as or, hl as orderBy, sl as query, ba as queryEqual, Ra as refEqual, nf as runTransaction, rf as serverTimestamp, Ul as setDoc, hf as setIndexConfiguration, D as setLogLevel, kl as snapshotEqual, ml as startAfter, wl as startAt, mh as terminate, Kl as updateDoc, dh as waitForPendingWrites, rl as where, af as writeBatch };