remult 0.26.21 → 0.26.23-next.0

package/esm/src/remult3/RepositoryImplementation.js

@@ -333,7 +333,8 @@ export class RepositoryImplementation {
         if (!ref) {
             const instance = new this._entity(this._remult);
             for (const field of this._fieldsOf(entity)) {
-                instance[field.key] = entity[field.key];
+                const key = field.key;
+                instance[key] = entity[key];
             }
             this._fixTypes(instance);
             let row = new rowHelperImplementation(this._info, instance, this, this._edp, this._remult, false);
@@ -386,7 +387,8 @@ export class RepositoryImplementation {
                 }
                 listener.error ??= () => { };
                 listener.complete ??= () => { };
-                return this._remult.liveQuerySubscriber.subscribe(this, options, listener);
+                return this._remult.liveQuerySubscriber.subscribe(//TODO - figure out why the type was required
+                this, options, listener);
             },
         };
     }
@@ -481,15 +483,17 @@ export class RepositoryImplementation {
             let rel = getRelationFieldInfo(col);
             let incl = col.options
                 .defaultIncluded;
-            if (loadOptions?.include?.[col.key] !== undefined) {
-                incl = loadOptions.include[col.key];
+            const include = loadOptions?.include?.[col.key];
+            if (include !== undefined) {
+                incl = include;
             }
             if (rel && incl) {
                 const otherRepo = rel.toRepo;
                 for (const row of result) {
                     let { findOptions, returnNull } = this._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo);
+                    const colKey = col.key;
                     if (returnNull)
-                        row[col.key] = null;
+                        row[colKey] = null;
                     else {
                         const entityType = rel.toEntity;
                         const toRepo = otherRepo;
@@ -502,7 +506,7 @@ export class RepositoryImplementation {
                             .then((result) => {
                             if (result.length == 0 && rel.type == 'toOne')
                                 return;
-                            row[col.key] =
+                            row[colKey] =
                                 rel.type !== 'toMany'
                                     ? result.length == 0
                                         ? null
@@ -580,8 +584,6 @@ export class RepositoryImplementation {
         return { findOptions, returnNull, returnUndefined };
     }
     async _mapRawDataToResult(r, loadFields) {
-        if (!r)
-            return undefined;
         let x = new this._entity(this._remult);
         let helper = new rowHelperImplementation(this._info, x, this, this._edp, this._remult, false);
         Object.defineProperty(x, entityMember, {
@@ -608,17 +610,18 @@ export class RepositoryImplementation {
             return json.map((item) => this.fromJson(item, newRow));
         let result = new this._entity(this._remult);
         for (const col of this._fieldsOf(json)) {
+            const colKey = col.key;
             let ei = getEntitySettings(col.valueType, false);
             if (ei) {
                 let val = json[col.key];
                 if (typeof val === 'string' || typeof val === 'number')
-                    result[col.key] = val;
+                    result[colKey] = val;
                 else
-                    result[col.key] = this._remult.repo(col.valueType).fromJson(val);
+                    result[colKey] = this._remult.repo(col.valueType).fromJson(val);
             }
             else {
-                if (json[col.key] !== undefined) {
-                    result[col.key] = col.valueConverter.fromJson(json[col.key]);
+                if (json[colKey] !== undefined) {
+                    result[colKey] = col.valueConverter.fromJson(json[col.key]);
                 }
             }
         }
@@ -654,11 +657,10 @@ export class RepositoryImplementation {
         }
     }
     _cache = new Map();
-    async findOne(options, skipOrderByAndLimit = false) {
+    async findOne(pOptions, skipOrderByAndLimit = false) {
         let r;
         let cacheInfo;
-        if (!options)
-            options = {};
+        let options = pOptions ?? {};
         if (options.useCache) {
             let f = findOptionsToJson(options, this.metadata);
             let key = JSON.stringify(f);
@@ -670,7 +672,7 @@ export class RepositoryImplementation {
                     this._cache.delete(key);
                 }
                 else
-                    return this._cache.get(key).promise;
+                    return cacheInfo.promise;
             }
             else {
                 cacheInfo = {
@@ -723,7 +725,8 @@ export class RepositoryImplementation {
         let r = new this._entity(this._remult);
         if (item) {
             for (const field of this._fieldsOf(item)) {
-                r[field.key] = item[field.key];
+                const key = field.key;
+                r[key] = item[key];
             }
             this._fixTypes(r);
         }
@@ -755,7 +758,7 @@ export class RepositoryImplementation {
     }
     findId(id, options) {
         if (id === null || id === undefined)
-            return null;
+            return Promise.resolve(null);
         if (typeof id !== 'string' && typeof id !== 'number')
             throw new Error('id can be either number or string, but got: ' + typeof id);
         return this.findFirst({}, {
@@ -764,24 +767,23 @@ export class RepositoryImplementation {
         }, true);
     }
     async _translateWhereToFilter(where) {
-        if (!where)
-            where = {};
+        let safeWhere = where ?? {};
         if (this._defaultFindOptions?.where) {
-            let z = where;
-            where = {
+            let z = safeWhere;
+            safeWhere = {
                 $and: [z, this._defaultFindOptions?.where],
             };
         }
         if (!this._dataProvider.isProxy) {
             if (this.metadata.options.backendPreprocessFilter) {
-                where = await this.metadata.options.backendPreprocessFilter(where, {
+                safeWhere = await this.metadata.options.backendPreprocessFilter(safeWhere, {
                     metadata: this.metadata,
-                    getFilterPreciseValues: (filter) => Filter.getPreciseValues(this.metadata, filter || where),
+                    getFilterPreciseValues: (filter) => Filter.getPreciseValues(this.metadata, filter || safeWhere),
                 });
             }
             if (this.metadata.options.backendPrefilter) {
-                let z = where;
-                where = {
+                let z = safeWhere;
+                safeWhere = {
                     $and: [
                         z,
                         await Filter.resolve(this.metadata.options.backendPrefilter),
@@ -789,7 +791,7 @@ export class RepositoryImplementation {
                 };
             }
         }
-        let r = await Filter.fromEntityFilter(this.metadata, where);
+        let r = await Filter.fromEntityFilter(this.metadata, safeWhere);
         if (r && !this._dataProvider.isProxy) {
             r = await Filter.translateCustomWhere(r, this.metadata, this._remult);
         }
@@ -822,8 +824,11 @@ export function createOldEntity(entity, remult) {
             for (const key of functions) {
                 if (baseSettings[key] && baseSettings[key] !== info[key]) {
                     let x = info[key];
+                    //@ts-ignore
                     info[key] = async (a, b) => {
+                        //@ts-ignore
                         await x(a, b);
+                        //@ts-ignore
                         await baseSettings[key](a, b);
                     };
                 }
@@ -894,37 +899,41 @@ class rowHelperBase {
                 });
                 lookup.set(val);
             }
-            else if (getRelationFieldInfo(col)?.type === 'toOne') {
-                let hasVal = instance.hasOwnProperty(col.key);
-                let val = instance[col.key];
-                if (isNewRow && !val)
-                    hasVal = false;
-                Object.defineProperty(instance, col.key, {
-                    get: () => {
-                        return val;
-                    },
-                    set: (newVal) => {
-                        val = newVal;
-                        if (newVal === undefined)
-                            return;
-                        const op = col.options;
-                        if (op.field) {
-                            this.instance[op.field] =
-                                getRelationFieldInfo(col).toRepo.metadata.idMetadata.getId(newVal);
-                        }
-                        if (op.fields) {
-                            for (const key in op.fields) {
-                                if (Object.prototype.hasOwnProperty.call(op.fields, key)) {
-                                    const element = op.fields[key];
-                                    this.instance[element] = newVal == null ? null : newVal[key];
+            else {
+                const rel = getRelationFieldInfo(col);
+                if (rel?.type === 'toOne') {
+                    let hasVal = instance.hasOwnProperty(col.key);
+                    let val = instance[col.key];
+                    if (isNewRow && !val)
+                        hasVal = false;
+                    Object.defineProperty(instance, col.key, {
+                        get: () => {
+                            return val;
+                        },
+                        set: (newVal) => {
+                            val = newVal;
+                            if (newVal === undefined)
+                                return;
+                            const op = col.options;
+                            if (op.field) {
+                                this.instance[op.field] =
+                                    rel.toRepo.metadata.idMetadata.getId(newVal);
+                            }
+                            if (op.fields) {
+                                for (const key in op.fields) {
+                                    if (Object.prototype.hasOwnProperty.call(op.fields, key)) {
+                                        const element = op.fields[key];
+                                        this.instance[element] =
+                                            newVal == null ? null : newVal[key];
+                                    }
                                 }
                             }
-                        }
-                    },
-                    enumerable: true,
-                });
-                if (hasVal)
-                    instance[col.key] = val;
+                        },
+                        enumerable: true,
+                    });
+                    if (hasVal)
+                        instance[col.key] = val;
+                }
             }
         }
     }
@@ -937,6 +946,7 @@ class rowHelperBase {
     initSubscribers() {
         if (!this._subscribers) {
             this._subscribers = new SubscribableImp();
+            const safeSubscribers = this._subscribers;
             for (const col of this.fieldsMetadata) {
                 let ei = getEntitySettings(col.valueType, false);
                 let refImpl = this.fields.find(col.key);
@@ -947,13 +957,13 @@ class rowHelperBase {
                     let val = this.instance[col.key];
                     Object.defineProperty(this.instance, col.key, {
                         get: () => {
-                            this._subscribers.reportObserved();
+                            safeSubscribers.reportObserved();
                             refImpl._subscribers.reportObserved();
                             return val;
                         },
                         set: (value) => {
                             val = value;
-                            this._subscribers.reportChanged();
+                            safeSubscribers.reportChanged();
                             refImpl._subscribers.reportChanged();
                         },
                         enumerable: true,
@@ -986,9 +996,11 @@ class rowHelperBase {
         };
         if (!error.message) {
             for (const col of this.fieldsMetadata) {
-                if (this.errors[col.key]) {
+                if (this.errors?.[col.key]) {
                     error.message =
-                        this.fields[col.key].metadata.caption + ': ' + this.errors[col.key];
+                        this.fields[col.key].metadata.caption +
+                            ': ' +
+                            this.errors[col.key];
                     this.error = error.message;
                     break;
                 }
@@ -1161,12 +1173,13 @@ export class rowHelperImplementation extends rowHelperBase {
         this.metadata = info;
         if (_isNew) {
             for (const col of info.fieldsMetadata) {
-                if (col.options.defaultValue && instance[col.key] === undefined) {
+                const colKey = col.key;
+                if (col.options.defaultValue && instance[colKey] === undefined) {
                     if (typeof col.options.defaultValue === 'function') {
-                        instance[col.key] = col.options.defaultValue(instance);
+                        instance[colKey] = col.options.defaultValue(instance);
                     }
-                    else if (!instance[col.key])
-                        instance[col.key] = col.options.defaultValue;
+                    else if (!instance[colKey])
+                        instance[colKey] = col.options.defaultValue;
                 }
             }
         }
@@ -1232,12 +1245,17 @@ export class rowHelperImplementation extends rowHelperBase {
         if (!this._columns) {
             let _items = [];
             let r = {
-                find: (c) => r[typeof c === 'string' ? c : c.key],
+                //@ts-ignore
+                find: (c) => 
+                //@ts-ignore
+                r[typeof c === 'string' ? c : c.key],
                 [Symbol.iterator]: () => _items[Symbol.iterator](),
                 toArray: () => _items,
             };
             for (const c of this.info.fieldsMetadata) {
-                _items.push((r[c.key] = new FieldRefImplementation(c.options, c, this.instance, this, this)));
+                _items.push(
+                //@ts-ignore
+                (r[c.key] = new FieldRefImplementation(c.options, c, this.instance, this, this)));
             }
             this._columns = r;
         }
@@ -1287,7 +1305,13 @@ export class rowHelperImplementation extends rowHelperBase {
             try {
                 this._subscribers?.reportChanged();
                 if (this.isNew()) {
-                    updatedRow = await this.edp.insert(d);
+                    if (doNotSave) {
+                        updatedRow = (updatedRow = await this.edp.find({
+                            where: await this.getIdFilter(),
+                        }))[0];
+                    }
+                    else
+                        updatedRow = await this.edp.insert(d);
                 }
                 else {
                     let changesOnly = {};
@@ -1311,14 +1335,15 @@ export class rowHelperImplementation extends rowHelperBase {
                         updatedRow = await this.edp.update(this.id, changesOnly);
                     }
                 }
-                await this.loadDataFrom(updatedRow);
+                if (updatedRow)
+                    await this.loadDataFrom(updatedRow);
                 e.id = this.getId();
                 if (!this.repository._dataProvider.isProxy) {
                     if (this.info.entityInfo.saved)
                         await this.info.entityInfo.saved(this.instance, e);
                     if (this.repository.listeners)
-                        for (const listener of this.repository.listeners.filter((x) => x.saved)) {
-                            await listener.saved(this.instance, isNew);
+                        for (const listener of this.repository.listeners) {
+                            await listener.saved?.(this.instance, isNew);
                         }
                 }
                 await this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
@@ -1327,7 +1352,7 @@ export class rowHelperImplementation extends rowHelperBase {
                 return this.instance;
             }
             catch (err) {
-                await this.catchSaveErrors(err);
+                throw await this.catchSaveErrors(err);
             }
         }
         finally {
@@ -1390,14 +1415,14 @@ export class rowHelperImplementation extends rowHelperBase {
                     await this.info.entityInfo.deleted(this.instance, e);
             }
             if (this.repository.listeners)
-                for (const listener of this.repository.listeners.filter((x) => x.deleted)) {
-                    await listener.deleted(this.instance);
+                for (const listener of this.repository.listeners) {
+                    await listener.deleted?.(this.instance);
                 }
             await this.repository._remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: true }]);
             this._wasDeleted = true;
         }
         catch (err) {
-            await this.catchSaveErrors(err);
+            throw await this.catchSaveErrors(err);
         }
     }
     async loadDataFrom(data, loadItems) {
@@ -1430,7 +1455,8 @@ export class rowHelperImplementation extends rowHelperBase {
             //y2 should be changed to be based on data provider - consider naming
             for (const col of this.info.fieldsMetadata) {
                 if (col.options.serverExpression) {
-                    this.instance[col.key] = await col.options.serverExpression(this.instance);
+                    this.instance[col.key] =
+                        await col.options.serverExpression(this.instance);
                 }
             }
     }
@@ -1460,8 +1486,8 @@ export class rowHelperImplementation extends rowHelperBase {
             await this.info.entityInfo.validation(this.instance, e);
         }
         if (this.repository.listeners)
-            for (const listener of this.repository.listeners.filter((x) => x.validating)) {
-                await listener.validating(this.instance);
+            for (const listener of this.repository.listeners) {
+                await listener.validating?.(this.instance);
             }
     }
 }
@@ -1474,7 +1500,9 @@ export function getFields(container, remult) {
 }
 export function getControllerRef(container, remultArg) {
     const remultVar = remultArg || defaultRemult;
+    //@ts-ignore
     let result = container[controllerColumns];
+    //@ts-ignore
     if (!result)
         result = container[entityMember];
     if (!result) {
@@ -1489,7 +1517,9 @@ export function getControllerRef(container, remultArg) {
             }
             base = Object.getPrototypeOf(base);
         }
-        container[controllerColumns] = result = new controllerRefImpl(prepareColumnInfo(columnSettings, remultVar).map((x) => new columnDefsImpl(x, undefined, remultVar)), container, remultVar);
+        //@ts-ignore
+        container[controllerColumns] = result = new controllerRefImpl(prepareColumnInfo(columnSettings, remultVar).map((x) => new columnDefsImpl(x, undefined, //TODO - not sure
+        remultVar)), container, remultVar);
     }
     return result;
 }
@@ -1529,7 +1559,7 @@ export class FieldRefImplementation {
         this.helper = helper;
         this.rowBase = rowBase;
         this.target = this.settings.target;
-        this.entityRef = this.helper;
+        this.entityRef = this.helper; //todo - I'm not sure this is correct in the case of ControllerInstance
     }
     _subscribers;
     subscribe(listener) {
@@ -1554,10 +1584,9 @@ export class FieldRefImplementation {
     async load() {
         let lu = this.rowBase.lookups.get(this.metadata.key);
         let rel = getRelationFieldInfo(this.metadata);
-        if (rel) {
+        if (rel && this.helper) {
             if (rel.type === 'toMany') {
-                return (this.container[this.metadata.key] = await this.helper.repository
-                    .relations(this.container)[this.metadata.key].find());
+                return (this.container[this.metadata.key] = await this.helper.repository.relations(this.container)[this.metadata.key].find());
             }
             else {
                 let val = await this.helper.repository
@@ -1565,7 +1594,7 @@ export class FieldRefImplementation {
                 if (val)
                     this.container[this.metadata.key] = val;
                 else
-                    return null;
+                    return null; //TODO: check if this (!) is correct
             }
         }
         else if (lu) {
@@ -1679,7 +1708,7 @@ export class FieldRefImplementation {
                     set error(value) {
                         self.error = value;
                     },
-                    isNew: this.entityRef?.isNew(),
+                    isNew: this.entityRef?.isNew() ?? false,
                     load: () => self.load(),
                     metadata: self.metadata,
                     originalValue: self.originalValue,
@@ -1702,7 +1731,7 @@ export class FieldRefImplementation {
             if (typeof error === 'string')
                 this.error = error;
             else
-                this.error = error.message;
+                this.error = error?.message;
         }
     }
     async validate() {
@@ -1716,14 +1745,14 @@ let tempCaptionTransformer = {
 export const CaptionTransformer = remultStatic.captionTransformer ||
     (remultStatic.captionTransformer = tempCaptionTransformer);
 export function buildCaption(caption, key, remult, metaData) {
-    let result;
+    let result = undefined;
     if (typeof caption === 'function') {
         if (remult)
             result = caption(remult);
     }
     else if (caption)
         result = caption;
-    result = CaptionTransformer.transformCaption(remult, key, result, metaData);
+    result = CaptionTransformer.transformCaption(remult, key, result ?? '', metaData);
     if (result)
         return result;
     if (key)
@@ -1740,7 +1769,7 @@ export class columnDefsImpl {
         this.remult = remult;
         this.options = this.settings;
         this.target = this.settings.target;
-        this.valueConverter = new Proxy(this.settings.valueConverter, {
+        this.valueConverter = new Proxy(this.settings.valueConverter ?? {}, {
             get: (target, prop) => {
                 let result = target[prop];
                 if (typeof result === 'function') {
@@ -1803,7 +1832,7 @@ export class columnDefsImpl {
     }
     options;
     target;
-    readonly;
+    readonly = false;
     valueConverter;
     allowNull;
     caption;
@@ -1811,9 +1840,9 @@ export class columnDefsImpl {
     inputType;
     key;
     get dbReadOnly() {
-        return this.settings.dbReadOnly;
+        return Boolean(this.settings.dbReadOnly);
     }
-    isServerExpression;
+    isServerExpression = false;
     valueType;
 }
 class EntityFullInfo {
@@ -1875,8 +1904,9 @@ class EntityFullInfo {
                 this.idMetadata.field = r;
         }
         if (!this.idMetadata.field) {
-            if (this.fields['id'])
-                this.idMetadata.field = this.fields['id'];
+            const idField = this.fields['id'];
+            if (idField)
+                this.idMetadata.field = idField;
             else
                 this.idMetadata.field = [...this.fields][0];
         }
@@ -1939,6 +1969,10 @@ class EntityFullInfo {
                 return {
                     $or: items.map((x) => this.idMetadata.getIdFilter(getEntityRef(x).getId())),
                 };
+            else
+                return {
+                    [this.fields.toArray()[0].key]: [],
+                };
         },
         isIdField: (col) => {
             return col.key == this.idMetadata.field.key;
@@ -1969,7 +2003,7 @@ class EntityFullInfo {
     caption;
 }
 export function FieldType(...options) {
-    return (target, context) => {
+    return (target) => {
         if (!options) {
             options = [];
         }
@@ -1982,7 +2016,7 @@ export function isAutoIncrement(f) {
     return f.options?.valueConverter?.fieldTypeInDb === 'autoincrement';
 }
 export function ValueListFieldType(...options) {
-    return (type, context) => {
+    return (type) => {
         FieldType((o) => {
             ;
             (o.valueConverter = ValueListInfo.get(type)),
@@ -1994,7 +2028,7 @@ export function ValueListFieldType(...options) {
                 }
                 return Validators.in(values)(entity, ref);
             };
-        }, ...options)(type, context);
+        }, ...options)(type);
     };
 }
 export class ValueListInfo {
@@ -2095,7 +2129,7 @@ export function getValueList(type) {
         if (options)
             return ValueListInfo.get(type).getValues();
     }
-    let optionalValues = meta?.options[fieldOptionalValuesFunctionKey];
+    let optionalValues = (meta?.options)[fieldOptionalValuesFunctionKey];
     if (optionalValues)
         return optionalValues();
     return undefined;
@@ -2194,17 +2228,19 @@ export function decorateColumnSettings(settings, remult) {
     if (!settings.valueConverter.fromJson) {
         settings.valueConverter.fromJson = (x) => x;
     }
+    const fromJson = settings.valueConverter.fromJson;
+    const toJson = settings.valueConverter.toJson;
     if (!settings.valueConverter.toDb) {
-        settings.valueConverter.toDb = (x) => settings.valueConverter.toJson(x);
+        settings.valueConverter.toDb = (x) => toJson(x);
     }
     if (!settings.valueConverter.fromDb) {
-        settings.valueConverter.fromDb = (x) => settings.valueConverter.fromJson(x);
+        settings.valueConverter.fromDb = (x) => fromJson(x);
     }
     if (!settings.valueConverter.toInput) {
-        settings.valueConverter.toInput = (x) => settings.valueConverter.toJson(x);
+        settings.valueConverter.toInput = (x) => toJson(x);
     }
     if (!settings.valueConverter.fromInput) {
-        settings.valueConverter.fromInput = (x) => settings.valueConverter.fromJson(x);
+        settings.valueConverter.fromInput = (x) => fromJson(x);
     }
     return settings;
 }
@@ -2259,7 +2295,7 @@ class QueryResultImpl {
     }
     _count = undefined;
     async getPage(page) {
-        if (page < 1)
+        if ((page ?? 0) < 1)
             page = 1;
         return this.repo.find({
             where: this.options.where,
@@ -2294,7 +2330,9 @@ class QueryResultImpl {
             load: this.options.load,
             include: this.options.include,
         });
-        let nextPage = undefined;
+        let nextPage = () => {
+            throw new Error('no more pages');
+        };
         let hasNextPage = items.length == this.options.pageSize;
         if (hasNextPage) {
             let nextPageFilter = await this.repo._createAfterFilter(this.options.orderBy, items[items.length - 1]);
@@ -2334,7 +2372,7 @@ class QueryResultImpl {
                     return { value: undefined, done: true };
                 }
                 else {
-                    if (prev?.items.length > 0) {
+                    if (prev?.items.length ?? 0 > 0) {
                         if (this.repo.getEntityRef(prev.items[0]).getId() ==
                             this.repo.getEntityRef(currentPage.items[0]).getId())
                             throw new Error('pagination failure, returned same first row');
@@ -2343,6 +2381,7 @@ class QueryResultImpl {
             }
             if (itemIndex < currentPage.items.length)
                 return { value: currentPage.items[itemIndex++], done: false };
+            return { done: true, value: undefined };
         };
         return {
             next: async () => {

package/esm/src/remult3/entity.js

@@ -30,7 +30,7 @@ export function Entity(key, ...options) {
         for (const rawFilterMember in target) {
             if (Object.prototype.hasOwnProperty.call(target, rawFilterMember)) {
                 const element = target[rawFilterMember];
-                if (element?.rawFilterInfo?.rawFilterTranslator) {
+                if (element?.rawFilterInfo) {
                     if (!element.rawFilterInfo.key)
                         element.rawFilterInfo.key = rawFilterMember;
                 }

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

@@ -137,8 +137,8 @@ class PendingInStatements {
             });
             this.values.set(val, (valHandler = {
                 value: val,
-                resolve,
-                reject,
+                resolve: resolve,
+                reject: reject,
                 result,
             }));
         }