remult 3.4.0 → 3.4.2

package/esm/remult-knex/index.js

@@ -102,7 +102,7 @@ class KnexEntityDataProvider {
         this.dp = dp;
     }
     async groupBy(options) {
-        return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => this.knex.client.config.client?.includes('mssql')
+        return groupByImpl(options, await dbNamesOfWithForceSqlExpression(this.entity, this.dp.wrapIdentifier, true), this.dp.createCommand(), false, (limit, offset) => this.knex.client.config.client?.includes('mssql')
             ? ' offset ' + offset + ' rows fetch next ' + limit + ' rows only'
             : ' limit ' + limit + ' offset ' + offset, this.dp.jsonColumnStorage);
     }
@@ -183,7 +183,7 @@ class KnexEntityDataProvider {
         });
     }
     async init() {
-        const r = (await dbNamesOfWithForceSqlExpression(this.entity, (x) => x));
+        const r = (await dbNamesOfWithForceSqlExpression(this.entity, (x) => x, true));
         return {
             $dbNameOf: (f) => {
                 let fm = f;

package/esm/remult-mongo.js

@@ -1,6 +1,6 @@
 import { ObjectId, } from 'mongodb';
 import { Filter } from './index.js';
-import { dbNamesOf, dbNamesOfWithForceSqlExpression, } from './src/filter/filter-consumer-bridge-to-sql-request.js';
+import { dbNamesOfWithForceSqlExpression, } from './src/filter/filter-consumer-bridge-to-sql-request.js';
 import { remult as remultContext } from './src/remult-proxy.js';
 import { getRepository } from './src/remult3/RepositoryImplementation.js';
 import { getRepositoryInternals } from './src/remult3/repository-internals.js';
@@ -295,7 +295,7 @@ class MongoEntityDataProvider {
         return result;
     }
     async collection() {
-        const e = await dbNamesOf(this.entity);
+        const e = await dbNamesOfWithForceSqlExpression(this.entity, undefined, true);
         const collection = this.db.collection(e.$entityName);
         return { e, collection };
     }

package/esm/src/data-providers/sql-database.js

@@ -324,7 +324,7 @@ class ActualSQLEntityDataProvider {
         this.strategy = strategy;
     }
     async init() {
-        let dbNameProvider = await dbNamesOfWithForceSqlExpression(this.entity, (x) => this.sql.wrapIdentifier(x));
+        let dbNameProvider = await dbNamesOfWithForceSqlExpression(this.entity, (x) => this.sql.wrapIdentifier(x), true);
         await this.iAmUsed(dbNameProvider);
         return dbNameProvider;
     }

package/esm/src/filter/entityDbName.js

@@ -1,17 +1,13 @@
-export async function entityDbName(metadata, wrapIdentifier = (x) => x) {
+import { isSqlExpressionInProgress, runSqlExpression, } from './sqlExpressionInProgress.js';
+export async function entityDbName(metadata, wrapIdentifier = (x) => x, forceSqlExpression = false) {
     if (metadata.options.sqlExpression) {
         if (typeof metadata.options.sqlExpression === 'string')
             return metadata.options.sqlExpression;
         else if (typeof metadata.options.sqlExpression === 'function') {
-            const prev = metadata.options.sqlExpression;
-            try {
-                metadata.options.sqlExpression =
-                    "recursive sqlExpression call for entity '" + metadata.key + "'. ";
-                return await prev(metadata);
-            }
-            finally {
-                metadata.options.sqlExpression = prev;
-            }
+            if (isSqlExpressionInProgress(metadata) && !forceSqlExpression)
+                return "recursive sqlExpression call for entity '" + metadata.key + "'. ";
+            const { sqlExpression } = metadata.options;
+            return await runSqlExpression(metadata, () => sqlExpression(metadata));
         }
     }
     return wrapIdentifier(metadata.dbName);

package/esm/src/filter/fieldDbName.js

@@ -1,26 +1,20 @@
 import { getRelationFieldInfo } from '../remult3/relationInfoMember.js';
-const sqlExpressionInProgressKey = Symbol.for(`sqlExpressionInProgressKey`);
+import { isSqlExpressionInProgress, runSqlExpression, } from './sqlExpressionInProgress.js';
 export const originalSqlExpressionKey = Symbol.for(`originalSqlExpressionKey`);
 export async function fieldDbName(f, meta, wrapIdentifier = (x) => x, forceSqlExpression = false) {
     try {
         if (f.options.sqlExpression) {
             let result;
             if (typeof f.options.sqlExpression === 'function') {
-                if (f[sqlExpressionInProgressKey] && !forceSqlExpression) {
+                if (isSqlExpressionInProgress(f) && !forceSqlExpression) {
                     return "recursive sqlExpression call for field '" + f.key + "'. \0";
                 }
-                try {
-                    ;
-                    f[sqlExpressionInProgressKey] = true;
-                    if (!f[originalSqlExpressionKey])
-                        f[originalSqlExpressionKey] = f.options.sqlExpression;
-                    result = await f.options.sqlExpression(meta, undefined, undefined);
-                    if (!result.includes('\0'))
-                        f.options.sqlExpression = () => result;
-                }
-                finally {
-                    delete f[sqlExpressionInProgressKey];
-                }
+                const { sqlExpression } = f.options;
+                if (!f[originalSqlExpressionKey])
+                    f[originalSqlExpressionKey] = sqlExpression;
+                result = await runSqlExpression(f, () => sqlExpression(meta, undefined, undefined));
+                if (!result.includes('\0'))
+                    f.options.sqlExpression = () => result;
             }
             else
                 result = f.options.sqlExpression;

package/esm/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -223,10 +223,10 @@ export function shouldCreateEntity(entity, e) {
 export async function dbNamesOf(repo, wrapIdentifierOrOptions) {
     return internalDbNamesOf(repo, wrapIdentifierOrOptions);
 }
-export async function dbNamesOfWithForceSqlExpression(repo, wrapIdentifierOrOptions) {
-    return internalDbNamesOf(repo, wrapIdentifierOrOptions, true);
+export async function dbNamesOfWithForceSqlExpression(repo, wrapIdentifierOrOptions, forceEntitySqlExpression = false) {
+    return internalDbNamesOf(repo, wrapIdentifierOrOptions, true, forceEntitySqlExpression);
 }
-async function internalDbNamesOf(repo, wrapIdentifierOrOptions, forceSqlExpression = false) {
+async function internalDbNamesOf(repo, wrapIdentifierOrOptions, forceSqlExpression = false, forceEntitySqlExpression = false) {
     let options = typeof wrapIdentifierOrOptions === 'function'
         ? { wrapIdentifier: wrapIdentifierOrOptions }
         : wrapIdentifierOrOptions || {};
@@ -237,7 +237,7 @@ async function internalDbNamesOf(repo, wrapIdentifierOrOptions, forceSqlExpressi
     if (!options.wrapIdentifier)
         options.wrapIdentifier = (x) => x;
     const result = {
-        $entityName: await entityDbName(meta, options.wrapIdentifier),
+        $entityName: await entityDbName(meta, options.wrapIdentifier, forceEntitySqlExpression),
         toString: () => result.$entityName,
         $dbNameOf: (field) => {
             var key;

package/esm/src/filter/sqlExpressionInProgress.js

@@ -0,0 +1,14 @@
+const sqlExpressionInProgressKey = Symbol.for(`sqlExpressionInProgressKey`);
+export function isSqlExpressionInProgress(owner) {
+    return owner[sqlExpressionInProgressKey];
+}
+export async function runSqlExpression(owner, sqlExpression) {
+    try {
+        ;
+        owner[sqlExpressionInProgressKey] = true;
+        return await sqlExpression();
+    }
+    finally {
+        delete owner[sqlExpressionInProgressKey];
+    }
+}

package/esm/src/remult-proxy.js

@@ -124,10 +124,10 @@ export class RemultProxy {
                 .remultFactory()
                 .repo(...args)
                 .updateMany(...args2),
-            find: (options) => self
+            find: (...args2) => self
                 .remultFactory()
                 .repo(...args)
-                .find(options),
+                .find(...args2),
             groupBy: (...args2) => self
                 .remultFactory()
                 .repo(...args)
@@ -138,14 +138,14 @@ export class RemultProxy {
                 .repo(...args)
                 //@ts-ignore
                 .aggregate(...args2),
-            findFirst: (where, options) => self
+            findFirst: (...args2) => self
                 .remultFactory()
                 .repo(...args)
-                .findFirst(where, options),
-            findOne: (options) => self
+                .findFirst(...args2),
+            findOne: (...args2) => self
                 .remultFactory()
                 .repo(...args)
-                .findOne(options),
+                .findOne(...args2),
             findId: (a, b) => self
                 .remultFactory()
                 .repo(...args)

package/esm/src/remult3/QueryResultImpl.js

@@ -26,6 +26,7 @@ export class QueryResultImpl {
             page: page,
             load: this.options.load,
             include: this.options.include,
+            args: this.options.args,
         });
     }
     async count() {
@@ -51,6 +52,7 @@ export class QueryResultImpl {
             limit: this.options.pageSize,
             load: this.options.load,
             include: this.options.include,
+            args: this.options.args,
         };
         let getItems = () => this.repo.find(options);
         if (this._aggregates === undefined &&

package/esm/src/remult3/RepositoryImplementation.js

@@ -41,18 +41,6 @@ let classValidatorValidate = undefined;
 //     })
 //     .catch(() => {
 //     });
-// Assigning a `toOne` also writes its `field`/`fields`, which would wipe the FK of a row whose
-// target is missing.
-function setMissingRelationToNull(row, key) {
-    const ref = getEntityRef(row);
-    ref._skipRelationFieldSync = true;
-    try {
-        row[key] = null;
-    }
-    finally {
-        ref._skipRelationFieldSync = false;
-    }
-}
 export class RepositoryImplementation {
     _entity;
     _remult;
@@ -744,12 +732,10 @@ export class RepositoryImplementation {
                     for (const row of result) {
                         let { findOptions, returnNull, returnUndefined } = this._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo);
                         const colKey = col.key;
-                        if (returnNull || returnUndefined) {
-                            if (rel.type === 'toMany')
-                                row[colKey] = (returnNull ? null : undefined);
-                            else
-                                setMissingRelationToNull(row, colKey);
-                        }
+                        if (returnNull)
+                            row[colKey] = null;
+                        else if (returnUndefined)
+                            row[colKey] = undefined;
                         else {
                             const entityType = rel.toEntity;
                             const toRepo = otherRepo;
@@ -760,12 +746,14 @@ export class RepositoryImplementation {
                                 metadata: toRepo.metadata,
                             }, findOptions)
                                 .then((result) => {
-                                if (rel.type === 'toMany')
-                                    row[colKey] = result;
-                                else if (result.length == 0)
-                                    setMissingRelationToNull(row, colKey);
-                                else
-                                    row[colKey] = result[0];
+                                if (result.length == 0 && rel.type == 'toOne')
+                                    return;
+                                row[colKey] =
+                                    rel.type !== 'toMany'
+                                        ? result.length == 0
+                                            ? null
+                                            : result[0]
+                                        : result;
                             });
                         }
                     }
@@ -1201,7 +1189,7 @@ class rowHelperBase {
                         },
                         set: (newVal) => {
                             val = newVal;
-                            if (newVal === undefined || this._skipRelationFieldSync)
+                            if (newVal === undefined)
                                 return;
                             const op = col.options;
                             if (op.field) {
@@ -1226,7 +1214,6 @@ class rowHelperBase {
             }
         }
     }
-    _skipRelationFieldSync = false;
     _subscribers;
     subscribe(listener) {
         this.initSubscribers();
@@ -1685,9 +1672,7 @@ export class rowHelperImplementation extends rowHelperBase {
                         await listener.saved?.(this.instance, true);
                     }
             }
-            this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [
-                { id: this.getId(), oldId: this.getOriginalId(), deleted: false },
-            ]);
+            this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
             this.saveOriginalData();
             this._isNew = false;
             return this.instance;
@@ -1814,7 +1799,8 @@ export class rowHelperImplementation extends rowHelperBase {
         if (!this.repo._dataProvider.isProxy)
             //y2 should be changed to be based on data provider - consider naming
             for (const col of this.info.fieldsMetadata) {
-                if (col.options.serverExpression) {
+                if (col.options.serverExpression &&
+                    !this._fieldsExcludedBySelect?.has(col.key)) {
                     const result = (await col.options.serverExpression(this.instance));
                     if (result !== undefined)
                         this.instance[col.key] = result;

package/index.d.ts

@@ -2,7 +2,7 @@ import type { ClassType } from './classType.js';
 import type { DataProvider } from './src/data-interfaces.js';
 export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-provider.js';
 export type { ClassType } from './classType.js';
-export type { ValidateFieldEvent, MembersOnly, NumericKeys, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, UpsertOptions, Repository, GroupByOptions, GroupByResult, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, Loaded, RepositoryRelations, EntityIdFields, EntitySelectFields, InsertOrUpdateOptions, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
+export type { ValidateFieldEvent, MembersOnly, NumericKeys, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, UpsertOptions, Repository, GroupByOptions, GroupByResult, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, EntitySelectFields, InsertOrUpdateOptions, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
 LifecycleEvent, FieldsRefBase, FieldsRefForEntityBase, RepositoryRelationsForEntityBase, ControllerRefForControllerBase, ControllerRefBase, ControllerRef, EntityRefForEntityBase, IdMetadata, FindFirstOptionsBase, } from './src/remult3/remult3.js';
 export { standardSchema } from './src/standard-schema/index.js';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListInfo, } from './src/remult3/RepositoryImplementation.js';

package/package.json

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

package/remult-knex/index.js

@@ -185,7 +185,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0:
                         _a = sql_database_js_1.groupByImpl;
                         _b = [options];
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(this.entity, this.dp.wrapIdentifier)];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, this.dp.wrapIdentifier, true)];
                     case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([_c.sent(), this.dp.createCommand(),
                             false,
                             function (limit, offset) {
@@ -320,7 +320,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, function (x) { return x; })];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, function (x) { return x; }, true)];
                     case 1:
                         r = (_a.sent());
                         return [2 /*return*/, {

package/remult-mongo.js

@@ -619,7 +619,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
             var e, collection;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(this.entity)];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, undefined, true)];
                     case 1:
                         e = _a.sent();
                         collection = this.db.collection(e.$entityName);

package/src/data-providers/sql-database.js

@@ -475,9 +475,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, function (x) {
-                            return _this.sql.wrapIdentifier(x);
-                        })];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOfWithForceSqlExpression)(this.entity, function (x) { return _this.sql.wrapIdentifier(x); }, true)];
                     case 1:
                         dbNameProvider = _a.sent();
                         return [4 /*yield*/, this.iAmUsed(dbNameProvider)];

package/src/filter/entityDbName.d.ts

@@ -1,2 +1,2 @@
 import type { EntityMetadata } from '../remult3/remult3.js';
-export declare function entityDbName(metadata: EntityMetadata, wrapIdentifier?: (name: string) => string): Promise<string>;
+export declare function entityDbName(metadata: EntityMetadata, wrapIdentifier?: (name: string) => string, forceSqlExpression?: boolean): Promise<string>;

package/src/filter/entityDbName.js

@@ -2,30 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.entityDbName = entityDbName;
 var tslib_1 = require("tslib");
+var sqlExpressionInProgress_js_1 = require("./sqlExpressionInProgress.js");
 function entityDbName(metadata_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function (metadata, wrapIdentifier) {
-        var prev;
+    return tslib_1.__awaiter(this, arguments, void 0, function (metadata, wrapIdentifier, forceSqlExpression) {
+        var sqlExpression_1;
         if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
+        if (forceSqlExpression === void 0) { forceSqlExpression = false; }
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!metadata.options.sqlExpression) return [3 /*break*/, 5];
+                    if (!metadata.options.sqlExpression) return [3 /*break*/, 3];
                     if (!(typeof metadata.options.sqlExpression === 'string')) return [3 /*break*/, 1];
                     return [2 /*return*/, metadata.options.sqlExpression];
                 case 1:
-                    if (!(typeof metadata.options.sqlExpression === 'function')) return [3 /*break*/, 5];
-                    prev = metadata.options.sqlExpression;
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, , 4, 5]);
-                    metadata.options.sqlExpression =
-                        "recursive sqlExpression call for entity '" + metadata.key + "'. ";
-                    return [4 /*yield*/, prev(metadata)];
-                case 3: return [2 /*return*/, _a.sent()];
-                case 4:
-                    metadata.options.sqlExpression = prev;
-                    return [7 /*endfinally*/];
-                case 5: return [2 /*return*/, wrapIdentifier(metadata.dbName)];
+                    if (!(typeof metadata.options.sqlExpression === 'function')) return [3 /*break*/, 3];
+                    if ((0, sqlExpressionInProgress_js_1.isSqlExpressionInProgress)(metadata) && !forceSqlExpression)
+                        return [2 /*return*/, "recursive sqlExpression call for entity '" + metadata.key + "'. "];
+                    sqlExpression_1 = metadata.options.sqlExpression;
+                    return [4 /*yield*/, (0, sqlExpressionInProgress_js_1.runSqlExpression)(metadata, function () {
+                            return sqlExpression_1(metadata);
+                        })];
+                case 2: return [2 /*return*/, _a.sent()];
+                case 3: return [2 /*return*/, wrapIdentifier(metadata.dbName)];
             }
         });
     });

package/src/filter/fieldDbName.js

@@ -4,47 +4,41 @@ exports.originalSqlExpressionKey = void 0;
 exports.fieldDbName = fieldDbName;
 var tslib_1 = require("tslib");
 var relationInfoMember_js_1 = require("../remult3/relationInfoMember.js");
-var sqlExpressionInProgressKey = Symbol.for("sqlExpressionInProgressKey");
+var sqlExpressionInProgress_js_1 = require("./sqlExpressionInProgress.js");
 exports.originalSqlExpressionKey = Symbol.for("originalSqlExpressionKey");
 function fieldDbName(f_1, meta_1) {
     return tslib_1.__awaiter(this, arguments, void 0, function (f, meta, wrapIdentifier, forceSqlExpression) {
-        var result_1, rel, field, fInfo;
+        var result_1, sqlExpression_1, rel, field, fInfo;
         if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
         if (forceSqlExpression === void 0) { forceSqlExpression = false; }
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, , 8, 9]);
-                    if (!f.options.sqlExpression) return [3 /*break*/, 7];
-                    if (!(typeof f.options.sqlExpression === 'function')) return [3 /*break*/, 5];
-                    if (f[sqlExpressionInProgressKey] && !forceSqlExpression) {
+                    _a.trys.push([0, , 5, 6]);
+                    if (!f.options.sqlExpression) return [3 /*break*/, 4];
+                    if (!(typeof f.options.sqlExpression === 'function')) return [3 /*break*/, 2];
+                    if ((0, sqlExpressionInProgress_js_1.isSqlExpressionInProgress)(f) && !forceSqlExpression) {
                         return [2 /*return*/, "recursive sqlExpression call for field '" + f.key + "'. \0"];
                     }
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, , 3, 4]);
-                    ;
-                    f[sqlExpressionInProgressKey] = true;
+                    sqlExpression_1 = f.options.sqlExpression;
                     if (!f[exports.originalSqlExpressionKey])
-                        f[exports.originalSqlExpressionKey] = f.options.sqlExpression;
-                    return [4 /*yield*/, f.options.sqlExpression(meta, undefined, undefined)];
-                case 2:
+                        f[exports.originalSqlExpressionKey] = sqlExpression_1;
+                    return [4 /*yield*/, (0, sqlExpressionInProgress_js_1.runSqlExpression)(f, function () {
+                            return sqlExpression_1(meta, undefined, undefined);
+                        })];
+                case 1:
                     result_1 = _a.sent();
                     if (!result_1.includes('\0'))
                         f.options.sqlExpression = function () { return result_1; };
-                    return [3 /*break*/, 4];
-                case 3:
-                    delete f[sqlExpressionInProgressKey];
-                    return [7 /*endfinally*/];
-                case 4: return [3 /*break*/, 6];
-                case 5:
+                    return [3 /*break*/, 3];
+                case 2:
                     result_1 = f.options.sqlExpression;
-                    _a.label = 6;
-                case 6:
+                    _a.label = 3;
+                case 3:
                     if (!result_1)
                         return [2 /*return*/, f.dbName];
                     return [2 /*return*/, result_1];
-                case 7:
+                case 4:
                     rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(f);
                     field = (rel === null || rel === void 0 ? void 0 : rel.type) === 'toOne' &&
                         f.options.field;
@@ -54,8 +48,8 @@ function fieldDbName(f_1, meta_1) {
                             return [2 /*return*/, fieldDbName(fInfo, meta, wrapIdentifier, forceSqlExpression)];
                     }
                     return [2 /*return*/, wrapIdentifier(f.dbName)];
-                case 8: return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
+                case 5: return [7 /*endfinally*/];
+                case 6: return [2 /*return*/];
             }
         });
     });

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -88,5 +88,5 @@ export interface dbNamesOfOptions {
     tableName?: boolean | string;
 }
 export declare function dbNamesOf<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions): Promise<EntityDbNames<entityType>>;
-export declare function dbNamesOfWithForceSqlExpression<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions): Promise<EntityDbNames<entityType>>;
+export declare function dbNamesOfWithForceSqlExpression<entityType>(repo: EntityMetadataOverloads<entityType>, wrapIdentifierOrOptions?: ((name: string) => string) | dbNamesOfOptions, forceEntitySqlExpression?: boolean): Promise<EntityDbNames<entityType>>;
 export declare function toDbSql(r: SqlCommandWithParameters, field: FieldMetadata, val: any): string;

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -347,18 +347,20 @@ function dbNamesOf(repo, wrapIdentifierOrOptions) {
         });
     });
 }
