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

package/dist/index.cjs.js

@@ -70,7 +70,7 @@ V.MOCK_USER = new V("mock-user");
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-let S = "9.22.1-canary.e642fc7cd";
+let S = "9.22.1-canary.fe7da7ec3";
 
 /**
  * @license
@@ -7969,25 +7969,28 @@ function $r(t, e) {
         const e = ft(t);
         if (void 0 !== e && !this.en(e)) return !1;
         const n = dt(t);
-        let s = 0, i = 0;
+        let s = new Set, i = 0, r = 0;
         // Process all equalities first. Equalities can appear out of order.
-        for (;s < n.length && this.en(n[s]); ++s) ;
+        for (;i < n.length && this.en(n[i]); ++i) s = s.add(n[i].fieldPath.canonicalString());
         // If we already have processed all segments, all segments are used to serve
         // the equality filters and we do not need to map any segments to the
         // target's inequality and orderBy clauses.
-                if (s === n.length) return !0;
-        // If there is an inequality filter, the next segment must match both the
-        // filter and the first orderBy clause.
-                if (void 0 !== this.Ze) {
-            const t = n[s];
-            if (!this.nn(this.Ze, t) || !this.sn(this.Ye[i++], t)) return !1;
-            ++s;
+                if (i === n.length) return !0;
+        if (void 0 !== this.Ze) {
+            // 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 (!s.has(this.Ze.field.canonicalString())) {
+                const t = n[i];
+                if (!this.nn(this.Ze, t) || !this.sn(this.Ye[r++], t)) return !1;
+            }
+            ++i;
         }
         // All remaining segments need to represent the prefix of the target's
         // orderBy.
-                for (;s < n.length; ++s) {
-            const t = n[s];
-            if (i >= this.Ye.length || !this.sn(this.Ye[i++], t)) return !1;
+                for (;i < n.length; ++i) {
+            const t = n[i];
+            if (r >= this.Ye.length || !this.sn(this.Ye[r++], t)) return !1;
         }
         return !0;
     }
@@ -17782,10 +17785,10 @@ class hh {
  * Security Rules.
  */ function lh(t, e, n, s = {}) {
     var i;
-    const r = (t = uh(t, hh))._getSettings();
-    if ("firestore.googleapis.com" !== r.host && r.host !== e && M("Host has been set in both settings() and useEmulator(), emulator host will be used"), 
+    const r = (t = uh(t, hh))._getSettings(), o = `${e}:${n}`;
+    if ("firestore.googleapis.com" !== r.host && r.host !== o && M("Host has been set in both settings() and connectFirestoreEmulator(), emulator host will be used."), 
     t._setSettings(Object.assign(Object.assign({}, r), {
-        host: `${e}:${n}`,
+        host: o,
         ssl: !1
     })), s.mockUserToken) {
         let e, n;
@@ -21379,9 +21382,9 @@ function Jf(t, e) {
         return s = Object.assign({
             useFetchStreams: e
         }, s), r._setSettings(s), r;
-    }), "PUBLIC").setMultipleInstances(!0)), app.registerVersion(b, "3.12.1-canary.e642fc7cd", t), 
+    }), "PUBLIC").setMultipleInstances(!0)), app.registerVersion(b, "3.12.1-canary.fe7da7ec3", t), 
     // BUILD_TARGET will be replaced by values like esm5, esm2017, cjs5, etc during the compilation
-    app.registerVersion(b, "3.12.1-canary.e642fc7cd", "cjs2017");
+    app.registerVersion(b, "3.12.1-canary.fe7da7ec3", "cjs2017");
 }();
 
 exports.AbstractUserDataWriter = Wl;