@squidcloud/client 1.0.186 → 1.0.188

package/dist/cjs/index.js

@@ -19910,6 +19910,205 @@ exports.Trie = Trie;
 Trie.StopFillToken = Symbol('Trie.StopFillToken');
 //# sourceMappingURL=Trie.js.map
 
+/***/ }),
+
+/***/ 7795:
+/***/ ((module) => {
+
+"use strict";
+
+module.exports = rfdc
+
+function copyBuffer (cur) {
+  if (cur instanceof Buffer) {
+    return Buffer.from(cur)
+  }
+
+  return new cur.constructor(cur.buffer.slice(), cur.byteOffset, cur.length)
+}
+
+function rfdc (opts) {
+  opts = opts || {}
+
+  if (opts.circles) return rfdcCircles(opts)
+  return opts.proto ? cloneProto : clone
+
+  function cloneArray (a, fn) {
+    var keys = Object.keys(a)
+    var a2 = new Array(keys.length)
+    for (var i = 0; i < keys.length; i++) {
+      var k = keys[i]
+      var cur = a[k]
+      if (typeof cur !== 'object' || cur === null) {
+        a2[k] = cur
+      } else if (cur instanceof Date) {
+        a2[k] = new Date(cur)
+      } else if (ArrayBuffer.isView(cur)) {
+        a2[k] = copyBuffer(cur)
+      } else {
+        a2[k] = fn(cur)
+      }
+    }
+    return a2
+  }
+
+  function clone (o) {
+    if (typeof o !== 'object' || o === null) return o
+    if (o instanceof Date) return new Date(o)
+    if (Array.isArray(o)) return cloneArray(o, clone)
+    if (o instanceof Map) return new Map(cloneArray(Array.from(o), clone))
+    if (o instanceof Set) return new Set(cloneArray(Array.from(o), clone))
+    var o2 = {}
+    for (var k in o) {
+      if (Object.hasOwnProperty.call(o, k) === false) continue
+      var cur = o[k]
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur
+      } else if (cur instanceof Date) {
+        o2[k] = new Date(cur)
+      } else if (cur instanceof Map) {
+        o2[k] = new Map(cloneArray(Array.from(cur), clone))
+      } else if (cur instanceof Set) {
+        o2[k] = new Set(cloneArray(Array.from(cur), clone))
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur)
+      } else {
+        o2[k] = clone(cur)
+      }
+    }
+    return o2
+  }
+
+  function cloneProto (o) {
+    if (typeof o !== 'object' || o === null) return o
+    if (o instanceof Date) return new Date(o)
+    if (Array.isArray(o)) return cloneArray(o, cloneProto)
+    if (o instanceof Map) return new Map(cloneArray(Array.from(o), cloneProto))
+    if (o instanceof Set) return new Set(cloneArray(Array.from(o), cloneProto))
+    var o2 = {}
+    for (var k in o) {
+      var cur = o[k]
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur
+      } else if (cur instanceof Date) {
+        o2[k] = new Date(cur)
+      } else if (cur instanceof Map) {
+        o2[k] = new Map(cloneArray(Array.from(cur), cloneProto))
+      } else if (cur instanceof Set) {
+        o2[k] = new Set(cloneArray(Array.from(cur), cloneProto))
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur)
+      } else {
+        o2[k] = cloneProto(cur)
+      }
+    }
+    return o2
+  }
+}
+
+function rfdcCircles (opts) {
+  var refs = []
+  var refsNew = []
+
+  return opts.proto ? cloneProto : clone
+
+  function cloneArray (a, fn) {
+    var keys = Object.keys(a)
+    var a2 = new Array(keys.length)
+    for (var i = 0; i < keys.length; i++) {
+      var k = keys[i]
+      var cur = a[k]
+      if (typeof cur !== 'object' || cur === null) {
+        a2[k] = cur
+      } else if (cur instanceof Date) {
+        a2[k] = new Date(cur)
+      } else if (ArrayBuffer.isView(cur)) {
+        a2[k] = copyBuffer(cur)
+      } else {
+        var index = refs.indexOf(cur)
+        if (index !== -1) {
+          a2[k] = refsNew[index]
+        } else {
+          a2[k] = fn(cur)
+        }
+      }
+    }
+    return a2
+  }
+
+  function clone (o) {
+    if (typeof o !== 'object' || o === null) return o
+    if (o instanceof Date) return new Date(o)
+    if (Array.isArray(o)) return cloneArray(o, clone)
+    if (o instanceof Map) return new Map(cloneArray(Array.from(o), clone))
+    if (o instanceof Set) return new Set(cloneArray(Array.from(o), clone))
+    var o2 = {}
+    refs.push(o)
+    refsNew.push(o2)
+    for (var k in o) {
+      if (Object.hasOwnProperty.call(o, k) === false) continue
+      var cur = o[k]
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur
+      } else if (cur instanceof Date) {
+        o2[k] = new Date(cur)
+      } else if (cur instanceof Map) {
+        o2[k] = new Map(cloneArray(Array.from(cur), clone))
+      } else if (cur instanceof Set) {
+        o2[k] = new Set(cloneArray(Array.from(cur), clone))
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur)
+      } else {
+        var i = refs.indexOf(cur)
+        if (i !== -1) {
+          o2[k] = refsNew[i]
+        } else {
+          o2[k] = clone(cur)
+        }
+      }
+    }
+    refs.pop()
+    refsNew.pop()
+    return o2
+  }
+
+  function cloneProto (o) {
+    if (typeof o !== 'object' || o === null) return o
+    if (o instanceof Date) return new Date(o)
+    if (Array.isArray(o)) return cloneArray(o, cloneProto)
+    if (o instanceof Map) return new Map(cloneArray(Array.from(o), cloneProto))
+    if (o instanceof Set) return new Set(cloneArray(Array.from(o), cloneProto))
+    var o2 = {}
+    refs.push(o)
+    refsNew.push(o2)
+    for (var k in o) {
+      var cur = o[k]
+      if (typeof cur !== 'object' || cur === null) {
+        o2[k] = cur
+      } else if (cur instanceof Date) {
+        o2[k] = new Date(cur)
+      } else if (cur instanceof Map) {
+        o2[k] = new Map(cloneArray(Array.from(cur), cloneProto))
+      } else if (cur instanceof Set) {
+        o2[k] = new Set(cloneArray(Array.from(cur), cloneProto))
+      } else if (ArrayBuffer.isView(cur)) {
+        o2[k] = copyBuffer(cur)
+      } else {
+        var i = refs.indexOf(cur)
+        if (i !== -1) {
+          o2[k] = refsNew[i]
+        } else {
+          o2[k] = cloneProto(cur)
+        }
+      }
+    }
+    refs.pop()
+    refsNew.pop()
+    return o2
+  }
+}
+
+
 /***/ }),
 
 /***/ 7257:
