remult 3.0.6-next.0 → 3.0.6

package/remult-sveltekit.js

@@ -8,14 +8,17 @@ function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (event) { return ({
-            url: event.request.url,
-            method: event.request.method,
-            on: function (e, do1) {
-                if (e === 'close') {
-                    ;
-                    event.locals['_tempOnClose'] = do1;
-                }
+            internal: {
+                url: event.request.url,
+                method: event.request.method,
+                on: function (e, do1) {
+                    if (e === 'close') {
+                        ;
+                        event.locals['_tempOnClose'] = do1;
+                    }
+                },
             },
+            public: { headers: event.request.headers },
         }); },
         getRequestBody: function (event) { return event.request.json(); },
     });
@@ -88,7 +91,7 @@ function remultApi(options) {
                             status: responseFromRemultHandler.statusCode,
                             headers: {
                                 'Content-Type': 'application/json',
-                            }
+                            },
                         });
                         return [2 /*return*/, res];
                     }

package/server/core.d.ts

@@ -1,4 +1,4 @@
-export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer, } from './remult-api-server.js';
+export { type queuedJobInfo, type QueueStorage, type GenericRequestInfo, type GenericRequestHandler, type GenericResponse, type GenericRouter, createRemultServerCore, type RemultServerOptions, type SpecificRoute, type RemultServer, } from './remult-api-server.js';
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
 export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';

package/server/index.js

@@ -21,7 +21,10 @@ function createRemultServer(options, serverCoreOptions) {
     var _this = this;
     (0, initAsyncHooks_js_1.initAsyncHooks)();
     return (0, remult_api_server_js_1.createRemultServerCore)(options, serverCoreOptions || {
-        buildGenericRequestInfo: function (req) { return (0, isOfType_js_1.cast)(req, 'method'); },
+        buildGenericRequestInfo: function (req) { return ({
+            internal: (0, isOfType_js_1.cast)(req, 'method'),
+            public: { headers: new Headers(req.headers) },
+        }); },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
         }); }); },

package/server/module.js

