remult 0.17.2 → 0.18.0

package/src/remult3/RepositoryImplementation.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.Entity = 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;
+exports.getRepository = exports.getEntityMetadata = exports.ControllerBase = exports.EntityBase = exports.Entity = 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");
 var filter_interfaces_1 = require("../filter/filter-interfaces");
 var sort_1 = require("../sort");
 var uuid_1 = require("uuid");
+var cuid_1 = tslib_1.__importDefault(require("cuid"));
 var valueConverters_1 = require("../valueConverters");
 var filter_interfaces_2 = require("../filter/filter-interfaces");
 var assign_1 = require("../../assign");
+var remult_proxy_1 = require("../remult-proxy");
+var getId_1 = require("./getId");
 //import { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import("class-validator".toString())
@@ -281,8 +284,10 @@ var RepositoryImplementation = /** @class */ (function () {
                 finally { if (e_5) throw e_5.error; }
             }
             var row_1 = new rowHelperImplementation(this._info, instance, this, this.edp, this.remult, false);
-            if (id)
+            if (id) {
                 row_1.id = id;
+                row_1.originalId = id;
+            }
             else
                 row_1.id = row_1.getId();
             ref = row_1;
@@ -319,6 +324,27 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
+    RepositoryImplementation.prototype.liveQuery = function (options) {
+        var _this = this;
+        if (!options)
+            options = {};
+        return {
+            subscribe: function (l) {
+                var _a, _b;
+                var listener = l;
+                if (typeof l === "function") {
+                    listener = {
+                        next: l,
+                        complete: function () { },
+                        error: 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);
+            }
+        };
+    };
     RepositoryImplementation.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             function loadManyToOne(repo, toLoad) {
@@ -348,41 +374,32 @@ var RepositoryImplementation = /** @class */ (function () {
                     });
                 });
             }
-            var opt, _a, rawRows, loadFields, _b, _c, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_6_1, result;
-            var e_6, _d, e_7, _e;
+            var opt, rawRows, loadFields, _a, _b, col, ei, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, e_6_1, result;
+            var e_6, _c, e_7, _d;
             var _this = this;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         context_1.Remult.onFind(this._info, options);
-                        opt = {};
                         if (!options)
                             options = {};
-                        opt = {};
-                        if (!options.orderBy || Object.keys(options.orderBy).length === 0) {
-                            options.orderBy = this._info.entityInfo.defaultOrderBy;
-                        }
-                        _a = opt;
-                        return [4 /*yield*/, this.translateWhereToFilter(options.where)];
+                        return [4 /*yield*/, this.buildEntityDataProviderFindOptions(options)];
                     case 1:
-                        _a.where = _f.sent();
-                        opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
-                        opt.limit = options.limit;
-                        opt.page = options.page;
+                        opt = _e.sent();
                         return [4 /*yield*/, this.edp.find(opt)];
                     case 2:
-                        rawRows = _f.sent();
+                        rawRows = _e.sent();
                         loadFields = undefined;
                         if (options.load)
                             loadFields = options.load(this.metadata.fields);
-                        _f.label = 3;
+                        _e.label = 3;
                     case 3:
-                        _f.trys.push([3, 8, 9, 10]);
-                        _b = tslib_1.__values(this.metadata.fields), _c = _b.next();
-                        _f.label = 4;
+                        _e.trys.push([3, 8, 9, 10]);
+                        _a = tslib_1.__values(this.metadata.fields), _b = _a.next();
+                        _e.label = 4;
                     case 4:
-                        if (!!_c.done) return [3 /*break*/, 7];
-                        col = _c.value;
+                        if (!!_b.done) return [3 /*break*/, 7];
+                        col = _b.value;
                         ei = getEntitySettings(col.valueType, false);
                         if (!ei) return [3 /*break*/, 6];
                         load = !col.options.lazy;
@@ -403,26 +420,26 @@ var RepositoryImplementation = /** @class */ (function () {
                         catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
-                                if (rawRows_1_1 && !rawRows_1_1.done && (_e = rawRows_1.return)) _e.call(rawRows_1);
+                                if (rawRows_1_1 && !rawRows_1_1.done && (_d = rawRows_1.return)) _d.call(rawRows_1);
                             }
                             finally { if (e_7) throw e_7.error; }
                         }
                         if (!(toLoad.length > 0)) return [3 /*break*/, 6];
                         return [4 /*yield*/, loadManyToOne(repo, toLoad)];
                     case 5:
-                        _f.sent();
-                        _f.label = 6;
+                        _e.sent();
+                        _e.label = 6;
                     case 6:
-                        _c = _b.next();
+                        _b = _a.next();
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_6_1 = _f.sent();
+                        e_6_1 = _e.sent();
                         e_6 = { error: e_6_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
-                            if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
@@ -433,12 +450,35 @@ var RepositoryImplementation = /** @class */ (function () {
                             }
                         }); }); }))];
                     case 11:
-                        result = _f.sent();
+                        result = _e.sent();
                         return [2 /*return*/, result];
                 }
             });
         });
     };
+    RepositoryImplementation.prototype.buildEntityDataProviderFindOptions = function (options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var opt, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        opt = {};
+                        opt = {};
+                        if (!options.orderBy || Object.keys(options.orderBy).length === 0) {
+                            options.orderBy = this._info.entityInfo.defaultOrderBy;
+                        }
+                        _a = opt;
+                        return [4 /*yield*/, this.translateWhereToFilter(options.where)];
+                    case 1:
+                        _a.where = _b.sent();
+                        opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
+                        opt.limit = options.limit;
+                        opt.page = options.page;
+                        return [2 /*return*/, opt];
+                }
+            });
+        });
+    };
     RepositoryImplementation.prototype.mapRawDataToResult = function (r, loadFields) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var x, helper;
@@ -615,6 +655,7 @@ var RepositoryImplementation = /** @class */ (function () {
             throw new Error("id can be either number or string, but got: " + typeof (id));
         return this.findFirst({}, tslib_1.__assign(tslib_1.__assign({ useCache: true }, options), { where: this.metadata.idMetadata.getIdFilter(id) }));
     };
+    /* @internal*/
     RepositoryImplementation.prototype.translateWhereToFilter = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var z, _a, r;
@@ -636,7 +677,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 2: return [4 /*yield*/, filter_interfaces_1.Filter.fromEntityFilter(this.metadata, where)];
                     case 3:
                         r = _c.sent();
-                        if (!(r && !this.dataProvider.supportsCustomFilter)) return [3 /*break*/, 5];
+                        if (!(r && !this.dataProvider.supportsRawFilter)) return [3 /*break*/, 5];
                         return [4 /*yield*/, filter_interfaces_1.Filter.translateCustomWhere(r, this.metadata, this.remult)];
                     case 4:
                         r = _c.sent();
@@ -764,6 +805,12 @@ var rowHelperBase = /** @class */ (function () {
         this._isLoading = false;
         this.lookups = new Map();
         this.originalValues = {};
+        {
+            var fac = remult;
+            if (fac != null && fac.remultFactory) {
+                remult = fac.remultFactory();
+            }
+        }
         var _loop_3 = function (col) {
             var ei = getEntitySettings(col.valueType, false);
             if (ei && remult) {
@@ -1021,6 +1068,9 @@ var rowHelperBase = /** @class */ (function () {
     };
     rowHelperBase.prototype.saveOriginalData = function () {
         this.originalValues = this.copyDataToObject();
+        this.saveMoreOriginalData();
+    };
+    rowHelperBase.prototype.saveMoreOriginalData = function () {
     };
     rowHelperBase.prototype.validate = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -1200,10 +1250,10 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         configurable: true
     });
     rowHelperImplementation.prototype.getId = function () {
-        if (this.info.idMetadata.field instanceof column_1.CompoundIdField)
-            return this.info.idMetadata.field.getId(this.instance);
-        else
-            return this.instance[this.info.idMetadata.field.key];
+        return getId_1.getId(this.info, this.instance);
+    };
+    rowHelperImplementation.prototype.saveMoreOriginalData = function () {
+        this.originalId = this.getId();
     };
     rowHelperImplementation.prototype.wasDeleted = function () {
         var _a;
@@ -1277,7 +1327,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             return tslib_1.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
-                        _h.trys.push([0, , 25, 26]);
+                        _h.trys.push([0, , 26, 27]);
                         if (this._saving)
                             throw new Error("cannot save while entity is already saving");
                         this._saving = true;
@@ -1348,7 +1398,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         updatedRow = void 0;
                         _h.label = 12;
                     case 12:
-                        _h.trys.push([12, 22, , 24]);
+                        _h.trys.push([12, 23, , 25]);
                         (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
                         if (!this.isNew()) return [3 /*break*/, 14];
                         return [4 /*yield*/, this.edp.insert(d)];
@@ -1386,23 +1436,25 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 20:
                         _h.sent();
                         _h.label = 21;
-                    case 21:
+                    case 21: return [4 /*yield*/, this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }])];
+                    case 22:
+                        _h.sent();
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
-                    case 22:
+                    case 23:
                         err_1 = _h.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_1)];
-                    case 23:
+                    case 24:
                         _h.sent();
-                        return [3 /*break*/, 24];
-                    case 24: return [3 /*break*/, 26];
-                    case 25:
+                        return [3 /*break*/, 25];
+                    case 25: return [3 /*break*/, 27];
+                    case 26:
                         this.isLoading = false;
                         this._reportChangedToEntityAndFields();
                         this._saving = false;
                         return [7 /*endfinally*/];
-                    case 26: return [2 /*return*/];
+                    case 27: return [2 /*return*/];
                 }
             });
         });