-function dbNamesOfWithForceSqlExpression(repo, wrapIdentifierOrOptions) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
+function dbNamesOfWithForceSqlExpression(repo_1, wrapIdentifierOrOptions_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (repo, wrapIdentifierOrOptions, forceEntitySqlExpression) {
+        if (forceEntitySqlExpression === void 0) { forceEntitySqlExpression = false; }
         return tslib_1.__generator(this, function (_a) {
-            return [2 /*return*/, internalDbNamesOf(repo, wrapIdentifierOrOptions, true)];
+            return [2 /*return*/, internalDbNamesOf(repo, wrapIdentifierOrOptions, true, forceEntitySqlExpression)];
         });
     });
 }
 function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function (repo, wrapIdentifierOrOptions, forceSqlExpression) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (repo, wrapIdentifierOrOptions, forceSqlExpression, forceEntitySqlExpression) {
         var options, meta, result, _a, _b, field, r, e_3_1;
         var _c, e_3, _d;
         if (forceSqlExpression === void 0) { forceSqlExpression = false; }
+        if (forceEntitySqlExpression === void 0) { forceEntitySqlExpression = false; }
         return tslib_1.__generator(this, function (_e) {
             switch (_e.label) {
                 case 0:
@@ -372,7 +374,7 @@ function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
                     if (!options.wrapIdentifier)
                         options.wrapIdentifier = function (x) { return x; };
                     _c = {};
-                    return [4 /*yield*/, (0, entityDbName_js_1.entityDbName)(meta, options.wrapIdentifier)];
+                    return [4 /*yield*/, (0, entityDbName_js_1.entityDbName)(meta, options.wrapIdentifier, forceEntitySqlExpression)];
                 case 1:
                     result = (_c.$entityName = _e.sent(),
                         _c.toString = function () { return result.$entityName; },

package/src/filter/sqlExpressionInProgress.d.ts

@@ -0,0 +1,2 @@
+export declare function isSqlExpressionInProgress(owner: object): boolean;
+export declare function runSqlExpression<T>(owner: object, sqlExpression: () => T | Promise<T>): Promise<T>;

package/src/filter/sqlExpressionInProgress.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSqlExpressionInProgress = isSqlExpressionInProgress;
+exports.runSqlExpression = runSqlExpression;
+var tslib_1 = require("tslib");
+var sqlExpressionInProgressKey = Symbol.for("sqlExpressionInProgressKey");
+function isSqlExpressionInProgress(owner) {
+    return owner[sqlExpressionInProgressKey];
+}
+function runSqlExpression(owner, sqlExpression) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, , 2, 3]);
+                    ;
+                    owner[sqlExpressionInProgressKey] = true;
+                    return [4 /*yield*/, sqlExpression()];
+                case 1: return [2 /*return*/, _a.sent()];
+                case 2:
+                    delete owner[sqlExpressionInProgressKey];
+                    return [7 /*endfinally*/];
+                case 3: return [2 /*return*/];
+            }
+        });
+    });
+}

