remult 2.7.34 → 3.0.0-next.2

package/server/remult-api-server.d.ts

@@ -74,7 +74,7 @@ export interface RemultServerOptions<RequestType> {
      *
      * @returns A promise that resolves when the error handling is complete.
      * @example
-     * export const api = remultExpress({
+     * export const api = remultApi({
      *   error: async (e) => {
      *     if (e.httpStatusCode == 400) {
      *       e.sendError(500, { message: "An error occurred" })

package/src/buildRestDataProvider.d.ts

@@ -9,7 +9,6 @@ export declare class HttpProviderBridgeToRestDataProviderHttpProvider implements
     put(url: string, data: any): Promise<any>;
     get(url: string): Promise<any>;
 }
-export declare function retry<T>(what: () => Promise<T>): Promise<T>;
 export declare function toPromise<T>(p: Promise<T> | {
     toPromise(): Promise<T>;
 }): Promise<any>;

package/src/buildRestDataProvider.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpProviderBridgeToRestDataProviderHttpProvider = void 0;
 exports.buildRestDataProvider = buildRestDataProvider;
 exports.isExternalHttpProvider = isExternalHttpProvider;
-exports.retry = retry;
 exports.toPromise = toPromise;
 exports.processHttpException = processHttpException;
 var tslib_1 = require("tslib");
-var rest_data_provider_js_1 = require("./data-providers/rest-data-provider.js");
-var remult3_js_1 = require("./remult3/remult3.js");
+var rest_data_provider_using_fetch_js_1 = require("./data-providers/rest-data-provider-using-fetch.js");
+var retry_js_1 = require("./data-providers/retry.js");
 function buildRestDataProvider(provider) {
     if (!provider)
-        return new rest_data_provider_js_1.RestDataProviderHttpProviderUsingFetch();
+        return new rest_data_provider_using_fetch_js_1.RestDataProviderHttpProviderUsingFetch();
     var httpDataProvider;
     if (!httpDataProvider) {
         if (isExternalHttpProvider(provider)) {
@@ -20,7 +19,7 @@ function buildRestDataProvider(provider) {
     }
     if (!httpDataProvider) {
         if (typeof provider === 'function') {
-            httpDataProvider = new rest_data_provider_js_1.RestDataProviderHttpProviderUsingFetch(provider);
+            httpDataProvider = new rest_data_provider_using_fetch_js_1.RestDataProviderHttpProviderUsingFetch(provider);
         }
     }
     return httpDataProvider;
@@ -40,7 +39,7 @@ var HttpProviderBridgeToRestDataProviderHttpProvider = /** @class */ (function (
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, retry(function () { return toPromise(_this.http.post(url, data)); })];
+                    case 0: return [4 /*yield*/, (0, retry_js_1.retry)(function () { return toPromise(_this.http.post(url, data)); })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -57,7 +56,7 @@ var HttpProviderBridgeToRestDataProviderHttpProvider = /** @class */ (function (
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, retry(function () { return toPromise(_this.http.get(url)); })];
+                    case 0: return [4 /*yield*/, (0, retry_js_1.retry)(function () { return toPromise(_this.http.get(url)); })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -66,45 +65,6 @@ var HttpProviderBridgeToRestDataProviderHttpProvider = /** @class */ (function (
     return HttpProviderBridgeToRestDataProviderHttpProvider;
 }());
 exports.HttpProviderBridgeToRestDataProviderHttpProvider = HttpProviderBridgeToRestDataProviderHttpProvider;
-function retry(what) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var i, err_1;
-        var _a, _b, _c, _d;
-        return tslib_1.__generator(this, function (_e) {
-            switch (_e.label) {
-                case 0:
-                    i = 0;
-                    _e.label = 1;
-                case 1:
-                    if (!true) return [3 /*break*/, 8];
-                    _e.label = 2;
-                case 2:
-                    _e.trys.push([2, 4, , 7]);
-                    return [4 /*yield*/, what()];
-                case 3: return [2 /*return*/, _e.sent()];
-                case 4:
-                    err_1 = _e.sent();
-                    if (!((((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.startsWith('Error occurred while trying to proxy')) ||
-                        ((_b = err_1.message) === null || _b === void 0 ? void 0 : _b.startsWith('Error occured while trying to proxy')) ||
-                        ((_c = err_1.message) === null || _c === void 0 ? void 0 : _c.includes('http proxy error')) ||
-                        ((_d = err_1.message) === null || _d === void 0 ? void 0 : _d.startsWith('Gateway Timeout')) ||
-                        err_1.status == 500) &&
-                        i++ < remult3_js_1.flags.error500RetryCount)) return [3 /*break*/, 6];
-                    return [4 /*yield*/, new Promise(function (res, req) {
-                            setTimeout(function () {
-                                res({});
-                            }, 500);
-                        })];
-                case 5:
-                    _e.sent();
-                    return [3 /*break*/, 1];
-                case 6: throw err_1;
-                case 7: return [3 /*break*/, 1];
-                case 8: return [2 /*return*/];
-            }
-        });
-    });
-}
 function toPromise(p) {
     var _this = this;
     var r;

package/src/context.js

@@ -82,14 +82,17 @@ var Remult = /** @class */ (function () {
          * @param dataProvider - an optional alternative data provider to use. Useful for writing to offline storage or an alternative data provider
          */
         this.repo = function (entity, dataProvider) {
+            var _a, _b, _c;
+            var info = (0, RepositoryImplementation_js_1.createOldEntity)(entity, _this);
             if (dataProvider === undefined)
-                dataProvider = _this.dataProvider;
+                dataProvider =
+                    (_c = (_b = (_a = info === null || info === void 0 ? void 0 : info.options) === null || _a === void 0 ? void 0 : _a.dataProvider) === null || _b === void 0 ? void 0 : _b.call(_a, _this.dataProvider)) !== null && _c !== void 0 ? _c : _this.dataProvider;
             var dpCache = _this.repCache.get(dataProvider);
             if (!dpCache)
                 _this.repCache.set(dataProvider, (dpCache = new Map()));
             var r = dpCache.get(entity);
             if (!r) {
-                dpCache.set(entity, (r = new RepositoryImplementation_js_1.RepositoryImplementation(entity, _this, dataProvider, (0, RepositoryImplementation_js_1.createOldEntity)(entity, _this))));
+                dpCache.set(entity, (r = new RepositoryImplementation_js_1.RepositoryImplementation(entity, _this, dataProvider, info)));
                 (0, relationInfoMember_js_1.verifyFieldRelationInfo)(r, _this, dataProvider);
             }
             return r;

package/src/data-providers/rest-data-provider-using-fetch.d.ts

@@ -0,0 +1,13 @@
+import type { RestDataProviderHttpProvider } from '../data-interfaces.js';
+export declare class RestDataProviderHttpProviderUsingFetch implements RestDataProviderHttpProvider {
+    private fetch?;
+    constructor(fetch?: ((input: RequestInfo, init?: RequestInit) => Promise<Response>) | undefined);
+    get(url: string): Promise<any>;
+    put(url: string, data: any): Promise<any>;
+    delete(url: string): Promise<any>;
+    post(url: string, data: any): Promise<any>;
+    myFetch(url: string, options?: {
+        method?: string;
+        body?: string;
+    }): Promise<any>;
+}

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

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RestDataProviderHttpProviderUsingFetch = void 0;
+var tslib_1 = require("tslib");
+var retry_js_1 = require("./retry.js");
+var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
+    function RestDataProviderHttpProviderUsingFetch(fetch) {
+        this.fetch = fetch;
+    }
+    RestDataProviderHttpProviderUsingFetch.prototype.get = function (url) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, retry_js_1.retry)(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            return tslib_1.__generator(this, function (_a) {
+                                return [2 /*return*/, this.myFetch(url).then(function (r) {
+                                        return r;
+                                    })];
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RestDataProviderHttpProviderUsingFetch.prototype.put = function (url, data) {
+        return this.myFetch(url, {
+            method: 'put',
+            body: JSON.stringify(data),
+        });
+    };
+    RestDataProviderHttpProviderUsingFetch.prototype.delete = function (url) {
+        return this.myFetch(url, { method: 'delete' });
+    };
+    RestDataProviderHttpProviderUsingFetch.prototype.post = function (url, data) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, retry_js_1.retry)(function () {
+                            return _this.myFetch(url, {
+                                method: 'post',
+                                body: JSON.stringify(data),
+                            });
+                        })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, options) {
+        var e_1, _a;
+        var _this = this;
+        var headers = {};
+        if (options === null || options === void 0 ? void 0 : options.body)
+            headers['Content-type'] = 'application/json';
+        if (typeof window !== 'undefined' &&
+            typeof window.document !== 'undefined' &&
+            typeof (window.document.cookie !== 'undefined'))
+            try {
+                for (var _b = tslib_1.__values(window.document.cookie.split(';')), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var cookie = _c.value;
+                    if (cookie.trim().startsWith('XSRF-TOKEN=')) {
+                        headers['X-XSRF-TOKEN'] = cookie.split('=')[1];
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        return (this.fetch || fetch)(url, {
+            credentials: 'include',
+            method: options === null || options === void 0 ? void 0 : options.method,
+            body: options === null || options === void 0 ? void 0 : options.body,
+            headers: headers,
+        })
+            .then(function (response) {
+            return onSuccess(response);
+        })
+            .catch(function (error) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var r;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, error];
+                    case 1:
+                        r = _a.sent();
+                        throw r;
+                }
+            });
+        }); });
+    };
+    return RestDataProviderHttpProviderUsingFetch;
+}());
+exports.RestDataProviderHttpProviderUsingFetch = RestDataProviderHttpProviderUsingFetch;
+function onSuccess(response) {
+    if (response.status == 204)
+        return;
+    if (response.status >= 200 && response.status < 300)
+        return response.json();
+    else {
+        throw response
+            .json()
+            .then(function (x) {
+            return tslib_1.__assign(tslib_1.__assign({}, x), { message: x.message || response.statusText, url: response.url, status: response.status });
+        })
+            .catch(function () {
+            throw {
+                message: response.statusText,
+                url: response.url,
+                status: response.status,
+            };
+        });
+    }
+}

package/src/data-providers/rest-data-provider.d.ts

@@ -39,17 +39,5 @@ export declare class RestEntityDataProvider implements EntityDataProvider, Proxy
     insert(data: any): Promise<any>;
     insertMany(data: any[]): Promise<any[]>;
 }
-export declare class RestDataProviderHttpProviderUsingFetch implements RestDataProviderHttpProvider {
-    private fetch?;
-    constructor(fetch?: ((input: RequestInfo, init?: RequestInit) => Promise<Response>) | undefined);
-    get(url: string): Promise<any>;
-    put(url: string, data: any): Promise<any>;
-    delete(url: string): Promise<any>;
-    post(url: string, data: any): Promise<any>;
-    myFetch(url: string, options?: {
-        method?: string;
-        body?: string;
-    }): Promise<any>;
-}
 export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;
 export declare const liveQueryAction = "liveQuery-";

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liveQueryAction = exports.RestDataProviderHttpProviderUsingFetch = exports.RestEntityDataProvider = exports.RestDataProvider = void 0;
+exports.liveQueryAction = exports.RestEntityDataProvider = exports.RestDataProvider = void 0;
 exports.buildFullUrl = buildFullUrl;
 exports.findOptionsToJson = findOptionsToJson;
 exports.findOptionsFromJson = findOptionsFromJson;
@@ -411,120 +411,6 @@ var RestEntityDataProvider = /** @class */ (function () {
     return RestEntityDataProvider;
 }());
 exports.RestEntityDataProvider = RestEntityDataProvider;
-var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
-    function RestDataProviderHttpProviderUsingFetch(fetch) {
-        this.fetch = fetch;
-    }
-    RestDataProviderHttpProviderUsingFetch.prototype.get = function (url) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, buildRestDataProvider_js_1.retry)(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            return tslib_1.__generator(this, function (_a) {
-                                return [2 /*return*/, this.myFetch(url).then(function (r) {
-                                        return r;
-                                    })];
-                            });
-                        }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    RestDataProviderHttpProviderUsingFetch.prototype.put = function (url, data) {
-        return this.myFetch(url, {
-            method: 'put',
-            body: JSON.stringify(data),
-        });
-    };
-    RestDataProviderHttpProviderUsingFetch.prototype.delete = function (url) {
-        return this.myFetch(url, { method: 'delete' });
-    };
-    RestDataProviderHttpProviderUsingFetch.prototype.post = function (url, data) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, buildRestDataProvider_js_1.retry)(function () {
-                            return _this.myFetch(url, {
-                                method: 'post',
-                                body: JSON.stringify(data),
-                            });
-                        })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, options) {
-        var e_6, _a;
-        var _this = this;
-        var headers = {};
-        if (options === null || options === void 0 ? void 0 : options.body)
-            headers['Content-type'] = 'application/json';
-        if (typeof window !== 'undefined' &&
-            typeof window.document !== 'undefined' &&
-            typeof (window.document.cookie !== 'undefined'))
-            try {
-                for (var _b = tslib_1.__values(window.document.cookie.split(';')), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var cookie = _c.value;
-                    if (cookie.trim().startsWith('XSRF-TOKEN=')) {
-                        headers['X-XSRF-TOKEN'] = cookie.split('=')[1];
-                    }
-                }
-            }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_6) throw e_6.error; }
-            }
-        return (this.fetch || fetch)(url, {
-            credentials: 'include',
-            method: options === null || options === void 0 ? void 0 : options.method,
-            body: options === null || options === void 0 ? void 0 : options.body,
-            headers: headers,
-        })
-            .then(function (response) {
-            return onSuccess(response);
-        })
-            .catch(function (error) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var r;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, error];
-                    case 1:
-                        r = _a.sent();
-                        throw r;
-                }
-            });
-        }); });
-    };
-    return RestDataProviderHttpProviderUsingFetch;
-}());
-exports.RestDataProviderHttpProviderUsingFetch = RestDataProviderHttpProviderUsingFetch;
-function onSuccess(response) {
-    if (response.status == 204)
-        return;
-    if (response.status >= 200 && response.status < 300)
-        return response.json();
-    else {
-        throw response
-            .json()
-            .then(function (x) {
-            return tslib_1.__assign(tslib_1.__assign({}, x), { message: x.message || response.statusText, url: response.url, status: response.status });
-        })
-            .catch(function () {
-            throw {
-                message: response.statusText,
-                url: response.url,
-                status: response.status,
-            };
-        });
-    }
-}
 function addFilterToUrlAndReturnTrueIfSuccessful(filter, url) {
     for (var key in filter) {
         if (Object.prototype.hasOwnProperty.call(filter, key)) {

package/src/data-providers/retry.d.ts

@@ -0,0 +1 @@
+export declare function retry<T>(what: () => Promise<T>): Promise<T>;

package/src/data-providers/retry.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.retry = retry;
+var tslib_1 = require("tslib");
+var remult3_js_1 = require("../remult3/remult3.js");
+function retry(what) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var i, err_1;
+        var _a, _b, _c, _d;
+        return tslib_1.__generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    i = 0;
+                    _e.label = 1;
+                case 1:
+                    if (!true) return [3 /*break*/, 8];
+                    _e.label = 2;
+                case 2:
+                    _e.trys.push([2, 4, , 7]);
+                    return [4 /*yield*/, what()];
+                case 3: return [2 /*return*/, _e.sent()];
+                case 4:
+                    err_1 = _e.sent();
+                    if (!((((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.startsWith('Error occurred while trying to proxy')) ||
+                        ((_b = err_1.message) === null || _b === void 0 ? void 0 : _b.startsWith('Error occured while trying to proxy')) ||
+                        ((_c = err_1.message) === null || _c === void 0 ? void 0 : _c.includes('http proxy error')) ||
+                        ((_d = err_1.message) === null || _d === void 0 ? void 0 : _d.startsWith('Gateway Timeout')) ||
+                        err_1.status == 500) &&
+                        i++ < remult3_js_1.flags.error500RetryCount)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, new Promise(function (res, req) {
+                            setTimeout(function () {
+                                res({});
+                            }, 500);
+                        })];
+                case 5:
+                    _e.sent();
+                    return [3 /*break*/, 1];
+                case 6: throw err_1;
+                case 7: return [3 /*break*/, 1];
+                case 8: return [2 /*return*/];
+            }
+        });
+    });
+}