@@ -9,8 +9,8 @@ var Module = /** @class */ (function () {
         this.priority = (_a = options.priority) !== null && _a !== void 0 ? _a : 0;
         this.entities = options.entities;
         this.controllers = options.controllers;
-        this.initRequest = options.initRequest;
         this.initApi = options.initApi;
+        this.initRequest = options.initRequest;
         this.modules = options.modules;
     }
     return Module;

package/server/remult-admin.js

@@ -12,7 +12,11 @@ function remultAdminHtml(options) {
     var head = options.head, rootPath = options.rootPath, requireAuthToken = options.requireAuthToken, disableLiveQuery = options.disableLiveQuery;
     return (0, get_remult_admin_html_js_1.getHtml)()
         .replace('<!--PLACE_HERE_HEAD-->', head)
-        .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({ rootPath: rootPath, requireAuthToken: requireAuthToken, disableLiveQuery: disableLiveQuery }), "\n</script>"));
+        .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({
+        rootPath: rootPath,
+        requireAuthToken: requireAuthToken,
+        disableLiveQuery: disableLiveQuery,
+    }), "\n</script>"));
 }
 function buildEntityInfo(options) {
     var e_1, _a;
@@ -68,7 +72,7 @@ function buildEntityInfo(options) {
                     }
                     else if (info.type === 'toMany') {
                         if (relRepo.metadata.apiReadAllowed) {
-                            relations.push(tslib_1.__assign(tslib_1.__assign({}, relInfo), { where: where, entityKey: relRepo.metadata.key, key: x.key, caption: x.caption }));
+                            relations.push(tslib_1.__assign(tslib_1.__assign({}, relInfo), { where: where, entityKey: relRepo.metadata.key, key: x.key, caption: x.label }));
                         }
                         return "continue";
                     }
@@ -78,7 +82,7 @@ function buildEntityInfo(options) {
                     readOnly: !x.apiUpdateAllowed(),
                     values: (0, RepositoryImplementation_js_1.getValueList)(x),
                     valFieldKey: valFieldKey,
-                    caption: x.caption,
+                    caption: x.label,
                     relationToOne: relation,
                     inputType: x.inputType,
                     type: x.inputType === inputTypes_js_1.InputTypes.json
@@ -112,11 +116,11 @@ function buildEntityInfo(options) {
         }
         if (metadata.apiReadAllowed) {
             var superKey = metadata.key;
-            var caption = metadata.caption;
+            var caption = metadata.label;
             var nbOfEntities = entities.filter(function (e) { return e.key === metadata.key; }).length;
             if (nbOfEntities > 0) {
                 superKey = metadata.key + '_ext_' + nbOfEntities;
-                caption = metadata.caption + '*'.repeat(nbOfEntities);
+                caption = metadata.label + '*'.repeat(nbOfEntities);
             }
             entities.push({
                 superKey: superKey,

package/server/remult-api-server.d.ts

@@ -99,16 +99,23 @@ export interface RemultServerOptions<RequestType> {
      * @example
      * import { Module } from 'remult/server'
      *
-     * modules: [
-     *   new Module({
-     *     key: 'analytics',
-     *     entities: [AnalyticsEvent],
-     *     controllers: [AnalyticsController],
-     *     initApi: () => {
-     *       console.log('analytics module initialized')
-     *     },
-     *   }),
-     * ]
+     * // create an analytics module
+     * const analytics = () => new Module({
+     *   key: 'analytics',
+     *   priority: 11, // Default: 0, Prioritized by ascending order.
+     *   entities: [AnalyticsEvent],
+     *   controllers: [AnalyticsController],
+     *   initApi: () => console.log('analytics module initialized'),
+     *   initRequest: () => {},
+     *   modules: [] // You can nest modules
+     * })
+     *
+     * // use the module in the remultApi
+     * remultApi({
+     *   modules: [
+     *     analytics(),
+     *   ]
+     * })
      */
     modules?: Module<RequestType>[];
 }
@@ -145,6 +152,9 @@ export type SpecificRoute<RequestType> = {
     post(handler: GenericRequestHandler<RequestType>): SpecificRoute<RequestType>;
     delete(handler: GenericRequestHandler<RequestType>): SpecificRoute<RequestType>;
 };
+export interface GenericRequest {
+    headers: Headers;
+}
 export interface GenericRequestInfo {
     url?: string;
     method?: any;
@@ -199,7 +209,10 @@ export declare class JobsInQueueEntity extends IdEntity {
     progress: number;
 }
 export interface ServerCoreOptions<RequestType> {
-    buildGenericRequestInfo(req: RequestType): GenericRequestInfo;
+    buildGenericRequestInfo(req: RequestType): {
+        internal: GenericRequestInfo;
+        public: GenericRequest;
+    };
     getRequestBody(req: RequestType): Promise<any>;
     ignoreAsyncStorage?: boolean;
 }

package/server/remult-api-server.js

@@ -629,12 +629,14 @@ var RemultServerImplementation = /** @class */ (function () {
     RemultServerImplementation.prototype.process = function (what, doNotReuseInitRequest) {
         var _this = this;
         return function (req, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var genReq, myReq, myRes, err_2;
+            var _a, genReq, genReqPublic, myReq, myRes, err_2;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        genReq = req ? this.coreOptions.buildGenericRequestInfo(req) : {};
+                        _a = req
+                            ? this.coreOptions.buildGenericRequestInfo(req)
+                            : { internal: {}, public: { headers: new Headers() } }, genReq = _a.internal, genReqPublic = _a.public;
                         if (req) {
                             if (!genReq.query) {
                                 genReq.query = req['_tempQuery'];
@@ -644,13 +646,13 @@ var RemultServerImplementation = /** @class */ (function () {
                         }
                         myReq = new RequestBridgeToDataApiRequest(genReq);
                         myRes = new ResponseBridgeToDataApiResponse(origRes, req, genReq, this.options.error);
-                        _a.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _a.trys.push([1, 6, , 7]);
+                        _b.trys.push([1, 6, , 7]);
                         if (!(remult_static_js_1.remultStatic.asyncContext.isInInitRequest() &&
                             !doNotReuseInitRequest)) return [3 /*break*/, 3];
                         return [4 /*yield*/, what(remult_static_js_1.remultStatic.asyncContext.getStore().remult, myReq, myRes, genReq, origRes, req)];
-                    case 2: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/, _b.sent()];
                     case 3: return [4 /*yield*/, this.runWithRemult(function (remult) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                             var user, i, _initRequest;
                             return tslib_1.__generator(this, function (_a) {
@@ -659,6 +661,16 @@ var RemultServerImplementation = /** @class */ (function () {
                                         if (!req) return [3 /*break*/, 11];
                                         ;
                                         remult.context.request = req;
+                                        remult.context.headers = {
+                                            get: function (key) { var _a; return (_a = genReqPublic.headers.get(key)) !== null && _a !== void 0 ? _a : undefined; },
+                                            getAll: function () {
+                                                var result = {};
+                                                genReqPublic.headers.forEach(function (value, key) {
+                                                    result[key] = value;
+                                                });
+                                                return result;
+                                            },
+                                        };
                                         remult_static_js_1.remultStatic.asyncContext.setInInitRequest(true);
                                         _a.label = 1;
                                     case 1:
@@ -712,11 +724,11 @@ var RemultServerImplementation = /** @class */ (function () {
                             });
                         }); })];
                     case 4:
-                        _a.sent();
-                        _a.label = 5;
+                        _b.sent();
+                        _b.label = 5;
                     case 5: return [3 /*break*/, 7];
                     case 6:
-                        err_2 = _a.sent();
+                        err_2 = _b.sent();
                         if (origRes)
                             myRes.error(err_2, undefined);
                         else
@@ -1581,7 +1593,7 @@ var RouteImplementation = /** @class */ (function () {
     RouteImplementation.prototype.middleware = function (origReq, res, next) {
         var e_8, _a;
         var _b;
-        var req = this.coreOptions.buildGenericRequestInfo(origReq);
+        var req = this.coreOptions.buildGenericRequestInfo(origReq).internal;
         var theUrl = ((_b = req.url) === null || _b === void 0 ? void 0 : _b.toString()) || '';
         if (theUrl.startsWith('/'))
             //next sends a partial url '/api/tasks' and not the full url

package/server/test-api-data-provider.js

@@ -21,7 +21,10 @@ function TestApiDataProvider(options) {
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
         }); }); },
-        buildGenericRequestInfo: function (req) { return req; },
+        buildGenericRequestInfo: function (req) { return ({
+            internal: req,
+            public: { headers: new Headers() },
+        }); },
         ignoreAsyncStorage: true,
     });
     var lock = new AsyncLock();

package/src/CompoundIdField.d.ts

@@ -19,6 +19,7 @@ export declare class CompoundIdField implements FieldMetadata<string> {
     dbReadOnly: boolean;
     isServerExpression: boolean;
     key: string;
+    label: string;
     caption: string;
     inputType: string;
     dbName: string;

package/src/CompoundIdField.js

@@ -13,6 +13,7 @@ var CompoundIdField = /** @class */ (function () {
         this.dbReadOnly = false;
         this.isServerExpression = false;
         this.key = '';
+        this.label = '';
         this.caption = '';
         this.inputType = '';
         this.dbName = '';

package/src/column-interfaces.d.ts

@@ -7,6 +7,11 @@ export interface FieldOptions<entityType = unknown, valueType = unknown> {
      * <input placeholder={taskRepo.metadata.fields.title.caption}/>
      */
     caption?: string;
+    /** A human readable name for the field. Can be used to achieve a consistent label for a field throughout the app
+     * @example
+     * <input placeholder={taskRepo.metadata.fields.title.label}/>
+     */
+    label?: string;
     /** If it can store null in the database */
     allowNull?: boolean;
     /** If a value is required. Short-cut to say `validate: Validators.required`.
@@ -141,6 +146,12 @@ export interface FieldMetadata<valueType = unknown, entityType = unknown> {
      * @see {@link FieldOptions#caption} for configuration details
      */
     readonly caption: string;
+    /** A human readable label for the field. Can be used to achieve a consistent label for a field throughout the app
+     * @example
+     * <input placeholder={taskRepo.metadata.fields.title.label}/>
+     * @see {@link FieldOptions.label} for configuration details
+     */
+    readonly label: string;
     /** The name of the column in the database that holds the data for this field. If no name is set, the key will be used instead.
      * @example
      *
@@ -336,4 +347,5 @@ export declare function valueOrExpressionToValue<valueType>(f: ValueOrExpression
 export interface ValueListItem {
     id?: any;
     caption?: any;
+    label?: any;
 }

package/src/context.d.ts

@@ -90,7 +90,15 @@ export declare class Remult {
     clearAllCache(): any;
     /** A helper callback that is called whenever an entity is created. */
     static entityRefInit?: (ref: EntityRef<any>, row: any) => void;
-    /** context information that can be used to store custom information that will be disposed as part of the `remult` object */
+    /**
+     * context that can be used to store custom information that will be disposed as part of the `remult` object.
+     *
+     * `remult.context` is pre-filled in a framework-agnostic way with:
+     *   - `headers.get(key: string)` _of request_
+     *   - `headers.getAll()` _of request_
+     *
+     * Check out the [extensibility section](/docs/custom-options#enhancing-field-and-entity-definitions-with-custom-options) for more custom options.
+     */
     readonly context: RemultContext;
     /** The api client that will be used by `remult` to perform calls to the `api` */
     apiClient: ApiClient;
@@ -102,13 +110,18 @@ export type GetArguments<T> = T extends (...args: infer FirstArgument) => any ?
  * To type it correctly, you can extend it with your own properties.
  * @example
  * import type express from 'express'
+ *
  * declare module 'remult' {
  *   export interface RemultContext {
  *     request?: express.Request
  *   }
  * }
- *  */
+ */
 export interface RemultContext {
+    headers?: {
+        get: (key: string) => string | undefined;
+        getAll: () => Record<string, string>;
+    };
 }
 /**
  * Interface for configuring the API client used by Remult to perform HTTP calls to the backend.

package/src/context.js

@@ -121,7 +121,15 @@ var Remult = /** @class */ (function () {
         };
         /* @internal*/
         this.liveQuerySubscriber = new LiveQueryClient_js_1.LiveQueryClient(function () { return _this.apiClient; }, function () { var _a; return (_a = _this.user) === null || _a === void 0 ? void 0 : _a.id; });
-        /** context information that can be used to store custom information that will be disposed as part of the `remult` object */
+        /**
+         * context that can be used to store custom information that will be disposed as part of the `remult` object.
+         *
+         * `remult.context` is pre-filled in a framework-agnostic way with:
+         *   - `headers.get(key: string)` _of request_
+         *   - `headers.getAll()` _of request_
+         *
+         * Check out the [extensibility section](/docs/custom-options#enhancing-field-and-entity-definitions-with-custom-options) for more custom options.
+         */
         this.context = {};
         /** The api client that will be used by `remult` to perform calls to the `api` */
         this.apiClient = {

package/src/entity.d.ts

@@ -6,6 +6,11 @@ import type { DataProvider } from './data-interfaces.js';
 export interface EntityOptions<entityType = unknown> {
     /**A human readable name for the entity */
     caption?: string;
+    /** A human readable label for the entity. Can be used to achieve a consistent label for a field throughout the app
+     * @example
+     * <h1>Create a new item in {taskRepo.metadata.label}</h1>
+     */
+    label?: string;
     /**
      * Determines if this Entity is available for get requests using Rest Api
      * @description

package/src/remult-static.d.ts

@@ -20,7 +20,7 @@ export declare const remultStatic: {
         };
     };
     fieldOptionsEnricher: any;
-    captionTransformer: any;
+    labelTransformer: any;
     defaultDataProvider: () => Promise<DataProvider | undefined>;
 };
 export declare function defaultFactory(): Remult;

package/src/remult-static.js

@@ -24,7 +24,7 @@ var x = {
         }); },
     },
     fieldOptionsEnricher: undefined,
-    captionTransformer: undefined,
+    labelTransformer: undefined,
     defaultDataProvider: function () {
         return undefined;
     },

package/src/remult3/RepositoryImplementation.d.ts

@@ -211,39 +211,43 @@ export declare class FieldRefImplementation<entityType, valueType> implements Fi
 export declare const fieldOptionsEnricher: {
     enrichFieldOptions: (options: FieldOptions) => void;
 };
-export declare const CaptionTransformer: {
+export declare const LabelTransformer: {
     /**
-     * Transforms the caption of a column based on custom rules or criteria.
+     * Transforms the label of a column based on custom rules or criteria.
      *
      * This method can be assigned an arrow function that dynamically alters the
-     * caption of a column. It is particularly useful for internationalization,
-     * applying specific labeling conventions, or any other custom caption transformation
+     * label of a column. It is particularly useful for internationalization,
+     * applying specific labeling conventions, or any other custom label transformation
      * logic that your application requires.
      *
      * @param {Remult} remult - The Remult context, providing access to various framework features.
-     * @param {string} key - The key (name) of the field whose caption is being transformed.
-     * @param {string} caption - The original caption of the field.
+     * @param {string} key - The key (name) of the field whose label is being transformed.
+     * @param {string} label - The original label of the field.
      * @param {EntityMetadata<any>} entityMetaData - Metadata of the entity that the field belongs to.
-     * @returns {string} The transformed caption for the field. If no transformation is applied,
-     *                   the original caption is returned.
+     * @returns {string} The transformed label for the field. If no transformation is applied,
+     *                   the original label is returned.
      *
      * @example
-     * // Example of translating a field caption to French
-     * CaptionTransformer.transformCaption = (
-     *   remult, key, caption, entityMetaData
+     * // Example of translating a field label to French
+     * LabelTransformer.transformLabel = (
+     *   remult, key, label, entityMetaData
      * ) => {
      *   if (key === 'firstName') {
      *     return 'Prénom'; // French translation for 'firstName'
      *   }
-     *   return caption;
+     *   return label;
      * };
      *
      * // Usage
-     * const firstNameCaption = repo(Person).fields.firstName.caption; // Returns 'Prénom'
+     * const firstNameLabel = repo(Person).fields.firstName.label; // Returns 'Prénom'
      */
-    transformCaption: (remult: Remult, key: string, caption: string, entityMetaData: EntityMetadata<any>) => string;
+    transformLabel: (remult: Remult, key: string, label: string, entityMetaData: EntityMetadata<any>) => string;
+    /**
+     * @obsolete use LabelTransformer.transformLabel instead
+     */
+    transformCaption: (remult: Remult, key: string, label: string, entityMetaData: EntityMetadata<any>) => string;
 };
-export declare function buildCaption(caption: string | ((remult: Remult) => string) | undefined, key: string, remult: Remult, metaData: EntityMetadata<any>): string;
+export declare function buildLabel(label: string | ((remult: Remult) => string) | undefined, key: string, remult: Remult, metaData: EntityMetadata<any>): string;
 export declare class columnDefsImpl implements FieldMetadata {
     private settings;
     private entityDefs;
@@ -260,7 +264,8 @@ export declare class columnDefsImpl implements FieldMetadata {
     readonly: boolean;
     valueConverter: Required<ValueConverter<any>>;
     allowNull: boolean;
-    caption: string;
+    label: string;
+    get caption(): string;
     dbName: string;
     inputType: string;
     key: string;
@@ -285,7 +290,8 @@ declare class EntityFullInfo<T> implements EntityMetadata<T> {
     idMetadata: IdMetadata<T>;
     fields: FieldsMetadata<T>;
     dbName: string;
-    caption: string;
+    label: string;
+    get caption(): string;
 }
 export declare function FieldType<valueType = unknown>(...options: (FieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (target: any, context?: any) => any;
 export declare function isAutoIncrement(f: FieldMetadata): boolean;

package/src/remult3/RepositoryImplementation.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.fieldOptionalValuesFunctionKey = exports.storableMember = exports.ValueListInfo = exports.columnDefsImpl = exports.CaptionTransformer = exports.fieldOptionsEnricher = exports.FieldRefImplementation = exports.controllerRefImpl = exports.rowHelperImplementation = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.fieldOptionalValuesFunctionKey = exports.storableMember = exports.ValueListInfo = exports.columnDefsImpl = exports.LabelTransformer = exports.fieldOptionsEnricher = exports.FieldRefImplementation = exports.controllerRefImpl = exports.rowHelperImplementation = exports.RepositoryImplementation = void 0;
 exports.createOldEntity = createOldEntity;
 exports.getFields = getFields;
 exports.getControllerRef = getControllerRef;
-exports.buildCaption = buildCaption;
+exports.buildLabel = buildLabel;
 exports.FieldType = FieldType;
 exports.isAutoIncrement = isAutoIncrement;
 exports.ValueListFieldType = ValueListFieldType;
@@ -1955,7 +1955,7 @@ var rowHelperBase = /** @class */ (function () {
                     var col = _d.value;
                     if ((_b = this.errors) === null || _b === void 0 ? void 0 : _b[col.key]) {
                         error.message =
-                            this.fields[col.key].metadata.caption +
+                            this.fields[col.key].metadata.label +
                                 ': ' +
                                 this.errors[col.key];
                         this.error = error.message;
@@ -3334,23 +3334,26 @@ var FieldRefImplementation = /** @class */ (function () {
     return FieldRefImplementation;
 }());
 exports.FieldRefImplementation = FieldRefImplementation;
-var tempCaptionTransformer = {
-    transformCaption: function (remult, key, caption, entityMetaData) { return caption; },
+var tempLabelTransformer = {
+    transformLabel: function (remult, key, label, entityMetaData) { return label; },
+    set transformCaption(val) {
+        this.transformLabel = val;
+    },
 };
 exports.fieldOptionsEnricher = remult_static_js_1.remultStatic.fieldOptionsEnricher || {
     enrichFieldOptions: function (options) { return options; },
 };
-exports.CaptionTransformer = remult_static_js_1.remultStatic.captionTransformer ||
-    (remult_static_js_1.remultStatic.captionTransformer = tempCaptionTransformer);
-function buildCaption(caption, key, remult, metaData) {
+exports.LabelTransformer = remult_static_js_1.remultStatic.labelTransformer ||
+    (remult_static_js_1.remultStatic.labelTransformer = tempLabelTransformer);
+function buildLabel(label, key, remult, metaData) {
     var result = undefined;
-    if (typeof caption === 'function') {
+    if (typeof label === 'function') {
         if (remult)
-            result = caption(remult);
+            result = label(remult);
     }
-    else if (caption)
-        result = caption;
-    result = exports.CaptionTransformer.transformCaption(remult, key, result !== null && result !== void 0 ? result : '', metaData);
+    else if (label)
+        result = label;
+    result = exports.LabelTransformer.transformLabel(remult, key, result !== null && result !== void 0 ? result : '', metaData);
     if (result)
         return result;
     if (key)
@@ -3360,7 +3363,7 @@ function buildCaption(caption, key, remult, metaData) {
 var columnDefsImpl = /** @class */ (function () {
     function columnDefsImpl(settings, entityDefs, remult) {
         var _this = this;
-        var _a;
+        var _a, _b;
         this.settings = settings;
         this.entityDefs = entityDefs;
         this.remult = remult;
@@ -3384,7 +3387,7 @@ 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 new data_interfaces_js_1.EntityError({
-                                message: _this.caption + ': ' + error,
+                                message: _this.label + ': ' + error,
                                 modelState: (_a = {},
                                     _a[_this.key] = error,
                                     _a),
@@ -3408,7 +3411,7 @@ var columnDefsImpl = /** @class */ (function () {
         this.dbName = settings.dbName;
         if (this.dbName == undefined)
             this.dbName = settings.key;
-        this.caption = buildCaption(settings.caption, settings.key, remult, entityDefs);
+        this.label = buildLabel((_b = settings.label) !== null && _b !== void 0 ? _b : settings.caption, settings.key, remult, entityDefs);
     }
     columnDefsImpl.prototype.apiUpdateAllowed = function (item) {
         if (this.options.allowApiUpdate === undefined)
@@ -3438,6 +3441,13 @@ var columnDefsImpl = /** @class */ (function () {
             });
         });
     };
+    Object.defineProperty(columnDefsImpl.prototype, "caption", {
+        get: function () {
+            return this.label;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(columnDefsImpl.prototype, "dbReadOnly", {
         get: function () {
             return Boolean(this.settings.dbReadOnly);
@@ -3452,6 +3462,7 @@ var EntityFullInfo = /** @class */ (function () {
     function EntityFullInfo(columnsInfo, entityInfo, remult, entityType, key) {
         var _a, e_49, _b;
         var _this = this;
+        var _c;
         this.entityInfo = entityInfo;
         this.remult = remult;
         this.entityType = entityType;
@@ -3562,7 +3573,7 @@ var EntityFullInfo = /** @class */ (function () {
             finally { if (e_49) throw e_49.error; }
         }
         this.fields = r;
-        this.caption = buildCaption(entityInfo.caption, this.key, remult, this);
+        this.label = buildLabel((_c = entityInfo.label) !== null && _c !== void 0 ? _c : entityInfo.caption, this.key, remult, this);
         if (entityInfo.id) {
             var r_2 = typeof entityInfo.id === 'string'
                 ? this.fields.find(entityInfo.id)
@@ -3627,6 +3638,13 @@ var EntityFullInfo = /** @class */ (function () {
     EntityFullInfo.prototype.getDbName = function () {
         return (0, entityDbName_js_1.entityDbName)(this);
     };
+    Object.defineProperty(EntityFullInfo.prototype, "caption", {
+        get: function () {
+            return this.label;
+        },
+        enumerable: false,
+        configurable: true
+    });
     return EntityFullInfo;
 }());
 function FieldType() {
@@ -3656,7 +3674,7 @@ function ValueListFieldType() {
         FieldType.apply(void 0, tslib_1.__spreadArray([function (o) {
                 ;
                 (o.valueConverter = ValueListInfo.get(type)),
-                    (o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; });
+                    (o.displayValue = function (item, val) { var _a; return (_a = val === null || val === void 0 ? void 0 : val.label) !== null && _a !== void 0 ? _a : val === null || val === void 0 ? void 0 : val.caption; });
                 o.validate = function (entity, ref) {
                     var values = ValueListInfo.get(type).getValues();
                     if (ref.value && !values.find(function (v) { return v === ref.value; })) {
@@ -3682,8 +3700,7 @@ var ValueListInfo = /** @class */ (function () {
                     s.id = member;
                 if (typeof s.id === 'number')
                     this.isNumeric = true;
-                if (s.caption === undefined)
-                    s.caption = (0, column_js_1.makeTitle)(s.id !== undefined ? s.id.toString() : member);
+                setLabelAndCaption(s, member);
                 this.byIdMap.set(s.id, s);
                 this.values.push(s);
             }
@@ -3700,8 +3717,7 @@ var ValueListInfo = /** @class */ (function () {
                         (_b = this.values).splice.apply(_b, tslib_1.__spreadArray([0, this.values.length], tslib_1.__read(op.getValues()), false));
                         this.byIdMap.clear();
                         this.values.forEach(function (s) {
-                            if (s.caption === undefined && s.id !== undefined)
-                                s.caption = (0, column_js_1.makeTitle)(s.id);
+                            setLabelAndCaption(s, '');
                             _this.byIdMap.set(s.id, s);
                         });
                     }
@@ -3766,6 +3782,16 @@ var ValueListInfo = /** @class */ (function () {
 }());
 exports.ValueListInfo = ValueListInfo;
 var typeCache = new Map();
+function setLabelAndCaption(s, member) {
+    var _a;
+    var label = (_a = s.label) !== null && _a !== void 0 ? _a : s.caption;
+    if (label === undefined)
+        label = (0, column_js_1.makeTitle)(s.id !== undefined ? s.id.toString() : member);
+    if (s.label === undefined)
+        s.label = label;
+    if (s.caption === undefined)
+        s.caption = label;
+}
 function getValueList(type) {
     var meta = type === null || type === void 0 ? void 0 : type.metadata;
     if (!meta && (0, isOfType_js_1.isOfType)(type, 'options'))