package/src/remult-proxy.js

@@ -112,11 +112,16 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .updateMany.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.find = function (options) {
-                    var _a;
-                    return (_a = self
+                _a.find = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).find(options);
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .find.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
                 _a.groupBy = function () {
                     var _a, _b;
@@ -140,17 +145,27 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .aggregate.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.findFirst = function (where, options) {
-                    var _a;
-                    return (_a = self
+                _a.findFirst = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).findFirst(where, options);
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .findFirst.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.findOne = function (options) {
-                    var _a;
-                    return (_a = self
+                _a.findOne = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).findOne(options);
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .findOne.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
                 _a.findId = function (a, b) {
                     var _a;

package/src/remult3/QueryResultImpl.js

@@ -29,6 +29,7 @@ var QueryResultImpl = /** @class */ (function () {
                         page: page,
                         load: this.options.load,
                         include: this.options.include,
+                        args: this.options.args,
                     })];
             });
         });
@@ -115,6 +116,7 @@ var QueryResultImpl = /** @class */ (function () {
                             limit: this.options.pageSize,
                             load: this.options.load,
                             include: this.options.include,
+                            args: this.options.args,
                         };
                         getItems = function () { return _this.repo.find(options); };
                         if (this._aggregates === undefined &&

package/src/remult3/RepositoryImplementation.d.ts

@@ -106,7 +106,6 @@ declare abstract class rowHelperBase<T> {
      * must not be serialized by {@link toApiJson}. */
     _fieldsExcludedBySelect?: Set<string>;
     constructor(fieldsMetadata: FieldMetadata[], instance: T, remult: Remult, isNewRow: boolean, excludeRelationMembers?: Set<string>);
-    _skipRelationFieldSync: boolean;
     _subscribers?: SubscribableImp;
     subscribe(listener: RefSubscriber): Unsubscribe;
     _isLoading: boolean;

package/src/remult3/RepositoryImplementation.js

@@ -57,18 +57,6 @@ var classValidatorValidate = undefined;
 //     })
 //     .catch(() => {
 //     });
-// Assigning a `toOne` also writes its `field`/`fields`, which would wipe the FK of a row whose
-// target is missing.
-function setMissingRelationToNull(row, key) {
-    var ref = (0, getEntityRef_js_1.getEntityRef)(row);
-    ref._skipRelationFieldSync = true;
-    try {
-        row[key] = null;
-    }
-    finally {
-        ref._skipRelationFieldSync = false;
-    }
-}
 var RepositoryImplementation = /** @class */ (function () {
     function RepositoryImplementation(_entity, _remult, _dataProvider, _info, _defaultFindOptions) {
         this._entity = _entity;
@@ -1239,12 +1227,10 @@ var RepositoryImplementation = /** @class */ (function () {
                     var _loop_2 = function (row) {
                         var _e = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _e.findOptions, returnNull = _e.returnNull, returnUndefined = _e.returnUndefined;
                         var colKey = col.key;
-                        if (returnNull || returnUndefined) {
-                            if (rel.type === 'toMany')
-                                row[colKey] = (returnNull ? null : undefined);
-                            else
-                                setMissingRelationToNull(row, colKey);
-                        }
+                        if (returnNull)
+                            row[colKey] = null;
+                        else if (returnUndefined)
+                            row[colKey] = undefined;
                         else {
                             var entityType = rel.toEntity;
                             var toRepo_1 = otherRepo;
@@ -1259,12 +1245,14 @@ var RepositoryImplementation = /** @class */ (function () {
                                 metadata: toRepo_1.metadata,
                             }, findOptions)
                                 .then(function (result) {
-                                if (rel.type === 'toMany')
-                                    row[colKey] = result;
-                                else if (result.length == 0)
-                                    setMissingRelationToNull(row, colKey);
-                                else
-                                    row[colKey] = result[0];
+                                if (result.length == 0 && rel.type == 'toOne')
+                                    return;
+                                row[colKey] =
+                                    rel.type !== 'toMany'
+                                        ? result.length == 0
+                                            ? null
+                                            : result[0]
+                                        : result;
                             });
                         }
                     };
@@ -1908,7 +1896,6 @@ var rowHelperBase = /** @class */ (function () {
         this.instance = instance;
         this.remult = remult;
         this.isNewRow = isNewRow;
-        this._skipRelationFieldSync = false;
         this._isLoading = false;
         this.lookups = new Map();
         this.originalValues = {};
@@ -1968,7 +1955,7 @@ var rowHelperBase = /** @class */ (function () {
                         },
                         set: function (newVal) {
                             val_1 = newVal;
-                            if (newVal === undefined || _this._skipRelationFieldSync)
+                            if (newVal === undefined)
                                 return;
                             var op = col.options;
                             if (op.field) {
@@ -2819,9 +2806,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         finally { if (e_41) throw e_41.error; }
                         return [7 /*endfinally*/];
                     case 12:
-                        this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [
-                            { id: this.getId(), oldId: this.getOriginalId(), deleted: false },
-                        ]);
+                        this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];
@@ -3107,31 +3092,33 @@ var rowHelperImplementation = /** @class */ (function (_super) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b, col, result, e_46_1;
             var e_46, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         if (!!this.repo._dataProvider.isProxy) return [3 /*break*/, 8];
-                        _d.label = 1;
+                        _e.label = 1;
                     case 1:
-                        _d.trys.push([1, 6, 7, 8]);
+                        _e.trys.push([1, 6, 7, 8]);
                         _a = tslib_1.__values(this.info.fieldsMetadata), _b = _a.next();
-                        _d.label = 2;
+                        _e.label = 2;
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 5];
                         col = _b.value;
-                        if (!col.options.serverExpression) return [3 /*break*/, 4];
+                        if (!(col.options.serverExpression &&
+                            !((_d = this._fieldsExcludedBySelect) === null || _d === void 0 ? void 0 : _d.has(col.key)))) return [3 /*break*/, 4];
                         return [4 /*yield*/, col.options.serverExpression(this.instance)];
                     case 3:
-                        result = (_d.sent());
+                        result = (_e.sent());
                         if (result !== undefined)
                             this.instance[col.key] = result;
-                        _d.label = 4;
+                        _e.label = 4;
                     case 4:
                         _b = _a.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_46_1 = _d.sent();
+                        e_46_1 = _e.sent();
                         e_46 = { error: e_46_1 };
                         return [3 /*break*/, 8];
                     case 7:

package/src/remult3/remult3.d.ts

@@ -395,10 +395,6 @@ export type GroupByResult<entityType, groupByFields extends (keyof entityType)[]
 };
 /** used to perform CRUD operations on an `entityType` */
 export interface Repository<entityType> {
-    /** returns an array based on the provided options. Included relations drop their `?`, see {@link Loaded} */
-    find<const include extends MembersToInclude<entityType>>(options: FindOptions<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include>[]>;
     /** returns an array based on the provided options */
     find(options?: FindOptions<entityType>): Promise<entityType[]>;
     /** Using the same options as the {@link find} method, but subscribing to entity changes.
@@ -414,9 +410,6 @@ export interface Repository<entityType> {
      * @example
      * await taskRepo.findFirst({ completed:false },{ createIfNotFound: true })
      *      */
-    findFirst<const include extends MembersToInclude<entityType>>(where: EntityFilter<entityType> | undefined, options: FindFirstOptions<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include> | undefined>;
     findFirst(where?: EntityFilter<entityType>, options?: FindFirstOptions<entityType>): Promise<entityType | undefined>;
     /** returns the first item that matchers the `where` condition
      * @example
@@ -424,14 +417,8 @@ export interface Repository<entityType> {
      * @example
      * await taskRepo.findFirst({ where:{ completed:false }, createIfNotFound: true })
      *      */
-    findOne<const include extends MembersToInclude<entityType>>(options: FindFirstOptions<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include> | undefined>;
     findOne(options?: FindFirstOptions<entityType>): Promise<entityType | undefined>;
     /** returns the items that matches the id. If id is undefined | null, returns null */
-    findId<const include extends MembersToInclude<entityType>>(id: idType<entityType>, options: FindFirstOptionsBase<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include> | undefined | null>;
     findId(id: idType<entityType>, options?: FindFirstOptionsBase<entityType>): Promise<entityType | undefined | null>;
     /**
      * Performs an aggregation on the repository's entity type based on the specified options.
@@ -1196,29 +1183,6 @@ export type ObjectMembersOnly<T> = MembersOnly<{
 export type MembersToInclude<T> = {
     [K in keyof ObjectMembersOnly<T>]?: boolean | (NonNullable<T[K]> extends Array<any> ? FindOptions<NonNullable<T[K]>[number]> : FindFirstOptions<NonNullable<T[K]>>);
 };
-type LoadedTarget<target, include> = include extends {
-    include: infer nested;
-} ? Loaded<target, nested> : target;
-type LoadedRelation<value, include> = NonNullable<value> extends (infer target)[] ? LoadedTarget<target, include>[] : null extends value ? LoadedTarget<NonNullable<value>, include> | null : LoadedTarget<NonNullable<value>, include>;
-type LoadedKeys<entityType, include> = {
-    [K in keyof include & keyof entityType]-?: [include[K]] extends [
-        true | object
-    ] ? K : never;
-}[keyof include & keyof entityType];
-/**
- * The entity type `find` returns for a given `include`.
- * Included relations drop their `?`, and nested `include`s work the same way.
- * A relation declared `| null` stays nullable.
- * A relation included with `false` or a widened `boolean` keeps its declared type.
- * An included relation whose target row is missing loads as `null`.
- * Declare it `| null` when that can happen, e.g. an optional FK or a target a `backendPrefilter` can hide.
- * @example
- * const tasks = await repo(Task).find({ include: { category: true } })
- * tasks[0].category.name // `category` is loaded, no `?.` needed
- */
-export type Loaded<entityType, include> = 0 extends 1 & (entityType | include) ? entityType : [LoadedKeys<entityType, include>] extends [never] ? entityType : Omit<entityType, LoadedKeys<entityType, include>> & {
-    [K in LoadedKeys<entityType, include>]-?: LoadedRelation<Exclude<entityType[K], undefined>, include[K]>;
-};
 export type RepositoryRelations<entityType> = {
     [K in keyof ObjectMembersOnly<entityType>]-?: NonNullable<entityType[K]> extends Array<infer R> ? Repository<R> : entityType[K] extends infer R ? {
         findOne: (options?: FindOptionsBase<R>) => Promise<R>;
@@ -1265,4 +1229,3 @@ export declare const flags: {
     /** Version poll while SSE is stale */
     liveQueryPollWhenStaleMs: number;
 };
-export {};