remult 0.12.8 → 0.13.2

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

@@ -290,11 +290,11 @@ var testDateWithNull = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], testDateWithNull.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.DateOnlyField({ allowNull: true }),
+        remult3_1.Fields.DateOnly({ allowNull: true }),
         tslib_1.__metadata("design:type", Date)
     ], testDateWithNull.prototype, "d", void 0);
     testDateWithNull = tslib_1.__decorate([
@@ -778,7 +778,7 @@ db_tests_setup_1.testAll("Test unique Validation,", function (_a) {
                         return class_1;
                     }(remult_3_entities_1.Categories));
                     remult3_1.Entity('categories')(type);
-                    remult3_1.Field({
+                    remult3_1.Fields.String({
                         validate: function (en, col) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
@@ -840,7 +840,7 @@ db_tests_setup_1.testAll("Test unique Validation 2", function (_a) {
                         return class_2;
                     }(remult_3_entities_1.Categories));
                     remult3_1.Entity('sdfgds')(type);
-                    remult3_1.Field({
+                    remult3_1.Fields.String({
                         validate: validators_1.Validators.unique
                     })(type.prototype, "a");
                     return [4 /*yield*/, createEntity(type)];
@@ -879,11 +879,11 @@ var testNumbers = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.IntegerField(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], testNumbers.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Number(),
         tslib_1.__metadata("design:type", Number)
     ], testNumbers.prototype, "a", void 0);
     testNumbers = tslib_1.__decorate([
@@ -1123,10 +1123,8 @@ db_tests_setup_1.testAll("saves correctly to db", function (_a) {
                         return class_3;
                     }(remult3_1.EntityBase));
                     remult3_1.Entity('asdf', { allowApiCrud: true })(type);
-                    remult3_1.Field({
-                        valueType: Number
-                    })(type.prototype, 'id');
-                    remult3_1.Field({ valueType: Boolean })(type.prototype, "ok");
+                    remult3_1.Fields.Number()(type.prototype, 'id');
+                    remult3_1.Fields.Boolean()(type.prototype, "ok");
                     return [4 /*yield*/, createEntity(type)];
                 case 1:
                     r = (_b.sent()).create();
@@ -1152,15 +1150,15 @@ var autoIncrement = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.IntegerField(),
+        remult3_1.Fields.AutoIncrement(),
         tslib_1.__metadata("design:type", Number)
     ], autoIncrement.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.IntegerField(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], autoIncrement.prototype, "stam", void 0);
     autoIncrement = tslib_1.__decorate([
-        remult3_1.Entity("autoi", { allowApiCrud: true, dbAutoIncrementId: true })
+        remult3_1.Entity("autoi", { allowApiCrud: true })
     ], autoIncrement);
     return autoIncrement;
 }(remult3_1.EntityBase));
@@ -1234,6 +1232,27 @@ db_tests_setup_1.testAll("filter", function (_a) {
         });
     });
 }, false);
