akeyless-client-commons 1.1.129 → 1.1.130

package/dist/components/index.js

@@ -791,17 +791,73 @@ function timestamp_to_string(firebaseTimestamp, options) {
             return import_moment_timezone.default.utc(date).format(format);
     }
 }
-// src/helpers/firebase.ts
+// src/helpers/global.ts
+var import_akeyless_types_commons = require("akeyless-types-commons");
+var import_axios = __toESM(require("axios"));
+var import_lodash = require("lodash");
 var import_meta = {};
+var renderOnce = function() {
+    return true;
+};
+var propsAreEqual = function(prevProps, nextProps) {
+    return (0, import_lodash.isEqual)(prevProps, nextProps);
+};
+var getLocationUrl = function(lng, lat) {
+    return "https://www.google.com/maps?q=".concat(lat, ",").concat(lng);
+};
+var isNodeEnv = typeof process !== "undefined" && process.env;
+var _ref = {
+    mode: isNodeEnv ? process.env.NEXT_PUBLIC_MODE : import_meta.env.VITE_MODE,
+    isLocal: (isNodeEnv ? process.env.NEXT_PUBLIC_IS_LOCAL : import_meta.env.VITE_is_local) === "true"
+}, mode = _ref.mode, isLocal = _ref.isLocal;
+var getFixedNumber = function() {
+    var number = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0, fix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 4;
+    var sum_value = number % 1 === 0 ? number : number.toFixed(fix).replace(/\.?0+$/, "");
+    return String(sum_value);
+};
+var checkConditions = function(document2, conditions) {
+    if (!conditions || conditions.length === 0) return true;
+    return conditions.every(function(condition) {
+        var fieldValue = document2[condition.field_name];
+        switch(condition.operator){
+            case "==":
+                return fieldValue === condition.value;
+            case "!=":
+                return fieldValue !== condition.value;
+            case "<":
+                return fieldValue < condition.value;
+            case "<=":
+                return fieldValue <= condition.value;
+            case ">":
+                return fieldValue > condition.value;
+            case ">=":
+                return fieldValue >= condition.value;
+            case "in":
+                return Array.isArray(condition.value) && condition.value.includes(fieldValue);
+            case "not-in":
+                return Array.isArray(condition.value) && !condition.value.includes(fieldValue);
+            case "array-contains":
+                return Array.isArray(fieldValue) && fieldValue.includes(condition.value);
+            case "array-contains-any":
+                return Array.isArray(fieldValue) && Array.isArray(condition.value) && condition.value.some(function(v) {
+                    return fieldValue.includes(v);
+                });
+            default:
+                return false;
+        }
+    });
+};
+// src/helpers/firebase.ts
+var import_meta2 = {};
 var initApp = function() {
     var isNodeEnv2 = typeof process !== "undefined" && process.env;
     var firebaseConfig = {
-        apiKey: isNodeEnv2 ? process.env.NEXT_PUBLIC_API_KEY : import_meta.env.VITE_API_KEY,
-        authDomain: isNodeEnv2 ? process.env.NEXT_PUBLIC_AUTH_DOMAIN : import_meta.env.VITE_AUTH_DOMAIN,
-        projectId: isNodeEnv2 ? process.env.NEXT_PUBLIC_PROJECT_ID : import_meta.env.VITE_PROJECT_ID,
-        storageBucket: isNodeEnv2 ? process.env.NEXT_PUBLIC_STORAGE_BUCKET : import_meta.env.VITE_STORAGE_BUCKET,
-        messagingSenderId: isNodeEnv2 ? process.env.NEXT_PUBLIC_MESSAGING_SENDER_ID : import_meta.env.VITE_MESSAGING_SENDER_ID,
-        appId: isNodeEnv2 ? process.env.NEXT_PUBLIC_APP_ID : import_meta.env.VITE_APP_ID
+        apiKey: isNodeEnv2 ? process.env.NEXT_PUBLIC_API_KEY : import_meta2.env.VITE_API_KEY,
+        authDomain: isNodeEnv2 ? process.env.NEXT_PUBLIC_AUTH_DOMAIN : import_meta2.env.VITE_AUTH_DOMAIN,
+        projectId: isNodeEnv2 ? process.env.NEXT_PUBLIC_PROJECT_ID : import_meta2.env.VITE_PROJECT_ID,
+        storageBucket: isNodeEnv2 ? process.env.NEXT_PUBLIC_STORAGE_BUCKET : import_meta2.env.VITE_STORAGE_BUCKET,
+        messagingSenderId: isNodeEnv2 ? process.env.NEXT_PUBLIC_MESSAGING_SENDER_ID : import_meta2.env.VITE_MESSAGING_SENDER_ID,
+        appId: isNodeEnv2 ? process.env.NEXT_PUBLIC_APP_ID : import_meta2.env.VITE_APP_ID
     };
     try {
         var app2 = (0, import_app.initializeApp)(firebaseConfig);
@@ -810,7 +866,7 @@ var initApp = function() {
         var db2 = (0, import_firestore2.getFirestore)(app2);
         var storage2 = (0, import_storage.getStorage)(app2);
         var googleLoginProvider2 = new import_auth.GoogleAuthProvider();
-        var recaptchaSiteKey = isNodeEnv2 ? process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY : import_meta.env.VITE_RECAPTCHA_SITE_KEY;
+        var recaptchaSiteKey = isNodeEnv2 ? process.env.NEXT_PUBLIC_RECAPTCHA_SITE_KEY : import_meta2.env.VITE_RECAPTCHA_SITE_KEY;
         var result = {
             db: db2,
             auth: auth2,
@@ -1170,30 +1226,6 @@ var validateUserStatusAndPermissions = function(user, app2) {
     }
     return userPermissions;
 };
-// src/helpers/global.ts
-var import_akeyless_types_commons = require("akeyless-types-commons");
-var import_axios = __toESM(require("axios"));
-var import_lodash = require("lodash");
-var import_meta2 = {};
-var renderOnce = function() {
-    return true;
-};
-var propsAreEqual = function(prevProps, nextProps) {
-    return (0, import_lodash.isEqual)(prevProps, nextProps);
-};
-var getLocationUrl = function(lng, lat) {
-    return "https://www.google.com/maps?q=".concat(lat, ",").concat(lng);
-};
-var isNodeEnv = typeof process !== "undefined" && process.env;
-var _ref = {
-    mode: isNodeEnv ? process.env.NEXT_PUBLIC_MODE : import_meta2.env.VITE_MODE,
-    isLocal: (isNodeEnv ? process.env.NEXT_PUBLIC_IS_LOCAL : import_meta2.env.VITE_is_local) === "true"
-}, mode = _ref.mode, isLocal = _ref.isLocal;
-var getFixedNumber = function() {
-    var number = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0, fix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 4;
-    var sum_value = number % 1 === 0 ? number : number.toFixed(fix).replace(/\.?0+$/, "");
-    return String(sum_value);
-};
 // src/helpers/forms.ts
 var import_xregexp = __toESM(require("xregexp"));
 var textRegex = (0, import_xregexp.default)(String.raw(_templateObject()), "gu");
@@ -1340,6 +1372,9 @@ var SocketService = /*#__PURE__*/ function() {
         this.disconnectCallbacks = [];
         this.authToken = null;
         this.isDisconnected = true;
+        /// the data-socket keeps one subscription per collection per socket, so a second condition set
+        /// for a collection never reaches it and would silently receive the first one's documents
+        this.activeConditions = /* @__PURE__ */ new Map();
         this.handleDisconnect = function(source, reason) {
             var _this_socket;
             if (_this.isDisconnected) {
@@ -1507,6 +1542,39 @@ var SocketService = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "registerConditions",
+            value: function registerConditions(collectionName) {
+                var conditions = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
+                var signature = JSON.stringify(conditions);
+                var active = this.activeConditions.get(collectionName);
+                if (!active) {
+                    this.activeConditions.set(collectionName, {
+                        signature: signature,
+                        conditions: conditions,
+                        count: 1
+                    });
+                    return;
+                }
+                active.count++;
+                if (active.signature !== signature) {
+                    console.error('[socket] "'.concat(collectionName, '" is already subscribed with different conditions, and a collection supports one condition set at a time. The active set stays in effect, so this subscription receives its documents instead of its own. active: ').concat(active.signature, " requested: ").concat(signature));
+                }
+            }
+        },
+        {
+            key: "releaseConditions",
+            value: function releaseConditions(collectionName) {
+                var active = this.activeConditions.get(collectionName);
+                if (!active) {
+                    return;
+                }
+                active.count--;
+                if (active.count <= 0) {
+                    this.activeConditions.delete(collectionName);
+                }
+            }
+        },
         {
             key: "disconnectSocket",
             value: function disconnectSocket() {
@@ -1518,6 +1586,8 @@ var SocketService = /*#__PURE__*/ function() {
         },
         {
             /// subscribe to collections
+            /// conditions are derived from OnSnapshotConfig.conditions, never passed in, so a caller cannot
+            /// set them in a second place and have them silently overwritten
             key: "subscribeToCollections",
             value: function subscribeToCollections(config, options) {
                 var _this = this;
@@ -1530,26 +1600,77 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
+                    var collectionName = configuration.collectionName, conditions = configuration.conditions;
+                    var parsers = [
+                        configuration
+                    ].concat(_to_consumable_array(configuration.extraParsers || []));
+                    var matchedIds = /* @__PURE__ */ new Set();
                     var attach = function(eventName, handler) {
-                        if (!handler) return;
-                        _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({
                             eventName: eventName,
                             handler: handler
                         });
                     };
-                    attach("initial:".concat(collectionName), onFirstTime);
-                    attach("add:".concat(collectionName), onAdd);
-                    attach("update:".concat(collectionName), onModify);
-                    attach("delete:".concat(collectionName), onRemove);
-                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
-                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
-                        attach("initial:".concat(collectionName), extraOnFirstTime);
-                        attach("add:".concat(collectionName), extraOnAdd);
-                        attach("update:".concat(collectionName), extraOnModify);
-                        attach("delete:".concat(collectionName), extraOnRemove);
+                    var toDocs = function(payload) {
+                        return Array.isArray(payload) ? payload : payload ? [
+                            payload
+                        ] : [];
+                    };
+                    var run = function(op, docs) {
+                        return parsers.forEach(function(parser) {
+                            var _parser_op;
+                            return (_parser_op = parser[op]) === null || _parser_op === void 0 ? void 0 : _parser_op.call(parser, docs, configuration);
+                        });
+                    };
+                    var runIfAny = function(op, docs) {
+                        if (docs.length) {
+                            run(op, docs);
+                        }
+                    };
+                    attach("initial:".concat(collectionName), function(payload) {
+                        var docs = toDocs(payload).filter(function(doc2) {
+                            return checkConditions(doc2, conditions);
+                        });
+                        matchedIds.clear();
+                        docs.forEach(function(doc2) {
+                            return matchedIds.add(doc2.id);
+                        });
+                        run("onFirstTime", docs);
+                    });
+                    var handleUpsert = function(payload, defaultOp) {
+                        var added = [];
+                        var modified = [];
+                        var removed = [];
+                        toDocs(payload).forEach(function(doc2) {
+                            if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) {
+                                (defaultOp === "onAdd" ? added : modified).push(doc2);
+                                return;
+                            }
+                            var wasMatching = matchedIds.has(doc2.id);
+                            if (checkConditions(doc2, conditions)) {
+                                matchedIds.add(doc2.id);
+                                (wasMatching ? modified : added).push(doc2);
+                            } else if (wasMatching) {
+                                matchedIds.delete(doc2.id);
+                                removed.push(doc2);
+                            }
+                        });
+                        runIfAny("onAdd", added);
+                        runIfAny("onModify", modified);
+                        runIfAny("onRemove", removed);
+                    };
+                    attach("add:".concat(collectionName), function(payload) {
+                        return handleUpsert(payload, "onAdd");
+                    });
+                    attach("update:".concat(collectionName), function(payload) {
+                        return handleUpsert(payload, "onModify");
+                    });
+                    attach("delete:".concat(collectionName), function(payload) {
+                        var docs = toDocs(payload).filter(function(doc2) {
+                            return !(conditions === null || conditions === void 0 ? void 0 : conditions.length) || matchedIds.delete(doc2.id);
+                        });
+                        runIfAny("onRemove", docs);
                     });
                 });
                 var acknowledge = function(callback) {
@@ -1559,12 +1680,28 @@ var SocketService = /*#__PURE__*/ function() {
                         console.error("Failed to subscribe to ".concat(config.join(", "), ": ").concat(callback.message));
                     }
                 };
-                if (options) {
-                    s.emit("subscribe_options", options);
+                config.forEach(function(c) {
+                    return _this.registerConditions(c.collectionName, c.conditions);
+                });
+                var conditionsByCollection = config.reduce(function(acc, c) {
+                    var active = _this.activeConditions.get(c.collectionName);
+                    if (active === null || active === void 0 ? void 0 : active.conditions.length) {
+                        acc[c.collectionName] = active.conditions;
+                    }
+                    return acc;
+                }, {});
+                var subscribeOptions = Object.keys(conditionsByCollection).length ? _object_spread_props(_object_spread({}, options), {
+                    conditions: conditionsByCollection
+                }) : options;
+                if (subscribeOptions) {
+                    s.emit("subscribe_options", subscribeOptions);
                 }
                 s.emit("subscribe_collections", collectionsNames, acknowledge);
                 return function() {
                     console.log("Cleaning up subscriptions for: ".concat(collectionsNames.join(", ")));
+                    collectionsNames.forEach(function(name) {
+                        return _this.releaseConditions(name);
+                    });
                     s.emit("unsubscribe_collections", collectionsNames);
                     eventHandlers.forEach(function(eh) {
                         s.off(eh.eventName, eh.handler);

package/dist/components/index.mjs

@@ -524,6 +524,61 @@ function timestamp_to_string(firebaseTimestamp, options) {
             return moment.utc(date).format(format);
     }
 }
+// src/helpers/global.ts
+import { CountryOptions, LanguageOptions } from "akeyless-types-commons";
+import axios from "axios";
+import { isEqual } from "lodash";
+var renderOnce = function() {
+    return true;
+};
+var propsAreEqual = function(prevProps, nextProps) {
+    return isEqual(prevProps, nextProps);
+};
+var getLocationUrl = function(lng, lat) {
+    return "https://www.google.com/maps?q=".concat(lat, ",").concat(lng);
+};
+var isNodeEnv = typeof process !== "undefined" && process.env;
+var _ref = {
+    mode: isNodeEnv ? process.env.NEXT_PUBLIC_MODE : import.meta.env.VITE_MODE,
+    isLocal: (isNodeEnv ? process.env.NEXT_PUBLIC_IS_LOCAL : import.meta.env.VITE_is_local) === "true"
+}, mode = _ref.mode, isLocal = _ref.isLocal;
+var getFixedNumber = function() {
+    var number = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0, fix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 4;
+    var sum_value = number % 1 === 0 ? number : number.toFixed(fix).replace(/\.?0+$/, "");
+    return String(sum_value);
+};
+var checkConditions = function(document2, conditions) {
+    if (!conditions || conditions.length === 0) return true;
+    return conditions.every(function(condition) {
+        var fieldValue = document2[condition.field_name];
+        switch(condition.operator){
+            case "==":
+                return fieldValue === condition.value;
+            case "!=":
+                return fieldValue !== condition.value;
+            case "<":
+                return fieldValue < condition.value;
+            case "<=":
+                return fieldValue <= condition.value;
+            case ">":
+                return fieldValue > condition.value;
+            case ">=":
+                return fieldValue >= condition.value;
+            case "in":
+                return Array.isArray(condition.value) && condition.value.includes(fieldValue);
+            case "not-in":
+                return Array.isArray(condition.value) && !condition.value.includes(fieldValue);
+            case "array-contains":
+                return Array.isArray(fieldValue) && fieldValue.includes(condition.value);
+            case "array-contains-any":
+                return Array.isArray(fieldValue) && Array.isArray(condition.value) && condition.value.some(function(v) {
+                    return fieldValue.includes(v);
+                });
+            default:
+                return false;
+        }
+    });
+};
 // src/helpers/firebase.ts
 var initApp = function() {
     var isNodeEnv2 = typeof process !== "undefined" && process.env;
@@ -902,29 +957,6 @@ var validateUserStatusAndPermissions = function(user, app2) {
     }
     return userPermissions;
 };
-// src/helpers/global.ts
-import { CountryOptions, LanguageOptions } from "akeyless-types-commons";
-import axios from "axios";
-import { isEqual } from "lodash";
-var renderOnce = function() {
-    return true;
-};
-var propsAreEqual = function(prevProps, nextProps) {
-    return isEqual(prevProps, nextProps);
-};
-var getLocationUrl = function(lng, lat) {
-    return "https://www.google.com/maps?q=".concat(lat, ",").concat(lng);
-};
-var isNodeEnv = typeof process !== "undefined" && process.env;
-var _ref = {
-    mode: isNodeEnv ? process.env.NEXT_PUBLIC_MODE : import.meta.env.VITE_MODE,
-    isLocal: (isNodeEnv ? process.env.NEXT_PUBLIC_IS_LOCAL : import.meta.env.VITE_is_local) === "true"
-}, mode = _ref.mode, isLocal = _ref.isLocal;
-var getFixedNumber = function() {
-    var number = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0, fix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 4;
-    var sum_value = number % 1 === 0 ? number : number.toFixed(fix).replace(/\.?0+$/, "");
-    return String(sum_value);
-};
 // src/helpers/forms.ts
 import XRegExp from "xregexp";
 var textRegex = XRegExp(String.raw(_templateObject()), "gu");
@@ -1071,6 +1103,9 @@ var SocketService = /*#__PURE__*/ function() {
         this.disconnectCallbacks = [];
         this.authToken = null;
         this.isDisconnected = true;
+        /// the data-socket keeps one subscription per collection per socket, so a second condition set
+        /// for a collection never reaches it and would silently receive the first one's documents
+        this.activeConditions = /* @__PURE__ */ new Map();
         this.handleDisconnect = function(source, reason) {
             var _this_socket;
             if (_this.isDisconnected) {
@@ -1238,6 +1273,39 @@ var SocketService = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "registerConditions",
+            value: function registerConditions(collectionName) {
+                var conditions = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [];
+                var signature = JSON.stringify(conditions);
+                var active = this.activeConditions.get(collectionName);
+                if (!active) {
+                    this.activeConditions.set(collectionName, {
+                        signature: signature,
+                        conditions: conditions,
+                        count: 1
+                    });
+                    return;
+                }
+                active.count++;
+                if (active.signature !== signature) {
+                    console.error('[socket] "'.concat(collectionName, '" is already subscribed with different conditions, and a collection supports one condition set at a time. The active set stays in effect, so this subscription receives its documents instead of its own. active: ').concat(active.signature, " requested: ").concat(signature));
+                }
+            }
+        },
+        {
+            key: "releaseConditions",
+            value: function releaseConditions(collectionName) {
+                var active = this.activeConditions.get(collectionName);
+                if (!active) {
+                    return;
+                }
+                active.count--;
+                if (active.count <= 0) {
+                    this.activeConditions.delete(collectionName);
+                }
+            }
+        },
         {
             key: "disconnectSocket",
             value: function disconnectSocket() {
@@ -1249,6 +1317,8 @@ var SocketService = /*#__PURE__*/ function() {
         },
         {
             /// subscribe to collections
+            /// conditions are derived from OnSnapshotConfig.conditions, never passed in, so a caller cannot
+            /// set them in a second place and have them silently overwritten
             key: "subscribeToCollections",
             value: function subscribeToCollections(config, options) {
                 var _this = this;
@@ -1261,26 +1331,77 @@ var SocketService = /*#__PURE__*/ function() {
                 });
                 var eventHandlers = [];
                 config.forEach(function(configuration) {
-                    var collectionName = configuration.collectionName, onAdd = configuration.onAdd, onFirstTime = configuration.onFirstTime, onModify = configuration.onModify, onRemove = configuration.onRemove, extraParsers = configuration.extraParsers;
+                    var collectionName = configuration.collectionName, conditions = configuration.conditions;
+                    var parsers = [
+                        configuration
+                    ].concat(_to_consumable_array(configuration.extraParsers || []));
+                    var matchedIds = /* @__PURE__ */ new Set();
                     var attach = function(eventName, handler) {
-                        if (!handler) return;
-                        _this.socket.off(eventName, handler);
                         _this.socket.on(eventName, handler);
                         eventHandlers.push({
                             eventName: eventName,
                             handler: handler
                         });
                     };
-                    attach("initial:".concat(collectionName), onFirstTime);
-                    attach("add:".concat(collectionName), onAdd);
-                    attach("update:".concat(collectionName), onModify);
-                    attach("delete:".concat(collectionName), onRemove);
-                    extraParsers === null || extraParsers === void 0 ? void 0 : extraParsers.forEach(function(parsers) {
-                        var extraOnAdd = parsers.onAdd, extraOnFirstTime = parsers.onFirstTime, extraOnModify = parsers.onModify, extraOnRemove = parsers.onRemove;
-                        attach("initial:".concat(collectionName), extraOnFirstTime);
-                        attach("add:".concat(collectionName), extraOnAdd);
-                        attach("update:".concat(collectionName), extraOnModify);
-                        attach("delete:".concat(collectionName), extraOnRemove);
+                    var toDocs = function(payload) {
+                        return Array.isArray(payload) ? payload : payload ? [
+                            payload
+                        ] : [];
+                    };
+                    var run = function(op, docs) {
+                        return parsers.forEach(function(parser) {
+                            var _parser_op;
+                            return (_parser_op = parser[op]) === null || _parser_op === void 0 ? void 0 : _parser_op.call(parser, docs, configuration);
+                        });
+                    };
+                    var runIfAny = function(op, docs) {
+                        if (docs.length) {
+                            run(op, docs);
+                        }
+                    };
+                    attach("initial:".concat(collectionName), function(payload) {
+                        var docs = toDocs(payload).filter(function(doc2) {
+                            return checkConditions(doc2, conditions);
+                        });
+                        matchedIds.clear();
+                        docs.forEach(function(doc2) {
+                            return matchedIds.add(doc2.id);
+                        });
+                        run("onFirstTime", docs);
+                    });
+                    var handleUpsert = function(payload, defaultOp) {
+                        var added = [];
+                        var modified = [];
+                        var removed = [];
+                        toDocs(payload).forEach(function(doc2) {
+                            if (!(conditions === null || conditions === void 0 ? void 0 : conditions.length)) {
+                                (defaultOp === "onAdd" ? added : modified).push(doc2);
+                                return;
+                            }
+                            var wasMatching = matchedIds.has(doc2.id);
+                            if (checkConditions(doc2, conditions)) {
+                                matchedIds.add(doc2.id);
+                                (wasMatching ? modified : added).push(doc2);
+                            } else if (wasMatching) {
+                                matchedIds.delete(doc2.id);
+                                removed.push(doc2);
+                            }
+                        });
+                        runIfAny("onAdd", added);
+                        runIfAny("onModify", modified);
+                        runIfAny("onRemove", removed);
+                    };
+                    attach("add:".concat(collectionName), function(payload) {
+                        return handleUpsert(payload, "onAdd");
+                    });
+                    attach("update:".concat(collectionName), function(payload) {
+                        return handleUpsert(payload, "onModify");
+                    });
+                    attach("delete:".concat(collectionName), function(payload) {
+                        var docs = toDocs(payload).filter(function(doc2) {
+                            return !(conditions === null || conditions === void 0 ? void 0 : conditions.length) || matchedIds.delete(doc2.id);
+                        });
+                        runIfAny("onRemove", docs);
                     });
                 });
                 var acknowledge = function(callback) {
@@ -1290,12 +1411,28 @@ var SocketService = /*#__PURE__*/ function() {
                         console.error("Failed to subscribe to ".concat(config.join(", "), ": ").concat(callback.message));
                     }
                 };
-                if (options) {
-                    s.emit("subscribe_options", options);
+                config.forEach(function(c) {
+                    return _this.registerConditions(c.collectionName, c.conditions);
+                });
+                var conditionsByCollection = config.reduce(function(acc, c) {
+                    var active = _this.activeConditions.get(c.collectionName);
+                    if (active === null || active === void 0 ? void 0 : active.conditions.length) {
+                        acc[c.collectionName] = active.conditions;
+                    }
+                    return acc;
+                }, {});
+                var subscribeOptions = Object.keys(conditionsByCollection).length ? _object_spread_props(_object_spread({}, options), {
+                    conditions: conditionsByCollection
+                }) : options;
+                if (subscribeOptions) {
+                    s.emit("subscribe_options", subscribeOptions);
                 }
                 s.emit("subscribe_collections", collectionsNames, acknowledge);
                 return function() {
                     console.log("Cleaning up subscriptions for: ".concat(collectionsNames.join(", ")));
+                    collectionsNames.forEach(function(name) {
+                        return _this.releaseConditions(name);
+                    });
                     s.emit("unsubscribe_collections", collectionsNames);
                     eventHandlers.forEach(function(eh) {
                         s.off(eh.eventName, eh.handler);

package/dist/helpers/index.d.mts

@@ -188,6 +188,7 @@ declare const isLocal: boolean;
 declare const getFixedNumber: (number?: number, fix?: number) => string;
 declare const getAddressByGeo: ({ lat, lng }: Geo, currentLanguage: LanguageOptions) => Promise<any>;
 declare const validateAndCast: <T extends unknown>(variable: any, condition: Boolean) => variable is T;
+declare const checkConditions: (document: TObject<any>, conditions?: WhereCondition[]) => boolean;
 
 declare const textRegex: RegExp;
 declare const numbersRegex: RegExp;
@@ -333,6 +334,7 @@ declare class SocketService {
     private disconnectCallbacks;
     private authToken;
     private isDisconnected;
+    private activeConditions;
     private handleDisconnect;
     private initSocket;
     private constructor();
@@ -345,8 +347,10 @@ declare class SocketService {
     offDisconnect(callback: () => void): void;
     isConnected(): boolean;
     setAuthToken(token: string): void;
+    private registerConditions;
+    private releaseConditions;
     disconnectSocket(): void;
-    subscribeToCollections(config: OnSnapshotConfig[], options?: SubscribeCollectionsOptions): () => void;
+    subscribeToCollections(config: OnSnapshotConfig[], options?: Omit<SubscribeCollectionsOptions, "conditions">): () => void;
     setData<UpdateType extends RedisUpdateType, DataType = any>(payload: RedisUpdatePayload<UpdateType, DataType>): Promise<SocketCallbackResponse>;
     getCollectionData<T>(payload: Omit<GetDataPayload<T>, "key">): void;
     getDocumentData<T>(payload: GetDataPayload<T>): void;
@@ -361,4 +365,4 @@ declare const multiply: (a: number, b: number) => number;
 declare const add: (a: number, b: number) => number;
 declare const subtract: (a: number, b: number) => number;
 
-export { type EmailAttachment, type EmailData, type ValidationType, add, addAuditRecord, addLoginAudit, addNxProblem, add_document, addressRegex, akeylessOnlineDomain, app, appCheck, auth, baseDomain, biDomain, calculateBearing, callCenterEventsDomain, callCenterGeoDomain, carsRegex, chargeDomain, chartsRegex, checkUserPermissions, cleanNxSites, cn, collections, colorRegex, createAttachmentFromBlob, createAttachmentFromUrl, createSelectors, dataSocketDomain, dataSyncDomain, db, delete_document, devicesDomain, displayFormatPhoneNumber, durationToSeconds, emailRegex, endUsersDomain, extractAlertsData, extractBoardsData, extractCanbusData, extractCarsData, extractClientData, extractLocationData, extractSiteData, fire_base_TIME_TEMP, formatCarNumber, getAddressByGeo, getFileUrlFromStorage, getFixedNumber, getFormCheckboxValue, getFormElementValue, getLocationUrl, getUserByEmail, getUserByIdentifier, getUserByPhone, getUserCountryByIp, get_all_documents, get_document_by_id, get_international_phone_number, googleLoginProvider, handleChange, handleInvalid, handlePaste, initializeUserPermissions, international_israel_phone_format, isFixedOrServiceNumber, isInternational, isInternationalIsraelPhone, isLocal, isNodeEnv, isSimProviderCelcom, isSimProviderMonogoto, isSimProviderPartner, isSimProviderPelephone, is_iccid, local_israel_phone_format, longShortPhoneNumbers, mode, multiStringFormat, multiply, notificationsDomain, numbersOnlyRegex, numbersRegex, nxApiCall, parseMultiSelectInput, parsePermissions, parseSnapshotAsArray, parseSnapshotAsObject, priceRegex, propsAreEqual, query_document, query_document_by_conditions, query_documents, query_documents_by_conditions, renderOnce, secondsToDuration, sendEmail, setFormElementValue, setState, set_document, simpleExtractData, snapshot, snapshotDocument, socketServiceInstance, sort_by_timestamp, storage, subtract, textNumbersRegex, textRegex, timestamp_to_millis, timestamp_to_string, uploadFileToStorage, useLoginWithGoogle, useStoreValues, useValidation, userNameFormat, validateAndCast, validateUserStatusAndPermissions };
+export { type EmailAttachment, type EmailData, type ValidationType, add, addAuditRecord, addLoginAudit, addNxProblem, add_document, addressRegex, akeylessOnlineDomain, app, appCheck, auth, baseDomain, biDomain, calculateBearing, callCenterEventsDomain, callCenterGeoDomain, carsRegex, chargeDomain, chartsRegex, checkConditions, checkUserPermissions, cleanNxSites, cn, collections, colorRegex, createAttachmentFromBlob, createAttachmentFromUrl, createSelectors, dataSocketDomain, dataSyncDomain, db, delete_document, devicesDomain, displayFormatPhoneNumber, durationToSeconds, emailRegex, endUsersDomain, extractAlertsData, extractBoardsData, extractCanbusData, extractCarsData, extractClientData, extractLocationData, extractSiteData, fire_base_TIME_TEMP, formatCarNumber, getAddressByGeo, getFileUrlFromStorage, getFixedNumber, getFormCheckboxValue, getFormElementValue, getLocationUrl, getUserByEmail, getUserByIdentifier, getUserByPhone, getUserCountryByIp, get_all_documents, get_document_by_id, get_international_phone_number, googleLoginProvider, handleChange, handleInvalid, handlePaste, initializeUserPermissions, international_israel_phone_format, isFixedOrServiceNumber, isInternational, isInternationalIsraelPhone, isLocal, isNodeEnv, isSimProviderCelcom, isSimProviderMonogoto, isSimProviderPartner, isSimProviderPelephone, is_iccid, local_israel_phone_format, longShortPhoneNumbers, mode, multiStringFormat, multiply, notificationsDomain, numbersOnlyRegex, numbersRegex, nxApiCall, parseMultiSelectInput, parsePermissions, parseSnapshotAsArray, parseSnapshotAsObject, priceRegex, propsAreEqual, query_document, query_document_by_conditions, query_documents, query_documents_by_conditions, renderOnce, secondsToDuration, sendEmail, setFormElementValue, setState, set_document, simpleExtractData, snapshot, snapshotDocument, socketServiceInstance, sort_by_timestamp, storage, subtract, textNumbersRegex, textRegex, timestamp_to_millis, timestamp_to_string, uploadFileToStorage, useLoginWithGoogle, useStoreValues, useValidation, userNameFormat, validateAndCast, validateUserStatusAndPermissions };

package/dist/helpers/index.d.ts

@@ -188,6 +188,7 @@ declare const isLocal: boolean;
 declare const getFixedNumber: (number?: number, fix?: number) => string;
 declare const getAddressByGeo: ({ lat, lng }: Geo, currentLanguage: LanguageOptions) => Promise<any>;
 declare const validateAndCast: <T extends unknown>(variable: any, condition: Boolean) => variable is T;
+declare const checkConditions: (document: TObject<any>, conditions?: WhereCondition[]) => boolean;
 
 declare const textRegex: RegExp;
 declare const numbersRegex: RegExp;
@@ -333,6 +334,7 @@ declare class SocketService {
     private disconnectCallbacks;
     private authToken;
     private isDisconnected;
+    private activeConditions;
     private handleDisconnect;
     private initSocket;
     private constructor();
@@ -345,8 +347,10 @@ declare class SocketService {
     offDisconnect(callback: () => void): void;
     isConnected(): boolean;
     setAuthToken(token: string): void;
+    private registerConditions;
+    private releaseConditions;
     disconnectSocket(): void;
-    subscribeToCollections(config: OnSnapshotConfig[], options?: SubscribeCollectionsOptions): () => void;
+    subscribeToCollections(config: OnSnapshotConfig[], options?: Omit<SubscribeCollectionsOptions, "conditions">): () => void;
     setData<UpdateType extends RedisUpdateType, DataType = any>(payload: RedisUpdatePayload<UpdateType, DataType>): Promise<SocketCallbackResponse>;
     getCollectionData<T>(payload: Omit<GetDataPayload<T>, "key">): void;
     getDocumentData<T>(payload: GetDataPayload<T>): void;
@@ -361,4 +365,4 @@ declare const multiply: (a: number, b: number) => number;
 declare const add: (a: number, b: number) => number;
 declare const subtract: (a: number, b: number) => number;
 
-export { type EmailAttachment, type EmailData, type ValidationType, add, addAuditRecord, addLoginAudit, addNxProblem, add_document, addressRegex, akeylessOnlineDomain, app, appCheck, auth, baseDomain, biDomain, calculateBearing, callCenterEventsDomain, callCenterGeoDomain, carsRegex, chargeDomain, chartsRegex, checkUserPermissions, cleanNxSites, cn, collections, colorRegex, createAttachmentFromBlob, createAttachmentFromUrl, createSelectors, dataSocketDomain, dataSyncDomain, db, delete_document, devicesDomain, displayFormatPhoneNumber, durationToSeconds, emailRegex, endUsersDomain, extractAlertsData, extractBoardsData, extractCanbusData, extractCarsData, extractClientData, extractLocationData, extractSiteData, fire_base_TIME_TEMP, formatCarNumber, getAddressByGeo, getFileUrlFromStorage, getFixedNumber, getFormCheckboxValue, getFormElementValue, getLocationUrl, getUserByEmail, getUserByIdentifier, getUserByPhone, getUserCountryByIp, get_all_documents, get_document_by_id, get_international_phone_number, googleLoginProvider, handleChange, handleInvalid, handlePaste, initializeUserPermissions, international_israel_phone_format, isFixedOrServiceNumber, isInternational, isInternationalIsraelPhone, isLocal, isNodeEnv, isSimProviderCelcom, isSimProviderMonogoto, isSimProviderPartner, isSimProviderPelephone, is_iccid, local_israel_phone_format, longShortPhoneNumbers, mode, multiStringFormat, multiply, notificationsDomain, numbersOnlyRegex, numbersRegex, nxApiCall, parseMultiSelectInput, parsePermissions, parseSnapshotAsArray, parseSnapshotAsObject, priceRegex, propsAreEqual, query_document, query_document_by_conditions, query_documents, query_documents_by_conditions, renderOnce, secondsToDuration, sendEmail, setFormElementValue, setState, set_document, simpleExtractData, snapshot, snapshotDocument, socketServiceInstance, sort_by_timestamp, storage, subtract, textNumbersRegex, textRegex, timestamp_to_millis, timestamp_to_string, uploadFileToStorage, useLoginWithGoogle, useStoreValues, useValidation, userNameFormat, validateAndCast, validateUserStatusAndPermissions };
+export { type EmailAttachment, type EmailData, type ValidationType, add, addAuditRecord, addLoginAudit, addNxProblem, add_document, addressRegex, akeylessOnlineDomain, app, appCheck, auth, baseDomain, biDomain, calculateBearing, callCenterEventsDomain, callCenterGeoDomain, carsRegex, chargeDomain, chartsRegex, checkConditions, checkUserPermissions, cleanNxSites, cn, collections, colorRegex, createAttachmentFromBlob, createAttachmentFromUrl, createSelectors, dataSocketDomain, dataSyncDomain, db, delete_document, devicesDomain, displayFormatPhoneNumber, durationToSeconds, emailRegex, endUsersDomain, extractAlertsData, extractBoardsData, extractCanbusData, extractCarsData, extractClientData, extractLocationData, extractSiteData, fire_base_TIME_TEMP, formatCarNumber, getAddressByGeo, getFileUrlFromStorage, getFixedNumber, getFormCheckboxValue, getFormElementValue, getLocationUrl, getUserByEmail, getUserByIdentifier, getUserByPhone, getUserCountryByIp, get_all_documents, get_document_by_id, get_international_phone_number, googleLoginProvider, handleChange, handleInvalid, handlePaste, initializeUserPermissions, international_israel_phone_format, isFixedOrServiceNumber, isInternational, isInternationalIsraelPhone, isLocal, isNodeEnv, isSimProviderCelcom, isSimProviderMonogoto, isSimProviderPartner, isSimProviderPelephone, is_iccid, local_israel_phone_format, longShortPhoneNumbers, mode, multiStringFormat, multiply, notificationsDomain, numbersOnlyRegex, numbersRegex, nxApiCall, parseMultiSelectInput, parsePermissions, parseSnapshotAsArray, parseSnapshotAsObject, priceRegex, propsAreEqual, query_document, query_document_by_conditions, query_documents, query_documents_by_conditions, renderOnce, secondsToDuration, sendEmail, setFormElementValue, setState, set_document, simpleExtractData, snapshot, snapshotDocument, socketServiceInstance, sort_by_timestamp, storage, subtract, textNumbersRegex, textRegex, timestamp_to_millis, timestamp_to_string, uploadFileToStorage, useLoginWithGoogle, useStoreValues, useValidation, userNameFormat, validateAndCast, validateUserStatusAndPermissions };