remult 0.27.22 → 0.27.23-next.0

package/esm/index.js

@@ -5,6 +5,7 @@ export { getEntityRef } from './src/remult3/getEntityRef.js';
 export { Field, Fields, Relations, } from './src/remult3/Fields.js';
 export { IdEntity } from './src/remult3/IdEntity.js';
 export { describeClass, describeBackendMethods, describeEntity, } from './src/remult3/classDescribers.js';
+export { EntityError, } from './src/data-interfaces.js'; //V
 export { RestDataProvider } from './src/data-providers/rest-data-provider.js'; //V
 export { InMemoryDataProvider } from './src/data-providers/in-memory-database.js'; //V
 export { SqlDatabase } from './src/data-providers/sql-database.js'; //V

package/esm/server/remult-api-server.js

@@ -833,10 +833,11 @@ class ResponseBridgeToDataApiResponse {
                 url: this.genReq?.url,
                 method: this.genReq?.method,
             });
-            this.setStatus(httpStatusCode).json(body);
+            const json = { ...body, message: body.message };
+            this.setStatus(httpStatusCode).json(json);
         };
         await this.handleError?.({
-            httpStatusCode,
+            httpStatusCode: httpStatusCode,
             req: this.req,
             entity,
             exception,

package/esm/src/data-api.js

@@ -1,4 +1,5 @@
 import { doTransaction } from './context.js';
+import { EntityError } from './data-interfaces.js';
 import { findOptionsToJson, liveQueryAction, } from './data-providers/rest-data-provider.js';
 import { Filter, buildFilterFromRequestParameters, customUrlToken, } from './filter/filter-interfaces.js';
 import { getRelationFieldInfo } from './remult3/relationInfoMember.js';
@@ -490,7 +491,10 @@ export function determineSort(sortUrlParm, dirUrlParam) {
     return result;
 }
 export function serializeError(data) {
-    if (data instanceof TypeError) {
+    if (data instanceof EntityError) {
+        data = { message: data.message, modelState: data.modelState };
+    }
+    else if (data instanceof Error) {
         data = { message: data.message, stack: data.stack };
     }
     let x = JSON.parse(JSON.stringify(data));

package/esm/src/data-interfaces.js

@@ -9,3 +9,13 @@ export function extractSort(sort) {
     }
     return sort;
 }
+export class EntityError extends Error {
+    constructor(errorInfo) {
+        super(errorInfo.message);
+        Object.assign(this, errorInfo);
+    }
+    modelState;
+    stack;
+    exception;
+    httpStatusCode;
+}

package/esm/src/remult3/RepositoryImplementation.js

@@ -5,6 +5,7 @@ import { Filter } from '../filter/filter-interfaces.js';
 import { Sort } from '../sort.js';
 import { GroupByForApiKey, } from './remult3.js';
 import { assign } from '../../assign.js';
+import { EntityError, } from '../data-interfaces.js';
 import { ValueConverters } from '../valueConverters.js';
 import { findOptionsToJson } from '../data-providers/rest-data-provider.js';
 import { remult as defaultRemult } from '../remult-proxy.js';
@@ -1194,7 +1195,7 @@ class rowHelperBase {
                 }
             }
         }
-        return error;
+        return new EntityError(error);
     }
     catchSaveErrors(err) {
         let e = err;
@@ -1987,12 +1988,12 @@ export class columnDefsImpl {
                         }
                         catch (err) {
                             const error = `${String(prop)} failed for value ${args?.[0]}. Error: ${typeof err === 'string' ? err : err.message}`;
-                            throw {
+                            throw new EntityError({
                                 message: this.caption + ': ' + error,
                                 modelState: {
                                     [this.key]: error,
                                 },
-                            };
+                            });
                         }
                     };
                 }

package/esm/src/remult3/remult3.js

@@ -17,6 +17,8 @@ const wnn = [
 export const flags = {
     error500RetryCount: 4,
 };
+//p1 - make error info an actual error, important for exception handling, and also for auth.js errors that were mistic
+//p1 - add validators min,max,between(range)
 //p1 - allow experimental route registration on remult server, with at least get route, and support redirect, read header and set header - (and the existing get html etc...)
 //p2 - add parameter all to deleteMany, and updateMany
 //p2  filter.apply ApiPreFilter

package/esm/src/validators.js

@@ -45,6 +45,8 @@ export class Validators {
             return true;
         return Boolean(await e.load());
     }, 'Relation value does not exist');