+db_tests_setup_1.testAll("large string field", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, r;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, createEntity(stam)];
+                case 1:
+                    s = _b.sent();
+                    return [4 /*yield*/, s.insert({ title: "1234567890".repeat(100) })];
+                case 2:
+                    _b.sent();
+                    return [4 /*yield*/, s.findFirst()];
+                case 3:
+                    r = _b.sent();
+                    expect(r.title).toBe("1234567890".repeat(100));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
 var testFilter = /** @class */ (function () {
     function testFilter() {
         this.id = 0;
@@ -1251,19 +1270,19 @@ var testFilter = /** @class */ (function () {
             }]
     }); });
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], testFilter.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], testFilter.prototype, "a", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], testFilter.prototype, "b", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], testFilter.prototype, "c", void 0);
     testFilter = tslib_1.__decorate([
@@ -1279,11 +1298,11 @@ var testStringWithNull = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], testStringWithNull.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field({ allowNull: true }),
+        remult3_1.Fields.String({ allowNull: true }),
         tslib_1.__metadata("design:type", String)
     ], testStringWithNull.prototype, "d", void 0);
     testStringWithNull = tslib_1.__decorate([
@@ -1300,11 +1319,11 @@ var stam = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], stam.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String({ maxLength: 1500 }),
         tslib_1.__metadata("design:type", String)
     ], stam.prototype, "title", void 0);
     stam = tslib_1.__decorate([
@@ -1321,15 +1340,15 @@ var p = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], p.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], p.prototype, "name", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Field(function () { return c_1.c; }),
         tslib_1.__metadata("design:type", c_1.c)
     ], p.prototype, "c", void 0);
     p = tslib_1.__decorate([

package/src/shared-tests/entityWithValidations.js

@@ -53,11 +53,11 @@ var entityWithValidations = /** @class */ (function (_super) {
     var entityWithValidations_1;
     entityWithValidations.savingRowCount = 0;
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], entityWithValidations.prototype, "myId", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], entityWithValidations.prototype, "name", void 0);
     entityWithValidations = entityWithValidations_1 = tslib_1.__decorate([

package/src/shared-tests/test-custom-id-column.spec.js

@@ -19,8 +19,8 @@ describe("custom id column", function () {
                             return class_1;
                         }(remult3_1.EntityBase));
                         remult3_1.BuildEntity(type, 'custom', {
-                            a: remult3_1.Field(),
-                            b: remult3_1.Field()
+                            a: remult3_1.Fields.Number(),
+                            b: remult3_1.Fields.Number()
                         }, { allowApiCrud: true });
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
@@ -58,8 +58,8 @@ describe("custom id column", function () {
                             return class_2;
                         }(remult3_1.EntityBase));
                         remult3_1.Entity('custom2', { allowApiCrud: true })(type);
-                        remult3_1.Field({ valueType: Number })(type.prototype, 'a');
-                        remult3_1.Field({ valueType: Number })(type.prototype, 'id');
+                        remult3_1.Fields.Number()(type.prototype, 'a');
+                        remult3_1.Fields.Number()(type.prototype, 'id');
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
                         c = _c.sent();
@@ -86,3 +86,25 @@ describe("custom id column", function () {
         });
     });
 });
+//typing game
+// var z = <Z>(y: Z) => {
+// }
+// z<number>(1);
+// function myBackendMethod<T>(types: T, values: values<T>) {
+// }
+// type values<T> = {
+//     [Property in keyof T]: T[Property] extends new (...args: any[]) => infer R ? R : any;
+// };
+// const a1 = AccountManager;
+// const a = {
+//     a: String.prototype,
+//     b: AccountManager.prototype
+// };
+// var zzz: AccountManager = undefined!;
+// myBackendMethod({
+//     a: String,
+//     b: AccountManager
+// }, {
+//     b: new AccountManager(),
+//     a: "asdf"
+// })

package/src/shared-tests/test-special-value.spec.js

