remult 3.2.2-next.1 → 3.3.0-next.1

package/esm/remult-solid-start.js

@@ -8,6 +8,7 @@ export function remultApi(options) {
                 method: event.request.method,
                 on: (e, do1) => {
                     if (e === 'close') {
+                        event.locals ??= {};
                         event.locals['_tempOnClose'] = do1;
                     }
                 },
@@ -17,10 +18,12 @@ export function remultApi(options) {
         getRequestBody: (event) => event.request.json(),
     });
     const serverHandler = async (evt) => {
-        const event = (await getRequestEvent()) ?? evt;
+        const event = getRequestEvent() ?? evt;
         let sseResponse = undefined;
-        if (event)
+        if (event) {
+            event.locals ??= {};
             event.locals['_tempOnClose'] = () => { };
+        }
         const response = {
             end: () => { },
             json: () => { },

package/esm/src/data-api.js

@@ -233,6 +233,8 @@ export class DataApi {
             include: this.includeNone(),
         };
         findOptions.where = await this.buildWhere(request, body);
+        if (body?.args)
+            findOptions.args = body.args;
         if (request) {
             let sort = request.get('_sort');
             if (sort != undefined) {

package/esm/src/data-providers/rest-data-provider.js

@@ -71,6 +71,7 @@ export function findOptionsFromJson(json, meta) {
         'orderBy',
         'include',
         'select',
+        'args',
     ]) {
         if (json[key] !== undefined) {
             if (key === 'where') {
@@ -200,8 +201,9 @@ export class RestEntityDataProvider {
         if (options) {
             if (options.where) {
                 filterObject = options.where.toJson(); //        options.where.__applyToConsumer(new FilterConsumnerBridgeToUrlBuilder(url));
-                if (addFilterToUrlAndReturnTrueIfSuccessful(filterObject, url))
-                    filterObject = undefined;
+                if (options.args === undefined)
+                    if (addFilterToUrlAndReturnTrueIfSuccessful(filterObject, url))
+                        filterObject = undefined;
             }
             if (options.orderBy && options.orderBy.Segments) {
                 let sort = '';
@@ -244,6 +246,8 @@ export class RestEntityDataProvider {
                 else
                     body = { ...body, where: filterObject };
             }
+            if (options?.args)
+                body.args = options.args;
             if (body && method != 'put')
                 return this.http().post(u.url, body);
             else

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

@@ -1,4 +1,4 @@
-import { FilterConsumerBridgeToSqlRequest, dbNamesOfWithForceSqlExpression, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
+import { FilterConsumerBridgeToSqlRequest, dbNamesOfWithForceSqlExpression, isDbReadonly, toDbSql, } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { Filter, customDatabaseFilterToken, } from '../filter/filter-interfaces.js';
 import { remult as defaultRemult } from '../remult-proxy.js';
 import { GroupByCountMember, GroupByOperators, } from '../remult3/remult3.js';
@@ -7,6 +7,7 @@ import { Sort } from '../sort.js';
 import { ValueConverters } from '../valueConverters.js';
 import { getRepositoryInternals } from '../remult3/repository-internals.js';
 import { isOfType } from '../isOfType.js';
+import { originalSqlExpressionKey } from '../filter/fieldDbName.js';
 /**
  * A DataProvider for Sql Databases
  * @example
@@ -292,10 +293,10 @@ class ActualSQLEntityDataProvider {
     }
     async find(options) {
         let e = await this.init();
-        let { colKeys, select } = this.buildSelect(e, options?.select);
+        let r = this.sql.createCommand();
+        let { colKeys, select } = await this.buildSelect(e, r, options?.select, options?.args);
         select = 'select ' + select;
         select += '\n from ' + e.$entityName;
-        let r = this.sql.createCommand();
         if (options) {
             if (options.where) {
                 let where = new FilterConsumerBridgeToSqlRequest(r, e);
@@ -321,7 +322,9 @@ class ActualSQLEntityDataProvider {
                     }
                     else
                         select += ', ';
-                    select += e.$dbNameOf(c.field);
+                    select += c.field.options.sqlExpression
+                        ? c.field.options.key
+                        : await e.$dbNameOf(c.field);
                     if (c.isDescending)
                         select += ' desc';
                     if (this.sql._getSourceSql().orderByNullsFirst) {
@@ -362,7 +365,7 @@ class ActualSQLEntityDataProvider {
         }
         return result;
     }
-    buildSelect(e, selectedFields) {
+    async buildSelect(e, r, selectedFields, args) {
         let select = '';
         let colKeys = [];
         for (const x of this.entity.fields) {
@@ -373,7 +376,15 @@ class ActualSQLEntityDataProvider {
             else {
                 if (colKeys.length > 0)
                     select += ', ';
-                select += e.$dbNameOf(x);
+                if (typeof x.options.sqlExpression === 'function') {
+                    let sql = await x[originalSqlExpressionKey](this.entity, args, r);
+                    if (sql.includes(' '))
+                        select += '(' + sql + ')';
+                    else
+                        select += sql;
+                }
+                else
+                    select += e.$dbNameOf(x);
                 if (x.options.sqlExpression)
                     select += ' as ' + x.key;
                 colKeys.push(x);
@@ -396,7 +407,7 @@ class ActualSQLEntityDataProvider {
                         added = true;
                     else
                         statement += ', ';
-                    statement += e.$dbNameOf(x) + ' = ' + r.param(v);
+                    statement += e.$dbNameOf(x) + ' = ' + toDbSql(r, x, v);
                 }
             }
         }
@@ -404,7 +415,7 @@ class ActualSQLEntityDataProvider {
         let f = new FilterConsumerBridgeToSqlRequest(r, e);
         Filter.fromEntityFilter(this.entity, idFilter).__applyToConsumer(f);
         statement += await f.resolveWhere();
-        let { colKeys, select } = this.buildSelect(e);
+        let { colKeys, select } = await this.buildSelect(e, r, undefined, undefined);
         let returning = true;
         if (this.sql._getSourceSql().doesNotSupportReturningSyntax)
             returning = false;
@@ -456,12 +467,12 @@ class ActualSQLEntityDataProvider {
                         vals += ', ';
                     }
                     cols += e.$dbNameOf(x);
-                    vals += r.param(v);
+                    vals += toDbSql(r, x, v);
                 }
             }
         }
         let statement = `insert into ${e.$entityName} (${cols}) values (${vals})`;
-        let { colKeys, select } = this.buildSelect(e);
+        let { colKeys, select } = await this.buildSelect(e, r, undefined, undefined);
         if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
             statement += ' returning ' + select;
         return await r.execute(statement).then((sql) => {

package/esm/src/filter/fieldDbName.js

@@ -1,5 +1,6 @@
 import { getRelationFieldInfo } from '../remult3/relationInfoMember.js';
 const sqlExpressionInProgressKey = Symbol.for(`sqlExpressionInProgressKey`);
+export const originalSqlExpressionKey = Symbol.for(`originalSqlExpressionKey`);
 export async function fieldDbName(f, meta, wrapIdentifier = (x) => x, forceSqlExpression = false) {
     try {
         if (f.options.sqlExpression) {
@@ -11,7 +12,9 @@ export async function fieldDbName(f, meta, wrapIdentifier = (x) => x, forceSqlEx
                 try {
                     ;
                     f[sqlExpressionInProgressKey] = true;
-                    result = await f.options.sqlExpression(meta);
+                    if (!f[originalSqlExpressionKey])
+                        f[originalSqlExpressionKey] = f.options.sqlExpression;
+                    result = await f.options.sqlExpression(meta, undefined, undefined);
                     if (!result.includes('\0'))
                         f.options.sqlExpression = () => result;
                 }

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

@@ -73,7 +73,7 @@ export class FilterConsumerBridgeToSqlRequest {
                 this.addToWhere(this.nameProvider.$dbNameOf(col) +
                     ' in (' +
                     val
-                        .map((x) => this.r.param(col.valueConverter.toDb(x)))
+                        .map((x) => toDbSql(this.r, col, col.valueConverter.toDb(x)))
                         .join(',') +
                     ')');
             else
@@ -140,7 +140,7 @@ export class FilterConsumerBridgeToSqlRequest {
                 ' ' +
                 operator +
                 ' ' +
-                this.r.param(col.valueConverter.toDb(val));
+                toDbSql(this.r, col, col.valueConverter.toDb(val));
             this.addToWhere(x);
         })());
     }
@@ -261,3 +261,6 @@ async function internalDbNamesOf(repo, wrapIdentifierOrOptions, forceSqlExpressi
     }
     return result;
 }
+export function toDbSql(r, field, val) {
+    return (field.valueConverter.toDbSql ?? ((x) => x))(r.param(val));
+}

package/esm/src/remult3/RepositoryImplementation.js

@@ -583,6 +583,8 @@ export class RepositoryImplementation {
         options = { ...options };
         let opt = {};
         opt = {};
+        if (options.args)
+            opt.args = options.args;
         if (options.select) {
             opt.select = Object.keys(options.select)
                 .filter((x) => options.select[x])

package/esm/src/remult3/remult3.js

@@ -41,6 +41,14 @@ export const flags = {
   
   -
 */
+/*p1 - https://github.com/remult/remult/discussions/438
+  - should we use the arg for update and insert? for the returning query?
+  - Does dbNamesOf still makes sense? I think that abstraction, regarding sql expression has lost it's merit
+  - remember caching of sql expression  calculations that took a recursive amount of time for JYC
+  - maybe introduce a ready dbNamesOf of argument that will be aware of prefixes
+  - I've changed the order by to support order by 1
+
+*/
 //p1 - deleteAll({title:undefined}) should throw an error - not return 0 (with direct call to db)
 //p1 - remult-create, move db question ahead of auth - everyone needs a database, not everyone need auth
 //p1 - allow experimental route registration on remult server, with at least get route, and support redirect, read header and set header - (and the existing get html etc...)

package/esm/src/valueConverters.js

@@ -175,6 +175,7 @@ export class ValueConverters {
         toDb: (x) => ValueConverters.JsonString.toDb(x),
         fromInput: (x) => ValueConverters.Default.fromJson(x),
         toInput: (x) => ValueConverters.Default.toJson(x),
+        toDbSql: (x) => x,
         displayValue: (x) => x + '',
         fieldTypeInDb: '',
         inputType: 'text',

package/package.json

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

package/remult-solid-start.js

@@ -13,7 +13,9 @@ function remultApi(options) {
                 url: event.request.url,
                 method: event.request.method,
                 on: function (e, do1) {
+                    var _a;
                     if (e === 'close') {
+                        (_a = event.locals) !== null && _a !== void 0 ? _a : (event.locals = {});
                         event.locals['_tempOnClose'] = do1;
                     }
                 },
@@ -24,15 +26,16 @@ function remultApi(options) {
     });
     var serverHandler = function (evt) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         var event, sseResponse, response, responseFromRemultHandler, res;
-        var _a;
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, web_1.getRequestEvent)()];
-                case 1:
-                    event = (_a = (_b.sent())) !== null && _a !== void 0 ? _a : evt;
+        var _a, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    event = (_a = (0, web_1.getRequestEvent)()) !== null && _a !== void 0 ? _a : evt;
                     sseResponse = undefined;
-                    if (event)
+                    if (event) {
+                        (_b = event.locals) !== null && _b !== void 0 ? _b : (event.locals = {});
                         event.locals['_tempOnClose'] = function () { };
+                    }
                     response = {
                         end: function () { },
                         json: function () { },
@@ -79,8 +82,8 @@ function remultApi(options) {
                         },
                     };
                     return [4 /*yield*/, result.handle(event, response)];
-                case 2:
-                    responseFromRemultHandler = _b.sent();
+                case 1:
+                    responseFromRemultHandler = _c.sent();
                     if (sseResponse !== undefined) {
                         return [2 /*return*/, sseResponse];
                     }

package/src/column-interfaces.d.ts

@@ -1,6 +1,7 @@
 import type { ClassType } from '../classType.js';
 import type { AllowedForInstance } from './context.js';
 import type { EntityMetadata, FieldRef, LifecycleEvent, ValidateFieldEvent } from './remult3/remult3.js';
+import type { SqlCommandWithParameters } from './sql-command.js';
 export interface FieldOptions<entityType = unknown, valueType = unknown> {
     /** A human readable name for the field. Can be used to achieve a consistent caption for a field throughout the app
      * @example
@@ -103,7 +104,7 @@ export interface FieldOptions<entityType = unknown, valueType = unknown> {
      * @Fields.string()
      * title='';
      */
-    sqlExpression?: string | ((entity: EntityMetadata<entityType>) => string | Promise<string>);
+    sqlExpression?: string | ((entity: EntityMetadata<entityType>, args?: any, command?: SqlCommandWithParameters) => string | Promise<string>);
     /** For fields that shouldn't be part of an update or insert statement */
     dbReadOnly?: boolean;
     /** The value converter to be used when loading and saving this field */
@@ -293,6 +294,7 @@ export interface ValueConverter<valueType> {
      * toDb: val => val?.toISOString()
      */
     toDb?(val: valueType): any;
+    toDbSql?(val: string): string;
     /**
      * Converts a value of valueType to a string suitable for an HTML input element.
      *

package/src/data-api.js

@@ -482,6 +482,8 @@ var DataApi = /** @class */ (function () {
                         return [4 /*yield*/, this.buildWhere(request, body)];
                     case 1:
                         _a.where = _b.sent();
+                        if (body === null || body === void 0 ? void 0 : body.args)
+                            findOptions.args = body.args;
                         if (request) {
                             sort = request.get('_sort');
                             if (sort != undefined) {

package/src/data-interfaces.d.ts

@@ -49,6 +49,7 @@ export interface EntityDataProviderFindOptions {
     select?: string[];
     where?: Filter;
     limit?: number;
+    args?: any;
     page?: number;
     orderBy?: Sort;
 }

package/src/data-providers/rest-data-provider.js

@@ -82,6 +82,7 @@ function findOptionsFromJson(json, meta) {
             'orderBy',
             'include',
             'select',
+            'args',
         ]), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
             if (json[key] !== undefined) {
@@ -288,8 +289,9 @@ var RestEntityDataProvider = /** @class */ (function () {
         if (options) {
             if (options.where) {
                 filterObject = options.where.toJson(); //        options.where.__applyToConsumer(new FilterConsumnerBridgeToUrlBuilder(url));
-                if (addFilterToUrlAndReturnTrueIfSuccessful(filterObject, url))
-                    filterObject = undefined;
+                if (options.args === undefined)
+                    if (addFilterToUrlAndReturnTrueIfSuccessful(filterObject, url))
+                        filterObject = undefined;
             }
             if (options.orderBy && options.orderBy.Segments) {
                 var sort_1 = '';
@@ -332,6 +334,8 @@ var RestEntityDataProvider = /** @class */ (function () {
                 else
                     body = tslib_1.__assign(tslib_1.__assign({}, body), { where: filterObject });
             }
+            if (options === null || options === void 0 ? void 0 : options.args)
+                body.args = options.args;
             if (body && method != 'put')
                 return _this.http().post(u.url, body);
             else

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

@@ -13,6 +13,7 @@ var sort_js_1 = require("../sort.js");
 var valueConverters_js_1 = require("../valueConverters.js");
 var repository_internals_js_1 = require("../remult3/repository-internals.js");
 var isOfType_js_1 = require("../isOfType.js");
+var fieldDbName_js_1 = require("../filter/fieldDbName.js");
 /**
  * A DataProvider for Sql Databases
  * @example
@@ -413,78 +414,100 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
     };
     ActualSQLEntityDataProvider.prototype.find = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _a, colKeys, select, r, where, _b, first, segs, _c, _d, s, segs_1, segs_1_1, c, page;
-            var e_2, _e, e_3, _f;
+            var e, r, _a, colKeys, select, where, _b, first, segs, _c, _d, s, segs_1, segs_1_1, c, _e, _f, e_2_1, page;
+            var e_3, _g, e_2, _h;
             var _this = this;
-            return tslib_1.__generator(this, function (_g) {
-                switch (_g.label) {
+            return tslib_1.__generator(this, function (_j) {
+                switch (_j.label) {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
-                        e = _g.sent();
-                        _a = this.buildSelect(e, options === null || options === void 0 ? void 0 : options.select), colKeys = _a.colKeys, select = _a.select;
+                        e = _j.sent();
+                        r = this.sql.createCommand();
+                        return [4 /*yield*/, this.buildSelect(e, r, options === null || options === void 0 ? void 0 : options.select, options === null || options === void 0 ? void 0 : options.args)];
+                    case 2:
+                        _a = _j.sent(), colKeys = _a.colKeys, select = _a.select;
                         select = 'select ' + select;
                         select += '\n from ' + e.$entityName;
-                        r = this.sql.createCommand();
-                        if (!options) return [3 /*break*/, 4];
-                        if (!options.where) return [3 /*break*/, 3];
+                        if (!options) return [3 /*break*/, 15];
+                        if (!options.where) return [3 /*break*/, 4];
                         where = new filter_consumer_bridge_to_sql_request_js_1.FilterConsumerBridgeToSqlRequest(r, e);
                         options.where.__applyToConsumer(where);
                         _b = select;
                         return [4 /*yield*/, where.resolveWhere()];
-                    case 2:
-                        select = _b + _g.sent();
-                        _g.label = 3;
                     case 3:
+                        select = _b + _j.sent();
+                        _j.label = 4;
+                    case 4:
                         if (options.limit) {
                             options.orderBy = sort_js_1.Sort.createUniqueSort(this.entity, options.orderBy);
                         }
                         if (!options.orderBy) {
                             options.orderBy = sort_js_1.Sort.createUniqueSort(this.entity, new sort_js_1.Sort());
                         }
-                        if (options.orderBy) {
-                            first = true;
-                            segs = [];
-                            try {
-                                for (_c = tslib_1.__values(options.orderBy.Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
-                                    s = _d.value;
-                                    segs.push(s);
-                                }
-                            }
-                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                            finally {
-                                try {
-                                    if (_d && !_d.done && (_e = _c.return)) _e.call(_c);
-                                }
-                                finally { if (e_2) throw e_2.error; }
+                        if (!options.orderBy) return [3 /*break*/, 14];
+                        first = true;
+                        segs = [];
+                        try {
+                            for (_c = tslib_1.__values(options.orderBy.Segments), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                s = _d.value;
+                                segs.push(s);
                             }
+                        }
+                        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                        finally {
                             try {
-                                for (segs_1 = tslib_1.__values(segs), segs_1_1 = segs_1.next(); !segs_1_1.done; segs_1_1 = segs_1.next()) {
-                                    c = segs_1_1.value;
-                                    if (first) {
-                                        select += ' Order By ';
-                                        first = false;
-                                    }
-                                    else
-                                        select += ', ';
-                                    select += e.$dbNameOf(c.field);
-                                    if (c.isDescending)
-                                        select += ' desc';
-                                    if (this.sql._getSourceSql().orderByNullsFirst) {
-                                        if (c.isDescending)
-                                            select += ' nulls last';
-                                        else
-                                            select += ' nulls first';
-                                    }
-                                }
-                            }
-                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                            finally {
-                                try {
-                                    if (segs_1_1 && !segs_1_1.done && (_f = segs_1.return)) _f.call(segs_1);
-                                }
-                                finally { if (e_3) throw e_3.error; }
+                                if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
                             }
+                            finally { if (e_3) throw e_3.error; }
                         }
+                        _j.label = 5;
+                    case 5:
+                        _j.trys.push([5, 12, 13, 14]);
+                        segs_1 = tslib_1.__values(segs), segs_1_1 = segs_1.next();
+                        _j.label = 6;
+                    case 6:
+                        if (!!segs_1_1.done) return [3 /*break*/, 11];
+                        c = segs_1_1.value;
+                        if (first) {
+                            select += ' Order By ';
+                            first = false;
+                        }
+                        else
+                            select += ', ';
+                        _e = select;
+                        if (!c.field.options.sqlExpression) return [3 /*break*/, 7];
+                        _f = c.field.options.key;
+                        return [3 /*break*/, 9];
+                    case 7: return [4 /*yield*/, e.$dbNameOf(c.field)];
+                    case 8:
+                        _f = _j.sent();
+                        _j.label = 9;
+                    case 9:
+                        select = _e + _f;
+                        if (c.isDescending)
+                            select += ' desc';
+                        if (this.sql._getSourceSql().orderByNullsFirst) {
+                            if (c.isDescending)
+                                select += ' nulls last';
+                            else
+                                select += ' nulls first';
+                        }
+                        _j.label = 10;
+                    case 10:
+                        segs_1_1 = segs_1.next();
+                        return [3 /*break*/, 6];
+                    case 11: return [3 /*break*/, 14];
+                    case 12:
+                        e_2_1 = _j.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 14];
+                    case 13:
+                        try {
+                            if (segs_1_1 && !segs_1_1.done && (_h = segs_1.return)) _h.call(segs_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 14:
                         if (options.limit) {
                             page = 1;
                             if (options.page)
@@ -495,8 +518,8 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 ' ' +
                                     this.strategy.getLimitSqlSyntax(options.limit, (page - 1) * options.limit);
                         }
-                        _g.label = 4;
-                    case 4: return [2 /*return*/, r.execute(select).then(function (r) {
+                        _j.label = 15;
+                    case 15: return [2 /*return*/, r.execute(select).then(function (r) {
                             return r.rows.map(function (y) {
                                 return _this.buildResultRow(colKeys, y, r);
                             });
@@ -518,35 +541,65 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
         }
         return result;
     };
-    ActualSQLEntityDataProvider.prototype.buildSelect = function (e, selectedFields) {
-        var e_4, _a;
-        var select = '';
-        var colKeys = [];
-        try {
-            for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var x = _c.value;
-                if (selectedFields && !selectedFields.includes(x.key))
-                    continue;
-                if (x.isServerExpression) {
-                }
-                else {
-                    if (colKeys.length > 0)
-                        select += ', ';
-                    select += e.$dbNameOf(x);
-                    if (x.options.sqlExpression)
-                        select += ' as ' + x.key;
-                    colKeys.push(x);
+    ActualSQLEntityDataProvider.prototype.buildSelect = function (e, r, selectedFields, args) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var select, colKeys, _a, _b, x, sql, e_4_1;
+            var e_4, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        select = '';
+                        colKeys = [];
+                        _d.label = 1;
+                    case 1:
+                        _d.trys.push([1, 9, 10, 11]);
+                        _a = tslib_1.__values(this.entity.fields), _b = _a.next();
+                        _d.label = 2;
+                    case 2:
+                        if (!!_b.done) return [3 /*break*/, 8];
+                        x = _b.value;
+                        if (selectedFields && !selectedFields.includes(x.key))
+                            return [3 /*break*/, 7];
+                        if (!x.isServerExpression) return [3 /*break*/, 3];
+                        return [3 /*break*/, 7];
+                    case 3:
+                        if (colKeys.length > 0)
+                            select += ', ';
+                        if (!(typeof x.options.sqlExpression === 'function')) return [3 /*break*/, 5];
+                        return [4 /*yield*/, x[fieldDbName_js_1.originalSqlExpressionKey](this.entity, args, r)];
+                    case 4:
+                        sql = _d.sent();
+                        if (sql.includes(' '))
+                            select += '(' + sql + ')';
+                        else
+                            select += sql;
+                        return [3 /*break*/, 6];
+                    case 5:
+                        select += e.$dbNameOf(x);
+                        _d.label = 6;
+                    case 6:
+                        if (x.options.sqlExpression)
+                            select += ' as ' + x.key;
+                        colKeys.push(x);
+                        _d.label = 7;
+                    case 7:
+                        _b = _a.next();
+                        return [3 /*break*/, 2];
+                    case 8: return [3 /*break*/, 11];
+                    case 9:
+                        e_4_1 = _d.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 11];
+                    case 10:
+                        try {
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 11: return [2 /*return*/, { colKeys: colKeys, select: select }];
                 }
-            }
-        }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_4) throw e_4.error; }
-        }
-        return { colKeys: colKeys, select: select };
+            });
+        });
     };
     ActualSQLEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -573,7 +626,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                             added = true;
                                         else
                                             statement += ', ';
-                                        statement += e.$dbNameOf(x) + ' = ' + r.param(v);
+                                        statement += e.$dbNameOf(x) + ' = ' + (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
                                     }
                                 }
                             }
@@ -592,7 +645,9 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         statement = _c + _f.sent();
-                        _d = this.buildSelect(e), colKeys = _d.colKeys, select = _d.select;
+                        return [4 /*yield*/, this.buildSelect(e, r, undefined, undefined)];
+                    case 3:
+                        _d = _f.sent(), colKeys = _d.colKeys, select = _d.select;
                         returning = true;
                         if (this.sql._getSourceSql().doesNotSupportReturningSyntax)
                             returning = false;
@@ -672,7 +727,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                             vals += ', ';
                                         }
                                         cols += e.$dbNameOf(x);
-                                        vals += r.param(v);
+                                        vals += (0, filter_consumer_bridge_to_sql_request_js_1.toDbSql)(r, x, v);
                                     }
                                 }
                             }
@@ -685,7 +740,9 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                             finally { if (e_6) throw e_6.error; }
                         }
                         statement = "insert into ".concat(e.$entityName, " (").concat(cols, ") values (").concat(vals, ")");
-                        _c = this.buildSelect(e), colKeys = _c.colKeys, select = _c.select;
+                        return [4 /*yield*/, this.buildSelect(e, r, undefined, undefined)];
+                    case 2:
+                        _c = _e.sent(), colKeys = _c.colKeys, select = _c.select;
                         if (!this.sql._getSourceSql().doesNotSupportReturningSyntax)
                             statement += ' returning ' + select;
                         return [4 /*yield*/, r.execute(statement).then(function (sql) {
@@ -709,7 +766,7 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
                                 }
                                 return _this.buildResultRow(colKeys, sql.rows[0], sql);
                             })];
-                    case 2: return [2 /*return*/, _e.sent()];
+                    case 3: return [2 /*return*/, _e.sent()];
                 }
             });
         });

package/src/filter/fieldDbName.d.ts

@@ -1,3 +1,4 @@
-import type { EntityMetadata } from "../remult3/remult3.js";
+import type { EntityMetadata } from '../remult3/remult3.js';
 import type { FieldMetadata } from '../column-interfaces.js';
+export declare const originalSqlExpressionKey: unique symbol;
 export declare function fieldDbName(f: FieldMetadata, meta: EntityMetadata, wrapIdentifier?: (name: string) => string, forceSqlExpression?: boolean): Promise<string>;

package/src/filter/fieldDbName.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+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");
+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;
@@ -23,7 +25,9 @@ function fieldDbName(f_1, meta_1) {
                     _a.trys.push([1, , 3, 4]);
                     ;
                     f[sqlExpressionInProgressKey] = true;
-                    return [4 /*yield*/, f.options.sqlExpression(meta)];
+                    if (!f[exports.originalSqlExpressionKey])
+                        f[exports.originalSqlExpressionKey] = f.options.sqlExpression;
+                    return [4 /*yield*/, f.options.sqlExpression(meta, undefined, undefined)];
                 case 2:
                     result_1 = _a.sent();
                     if (!result_1.includes('\0'))

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

@@ -84,3 +84,4 @@ export interface dbNamesOfOptions {
 }
 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 toDbSql(r: SqlCommandWithParameters, field: FieldMetadata, val: any): string;

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

@@ -6,6 +6,7 @@ exports.shouldNotCreateField = shouldNotCreateField;
 exports.shouldCreateEntity = shouldCreateEntity;
 exports.dbNamesOf = dbNamesOf;
 exports.dbNamesOfWithForceSqlExpression = dbNamesOfWithForceSqlExpression;
+exports.toDbSql = toDbSql;
 var tslib_1 = require("tslib");
 var sql_database_js_1 = require("../data-providers/sql-database.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
@@ -162,7 +163,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     this.addToWhere(this.nameProvider.$dbNameOf(col) +
                         ' in (' +
                         val
-                            .map(function (x) { return _this.r.param(col.valueConverter.toDb(x)); })
+                            .map(function (x) { return toDbSql(_this.r, col, col.valueConverter.toDb(x)); })
                             .join(',') +
                         ')');
                 else
@@ -250,7 +251,7 @@ var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
                     ' ' +
                     operator +
                     ' ' +
-                    this.r.param(col.valueConverter.toDb(val));
+                    toDbSql(this.r, col, col.valueConverter.toDb(val));
                 this.addToWhere(x);
                 return [2 /*return*/];
             });
@@ -431,3 +432,7 @@ function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
         });
     });
 }
+function toDbSql(r, field, val) {
+    var _a;
+    return ((_a = field.valueConverter.toDbSql) !== null && _a !== void 0 ? _a : (function (x) { return x; }))(r.param(val));
+}

package/src/remult3/RepositoryImplementation.js

@@ -952,6 +952,8 @@ var RepositoryImplementation = /** @class */ (function () {
                         options = tslib_1.__assign({}, options);
                         opt = {};
                         opt = {};
+                        if (options.args)
+                            opt.args = options.args;
                         if (options.select) {
                             opt.select = Object.keys(options.select)
                                 .filter(function (x) { return options.select[x]; })

package/src/remult3/remult3.d.ts

@@ -1069,6 +1069,7 @@ export interface FindOptionsBase<entityType> extends LoadOptions<entityType> {
      * await repo(Products).find({ orderBy: { price: "desc", name: "asc" }})
      */
     orderBy?: EntityOrderBy<entityType>;
+    args?: any;
 }
 export interface FindFirstOptions<entityType> extends FindOptionsBase<entityType>, FindFirstOptionsBase<entityType> {
 }

package/src/remult3/remult3.js

@@ -44,6 +44,14 @@ exports.flags = {
   
   -
 */
+/*p1 - https://github.com/remult/remult/discussions/438
+  - should we use the arg for update and insert? for the returning query?
+  - Does dbNamesOf still makes sense? I think that abstraction, regarding sql expression has lost it's merit
+  - remember caching of sql expression  calculations that took a recursive amount of time for JYC
+  - maybe introduce a ready dbNamesOf of argument that will be aware of prefixes
+  - I've changed the order by to support order by 1
+
+*/
 //p1 - deleteAll({title:undefined}) should throw an error - not return 0 (with direct call to db)
 //p1 - remult-create, move db question ahead of auth - everyone needs a database, not everyone need auth
 //p1 - allow experimental route registration on remult server, with at least get route, and support redirect, read header and set header - (and the existing get html etc...)

package/src/valueConverters.js

@@ -173,6 +173,7 @@ var ValueConverters = /** @class */ (function () {
         toDb: function (x) { return ValueConverters.JsonString.toDb(x); },
         fromInput: function (x) { return ValueConverters.Default.fromJson(x); },
         toInput: function (x) { return ValueConverters.Default.toJson(x); },
+        toDbSql: function (x) { return x; },
         displayValue: function (x) { return x + ''; },
         fieldTypeInDb: '',
         inputType: 'text',