remult 0.21.1 → 0.22.0

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -8,7 +8,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
     function FilterConsumerBridgeToSqlRequest(r, nameProvider) {
         this.r = r;
         this.nameProvider = nameProvider;
-        this.where = "";
+        this.where = '';
         this._addWhere = true;
         this.promises = [];
     }
@@ -55,7 +55,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
         });
     };
     FilterConsumerBridgeToSqlRequest.prototype.custom = function (key, customItem) {
-        throw new Error("Custom filter should be translated before it gets here");
+        throw new Error('Custom filter should be translated before it gets here');
     };
     FilterConsumerBridgeToSqlRequest.prototype.or = function (orElements) {
         var _this = this;
@@ -82,10 +82,10 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                             return [2 /*return*/]; //since if any member of or is empty, then the entire or is irrelevant
                         if (where.length > 0) {
                             if (statement.length > 0) {
-                                statement += " or ";
+                                statement += ' or ';
                             }
                             if (orElements.length > 1) {
-                                statement += "(" + where + ")";
+                                statement += '(' + where + ')';
                             }
                             else
                                 statement += where;
@@ -106,7 +106,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
                     case 7:
-                        this.addToWhere("(" + statement + ")");
+                        this.addToWhere('(' + statement + ')');
                         return [2 /*return*/];
                 }
             });
@@ -130,7 +130,14 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 if (val && val.length > 0)
-                    this.addToWhere(this.nameProvider.$dbNameOf(col) + " in (" + val.map(function (x) { return _this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x)); }).join(",") + ")");
+                    this.addToWhere(this.nameProvider.$dbNameOf(col) +
+                        ' in (' +
+                        val
+                            .map(function (x) {
+                            return _this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x));
+                        })
+                            .join(',') +
+                        ')');
                 else
                     this.addToWhere('1 = 0 /*isIn with no values*/');
                 return [2 /*return*/];
@@ -138,28 +145,32 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
         }); })());
     };
     FilterConsumerBridgeToSqlRequest.prototype.isEqualTo = function (col, val) {
-        this.add(col, val, "=");
+        this.add(col, val, '=');
     };
     FilterConsumerBridgeToSqlRequest.prototype.isDifferentFrom = function (col, val) {
-        this.add(col, val, "<>");
+        this.add(col, val, '<>');
     };
     FilterConsumerBridgeToSqlRequest.prototype.isGreaterOrEqualTo = function (col, val) {
-        this.add(col, val, ">=");
+        this.add(col, val, '>=');
     };
     FilterConsumerBridgeToSqlRequest.prototype.isGreaterThan = function (col, val) {
-        this.add(col, val, ">");
+        this.add(col, val, '>');
     };
     FilterConsumerBridgeToSqlRequest.prototype.isLessOrEqualTo = function (col, val) {
-        this.add(col, val, "<=");
+        this.add(col, val, '<=');
     };
     FilterConsumerBridgeToSqlRequest.prototype.isLessThan = function (col, val) {
-        this.add(col, val, "<");
+        this.add(col, val, '<');
     };
     FilterConsumerBridgeToSqlRequest.prototype.containsCaseInsensitive = function (col, val) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                this.addToWhere('lower (' + this.nameProvider.$dbNameOf(col) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')");
+                this.addToWhere('lower (' +
+                    this.nameProvider.$dbNameOf(col) +
+                    ") like lower ('%" +
+                    val.replace(/'/g, "''") +
+                    "%')");
                 return [2 /*return*/];
             });
         }); })());
@@ -169,7 +180,11 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var x;
             return tslib_1.__generator(this, function (_a) {
-                x = this.nameProvider.$dbNameOf(col) + ' ' + operator + ' ' + this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
+                x = this.nameProvider.$dbNameOf(col) +
+                    ' ' +
+                    operator +
+                    ' ' +
+                    this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
                 this.addToWhere(x);
                 return [2 /*return*/];
             });
@@ -197,7 +212,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         if (item.sql) {
-                            this.addToWhere("(" + item.sql + ")");
+                            this.addToWhere('(' + item.sql + ')');
                         }
                         _a.label = 2;
                     case 2: return [2 /*return*/];
