remult 0.13.10 → 0.13.13

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.Entity = exports.BuildEntity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.Fields1 = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.Entity = exports.BuildEntity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
 var tslib_1 = require("tslib");
 var column_1 = require("../column");
 var context_1 = require("../context");
@@ -189,16 +189,12 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype.delete = function (item) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(typeof item === "string" || typeof item === "number")) return [3 /*break*/, 1];
-                        return [2 /*return*/, this.edp.delete(item)];
-                    case 1: return [4 /*yield*/, this.getEntityRef(item).delete()];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                if (typeof item === "string" || typeof item === "number")
+                    return [2 /*return*/, this.edp.delete(item)];
+                else {
+                    return [2 /*return*/, this.getRefForExistingRow(item, undefined).delete()];
                 }
+                return [2 /*return*/];
             });
         });
     };
@@ -226,25 +222,47 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.update = function (id, entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var row, obj, key, updatedRow;
+            var ref;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        row = new rowHelperImplementation(this._info, Object.assign({}, entity), this, this.edp, this.remult, false);
-                        obj = row.copyDataToObject();
-                        for (key in entity) {
-                            if (Object.prototype.hasOwnProperty.call(entity, key)) {
-                                entity[key] = obj[key];
-                            }
-                        }
-                        return [4 /*yield*/, this.edp.update(id, entity)];
-                    case 1:
-                        updatedRow = _a.sent();
-                        return [2 /*return*/, this.mapRawDataToResult(updatedRow, undefined)];
+                        ref = this.getRefForExistingRow(entity, id);
+                        return [4 /*yield*/, ref.save()];
+                    case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
         });
     };
+    RepositoryImplementation.prototype.getRefForExistingRow = function (entity, id) {
+        var e_4, _a;
+        var ref = getEntityRef(entity, false);
+        if (!ref) {
+            var instance = new this.entity(this.remult);
+            try {
+                for (var _b = tslib_1.__values(this.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var field = _c.value;
+                    instance[field.key] = entity[field.key];
+                }
+            }
+            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; }
+            }
+            var row_1 = new rowHelperImplementation(this._info, instance, this, this.edp, this.remult, false);
+            if (id)
+                row_1.id = id;
+            else
+                row_1.id = row_1.getId();
+            ref = row_1;
+            Object.defineProperty(instance, entityMember, {
+                get: function () { return row_1; }
+            });
+        }
+        return ref;
+    };
     RepositoryImplementation.prototype.save = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var ref, id;
@@ -277,7 +295,7 @@ var RepositoryImplementation = /** @class */ (function () {
             function loadManyToOne(repo, toLoad) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var rows, rows_1, rows_1_1, r;
-                    var _a, e_6, _b;
+                    var _a, e_7, _b;
                     return tslib_1.__generator(this, function (_c) {
                         switch (_c.label) {
                             case 0: return [4 /*yield*/, repo.find({ where: (_a = repo.metadata.idMetadata).getIdFilter.apply(_a, tslib_1.__spread(toLoad)) })];
@@ -289,20 +307,20 @@ var RepositoryImplementation = /** @class */ (function () {
                                         repo.addToCache(r);
                                     }
                                 }
-                                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                                catch (e_7_1) { e_7 = { error: e_7_1 }; }
                                 finally {
                                     try {
                                         if (rows_1_1 && !rows_1_1.done && (_b = rows_1.return)) _b.call(rows_1);
                                     }
-                                    finally { if (e_6) throw e_6.error; }
+                                    finally { if (e_7) throw e_7.error; }
                                 }
                                 return [2 /*return*/];
                         }
                     });
                 });
             }
-            var opt, _a, rawRows, loadFields, _b, _c, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_4_1, result;
-            var e_4, _d, e_5, _e;
+            var opt, _a, rawRows, loadFields, _b, _c, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_5_1, result;
+            var e_5, _d, e_6, _e;
             var _this = this;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
