remult 0.13.6 → 0.13.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.13.6",
+    "version": "0.13.9",
     "description": "remult core lib",
     "homepage": "https://remult.dev/",
     "repository": {

package/src/backend-tests/my-test.backend-spec.js

@@ -2,28 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var __1 = require("../..");
-var context_1 = require("../context");
 var remult_knex_1 = require("../../remult-knex");
-var Knex = require("knex");
 var dotenv_1 = require("dotenv");
 var backend_database_test_setup_backend_spec_1 = require("./backend-database-test-setup.backend-spec");
 var entityWithValidations_1 = require("../shared-tests/entityWithValidations");
 dotenv_1.config();
-describe("test", function () {
-    var remult;
-    var knex;
-    beforeAll(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        return tslib_1.__generator(this, function (_a) {
-            knex =
-                Knex.default({
-                    client: 'pg',
-                    connection: process.env.DATABASE_URL
-                });
-            remult = new context_1.Remult(new remult_knex_1.KnexDataProvider(knex));
-            return [2 /*return*/];
-        });
-    }); });
-});
 backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filter", function (_a) {
     var createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {

package/src/remult3/RepositoryImplementation.d.ts

@@ -224,7 +224,7 @@ export declare function isAutoIncrement(f: FieldMetadata): boolean;
 export interface StringFieldOptions<entityType = any> extends FieldOptions<entityType, string> {
     maxLength?: number;
 }
-export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => any;
+export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => void;
 export interface ValueListFieldOptions<entityType, valueType> extends FieldOptions<entityType, valueType> {
     getValues?: () => valueType[];
 }
@@ -235,8 +235,6 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
     private values;
     isNumeric: boolean;
     private constructor();
-    private loadedFromOptions;
-    private loadFromDecoratorOptions;
     getValues(): T[];
     byId(key: any): T;
     fromJson(val: any): T;

package/src/remult3/RepositoryImplementation.js

@@ -2269,7 +2269,7 @@ function ValueListFieldType() {
         options[_i] = arguments[_i];
     }
     return function (type) {
-        return FieldType.apply(void 0, tslib_1.__spread([function (o) {
+        FieldType.apply(void 0, tslib_1.__spread([function (o) {
                 o.valueConverter = ValueListInfo.get(type),
                     o.displayValue = function (item, val) { return val.caption; };
             }], options))(type);
@@ -2278,11 +2278,12 @@ function ValueListFieldType() {
 exports.ValueListFieldType = ValueListFieldType;
 var ValueListInfo = /** @class */ (function () {
     function ValueListInfo(valueListType) {
+        var e_30, _a, _b;
+        var _this = this;
         this.valueListType = valueListType;
         this.byIdMap = new Map();
         this.values = [];
         this.isNumeric = false;
-        this.loadedFromOptions = false;
         for (var member in this.valueListType) {
             var s = this.valueListType[member];
             if (s instanceof this.valueListType) {
@@ -2299,30 +2300,18 @@ var ValueListInfo = /** @class */ (function () {
         if (this.isNumeric) {
             this.fieldTypeInDb = 'integer';
         }
-    }
-    ValueListInfo.get = function (type) {
-        var r = typeCache.get(type);
-        if (!r) {
-            r = new ValueListInfo(type);
-            typeCache.set(type, r);
-        }
-        return r;
-    };
-    ValueListInfo.prototype.loadFromDecoratorOptions = function () {
-        var e_30, _a, _b;
-        if (this.loadedFromOptions)
-            return;
         var options = Reflect.getMetadata(exports.storableMember, this.valueListType);
         if (options) {
-            this.loadedFromOptions = true;
             try {
                 for (var options_1 = tslib_1.__values(options), options_1_1 = options_1.next(); !options_1_1.done; options_1_1 = options_1.next()) {
                     var op = options_1_1.value;
                     if (op === null || op === void 0 ? void 0 : op.getValues) {
                         (_b = this.values).splice.apply(_b, tslib_1.__spread([0, this.values.length], op.getValues()));
+                        this.byIdMap.clear();
                         this.values.forEach(function (s) {
                             if (s.caption === undefined && s.id !== undefined)
                                 s.caption = column_1.makeTitle(s.id);
+                            _this.byIdMap.set(s.id, s);
                         });
                     }
                 }
@@ -2335,15 +2324,23 @@ var ValueListInfo = /** @class */ (function () {
                 finally { if (e_30) throw e_30.error; }
             }
             if (this.values.find(function (s) { return s.id === undefined; }))
-                throw new Error("Type " + this.valueListType + " has values without an id");
+                throw new Error("ValueType " + this.valueListType + " has values without an id");
+        }
+        else
+            throw new Error("ValueType not yet initialized, did you forget to call @ValueListFieldType on " + valueListType);
+    }
+    ValueListInfo.get = function (type) {
+        var r = typeCache.get(type);
+        if (!r) {
+            r = new ValueListInfo(type);
+            typeCache.set(type, r);
         }
+        return r;
     };
     ValueListInfo.prototype.getValues = function () {
-        this.loadFromDecoratorOptions();
         return this.values;
     };
     ValueListInfo.prototype.byId = function (key) {
-        this.loadFromDecoratorOptions();
         if (this.isNumeric)
             key = +key;
         return this.byIdMap.get(key);

package/src/shared-tests/db-tests.db-tests.d.ts

@@ -1,5 +1,16 @@
 import { EntityBase } from "../remult3";
+import { IdEntity } from "../id-entity";
 export declare class stam extends EntityBase {
     id: number;
     title: string;
 }
+export declare class tasksWithEnum extends IdEntity {
+    title: string;
+    completed: boolean;
+    priority: Priority;
+}
+export declare enum Priority {
+    Low = 0,
+    High = 1,
+    Critical = 2
+}

package/src/shared-tests/db-tests.db-tests.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stam = void 0;
+exports.Priority = exports.tasksWithEnum = exports.stam = void 0;
 var tslib_1 = require("tslib");
 var data_api_1 = require("../data-api");
 var remult3_1 = require("../remult3");
@@ -20,6 +20,7 @@ var entityForCustomFilter_1 = require("../tests/entityForCustomFilter");
 var entityWithValidationsOnColumn_1 = require("../tests/entityWithValidationsOnColumn");
 var validators_1 = require("../validators");
 var models_1 = require("../tests/testModel/models");
+var id_entity_1 = require("../id-entity");
 db_tests_setup_1.testAll("what", function (_a) {
     var remult = _a.remult, createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
@@ -1393,3 +1394,62 @@ var p = /** @class */ (function (_super) {
     ], p);
     return p;
 }(remult3_1.EntityBase));
+var tasksWithEnum = /** @class */ (function (_super) {
+    tslib_1.__extends(tasksWithEnum, _super);
+    function tasksWithEnum() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.title = '';
+        _this.completed = false;
+        _this.priority = Priority.Low;
+        return _this;
+    }
+    tslib_1.__decorate([
+        remult3_1.Fields.string(),
+        tslib_1.__metadata("design:type", Object)
+    ], tasksWithEnum.prototype, "title", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.boolean(),
+        tslib_1.__metadata("design:type", Object)
+    ], tasksWithEnum.prototype, "completed", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.object(),
+        tslib_1.__metadata("design:type", Object)
+    ], tasksWithEnum.prototype, "priority", void 0);
+    tasksWithEnum = tslib_1.__decorate([
+        remult3_1.Entity('tasksWithEnum', {
+            allowApiCrud: true
+        })
+    ], tasksWithEnum);
+    return tasksWithEnum;
+}(id_entity_1.IdEntity));
+exports.tasksWithEnum = tasksWithEnum;
+var Priority;
+(function (Priority) {
+    Priority[Priority["Low"] = 0] = "Low";
+    Priority[Priority["High"] = 1] = "High";
+    Priority[Priority["Critical"] = 2] = "Critical";
+})(Priority = exports.Priority || (exports.Priority = {}));
+db_tests_setup_1.testAll("task with enum", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var r, item;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, createEntity(tasksWithEnum)];
+                case 1:
+                    r = _b.sent();
+                    return [4 /*yield*/, r.insert({
+                            title: 'a',
+                            priority: Priority.Critical
+                        })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, r.findFirst()];
+                case 3:
+                    item = _b.sent();
+                    expect(item.priority).toBe(Priority.Critical);
+                    return [2 /*return*/];
+            }
+        });
+    });
+});

package/src/tests/testModel/models.js

@@ -28,9 +28,15 @@ var TestStatus = /** @class */ (function () {
         this.id = id;
         this.caption = caption;
     }
-    TestStatus.open = new TestStatus();
-    TestStatus.closed = new TestStatus('cc');
-    TestStatus.hold = new TestStatus(undefined, 'hh');
+    TestStatus_1 = TestStatus;
+    var TestStatus_1;
+    TestStatus.open = new TestStatus_1();
+    TestStatus.closed = new TestStatus_1('cc');
+    TestStatus.hold = new TestStatus_1(undefined, 'hh');
+    TestStatus = TestStatus_1 = tslib_1.__decorate([
+        remult3_1.ValueListFieldType(),
+        tslib_1.__metadata("design:paramtypes", [String, String])
+    ], TestStatus);
     return TestStatus;
 }());
 exports.TestStatus = TestStatus;