+    static min = createValueValidatorWithArgs((val, minValue) => val >= minValue, (minValue) => `Value must be bigger than or equal to ${minValue}`);
+    static max = createValueValidatorWithArgs((val, maxValue) => val <= maxValue, (maxValue) => `Value must be smaller than or equal to ${maxValue}`);
     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';

package/index.d.ts

@@ -11,7 +11,7 @@ export { Field, Fields, StringFieldOptions, Relations, } from './src/remult3/Fie
 export { IdEntity } from './src/remult3/IdEntity.js';
 export { describeClass, describeBackendMethods, describeEntity, } from './src/remult3/classDescribers.js';
 export { EntityOptions, PreprocessFilterEvent } from './src/entity.js';
-export { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider, } from './src/data-interfaces.js';
+export { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions, ErrorInfo, EntityError, RestDataProviderHttpProvider, } from './src/data-interfaces.js';
 export { SqlCommand, SqlCommandWithParameters, SqlImplementation, SqlResult, } from './src/sql-command.js';
 export { FieldMetadata, FieldOptions, FieldValidator, ValueConverter, ValueListItem, // reconsider, maybe it should go to remult angular as the abstraction ?
 ValueOrExpression, } from './src/column-interfaces.js';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubscriptionChannel = exports.InMemoryLiveQueryStorage = exports.remult = exports.ValueConverters = exports.createValueValidator = exports.createValueValidatorWithArgs = exports.createValidatorWithArgs = exports.createValidator = exports.valueValidator = exports.Validators = exports.UrlBuilder = exports.Filter = exports.CompoundIdField = exports.Sort = exports.EventSource = exports.isBackend = exports.withRemult = exports.Remult = exports.Allow = exports.ForbiddenError = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonEntityIndexedDbStorage = exports.JsonEntityOpfsStorage = exports.JsonDataProvider = exports.dbNamesOf = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.InMemoryDataProvider = exports.RestDataProvider = exports.describeEntity = exports.describeBackendMethods = exports.describeClass = exports.IdEntity = exports.Relations = exports.Fields = exports.Field = exports.getEntityRef = exports.Entity = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.ArrayEntityDataProvider = void 0;
+exports.SubscriptionChannel = exports.InMemoryLiveQueryStorage = exports.remult = exports.ValueConverters = exports.createValueValidator = exports.createValueValidatorWithArgs = exports.createValidatorWithArgs = exports.createValidator = exports.valueValidator = exports.Validators = exports.UrlBuilder = exports.Filter = exports.CompoundIdField = exports.Sort = exports.EventSource = exports.isBackend = exports.withRemult = exports.Remult = exports.Allow = exports.ForbiddenError = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonEntityIndexedDbStorage = exports.JsonEntityOpfsStorage = exports.JsonDataProvider = exports.dbNamesOf = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.InMemoryDataProvider = exports.RestDataProvider = exports.EntityError = exports.describeEntity = exports.describeBackendMethods = exports.describeClass = exports.IdEntity = exports.Relations = exports.Fields = exports.Field = exports.getEntityRef = exports.Entity = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.ArrayEntityDataProvider = void 0;
 exports.repo = repo;
 var array_entity_data_provider_js_1 = require("./src/data-providers/array-entity-data-provider.js");
 Object.defineProperty(exports, "ArrayEntityDataProvider", { enumerable: true, get: function () { return array_entity_data_provider_js_1.ArrayEntityDataProvider; } });
@@ -27,6 +27,8 @@ var classDescribers_js_1 = require("./src/remult3/classDescribers.js");
 Object.defineProperty(exports, "describeClass", { enumerable: true, get: function () { return classDescribers_js_1.describeClass; } });
 Object.defineProperty(exports, "describeBackendMethods", { enumerable: true, get: function () { return classDescribers_js_1.describeBackendMethods; } });
 Object.defineProperty(exports, "describeEntity", { enumerable: true, get: function () { return classDescribers_js_1.describeEntity; } });
+var data_interfaces_js_1 = require("./src/data-interfaces.js"); //V
+Object.defineProperty(exports, "EntityError", { enumerable: true, get: function () { return data_interfaces_js_1.EntityError; } });
 var rest_data_provider_js_1 = require("./src/data-providers/rest-data-provider.js"); //V
 Object.defineProperty(exports, "RestDataProvider", { enumerable: true, get: function () { return rest_data_provider_js_1.RestDataProvider; } });
 var in_memory_database_js_1 = require("./src/data-providers/in-memory-database.js"); //V