@@ -346,7 +364,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         repo = this.remult.repo(col.valueType);
                         toLoad = [];
                         try {
-                            for (rawRows_1 = (e_5 = void 0, tslib_1.__values(rawRows)), rawRows_1_1 = rawRows_1.next(); !rawRows_1_1.done; rawRows_1_1 = rawRows_1.next()) {
+                            for (rawRows_1 = (e_6 = void 0, tslib_1.__values(rawRows)), rawRows_1_1 = rawRows_1.next(); !rawRows_1_1.done; rawRows_1_1 = rawRows_1.next()) {
                                 r = rawRows_1_1.value;
                                 val = r[col.key];
                                 if (val !== undefined && val !== null && !toLoad.includes(val) && !repo.idCache.has(val)) {
@@ -354,12 +372,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
                         finally {
                             try {
                                 if (rawRows_1_1 && !rawRows_1_1.done && (_e = rawRows_1.return)) _e.call(rawRows_1);
                             }
-                            finally { if (e_5) throw e_5.error; }
+                            finally { if (e_6) throw e_6.error; }
                         }
                         if (!(toLoad.length > 0)) return [3 /*break*/, 6];
                         return [4 /*yield*/, loadManyToOne(repo, toLoad)];
@@ -371,14 +389,14 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_4_1 = _f.sent();
-                        e_4 = { error: e_4_1 };
+                        e_5_1 = _f.sent();
+                        e_5 = { error: e_5_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 10: return [4 /*yield*/, Promise.all(rawRows.map(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
@@ -473,7 +491,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                         _a.label = 2;
                     case 2:
-                        r = this.find(options).then(function (items) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        r = this.find(tslib_1.__assign(tslib_1.__assign({}, options), { limit: 1 })).then(function (items) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var r;
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
@@ -513,7 +531,7 @@ var RepositoryImplementation = /** @class */ (function () {
     RepositoryImplementation.prototype.fromJson = function (json, newRow) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var obj, _a, _b, col, r, helper;
-            var e_7, _c;
+            var e_8, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -526,12 +544,12 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                         if (!newRow) return [3 /*break*/, 2];
                         r = this.create();
@@ -640,7 +658,7 @@ function createOldEntity(entity, remult) {
     var key = getEntityKey(entity);
     var base = Object.getPrototypeOf(entity);
     var _loop_1 = function () {
-        var e_8, _a;
+        var e_9, _a;
         var baseCols = exports.columnsOfType.get(base);
         if (baseCols) {
             r.unshift.apply(r, tslib_1.__spread(baseCols.filter(function (x) { return !r.find(function (y) { return y.key == x.key; }); })));
@@ -669,17 +687,17 @@ function createOldEntity(entity, remult) {
                 }
             };
             try {
-                for (var _b = (e_8 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = (e_9 = void 0, tslib_1.__values(functions)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var key_1 = _c.value;
                     _loop_2(key_1);
                 }
             }
-            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+            catch (e_9_1) { e_9 = { error: e_9_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_8) throw e_8.error; }
+                finally { if (e_9) throw e_9.error; }
             }
         }
         base = Object.getPrototypeOf(base);
@@ -692,7 +710,7 @@ function createOldEntity(entity, remult) {
 exports.createOldEntity = createOldEntity;
 var rowHelperBase = /** @class */ (function () {
     function rowHelperBase(columnsInfo, instance, remult) {
-        var e_9, _a;
+        var e_10, _a;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.instance = instance;
@@ -747,12 +765,12 @@ var rowHelperBase = /** @class */ (function () {
                 _loop_3(col);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (columnsInfo_1_1 && !columnsInfo_1_1.done && (_a = columnsInfo_1.return)) _a.call(columnsInfo_1);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_10) throw e_10.error; }
         }
     }
     Object.defineProperty(rowHelperBase.prototype, "error", {
@@ -774,7 +792,7 @@ var rowHelperBase = /** @class */ (function () {
         return this._subscribers.subscribe(listener);
     };
     rowHelperBase.prototype.initSubscribers = function () {
-        var e_10, _a;
+        var e_11, _a;
         var _this = this;
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
@@ -809,12 +827,12 @@ var rowHelperBase = /** @class */ (function () {
                     _loop_4(col);
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_11_1) { e_11 = { error: e_11_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_11) throw e_11.error; }
             }
         }
     };
@@ -845,7 +863,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.__assertValidity = function () {
-        var e_11, _a;
+        var e_12, _a;
         if (!this.hasErrors()) {
             var error = {
                 modelState: Object.assign({}, this.errors),
@@ -862,12 +880,12 @@ var rowHelperBase = /** @class */ (function () {
                         }
                     }
                 }
-                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_12) throw e_12.error; }
                 }
             }
             throw error;
@@ -902,7 +920,7 @@ var rowHelperBase = /** @class */ (function () {
         this._reportChangedToEntityAndFields();
     };
     rowHelperBase.prototype._reportChangedToEntityAndFields = function () {
-        var e_12, _a;
+        var e_13, _a;
         if (this._subscribers) {
             this._subscribers.reportChanged();
             try {
@@ -912,12 +930,12 @@ var rowHelperBase = /** @class */ (function () {
                     ref._subscribers.reportChanged();
                 }
             }
-            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+            catch (e_13_1) { e_13 = { error: e_13_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_12) throw e_12.error; }
+                finally { if (e_13) throw e_13.error; }
             }
         }
     };
@@ -927,7 +945,7 @@ var rowHelperBase = /** @class */ (function () {
         return !!!this.error && this.errors == undefined;
     };
     rowHelperBase.prototype.copyDataToObject = function () {
-        var e_13, _a;
+        var e_14, _a;
         var d = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -946,12 +964,12 @@ var rowHelperBase = /** @class */ (function () {
                 d[col.key] = val;
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         return d;
     };
@@ -1007,7 +1025,7 @@ var rowHelperBase = /** @class */ (function () {
         });
     };
     rowHelperBase.prototype.toApiJson = function () {
-        var e_14, _a;
+        var e_15, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -1032,19 +1050,19 @@ var rowHelperBase = /** @class */ (function () {
                 }
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         return result;
     };
     rowHelperBase.prototype._updateEntityBasedOnApi = function (body) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var keys, _a, _b, col, lu;
-            var e_15, _c;
+            var e_16, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1064,12 +1082,12 @@ var rowHelperBase = /** @class */ (function () {
                                     }
                             }
                         }
-                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_15) throw e_15.error; }
+                            finally { if (e_16) throw e_16.error; }
                         }
                         return [4 /*yield*/, Promise.all(tslib_1.__spread(this.fields).map(function (x) { return x.load(); }))];
                     case 1:
@@ -1084,7 +1102,7 @@ var rowHelperBase = /** @class */ (function () {
 var rowHelperImplementation = /** @class */ (function (_super) {
     tslib_1.__extends(rowHelperImplementation, _super);
     function rowHelperImplementation(info, instance, repository, edp, remult, _isNew) {
-        var e_16, _a;
+        var e_17, _a;
         var _this = _super.call(this, info.columnsInfo, instance, remult) || this;
         _this.info = info;
         _this.repository = repository;
@@ -1106,12 +1124,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     }
                 }
             }
-            catch (e_16_1) { e_16 = { error: e_16_1 }; }
+            catch (e_17_1) { e_17 = { error: e_17_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_16) throw e_16.error; }
+                finally { if (e_17) throw e_17.error; }
             }
         }
         if (_this.info.options.entityRefInit)
@@ -1176,7 +1194,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     Object.defineProperty(rowHelperImplementation.prototype, "fields", {
         get: function () {
-            var _a, e_17, _b;
+            var _a, e_18, _b;
             if (!this._columns) {
                 var _items_1 = [];
                 var r_1 = (_a = {
@@ -1191,12 +1209,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         _items_1.push(r_1[c.key] = new FieldRefImplementation(c, this.info.fields[c.key], this.instance, this, this));
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_18_1) { e_18 = { error: e_18_1 }; }
                 finally {
                     try {
                         if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_18) throw e_18.error; }
                 }
                 this._columns = r_1;
             }
@@ -1208,8 +1226,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     rowHelperImplementation.prototype.save = function () {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var doNotSave_1, _b, _c, col, e_18_1, d, ignoreKeys, _d, _e, field, f, updatedRow, changesOnly, wasChanged, key, element, err_1;
-            var e_18, _f, e_19, _g;
+            var doNotSave_1, _b, _c, col, e_19_1, d, ignoreKeys, _d, _e, field, f, updatedRow, changesOnly, wasChanged, key, element, err_1;
+            var e_19, _f, e_20, _g;
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
@@ -1242,14 +1260,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_18_1 = _h.sent();
-                        e_18 = { error: e_18_1 };
+                        e_19_1 = _h.sent();
+                        e_19 = { error: e_19_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
                         }
-                        finally { if (e_18) throw e_18.error; }
+                        finally { if (e_19) throw e_19.error; }
                         return [7 /*endfinally*/];
                     case 9:
                         if (!this.info.entityInfo.saving) return [3 /*break*/, 11];
@@ -1272,12 +1290,12 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                                 }
                             }
                         }
-                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
                         finally {
                             try {
                                 if (_e && !_e.done && (_g = _d.return)) _g.call(_d);
                             }
-                            finally { if (e_19) throw e_19.error; }
+                            finally { if (e_20) throw e_20.error; }
                         }
                         if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
                             delete (d.id);
@@ -1348,8 +1366,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.delete = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, listener, e_20_1, err_2;
-            var e_20, _c;
+            var _a, _b, listener, e_21_1, err_2;
+            var e_21, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1391,14 +1409,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 8];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_20_1 = _d.sent();
-                        e_20 = { error: e_20_1 };
+                        e_21_1 = _d.sent();
+                        e_21 = { error: e_21_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_20) throw e_20.error; }
+                        finally { if (e_21) throw e_21.error; }
                         return [7 /*endfinally*/];
                     case 14:
                         this._wasDeleted = true;
@@ -1416,8 +1434,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.loadDataFrom = function (data, loadItems) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, lu, e_21_1;
-            var e_21, _c;
+            var _a, _b, col, lu, e_22_1;
+            var e_22, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1452,14 +1470,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_21_1 = _d.sent();
-                        e_21 = { error: e_21_1 };
+                        e_22_1 = _d.sent();
+                        e_22 = { error: e_22_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_21) throw e_21.error; }
+                        finally { if (e_22) throw e_22.error; }
                         return [7 /*endfinally*/];
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
@@ -1479,8 +1497,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
     };
     rowHelperImplementation.prototype.calcServerExpression = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, _c, _d, e_22_1;
-            var e_22, _e;
+            var _a, _b, col, _c, _d, e_23_1;
+            var e_23, _e;
             return tslib_1.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -1505,14 +1523,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_22_1 = _f.sent();
-                        e_22 = { error: e_22_1 };
+                        e_23_1 = _f.sent();
+                        e_23 = { error: e_23_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_22) throw e_22.error; }
+                        finally { if (e_23) throw e_23.error; }
                         return [7 /*endfinally*/];
                     case 8: return [2 /*return*/];
                 }
@@ -1525,7 +1543,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return this._isNew;
     };
     rowHelperImplementation.prototype.wasChanged = function () {
-        var e_23, _a;
+        var e_24, _a;
         var _b;
         (_b = this._subscribers) === null || _b === void 0 ? void 0 : _b.reportObserved();
         try {
@@ -1535,19 +1553,19 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     return true;
             }
         }
-        catch (e_23_1) { e_23 = { error: e_23_1 }; }
+        catch (e_24_1) { e_24 = { error: e_24_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_23) throw e_23.error; }
+            finally { if (e_24) throw e_24.error; }
         }
         return false;
     };
     rowHelperImplementation.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, c, col, e_24_1, _c, _d, listener, e_25_1;
-            var e_24, _e, e_25, _f;
+            var _a, _b, c, col, e_25_1, _c, _d, listener, e_26_1;
+            var e_25, _e, e_26, _f;
             return tslib_1.__generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -1568,14 +1586,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_24_1 = _g.sent();
-                        e_24 = { error: e_24_1 };
+                        e_25_1 = _g.sent();
+                        e_25 = { error: e_25_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                         }
-                        finally { if (e_24) throw e_24.error; }
+                        finally { if (e_25) throw e_25.error; }
                         return [7 /*endfinally*/];
                     case 7:
                         if (!this.info.entityInfo.validation) return [3 /*break*/, 9];
@@ -1602,14 +1620,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         return [3 /*break*/, 11];
                     case 14: return [3 /*break*/, 17];
                     case 15:
-                        e_25_1 = _g.sent();
-                        e_25 = { error: e_25_1 };
+                        e_26_1 = _g.sent();
+                        e_26 = { error: e_26_1 };
                         return [3 /*break*/, 17];
                     case 16:
                         try {
                             if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
                         }
-                        finally { if (e_25) throw e_25.error; }
+                        finally { if (e_26) throw e_26.error; }
                         return [7 /*endfinally*/];
                     case 17: return [2 /*return*/];
                 }
@@ -1651,7 +1669,7 @@ exports.getControllerRef = getControllerRef;
 var controllerRefImpl = /** @class */ (function (_super) {
     tslib_1.__extends(controllerRefImpl, _super);
     function controllerRefImpl(columnsInfo, instance, remult) {
-        var _a, e_26, _b;
+        var _a, e_27, _b;
         var _this = _super.call(this, columnsInfo, instance, remult) || this;
         var _items = [];
         var r = (_a = {
@@ -1666,20 +1684,20 @@ var controllerRefImpl = /** @class */ (function (_super) {
                 _items.push(r[col.key] = new FieldRefImplementation(col, new columnDefsImpl(col, undefined, remult), instance, undefined, _this));
             }
         }
-        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (columnsInfo_2_1 && !columnsInfo_2_1.done && (_b = columnsInfo_2.return)) _b.call(columnsInfo_2);
             }
-            finally { if (e_26) throw e_26.error; }
+            finally { if (e_27) throw e_27.error; }
         }
         _this.fields = r;
         return _this;
     }
     controllerRefImpl.prototype.__performColumnAndEntityValidations = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, col, e_27_1;
-            var e_27, _c;
+            var _a, _b, col, e_28_1;
+            var e_28, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1699,14 +1717,14 @@ var controllerRefImpl = /** @class */ (function (_super) {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_27_1 = _d.sent();
-                        e_27 = { error: e_27_1 };
+                        e_28_1 = _d.sent();
+                        e_28 = { error: e_28_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_27) throw e_27.error; }
+                        finally { if (e_28) throw e_28.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }
@@ -1865,8 +1883,8 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     FieldRefImplementation.prototype.__performValidation = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var x, _a, _b, v, e_28_1;
-            var e_28, _c;
+            var x, _a, _b, v, e_29_1;
+            var e_29, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -1889,14 +1907,14 @@ var FieldRefImplementation = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_28_1 = _d.sent();
-                        e_28 = { error: e_28_1 };
+                        e_29_1 = _d.sent();
+                        e_29 = { error: e_29_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_28) throw e_28.error; }
+                        finally { if (e_29) throw e_29.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 11];
                     case 9:
@@ -2023,7 +2041,7 @@ var columnDefsImpl = /** @class */ (function () {
 exports.columnDefsImpl = columnDefsImpl;
 var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
-        var _a, e_29, _b;
+        var _a, e_30, _b;
         var _this = this;
         this.columnsInfo = columnsInfo;
         this.entityInfo = entityInfo;
@@ -2093,12 +2111,12 @@ var EntityFullInfo = /** @class */ (function () {
                 _items.push(r[x.key] = new columnDefsImpl(x, this, remult));
             }
         }
-        catch (e_29_1) { e_29 = { error: e_29_1 }; }
+        catch (e_30_1) { e_30 = { error: e_30_1 }; }
         finally {
             try {
                 if (columnsInfo_3_1 && !columnsInfo_3_1.done && (_b = columnsInfo_3.return)) _b.call(columnsInfo_3);
             }
-            finally { if (e_29) throw e_29.error; }
+            finally { if (e_30) throw e_30.error; }
         }
         this.fields = r;
         this.caption = buildCaption(entityInfo.caption, this.key, remult);
@@ -2172,12 +2190,6 @@ function FieldType() {
     };
 }
 exports.FieldType = FieldType;
-exports.Fields1 = {
-    String: function () {
-        return function (a) {
-        };
-    }
-};
 var Fields = /** @class */ (function () {
     function Fields() {
     }
@@ -2278,7 +2290,7 @@ function ValueListFieldType() {
 exports.ValueListFieldType = ValueListFieldType;
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
-        var e_30, _a, _b;
+        var e_31, _a, _b;
         var _this = this;
         this.valueListType = valueListType;
         this.byIdMap = new Map();
@@ -2316,12 +2328,12 @@ var ValueListInfo = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_30_1) { e_30 = { error: e_30_1 }; }
+            catch (e_31_1) { e_31 = { error: e_31_1 }; }
             finally {
                 try {
                     if (options_1_1 && !options_1_1.done && (_a = options_1.return)) _a.call(options_1);
                 }
-                finally { if (e_30) throw e_30.error; }
+                finally { if (e_31) throw e_31.error; }
             }
             if (this.values.find(function (s) { return s.id === undefined; }))
                 throw new Error("ValueType " + this.valueListType + " has values without an id");
@@ -2375,6 +2387,17 @@ var ValueListInfo = /** @class */ (function () {
 exports.ValueListInfo = ValueListInfo;
 var typeCache = new Map();
 function getValueList(type) {
+    var _a, _b, _c;
+    {
+        var fr = (_b = (_a = type) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.valueType;
+        if (fr)
+            return ValueListInfo.get(fr).getValues();
+    }
+    {
+        var fr = (_c = type) === null || _c === void 0 ? void 0 : _c.valueType;
+        if (fr)
+            return ValueListInfo.get(fr).getValues();
+    }
     return ValueListInfo.get(type).getValues();
 }
 exports.getValueList = getValueList;
@@ -2427,7 +2450,7 @@ function Field(valueType) {
 exports.Field = Field;
 exports.storableMember = Symbol("storableMember");
 function buildOptions(options, remult) {
-    var e_31, _a;
+    var e_32, _a;
     var r = {};
     try {
         for (var options_2 = tslib_1.__values(options), options_2_1 = options_2.next(); !options_2_1.done; options_2_1 = options_2.next()) {
@@ -2440,12 +2463,12 @@ function buildOptions(options, remult) {
             }
         }
     }
-    catch (e_31_1) { e_31 = { error: e_31_1 }; }
+    catch (e_32_1) { e_32 = { error: e_32_1 }; }
     finally {
         try {
             if (options_2_1 && !options_2_1.done && (_a = options_2.return)) _a.call(options_2);
         }
-        finally { if (e_31) throw e_31.error; }
+        finally { if (e_32) throw e_32.error; }
     }
     return r;
 }
@@ -2543,7 +2566,7 @@ function Entity(key) {
             }
         }
         var factory = function (remult) {
-            var e_32, _a;
+            var e_33, _a;
             var r = {};
             try {
                 for (var options_3 = tslib_1.__values(options), options_3_1 = options_3.next(); !options_3_1.done; options_3_1 = options_3.next()) {
@@ -2556,12 +2579,12 @@ function Entity(key) {
                     }
                 }
             }
-            catch (e_32_1) { e_32 = { error: e_32_1 }; }
+            catch (e_33_1) { e_33 = { error: e_33_1 }; }
             finally {
                 try {
                     if (options_3_1 && !options_3_1.done && (_a = options_3.return)) _a.call(options_3);
                 }
-                finally { if (e_32) throw e_32.error; }
+                finally { if (e_33) throw e_33.error; }
             }
             var base = Object.getPrototypeOf(target);
             if (base) {
@@ -2667,9 +2690,9 @@ var QueryResultImpl = /** @class */ (function () {
         });
     };
     QueryResultImpl.prototype.forEach = function (what) {
-        var e_33, _a;
+        var e_34, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var i, _b, _c, x, e_33_1;
+            var i, _b, _c, x, e_34_1;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -2691,8 +2714,8 @@ var QueryResultImpl = /** @class */ (function () {
                     case 5: return [3 /*break*/, 2];
                     case 6: return [3 /*break*/, 13];
                     case 7:
-                        e_33_1 = _d.sent();
-                        e_33 = { error: e_33_1 };
+                        e_34_1 = _d.sent();
+                        e_34 = { error: e_34_1 };
                         return [3 /*break*/, 13];
                     case 8:
                         _d.trys.push([8, , 11, 12]);
@@ -2703,7 +2726,7 @@ var QueryResultImpl = /** @class */ (function () {
                         _d.label = 10;
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        if (e_33) throw e_33.error;
+                        if (e_34) throw e_34.error;
                         return [7 /*endfinally*/];
                     case 12: return [7 /*endfinally*/];
                     case 13: return [2 /*return*/, i];