remult 0.26.23 → 0.27.0

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRepository = exports.getEntityMetadata = exports.ControllerBase = exports.EntityBase = exports.decorateColumnSettings = exports.buildOptions = exports.fieldOptionalValuesFunctionKey = exports.storableMember = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.fieldOptionalValuesFunctionKey = exports.storableMember = exports.ValueListInfo = exports.columnDefsImpl = exports.CaptionTransformer = exports.FieldRefImplementation = exports.controllerRefImpl = exports.rowHelperImplementation = exports.RepositoryImplementation = void 0;
+exports.createOldEntity = createOldEntity;
+exports.getFields = getFields;
+exports.getControllerRef = getControllerRef;
+exports.buildCaption = buildCaption;
+exports.FieldType = FieldType;
+exports.isAutoIncrement = isAutoIncrement;
+exports.ValueListFieldType = ValueListFieldType;
+exports.getValueList = getValueList;
+exports.buildOptions = buildOptions;
+exports.decorateColumnSettings = decorateColumnSettings;
+exports.getEntityMetadata = getEntityMetadata;
+exports.getRepository = getRepository;
 var tslib_1 = require("tslib");
 var column_js_1 = require("../column.js");
 var CompoundIdField_js_1 = require("../CompoundIdField.js");
@@ -439,52 +451,52 @@ var RepositoryImplementation = /** @class */ (function () {
         });
     };
     RepositoryImplementation.prototype.updateMany = function (_a) {
-        var _b, e_7, _c, _d;
-        var where = _a.where, set = _a.set;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _e, _f, updated, _g, _h, _j, item, e_7_1;
-            return tslib_1.__generator(this, function (_k) {
-                switch (_k.label) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
+            var _c, _d, updated, _e, _f, _g, item, e_7_1;
+            var _h, e_7, _j, _k;
+            var where = _b.where, set = _b.set;
+            return tslib_1.__generator(this, function (_l) {
+                switch (_l.label) {
                     case 0:
                         filter_interfaces_js_1.Filter.throwErrorIfFilterIsEmpty(where, 'updateMany');
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 2];
-                        _f = (_e = this._edp).updateMany;
+                        _d = (_c = this._edp).updateMany;
                         return [4 /*yield*/, this._translateWhereToFilter(where)];
-                    case 1: return [2 /*return*/, _f.apply(_e, [_k.sent(), set])];
+                    case 1: return [2 /*return*/, _d.apply(_c, [_l.sent(), set])];
                     case 2:
                         updated = 0;
-                        _k.label = 3;
+                        _l.label = 3;
                     case 3:
-                        _k.trys.push([3, 9, 10, 15]);
-                        _g = true, _h = tslib_1.__asyncValues(this.query({ where: where }));
-                        _k.label = 4;
-                    case 4: return [4 /*yield*/, _h.next()];
+                        _l.trys.push([3, 9, 10, 15]);
+                        _e = true, _f = tslib_1.__asyncValues(this.query({ where: where }));
+                        _l.label = 4;
+                    case 4: return [4 /*yield*/, _f.next()];
                     case 5:
-                        if (!(_j = _k.sent(), _b = _j.done, !_b)) return [3 /*break*/, 8];
-                        _d = _j.value;
-                        _g = false;
-                        item = _d;
+                        if (!(_g = _l.sent(), _h = _g.done, !_h)) return [3 /*break*/, 8];
+                        _k = _g.value;
+                        _e = false;
+                        item = _k;
                         (0, assign_js_1.assign)(item, set);
                         return [4 /*yield*/, (0, getEntityRef_js_1.getEntityRef)(item).save()];
                     case 6:
-                        _k.sent();
+                        _l.sent();
                         updated++;
-                        _k.label = 7;
+                        _l.label = 7;
                     case 7:
-                        _g = true;
+                        _e = true;
                         return [3 /*break*/, 4];
                     case 8: return [3 /*break*/, 15];
                     case 9:
-                        e_7_1 = _k.sent();
+                        e_7_1 = _l.sent();
                         e_7 = { error: e_7_1 };
                         return [3 /*break*/, 15];
                     case 10:
-                        _k.trys.push([10, , 13, 14]);
-                        if (!(!_g && !_b && (_c = _h.return))) return [3 /*break*/, 12];
-                        return [4 /*yield*/, _c.call(_h)];
+                        _l.trys.push([10, , 13, 14]);
+                        if (!(!_e && !_h && (_j = _f.return))) return [3 /*break*/, 12];
+                        return [4 /*yield*/, _j.call(_f)];
                     case 11:
-                        _k.sent();
-                        _k.label = 12;
+                        _l.sent();
+                        _l.label = 12;
                     case 12: return [3 /*break*/, 14];
                     case 13:
                         if (e_7) throw e_7.error;
@@ -554,7 +566,8 @@ var RepositoryImplementation = /** @class */ (function () {
             try {
                 for (var _b = tslib_1.__values(this._fieldsOf(entity)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var field = _c.value;
-                    instance[field.key] = entity[field.key];
+                    var key = field.key;
+                    instance[key] = entity[key];
                 }
             }
             catch (e_8_1) { e_8 = { error: e_8_1 }; }
@@ -625,14 +638,15 @@ var RepositoryImplementation = /** @class */ (function () {
                 }
                 (_a = listener.error) !== null && _a !== void 0 ? _a : (listener.error = function () { });
                 (_b = listener.complete) !== null && _b !== void 0 ? _b : (listener.complete = function () { });
-                return _this._remult.liveQuerySubscriber.subscribe(_this, options, listener);
+                return _this._remult.liveQuerySubscriber.subscribe(//TODO - figure out why the type was required
+                _this, options, listener);
             },
         };
     };
-    RepositoryImplementation.prototype._rawFind = function (options, skipOrderByAndLimit, loader) {
-        if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    RepositoryImplementation.prototype._rawFind = function (options_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (options, skipOrderByAndLimit, loader) {
             var opt, rawRows, result;
+            if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -660,10 +674,10 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
-    RepositoryImplementation.prototype.find = function (options, skipOrderByAndLimit) {
-        if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    RepositoryImplementation.prototype.find = function (options_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (options, skipOrderByAndLimit) {
             var loader, result;
+            if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -742,7 +756,6 @@ var RepositoryImplementation = /** @class */ (function () {
         });
     };
     RepositoryImplementation.prototype._loadManyToOneForManyRows = function (rawRows, loadOptions, loader) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             function loadManyToOne(repo, toLoad) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -771,9 +784,10 @@ var RepositoryImplementation = /** @class */ (function () {
                     });
                 });
             }
-            var loadFields, _b, _c, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_10_1, result, _loop_1, this_1, _d, _e, col;
-            var e_10, _f, e_11, _g, e_12, _h;
+            var loadFields, _a, _b, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_10_1, result, _loop_1, this_1, _c, _d, col;
+            var e_10, _e, e_11, _f, e_12, _g;
             var _this = this;
+            var _h;
             return tslib_1.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
@@ -783,11 +797,11 @@ var RepositoryImplementation = /** @class */ (function () {
                         _j.label = 1;
                     case 1:
                         _j.trys.push([1, 6, 7, 8]);
-                        _b = tslib_1.__values(this.metadata.fields), _c = _b.next();
+                        _a = tslib_1.__values(this.metadata.fields), _b = _a.next();
                         _j.label = 2;
                     case 2:
-                        if (!!_c.done) return [3 /*break*/, 5];
-                        col = _c.value;
+                        if (!!_b.done) return [3 /*break*/, 5];
+                        col = _b.value;
                         ei = (0, getEntityRef_js_1.getEntitySettings)(col.valueType, false);
                         if (!ei) return [3 /*break*/, 4];
                         isRelation = (0, relationInfoMember_js_1.getRelationFieldInfo)(col);
@@ -813,7 +827,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         catch (e_11_1) { e_11 = { error: e_11_1 }; }
                         finally {
                             try {
-                                if (rawRows_1_1 && !rawRows_1_1.done && (_g = rawRows_1.return)) _g.call(rawRows_1);
+                                if (rawRows_1_1 && !rawRows_1_1.done && (_f = rawRows_1.return)) _f.call(rawRows_1);
                             }
                             finally { if (e_11) throw e_11.error; }
                         }
@@ -823,7 +837,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         _j.sent();
                         _j.label = 4;
                     case 4:
-                        _c = _b.next();
+                        _b = _a.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
@@ -832,7 +846,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
+                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
                         finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
@@ -849,15 +863,17 @@ var RepositoryImplementation = /** @class */ (function () {
                             var rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(col);
                             var incl = col.options
                                 .defaultIncluded;
-                            if (((_a = loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) === null || _a === void 0 ? void 0 : _a[col.key]) !== undefined) {
-                                incl = loadOptions.include[col.key];
+                            var include = (_h = loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) === null || _h === void 0 ? void 0 : _h[col.key];
+                            if (include !== undefined) {
+                                incl = include;
                             }
                             if (rel && incl) {
                                 var otherRepo = rel.toRepo;
                                 var _loop_2 = function (row) {
                                     var _l = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _l.findOptions, returnNull = _l.returnNull;
+                                    var colKey = col.key;
                                     if (returnNull)
-                                        row[col.key] = null;
+                                        row[colKey] = null;
                                     else {
                                         var entityType = rel.toEntity;
                                         var toRepo_1 = otherRepo;
@@ -870,7 +886,7 @@ var RepositoryImplementation = /** @class */ (function () {
                                             .then(function (result) {
                                             if (result.length == 0 && rel.type == 'toOne')
                                                 return;
-                                            row[col.key] =
+                                            row[colKey] =
                                                 rel.type !== 'toMany'
                                                     ? result.length == 0
                                                         ? null
@@ -896,15 +912,15 @@ var RepositoryImplementation = /** @class */ (function () {
                         };
                         this_1 = this;
                         try {
-                            for (_d = tslib_1.__values(this.metadata.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                col = _e.value;
+                            for (_c = tslib_1.__values(this.metadata.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                col = _d.value;
                                 _loop_1(col);
                             }
                         }
                         catch (e_12_1) { e_12 = { error: e_12_1 }; }
                         finally {
                             try {
-                                if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
+                                if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
                             }
                             finally { if (e_12) throw e_12.error; }
                         }
@@ -1004,8 +1020,6 @@ var RepositoryImplementation = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!r)
-                            return [2 /*return*/, undefined];
                         x = new this._entity(this._remult);
                         helper = new rowHelperImplementation(this._info, x, this, this._edp, this._remult, false);
                         Object.defineProperty(x, getEntityRef_js_1.entityMember, {
@@ -1042,17 +1056,18 @@ var RepositoryImplementation = /** @class */ (function () {
         try {
             for (var _b = tslib_1.__values(this._fieldsOf(json)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
+                var colKey = col.key;
                 var ei = (0, getEntityRef_js_1.getEntitySettings)(col.valueType, false);
                 if (ei) {
                     var val = json[col.key];
                     if (typeof val === 'string' || typeof val === 'number')
-                        result[col.key] = val;
+                        result[colKey] = val;
                     else
-                        result[col.key] = this._remult.repo(col.valueType).fromJson(val);
+                        result[colKey] = this._remult.repo(col.valueType).fromJson(val);
                 }
                 else {
-                    if (json[col.key] !== undefined) {
-                        result[col.key] = col.valueConverter.fromJson(json[col.key]);
+                    if (json[colKey] !== undefined) {
+                        result[colKey] = col.valueConverter.fromJson(json[col.key]);
                     }
                 }
             }
@@ -1092,51 +1107,51 @@ var RepositoryImplementation = /** @class */ (function () {
         });
     };
     RepositoryImplementation.prototype.deleteMany = function (_a) {
-        var _b, e_18, _c, _d;
-        var where = _a.where;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _e, _f, deleted, _g, _h, _j, item, e_18_1;
-            return tslib_1.__generator(this, function (_k) {
-                switch (_k.label) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (_b) {
+            var _c, _d, deleted, _e, _f, _g, item, e_18_1;
+            var _h, e_18, _j, _k;
+            var where = _b.where;
+            return tslib_1.__generator(this, function (_l) {
+                switch (_l.label) {
                     case 0:
                         filter_interfaces_js_1.Filter.throwErrorIfFilterIsEmpty(where, 'deleteMany');
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 2];
-                        _f = (_e = this._edp).deleteMany;
+                        _d = (_c = this._edp).deleteMany;
                         return [4 /*yield*/, this._translateWhereToFilter(where)];
-                    case 1: return [2 /*return*/, _f.apply(_e, [_k.sent()])];
+                    case 1: return [2 /*return*/, _d.apply(_c, [_l.sent()])];
                     case 2:
                         deleted = 0;
-                        _k.label = 3;
+                        _l.label = 3;
                     case 3:
-                        _k.trys.push([3, 9, 10, 15]);
-                        _g = true, _h = tslib_1.__asyncValues(this.query({ where: where }));
-                        _k.label = 4;
-                    case 4: return [4 /*yield*/, _h.next()];
+                        _l.trys.push([3, 9, 10, 15]);
+                        _e = true, _f = tslib_1.__asyncValues(this.query({ where: where }));
+                        _l.label = 4;
+                    case 4: return [4 /*yield*/, _f.next()];
                     case 5:
-                        if (!(_j = _k.sent(), _b = _j.done, !_b)) return [3 /*break*/, 8];
-                        _d = _j.value;
-                        _g = false;
-                        item = _d;
+                        if (!(_g = _l.sent(), _h = _g.done, !_h)) return [3 /*break*/, 8];
+                        _k = _g.value;
+                        _e = false;
+                        item = _k;
                         return [4 /*yield*/, (0, getEntityRef_js_1.getEntityRef)(item).delete()];
                     case 6:
-                        _k.sent();
+                        _l.sent();
                         deleted++;
-                        _k.label = 7;
+                        _l.label = 7;
                     case 7:
-                        _g = true;
+                        _e = true;
                         return [3 /*break*/, 4];
                     case 8: return [3 /*break*/, 15];
                     case 9:
-                        e_18_1 = _k.sent();
+                        e_18_1 = _l.sent();
                         e_18 = { error: e_18_1 };
                         return [3 /*break*/, 15];
                     case 10:
-                        _k.trys.push([10, , 13, 14]);
-                        if (!(!_g && !_b && (_c = _h.return))) return [3 /*break*/, 12];
-                        return [4 /*yield*/, _c.call(_h)];
+                        _l.trys.push([10, , 13, 14]);
+                        if (!(!_e && !_h && (_j = _f.return))) return [3 /*break*/, 12];
+                        return [4 /*yield*/, _j.call(_f)];
                     case 11:
-                        _k.sent();
-                        _k.label = 12;
+                        _l.sent();
+                        _l.label = 12;
                     case 12: return [3 /*break*/, 14];
                     case 13:
                         if (e_18) throw e_18.error;
@@ -1147,14 +1162,13 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
-    RepositoryImplementation.prototype.findOne = function (options, skipOrderByAndLimit) {
-        if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var r, cacheInfo, f, key;
+    RepositoryImplementation.prototype.findOne = function (pOptions_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (pOptions, skipOrderByAndLimit) {
+            var r, cacheInfo, options, f, key;
             var _this = this;
+            if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
             return tslib_1.__generator(this, function (_a) {
-                if (!options)
-                    options = {};
+                options = pOptions !== null && pOptions !== void 0 ? pOptions : {};
                 if (options.useCache) {
                     f = (0, rest_data_provider_js_1.findOptionsToJson)(options, this.metadata);
                     key = JSON.stringify(f);
@@ -1166,7 +1180,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             this._cache.delete(key);
                         }
                         else
-                            return [2 /*return*/, this._cache.get(key).promise];
+                            return [2 /*return*/, cacheInfo.promise];
                     }
                     else {
                         cacheInfo = {
@@ -1205,10 +1219,10 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
-    RepositoryImplementation.prototype.findFirst = function (where, options, skipOrderByAndLimit) {
-        if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    RepositoryImplementation.prototype.findFirst = function (where_1, options_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (where, options, skipOrderByAndLimit) {
             var w;
+            if (skipOrderByAndLimit === void 0) { skipOrderByAndLimit = false; }
             return tslib_1.__generator(this, function (_a) {
                 if (!options)
                     options = {};
@@ -1238,7 +1252,8 @@ var RepositoryImplementation = /** @class */ (function () {
             try {
                 for (var _c = tslib_1.__values(this._fieldsOf(item)), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var field = _d.value;
-                    r[field.key] = item[field.key];
+                    var key = field.key;
+                    r[key] = item[key];
                 }
             }
             catch (e_19_1) { e_19 = { error: e_19_1 }; }
@@ -1304,52 +1319,51 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.findId = function (id, options) {
         if (id === null || id === undefined)
-            return null;
+            return Promise.resolve(null);
         if (typeof id !== 'string' && typeof id !== 'number')
             throw new Error('id can be either number or string, but got: ' + typeof id);
         return this.findFirst({}, tslib_1.__assign(tslib_1.__assign({}, options), { where: this.metadata.idMetadata.getIdFilter(id) }), true);
     };
     RepositoryImplementation.prototype._translateWhereToFilter = function (where) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var z, z, _c, r;
-            var _d;
+            var safeWhere, z, z, _a, r;
+            var _b;
             var _this = this;
+            var _c, _d;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        if (!where)
-                            where = {};
-                        if ((_a = this._defaultFindOptions) === null || _a === void 0 ? void 0 : _a.where) {
-                            z = where;
-                            where = {
-                                $and: [z, (_b = this._defaultFindOptions) === null || _b === void 0 ? void 0 : _b.where],
+                        safeWhere = where !== null && where !== void 0 ? where : {};
+                        if ((_c = this._defaultFindOptions) === null || _c === void 0 ? void 0 : _c.where) {
+                            z = safeWhere;
+                            safeWhere = {
+                                $and: [z, (_d = this._defaultFindOptions) === null || _d === void 0 ? void 0 : _d.where],
                             };
                         }
                         if (!!this._dataProvider.isProxy) return [3 /*break*/, 4];
                         if (!this.metadata.options.backendPreprocessFilter) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.metadata.options.backendPreprocessFilter(where, {
+                        return [4 /*yield*/, this.metadata.options.backendPreprocessFilter(safeWhere, {
                                 metadata: this.metadata,
                                 getFilterPreciseValues: function (filter) {
-                                    return filter_interfaces_js_1.Filter.getPreciseValues(_this.metadata, filter || where);
+                                    return filter_interfaces_js_1.Filter.getPreciseValues(_this.metadata, filter || safeWhere);
                                 },
                             })];
                     case 1:
-                        where = _e.sent();
+                        safeWhere = _e.sent();
                         _e.label = 2;
                     case 2:
                         if (!this.metadata.options.backendPrefilter) return [3 /*break*/, 4];
-                        z = where;
-                        _d = {};
-                        _c = [z];
+                        z = safeWhere;
+                        _b = {};
+                        _a = [z];
                         return [4 /*yield*/, filter_interfaces_js_1.Filter.resolve(this.metadata.options.backendPrefilter)];
                     case 3:
-                        where = (_d.$and = _c.concat([
+                        safeWhere = (_b.$and = _a.concat([
                             _e.sent()
                         ]),
-                            _d);
+                            _b);
                         _e.label = 4;
-                    case 4: return [4 /*yield*/, filter_interfaces_js_1.Filter.fromEntityFilter(this.metadata, where)];
+                    case 4: return [4 /*yield*/, filter_interfaces_js_1.Filter.fromEntityFilter(this.metadata, safeWhere)];
                     case 5:
                         r = _e.sent();
                         if (!(r && !this._dataProvider.isProxy)) return [3 /*break*/, 7];
@@ -1393,14 +1407,22 @@ function createOldEntity(entity, remult) {
             var _loop_4 = function (key_1) {
                 if (baseSettings_1[key_1] && baseSettings_1[key_1] !== info[key_1]) {
                     var x_1 = info[key_1];
+                    //@ts-ignore
                     info[key_1] = function (a, b) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, x_1(a, b)];
+                                case 0: 
+                                //@ts-ignore
+                                return [4 /*yield*/, x_1(a, b)
+                                    //@ts-ignore
+                                ];
                                 case 1:
+                                    //@ts-ignore
                                     _a.sent();
+                                    //@ts-ignore
                                     return [4 /*yield*/, baseSettings_1[key_1](a, b)];
                                 case 2:
+                                    //@ts-ignore
                                     _a.sent();
                                     return [2 /*return*/];
                             }
@@ -1409,15 +1431,15 @@ function createOldEntity(entity, remult) {
                 }
             };
             try {
-                for (var _b = (e_22 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var key_1 = _c.value;
+                for (var functions_1 = (e_22 = void 0, tslib_1.__values(functions)), functions_1_1 = functions_1.next(); !functions_1_1.done; functions_1_1 = functions_1.next()) {
+                    var key_1 = functions_1_1.value;
                     _loop_4(key_1);
                 }
             }
             catch (e_22_1) { e_22 = { error: e_22_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (functions_1_1 && !functions_1_1.done && (_a = functions_1.return)) _a.call(functions_1);
                 }
                 finally { if (e_22) throw e_22.error; }
             }
@@ -1429,12 +1451,10 @@ function createOldEntity(entity, remult) {
     }
     return new EntityFullInfo(prepareColumnInfo(r, remult), info, remult, entity, key);
 }
-exports.createOldEntity = createOldEntity;
 var rowHelperBase = /** @class */ (function () {
     function rowHelperBase(fieldsMetadata, instance, remult, isNewRow) {
         var e_23, _a;
         var _this = this;
-        var _b;
         this.fieldsMetadata = fieldsMetadata;
         this.instance = instance;
         this.remult = remult;
@@ -1485,37 +1505,41 @@ var rowHelperBase = /** @class */ (function () {
                 });
                 lookup_1.set(val);
             }
-            else if (((_b = (0, relationInfoMember_js_1.getRelationFieldInfo)(col)) === null || _b === void 0 ? void 0 : _b.type) === 'toOne') {
-                var hasVal = instance.hasOwnProperty(col.key);
-                var val_1 = instance[col.key];
-                if (isNewRow && !val_1)
-                    hasVal = false;
-                Object.defineProperty(instance, col.key, {
-                    get: function () {
-                        return val_1;
-                    },
-                    set: function (newVal) {
-                        val_1 = newVal;
-                        if (newVal === undefined)
-                            return;
-                        var op = col.options;
-                        if (op.field) {
-                            _this.instance[op.field] =
-                                (0, relationInfoMember_js_1.getRelationFieldInfo)(col).toRepo.metadata.idMetadata.getId(newVal);
-                        }
-                        if (op.fields) {
-                            for (var key in op.fields) {
-                                if (Object.prototype.hasOwnProperty.call(op.fields, key)) {
-                                    var element = op.fields[key];
-                                    _this.instance[element] = newVal == null ? null : newVal[key];
+            else {
+                var rel_1 = (0, relationInfoMember_js_1.getRelationFieldInfo)(col);
+                if ((rel_1 === null || rel_1 === void 0 ? void 0 : rel_1.type) === 'toOne') {
+                    var hasVal = instance.hasOwnProperty(col.key);
+                    var val_1 = instance[col.key];
+                    if (isNewRow && !val_1)
+                        hasVal = false;
+                    Object.defineProperty(instance, col.key, {
+                        get: function () {
+                            return val_1;
+                        },
+                        set: function (newVal) {
+                            val_1 = newVal;
+                            if (newVal === undefined)
+                                return;
+                            var op = col.options;
+                            if (op.field) {
+                                _this.instance[op.field] =
+                                    rel_1.toRepo.metadata.idMetadata.getId(newVal);
+                            }
+                            if (op.fields) {
+                                for (var key in op.fields) {
+                                    if (Object.prototype.hasOwnProperty.call(op.fields, key)) {
+                                        var element = op.fields[key];
+                                        _this.instance[element] =
+                                            newVal == null ? null : newVal[key];
+                                    }
                                 }
                             }
-                        }
-                    },
-                    enumerable: true,
-                });
-                if (hasVal)
-                    instance[col.key] = val_1;
+                        },
+                        enumerable: true,
+                    });
+                    if (hasVal)
+                        instance[col.key] = val_1;
+                }
             }
         };
         var this_2 = this;
@@ -1553,9 +1577,9 @@ var rowHelperBase = /** @class */ (function () {
     };
     rowHelperBase.prototype.initSubscribers = function () {
         var e_24, _a;
-        var _this = this;
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
+            var safeSubscribers_1 = this._subscribers;
             var _loop_6 = function (col) {
                 var ei = (0, getEntityRef_js_1.getEntitySettings)(col.valueType, false);
                 var refImpl = this_3.fields.find(col.key);
@@ -1566,13 +1590,13 @@ var rowHelperBase = /** @class */ (function () {
                     var val_2 = this_3.instance[col.key];
                     Object.defineProperty(this_3.instance, col.key, {
                         get: function () {
-                            _this._subscribers.reportObserved();
+                            safeSubscribers_1.reportObserved();
                             refImpl._subscribers.reportObserved();
                             return val_2;
                         },
                         set: function (value) {
                             val_2 = value;
-                            _this._subscribers.reportChanged();
+                            safeSubscribers_1.reportChanged();
                             refImpl._subscribers.reportChanged();
                         },
                         enumerable: true,
@@ -1627,17 +1651,20 @@ var rowHelperBase = /** @class */ (function () {
     };
     rowHelperBase.prototype.buildErrorInfoObject = function () {
         var e_25, _a;
+        var _b;
         var error = {
             modelState: Object.assign({}, this.errors),
             message: this.error,
         };
         if (!error.message) {
             try {
-                for (var _b = tslib_1.__values(this.fieldsMetadata), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var col = _c.value;
-                    if (this.errors[col.key]) {
+                for (var _c = tslib_1.__values(this.fieldsMetadata), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var col = _d.value;
+                    if ((_b = this.errors) === null || _b === void 0 ? void 0 : _b[col.key]) {
                         error.message =
-                            this.fields[col.key].metadata.caption + ': ' + this.errors[col.key];
+                            this.fields[col.key].metadata.caption +
+                                ': ' +
+                                this.errors[col.key];
                         this.error = error.message;
                         break;
                     }
@@ -1646,7 +1673,7 @@ var rowHelperBase = /** @class */ (function () {
             catch (e_25_1) { e_25 = { error: e_25_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
                 finally { if (e_25) throw e_25.error; }
             }
@@ -1853,11 +1880,11 @@ var rowHelperBase = /** @class */ (function () {
         }
         return result;
     };
-    rowHelperBase.prototype._updateEntityBasedOnApi = function (body, ignoreApiAllowed) {
-        if (ignoreApiAllowed === void 0) { ignoreApiAllowed = false; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+    rowHelperBase.prototype._updateEntityBasedOnApi = function (body_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (body, ignoreApiAllowed) {
             var keys, _a, _b, col, lu;
             var e_29, _c;
+            if (ignoreApiAllowed === void 0) { ignoreApiAllowed = false; }
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1898,26 +1925,28 @@ var rowHelperBase = /** @class */ (function () {
 }());
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
-    function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
+    function rowHelperImplementation(info, instance, repo, edp, remult, _isNew) {
         var e_30, _a;
         var _this = _super.call(this, info.fieldsMetadata, instance, remult, _isNew) || this;
         _this.info = info;
-        _this.repository = repository;
+        _this.repo = repo;
         _this.edp = edp;
         _this._isNew = _isNew;
         _this._wasDeleted = false;
         _this._saving = false;
+        _this.repository = repo;
         _this.metadata = info;
         if (_isNew) {
             try {
                 for (var _b = tslib_1.__values(info.fieldsMetadata), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var col = _c.value;
-                    if (col.options.defaultValue && instance[col.key] === undefined) {
+                    var colKey = col.key;
+                    if (col.options.defaultValue && instance[colKey] === undefined) {
                         if (typeof col.options.defaultValue === 'function') {
-                            instance[col.key] = col.options.defaultValue(instance);
+                            instance[colKey] = col.options.defaultValue(instance);
                         }
-                        else if (!instance[col.key])
-                            instance[col.key] = col.options.defaultValue;
+                        else if (!instance[colKey])
+                            instance[colKey] = col.options.defaultValue;
                     }
                 }
             }
@@ -1929,19 +1958,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                 finally { if (e_30) throw e_30.error; }
             }
         }
-        if (_this.info.options.entityRefInit)
-            _this.info.options.entityRefInit(_this, instance);
+        if (_this.info.entityInfo.entityRefInit)
+            _this.info.entityInfo.entityRefInit(_this, instance);
         if (context_js_1.Remult.entityRefInit)
             context_js_1.Remult.entityRefInit(_this, instance);
         return _this;
     }
     rowHelperImplementation.prototype.clone = function () {
         var data = this.toApiJson(true, true);
-        return this.repository.fromJson(data, this.isNew());
+        return this.repo.fromJson(data, this.isNew());
     };
     Object.defineProperty(rowHelperImplementation.prototype, "relations", {
         get: function () {
-            return this.repository.relations(this.instance);
+            return this.repo.relations(this.instance);
         },
         enumerable: false,
         configurable: true
@@ -2009,7 +2038,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 switch (_a.label) {
                                     case 0:
                                         if (newData.length === 0)
-                                            throw this.repository._notFoundError(this.id);
+                                            throw this.repo._notFoundError(this.id);
                                         return [4 /*yield*/, this.loadDataFrom(newData[0])];
                                     case 1:
                                         _a.sent();
@@ -2032,7 +2061,9 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
+                        //@ts-ignore
                         find: function (c) {
+                            //@ts-ignore
                             return r_1[typeof c === 'string' ? c : c.key];
                         }
                     },
@@ -2042,7 +2073,9 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                 try {
                     for (var _c = tslib_1.__values(this.info.fieldsMetadata), _d = _c.next(); !_d.done; _d = _c.next()) {
                         var c = _d.value;
-                        _items_1.push((r_1[c.key] = new FieldRefImplementation(c.options, c, this.instance, this, this)));
+                        _items_1.push(
+                        //@ts-ignore
+                        (r_1[c.key] = new FieldRefImplementation(c.options, c, this.instance, this, this)));
                     }
                 }
                 catch (e_31_1) { e_31 = { error: e_31_1 }; }
@@ -2060,14 +2093,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         configurable: true
     });
     rowHelperImplementation.prototype.save = function (onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doNotSave_1, e, _b, _c, col, e_32_1, d, ignoreKeys, _d, _e, field, f, updatedRow, isNew, _f, _g, changesOnly, wasChanged, key, element, _h, _j, _k, _l, listener, e_33_1, err_1;
-            var e_32, _m, e_34, _o, _p, _q, e_33, _r;
-            return tslib_1.__generator(this, function (_s) {
-                switch (_s.label) {
+            var doNotSave_1, e, _a, _b, col, e_32_1, d, ignoreKeys, _c, _d, field, f, updatedRow, isNew, _e, _f, changesOnly, wasChanged, key, element, _g, _h, _j, _k, listener, e_33_1, err_1;
+            var e_32, _l, e_34, _m, _o, _p, e_33, _q;
+            var _r, _s;
+            return tslib_1.__generator(this, function (_t) {
+                switch (_t.label) {
                     case 0:
-                        _s.trys.push([0, , 41, 42]);
+                        _t.trys.push([0, , 41, 42]);
                         if (this._saving)
                             throw new Error('cannot save while entity is already saving');
                         this._saving = true;
@@ -2080,36 +2113,36 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.__validateEntity()];
                     case 1:
                         // no need
-                        _s.sent();
-                        _s.label = 2;
+                        _t.sent();
+                        _t.label = 2;
                     case 2:
                         doNotSave_1 = false;
                         e = this.buildLifeCycleEvent(function () { return (doNotSave_1 = true); });
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 12];
-                        _s.label = 3;
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 12];
+                        _t.label = 3;
                     case 3:
-                        _s.trys.push([3, 8, 9, 10]);
-                        _b = tslib_1.__values(this.fields), _c = _b.next();
-                        _s.label = 4;
+                        _t.trys.push([3, 8, 9, 10]);
+                        _a = tslib_1.__values(this.fields), _b = _a.next();
+                        _t.label = 4;
                     case 4:
-                        if (!!_c.done) return [3 /*break*/, 7];
-                        col = _c.value;
+                        if (!!_b.done) return [3 /*break*/, 7];
+                        col = _b.value;
                         if (!col.metadata.options.saving) return [3 /*break*/, 6];
                         return [4 /*yield*/, col.metadata.options.saving(this.instance, col, e)];
                     case 5:
-                        _s.sent();
-                        _s.label = 6;
+                        _t.sent();
+                        _t.label = 6;
                     case 6:
-                        _c = _b.next();
+                        _b = _a.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_32_1 = _s.sent();
+                        e_32_1 = _t.sent();
                         e_32 = { error: e_32_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
-                            if (_c && !_c.done && (_m = _b.return)) _m.call(_b);
+                            if (_b && !_b.done && (_l = _a.return)) _l.call(_a);
                         }
                         finally { if (e_32) throw e_32.error; }
                         return [7 /*endfinally*/];
@@ -2117,15 +2150,15 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 12];
                         return [4 /*yield*/, this.info.entityInfo.saving(this.instance, e)];
                     case 11:
-                        _s.sent();
-                        _s.label = 12;
+                        _t.sent();
+                        _t.label = 12;
                     case 12:
                         this.__assertValidity();
                         d = this.copyDataToObject(this.isNew());
                         ignoreKeys = [];
                         try {
-                            for (_d = tslib_1.__values(this.metadata.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                field = _e.value;
+                            for (_c = tslib_1.__values(this.metadata.fields), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                field = _d.value;
                                 if (field.dbReadOnly ||
                                     (onlyTheseFieldsSentOnlyInTheCaseOfProxySaveWithPartialObject !==
                                         undefined &&
@@ -2140,30 +2173,30 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         catch (e_34_1) { e_34 = { error: e_34_1 }; }
                         finally {
                             try {
-                                if (_e && !_e.done && (_o = _d.return)) _o.call(_d);
+                                if (_d && !_d.done && (_m = _c.return)) _m.call(_c);
                             }
                             finally { if (e_34) throw e_34.error; }
                         }
                         updatedRow = void 0;
                         isNew = this.isNew();
-                        _s.label = 13;
+                        _t.label = 13;
                     case 13:
-                        _s.trys.push([13, 38, , 40]);
-                        (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
+                        _t.trys.push([13, 38, , 40]);
+                        (_r = this._subscribers) === null || _r === void 0 ? void 0 : _r.reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 19];
                         if (!doNotSave_1) return [3 /*break*/, 16];
-                        _g = (_f = this.edp).find;
-                        _p = {};
+                        _f = (_e = this.edp).find;
+                        _o = {};
                         return [4 /*yield*/, this.getIdFilter()];
-                    case 14: return [4 /*yield*/, _g.apply(_f, [(_p.where = _s.sent(),
-                                _p)])];
+                    case 14: return [4 /*yield*/, _f.apply(_e, [(_o.where = _t.sent(),
+                                _o)])];
                     case 15:
-                        updatedRow = (updatedRow = _s.sent())[0];
+                        updatedRow = (updatedRow = _t.sent())[0];
                         return [3 /*break*/, 18];
                     case 16: return [4 /*yield*/, this.edp.insert(d)];
                     case 17:
-                        updatedRow = _s.sent();
-                        _s.label = 18;
+                        updatedRow = _t.sent();
+                        _t.label = 18;
                     case 18: return [3 /*break*/, 24];
                     case 19:
                         changesOnly = {};
@@ -2181,71 +2214,69 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         if (!wasChanged)
                             return [2 /*return*/, this.instance];
                         if (!doNotSave_1) return [3 /*break*/, 22];
-                        _j = (_h = this.edp).find;
-                        _q = {};
+                        _h = (_g = this.edp).find;
+                        _p = {};
                         return [4 /*yield*/, this.getIdFilter()];
-                    case 20: return [4 /*yield*/, _j.apply(_h, [(_q.where = _s.sent(), _q)])];
+                    case 20: return [4 /*yield*/, _h.apply(_g, [(_p.where = _t.sent(), _p)])];
                     case 21:
-                        updatedRow = (_s.sent())[0];
+                        updatedRow = (_t.sent())[0];
                         return [3 /*break*/, 24];
                     case 22: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
                     case 23:
-                        updatedRow = _s.sent();
-                        _s.label = 24;
+                        updatedRow = _t.sent();
+                        _t.label = 24;
                     case 24:
                         if (!updatedRow) return [3 /*break*/, 26];
                         return [4 /*yield*/, this.loadDataFrom(updatedRow)];
                     case 25:
-                        _s.sent();
-                        _s.label = 26;
+                        _t.sent();
+                        _t.label = 26;
                     case 26:
                         e.id = this.getId();
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 36];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 36];
                         if (!this.info.entityInfo.saved) return [3 /*break*/, 28];
                         return [4 /*yield*/, this.info.entityInfo.saved(this.instance, e)];
                     case 27:
-                        _s.sent();
-                        _s.label = 28;
+                        _t.sent();
+                        _t.label = 28;
                     case 28:
-                        if (!this.repository.listeners) return [3 /*break*/, 36];
-                        _s.label = 29;
+                        if (!this.repo.listeners) return [3 /*break*/, 36];
+                        _t.label = 29;
                     case 29:
-                        _s.trys.push([29, 34, 35, 36]);
-                        _k = tslib_1.__values(this.repository.listeners.filter(function (x) { return x.saved; })), _l = _k.next();
-                        _s.label = 30;
+                        _t.trys.push([29, 34, 35, 36]);
+                        _j = tslib_1.__values(this.repo.listeners), _k = _j.next();
+                        _t.label = 30;
                     case 30:
-                        if (!!_l.done) return [3 /*break*/, 33];
-                        listener = _l.value;
-                        return [4 /*yield*/, listener.saved(this.instance, isNew)];
+                        if (!!_k.done) return [3 /*break*/, 33];
+                        listener = _k.value;
+                        return [4 /*yield*/, ((_s = listener.saved) === null || _s === void 0 ? void 0 : _s.call(listener, this.instance, isNew))];
                     case 31:
-                        _s.sent();
-                        _s.label = 32;
+                        _t.sent();
+                        _t.label = 32;
                     case 32:
-                        _l = _k.next();
+                        _k = _j.next();
                         return [3 /*break*/, 30];
                     case 33: return [3 /*break*/, 36];
                     case 34:
-                        e_33_1 = _s.sent();
+                        e_33_1 = _t.sent();
                         e_33 = { error: e_33_1 };
                         return [3 /*break*/, 36];
                     case 35:
                         try {
-                            if (_l && !_l.done && (_r = _k.return)) _r.call(_k);
+                            if (_k && !_k.done && (_q = _j.return)) _q.call(_j);
                         }
                         finally { if (e_33) throw e_33.error; }
                         return [7 /*endfinally*/];
-                    case 36: return [4 /*yield*/, this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
+                    case 36: return [4 /*yield*/, this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
                     case 37:
-                        _s.sent();
+                        _t.sent();
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
                     case 38:
-                        err_1 = _s.sent();
+                        err_1 = _t.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_1)];
-                    case 39:
-                        _s.sent();
-                        return [3 /*break*/, 40];
+                    case 39: throw _t.sent();
                     case 40: return [3 /*break*/, 42];
                     case 41:
                         this.isLoading = false;
@@ -2314,17 +2345,17 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             fields: self.fields,
             id: self.getId(),
             originalId: self.getOriginalId(),
-            metadata: self.repository.metadata,
-            repository: self.repository,
+            metadata: self.repo.metadata,
+            repository: self.repo,
             preventDefault: function () { return preventDefault(); },
-            relations: self.repository.relations(self.instance),
+            relations: self.repo.relations(self.instance),
         };
     };
     rowHelperImplementation.prototype.getIdFilter = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repository._translateWhereToFilter(this.repository.metadata.idMetadata.getIdFilter(this.id))];
+                    case 0: return [4 /*yield*/, this.repo._translateWhereToFilter(this.repo.metadata.idMetadata.getIdFilter(this.id))];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -2334,55 +2365,56 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var doDelete, e, _a, _b, listener, e_36_1, err_2;
             var e_36, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         this.__clearErrorsAndReportChanged();
                         doDelete = true;
                         e = this.buildLifeCycleEvent(function () { return (doDelete = false); });
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 2];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 2];
                         if (!this.info.entityInfo.deleting) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.info.entityInfo.deleting(this.instance, e)];
                     case 1:
-                        _d.sent();
-                        _d.label = 2;
+                        _e.sent();
+                        _e.label = 2;
                     case 2:
                         this.__assertValidity();
-                        _d.label = 3;
+                        _e.label = 3;
                     case 3:
-                        _d.trys.push([3, 17, , 19]);
+                        _e.trys.push([3, 17, , 19]);
                         if (!doDelete) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.edp.delete(this.id)];
                     case 4:
-                        _d.sent();
-                        _d.label = 5;
+                        _e.sent();
+                        _e.label = 5;
                     case 5:
-                        if (!!this.repository._dataProvider.isProxy) return [3 /*break*/, 7];
+                        if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 7];
                         if (!this.info.entityInfo.deleted) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.info.entityInfo.deleted(this.instance, e)];
                     case 6:
-                        _d.sent();
-                        _d.label = 7;
+                        _e.sent();
+                        _e.label = 7;
                     case 7:
-                        if (!this.repository.listeners) return [3 /*break*/, 15];
-                        _d.label = 8;
+                        if (!this.repo.listeners) return [3 /*break*/, 15];
+                        _e.label = 8;
                     case 8:
-                        _d.trys.push([8, 13, 14, 15]);
-                        _a = tslib_1.__values(this.repository.listeners.filter(function (x) { return x.deleted; })), _b = _a.next();
-                        _d.label = 9;
+                        _e.trys.push([8, 13, 14, 15]);
+                        _a = tslib_1.__values(this.repo.listeners), _b = _a.next();
+                        _e.label = 9;
                     case 9:
                         if (!!_b.done) return [3 /*break*/, 12];
                         listener = _b.value;
-                        return [4 /*yield*/, listener.deleted(this.instance)];
+                        return [4 /*yield*/, ((_d = listener.deleted) === null || _d === void 0 ? void 0 : _d.call(listener, this.instance))];
                     case 10:
-                        _d.sent();
-                        _d.label = 11;
+                        _e.sent();
+                        _e.label = 11;
                     case 11:
                         _b = _a.next();
                         return [3 /*break*/, 9];
                     case 12: return [3 /*break*/, 15];
                     case 13:
-                        e_36_1 = _d.sent();
+                        e_36_1 = _e.sent();
                         e_36 = { error: e_36_1 };
                         return [3 /*break*/, 15];
                     case 14:
@@ -2391,17 +2423,15 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         finally { if (e_36) throw e_36.error; }
                         return [7 /*endfinally*/];
-                    case 15: return [4 /*yield*/, this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
+                    case 15: return [4 /*yield*/, this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
                     case 16:
-                        _d.sent();
+                        _e.sent();
                         this._wasDeleted = true;
                         return [3 /*break*/, 19];
                     case 17:
-                        err_2 = _d.sent();
+                        err_2 = _e.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_2)];
-                    case 18:
-                        _d.sent();
-                        return [3 /*break*/, 19];
+                    case 18: throw _e.sent();
                     case 19: return [2 /*return*/];
                 }
             });
@@ -2488,7 +2518,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _d = col.key;
                         return [4 /*yield*/, col.options.serverExpression(this.instance)];
                     case 3:
-                        _c[_d] = _f.sent();
+                        _c[_d] =
+                            (_f.sent());
                         _f.label = 4;
                     case 4:
                         _b = _a.next();
@@ -2540,12 +2571,13 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, c, col, e_40_1, e, _c, _d, listener, e_41_1;
             var e_40, _e, e_41, _f;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
+            var _g;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
-                        _g.trys.push([0, 5, 6, 7]);
+                        _h.trys.push([0, 5, 6, 7]);
                         _a = tslib_1.__values(this.fieldsMetadata), _b = _a.next();
-                        _g.label = 1;
+                        _h.label = 1;
                     case 1:
                         if (!!_b.done) return [3 /*break*/, 4];
                         c = _b.value;
@@ -2553,14 +2585,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         col = new FieldRefImplementation(c.options, c, this.instance, this, this);
                         return [4 /*yield*/, col.__performValidation()];
                     case 2:
-                        _g.sent();
-                        _g.label = 3;
+                        _h.sent();
+                        _h.label = 3;
                     case 3:
                         _b = _a.next();
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_40_1 = _g.sent();
+                        e_40_1 = _h.sent();
                         e_40 = { error: e_40_1 };
                         return [3 /*break*/, 7];
                     case 6:
@@ -2574,28 +2606,28 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         e = this.buildLifeCycleEvent(function () { });
                         return [4 /*yield*/, this.info.entityInfo.validation(this.instance, e)];
                     case 8:
-                        _g.sent();
-                        _g.label = 9;
+                        _h.sent();
+                        _h.label = 9;
                     case 9:
-                        if (!this.repository.listeners) return [3 /*break*/, 17];
-                        _g.label = 10;
+                        if (!this.repo.listeners) return [3 /*break*/, 17];
+                        _h.label = 10;
                     case 10:
-                        _g.trys.push([10, 15, 16, 17]);
-                        _c = tslib_1.__values(this.repository.listeners.filter(function (x) { return x.validating; })), _d = _c.next();
-                        _g.label = 11;
+                        _h.trys.push([10, 15, 16, 17]);
+                        _c = tslib_1.__values(this.repo.listeners), _d = _c.next();
+                        _h.label = 11;
                     case 11:
                         if (!!_d.done) return [3 /*break*/, 14];
                         listener = _d.value;
-                        return [4 /*yield*/, listener.validating(this.instance)];
+                        return [4 /*yield*/, ((_g = listener.validating) === null || _g === void 0 ? void 0 : _g.call(listener, this.instance))];
                     case 12:
-                        _g.sent();
-                        _g.label = 13;
+                        _h.sent();
+                        _h.label = 13;
                     case 13:
                         _d = _c.next();
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_41_1 = _g.sent();
+                        e_41_1 = _h.sent();
                         e_41 = { error: e_41_1 };
                         return [3 /*break*/, 17];
                     case 16:
@@ -2619,10 +2651,11 @@ function prepareColumnInfo(r, remult) {
 function getFields(container, remult) {
     return getControllerRef(container, remult).fields;
 }
-exports.getFields = getFields;
 function getControllerRef(container, remultArg) {
     var remultVar = remultArg || remult_proxy_js_1.remult;
+    //@ts-ignore
     var result = container[controllerColumns];
+    //@ts-ignore
     if (!result)
         result = container[getEntityRef_js_1.entityMember];
     if (!result) {
@@ -2637,11 +2670,14 @@ function getControllerRef(container, remultArg) {
             }
             base = Object.getPrototypeOf(base);
         }
-        container[controllerColumns] = result = new controllerRefImpl(prepareColumnInfo(columnSettings_1, remultVar).map(function (x) { return new columnDefsImpl(x, undefined, remultVar); }), container, remultVar);
+        //@ts-ignore
+        container[controllerColumns] = result = new controllerRefImpl(prepareColumnInfo(columnSettings_1, remultVar).map(function (x) {
+            return new columnDefsImpl(x, undefined, //TODO - not sure
+            remultVar);
+        }), container, remultVar);
     }
     return result;
 }
-exports.getControllerRef = getControllerRef;
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
@@ -2720,7 +2756,7 @@ var FieldRefImplementation = /** @class */ (function () {
         this.helper = helper;
         this.rowBase = rowBase;
         this.target = this.settings.target;
-        this.entityRef = this.helper;
+        this.entityRef = this.helper; //todo - I'm not sure this is correct in the case of ControllerInstance
     }
     FieldRefImplementation.prototype.subscribe = function (listener) {
         if (!this._subscribers) {
@@ -2741,6 +2777,21 @@ var FieldRefImplementation = /** @class */ (function () {
         var lu = this.rowBase.lookups.get(this.metadata.key);
         return this.rawOriginalValue() === null;
     };
+    Object.defineProperty(FieldRefImplementation.prototype, "key", {
+        get: function () {
+            return this.metadata.key;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(FieldRefImplementation.prototype, "repo", {
+        get: function () {
+            var _a;
+            return (_a = this.helper) === null || _a === void 0 ? void 0 : _a.repository;
+        },
+        enumerable: false,
+        configurable: true
+    });
     FieldRefImplementation.prototype.load = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var lu, rel, _a, _b, val;
@@ -2749,21 +2800,20 @@ var FieldRefImplementation = /** @class */ (function () {
                     case 0:
                         lu = this.rowBase.lookups.get(this.metadata.key);
                         rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(this.metadata);
-                        if (!rel) return [3 /*break*/, 5];
+                        if (!(rel && this.helper)) return [3 /*break*/, 5];
                         if (!(rel.type === 'toMany')) return [3 /*break*/, 2];
                         _a = this.container;
                         _b = this.metadata.key;
-                        return [4 /*yield*/, this.helper.repository
-                                .relations(this.container)[this.metadata.key].find()];
+                        return [4 /*yield*/, this.repo.relations(this.container)[this.key].find()];
                     case 1: return [2 /*return*/, (_a[_b] = _c.sent())];
-                    case 2: return [4 /*yield*/, this.helper.repository
+                    case 2: return [4 /*yield*/, this.repo
                             .relations(this.container)[this.metadata.key].findOne()];
                     case 3:
                         val = _c.sent();
                         if (val)
                             this.container[this.metadata.key] = val;
                         else
-                            return [2 /*return*/, null];
+                            return [2 /*return*/, null]; //TODO: check if this (!) is correct
                         _c.label = 4;
                     case 4: return [3 /*break*/, 9];
                     case 5:
@@ -2884,15 +2934,15 @@ var FieldRefImplementation = /** @class */ (function () {
         return (JSON.stringify(this.metadata.valueConverter.toJson(this.rowBase.originalValues[this.metadata.key])) != JSON.stringify(this.metadata.valueConverter.toJson(val)));
     };
     FieldRefImplementation.prototype.__performValidation = function () {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var processValidation, self_1, event_1, _b, _c, v, _d, e_44_1, _e, error_1;
-            var e_44, _f;
+            var processValidation, self_1, event_1, _a, _b, v, _c, e_44_1, _d, error_1;
+            var e_44, _e;
             var _this = this;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
+            var _f, _g;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
-                        _g.trys.push([0, 12, , 13]);
+                        _h.trys.push([0, 12, , 13]);
                         processValidation = function (result) {
                             if (result !== true && result !== undefined && !_this.error) {
                                 if (typeof result === 'string' && result.length > 0)
@@ -2911,7 +2961,7 @@ var FieldRefImplementation = /** @class */ (function () {
                             set error(value) {
                                 self_1.error = value;
                             },
-                            isNew: (_a = this.entityRef) === null || _a === void 0 ? void 0 : _a.isNew(),
+                            isNew: (_g = (_f = this.entityRef) === null || _f === void 0 ? void 0 : _f.isNew()) !== null && _g !== void 0 ? _g : false,
                             load: function () { return self_1.load(); },
                             metadata: self_1.metadata,
                             originalValue: self_1.originalValue,
@@ -2922,48 +2972,48 @@ var FieldRefImplementation = /** @class */ (function () {
                             isBackend: function () { var _a, _b, _c; return !((_c = (_b = (_a = self_1.rowBase) === null || _a === void 0 ? void 0 : _a.remult) === null || _b === void 0 ? void 0 : _b.dataProvider) === null || _c === void 0 ? void 0 : _c.isProxy); },
                         };
                         if (!Array.isArray(this.settings.validate)) return [3 /*break*/, 9];
-                        _g.label = 1;
+                        _h.label = 1;
                     case 1:
-                        _g.trys.push([1, 6, 7, 8]);
-                        _b = tslib_1.__values(this.settings.validate), _c = _b.next();
-                        _g.label = 2;
+                        _h.trys.push([1, 6, 7, 8]);
+                        _a = tslib_1.__values(this.settings.validate), _b = _a.next();
+                        _h.label = 2;
                     case 2:
-                        if (!!_c.done) return [3 /*break*/, 5];
-                        v = _c.value;
-                        _d = processValidation;
+                        if (!!_b.done) return [3 /*break*/, 5];
+                        v = _b.value;
+                        _c = processValidation;
                         return [4 /*yield*/, v(this.container, event_1)];
                     case 3:
-                        _d.apply(void 0, [_g.sent()]);
-                        _g.label = 4;
+                        _c.apply(void 0, [_h.sent()]);
+                        _h.label = 4;
                     case 4:
-                        _c = _b.next();
+                        _b = _a.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_44_1 = _g.sent();
+                        e_44_1 = _h.sent();
                         e_44 = { error: e_44_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
-                            if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
+                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
                         finally { if (e_44) throw e_44.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
                         if (!(typeof this.settings.validate === 'function')) return [3 /*break*/, 11];
-                        _e = processValidation;
+                        _d = processValidation;
                         return [4 /*yield*/, this.settings.validate(this.container, event_1)];
                     case 10:
-                        _e.apply(void 0, [_g.sent()]);
-                        _g.label = 11;
+                        _d.apply(void 0, [_h.sent()]);
+                        _h.label = 11;
                     case 11: return [3 /*break*/, 13];
                     case 12:
-                        error_1 = _g.sent();
+                        error_1 = _h.sent();
                         if (typeof error_1 === 'string')
                             this.error = error_1;
                         else
-                            this.error = error_1.message;
+                            this.error = error_1 === null || error_1 === void 0 ? void 0 : error_1.message;
                         return [3 /*break*/, 13];
                     case 13: return [2 /*return*/];
                 }
@@ -2991,30 +3041,32 @@ var tempCaptionTransformer = {
 exports.CaptionTransformer = remult_static_js_1.remultStatic.captionTransformer ||
     (remult_static_js_1.remultStatic.captionTransformer = tempCaptionTransformer);
 function buildCaption(caption, key, remult, metaData) {
-    var result;
+    var result = undefined;
     if (typeof caption === 'function') {
         if (remult)
             result = caption(remult);
     }
     else if (caption)
         result = caption;
-    result = exports.CaptionTransformer.transformCaption(remult, key, result, metaData);
+    result = exports.CaptionTransformer.transformCaption(remult, key, result !== null && result !== void 0 ? result : '', metaData);
     if (result)
         return result;
     if (key)
         return (0, column_js_1.makeTitle)(key);
     return '';
 }
-exports.buildCaption = buildCaption;
 var columnDefsImpl = /** @class */ (function () {
     function columnDefsImpl(settings, entityDefs, remult) {
         var _this = this;
+        var _a;
         this.settings = settings;
         this.entityDefs = entityDefs;
         this.remult = remult;
+        this.readonly = false;
+        this.isServerExpression = false;
         this.options = this.settings;
         this.target = this.settings.target;
-        this.valueConverter = new Proxy(this.settings.valueConverter, {
+        this.valueConverter = new Proxy((_a = this.settings.valueConverter) !== null && _a !== void 0 ? _a : {}, {
             get: function (target, prop) {
                 var result = target[prop];
                 if (typeof result === 'function') {
@@ -3086,7 +3138,7 @@ var columnDefsImpl = /** @class */ (function () {
     };
     Object.defineProperty(columnDefsImpl.prototype, "dbReadOnly", {
         get: function () {
-            return this.settings.dbReadOnly;
+            return Boolean(this.settings.dbReadOnly);
         },
         enumerable: false,
         configurable: true
@@ -3122,12 +3174,17 @@ var EntityFullInfo = /** @class */ (function () {
                     : [this.field];
             },
             createIdInFilter: function (items) {
+                var _a;
                 if (items.length > 0)
                     return {
                         $or: items.map(function (x) {
                             return _this.idMetadata.getIdFilter((0, getEntityRef_js_1.getEntityRef)(x).getId());
                         }),
                     };
+                else
+                    return _a = {},
+                        _a[_this.fields.toArray()[0].key] = [],
+                        _a;
             },
             isIdField: function (col) {
                 return col.key == _this.idMetadata.field.key;
@@ -3166,11 +3223,11 @@ var EntityFullInfo = /** @class */ (function () {
             else
                 crud = this.options.allowApiCrud;
             if (this.options.allowApiDelete === undefined)
-                this.options.allowApiDelete = crud;
+                this.entityInfo.allowApiDelete = crud;
             if (this.options.allowApiInsert === undefined)
-                this.options.allowApiInsert = crud;
+                this.entityInfo.allowApiInsert = crud;
             if (this.options.allowApiUpdate === undefined)
-                this.options.allowApiUpdate = crud;
+                this.entityInfo.allowApiUpdate = crud;
             if (this.options.allowApiRead === undefined)
                 this.options.allowApiRead = this.options.allowApiCrud;
         }
@@ -3218,8 +3275,9 @@ var EntityFullInfo = /** @class */ (function () {
                 this.idMetadata.field = r_2;
         }
         if (!this.idMetadata.field) {
-            if (this.fields['id'])
-                this.idMetadata.field = this.fields['id'];
+            var idField = this.fields['id'];
+            if (idField)
+                this.idMetadata.field = idField;
             else
                 this.idMetadata.field = tslib_1.__spreadArray([], tslib_1.__read(this.fields), false)[0];
         }
@@ -3279,12 +3337,10 @@ function FieldType() {
         return target;
     };
 }
-exports.FieldType = FieldType;
 function isAutoIncrement(f) {
     var _a, _b;
     return ((_b = (_a = f.options) === null || _a === void 0 ? void 0 : _a.valueConverter) === null || _b === void 0 ? void 0 : _b.fieldTypeInDb) === 'autoincrement';
 }
-exports.isAutoIncrement = isAutoIncrement;
 function ValueListFieldType() {
     var options = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -3302,10 +3358,9 @@ function ValueListFieldType() {
                     }
                     return validators_js_1.Validators.in(values)(entity, ref);
                 };
-            }], tslib_1.__read(options), false))(type, context);
+            }], tslib_1.__read(options), false))(type);
     };
 }
-exports.ValueListFieldType = ValueListFieldType;
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
         var e_46, _a, _b;
@@ -3415,12 +3470,11 @@ function getValueList(type) {
         if (options)
             return ValueListInfo.get(type).getValues();
     }
-    var optionalValues = meta === null || meta === void 0 ? void 0 : meta.options[exports.fieldOptionalValuesFunctionKey];
+    var optionalValues = (meta === null || meta === void 0 ? void 0 : meta.options)[exports.fieldOptionalValuesFunctionKey];
     if (optionalValues)
         return optionalValues();
     return undefined;
 }
-exports.getValueList = getValueList;
 exports.storableMember = Symbol.for('storableMember');
 exports.fieldOptionalValuesFunctionKey = Symbol.for('fieldOptionalValues');
 function buildOptions(options, remult) {
@@ -3449,7 +3503,6 @@ function buildOptions(options, remult) {
     }
     return r;
 }
-exports.buildOptions = buildOptions;
 function decorateColumnSettings(settings, remult) {
     if (settings.valueType) {
         var settingsOnTypeLevel = settings.valueType[exports.storableMember];
@@ -3538,23 +3591,22 @@ function decorateColumnSettings(settings, remult) {
     if (!settings.valueConverter.fromJson) {
         settings.valueConverter.fromJson = function (x) { return x; };
     }
+    var fromJson = settings.valueConverter.fromJson;
+    var toJson = settings.valueConverter.toJson;
     if (!settings.valueConverter.toDb) {
-        settings.valueConverter.toDb = function (x) { return settings.valueConverter.toJson(x); };
+        settings.valueConverter.toDb = function (x) { return toJson(x); };
     }
     if (!settings.valueConverter.fromDb) {
-        settings.valueConverter.fromDb = function (x) { return settings.valueConverter.fromJson(x); };
+        settings.valueConverter.fromDb = function (x) { return fromJson(x); };
     }
     if (!settings.valueConverter.toInput) {
-        settings.valueConverter.toInput = function (x) { return settings.valueConverter.toJson(x); };
+        settings.valueConverter.toInput = function (x) { return toJson(x); };
     }
     if (!settings.valueConverter.fromInput) {
-        settings.valueConverter.fromInput = function (x) {
-            return settings.valueConverter.fromJson(x);
-        };
+        settings.valueConverter.fromInput = function (x) { return fromJson(x); };
     }
     return settings;
 }
-exports.decorateColumnSettings = decorateColumnSettings;
 var EntityBase = /** @class */ (function () {
     function EntityBase() {
     }
@@ -3627,7 +3679,7 @@ var QueryResultImpl = /** @class */ (function () {
     QueryResultImpl.prototype.getPage = function (page) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                if (page < 1)
+                if ((page !== null && page !== void 0 ? page : 0) < 1)
                     page = 1;
                 return [2 /*return*/, this.repo.find({
                         where: this.options.where,
@@ -3658,9 +3710,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var _a, e_49, _b, _c;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _d, _e, _f, x, e_49_1;
+            var i, _a, _b, _c, x, e_49_1;
+            var _d, e_49, _e, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -3668,21 +3720,21 @@ var QueryResultImpl = /** @class */ (function () {
                         _g.label = 1;
                     case 1:
                         _g.trys.push([1, 7, 8, 13]);
-                        _d = true, _e = tslib_1.__asyncValues(this);
+                        _a = true, _b = tslib_1.__asyncValues(this);
                         _g.label = 2;
-                    case 2: return [4 /*yield*/, _e.next()];
+                    case 2: return [4 /*yield*/, _b.next()];
                     case 3:
-                        if (!(_f = _g.sent(), _a = _f.done, !_a)) return [3 /*break*/, 6];
-                        _c = _f.value;
-                        _d = false;
-                        x = _c;
+                        if (!(_c = _g.sent(), _d = _c.done, !_d)) return [3 /*break*/, 6];
+                        _f = _c.value;
+                        _a = false;
+                        x = _f;
                         return [4 /*yield*/, what(x)];
                     case 4:
                         _g.sent();
                         i++;
                         _g.label = 5;
                     case 5:
-                        _d = true;
+                        _a = true;
                         return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
@@ -3691,8 +3743,8 @@ var QueryResultImpl = /** @class */ (function () {
                         return [3 /*break*/, 13];
                     case 8:
                         _g.trys.push([8, , 11, 12]);
-                        if (!(!_d && !_a && (_b = _e.return))) return [3 /*break*/, 10];
-                        return [4 /*yield*/, _b.call(_e)];
+                        if (!(!_a && !_d && (_e = _b.return))) return [3 /*break*/, 10];
+                        return [4 /*yield*/, _e.call(_b)];
                     case 9:
                         _g.sent();
                         _g.label = 10;
@@ -3725,7 +3777,9 @@ var QueryResultImpl = /** @class */ (function () {
                             })];
                     case 1:
                         items = _a.sent();
-                        nextPage = undefined;
+                        nextPage = function () {
+                            throw new Error('no more pages');
+                        };
                         hasNextPage = items.length == this.options.pageSize;
                         if (!hasNextPage) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.repo._createAfterFilter(this.options.orderBy, items[items.length - 1])];
@@ -3756,16 +3810,17 @@ var QueryResultImpl = /** @class */ (function () {
         var j = 0;
         itStrategy = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var _a, _b, _c, prev;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         if (!this.options.progress) return [3 /*break*/, 2];
                         _b = (_a = this.options.progress).progress;
                         _c = j++;
                         return [4 /*yield*/, this.count()];
                     case 1:
-                        _b.apply(_a, [_c / (_d.sent())]);
-                        _d.label = 2;
+                        _b.apply(_a, [_c / (_e.sent())]);
+                        _e.label = 2;
                     case 2:
                         if (!(currentPage === undefined || itemIndex == currentPage.items.length)) return [3 /*break*/, 7];
                         if (currentPage && !currentPage.hasNextPage)
@@ -3774,29 +3829,29 @@ var QueryResultImpl = /** @class */ (function () {
                         if (!currentPage) return [3 /*break*/, 4];
                         return [4 /*yield*/, currentPage.nextPage()];
                     case 3:
-                        currentPage = _d.sent();
+                        currentPage = _e.sent();
                         return [3 /*break*/, 6];
                     case 4: return [4 /*yield*/, this.paginator()];
                     case 5:
-                        currentPage = _d.sent();
-                        _d.label = 6;
+                        currentPage = _e.sent();
+                        _e.label = 6;
                     case 6:
                         itemIndex = 0;
                         if (currentPage.items.length == 0) {
                             return [2 /*return*/, { value: undefined, done: true }];
                         }
                         else {
-                            if ((prev === null || prev === void 0 ? void 0 : prev.items.length) > 0) {
+                            if ((_d = prev === null || prev === void 0 ? void 0 : prev.items.length) !== null && _d !== void 0 ? _d : 0 > 0) {
                                 if (this.repo.getEntityRef(prev.items[0]).getId() ==
                                     this.repo.getEntityRef(currentPage.items[0]).getId())
                                     throw new Error('pagination failure, returned same first row');
                             }
                         }
-                        _d.label = 7;
+                        _e.label = 7;
                     case 7:
                         if (itemIndex < currentPage.items.length)
                             return [2 /*return*/, { value: currentPage.items[itemIndex++], done: false }];
-                        return [2 /*return*/];
+                        return [2 /*return*/, { done: true, value: undefined }];
                 }
             });
         }); };
@@ -3858,7 +3913,6 @@ function getEntityMetadata(entity) {
     }
     return entity;
 }
-exports.getEntityMetadata = getEntityMetadata;
 function getRepository(entity) {
     var settings = (0, getEntityRef_js_1.getEntitySettings)(entity, false);
     if (settings) {
@@ -3866,7 +3920,6 @@ function getRepository(entity) {
     }
     return entity;
 }
-exports.getRepository = getRepository;
 function promiseAll(array, mapToPromise) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var result, index, element, _a, _b;