@firebase/firestore 3.12.1-canary.e642fc7cd → 3.12.1-canary.fe7da7ec3

package/dist/index.node.cjs.js

@@ -34,7 +34,7 @@ var grpc__namespace = /*#__PURE__*/_interopNamespace(grpc);
 var protoLoader__namespace = /*#__PURE__*/_interopNamespace(protoLoader);
 
 const name = "@firebase/firestore";
-const version$1 = "3.12.1-canary.e642fc7cd";
+const version$1 = "3.12.1-canary.fe7da7ec3";
 
 /**
  * @license
@@ -87,7 +87,7 @@ User.GOOGLE_CREDENTIALS = new User('google-credentials-uid');
 User.FIRST_PARTY = new User('first-party-uid');
 User.MOCK_USER = new User('mock-user');
 
-const version = "9.22.1-canary.e642fc7cd";
+const version = "9.22.1-canary.fe7da7ec3";
 
 /**
  * @license
@@ -11070,17 +11070,17 @@ class TargetIndexMatcher {
             return false;
         }
         const segments = fieldIndexGetDirectionalSegments(index);
+        let equalitySegments = new Set();
         let segmentIndex = 0;
         let orderBysIndex = 0;
         // Process all equalities first. Equalities can appear out of order.
         for (; segmentIndex < segments.length; ++segmentIndex) {
             // We attempt to greedily match all segments to equality filters. If a
             // filter matches an index segment, we can mark the segment as used.
-            // Since it is not possible to use the same field path in both an equality
-            // and inequality/oderBy clause, we do not have to consider the possibility
-            // that a matching equality segment should instead be used to map to an
-            // inequality filter or orderBy clause.
-            if (!this.hasMatchingEqualityFilter(segments[segmentIndex])) {
+            if (this.hasMatchingEqualityFilter(segments[segmentIndex])) {
+                equalitySegments = equalitySegments.add(segments[segmentIndex].fieldPath.canonicalString());
+            }
+            else {
                 // If we cannot find a matching filter, we need to verify whether the
                 // remaining segments map to the target's inequality and its orderBy
                 // clauses.
@@ -11093,13 +11093,16 @@ class TargetIndexMatcher {
         if (segmentIndex === segments.length) {
             return true;
         }
-        // If there is an inequality filter, the next segment must match both the
-        // filter and the first orderBy clause.
         if (this.inequalityFilter !== undefined) {
-            const segment = segments[segmentIndex];
-            if (!this.matchesFilter(this.inequalityFilter, segment) ||
-                !this.matchesOrderBy(this.orderBys[orderBysIndex++], segment)) {
-                return false;
+            // If there is an inequality filter and the field was not in one of the
+            // equality filters above, the next segment must match both the filter
+            // and the first orderBy clause.
+            if (!equalitySegments.has(this.inequalityFilter.field.canonicalString())) {
+                const segment = segments[segmentIndex];
+                if (!this.matchesFilter(this.inequalityFilter, segment) ||
+                    !this.matchesOrderBy(this.orderBys[orderBysIndex++], segment)) {
+                    return false;
+                }
             }
             ++segmentIndex;
         }
@@ -27262,11 +27265,12 @@ function connectFirestoreEmulator(firestore, host, port, options = {}) {
     var _a;
     firestore = cast(firestore, Firestore$1);
     const settings = firestore._getSettings();
-    if (settings.host !== DEFAULT_HOST && settings.host !== host) {
-        logWarn('Host has been set in both settings() and useEmulator(), emulator host ' +
-            'will be used');
+    const newHostSetting = `${host}:${port}`;
+    if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {
+        logWarn('Host has been set in both settings() and connectFirestoreEmulator(), emulator host ' +
+            'will be used.');
     }
-    firestore._setSettings(Object.assign(Object.assign({}, settings), { host: `${host}:${port}`, ssl: false }));
+    firestore._setSettings(Object.assign(Object.assign({}, settings), { host: newHostSetting, ssl: false }));
     if (options.mockUserToken) {
         let token;
         let user;