remult 0.13.11 → 0.13.14

package/package.json

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

package/readme.md

@@ -99,23 +99,26 @@ static async increasePriceOfTofu(priceIncrease: number, remult?: Remult) {
 ## :ballot_box_with_check: Data validation and constraints - defined once
 
 ```ts
-import { Entity, EntityBase, Field } from 'remult';
-import { Min } from 'class-validator';
+import { Entity, EntityBase, Fields } from 'remult';
 
 @Entity('products', {
     allowApiCrud: true
 })
 export class Product extends EntityBase {
     @Fields.string<Product>({
-        validate: p => {
-            if (p.name.trim().length == 0)
-                p.$.name.error = 'required';
+        validate: product => {
+            if (product.name.trim().length == 0)
+                product.$.name.error = 'required';
         }
     })
     name = '';
 
-    @Fields.number()
-    @Min(0)
+    @Fields.number({
+        validate: (_, field) => {
+            if (field.value < 0)
+                field.error = "must not be less than 0";
+        }
+    })
     unitPrice = 0;
 }
 ```
@@ -136,7 +139,7 @@ catch {
 ```sh
 > curl -d "{""unitPrice"":-1}" -H "Content-Type: application/json" -X POST http://localhost:3001/api/products
 
-{"modelState":{"unitPrice":"unitPrice must not be less than 0","name":"required"},"message":"Name: required"}
+{"modelState":{"unitPrice":"must not be less than 0","name":"required"},"message":"Name: required"}
 ```
 
 ## :lock: Secure the API with fine-grained authorization

package/src/context.js

@@ -94,14 +94,14 @@ function toPromise(p) {
 }
 exports.toPromise = toPromise;
 function processHttpException(ex) {
-    var _a, _b;
+    var _a, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var z, error, result;
-        return tslib_1.__generator(this, function (_c) {
-            switch (_c.label) {
+        var z, error, httpStatusCode, result;
+        return tslib_1.__generator(this, function (_d) {
+            switch (_d.label) {
                 case 0: return [4 /*yield*/, ex];
                 case 1:
-                    z = _c.sent();
+                    z = _d.sent();
                     if (z.error)
                         error = z.error;
                     else if (z.isAxiosError) {
@@ -116,9 +116,15 @@ function processHttpException(ex) {
                         error = "Network Error";
                     if (typeof error === 'string') {
                         error = {
-                            message: error
+                            message: error,
                         };
                     }
+                    httpStatusCode = z.status;
+                    if (httpStatusCode === undefined)
+                        httpStatusCode = (_c = z.response) === null || _c === void 0 ? void 0 : _c.status;
+                    if (httpStatusCode !== undefined && httpStatusCode !== null) {
+                        error.httpStatusCode = httpStatusCode;
+                    }
                     result = Object.assign(error, {
                     //     exception: ex disabled for now because JSON.stringify crashed with this
                     });

package/src/data-interfaces.d.ts

@@ -33,4 +33,5 @@ export interface ErrorInfo<entityType = any> {
     };
     stack?: string;
     exception?: any;
+    httpStatusCode?: number;
 }

package/src/filter/filter-interfaces.js

@@ -397,11 +397,12 @@ function entityFilterToJson(entityDefs, where) {
 }
 exports.entityFilterToJson = entityFilterToJson;
 function buildFilterFromRequestParameters(entity, filterInfo) {
-    var e_3, _a, _b;
+    var _a;
     var where = [];
     tslib_1.__spread(entity.fields).forEach(function (col) {
         var _a, _b;
         function addFilter(operation, theFilter, jsonArray, asString) {
+            var e_3, _a;
             if (jsonArray === void 0) { jsonArray = false; }
             if (asString === void 0) { asString = false; }
             var val = filterInfo.get(col.key + operation);
@@ -430,8 +431,26 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
                         addFilter_1(v);
                     });
                 }
-                else
-                    addFilter_1(val);
+                else {
+                    if (jsonArray) {
+                        if (typeof val === 'string')
+                            val = JSON.parse(val);
+                    }
+                    var array = separateArrayFromInnerArray(val);
+                    try {
+                        for (var array_1 = tslib_1.__values(array), array_1_1 = array_1.next(); !array_1_1.done; array_1_1 = array_1.next()) {
+                            var x = array_1_1.value;
+                            addFilter_1(x);
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (array_1_1 && !array_1_1.done && (_a = array_1.return)) _a.call(array_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                }
             }
         }
         var c = new filterHelper(col);
@@ -460,6 +479,29 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
     });
     var val = filterInfo.get('OR');
     if (val) {
+        var array = separateArrayFromInnerArray(val);
+        where.push({
+            $and: array.map(function (v) { return ({
+                $or: v.map(function (x) {
+                    return buildFilterFromRequestParameters(entity, { get: function (key) { return x[key]; } });
+                })
+            }); })
+        });
+    }
+    for (var key in entity.entityType) {
+        var element = entity.entityType[key];
+        if (element && element.customFilterInfo && element.customFilterInfo.customFilterTranslator) {
+            var custom = filterInfo.get(exports.customUrlToken + key);
+            if (custom !== undefined) {
+                where.push((_a = {}, _a[exports.customUrlToken + key] = custom, _a));
+            }
+        }
+    }
+    return { $and: where };
+    function separateArrayFromInnerArray(val) {
+        var e_4, _a;
+        if (!Array.isArray(val))
+            return [val];
         var nonArray = [], array = [];
         try {
             for (var val_1 = tslib_1.__values(val), val_1_1 = val_1.next(); !val_1_1.done; val_1_1 = val_1.next()) {
@@ -471,32 +513,16 @@ function buildFilterFromRequestParameters(entity, filterInfo) {
                     nonArray.push(v);
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (val_1_1 && !val_1_1.done && (_a = val_1.return)) _a.call(val_1);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         array.push(nonArray);
-        where.push({
-            $and: array.map(function (v) { return ({
-                $or: v.map(function (x) {
-                    return buildFilterFromRequestParameters(entity, { get: function (key) { return x[key]; } });
-                })
-            }); })
-        });
-    }
-    for (var key in entity.entityType) {
-        var element = entity.entityType[key];
-        if (element && element.customFilterInfo && element.customFilterInfo.customFilterTranslator) {
-            var custom = filterInfo.get(exports.customUrlToken + key);
-            if (custom !== undefined) {
-                where.push((_b = {}, _b[exports.customUrlToken + key] = custom, _b));
-            }
-        }
+        return array;
     }
-    return { $and: where };
 }
 exports.buildFilterFromRequestParameters = buildFilterFromRequestParameters;
 var customTranslator = /** @class */ (function () {

package/src/remult3/RepositoryImplementation.d.ts

@@ -38,6 +38,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     } ? number : entityType extends {
         id: string;
     } ? string : (string | number)), entity: Partial<OmitEB<entityType>>): Promise<entityType>;
+    private getRefForExistingRow;
     save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
     save(item: Partial<OmitEB<entityType>>): Promise<entityType>;
     find(options: FindOptions<entityType>): Promise<entityType[]>;
@@ -114,7 +115,7 @@ export declare class rowHelperImplementation<T> extends rowHelperBase<T> impleme
     private getIdFilter;
     delete(): Promise<void>;
     loadDataFrom(data: any, loadItems?: FieldMetadata[]): Promise<void>;
-    private id;
+    id: any;
     getOriginalId(): any;
     private calcServerExpression;
     isNew(): boolean;
@@ -206,9 +207,6 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
     caption: string;
 }
 export declare function FieldType<valueType = any>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any) => any;
-export declare const Fields1: {
-    String: () => (a: any) => void;
-};
 export declare class Fields {
     static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;
     static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, key: any, c?: any) => void;