@@ -229,7 +244,9 @@ var CustomSqlFilterBuilder = /** @class */ (function () {
 }());
 exports.CustomSqlFilterBuilder = CustomSqlFilterBuilder;
 function isDbReadonly(field, dbNames) {
-    return (field.dbReadOnly || field.isServerExpression || dbNames.$dbNameOf(field) != field.options.dbName);
+    return (field.dbReadOnly ||
+        field.isServerExpression ||
+        dbNames.$dbNameOf(field) != field.options.dbName);
 }
 exports.isDbReadonly = isDbReadonly;
 function dbNamesOf(repo) {
@@ -247,7 +264,7 @@ function dbNamesOf(repo) {
                         _e.toString = function () { return result.$entityName; },
                         _e.$dbNameOf = function (field) {
                             var key;
-                            if (typeof field === "string")
+                            if (typeof field === 'string')
                                 key = field;
                             else
                                 key = field.key;

package/src/filter/filter-interfaces.d.ts

@@ -1,13 +1,13 @@
-import { FieldMetadata } from "../column-interfaces";
-import { Remult } from "../context";
-import { EntityMetadata, EntityFilter } from "../remult3";
+import { FieldMetadata } from '../column-interfaces';
+import { Remult } from '../context';
+import { EntityMetadata, EntityFilter } from '../remult3';
 export declare class Filter {
     private apply?;
     constructor(apply?: (add: FilterConsumer) => void);
     __applyToConsumer(add: FilterConsumer): void;
     static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
-    static createCustom<entityType>(rawFilterTranslator: (unused: never, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
-    static createCustom<entityType, argsType>(rawFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & rawFilterInfo<entityType>;
+    static createCustom<entityType>(rawFilterTranslator: (unused: never, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & customFilterInfo<entityType>;
+    static createCustom<entityType, argsType>(rawFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & customFilterInfo<entityType>;
     static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
     toJson(): any;
     static entityFilterToJson<T>(entityDefs: EntityMetadata<T>, where: EntityFilter<T>): any;
@@ -77,9 +77,9 @@ export declare function entityFilterToJson<T>(entityDefs: EntityMetadata<T>, whe
 export declare function buildFilterFromRequestParameters(entity: EntityMetadata, filterInfo: {
     get: (key: string) => any;
 }): EntityFilter<any>;
-export interface rawFilterInfo<entityType> {
+export interface customFilterInfo<entityType> {
     rawFilterInfo: {
         key: string;
-        rawFilterTranslator: (args: any, r: Remult) => (EntityFilter<entityType> | Promise<EntityFilter<entityType>>);
+        rawFilterTranslator: (args: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>;
     };
 }

package/src/filter/filter-interfaces.js

@@ -18,7 +18,7 @@ var Filter = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(typeof filter === "function")) return [3 /*break*/, 2];
+                        if (!(typeof filter === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, filter()];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2: return [2 /*return*/, filter];
@@ -35,7 +35,7 @@ var Filter = /** @class */ (function () {
             if (x == undefined)
                 x = {};
             if (!rawFilterInfo.key)
-                throw "Usage of custom filter before a key was assigned to it";
+                throw 'Usage of custom filter before a key was assigned to it';
             return _a = {},
                 _a[exports.customUrlToken + rawFilterInfo.key] = x,
                 _a;
@@ -47,10 +47,10 @@ var Filter = /** @class */ (function () {
             if (Object.prototype.hasOwnProperty.call(whereItem, key)) {
                 var fieldToFilter_1 = whereItem[key];
                 {
-                    if (key == "$or") {
+                    if (key == '$or') {
                         result.push(new (OrFilter.bind.apply(OrFilter, tslib_1.__spread([void 0], fieldToFilter_1.map(function (x) { return Filter.fromEntityFilter(entity, x); }))))());
                     }
-                    else if (key == "$and") {
+                    else if (key == '$and') {
                         result.push(new (AndFilter.bind.apply(AndFilter, tslib_1.__spread([void 0], fieldToFilter_1.map(function (x) { return Filter.fromEntityFilter(entity, x); }))))());
                     }
                     else if (key.startsWith(exports.customUrlToken)) {
@@ -71,29 +71,29 @@ var Filter = /** @class */ (function () {
                                 if (Object.prototype.hasOwnProperty.call(fieldToFilter_1, key_1)) {
                                     var element = fieldToFilter_1[key_1];
                                     switch (key_1) {
-                                        case "$gte":
-                                        case ">=":
+                                        case '$gte':
+                                        case '>=':
                                             result.push(fh.isGreaterOrEqualTo(element));
                                             found = true;
                                             break;
-                                        case "$gt":
-                                        case ">":
+                                        case '$gt':
+                                        case '>':
                                             result.push(fh.isGreaterThan(element));
                                             found = true;
                                             break;
-                                        case "$lte":
-                                        case "<=":
+                                        case '$lte':
+                                        case '<=':
                                             result.push(fh.isLessOrEqualTo(element));
                                             found = true;
                                             break;
-                                        case "$lt":
-                                        case "<":
+                                        case '$lt':
+                                        case '<':
                                             result.push(fh.isLessThan(element));
                                             found = true;
                                             break;
-                                        case "$ne":
-                                        case "!=":
-                                        case "$nin":
+                                        case '$ne':
+                                        case '!=':
+                                        case '$nin':
                                             found = true;
                                             if (Array.isArray(element)) {
                                                 result.push(fh.isNotIn(element));
@@ -101,11 +101,11 @@ var Filter = /** @class */ (function () {
                                             else
                                                 result.push(fh.isDifferentFrom(element));
                                             break;
-                                        case "$in":
+                                        case '$in':
                                             found = true;
                                             result.push(fh.isIn(element));
                                             break;
-                                        case "$contains":
+                                        case '$contains':
                                             found = true;
                                             result.push(fh.contains(element));
                                             break;
@@ -138,7 +138,9 @@ var Filter = /** @class */ (function () {
         return Filter.fromEntityFilter(entityDefs, where).toJson();
     };
     Filter.entityFilterFromJson = function (entityDefs, packed) {
-        return buildFilterFromRequestParameters(entityDefs, { get: function (key) { return packed[key]; } });
+        return buildFilterFromRequestParameters(entityDefs, {
+            get: function (key) { return packed[key]; },
+        });
     };
     Filter.translateCustomWhere = function (r, entity, remult) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -162,7 +164,9 @@ var Filter = /** @class */ (function () {
                                         if (!(_i < _a.length)) return [3 /*break*/, 5];
                                         key = _a[_i];
                                         element = entity.entityType[key];
-                                        if (!(element && element.rawFilterInfo && element.rawFilterInfo.rawFilterTranslator)) return [3 /*break*/, 4];
+                                        if (!(element &&
+                                            element.rawFilterInfo &&
+                                            element.rawFilterInfo.rawFilterTranslator)) return [3 /*break*/, 4];
                                         if (!(element.rawFilterInfo.key == filterKey)) return [3 /*break*/, 4];
                                         _d = (_c = r).push;
                                         _f = (_e = Filter).fromEntityFilter;
@@ -201,7 +205,7 @@ var filterHelper = /** @class */ (function () {
         if (ei) {
             if (!val)
                 return null;
-            if (typeof val === "string" || typeof val === "number")
+            if (typeof val === 'string' || typeof val === 'number')
                 return val;
             return remult3_1.getEntityRef(val).getId();
         }
@@ -326,17 +330,21 @@ var OrFilter = /** @class */ (function (_super) {
     return OrFilter;
 }(Filter));
 exports.OrFilter = OrFilter;
-exports.customUrlToken = "$custom$";
-exports.customDatabaseFilterToken = "$db$";
+exports.customUrlToken = '$custom$';
+exports.customDatabaseFilterToken = '$db$';
+var customArrayToken = '$an array';
 var FilterSerializer = /** @class */ (function () {
     function FilterSerializer() {
         this.result = {};
         this.hasUndefined = false;
     }
     FilterSerializer.prototype.databaseCustom = function (databaseCustom) {
-        throw new Error("database custom is not allowed with api calls.");
+        throw new Error('database custom is not allowed with api calls.');
     };
     FilterSerializer.prototype.custom = function (key, customItem) {
+        var _a;
+        if (Array.isArray(customItem))
+            customItem = (_a = {}, _a[customArrayToken] = customItem, _a);
         this.add(exports.customUrlToken + key, customItem);
     };
     FilterSerializer.prototype.add = function (key, val) {
@@ -356,20 +364,20 @@ var FilterSerializer = /** @class */ (function () {
         r[key] = v;
     };
     FilterSerializer.prototype.or = function (orElements) {
-        this.add("OR", orElements.map(function (x) {
+        this.add('OR', orElements.map(function (x) {
             var f = new FilterSerializer();
             x.__applyToConsumer(f);
             return f.result;
         }));
     };
     FilterSerializer.prototype.isNull = function (col) {
-        this.add(col.key + ".null", true);
+        this.add(col.key + '.null', true);
     };
     FilterSerializer.prototype.isNotNull = function (col) {
-        this.add(col.key + ".null", false);
+        this.add(col.key + '.null', false);
     };
     FilterSerializer.prototype.isIn = function (col, val) {
-        this.add(col.key + ".in", val.map(function (x) { return col.valueConverter.toJson(x); }));
+        this.add(col.key + '.in', val.map(function (x) { return col.valueConverter.toJson(x); }));
     };
     FilterSerializer.prototype.isEqualTo = function (col, val) {
         this.add(col.key, col.valueConverter.toJson(val));
@@ -390,7 +398,7 @@ var FilterSerializer = /** @class */ (function () {
         this.add(col.key + '.lt', col.valueConverter.toJson(val));
     };
     FilterSerializer.prototype.containsCaseInsensitive = function (col, val) {
-        this.add(col.key + ".contains", val);
+        this.add(col.key + '.contains', val);
     };
     return FilterSerializer;
 }());
@@ -398,11 +406,10 @@ exports.FilterSerializer = FilterSerializer;
 function entityFilterToJson(entityDefs, where) {
     if (!where)
         return {};
-    return (Filter.fromEntityFilter(entityDefs, where)).toJson();
+    return Filter.fromEntityFilter(entityDefs, where).toJson();
 }
 exports.entityFilterToJson = entityFilterToJson;
 function buildFilterFromRequestParameters(entity, filterInfo) {
-    var _a;
     var where = [];
     tslib_1.__spread(entity.fields).forEach(function (col) {
         var _a, _b;
@@ -421,7 +428,9 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
                             arr = JSON.parse(val);
                         else
                             arr = val;
-                        theVal = arr.map(function (x) { return asString ? x : col.valueConverter.fromJson(x); });
+                        theVal = arr.map(function (x) {
+                            return asString ? x : col.valueConverter.fromJson(x);
+                        });
                     }
                     else {
                         theVal = asString ? theVal : col.valueConverter.fromJson(theVal);
@@ -460,23 +469,23 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
         }
         var c = new filterHelper(col);
         addFilter('', function (val) { return val; });
-        addFilter('.gt', function (val) { return ({ "$gt": val }); });
-        addFilter('.gte', function (val) { return ({ "$gte": val }); });
-        addFilter('.lt', function (val) { return ({ "$lt": val }); });
-        addFilter('.lte', function (val) { return ({ "$lte": val }); });
-        addFilter('.ne', function (val) { return ({ "$ne": val }); });
+        addFilter('.gt', function (val) { return ({ $gt: val }); });
+        addFilter('.gte', function (val) { return ({ $gte: val }); });
+        addFilter('.lt', function (val) { return ({ $lt: val }); });
+        addFilter('.lte', function (val) { return ({ $lte: val }); });
+        addFilter('.ne', function (val) { return ({ $ne: val }); });
         addFilter('.in', function (val) { return val; }, true);
-        var nullFilter = filterInfo.get(col.key + ".null");
+        var nullFilter = filterInfo.get(col.key + '.null');
         if (nullFilter) {
             nullFilter = nullFilter.toString().trim().toLowerCase();
             switch (nullFilter) {
-                case "y":
-                case "true":
-                case "yes":
+                case 'y':
+                case 'true':
+                case 'yes':
                     where.push((_a = {}, _a[col.key] = null, _a));
                     break;
                 default:
-                    where.push((_b = {}, _b[col.key] = { "$ne": null }, _b));
+                    where.push((_b = {}, _b[col.key] = { $ne: null }, _b));
                     break;
             }
         }
@@ -488,19 +497,36 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
         where.push({
             $and: array.map(function (v) { return ({
                 $or: v.map(function (x) {
-                    return buildFilterFromRequestParameters(entity, { get: function (key) { return x[key]; } });
-                })
-            }); })
+                    return buildFilterFromRequestParameters(entity, {
+                        get: function (key) { return x[key]; },
+                    });
+                }),
+            }); }),
         });
     }
-    for (var key in entity.entityType) {
+    var _loop_2 = function (key) {
         var element = entity.entityType[key];
-        if (element && element.rawFilterInfo && element.rawFilterInfo.rawFilterTranslator) {
+        if (element &&
+            element.rawFilterInfo &&
+            element.rawFilterInfo.rawFilterTranslator) {
             var custom = filterInfo.get(exports.customUrlToken + key);
             if (custom !== undefined) {
-                where.push((_a = {}, _a[exports.customUrlToken + key] = custom, _a));
+                var addItem_1 = function (item) {
+                    var _a;
+                    if (item[customArrayToken] != undefined)
+                        item = item[customArrayToken];
+                    where.push((_a = {}, _a[exports.customUrlToken + key] = item, _a));
+                };
+                if (Array.isArray(custom)) {
+                    custom.forEach(function (item) { return addItem_1(item); });
+                }
+                else
+                    addItem_1(custom);
             }
         }
+    };
+    for (var key in entity.entityType) {
+        _loop_2(key);
     }
     return { $and: where };
     function separateArrayFromInnerArray(val) {

package/src/live-query/LiveQueryClient.js

@@ -20,7 +20,9 @@ var LiveQueryClient = /** @class */ (function () {
         else
             handleMessage();
     };
-    ;
+    LiveQueryClient.prototype.hasQueriesForTesting = function () {
+        return this.queries.size > 0;
+    };
     LiveQueryClient.prototype.runPromise = function (p) {
         return p;
     };
@@ -45,7 +47,7 @@ var LiveQueryClient = /** @class */ (function () {
                         _b.trys.push([2, 7, , 8]);
                         q_1 = this.channels.get(key);
                         if (!!q_1) return [3 /*break*/, 6];
-                        this.channels.set(key, q_1 = new MessageChannel());
+                        this.channels.set(key, (q_1 = new MessageChannel()));
                         _b.label = 3;
                     case 3:
                         _b.trys.push([3, 5, , 6]);
@@ -95,16 +97,21 @@ var LiveQueryClient = /** @class */ (function () {
     LiveQueryClient.prototype.subscribe = function (repo, options, listener) {
         var _this = this;
         var alive = true;
-        var onUnsubscribe = function () { alive = false; };
-        this.runPromise(repo.buildEntityDataProviderFindOptions(options)
+        var onUnsubscribe = function () {
+            alive = false;
+        };
+        this.runPromise(repo
+            .buildEntityDataProviderFindOptions(options)
             .then(function (opts) {
             if (!alive)
                 return;
-            var _a = new rest_data_provider_1.RestDataProvider(_this.apiProvider).getEntityDataProvider(repo.metadata).buildFindRequest(opts), createKey = _a.createKey, subscribe = _a.subscribe;
+            var _a = new rest_data_provider_1.RestDataProvider(_this.apiProvider)
+                .getEntityDataProvider(repo.metadata)
+                .buildFindRequest(opts), createKey = _a.createKey, subscribe = _a.subscribe;
             var eventTypeKey = createKey();
             var q = _this.queries.get(eventTypeKey);
             if (!q) {
-                _this.queries.set(eventTypeKey, q = new SubscriptionChannel_1.LiveQuerySubscriber(repo, { entityKey: repo.metadata.key, options: options }, _this.getUserId()));
+                _this.queries.set(eventTypeKey, (q = new SubscriptionChannel_1.LiveQuerySubscriber(repo, { entityKey: repo.metadata.key, options: options }, _this.getUserId())));
                 q.subscribeCode = function () {
                     if (q.unsubscribe) {
                         q.unsubscribe();
@@ -115,13 +122,13 @@ var LiveQueryClient = /** @class */ (function () {
                         complete: function () { },
                         error: function (er) {
                             q.listeners.forEach(function (l) { return l.error(er); });
-                        }
+                        },
                     }).then(function (unsubscribeToChannel) {
                         if (q.listeners.length == 0) {
                             unsubscribeToChannel();
                             return;
                         }
-                        _this.runPromise(subscribe(q.id)
+                        _this.runPromise(subscribe(q.queryChannel)
                             .then(function (r) {
                             if (q.listeners.length === 0) {
                                 r.unsubscribe();
@@ -136,7 +143,9 @@ var LiveQueryClient = /** @class */ (function () {
                             };
                         })
                             .catch(function (err) {
-                            listener.error(err);
+                            q.listeners.forEach(function (l) { return l.error(err); });
+                            unsubscribeToChannel();
+                            _this.queries.delete(eventTypeKey);
                         }));
                     })).catch(function (err) {
                         q.listeners.forEach(function (l) { return l.error(err); });
@@ -194,7 +203,9 @@ var LiveQueryClient = /** @class */ (function () {
                         case 1:
                             actionInfo = (_j.sent()).actionInfo;
                             _c = this.runPromise;
-                            return [4 /*yield*/, actionInfo.runActionWithoutBlockingUI(function () { return buildRestDataProvider_1.buildRestDataProvider(p_1.httpClient).post(p_1.url + '/' + SubscriptionChannel_1.liveQueryKeepAliveRoute, ids); })];
+                            return [4 /*yield*/, actionInfo.runActionWithoutBlockingUI(function () {
+                                    return buildRestDataProvider_1.buildRestDataProvider(p_1.httpClient).post(p_1.url + '/' + SubscriptionChannel_1.liveQueryKeepAliveRoute, ids);
+                                })];
                         case 2: return [4 /*yield*/, _c.apply(this, [_j.sent()])];
                         case 3:
                             invalidIds = _j.sent();
@@ -229,23 +240,22 @@ var LiveQueryClient = /** @class */ (function () {
                     }
                 });
             }); }, 30000);
-            return this.runPromise(this.client =
-                this.apiProvider().subscriptionClient.openConnection(function () {
-                    var e_4, _a;
-                    try {
-                        for (var _b = tslib_1.__values(_this.queries.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                            var q = _c.value;
-                            q.subscribeCode();
-                        }
+            return this.runPromise((this.client = this.apiProvider().subscriptionClient.openConnection(function () {
+                var e_4, _a;
+                try {
+                    for (var _b = tslib_1.__values(_this.queries.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var q = _c.value;
+                        q.subscribeCode();
                     }
-                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                    finally {
-                        try {
-                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                        }
-                        finally { if (e_4) throw e_4.error; }
+                }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                }));
+                    finally { if (e_4) throw e_4.error; }
+                }
+            })));
         }
         return this.client;
     };

package/src/live-query/SseSubscriptionClient.d.ts

@@ -1,4 +1,4 @@
-import { SubscriptionClient, SubscriptionClientConnection } from "./SubscriptionChannel";
+import { SubscriptionClient, SubscriptionClientConnection } from './SubscriptionChannel';
 export declare class SseSubscriptionClient implements SubscriptionClient {
     openConnection(onReconnect: VoidFunction): Promise<SubscriptionClientConnection>;
 }