remult 0.13.8 → 0.13.11

package/package.json

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

package/src/remult3/RepositoryImplementation.d.ts

@@ -247,6 +247,8 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
     fieldTypeInDb?: string;
     inputType?: string;
 }
+export declare function getValueList<T>(field: FieldRef<T>): T[];
+export declare function getValueList<T>(field: FieldMetadata<T>): T[];
 export declare function getValueList<T>(type: ClassType<T>): T[];
 export declare function Field<entityType = any, valueType = any>(valueType: () => ClassType<valueType>, ...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
 export declare const storableMember: unique symbol;

package/src/remult3/RepositoryImplementation.js

@@ -473,7 +473,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) {
@@ -2279,6 +2279,7 @@ 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 = [];
@@ -2306,9 +2307,11 @@ var ValueListInfo = /** @class */ (function () {
                     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);
                         });
                     }
                 }
@@ -2372,6 +2375,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;

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

@@ -14,3 +14,13 @@ export declare enum Priority {
     High = 1,
     Critical = 2
 }
+export declare class tasksWithStringEnum extends IdEntity {
+    title: string;
+    completed: boolean;
+    priority: PriorityWithString;
+}
+export declare enum PriorityWithString {
+    Low = "Low",
+    High = "High",
+    Critical = "Critical"
+}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Priority = exports.tasksWithEnum = exports.stam = void 0;
+exports.PriorityWithString = exports.tasksWithStringEnum = 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");
@@ -1432,22 +1432,97 @@ var 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) {
+        var r, item, _b, _c;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, createEntity(tasksWithEnum)];
                 case 1:
-                    r = _b.sent();
+                    r = _d.sent();
                     return [4 /*yield*/, r.insert({
                             title: 'a',
                             priority: Priority.Critical
                         })];
                 case 2:
-                    _b.sent();
+                    _d.sent();
                     return [4 /*yield*/, r.findFirst()];
                 case 3:
-                    item = _b.sent();
+                    item = _d.sent();
                     expect(item.priority).toBe(Priority.Critical);
+                    _b = expect;
+                    return [4 /*yield*/, r.count({ priority: Priority.Critical })];
+                case 4:
+                    _b.apply(void 0, [_d.sent()]).toBe(1);
+                    _c = expect;
+                    return [4 /*yield*/, r.count({ priority: Priority.Low })];
+                case 5:
+                    _c.apply(void 0, [_d.sent()]).toBe(0);
+                    return [2 /*return*/];
+            }
+        });
+    });
+});
+var tasksWithStringEnum = /** @class */ (function (_super) {
+    tslib_1.__extends(tasksWithStringEnum, _super);
+    function tasksWithStringEnum() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.title = '';
+        _this.completed = false;
+        _this.priority = PriorityWithString.Low;
+        return _this;
+    }
+    tslib_1.__decorate([
+        remult3_1.Fields.string(),
+        tslib_1.__metadata("design:type", Object)
+    ], tasksWithStringEnum.prototype, "title", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.boolean(),
+        tslib_1.__metadata("design:type", Object)
+    ], tasksWithStringEnum.prototype, "completed", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.object(),
+        tslib_1.__metadata("design:type", Object)
+    ], tasksWithStringEnum.prototype, "priority", void 0);
+    tasksWithStringEnum = tslib_1.__decorate([
+        remult3_1.Entity('tasksWithStringEnum', {
+            allowApiCrud: true
+        })
+    ], tasksWithStringEnum);
+    return tasksWithStringEnum;
+}(id_entity_1.IdEntity));
+exports.tasksWithStringEnum = tasksWithStringEnum;
+var PriorityWithString;
+(function (PriorityWithString) {
+    PriorityWithString["Low"] = "Low";
+    PriorityWithString["High"] = "High";
+    PriorityWithString["Critical"] = "Critical";
+})(PriorityWithString = exports.PriorityWithString || (exports.PriorityWithString = {}));
+db_tests_setup_1.testAll("task with enum string", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var r, item, _b, _c;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
+                case 0: return [4 /*yield*/, createEntity(tasksWithStringEnum)];
+                case 1:
+                    r = _d.sent();
+                    return [4 /*yield*/, r.insert({
+                            title: 'a',
+                            priority: PriorityWithString.Critical
+                        })];
+                case 2:
+                    _d.sent();
+                    return [4 /*yield*/, r.findFirst()];
+                case 3:
+                    item = _d.sent();
+                    expect(item.priority).toBe(PriorityWithString.Critical);
+                    _b = expect;
+                    return [4 /*yield*/, r.count({ priority: PriorityWithString.Critical })];
+                case 4:
+                    _b.apply(void 0, [_d.sent()]).toBe(1);
+                    _c = expect;
+                    return [4 /*yield*/, r.count({ priority: PriorityWithString.Low })];
+                case 5:
+                    _c.apply(void 0, [_d.sent()]).toBe(0);
                     return [2 /*return*/];
             }
         });