remult 2.7.30 → 2.7.32-next.0

package/server/remult-admin.d.ts

@@ -3,6 +3,7 @@ import type { ClassType } from '../classType.js';
 import type { Remult } from '../src/context.js';
 import { EntityFilter } from '../src/remult3/remult3.js';
 export interface EntityUIInfo {
+    superKey: string;
     key: string;
     caption: string;
     fields: FieldUIInfo[];

package/server/remult-admin.js

@@ -14,118 +14,130 @@ function remultAdminHtml(options) {
         .replace('<!--PLACE_HERE_BODY-->', "<script>\n  window.optionsFromServer = ".concat(JSON.stringify({ rootPath: rootPath }), "\n</script>"));
 }
 function buildEntityInfo(options) {
-    var e_1, _a, e_2, _b, e_3, _c;
-    var _d, _e;
+    var e_1, _a;
+    var _b, _c;
     var entities = [];
-    try {
-        for (var _f = tslib_1.__values(options.entities.map(function (e) { return options.remult.repo(e).metadata; })), _g = _f.next(); !_g.done; _g = _f.next()) {
-            var metadata = _g.value;
-            var fields = [];
-            var relations = [];
-            var ids = {};
-            try {
-                for (var _h = (e_2 = void 0, tslib_1.__values(metadata.idMetadata.fields)), _j = _h.next(); !_j.done; _j = _h.next()) {
-                    var f = _j.value;
-                    ids[f.key] = true;
-                }
+    var _loop_1 = function (metadata) {
+        var e_2, _f, e_3, _g;
+        var fields = [];
+        var relations = [];
+        var ids = {};
+        try {
+            for (var _h = (e_2 = void 0, tslib_1.__values(metadata.idMetadata.fields)), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var f = _j.value;
+                ids[f.key] = true;
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-            finally {
-                try {
-                    if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
-                }
-                finally { if (e_2) throw e_2.error; }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_j && !_j.done && (_f = _h.return)) _f.call(_h);
             }
-            var _loop_1 = function (x) {
-                if (!x.includedInApi(undefined))
-                    return "continue";
-                try {
-                    var relation = void 0;
-                    var valFieldKey = x.key;
-                    var info = (0, relationInfoMember_js_1.getRelationFieldInfo)(x);
-                    if (info) {
-                        var relInfo = info.getFields();
-                        var relRepo = options.remult.repo(info.toEntity);
-                        var where = typeof info.options.findOptions === 'object' &&
-                            info.options.findOptions.where
-                            ? filter_interfaces_js_1.Filter.entityFilterToJson(relRepo.metadata, info.options.findOptions.where)
-                            : undefined;
-                        var idField_1 = relRepo.metadata.idMetadata.field.key;
-                        if (info.type === 'reference' || info.type === 'toOne') {
-                            if (info.type == 'toOne') {
-                                for (var key in relInfo.fields) {
-                                    if (Object.prototype.hasOwnProperty.call(relInfo.fields, key)) {
-                                        var element = relInfo.fields[key];
-                                        valFieldKey = element;
-                                    }
+            finally { if (e_2) throw e_2.error; }
+        }
+        var _loop_2 = function (x) {
+            if (!x.includedInApi(undefined))
+                return "continue";
+            try {
+                var relation = void 0;
+                var valFieldKey = x.key;
+                var info = (0, relationInfoMember_js_1.getRelationFieldInfo)(x);
+                if (info) {
+                    var relInfo = info.getFields();
+                    var relRepo = options.remult.repo(info.toEntity);
+                    var where = typeof info.options.findOptions === 'object' &&
+                        info.options.findOptions.where
+                        ? filter_interfaces_js_1.Filter.entityFilterToJson(relRepo.metadata, info.options.findOptions.where)
+                        : undefined;
+                    var idField_1 = relRepo.metadata.idMetadata.field.key;
+                    if (info.type === 'reference' || info.type === 'toOne') {
+                        if (info.type == 'toOne') {
+                            for (var key in relInfo.fields) {
+                                if (Object.prototype.hasOwnProperty.call(relInfo.fields, key)) {
+                                    var element = relInfo.fields[key];
+                                    valFieldKey = element;
                                 }
                             }
-                            if (relRepo.metadata.apiReadAllowed) {
-                                relation = tslib_1.__assign(tslib_1.__assign({}, relInfo), { where: where, entityKey: relRepo.metadata.key, idField: idField_1, captionField: (_d = relRepo.metadata.fields
-                                        .toArray()
-                                        .find(function (x) { return x.key != idField_1 && x.valueType == String; })) === null || _d === void 0 ? void 0 : _d.key });
-                            }
                         }
-                        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 }));
-                            }
-                            return "continue";
+                        if (relRepo.metadata.apiReadAllowed) {
+                            relation = tslib_1.__assign(tslib_1.__assign({}, relInfo), { where: where, entityKey: relRepo.metadata.key, idField: idField_1, captionField: (_b = relRepo.metadata.fields
+                                    .toArray()
+                                    .find(function (x) { return x.key != idField_1 && x.valueType == String; })) === null || _b === void 0 ? void 0 : _b.key });
                         }
                     }
-                    fields.push({
-                        key: x.key,
-                        readOnly: !x.apiUpdateAllowed(),
-                        values: (0, RepositoryImplementation_js_1.getValueList)(x),
-                        valFieldKey: valFieldKey,
-                        caption: x.caption,
-                        relationToOne: relation,
-                        inputType: x.inputType,
-                        type: x.valueConverter.fieldTypeInDb == 'json'
-                            ? 'json'
-                            : x.valueType === Number
-                                ? 'number'
-                                : x.valueType === Boolean
-                                    ? 'boolean'
-                                    : x.valueType === Date
-                                        ? 'date'
-                                        : 'string',
-                    });
-                }
-                catch (error) {
-                    console.error("[remult-admin] Error with ".concat(metadata.key, ".").concat(x.key, " field."));
-                    console.error("[remult-admin]", error);
-                }
-            };
-            try {
-                for (var _k = (e_3 = void 0, tslib_1.__values(metadata.fields.toArray())), _l = _k.next(); !_l.done; _l = _k.next()) {
-                    var x = _l.value;
-                    _loop_1(x);
+                    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 }));
+                        }
+                        return "continue";
+                    }
                 }
+                fields.push({
+                    key: x.key,
+                    readOnly: !x.apiUpdateAllowed(),
+                    values: (0, RepositoryImplementation_js_1.getValueList)(x),
+                    valFieldKey: valFieldKey,
+                    caption: x.caption,
+                    relationToOne: relation,
+                    inputType: x.inputType,
+                    type: x.valueConverter.fieldTypeInDb == 'json'
+                        ? 'json'
+                        : x.valueType === Number
+                            ? 'number'
+                            : x.valueType === Boolean
+                                ? 'boolean'
+                                : x.valueType === Date
+                                    ? 'date'
+                                    : 'string',
+                });
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
-                }
-                finally { if (e_3) throw e_3.error; }
+            catch (error) {
+                console.error("[remult-admin] Error with ".concat(metadata.key, ".").concat(x.key, " field."));
+                console.error("[remult-admin]", error);
             }
-            if (metadata.apiReadAllowed) {
-                entities.push({
-                    key: metadata.key,
-                    caption: metadata.caption,
-                    ids: ids,
-                    fields: fields,
-                    relations: relations,
-                    defaultOrderBy: (_e = metadata.options.defaultOrderBy) !== null && _e !== void 0 ? _e : { id: 'asc' },
-                });
+        };
+        try {
+            for (var _k = (e_3 = void 0, tslib_1.__values(metadata.fields.toArray())), _l = _k.next(); !_l.done; _l = _k.next()) {
+                var x = _l.value;
+                _loop_2(x);
             }
         }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_l && !_l.done && (_g = _k.return)) _g.call(_k);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        if (metadata.apiReadAllowed) {
+            var superKey = metadata.key;
+            var caption = metadata.caption;
+            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);
+            }
+            entities.push({
+                superKey: superKey,
+                key: metadata.key,
+                caption: caption,
+                ids: ids,
+                fields: fields,
+                relations: relations,
+                defaultOrderBy: (_c = metadata.options.defaultOrderBy) !== null && _c !== void 0 ? _c : { id: 'asc' },
+            });
+        }
+    };
+    try {
+        for (var _d = tslib_1.__values(options.entities.map(function (e) { return options.remult.repo(e).metadata; })), _e = _d.next(); !_e.done; _e = _d.next()) {
+            var metadata = _e.value;
+            _loop_1(metadata);
+        }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
+            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
         }
         finally { if (e_1) throw e_1.error; }
     }

