remult 0.23.0-exp.2 → 0.23.0-exp.21

package/esm/src/remult3/RepositoryImplementation.js

@@ -4,7 +4,6 @@ import { Remult, isBackend, queryConfig, } from '../context';
 import { Filter } from '../filter/filter-interfaces';
 import { Sort } from '../sort';
 import { assign } from '../../assign';
-import { filterHelper } from '../filter/filter-interfaces';
 import { ValueConverters } from '../valueConverters';
 import { findOptionsToJson } from '../data-providers/rest-data-provider';
 import { remult as defaultRemult } from '../remult-proxy';
@@ -12,6 +11,7 @@ import { entityMember, getEntityKey, getEntityRef, getEntitySettings, } from './
 import { __updateEntityBasedOnWhere } from './__updateEntityBasedOnWhere';
 import { getRelationInfo, relationInfoMember } from './relationInfoMember';
 import { RelationLoader } from './relation-loader';
+import { getInternalKey } from './repository-internals';
 //import  { remult } from "../remult-proxy";
 let classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -37,6 +37,9 @@ export class RepositoryImplementation {
     dataProvider;
     _info;
     defaultFindOptions;
+    [getInternalKey]() {
+        return this;
+    }
     async createAfterFilter(orderBy, lastRow) {
         let values = new Map();
         for (const s of Sort.translateOrderByToSort(this.metadata, orderBy)
@@ -56,7 +59,6 @@ export class RepositoryImplementation {
         let equalToColumn = [];
         for (const s of Sort.translateOrderByToSort(this.metadata, orderBy)
             .Segments) {
-            let ff = new filterHelper(s.field);
             let f = {};
             for (const c of equalToColumn) {
                 f[c.key] = values.get(c.key);
@@ -251,6 +253,8 @@ export class RepositoryImplementation {
             for (const key in entity) {
                 if (Object.prototype.hasOwnProperty.call(entity, key)) {
                     let f = ref.fields[key];
+                    if (entity[key] === undefined && getRelationInfo(f.metadata.options))
+                        continue;
                     if (f)
                         r[key] = entity[key];
                 }
@@ -324,7 +328,6 @@ export class RepositoryImplementation {
     async rawFind(options, skipOrderByAndLimit = false, loader) {
         if (!options)
             options = {};
-        Remult.onFind(this._info, options);
         if (this.defaultFindOptions) {
             options = { ...this.defaultFindOptions, ...options };
         }
@@ -333,6 +336,7 @@ export class RepositoryImplementation {
             delete opt.orderBy;
             delete opt.limit;
         }
+        Remult.onFind(this._info, options);
         const rawRows = await this.edp.find(opt);
         let result = await this.loadManyToOneForManyRows(rawRows, options, loader);
         return result;
@@ -350,9 +354,12 @@ export class RepositoryImplementation {
             options.orderBy = this._info.entityInfo.defaultOrderBy;
         }
         opt.where = await this.translateWhereToFilter(options.where);
-        opt.orderBy = Sort.translateOrderByToSort(this.metadata, options.orderBy);
-        opt.limit = options.limit;
-        opt.page = options.page;
+        if (options.orderBy !== undefined)
+            opt.orderBy = Sort.translateOrderByToSort(this.metadata, options.orderBy);
+        if (options.limit !== undefined)
+            opt.limit = options.limit;
+        if (options.page !== undefined)
+            opt.page = options.page;
         return opt;
     }
     async fromJsonArray(jsonItems, loadOptions) {
@@ -376,13 +383,9 @@ export class RepositoryImplementation {
             if (ei) {
                 let isRelation = col.options?.[relationInfoMember];
                 if (!isRelation) {
-                    let load = isRelation
-                        ? col.options?.defaultIncluded
-                        : !col.options.lazy;
+                    let load = !col.options.lazy;
                     if (loadFields !== undefined)
                         load = loadFields.includes(col);
-                    if (loadOptions.include)
-                        load = loadOptions.include[col.key];
                     if (load) {
                         let repo = this.remult.repo(col.valueType);
                         let toLoad = [];
@@ -391,7 +394,7 @@ export class RepositoryImplementation {
                             if (val !== undefined &&
                                 val !== null &&
                                 !toLoad.includes(val) &&
-                                !repo.idCache.has(val)) {
+                                !repo.idCache.has(val + '')) {
                                 toLoad.push(val);
                             }
                         }
@@ -417,7 +420,7 @@ export class RepositoryImplementation {
             let rel = getRelationInfo(col.options);
             let incl = col.options
                 .defaultIncluded;
-            if (loadOptions?.include) {
+            if (loadOptions?.include?.[col.key] !== undefined) {
                 incl = loadOptions.include[col.key];
             }
             if (rel && incl) {
@@ -439,7 +442,7 @@ export class RepositoryImplementation {
                             row[col.key] =
                                 rel.type !== 'toMany'
                                     ? result.length == 0
-                                        ? undefined
+                                        ? null
                                         : result[0]
                                     : result;
                         });
@@ -455,7 +458,7 @@ export class RepositoryImplementation {
         let where = [];
         let findOptions = {};
         let findOptionsSources = [];
-        const options = field.options;
+        let options = field.options;
         if (typeof options.findOptions === 'function') {
             findOptionsSources.push(options.findOptions(row));
         }
@@ -477,11 +480,54 @@ export class RepositoryImplementation {
                     findOptions[key] = source[key];
             }
         }
+        function buildError(what) {
+            return Error(`Error for relation: "${field.key}" to "${otherRepo.metadata.key}": ` +
+                what);
+        }
+        let hasFields = () => options.field || options.fields;
+        if (rel.type === 'toMany' && !hasFields()) {
+            for (const fieldInOtherRepo of otherRepo.fields.toArray()) {
+                if (!hasFields()) {
+                    const reverseRel = getRelationInfo(fieldInOtherRepo.options);
+                    const relOp = fieldInOtherRepo.options;
+                    if (reverseRel)
+                        if (reverseRel.toType() === this.entity)
+                            if (reverseRel.type === 'reference') {
+                                options = { ...findOptions, field: fieldInOtherRepo.key };
+                            }
+                            else if (reverseRel.type === 'toOne') {
+                                if (relOp.field) {
+                                    options = { ...options, field: relOp.field };
+                                }
+                                else if (relOp.fields) {
+                                    let fields = {};
+                                    for (const key in relOp.fields) {
+                                        if (Object.prototype.hasOwnProperty.call(relOp.fields, key)) {
+                                            const keyInMyTable = relOp.fields[key];
+                                            fields[keyInMyTable] = key;
+                                        }
+                                    }
+                                    options = { ...options, fields };
+                                }
+                            }
+                }
+            }
+            if (!hasFields())
+                throw buildError(`No matching field found on target. Please specify field/fields`);
+        }
+        function requireField(field, meta) {
+            const result = meta.fields.find(field);
+            if (!result)
+                throw buildError(`Field "${field}" was not found in "${meta.key}".`);
+            return result;
+        }
         if (options.field) {
             if (rel.type === 'toOne') {
+                requireField(options.field, this.metadata);
                 where.push(otherRepo.metadata.idMetadata.getIdFilter(row[options.field]));
             }
             else {
+                requireField(options.field, otherRepo.metadata);
                 where.push({
                     [options.field]: this.metadata.idMetadata.getId(row),
                 });
@@ -490,13 +536,15 @@ export class RepositoryImplementation {
         else if (options.fields) {
             for (const key in options.fields) {
                 if (Object.prototype.hasOwnProperty.call(options.fields, key)) {
+                    requireField(options.fields[key], this.metadata);
+                    requireField(key, otherRepo.metadata);
                     where.push({ [key]: row[options.fields[key]] });
                 }
             }
         }
         else if (rel.type === 'toOne' || rel.type === 'reference') {
             let val = rel.type === 'reference'
-                ? getEntityRef(row).fields.find(field.key).getId()
+                ? getEntityRef(row).fields.find(requireField(field.key, this.metadata)).getId()
                 : row[field.key];
             if (val === null)
                 returnNull = true;
@@ -741,6 +789,7 @@ class rowHelperBase {
     columnsInfo;
     instance;
     remult;
+    isNewRow;
     _error;
     get error() {
         this._subscribers?.reportObserved();
@@ -750,10 +799,11 @@ class rowHelperBase {
         this._error = val;
         this._subscribers?.reportChanged();
     }
-    constructor(columnsInfo, instance, remult) {
+    constructor(columnsInfo, instance, remult, isNewRow) {
         this.columnsInfo = columnsInfo;
         this.instance = instance;
         this.remult = remult;
+        this.isNewRow = isNewRow;
         {
             let fac = remult;
             if (fac != null && fac.remultFactory) {
@@ -796,7 +846,38 @@ class rowHelperBase {
                 });
                 lookup.set(val);
             }
-            else {
+            else if (getRelationInfo(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;
+                        if (op.field) {
+                            this.instance[op.field] = this.remult
+                                .repo(getRelationInfo(col).toType())
+                                .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[key];
+                                }
+                            }
+                        }
+                    },
+                    enumerable: true,
+                });
+                if (hasVal)
+                    instance[col.key] = val;
             }
         }
     }
@@ -922,7 +1003,9 @@ class rowHelperBase {
                 if (val !== undefined && val !== null)
                     val = col.valueConverter.fromJson(JSON.parse(JSON.stringify(val)));
             }
-            d[col.key] = val;
+            const rel = getRelationInfo(col);
+            if (!rel || rel.type === 'reference')
+                d[col.key] = val;
         }
         return d;
     }
@@ -956,7 +1039,7 @@ class rowHelperBase {
         for (const col of this.columnsInfo) {
             if (!this.remult ||
                 col.includeInApi === undefined ||
-                this.remult.isAllowed(col.includeInApi)) {
+                this.remult.isAllowedForInstance(this.instance, col.includeInApi)) {
                 let val;
                 let lu = this.lookups.get(col.key);
                 let disable = false;
@@ -985,13 +1068,14 @@ class rowHelperBase {
         }
         return result;
     }
-    async _updateEntityBasedOnApi(body) {
+    async _updateEntityBasedOnApi(body, ignoreApiAllowed = false) {
         let keys = Object.keys(body);
         for (const col of this.columnsInfo) {
             if (keys.includes(col.key))
                 if (col.includeInApi === undefined ||
-                    this.remult.isAllowed(col.includeInApi)) {
+                    this.remult.isAllowedForInstance(this.instance, col.includeInApi)) {
                     if (!this.remult ||
+                        ignoreApiAllowed ||
                         col.allowApiUpdate === undefined ||
                         this.remult.isAllowedForInstance(this.instance, col.allowApiUpdate)) {
                         let lu = this.lookups.get(col.key);
@@ -1011,7 +1095,7 @@ export class rowHelperImplementation extends rowHelperBase {
     edp;
     _isNew;
     constructor(info, instance, repository, edp, remult, _isNew) {
-        super(info.columnsInfo, instance, remult);
+        super(info.columnsInfo, instance, remult, _isNew);
         this.info = info;
         this.repository = repository;
         this.edp = edp;
@@ -1033,6 +1117,9 @@ export class rowHelperImplementation extends rowHelperBase {
         if (Remult.entityRefInit)
             Remult.entityRefInit(this, instance);
     }
+    get relations() {
+        return this.repository.relations(this.instance);
+    }
     get apiUpdateAllowed() {
         return this.remult.isAllowedForInstance(this.instance, this.metadata.options.allowApiUpdate);
     }
@@ -1104,12 +1191,15 @@ export class rowHelperImplementation extends rowHelperBase {
                 // no need
                 await this.__validateEntity();
             let doNotSave = false;
-            for (const col of this.fields) {
-                if (col.metadata.options.saving)
-                    await col.metadata.options.saving(this.instance, col);
-            }
-            if (this.info.entityInfo.saving) {
-                await this.info.entityInfo.saving(this.instance, () => (doNotSave = true));
+            let e = this.buildLifeCycleEvent(() => (doNotSave = true));
+            if (!this.remult.dataProvider.isProxy) {
+                for (const col of this.fields) {
+                    if (col.metadata.options.saving)
+                        await col.metadata.options.saving(this.instance, e, col);
+                }
+                if (this.info.entityInfo.saving) {
+                    await this.info.entityInfo.saving(this.instance, e);
+                }
             }
             this.__assertValidity();
             let d = this.copyDataToObject();
@@ -1125,8 +1215,7 @@ export class rowHelperImplementation extends rowHelperBase {
                     f.value = f.originalValue;
                 }
             }
-            if (this.info.idMetadata.field instanceof CompoundIdField)
-                delete d.id;
+            //if (this.info.idMetadata.field instanceof CompoundIdField) delete d.id
             let updatedRow;
             let isNew = this.isNew();
             try {
@@ -1157,12 +1246,14 @@ export class rowHelperImplementation extends rowHelperBase {
                     }
                 }
                 await this.loadDataFrom(updatedRow);
-                if (this.info.entityInfo.saved)
-                    await this.info.entityInfo.saved(this.instance);
-                if (this.repository.listeners)
-                    for (const listener of this.repository.listeners.filter((x) => x.saved)) {
-                        await listener.saved(this.instance, isNew);
-                    }
+                if (!this.remult.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);
+                        }
+                }
                 await this.repository.remult.liveQueryPublisher.itemChanged(this.repository.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
                 this.saveOriginalData();
                 this._isNew = false;
@@ -1178,18 +1269,36 @@ export class rowHelperImplementation extends rowHelperBase {
             this._saving = false;
         }
     }
+    buildLifeCycleEvent(preventDefault = () => { }) {
+        const self = this;
+        return {
+            isNew: self.isNew(),
+            fields: self.fields,
+            id: self.getId(),
+            originalId: self.getOriginalId(),
+            metadata: self.repository.metadata,
+            repository: self.repository,
+            preventDefault: () => preventDefault(),
+            relations: self.repository.relations(self.instance),
+        };
+    }
     getIdFilter() {
         return Filter.fromEntityFilter(this.metadata, this.repository.metadata.idMetadata.getIdFilter(this.id));
     }
     async delete() {
         this.__clearErrorsAndReportChanged();
-        if (this.info.entityInfo.deleting)
-            await this.info.entityInfo.deleting(this.instance);
+        let e = this.buildLifeCycleEvent();
+        if (!this.remult.dataProvider.isProxy) {
+            if (this.info.entityInfo.deleting)
+                await this.info.entityInfo.deleting(this.instance, e);
+        }
         this.__assertValidity();
         try {
             await this.edp.delete(this.id);
-            if (this.info.entityInfo.deleted)
-                await this.info.entityInfo.deleted(this.instance);
+            if (!this.remult.dataProvider.isProxy) {
+                if (this.info.entityInfo.deleted)
+                    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);
@@ -1228,7 +1337,7 @@ export class rowHelperImplementation extends rowHelperBase {
     }
     async calcServerExpression() {
         if (isBackend())
-            //[ ] should be changed to be based on data provider
+            //y2 should be changed to be based on data provider - consider naming
             for (const col of this.info.columnsInfo) {
                 if (col.serverExpression) {
                     this.instance[col.key] = await col.serverExpression(this.instance);
@@ -1254,8 +1363,10 @@ export class rowHelperImplementation extends rowHelperBase {
                 await col.__performValidation();
             }
         }
-        if (this.info.entityInfo.validation)
-            await this.info.entityInfo.validation(this.instance, this);
+        if (this.info.entityInfo.validation) {
+            let e = this.buildLifeCycleEvent(() => { });
+            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);
@@ -1292,7 +1403,7 @@ export function getControllerRef(container, remultArg) {
 }
 export class controllerRefImpl extends rowHelperBase {
     constructor(columnsInfo, instance, remult) {
-        super(columnsInfo, instance, remult);
+        super(columnsInfo, instance, remult, false);
         let _items = [];
         let r = {
             find: (c) => r[typeof c === 'string' ? c : c.key],
@@ -1526,10 +1637,10 @@ export class columnDefsImpl {
             .getEntityMetadataWithoutBreakingTheEntity(item)
             .fields.find(this.key).displayValue;
     }
-    get includedInApi() {
+    includedInApi(item) {
         if (this.options.includeInApi === undefined)
             return true;
-        return this.remult.isAllowed(this.options.includeInApi); //TODO 2- consolidate other code paths to go through here
+        return this.remult.isAllowedForInstance(item, this.options.includeInApi);
     }
     toInput(value, inputType) {
         return this.valueConverter.toInput(value, inputType);
@@ -1629,7 +1740,9 @@ class EntityFullInfo {
         this.fields = r;
         this.caption = buildCaption(entityInfo.caption, this.key, remult);
         if (entityInfo.id) {
-            let r = entityInfo.id(this.fields);
+            let r = typeof entityInfo.id === 'function'
+                ? entityInfo.id(this.fields)
+                : Object.keys(entityInfo.id).map((x) => this.fields.find(x));
             if (Array.isArray(r)) {
                 if (r.length > 1)
                     this.idMetadata.field = new CompoundIdField(...r);
@@ -1703,6 +1816,8 @@ class EntityFullInfo {
     }
     idMetadata = {
         getId: (item) => {
+            if (item === undefined || item === null)
+                return item;
             const ref = getEntityRef(item, false);
             if (ref)
                 return ref.getId();
@@ -2031,6 +2146,7 @@ class QueryResultImpl {
             limit: this.options.pageSize,
             page: page,
             load: this.options.load,
+            include: this.options.include,
         });
     }
     async count() {
@@ -2055,6 +2171,7 @@ class QueryResultImpl {
             orderBy: this.options.orderBy,
             limit: this.options.pageSize,
             load: this.options.load,
+            include: this.options.include,
         });
         let nextPage = undefined;
         let hasNextPage = items.length == this.options.pageSize;

package/esm/src/remult3/entity.d.ts

@@ -1,6 +1,6 @@
 import type { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ClassDecoratorContextStub } from './RepositoryImplementation';
+import type { ClassDecoratorContextStub } from './remult3';
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example

package/esm/src/remult3/entity.js

@@ -1,6 +1,5 @@
 import { allEntities, setControllerSettings } from '../context';
 import { entityInfo, entityInfo_key, getEntitySettings } from './getEntityRef';
-//[ ] YONI - in Typescript 5 I do get the name of the class, what would we like to change because of that?
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example

package/esm/src/remult3/getEntityRef.d.ts

@@ -5,5 +5,5 @@ export declare function getEntityRef<entityType>(entity: entityType, throwExcept
 export declare const entityMember: unique symbol;
 export declare const entityInfo: unique symbol;
 export declare const entityInfo_key: unique symbol;
-export declare function getEntitySettings<T>(entity: ClassType<T>, throwError?: boolean): EntityOptionsFactory;
+export declare function getEntitySettings<T>(entity: ClassType<T>, throwError?: boolean): EntityOptionsFactory | undefined;
 export declare function getEntityKey(entity: ClassType<any>): string;

package/esm/src/remult3/getEntityRef.js

@@ -2,7 +2,7 @@ export function getEntityRef(entity, throwException = true) {
     let x = entity[entityMember];
     if (!x && throwException)
         throw new Error('item ' +
-            entity.constructor.name +
+            (entity.constructor?.name || entity) +
             ' was not initialized using a context');
     return x;
 }

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

@@ -51,7 +51,10 @@ class QueryVariation {
         let w = this.whereVariations.get(whereKey);
         if (!w) {
             const keys = Object.keys(where);
-            if (keys.length === 1 && typeof where[keys[0]] !== 'object') {
+            if (keys.length === 1 &&
+                typeof where[keys[0]] !== 'object' &&
+                !findOptions.limit // because merging calls in that case may bring non more rows than the limit
+            ) {
                 let inVariation = this.pendingInStatements.get(keys[0]);
                 if (!inVariation) {
                     this.pendingInStatements.set(keys[0], (inVariation = new PendingInStatements(this.rel, keys[0], findOptions)));