package/package.json

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

package/server/remult-api-server.js

@@ -1195,7 +1195,8 @@ var ResponseBridgeToDataApiResponse = /** @class */ (function () {
                                 url: (_b = _this.genReq) === null || _b === void 0 ? void 0 : _b.url,
                                 method: (_c = _this.genReq) === null || _c === void 0 ? void 0 : _c.method,
                             });
-                            _this.setStatus(httpStatusCode).json(body);
+                            var json = tslib_1.__assign(tslib_1.__assign({}, body), { message: body.message });
+                            _this.setStatus(httpStatusCode).json(json);
                         };
                         return [4 /*yield*/, ((_a = this.handleError) === null || _a === void 0 ? void 0 : _a.call(this, {
                                 httpStatusCode: httpStatusCode,

package/src/data-api.d.ts

@@ -1,5 +1,5 @@
 import type { Remult } from './context.js';
-import type { ErrorInfo } from './data-interfaces.js';
+import { type ErrorInfo } from './data-interfaces.js';
 import { type EntityMetadata, type FindOptions, type Repository } from './remult3/remult3.js';
 import type { rowHelperImplementation } from './remult3/RepositoryImplementation.js';
 export declare class DataApi<T = unknown> {

package/src/data-api.js

@@ -5,6 +5,7 @@ exports.determineSort = determineSort;
 exports.serializeError = serializeError;
 var tslib_1 = require("tslib");
 var context_js_1 = require("./context.js");
+var data_interfaces_js_1 = require("./data-interfaces.js");
 var rest_data_provider_js_1 = require("./data-providers/rest-data-provider.js");
 var filter_interfaces_js_1 = require("./filter/filter-interfaces.js");
 var relationInfoMember_js_1 = require("./remult3/relationInfoMember.js");
@@ -1005,7 +1006,10 @@ function determineSort(sortUrlParm, dirUrlParam) {
     return result;
 }
 function serializeError(data) {
-    if (data instanceof TypeError) {
+    if (data instanceof data_interfaces_js_1.EntityError) {
+        data = { message: data.message, modelState: data.modelState };
+    }
+    else if (data instanceof Error) {
         data = { message: data.message, stack: data.stack };
     }
     var x = JSON.parse(JSON.stringify(data));

package/src/data-interfaces.d.ts

@@ -67,3 +67,12 @@ export interface ErrorInfo<entityType = unknown> {
     exception?: any;
     httpStatusCode?: number;
 }
+export declare class EntityError<entityType = unknown> extends Error implements ErrorInfo<entityType> {
+    constructor(errorInfo: ErrorInfo<entityType>);
+    modelState?: {
+        [Properties in keyof Partial<MembersOnly<entityType>>]?: string;
+    };
+    stack?: string;
+    exception?: any;
+    httpStatusCode?: number;
+}

package/src/data-interfaces.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityError = void 0;
 exports.extractSort = extractSort;
+var tslib_1 = require("tslib");
 var sort_js_1 = require("./sort.js");
 function extractSort(sort) {
     if (sort instanceof Array) {
@@ -12,3 +14,13 @@ function extractSort(sort) {
     }
     return sort;
 }
+var EntityError = /** @class */ (function (_super) {
+    tslib_1.__extends(EntityError, _super);
+    function EntityError(errorInfo) {
+        var _this = _super.call(this, errorInfo.message) || this;
+        Object.assign(_this, errorInfo);
+        return _this;
+    }
+    return EntityError;
+}(Error));
+exports.EntityError = EntityError;

package/src/remult3/RepositoryImplementation.d.ts

@@ -7,7 +7,7 @@ import { Filter } from '../filter/filter-interfaces.js';
 import { type GroupByOptions, type GroupByResult, type ControllerRef, type ControllerRefForControllerBase, type EntityFilter, type EntityMetadata, type EntityOrderBy, type EntityRef, type EntityRefForEntityBase, type FieldRef, type FieldsMetadata, type FieldsRef, type FieldsRefForEntityBase, type FindFirstOptions, type FindFirstOptionsBase, type FindOptions, type IdMetadata, type LiveQuery, type LoadOptions, type MembersOnly, type NumericKeys, type Repository, type RepositoryRelations, type Subscribable, type idType } from './remult3.js';
 import type { QueryOptions, RefSubscriber, UpsertOptions } from './remult3.js';
 import type { entityEventListener } from '../__EntityValueProvider.js';
-import type { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces.js';
+import { type DataProvider, type EntityDataProvider, type EntityDataProviderGroupByOptions, type EntityDataProviderFindOptions, type ErrorInfo, EntityError } from '../data-interfaces.js';
 import type { Unsubscribe } from '../live-query/SubscriptionChannel.js';
 import { RelationLoader } from './relation-loader.js';
 import { type RepositoryInternal, getInternalKey } from './repository-internals.js';
@@ -114,7 +114,7 @@ declare abstract class rowHelperBase<T> {
         [key: string]: string | undefined;
     };
     protected __assertValidity(): void;
-    buildErrorInfoObject(): ErrorInfo<unknown>;
+    buildErrorInfoObject(): EntityError<unknown>;
     abstract get fields(): FieldsRef<T>;
     catchSaveErrors(err: any): any;
     __clearErrorsAndReportChanged(): void;
@@ -124,7 +124,7 @@ declare abstract class rowHelperBase<T> {
     originalValues: any;
     saveOriginalData(): void;
     saveMoreOriginalData(): void;
-    validate(): Promise<ErrorInfo<unknown> | undefined>;
+    validate(): Promise<EntityError<unknown> | undefined>;
     __validateEntity(): Promise<void>;
     __performColumnAndEntityValidations(): Promise<void>;
     toApiJson(includeRelatedEntities?: boolean, notJustApi?: boolean): any;

package/src/remult3/RepositoryImplementation.js

@@ -21,6 +21,7 @@ var filter_interfaces_js_1 = require("../filter/filter-interfaces.js");
 var sort_js_1 = require("../sort.js");
 var remult3_js_1 = require("./remult3.js");
 var assign_js_1 = require("../../assign.js");
+var data_interfaces_js_1 = require("../data-interfaces.js");
 var valueConverters_js_1 = require("../valueConverters.js");
 var rest_data_provider_js_1 = require("../data-providers/rest-data-provider.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
@@ -1966,7 +1967,7 @@ var rowHelperBase = /** @class */ (function () {
                 finally { if (e_29) throw e_29.error; }
             }
         }
-        return error;
+        return new data_interfaces_js_1.EntityError(error);
     };
     rowHelperBase.prototype.catchSaveErrors = function (err) {
         var _this = this;
@@ -3377,12 +3378,12 @@ var columnDefsImpl = /** @class */ (function () {
                         }
                         catch (err) {
                             var error = "".concat(String(prop), " failed for value ").concat(args === null || args === void 0 ? void 0 : args[0], ". Error: ").concat(typeof err === 'string' ? err : err.message);
-                            throw {
+                            throw new data_interfaces_js_1.EntityError({
                                 message: _this.caption + ': ' + error,
                                 modelState: (_a = {},
                                     _a[_this.key] = error,
                                     _a),
-                            };
+                            });
                         }
                     };
                 }

package/src/remult3/remult3.js

@@ -20,6 +20,8 @@ var wnn = [
 exports.flags = {
     error500RetryCount: 4,
 };
+//p1 - make error info an actual error, important for exception handling, and also for auth.js errors that were mistic
+//p1 - add validators min,max,between(range)
 //p1 - allow experimental route registration on remult server, with at least get route, and support redirect, read header and set header - (and the existing get html etc...)
 //p2 - add parameter all to deleteMany, and updateMany
 //p2  filter.apply ApiPreFilter

package/src/validators.d.ts

@@ -20,6 +20,12 @@ export declare class Validators {
         defaultMessage: ValueValidationMessage<unknown>;
     };
     static relationExists: Validator<unknown>;
+    static min: ValidatorWithArgs<number, number> & {
+        defaultMessage: ValueValidationMessage<number>;
+    };
+    static max: ValidatorWithArgs<number, number> & {
+        defaultMessage: ValueValidationMessage<number>;
+    };
     static maxLength: ValidatorWithArgs<string, number> & {
         defaultMessage: ValueValidationMessage<number>;
     };

package/src/validators.js

@@ -89,6 +89,8 @@ var Validators = /** @class */ (function () {
             }
         });
     }); }, 'Relation value does not exist');
+    Validators.min = createValueValidatorWithArgs(function (val, minValue) { return val >= minValue; }, function (minValue) { return "Value must be bigger than or equal to ".concat(minValue); });
+    Validators.max = createValueValidatorWithArgs(function (val, maxValue) { return val <= maxValue; }, function (maxValue) { return "Value must be smaller than or equal to ".concat(maxValue); });
     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';