@@ -29285,16 +29484,28 @@ var lodash = __webpack_require__(8784);
 var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
 // EXTERNAL MODULE: ../node_modules/assertic/dist/index.js
 var dist = __webpack_require__(8975);
+// EXTERNAL MODULE: ../node_modules/rfdc/index.js
+var rfdc = __webpack_require__(7795);
+var rfdc_default = /*#__PURE__*/__webpack_require__.n(rfdc);
 ;// CONCATENATED MODULE: ../internal-common/src/utils/object.ts
 
 
-function getInPath(obj, path, delimiter = '.') {
-    const splitPath = path.split(delimiter);
+
+const SPLIT_REGEX_FOR_GET_IN_PATH = /[.\[\]]/;
+/** Returns a value by the `path`. Works with array indexes, like a.b[0]. */
+function getInPath(obj, path) {
+    if (!obj) {
+        return undefined;
+    }
+    const splitPath = path.split(SPLIT_REGEX_FOR_GET_IN_PATH);
     let value = undefined;
     let currentObj = obj;
     while (currentObj && splitPath.length) {
-        const key = (0,dist.truthy)(splitPath.shift());
-        if (!(currentObj instanceof Object) || !(key in currentObj)) {
+        const key = splitPath.shift();
+        if (!key) {
+            continue;
+        }
+        if (typeof currentObj !== 'object' || !(key in currentObj)) {
             return undefined;
         }
         value = currentObj[key];
@@ -29303,13 +29514,12 @@ function getInPath(obj, path, delimiter = '.') {
     return value;
 }
 function isJsObject(obj) {
-    if (typeof obj !== 'object')
-        return false;
-    return obj !== null && Reflect.getPrototypeOf(obj) === Object.prototype;
+    return obj !== null && typeof obj === 'object' && !Array.isArray(obj);
 }
 function isDateObject(value) {
     return Object.prototype.toString.call(value) === '[object Date]';
 }
+/** Sets a value by path . Does not support array indexes. */
 function setInPath(obj, path, value, delimiter = '.') {
     var _a;
     const splitPath = path.split(delimiter);
@@ -29317,7 +29527,8 @@ function setInPath(obj, path, value, delimiter = '.') {
     while (splitPath.length) {
         const key = (0,dist.truthy)(splitPath.shift());
         if (splitPath.length) {
-            const newCurrentObj = isJsObject(currentObj[key]) ? (_a = lodash.clone(currentObj[key])) !== null && _a !== void 0 ? _a : {} : {};
+            const fieldValue = currentObj[key];
+            const newCurrentObj = isJsObject(fieldValue) ? (_a = lodash.clone(fieldValue)) !== null && _a !== void 0 ? _a : {} : {};
             currentObj[key] = newCurrentObj;
             currentObj = newCurrentObj;
         }
@@ -29364,10 +29575,10 @@ function isEqual(a, b) {
         return true;
     if (a === null || b === null)
         return false;
-    const type = typeof a;
-    if (type !== typeof b)
+    const typeOfA = typeof a;
+    if (typeOfA !== typeof b)
         return false;
-    if (type !== 'object')
+    if (typeOfA !== 'object')
         return a === b;
     if (a instanceof Date && b instanceof Date) {
         return a.getTime() === b.getTime();
@@ -29401,7 +29612,7 @@ function isEmpty(a) {
     if (a instanceof Map || a instanceof Set) {
         return a.size === 0;
     }
-    if (typeof a === 'object' && a.constructor === Object) {
+    if (typeof a === 'object') {
         return Object.keys(a).length === 0;
     }
     return false;
@@ -29419,10 +29630,30 @@ function omit(object, ...paths) {
     });
     return result;
 }
+/** Creates a deep copy of the object. Copies all Date, Map, Set fields. */
+function cloneDeep(value) {
+    // Can't use 'structuredClone' function here because it does not process prototype chains:
+    // array fields of the object cloned with the 'structuredClone' have prototype different from Array.prototype,
+    // and it cases some tests to fail.
+    return rfdc_default()()(value);
+}
+/** Compares 2 values. 'null' and 'undefined' values are considered equal and are less than any other values. */
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+function compareValues(a, b) {
+    if (a === b || (isNil(a) && isNil(b))) {
+        return 0;
+    }
+    else if (isNil(a)) {
+        return -1;
+    }
+    else if (isNil(b)) {
+        return 1;
+    }
+    return a < b ? -1 : a > b ? 1 : 0;
+}
 
 ;// CONCATENATED MODULE: ../internal-common/src/public-types/mutation.public-context.ts
 
-
 /** The mutation context that will be provided to the security function. */
 class MutationContext {
     /**
@@ -29444,8 +29675,8 @@ class MutationContext {
     }
     /** Returns true if the mutation affects the provided path. */
     affectsPath(path) {
-        const before = this.before ? lodash.get(this.before, path) : undefined;
-        const after = this.after ? lodash.get(this.after, path) : undefined;
+        const before = getInPath(this.before, path);
+        const after = getInPath(this.after, path);
         return !isEqual(before, after);
     }
 }
@@ -29509,36 +29740,23 @@ class Pagination {
             .snapshots(this.options.subscribe);
         this.snapshotSubject.next(firstPageSnapshot);
     }
-    static compareValues(a, b) {
-        if (isNil(a)) {
-            return isNil(b) ? 0 : -1;
-        }
-        if (isNil(b)) {
-            return 1;
-        }
-        if (a > b) {
-            return 1;
+    compareObjects(doc1, doc2) {
+        if (doc1 === doc2 || (isNil(doc1) && isNil(doc2))) {
+            return 0;
         }
-        else if (a < b) {
+        else if (isNil(doc1)) {
             return -1;
         }
-        else {
-            return 0;
-        }
-    }
-    compare(doc1, doc2) {
-        if (isNil(doc2)) {
+        else if (isNil(doc2)) {
             return 1;
         }
-        for (const so of this.templateSnapshotEmitter.getSortOrders()) {
-            const currentComparison = Pagination.compareValues(getInPath(doc1, so.fieldName), getInPath(doc2, so.fieldName));
-            if (currentComparison !== 0) {
-                if (so.asc) {
-                    return currentComparison;
-                }
-                else {
-                    return -currentComparison;
-                }
+        const sortOrders = this.templateSnapshotEmitter.getSortOrders();
+        for (const { fieldName, asc } of sortOrders) {
+            const value1 = getInPath(doc1, fieldName);
+            const value2 = getInPath(doc2, fieldName);
+            const rc = compareValues(value1, value2);
+            if (rc !== 0) {
+                return asc ? rc : -rc;
             }
         }
         return 0;
@@ -29560,7 +29778,7 @@ class Pagination {
             if (this.lastElement !== null) {
                 // We just executed a `prev` and we know what the last element is on the page but not the first.
                 // We need to find the first element on the page instead, because that's our anchor.
-                const numAfter = extractedData.filter(s => this.compare(s, this.lastElement) === 1).length;
+                const numAfter = extractedData.filter(s => this.compareObjects(s, this.lastElement) === 1).length;
                 this.firstElement = extractedData[data.length - numAfter - this.options.pageSize];
                 this.lastElement = null;
             }
@@ -29570,7 +29788,7 @@ class Pagination {
                 this.navigatingToLastPage = false;
             }
         }
-        const numBefore = extractedData.filter(s => this.compare(s, this.firstElement) === -1).length;
+        const numBefore = extractedData.filter(s => this.compareObjects(s, this.firstElement) === -1).length;
         const numAfter = Math.max(0, data.length - numBefore - this.options.pageSize);
         // Current page is empty, go to previous page
         if (numBefore === data.length) {
@@ -29631,7 +29849,7 @@ class Pagination {
         const { data, numBefore, numAfter, extractedData } = internalState;
         return {
             data: data
-                .filter((_, i) => this.compare(extractedData[i], this.firstElement) !== -1)
+                .filter((_, i) => this.compareObjects(extractedData[i], this.firstElement) !== -1)
                 .slice(0, this.options.pageSize),
             hasNext: numAfter > 0,
             hasPrev: numBefore > 0,
@@ -29930,7 +30148,6 @@ function parseQuerySubscriptionId(querySubscriptionId) {
 
 
 
-
 /**
  * The compare table is used to determine whether one condition (conditionA)
  * is a subset of another condition (conditionB).
@@ -30106,7 +30323,7 @@ class QueryContext {
         for (const contextCondition of this.parsedConditions) {
             const fieldNameOrPath = contextCondition.fieldName;
             const operator = contextCondition.operator;
-            const valueInDoc = lodash.get(doc, fieldNameOrPath);
+            const valueInDoc = getInPath(doc, fieldNameOrPath);
             if (operator === 'in') {
                 if (contextCondition.value.includes(valueInDoc)) {
                     continue;
@@ -30269,6 +30486,7 @@ function getSquidDocId(...args) {
 
 
 
+
 /**
  * A query builder that can participate in a join.
  * To learn more about join queries, see the
@@ -30351,7 +30569,7 @@ class JoinQueryBuilder extends BaseQueryBuilder {
             return new external_rxjs_.BehaviorSubject([]);
         }
         return this.querySubscriptionManager
-            .processQuery(this.build(), this.rootAlias, lodash.cloneDeep(this.joins), lodash.cloneDeep(this.joinConditions), subscribe, false)
+            .processQuery(this.build(), this.rootAlias, cloneDeep(this.joins), cloneDeep(this.joinConditions), subscribe, false)
             .pipe(map(docs => docs.map(docRecord => {
             const result = {};
             for (const [alias, doc] of Object.entries(docRecord)) {
@@ -30389,7 +30607,7 @@ class JoinQueryBuilder extends BaseQueryBuilder {
         return this.queryBuilder.getSortOrders();
     }
     clone() {
-        const res = new JoinQueryBuilder(this.collectionName, this.integrationId, this.querySubscriptionManager, this.documentReferenceFactory, this.queryBuilderFactory, this.rootAlias, this.latestAlias, lodash.cloneDeep(this.leftToRight), lodash.cloneDeep(this.joins), lodash.cloneDeep(this.joinConditions), this.queryBuilder.clone());
+        const res = new JoinQueryBuilder(this.collectionName, this.integrationId, this.querySubscriptionManager, this.documentReferenceFactory, this.queryBuilderFactory, this.rootAlias, this.latestAlias, cloneDeep(this.leftToRight), cloneDeep(this.joins), cloneDeep(this.joinConditions), this.queryBuilder.clone());
         res.containsEmptyInCondition = this.containsEmptyInCondition;
         return res;
     }
@@ -30911,7 +31129,7 @@ class DocumentReference {
      * @throws Error if the document does not exist.
      */
     get data() {
-        return lodash.cloneDeep(this.dataRef);
+        return cloneDeep(this.dataRef);
     }
     /**
      * Returns a read-only internal copy of the document data. This works similar to `this.data`, except it does not
@@ -31038,7 +31256,7 @@ class DocumentReference {
     async setInPath(path, value, transactionId) {
         // Not sure why TypeScript doesn't understand that `path` below is restricted, but we need the explicit type
         // assertion to make it compile.
-        return this.update({ [path]: lodash.cloneDeep(value) }, transactionId);
+        return this.update({ [path]: cloneDeep(value) }, transactionId);
     }
     /**
      * Similar to `update`, but only deletes the given path.
@@ -36614,7 +36832,7 @@ var cloneDeep_toString = Object.prototype.toString;
 /**
  * Deeply clones a value to create a new instance.
  */
-function cloneDeep(value) {
+function cloneDeep_cloneDeep(value) {
     return cloneDeepHelper(value);
 }
 function cloneDeepHelper(val, seen) {
@@ -37304,7 +37522,7 @@ var ObservableQuery = /** @class */ (function (_super) {
         }
         return (this.last = tslib_es6_assign({ result: this.queryManager.assumeImmutableResults ?
                 newResult
-                : cloneDeep(newResult), variables: variables }, (error ? { error: error } : null)));
+                : cloneDeep_cloneDeep(newResult), variables: variables }, (error ? { error: error } : null)));
     };
     ObservableQuery.prototype.reobserveAsConcast = function (newOptions, newNetworkStatus) {
         var _this = this;
@@ -43231,7 +43449,7 @@ var StoreWriter = /** @class */ (function () {
             // In development, we need to clone scalar values so that they can be
             // safely frozen with maybeDeepFreeze in readFromStore.ts. In production,
             // it's cheaper to store the scalar values directly in the cache.
-            return globalThis.__DEV__ !== false ? cloneDeep(value) : value;
+            return globalThis.__DEV__ !== false ? cloneDeep_cloneDeep(value) : value;
         }
         if (isArray(value)) {
             return value.map(function (item, i) {
@@ -47120,13 +47338,6 @@ function setSquidPrivateOption(optionName, value) {
 function getSquidPrivateOption(optionName) {
     return getSquidPrivateOptions()[optionName];
 }
-/*** Set of constants for private options. */
-/**
- * When set to 'true' (boolean), the RPC manager in Squid uses new 'fetch' based
- * HTTP client instead of axios library.
- * The option will be removed after the migration is tested and all issues are fixed.
- */
-const SQUID_PRIVATE_OPTION_USE_FETCH_IN_RPC_MANAGER = 'useFetchInRpcManager';
 /**
  * When set to 'true' (boolean), the Graphql client in Squid uses new 'fetch' based
  * HTTP client instead of cross-fetch library.
@@ -47787,7 +47998,7 @@ class QueryBuilder extends BaseQueryBuilder {
     }
     clone() {
         const res = new QueryBuilder(this.collectionName, this.integrationId, this.querySubscriptionManager, this.localQueryManager, this.documentReferenceFactory, this.queryBuilderFactory, this.documentIdentityService);
-        res.query = lodash.cloneDeep(this.query);
+        res.query = cloneDeep(this.query);
         res.containsEmptyInCondition = this.containsEmptyInCondition;
         return res;
     }
@@ -48047,7 +48258,7 @@ class ClientIdService {
         this.clientTooOldSubject.next(true);
         this.clientIdSubject.next(this.generateClientId());
     }
-    notifyClientReadyToBeRegenerated() {
+    notifyClientNotTooOld() {
         this.clientTooOldSubject.next(false);
     }
     observeClientReadyToBeRegenerated() {
@@ -48195,7 +48406,7 @@ function mergeMutations(mutationA, mutationB) {
     (0,dist.assertTruthy)(mutationB.type === 'update', 'Invalid mutation type');
     if (mutationA.type === 'update')
         return mergeUpdateMutations(mutationA, mutationB);
-    const result = lodash.cloneDeep(mutationA);
+    const result = cloneDeep(mutationA);
     for (const [fieldName, propertyMutationsAr] of sortUpdateMutationProperties(mutationB)) {
         const propertyMutations = propertyMutationsAr;
         for (const propertyMutation of propertyMutations) {
@@ -48211,8 +48422,8 @@ function mergeMutations(mutationA, mutationB) {
     return result;
 }
 function mergeUpdateMutations(mutationA, mutationB) {
-    const result = lodash.cloneDeep(mutationA);
-    mutationB = lodash.cloneDeep(mutationB);
+    const result = cloneDeep(mutationA);
+    mutationB = cloneDeep(mutationB);
     for (const [aPropName] of sortUpdateMutationProperties(result)) {
         const aPropNameDots = aPropName.split('.').length;
         const isOverriddenByMutationB = Object.entries(mutationB.properties).some(([bPropName]) => {
@@ -49206,7 +49417,7 @@ class DocumentStore {
         if (doc !== undefined) {
             // Update
             if (properties) {
-                const updateDoc = (0,lodash.cloneDeep)(properties);
+                const updateDoc = cloneDeep(properties);
                 const data = this.removeInternalProperties(updateDoc);
                 this.squidDocIdToDoc.set(squidDocId, data);
                 return data;
@@ -49230,21 +49441,13 @@ class DocumentStore {
     getDocumentOrUndefined(squidDocId) {
         return this.squidDocIdToDoc.get(squidDocId);
     }
-    compareValues(a, b) {
-        if (isNil(a)) {
-            return isNil(b) ? 0 : -1;
-        }
-        if (isNil(b))
-            return 1;
-        if (a === b)
-            return 0;
-        return a > b ? 1 : -1;
-    }
-    compareSquidDocs(a, b, sortFieldNames, sortOrders) {
-        for (const [i, fieldName] of sortFieldNames.entries()) {
-            const compare = this.compareValues(lodash_default().get(a, fieldName), lodash_default().get(b, fieldName));
-            if (compare !== 0) {
-                return sortOrders[i] === 'asc' ? compare : -1 * compare;
+    compareSquidDocs(a, b, sortOrders) {
+        for (const { fieldName, asc } of sortOrders) {
+            const valueA = getInPath(a, fieldName);
+            const valueB = getInPath(b, fieldName);
+            const rc = compareValues(valueA, valueB);
+            if (rc !== 0) {
+                return asc ? rc : -rc;
             }
         }
         return 0;
@@ -49260,11 +49463,7 @@ class DocumentStore {
         }
         const docs = [...docIdSet].map(id => this.squidDocIdToDoc.get(id)).filter(dist.isNonNullable);
         const { sortOrder, limitBy } = query;
-        const sortFieldNames = sortOrder.map(s => s.fieldName);
-        const sortOrders = sortOrder.map(s => (s.asc ? 'asc' : 'desc'));
-        const sortedDocs = docs.sort((a, b) => {
-            return this.compareSquidDocs(a, b, sortFieldNames, sortOrders);
-        });
+        const sortedDocs = docs.sort((a, b) => this.compareSquidDocs(a, b, sortOrder));
         const mainLimit = query.limit < 0 ? 2000 : query.limit;
         if (!limitBy) {
             return sortedDocs.slice(0, mainLimit);
@@ -49466,7 +49665,6 @@ const arrayMergeCustomizer = (a, b) => {
 
 
 
-
 // See limitUnderflowState below.
 // Exported only for tests
 const FETCH_BEYOND_LIMIT = 100;
@@ -49971,7 +50169,7 @@ class QuerySubscriptionManager {
             if (allNeededValues.size === 0) {
                 return false;
             }
-            const newQuery = lodash.cloneDeep(query);
+            const newQuery = cloneDeep(query);
             newQuery.conditions = newQuery.conditions.filter(cond => !isSimpleCondition(cond) || cond.fieldName !== joinCondition.right);
             [...allNeededValues].forEach(value => {
                 newQuery.conditions.push({
@@ -50379,13 +50577,9 @@ class RateLimiter {
     }
 }
 
-;// CONCATENATED MODULE: external "axios"
-const external_axios_namespaceObject = require("axios");
-var external_axios_default = /*#__PURE__*/__webpack_require__.n(external_axios_namespaceObject);
 ;// CONCATENATED MODULE: ./src/squid-http-client.ts
 
 
-
 class RpcError extends Error {
     /** @internal */
     constructor(statusCode, statusText, url, headers, body, message) {
@@ -50397,20 +50591,12 @@ class RpcError extends Error {
         this.body = body;
     }
 }
-function isFetchMode() {
-    // Temporary (1 week) keep the old code to simplify rollback.
-    return true;
-    // Native fetch is used in json request mode or when the corresponding private Squid option is enabled.
-    // This option is enabled in console-local and console-dev modes both in Web & Backend.
-    // return files.length === 0 || !!getSquidPrivateOption(SQUID_PRIVATE_OPTION_USE_FETCH_IN_RPC_MANAGER);
-}
 /**
  * Runs a post request to the given URL.
  * @internal.
  */
 async function rawSquidHttpPost(input) {
-    const isFetch = isFetchMode();
-    const response = await (isFetch ? performFetchRequest(input) : performAxiosRequest(input));
+    const response = await performFetchRequest(input);
     response.body = tryDeserializing(response.body);
     return response;
 }
@@ -50431,74 +50617,17 @@ async function performFetchRequest({ headers, files, filesFieldName, message: bo
         requestOptionHeaders.append('Content-Type', 'application/json');
         requestOptions.body = serializeObj(body);
     }
-    const response = await fetch(url, requestOptions);
-    const responseHeaders = {};
-    response.headers.forEach((value, key) => {
-        responseHeaders[key] = value;
-    });
-    if (!response.ok) {
-        const rawBody = await response.text();
-        const parsedBody = tryDeserializing(rawBody);
-        if (!extractErrorMessage) {
-            throw new RpcError(response.status, response.statusText, url, responseHeaders, parsedBody, rawBody);
-        }
-        let message;
-        try {
-            message = typeof parsedBody === 'string' ? parsedBody : (parsedBody === null || parsedBody === void 0 ? void 0 : parsedBody['message']) || rawBody;
-        }
-        catch (_a) { }
-        if (!message)
-            message = response.statusText;
-        throw new RpcError(response.status, response.statusText, url, responseHeaders, parsedBody, message);
-    }
-    const responseBody = await response.text();
-    DebugLogger.debug(`received response: ${JSON.stringify(responseBody)}`);
-    return {
-        body: responseBody,
-        headers: responseHeaders,
-        status: response.status,
-        statusText: response.statusText,
-    };
-}
-function extractAxiosResponseHeaders(response) {
-    return Object.entries(response.headers).reduce((acc, [key, value]) => {
-        acc[key] = value;
-        return acc;
-    }, {});
-}
-async function performAxiosRequest({ files, filesFieldName, message: body, url, headers, extractErrorMessage, }) {
-    let axiosResponse;
     try {
-        if (files.length) {
-            const formData = new FormData();
-            for (const file of files) {
-                const blob = file instanceof Blob ? file : file.blob;
-                const filename = file instanceof Blob ? undefined : file.name;
-                formData.append(filesFieldName, blob, filename);
-            }
-            formData.append('body', serializeObj(body));
-            // Make the axios call
-            axiosResponse = await external_axios_default().post(url, formData, {
-                headers,
-                responseType: 'text',
-            });
-        }
-        else {
-            axiosResponse = await external_axios_default().post(url, serializeObj(body), {
-                headers: Object.assign(Object.assign({}, headers), { 'Content-Type': 'application/json' }),
-                responseType: 'text',
-            });
-        }
-    }
-    catch (error) {
-        if ((0,external_axios_namespaceObject.isAxiosError)(error)) {
-            const { response } = error;
-            if (!response)
-                throw error;
-            const responseHeaders = extractAxiosResponseHeaders(response);
-            const rawBody = response.data;
+        const response = await fetch(url, requestOptions);
+        const responseHeaders = {};
+        response.headers.forEach((value, key) => {
+            responseHeaders[key] = value;
+        });
+        if (!response.ok) {
+            const rawBody = await response.text();
             const parsedBody = tryDeserializing(rawBody);
             if (!extractErrorMessage) {
+                // noinspection ExceptionCaughtLocallyJS
                 throw new RpcError(response.status, response.statusText, url, responseHeaders, parsedBody, rawBody);
             }
             let message;
@@ -50508,20 +50637,22 @@ async function performAxiosRequest({ files, filesFieldName, message: body, url,
             catch (_a) { }
             if (!message)
                 message = response.statusText;
+            // noinspection ExceptionCaughtLocallyJS
             throw new RpcError(response.status, response.statusText, url, responseHeaders, parsedBody, message);
         }
-        else {
-            throw error;
-        }
+        const responseBody = await response.text();
+        DebugLogger.debug(`received response: ${JSON.stringify(responseBody)}`);
+        return {
+            body: responseBody,
+            headers: responseHeaders,
+            status: response.status,
+            statusText: response.statusText,
+        };
+    }
+    catch (e) {
+        console.error(`Unable to perform fetch request to url: ${url}`, e);
+        throw e;
     }
-    const responseHeaders = extractAxiosResponseHeaders(axiosResponse);
-    DebugLogger.debug(`received response: ${JSON.stringify(axiosResponse.data)}`);
-    return {
-        body: axiosResponse.data,
-        headers: responseHeaders,
-        status: axiosResponse.status,
-        statusText: axiosResponse.statusText,
-    };
 }
 /**
  * @internal.
@@ -50818,28 +50949,30 @@ class SocketManager {
         }))
             .subscribe(() => {
             if (this.connectionReady.value) {
-                DebugLogger.debug('Client reconnected before becoming too old. Ignoring...');
+                DebugLogger.debug(`Client reconnected before becoming too old. Ignoring... ${this.clientIdService.getClientId()}`);
                 return;
             }
+            DebugLogger.debug(`Client disconnected for a long period - refreshing ${this.clientIdService.getClientId()}`);
             this.refreshClient();
         });
         this.observeConnectionReady()
             .pipe((0,external_rxjs_.filter)(Boolean))
             .subscribe(() => {
             if (this.clientIdService.isClientTooOld()) {
-                this.clientIdService.notifyClientReadyToBeRegenerated();
+                this.clientIdService.notifyClientNotTooOld();
             }
         });
     }
     refreshClient() {
         if (this.destructManager.isDestructing) {
-            DebugLogger.debug('Client too old but is destructed. Ignoring...');
+            DebugLogger.debug(`Client too old but is destructed. Ignoring... ${this.clientIdService.getClientId()}`);
             return;
         }
         else if (this.clientIdService.isClientTooOld()) {
-            DebugLogger.debug('Client is already marked as too old. Ignoring...');
+            DebugLogger.debug(`Client is already marked as too old. Ignoring... ${this.clientIdService.getClientId()}`);
             return;
         }
+        DebugLogger.debug(`Notifying client too old ${this.clientIdService.getClientId()}`);
         this.clientIdService.notifyClientTooOld();
         DebugLogger.debug('Client too old. Reconnecting...');
         this.connect();
@@ -50847,6 +50980,7 @@ class SocketManager {
     tick() {
         const diff = Math.abs(Date.now() - this.lastTick.getTime());
         if (diff > this.clientTooOldThreshold) {
+            DebugLogger.debug('Tick: Client not responding for a long time. Refreshing...', this.clientIdService.getClientId());
             this.refreshClient();
         }
         this.lastTick = new Date();
@@ -50895,29 +51029,45 @@ class SocketManager {
     connect() {
         var _a;
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
+        if (this.connectionReady.value) {
+            this.connectionReady.next(false);
+        }
         const endpoint = getApplicationUrl(this.region, this.appId, 'ws/general')
             .replace('https', 'wss')
             .replace('http', 'ws');
-        DebugLogger.debug('Connecting to socket at:', endpoint);
-        const socketUri = `${endpoint}?clientId=${this.clientIdService.getClientId()}`;
+        const clientId = this.clientIdService.getClientId();
+        DebugLogger.debug('Connecting to socket at:', endpoint, 'clientId:', clientId);
+        const socketUri = `${endpoint}?clientId=${clientId}`;
         this.socket = createWebSocketWrapper(socketUri, {
             timeout: 5000, // 5 seconds
             onmessage: (e) => this.onMessage(e.data),
             onopen: () => {
-                DebugLogger.debug(`Connection to socket established. Endpoint: ${endpoint}`);
+                DebugLogger.debug(`Connection to socket established. Endpoint: ${endpoint}  ${this.clientIdService.getClientId()}`);
             },
             onreconnect: () => {
-                DebugLogger.debug(`WebSocket reconnect event triggered`);
-                this.connectionReady.next(false);
+                DebugLogger.debug(`WebSocket reconnect event triggered ${clientId}`);
+                if (this.clientIdService.getClientId() !== clientId) {
+                    DebugLogger.debug(`WebSocket reconnect event triggered - ignored because the client id changed. Old: ${clientId}, new: ${this.clientIdService.getClientId()}`);
+                    return;
+                }
+                if (this.connectionReady.value) {
+                    this.connectionReady.next(false);
+                }
             },
             onclose: () => {
-                DebugLogger.debug(`WebSocket onclose event triggered`);
-                this.connectionReady.next(false);
+                DebugLogger.debug(`WebSocket onclose event triggered ${clientId}`);
+                if (this.clientIdService.getClientId() !== clientId) {
+                    DebugLogger.debug(`WebSocket onclose event triggered - ignored because the client id changed. Old: ${clientId}, new: ${this.clientIdService.getClientId()}`);
+                    return;
+                }
+                if (this.connectionReady.value) {
+                    this.connectionReady.next(false);
+                }
             },
             onerror: (e) => console.error('WebSocket error:', e),
         });
     }
-    disconnect() {
+    disconnectForTest() {
         var _a;
         this.connectionReady.next(false);
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close(4998);
@@ -50928,7 +51078,7 @@ class SocketManager {
     }
     onMessage(messagesStr) {
         if (messagesStr === 'connectionReady') {
-            DebugLogger.debug('Got socket message: connectionReady');
+            DebugLogger.debug(`Got socket message: connectionReady ${this.clientIdService.getClientId()}`);
             this.onConnectionReady();
             return;
         }
@@ -50939,7 +51089,7 @@ class SocketManager {
                 continue;
             }
             this.seenMessageIds.add(message.messageId);
-            DebugLogger.debug(new Date(), 'Got socket message: ', JSON.stringify(message, null, 2));
+            DebugLogger.debug(new Date(), `Got socket message: (${this.clientIdService.getClientId()})`, JSON.stringify(message, null, 2));
             this.messageNotificationWrapper(() => {
                 this.webSocketObserver.next(message);
             });

package/dist/internal-common/src/public-types/pagination.public-types.d.ts

@@ -32,8 +32,7 @@ export declare class Pagination<ReturnType> {
     private navigatingToLastPage;
     private lastElement;
     private goToFirstPage;
-    private static compareValues;
-    private compare;
+    private compareObjects;
     private dataReceived;
     private doNewQuery;
     private waitForInternalState;

package/dist/internal-common/src/utils/object.d.ts

@@ -1,5 +1,7 @@
-export declare function getInPath(obj: Readonly<any> | undefined, path: string, delimiter?: string): any;
+/** Returns a value by the `path`. Works with array indexes, like a.b[0]. */
+export declare function getInPath(obj: unknown, path: string): any;
 export declare function isDateObject(value: unknown): value is Date;
+/** Sets a value by path . Does not support array indexes. */
 export declare function setInPath(obj: object, path: string, value: unknown, delimiter?: string): void;
 export declare function deleteInPath(obj: object, path: string, delimiter?: string): void;
 export declare function replaceKeyInMap<K, T>(map: Map<K, T | undefined>, a: K, b: K): void;
@@ -8,3 +10,7 @@ export declare function isNil(obj: unknown): obj is null | undefined;
 export declare function isEqual(a: unknown, b: unknown): boolean;
 export declare function isEmpty(a: unknown): boolean;
 export declare function omit<T extends object, K extends (string | number | symbol)[]>(object: T | null | undefined, ...paths: K): Pick<T, Exclude<keyof T, K[number]>>;
+/** Creates a deep copy of the object. Copies all Date, Map, Set fields. */
+export declare function cloneDeep<T>(value: T): T;
+/** Compares 2 values. 'null' and 'undefined' values are considered equal and are less than any other values. */
+export declare function compareValues(a: any, b: any): number;

package/dist/internal-common/src/utils/squid-private-options.d.ts

@@ -1,12 +1,5 @@
 export declare function setSquidPrivateOption<T = unknown>(optionName: string, value: T): void;
 export declare function getSquidPrivateOption<T = unknown>(optionName: string): T | undefined;
-/*** Set of constants for private options. */
-/**
- * When set to 'true' (boolean), the RPC manager in Squid uses new 'fetch' based
- * HTTP client instead of axios library.
- * The option will be removed after the migration is tested and all issues are fixed.
- */
-export declare const SQUID_PRIVATE_OPTION_USE_FETCH_IN_RPC_MANAGER = "useFetchInRpcManager";
 /**
  * When set to 'true' (boolean), the Graphql client in Squid uses new 'fetch' based
  * HTTP client instead of cross-fetch library.

package/dist/typescript-client/src/client-id.service.d.ts

@@ -19,7 +19,7 @@ export declare class ClientIdService {
     observeClientTooOld(): Observable<void>;
     /**  there was a long-term disconnection of the socket */
     notifyClientTooOld(): void;
-    notifyClientReadyToBeRegenerated(): void;
+    notifyClientNotTooOld(): void;
     observeClientReadyToBeRegenerated(): Observable<void>;
     getClientId(): ClientId;
     isClientTooOld(): boolean;

package/dist/typescript-client/src/document-store.d.ts

@@ -1,12 +1,11 @@
-import { FieldType, Query, SquidDocId, SquidDocument } from './public-types';
+import { Query, SquidDocId, SquidDocument } from './public-types';
 export declare class DocumentStore {
     private readonly squidDocIdToDoc;
     saveDocument(squidDocId: SquidDocId, properties: SquidDocument | undefined): SquidDocument | undefined;
     hasData(squidDocId: SquidDocId): boolean;
     getDocument(squidDocId: SquidDocId): SquidDocument;
     getDocumentOrUndefined(squidDocId: SquidDocId): SquidDocument | undefined;
-    compareValues(a: FieldType | undefined, b: FieldType | undefined): number;
-    compareSquidDocs(a: SquidDocument, b: SquidDocument, sortFieldNames: string[], sortOrders: ('asc' | 'desc')[]): number;
+    private compareSquidDocs;
     group(sortedDocs: SquidDocument[], sortFieldNames: string[]): SquidDocument[][];
     sortAndLimitDocs(docIdSet: Set<SquidDocId>, query: Query): Array<SquidDocument>;
     private removeInternalProperties;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squidcloud/client",
-  "version": "1.0.186",
+  "version": "1.0.188",
   "description": "A typescript implementation of the Squid client",
   "main": "dist/cjs/index.js",
   "types": "dist/typescript-client/src/index.d.ts",
@@ -39,7 +39,6 @@
     "@supercharge/promise-pool": "^2.3.2",
     "ajv": "^8.11.2",
     "ajv-formats": "^2.1.1",
-    "axios": "^1.6.2",
     "bufferutil": "^4.0.7",
     "cross-fetch": "^3.1.5",
     "date-fns": "^2.30.0",
@@ -48,6 +47,7 @@
     "json-schema-typed": "^8.0.1",
     "lodash": "^4.17.21",
     "otrie": "1.1.2",
+    "rfdc": "^1.3.1",
     "utf-8-validate": "^6.0.3",
     "ws": "^8.13.0"
   },