package/src/entity.d.ts

@@ -2,6 +2,7 @@ import type { Allowed, AllowedForInstance } from './context.js';
 import type { FieldMetadata } from './column-interfaces.js';
 import type { EntityFilter, EntityIdFields, EntityMetadata, EntityOrderBy, EntityRef, FieldsMetadata, LifecycleEvent, MembersOnly } from './remult3/remult3.js';
 import type { FilterPreciseValues } from './filter/filter-interfaces.js';
+import type { DataProvider } from './data-interfaces.js';
 export interface EntityOptions<entityType = unknown> {
     /**A human readable name for the entity */
     caption?: string;
@@ -181,6 +182,18 @@ export interface EntityOptions<entityType = unknown> {
     id?: keyof MembersOnly<entityType> | (keyof MembersOnly<entityType>)[] | EntityIdFields<entityType> | ((entity: FieldsMetadata<entityType>) => FieldMetadata | FieldMetadata[]);
     entityRefInit?: (ref: EntityRef<entityType>, row: entityType) => void;
     apiRequireId?: Allowed;
+    /**
+     * A function that allows customizing the data provider for the entity.
+     * @param defaultDataProvider The default data provider defined in the `remult` object.
+     * @example
+     * dataProvider: (dp) => {
+     *   if (!dp.isProxy) // usually indicates that we're on the backend
+     *     return getASpacificDataProvider();
+     *   return null
+     * }
+     * @returns A custom data provider for the entity.
+     */
+    dataProvider?: (defaultDataProvider: DataProvider) => DataProvider | undefined | null;
 }
 /**
  * Provides additional information and utilities for preprocessing filters in API and backend operations.

package/src/filter/entityDbName.d.ts

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

package/src/filter/entityDbName.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entityDbName = entityDbName;
+var tslib_1 = require("tslib");
+function entityDbName(metadata_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function (metadata, wrapIdentifier) {
+        var prev;
+        if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!metadata.options.sqlExpression) return [3 /*break*/, 5];
+                    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)];
+            }
+        });
+    });
+}