@@ -1427,7 +1479,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         this.__assertValidity();
                         _d.label = 3;
                     case 3:
-                        _d.trys.push([3, 15, , 17]);
+                        _d.trys.push([3, 16, , 18]);
                         return [4 /*yield*/, this.edp.delete(this.id)];
                     case 4:
                         _d.sent();
@@ -1464,16 +1516,18 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         }
                         finally { if (e_23) throw e_23.error; }
                         return [7 /*endfinally*/];
-                    case 14:
-                        this._wasDeleted = true;
-                        return [3 /*break*/, 17];
+                    case 14: return [4 /*yield*/, this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }])];
                     case 15:
+                        _d.sent();
+                        this._wasDeleted = true;
+                        return [3 /*break*/, 18];
+                    case 16:
                         err_2 = _d.sent();
                         return [4 /*yield*/, this.catchSaveErrors(err_2)];
-                    case 16:
+                    case 17:
                         _d.sent();
-                        return [3 /*break*/, 17];
-                    case 17: return [2 /*return*/];
+                        return [3 /*break*/, 18];
+                    case 18: return [2 /*return*/];
                 }
             });
         });
@@ -1528,18 +1582,14 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 12: return [4 /*yield*/, this.calcServerExpression()];
                     case 13:
                         _d.sent();
-                        if (this.repository.metadata.idMetadata.field instanceof column_1.CompoundIdField) {
-                            this.id = this.repository.metadata.idMetadata.field.getId(this.instance);
-                        }
-                        else
-                            this.id = data[this.repository.metadata.idMetadata.field.key];
+                        this.id = getId_1.getId(this.info, this.instance);
                         return [2 /*return*/];
                 }
             });
         });
     };
     rowHelperImplementation.prototype.getOriginalId = function () {
-        return this.id;
+        return this.originalId;
     };
     rowHelperImplementation.prototype.calcServerExpression = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -1692,7 +1742,7 @@ function getFields(container, remult) {
 }
 exports.getFields = getFields;
 function getControllerRef(container, remultArg) {
-    var remultVar = remultArg || RepositoryImplementation.defaultRemult;
+    var remultVar = remultArg || remult_proxy_1.remult;
     var result = container[controllerColumns];
     if (!result)
         result = container[entityMember];
@@ -2052,26 +2102,32 @@ var columnDefsImpl = /** @class */ (function () {
         this.caption = buildCaption(settings.caption, settings.key, remult);
     }
     columnDefsImpl.prototype.getDbName = function () {
-        var _this = this;
-        if (this.dbNamePromise)
-            return this.dbNamePromise;
-        this.dbNamePromise = (function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var result;
             return tslib_1.__generator(this, function (_a) {
-                if (this.settings.sqlExpression) {
-                    if (typeof this.settings.sqlExpression === "function") {
-                        return [2 /*return*/, this.settings.sqlExpression(this.entityDefs)];
-                    }
-                    else
-                        return [2 /*return*/, this.settings.sqlExpression];
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, , 5, 6]);
+                        if (!this.settings.sqlExpression) return [3 /*break*/, 4];
+                        result = void 0;
+                        if (!(typeof this.settings.sqlExpression === "function")) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.settings.sqlExpression(this.entityDefs)];
+                    case 1:
+                        result = _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        result = this.settings.sqlExpression;
+                        _a.label = 3;
+                    case 3:
+                        if (!result)
+                            return [2 /*return*/, this.settings.dbName];
+                        return [2 /*return*/, result];
+                    case 4: return [2 /*return*/, this.settings.dbName];
+                    case 5: return [7 /*endfinally*/];
+                    case 6: return [2 /*return*/];
                 }
-                return [2 /*return*/, this.settings.dbName];
             });
-        }); })().then(function (x) {
-            if (x)
-                return x;
-            return _this.settings.dbName;
         });