@@ -66,11 +66,11 @@ var testGroups = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], testGroups.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Field(function () { return GroupsValue; }),
         tslib_1.__metadata("design:type", GroupsValue)
     ], testGroups.prototype, "g", void 0);
     testGroups = tslib_1.__decorate([

package/src/shared-tests/test-update-with-null.spec.js

@@ -11,11 +11,11 @@ var testNull = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], testNull.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field({ allowNull: true }),
+        remult3_1.Field(undefined, { allowNull: true }),
         tslib_1.__metadata("design:type", Object)
     ], testNull.prototype, "myCol", void 0);
     testNull = tslib_1.__decorate([

package/src/tests/c.js

@@ -12,11 +12,11 @@ var c = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], c.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], c.prototype, "name", void 0);
     c = tslib_1.__decorate([

package/src/tests/d.js

@@ -20,11 +20,11 @@ var d = /** @class */ (function (_super) {
     };
     d.count = 0;
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], d.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], d.prototype, "b", void 0);
     tslib_1.__decorate([

package/src/tests/dWithPrefilter.js

@@ -21,11 +21,11 @@ var dWithPrefilter = /** @class */ (function (_super) {
     var dWithPrefilter_1;
     dWithPrefilter.count = 0;
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], dWithPrefilter.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], dWithPrefilter.prototype, "b", void 0);
     tslib_1.__decorate([

package/src/tests/entityForCustomFilter.js

@@ -46,7 +46,7 @@ var entityForCustomFilter = /** @class */ (function (_super) {
     entityForCustomFilter.testNumericValue = filter_interfaces_1.Filter.createCustom(function (r, val) { return ({ id: val }); });
     entityForCustomFilter.testObjectValue = filter_interfaces_1.Filter.createCustom(function (r, val) { return ({ id: val.val }); });
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], entityForCustomFilter.prototype, "id", void 0);
     entityForCustomFilter = entityForCustomFilter_1 = tslib_1.__decorate([

package/src/tests/entityWithValidationsOnColumn.js

@@ -9,11 +9,11 @@ var entityWithValidationsOnColumn = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], entityWithValidationsOnColumn.prototype, "myId", void 0);
     tslib_1.__decorate([
-        remult3_1.Field({
+        remult3_1.Fields.String({
             validate: function (t, c) {
                 if (!t.name || t.name.length < 3)
                     c.error = 'invalid on column';

package/src/tests/h.js

@@ -8,19 +8,21 @@ var h = /** @class */ (function (_super) {
     function h() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    h_1 = h;
+    var h_1;
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], h.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Field(function () { return h_1; }),
         tslib_1.__metadata("design:type", h)
     ], h.prototype, "refH", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], h.prototype, "refHId", void 0);
-    h = tslib_1.__decorate([
+    h = h_1 = tslib_1.__decorate([
         remult3_1.FieldType({
             valueConverter: {
                 toJson: function (x) { return x != undefined ? x : ''; },

package/src/tests/remult-3-entities.js

@@ -8,23 +8,23 @@ var Products = /** @class */ (function () {
     function Products() {
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], Products.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], Products.prototype, "name", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Number(),
         tslib_1.__metadata("design:type", Number)
     ], Products.prototype, "price", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], Products.prototype, "archived", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Date(),
         tslib_1.__metadata("design:type", Date)
     ], Products.prototype, "availableFrom", void 0);
     Products = tslib_1.__decorate([
@@ -42,33 +42,33 @@ var Categories = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field({
+        remult3_1.Fields.Number({
             dbName: 'CategoryID'
         }),
         tslib_1.__metadata("design:type", Number)
     ], Categories.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field({ allowNull: true }),
+        remult3_1.Fields.String({ allowNull: true }),
         tslib_1.__metadata("design:type", String)
     ], Categories.prototype, "categoryName", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], Categories.prototype, "description", void 0);
     tslib_1.__decorate([
-        remult3_1.Field({
+        remult3_1.Fields.Number({
             serverExpression: function (c) { return c.categoryName ? c.categoryName.length : undefined; }
         }),
         tslib_1.__metadata("design:type", Number)
     ], Categories.prototype, "categoryNameLength", void 0);
     tslib_1.__decorate([
-        remult3_1.Field({
+        remult3_1.Fields.Number({
             serverExpression: function (c) { return Promise.resolve(c.categoryName ? c.categoryName.length : undefined); }
         }),
         tslib_1.__metadata("design:type", Number)
     ], Categories.prototype, "categoryNameLengthAsync", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Field(function () { return models_1.Status; }),
         tslib_1.__metadata("design:type", models_1.Status)
     ], Categories.prototype, "status", void 0);
     Categories = tslib_1.__decorate([

package/src/tests/tasks.js

@@ -11,15 +11,15 @@ var tasks = /** @class */ (function (_super) {
         return _this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Integer(),
         tslib_1.__metadata("design:type", Number)
     ], tasks.prototype, "id", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], tasks.prototype, "name", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], tasks.prototype, "completed", void 0);
     tasks = tslib_1.__decorate([

package/src/validators.d.ts

@@ -1,12 +1,14 @@
 import { FieldRef } from "./remult3";
 export declare class Validators {
-    static required: ((entity: any, col: FieldRef<any, string>, message?: string) => void) & {
+    static required: ((entity: any, col: FieldRef<any, string>, message?: any) => void) & {
         withMessage: (message: string) => (entity: any, col: FieldRef<any, string>) => void;
+        defaultMessage: string;
     };
-    static unique: ((entity: any, col: FieldRef<any, any>, message?: string) => Promise<void>) & {
+    static unique: ((entity: any, col: FieldRef<any, any>, message?: any) => Promise<void>) & {
         withMessage: (message: string) => (entity: any, col: FieldRef<any, any>) => Promise<void>;
+        defaultMessage: string;
     };
-    static uniqueOnBackend: ((entity: any, col: FieldRef<any, any>, message?: string) => Promise<void>) & {
+    static uniqueOnBackend: ((entity: any, col: FieldRef<any, any>, message?: any) => Promise<void>) & {
         withMessage: (message: string) => (entity: any, col: FieldRef<any, any>) => Promise<void>;
     };
 }

package/src/validators.js

@@ -7,16 +7,17 @@ var Validators = /** @class */ (function () {
     function Validators() {
     }
     Validators.required = Object.assign(function (entity, col, message) {
-        if (message === void 0) { message = 'Should not be empty'; }
+        if (message === void 0) { message = undefined; }
         if (!col.value || typeof (col.value) === "string" && col.value.trim().length == 0)
-            col.error = message;
+            col.error = message || Validators.required.defaultMessage;
     }, {
         withMessage: function (message) {
             return function (entity, col) { return Validators.required(entity, col, message); };
-        }
+        },
+        defaultMessage: 'Should not be empty'
     });
     Validators.unique = Object.assign(function (entity, col, message) {
-        if (message === void 0) { message = 'already exists'; }
+        if (message === void 0) { message = undefined; }
         return tslib_1.__awaiter(void 0, void 0, void 0, function () {
             var _a;
             return tslib_1.__generator(this, function (_b) {
@@ -28,7 +29,7 @@ var Validators = /** @class */ (function () {
                         return [4 /*yield*/, col.entityRef.repository.count((_a = {}, _a[col.metadata.key] = col.value, _a))];
                     case 1:
                         if (_b.sent())
-                            col.error = message;
+                            col.error = message || Validators.unique.defaultMessage;
                         _b.label = 2;
                     case 2: return [2 /*return*/];
                 }
@@ -37,10 +38,11 @@ var Validators = /** @class */ (function () {
     }, {
         withMessage: function (message) {
             return function (entity, col) { return Validators.unique(entity, col, message); };
-        }
+        },
+        defaultMessage: 'already exists'
     });
     Validators.uniqueOnBackend = Object.assign(function (entity, col, message) {
-        if (message === void 0) { message = 'already exists'; }
+        if (message === void 0) { message = undefined; }
         return tslib_1.__awaiter(void 0, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 if (__1.isBackend())

package/valueConverters.d.ts

@@ -1,25 +1,12 @@
-import { ClassType } from "./classType";
-import { ValueConverter, ValueListItem } from "./src/column-interfaces";
-export declare const DateValueConverter: ValueConverter<Date>;
-export declare const DateOnlyValueConverter: ValueConverter<Date>;
-export declare const CharDateValueConverter: ValueConverter<Date>;
-export declare const BoolValueConverter: ValueConverter<Boolean>;
-export declare const NumberValueConverter: ValueConverter<number>;
-export declare const IntegerValueConverter: ValueConverter<number>;
-export declare const DefaultValueConverter: ValueConverter<any>;
-export declare class ValueListValueConverter<T extends ValueListItem> implements ValueConverter<T> {
-    private type;
-    private info;
-    constructor(type: ClassType<T>);
-    fromJson(val: any): T;
-    toJson(val: T): any;
-    fromDb(val: any): T;
-    toDb(val: T): any;
-    toInput(val: T, inputType: string): string;
-    fromInput(val: string, inputType: string): T;
-    displayValue?(val: T): string;
-    fieldTypeInDb?: string;
-    inputType?: string;
-    getOptions(): T[];
-    byId(key: any): T;
+import { ValueConverter } from "./src/column-interfaces";
+export declare class ValueConverters {
+    static readonly Date: ValueConverter<Date>;
+    static readonly DateOnly: ValueConverter<Date>;
+    static readonly DateOnlyString: ValueConverter<Date>;
+    static readonly Boolean: ValueConverter<Boolean>;
+    static readonly Number: ValueConverter<number>;
+    static readonly Integer: ValueConverter<number>;
+    static readonly Default: ValueConverter<any>;
+    static readonly JsonString: ValueConverter<any>;
+    static readonly JsonValue: ValueConverter<any>;
 }