package/src/filter/fieldDbName.d.ts

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

package/src/filter/fieldDbName.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fieldDbName = fieldDbName;
+var tslib_1 = require("tslib");
+var relationInfoMember_js_1 = require("../remult3/relationInfoMember.js");
+var sqlExpressionInProgressKey = Symbol.for("sqlExpressionInProgressKey");
+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;
+        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) {
+                        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;
+                    return [4 /*yield*/, f.options.sqlExpression(meta)];
+                case 2:
+                    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:
+                    result_1 = f.options.sqlExpression;
+                    _a.label = 6;
+                case 6:
+                    if (!result_1)
+                        return [2 /*return*/, f.dbName];
+                    return [2 /*return*/, result_1];
+                case 7:
+                    rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(f);
+                    field = (rel === null || rel === void 0 ? void 0 : rel.type) === 'toOne' &&
+                        f.options.field;
+                    if (field) {
+                        fInfo = meta.fields.find(field);
+                        if (fInfo)
+                            return [2 /*return*/, fieldDbName(fInfo, meta, wrapIdentifier, forceSqlExpression)];
+                    }
+                    return [2 /*return*/, wrapIdentifier(f.dbName)];
+                case 8: return [7 /*endfinally*/];
+                case 9: return [2 /*return*/];
+            }
+        });
+    });
+}

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

@@ -84,5 +84,3 @@ 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 entityDbName(metadata: EntityMetadata, wrapIdentifier?: (name: string) => string): Promise<string>;
-export declare function fieldDbName(f: FieldMetadata, meta: EntityMetadata, wrapIdentifier?: (name: string) => string, forceSqlExpression?: boolean): Promise<string>;