-        return this.dbNamePromise;
     };
     Object.defineProperty(columnDefsImpl.prototype, "dbName", {
         get: function () {
@@ -2230,7 +2286,7 @@ var EntityFullInfo = /** @class */ (function () {
         if (typeof this.options.sqlExpression === "string")
             this.dbNamePromise = Promise.resolve(this.options.sqlExpression);
         else if (typeof this.options.sqlExpression === "function") {
-            var r = this.options.sqlExpression(this.fields);
+            var r = this.options.sqlExpression(this);
             if (r instanceof Promise)
                 this.dbNamePromise = r;
             else if (r)
@@ -2313,6 +2369,29 @@ var Fields = /** @class */ (function () {
         }
         return Field.apply(void 0, tslib_1.__spread([function () { return Number; }], options));
     };
+    Fields.createdAt = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Date; }, {
+                saving: function (_, ref) {
+                    if (getEntityRef(_).isNew())
+                        ref.value = new Date();
+                }
+            }], options));
+    };
+    Fields.updatedAt = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return Date; }, {
+                saving: function (_, ref) {
+                    ref.value = new Date();
+                }
+            }], options));
+    };
     Fields.uuid = function () {
         var options = [];
         for (var _i = 0; _i < arguments.length; _i++) {
@@ -2320,7 +2399,25 @@ var Fields = /** @class */ (function () {
         }
         return Field.apply(void 0, tslib_1.__spread([function () { return String; }, {
                 allowApiUpdate: false,
-                defaultValue: function () { return uuid_1.v4(); }
+                defaultValue: function () { return uuid_1.v4(); },
+                saving: function (_, r) {
+                    if (!r.value)
+                        r.value = uuid_1.v4();
+                }
+            }], options));
+    };
+    Fields.cuid = function () {
+        var options = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            options[_i] = arguments[_i];
+        }
+        return Field.apply(void 0, tslib_1.__spread([function () { return String; }, {
+                allowApiUpdate: false,
+                defaultValue: function () { return cuid_1.default(); },
+                saving: function (_, r) {
+                    if (!r.value)
+                        r.value = cuid_1.default();
+                }
             }], options));
     };
     Fields.string = function () {
@@ -2353,7 +2450,7 @@ function ValueListFieldType() {
     return function (type) {
         FieldType.apply(void 0, tslib_1.__spread([function (o) {
                 o.valueConverter = ValueListInfo.get(type),
-                    o.displayValue = function (item, val) { return val.caption; };
+                    o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; };
             }], options))(type);
     };
 }
@@ -2649,12 +2746,12 @@ function Entity(key) {
     }
     return function (target) {
         var _a;
-        for (var customFilterMember in target) {
-            if (Object.prototype.hasOwnProperty.call(target, customFilterMember)) {
-                var element = target[customFilterMember];
-                if ((_a = element === null || element === void 0 ? void 0 : element.customFilterInfo) === null || _a === void 0 ? void 0 : _a.customFilterTranslator) {
-                    if (!element.customFilterInfo.key)
-                        element.customFilterInfo.key = customFilterMember;
+        for (var rawFilterMember in target) {
+            if (Object.prototype.hasOwnProperty.call(target, rawFilterMember)) {
+                var element = target[rawFilterMember];
+                if ((_a = element === null || element === void 0 ? void 0 : element.rawFilterInfo) === null || _a === void 0 ? void 0 : _a.rawFilterTranslator) {
+                    if (!element.rawFilterInfo.key)
+                        element.rawFilterInfo.key = rawFilterMember;
                 }
             }
         }
@@ -2724,7 +2821,7 @@ var EntityBase = /** @class */ (function () {
 exports.EntityBase = EntityBase;
 var ControllerBase = /** @class */ (function () {
     function ControllerBase(remult) {
-        this.remult = remult || RepositoryImplementation.defaultRemult;
+        this.remult = remult || remult_proxy_1.remult;
     }
     ControllerBase.prototype.assign = function (values) {
         assign_1.assign(this, values);
@@ -2968,3 +3065,21 @@ var SubscribableImp = /** @class */ (function () {
     };
     return SubscribableImp;
 }());
+function getEntityMetadata(entity) {
+    if (entity.metadata)
+        return entity.metadata;
+    var settings = getEntitySettings(entity, false);
+    if (settings) {
+        return remult_proxy_1.RemultProxy.defaultRemult.repo(entity).metadata;
+    }
+    return entity;
+}
+exports.getEntityMetadata = getEntityMetadata;
+function getRepository(entity) {
+    var settings = getEntitySettings(entity, false);
+    if (settings) {
+        return remult_proxy_1.RemultProxy.defaultRemult.repo(entity);
+    }
+    return entity;
+}
+exports.getRepository = getRepository;

package/src/remult3/getId.d.ts

@@ -0,0 +1,2 @@
+import type { EntityMetadata } from "./remult3";
+export declare function getId<entityType>(meta: EntityMetadata<entityType>, instance: entityType): any;

package/src/remult3/getId.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getId = void 0;
+var column_1 = require("../column");
+function getId(meta, instance) {
+    if (meta.idMetadata.field instanceof column_1.CompoundIdField)
+        return meta.idMetadata.field.getId(instance);
+    else
+        return instance[meta.idMetadata.field.key];
+}
+exports.getId = getId;