remult 0.25.0 → 0.25.2

package/esm/src/remult3/relation-loader.js

@@ -88,7 +88,7 @@ class PendingInStatements {
     rel;
     key;
     options;
-    resolve() {
+    async resolve() {
         const values = [...this.values.values()];
         if (values.length == 1) {
             this.rel.find(this.options).then(values[0].resolve, values[0].reject);
@@ -96,9 +96,19 @@ class PendingInStatements {
         }
         var op = { ...this.options };
         op.where = { [this.key]: values.map((v) => v.value) };
-        this.rel.find(op).then((val) => {
+        op.limit = 1000;
+        op.page = 1;
+        let vals = [];
+        try {
+            while (true) {
+                const val = await this.rel.find(op);
+                vals.push(...val);
+                if (val.length < op.limit)
+                    break;
+                op.page++;
+            }
             for (const value of this.values.values()) {
-                value.resolve(val.filter((x) => {
+                value.resolve(vals.filter((x) => {
                     const ref = getEntityRef(x);
                     const field = ref.fields.find(this.key);
                     const rel = getRelationInfo(field.metadata.options);
@@ -108,11 +118,12 @@ class PendingInStatements {
                     return value.value == val;
                 }));
             }
-        }, (err) => {
+        }
+        catch (err) {
             for (const value of this.values.values()) {
                 value.reject(err);
             }
-        });
+        }
     }
     find(where) {
         const val = where[this.key];

package/esm/src/remult3/remult3.js

@@ -1,5 +1,5 @@
 export {};
-//y1 - discuss limit and include queries
+//y1 - number default storage in knex is decimal and it by default has 8,2 - meaning only 999,999 - I think it should be way bigger than that. in firefly we do at least 18 - https://discord.com/channels/975754286384418847/1195162533447876658
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
 //y2 - from the crm-demo(https://crm-demo.up.railway.app/deals), after editing a deal: - _updateEntityBasedOnApi
 //y2 - Backend methods are transactions, it's not intuitive and maybe should be optional / opt in
@@ -70,3 +70,5 @@ remult.apiClient.url='localhost:3007/api
 //[ ] V3 - all these fields will also appear in the where etc... in the typescript api - but we will not enforce them
 //y2 - consider if field types should include validation in them by default (string,number that it's not NaN etc...) and if so, what message?
 //y2 - should enforce integer - currently we probably round / truncate it
+//p1 - adjust react tutorial to esm
+//p1 - write docs on with remult - and usage in init api

package/esm/src/validators.js

@@ -39,6 +39,7 @@ export class Validators {
         return Boolean(await e.load());
     }, 'Relation value does not exist');
     static maxLength = createValueValidatorWithArgs((val, maxLength) => val.length <= maxLength, (maxLength) => `Value must be at most ${maxLength} characters`);
+    static minLength = createValueValidatorWithArgs((val, minLength) => val.length >= minLength, (maxLength) => `Value must be at least ${maxLength} characters`);
     static defaultMessage = 'Invalid value';
 }
 export function createValidator(validate, defaultMessage) {
@@ -63,16 +64,18 @@ export function createValidator(validate, defaultMessage) {
         }
         return validation(entityOrMessage, e, message);
     };
-    //@ts-ignore
-    return Object.assign(result, {
-        withMessage: (message) => async (entity, e) => result(entity, e, message),
-        get defaultMessage() {
+    Object.defineProperty(result, 'defaultMessage', {
+        get: () => {
             return defaultMessage;
         },
-        set defaultMessage(val) {
+        set: (val) => {
             defaultMessage = val;
         },
-        isValid: validate,
+        enumerable: true,
+    });
+    //@ts-ignore
+    return Object.assign(result, {
+        withMessage: (message) => async (entity, e) => result(entity, e, message),
     });
 }
 export function valueValidator(validate, defaultMessage) {
@@ -123,6 +126,3 @@ export function createValidatorWithArgs(validate, defaultMessage) {
         },
     });
 }
-//y1 - talk about the 3rd parameter as message
-//y1 - talk about the changed signature breaking existing validations and preventing the usage of unique outside the normal flow
-//y1 - talk about the defaultMessage value now being a function that get's too many arguments, that makes it's reuse that much harder

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.25.0",
+    "version": "0.25.2",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/remult3/relation-loader.d.ts

@@ -27,7 +27,7 @@ declare class PendingInStatements {
     private rel;
     private key;
     private options;
-    resolve(): void;
+    resolve(): Promise<void>;
     find(where: any): Promise<any[]>;
     values: Map<any, {
         value: any;

package/src/remult3/relation-loader.js

@@ -144,56 +144,82 @@ var PendingInStatements = /** @class */ (function () {
         this.values = new Map();
     }
     PendingInStatements.prototype.resolve = function () {
-        var _a;
-        var _this = this;
-        var values = tslib_1.__spreadArray([], tslib_1.__read(this.values.values()), false);
-        if (values.length == 1) {
-            this.rel.find(this.options).then(values[0].resolve, values[0].reject);
-            return;
-        }
-        var op = tslib_1.__assign({}, this.options);
-        op.where = (_a = {}, _a[this.key] = values.map(function (v) { return v.value; }), _a);
-        this.rel.find(op).then(function (val) {
-            var e_4, _a;
-            var _loop_1 = function (value) {
-                value.resolve(val.filter(function (x) {
-                    var ref = (0, getEntityRef_js_1.getEntityRef)(x);
-                    var field = ref.fields.find(_this.key);
-                    var rel = (0, relationInfoMember_js_1.getRelationInfo)(field.metadata.options);
-                    var val = (rel === null || rel === void 0 ? void 0 : rel.type) === 'reference'
-                        ? field.getId()
-                        : x[_this.key];
-                    return value.value == val;
-                }));
-            };
-            try {
-                for (var _b = tslib_1.__values(_this.values.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var value = _c.value;
-                    _loop_1(value);
-                }
-            }
-            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; }
-            }
-        }, function (err) {
-            var e_5, _a;
-            try {
-                for (var _b = tslib_1.__values(_this.values.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var value = _c.value;
-                    value.reject(err);
-                }
-            }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var values, op, vals, val, _loop_1, _a, _b, value, err_1, _c, _d, value;
+            var _e, e_4, _f, e_5, _g;
+            var _this = this;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
+                    case 0:
+                        values = tslib_1.__spreadArray([], tslib_1.__read(this.values.values()), false);
+                        if (values.length == 1) {
+                            this.rel.find(this.options).then(values[0].resolve, values[0].reject);
+                            return [2 /*return*/];
+                        }
+                        op = tslib_1.__assign({}, this.options);
+                        op.where = (_e = {}, _e[this.key] = values.map(function (v) { return v.value; }), _e);
+                        op.limit = 1000;
+                        op.page = 1;
+                        vals = [];
+                        _h.label = 1;
+                    case 1:
+                        _h.trys.push([1, 5, , 6]);
+                        _h.label = 2;
+                    case 2:
+                        if (!true) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.rel.find(op)];
+                    case 3:
+                        val = _h.sent();
+                        vals.push.apply(vals, tslib_1.__spreadArray([], tslib_1.__read(val), false));
+                        if (val.length < op.limit)
+                            return [3 /*break*/, 4];
+                        op.page++;
+                        return [3 /*break*/, 2];
+                    case 4:
+                        _loop_1 = function (value) {
+                            value.resolve(vals.filter(function (x) {
+                                var ref = (0, getEntityRef_js_1.getEntityRef)(x);
+                                var field = ref.fields.find(_this.key);
+                                var rel = (0, relationInfoMember_js_1.getRelationInfo)(field.metadata.options);
+                                var val = (rel === null || rel === void 0 ? void 0 : rel.type) === 'reference'
+                                    ? field.getId()
+                                    : x[_this.key];
+                                return value.value == val;
+                            }));
+                        };
+                        try {
+                            for (_a = tslib_1.__values(this.values.values()), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                value = _b.value;
+                                _loop_1(value);
+                            }
+                        }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
+                            }
+                            finally { if (e_4) throw e_4.error; }
+                        }
+                        return [3 /*break*/, 6];
+                    case 5:
+                        err_1 = _h.sent();
+                        try {
+                            for (_c = tslib_1.__values(this.values.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                value = _d.value;
+                                value.reject(err_1);
+                            }
+                        }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        finally {
+                            try {
+                                if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
+                            }
+                            finally { if (e_5) throw e_5.error; }
+                        }
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
-                finally { if (e_5) throw e_5.error; }
-            }
+            });
         });
     };
     PendingInStatements.prototype.find = function (where) {

package/src/remult3/remult3.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//y1 - discuss limit and include queries
+//y1 - number default storage in knex is decimal and it by default has 8,2 - meaning only 999,999 - I think it should be way bigger than that. in firefly we do at least 18 - https://discord.com/channels/975754286384418847/1195162533447876658
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
 //y2 - from the crm-demo(https://crm-demo.up.railway.app/deals), after editing a deal: - _updateEntityBasedOnApi
 //y2 - Backend methods are transactions, it's not intuitive and maybe should be optional / opt in
@@ -71,3 +71,5 @@ remult.apiClient.url='localhost:3007/api
 //[ ] V3 - all these fields will also appear in the where etc... in the typescript api - but we will not enforce them
 //y2 - consider if field types should include validation in them by default (string,number that it's not NaN etc...) and if so, what message?
 //y2 - should enforce integer - currently we probably round / truncate it
+//p1 - adjust react tutorial to esm
+//p1 - write docs on with remult - and usage in init api

package/src/validators.d.ts

@@ -23,6 +23,9 @@ export declare class Validators {
     static maxLength: ValidatorWithArgs<string, number> & {
         defaultMessage: ValueValidationMessage<number>;
     };
+    static minLength: ValidatorWithArgs<string, number> & {
+        defaultMessage: ValueValidationMessage<number>;
+    };
     static defaultMessage: string;
 }
 export type Validator<valueType> = FieldValidator<any, valueType> & ((message?: ValidationMessage<valueType, undefined>) => FieldValidator<any, valueType>) & {

package/src/validators.js

@@ -71,6 +71,7 @@ var Validators = /** @class */ (function () {
         });
     }); }, 'Relation value does not exist');
     Validators.maxLength = createValueValidatorWithArgs(function (val, maxLength) { return val.length <= maxLength; }, function (maxLength) { return "Value must be at most ".concat(maxLength, " characters"); });
+    Validators.minLength = createValueValidatorWithArgs(function (val, minLength) { return val.length >= minLength; }, function (maxLength) { return "Value must be at least ".concat(maxLength, " characters"); });
     Validators.defaultMessage = 'Invalid value';
     return Validators;
 }());
@@ -111,6 +112,15 @@ function createValidator(validate, defaultMessage) {
         }
         return validation(entityOrMessage, e, message);
     };
+    Object.defineProperty(result, 'defaultMessage', {
+        get: function () {
+            return defaultMessage;
+        },
+        set: function (val) {
+            defaultMessage = val;
+        },
+        enumerable: true,
+    });
     //@ts-ignore
     return Object.assign(result, {
         withMessage: function (message) {
@@ -118,13 +128,6 @@ function createValidator(validate, defaultMessage) {
                 return [2 /*return*/, result(entity, e, message)];
             }); }); };
         },
-        get defaultMessage() {
-            return defaultMessage;
-        },
-        set defaultMessage(val) {
-            defaultMessage = val;
-        },
-        isValid: validate,
     });
 }
 exports.createValidator = createValidator;
@@ -195,6 +198,3 @@ function createValidatorWithArgs(validate, defaultMessage) {
     });
 }
 exports.createValidatorWithArgs = createValidatorWithArgs;
-//y1 - talk about the 3rd parameter as message
-//y1 - talk about the changed signature breaking existing validations and preventing the usage of unique outside the normal flow
-//y1 - talk about the defaultMessage value now being a function that get's too many arguments, that makes it's reuse that much harder