package/src/context.d.ts

@@ -1,6 +1,6 @@
 import type { ClassType } from '../classType.js';
 import type { DataProvider } from './data-interfaces.js';
-import type { EntityMetadata, EntityRef, FindOptions, Repository } from './remult3/remult3.js';
+import type { EntityMetadata, EntityRef, FindOptions, RefSubscriber, Repository } from './remult3/remult3.js';
 import type { ExternalHttpProvider } from './buildRestDataProvider.js';
 import type { SubscriptionClient, Unsubscribe } from './live-query/SubscriptionChannel.js';
 import type { LiveQueryStorage, SubscriptionServer } from './live-query/SubscriptionServer.js';
@@ -36,8 +36,12 @@ export declare class Remult {
      * @param dataProvider - an optional alternative data provider to use. Useful for writing to offline storage or an alternative data provider
      */
     repo: <T>(entity: ClassType<T>, dataProvider?: DataProvider) => Repository<T>;
+    private _subscribers?;
+    subscribeAuth(listener: RefSubscriber): Unsubscribe;
+    private __user?;
     /** Returns the current user's info */
-    user?: UserInfo;
+    get user(): UserInfo | undefined;
+    set user(user: UserInfo | undefined);
     /**
      * Fetches user information from the backend and updates the `remult.user` object.
      * Typically used during application initialization and user authentication.

package/src/context.js

@@ -16,6 +16,7 @@ var buildRestDataProvider_js_1 = require("./buildRestDataProvider.js");
 var relationInfoMember_js_1 = require("./remult3/relationInfoMember.js");
 var remult_static_js_1 = require("./remult-static.js");
 var initDataProvider_js_1 = require("../server/initDataProvider.js");
+var SubscribableImp_js_1 = require("./remult3/SubscribableImp.js");
 var RemultAsyncLocalStorage = /** @class */ (function () {
     function RemultAsyncLocalStorage(remultObjectStorage) {
         this.remultObjectStorage = remultObjectStorage;
@@ -133,6 +134,26 @@ var Remult = /** @class */ (function () {
                 this.apiClient.wrapMessageHandling = apiClient.wrapMessageHandling;
         }
     }
+    Remult.prototype.subscribeAuth = function (listener) {
+        if (!this._subscribers)
+            this._subscribers = new SubscribableImp_js_1.SubscribableImp();
+        return this._subscribers.subscribe(listener);
+    };
+    Object.defineProperty(Remult.prototype, "user", {
+        /** Returns the current user's info */
+        get: function () {
+            var _a;
+            (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportObserved();
+            return this.__user;
+        },
+        set: function (user) {
+            var _a;
+            this.__user = user;
+            (_a = this._subscribers) === null || _a === void 0 ? void 0 : _a.reportChanged();
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Fetches user information from the backend and updates the `remult.user` object.
      * Typically used during application initialization and user authentication.

package/src/remult-proxy.js

@@ -285,6 +285,9 @@ var RemultProxy = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    RemultProxy.prototype.subscribeAuth = function (listener) {
+        return remult_static_js_1.remultStatic.remultFactory().subscribeAuth(listener);
+    };
     RemultProxy.prototype.initUser = function () {
         return remult_static_js_1.remultStatic.remultFactory().initUser();
     };

package/src/remult3/RepositoryImplementation.d.ts

@@ -4,13 +4,14 @@ import type { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from
 import { Remult } from '../context.js';
 import type { EntityOptions } from '../entity.js';
 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 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 idType } from './remult3.js';
 import type { QueryOptions, RefSubscriber, UpsertOptions } from './remult3.js';
 import type { entityEventListener } from '../__EntityValueProvider.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';
+import { SubscribableImp } from './SubscribableImp.js';
 export declare class RepositoryImplementation<entityType> implements Repository<entityType>, RepositoryInternal<entityType> {
     private _entity;
     _remult: Remult;
@@ -333,15 +334,6 @@ export declare class ControllerBase {
     get $(): FieldsRefForEntityBase<this>;
     get _(): ControllerRefForControllerBase<this>;
 }
-declare class SubscribableImp implements Subscribable {
-    reportChanged(): void;
-    reportObserved(): void;
-    private _subscribers?;
-    subscribe(listener: (() => void) | {
-        reportChanged: () => void;
-        reportObserved: () => void;
-    }): Unsubscribe;
-}
 export declare function getEntityMetadata<entityType>(entity: EntityMetadataOverloads<entityType>): EntityMetadata<entityType>;
 export declare function getRepository<entityType>(entity: RepositoryOverloads<entityType>): Repository<entityType>;
 export type EntityMetadataOverloads<entityType> = Repository<entityType> | EntityMetadata<entityType> | ClassType<entityType>;

package/src/remult3/RepositoryImplementation.js

@@ -36,6 +36,7 @@ var validators_js_1 = require("../validators.js");
 var addValidator_js_1 = require("./addValidator.js");
 var isOfType_js_1 = require("../isOfType.js");
 var QueryResultImpl_js_1 = require("./QueryResultImpl.js");
+var SubscribableImp_js_1 = require("./SubscribableImp.js");
 //import  { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -1773,7 +1774,7 @@ var rowHelperBase = /** @class */ (function () {
                             if (!refImpl_1) {
                                 refImpl_1 = _this.fields.find(col.key);
                                 if (!refImpl_1._subscribers) {
-                                    refImpl_1._subscribers = new SubscribableImp();
+                                    refImpl_1._subscribers = new SubscribableImp_js_1.SubscribableImp();
                                 }
                             }
                             refImpl_1._subscribers.reportObserved();
@@ -1787,7 +1788,7 @@ var rowHelperBase = /** @class */ (function () {
                         if (!refImpl_1) {
                             refImpl_1 = _this.fields.find(col.key);
                             if (!refImpl_1._subscribers) {
-                                refImpl_1._subscribers = new SubscribableImp();
+                                refImpl_1._subscribers = new SubscribableImp_js_1.SubscribableImp();
                             }
                         }
                         refImpl_1._subscribers.reportChanged();
@@ -1869,12 +1870,12 @@ var rowHelperBase = /** @class */ (function () {
     rowHelperBase.prototype.initSubscribers = function () {
         var e_28, _a;
         if (!this._subscribers) {
-            this._subscribers = new SubscribableImp();
+            this._subscribers = new SubscribableImp_js_1.SubscribableImp();
             var safeSubscribers_1 = this._subscribers;
             var _loop_6 = function (col) {
                 var ei = (0, getEntityRef_js_1.getEntitySettings)(col.valueType, false);
                 var refImpl = this_3.fields.find(col.key);
-                refImpl._subscribers = new SubscribableImp();
+                refImpl._subscribers = new SubscribableImp_js_1.SubscribableImp();
                 if ((ei && this_3.remult) || (0, relationInfoMember_js_1.getRelationFieldInfo)(col)) {
                 }
                 else {
@@ -3977,37 +3978,6 @@ var cacheEntityInfo = /** @class */ (function () {
     }
     return cacheEntityInfo;
 }());
-var SubscribableImp = /** @class */ (function () {
-    function SubscribableImp() {
-    }
-    SubscribableImp.prototype.reportChanged = function () {
-        if (this._subscribers)
-            this._subscribers.forEach(function (x) { return x.reportChanged(); });
-    };
-    SubscribableImp.prototype.reportObserved = function () {
-        if (this._subscribers)
-            this._subscribers.forEach(function (x) { return x.reportObserved(); });
-    };
-    SubscribableImp.prototype.subscribe = function (listener) {
-        var _this = this;
-        var list;
-        if (typeof listener === 'function')
-            list = {
-                reportChanged: function () { return listener(); },
-                reportObserved: function () { },
-            };
-        else
-            list = listener;
-        if (!this._subscribers) {
-            this._subscribers = [];
-        }
-        this._subscribers.push(list);
-        return function () {
-            return (_this._subscribers = _this._subscribers.filter(function (x) { return x != list; }));
-        };
-    };
-    return SubscribableImp;
-}());
 function getEntityMetadata(entity) {
     if (entity.metadata)
         return entity.metadata;

package/src/remult3/SubscribableImp.d.ts

@@ -0,0 +1,11 @@
+import type { Unsubscribe } from '../live-query/SubscriptionChannel.js';
+import type { Subscribable } from './remult3.js';
+export declare class SubscribableImp implements Subscribable {
+    reportChanged(): void;
+    reportObserved(): void;
+    private _subscribers?;
+    subscribe(listener: (() => void) | {
+        reportChanged: () => void;
+        reportObserved: () => void;
+    }): Unsubscribe;
+}

package/src/remult3/SubscribableImp.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscribableImp = void 0;
+var SubscribableImp = /** @class */ (function () {
+    function SubscribableImp() {
+    }
+    SubscribableImp.prototype.reportChanged = function () {
+        if (this._subscribers)
+            this._subscribers.forEach(function (x) { return x.reportChanged(); });
+    };
+    SubscribableImp.prototype.reportObserved = function () {
+        if (this._subscribers)
+            this._subscribers.forEach(function (x) { return x.reportObserved(); });
+    };
+    SubscribableImp.prototype.subscribe = function (listener) {
+        var _this = this;
+        var list;
+        if (typeof listener === 'function')
+            list = {
+                reportChanged: function () { return listener(); },
+                reportObserved: function () { },
+            };
+        else
+            list = listener;
+        if (!this._subscribers) {
+            this._subscribers = [];
+        }
+        this._subscribers.push(list);
+        return function () {
+            return (_this._subscribers = _this._subscribers.filter(function (x) { return x != list; }));
+        };
+    };
+    return SubscribableImp;
+}());
+exports.SubscribableImp = SubscribableImp;

package/src/valueConverters.js

@@ -138,7 +138,9 @@ var ValueConverters = /** @class */ (function () {
         toJson: function (value) { return ValueConverters.Number.toDb(value); },
         fromInput: function (x, type) {
             var r = +x;
-            if (x === null || x === undefined)
+            if (x === null)
+                return null;
+            if (x === undefined)
                 return undefined;
             return r;
         },