remult 0.14.6 → 0.14.7

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

@@ -1,92 +1,179 @@
-export class FilterConsumerBridgeToSqlRequest {
-    constructor(r, nameProvider) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dbNameProviderImpl = exports.getDbNameProvider = exports.CustomSqlFilterBuilder = exports.FilterConsumerBridgeToSqlRequest = void 0;
+var tslib_1 = require("tslib");
+var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
+    function FilterConsumerBridgeToSqlRequest(r, nameProvider) {
         this.r = r;
         this.nameProvider = nameProvider;
         this.where = "";
         this._addWhere = true;
         this.promises = [];
     }
-    async resolveWhere() {
-        while (this.promises.length > 0) {
-            let p = this.promises;
-            this.promises = [];
-            for (const pr of p) {
-                await pr;
-            }
-        }
-        return this.where;
-    }
-    custom(key, customItem) {
+    FilterConsumerBridgeToSqlRequest.prototype.resolveWhere = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var p, p_1, p_1_1, pr, e_1_1;
+            var e_1, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!(this.promises.length > 0)) return [3 /*break*/, 9];
+                        p = this.promises;
+                        this.promises = [];
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 6, 7, 8]);
+                        p_1 = (e_1 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
+                        _b.label = 2;
+                    case 2:
+                        if (!!p_1_1.done) return [3 /*break*/, 5];
+                        pr = p_1_1.value;
+                        return [4 /*yield*/, pr];
+                    case 3:
+                        _b.sent();
+                        _b.label = 4;
+                    case 4:
+                        p_1_1 = p_1.next();
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_1_1 = _b.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 8];
+                    case 7:
+                        try {
+                            if (p_1_1 && !p_1_1.done && (_a = p_1.return)) _a.call(p_1);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 8: return [3 /*break*/, 0];
+                    case 9: return [2 /*return*/, this.where];
+                }
+            });
+        });
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.custom = function (key, customItem) {
         throw new Error("Custom filter should be translated before it gets here");
-    }
-    or(orElements) {
-        let statement = '';
-        this.promises.push((async () => {
-            for (const element of orElements) {
-                let f = new FilterConsumerBridgeToSqlRequest(this.r, this.nameProvider);
-                f._addWhere = false;
-                element.__applyToConsumer(f);
-                let where = await f.resolveWhere();
-                if (!where)
-                    return; //since if any member of or is empty, then the entire or is irrelevant
-                if (where.length > 0) {
-                    if (statement.length > 0) {
-                        statement += " or ";
-                    }
-                    if (orElements.length > 1) {
-                        statement += "(" + where + ")";
-                    }
-                    else
-                        statement += where;
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.or = function (orElements) {
+        var _this = this;
+        var statement = '';
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var orElements_1, orElements_1_1, element, f, where, e_2_1;
+            var e_2, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 5, 6, 7]);
+                        orElements_1 = tslib_1.__values(orElements), orElements_1_1 = orElements_1.next();
+                        _b.label = 1;
+                    case 1:
+                        if (!!orElements_1_1.done) return [3 /*break*/, 4];
+                        element = orElements_1_1.value;
+                        f = new FilterConsumerBridgeToSqlRequest(this.r, this.nameProvider);
+                        f._addWhere = false;
+                        element.__applyToConsumer(f);
+                        return [4 /*yield*/, f.resolveWhere()];
+                    case 2:
+                        where = _b.sent();
+                        if (!where)
+                            return [2 /*return*/]; //since if any member of or is empty, then the entire or is irrelevant
+                        if (where.length > 0) {
+                            if (statement.length > 0) {
+                                statement += " or ";
+                            }
+                            if (orElements.length > 1) {
+                                statement += "(" + where + ")";
+                            }
+                            else
+                                statement += where;
+                        }
+                        _b.label = 3;
+                    case 3:
+                        orElements_1_1 = orElements_1.next();
+                        return [3 /*break*/, 1];
+                    case 4: return [3 /*break*/, 7];
+                    case 5:
+                        e_2_1 = _b.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 7];
+                    case 6:
+                        try {
+                            if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 7:
+                        this.addToWhere("(" + statement + ")");
+                        return [2 /*return*/];
                 }
-            }
-            this.addToWhere("(" + statement + ")");
-        })());
-    }
-    isNull(col) {
-        this.promises.push((async () => this.addToWhere(this.nameProvider.nameOf(col) + ' is null'))());
-    }
-    isNotNull(col) {
-        this.promises.push((async () => this.addToWhere(this.nameProvider.nameOf(col) + ' is not null'))());
-    }
-    isIn(col, val) {
-        this.promises.push((async () => {
-            if (val && val.length > 0)
-                this.addToWhere(this.nameProvider.nameOf(col) + " in (" + val.map(x => this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x))).join(",") + ")");
-            else
-                this.addToWhere('1 = 0 /*isIn with no values*/');
-        })());
-    }
-    isEqualTo(col, val) {
+            });
+        }); })());
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isNull = function (col) {
+        var _this = this;
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, this.addToWhere(this.nameProvider.nameOf(col) + ' is null')];
+        }); }); })());
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isNotNull = function (col) {
+        var _this = this;
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, this.addToWhere(this.nameProvider.nameOf(col) + ' is not null')];
+        }); }); })());
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isIn = function (col, val) {
+        var _this = this;
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                if (val && val.length > 0)
+                    this.addToWhere(this.nameProvider.nameOf(col) + " in (" + val.map(function (x) { return _this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(x)); }).join(",") + ")");
+                else
+                    this.addToWhere('1 = 0 /*isIn with no values*/');
+                return [2 /*return*/];
+            });
+        }); })());
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isEqualTo = function (col, val) {
         this.add(col, val, "=");
-    }
-    isDifferentFrom(col, val) {
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isDifferentFrom = function (col, val) {
         this.add(col, val, "<>");
-    }
-    isGreaterOrEqualTo(col, val) {
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isGreaterOrEqualTo = function (col, val) {
         this.add(col, val, ">=");
-    }
-    isGreaterThan(col, val) {
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isGreaterThan = function (col, val) {
         this.add(col, val, ">");
-    }
-    isLessOrEqualTo(col, val) {
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isLessOrEqualTo = function (col, val) {
         this.add(col, val, "<=");
-    }
-    isLessThan(col, val) {
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.isLessThan = function (col, val) {
         this.add(col, val, "<");
-    }
-    containsCaseInsensitive(col, val) {
-        this.promises.push((async () => {
-            this.addToWhere('lower (' + this.nameProvider.nameOf(col) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')");
-        })());
-    }
-    add(col, val, operator) {
-        this.promises.push((async () => {
-            let x = this.nameProvider.nameOf(col) + ' ' + operator + ' ' + this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
-            this.addToWhere(x);
-        })());
-    }
-    addToWhere(x) {
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.containsCaseInsensitive = function (col, val) {
+        var _this = this;
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                this.addToWhere('lower (' + this.nameProvider.nameOf(col) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')");
+                return [2 /*return*/];
+            });
+        }); })());
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.add = function (col, val, operator) {
+        var _this = this;
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var x;
+            return tslib_1.__generator(this, function (_a) {
+                x = this.nameProvider.nameOf(col) + ' ' + operator + ' ' + this.r.addParameterAndReturnSqlToken(col.valueConverter.toDb(val));
+                this.addToWhere(x);
+                return [2 /*return*/];
+            });
+        }); })());
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.addToWhere = function (x) {
         if (this.where.length == 0) {
             if (this._addWhere)
                 this.where += ' where ';
@@ -94,46 +181,101 @@ export class FilterConsumerBridgeToSqlRequest {
         else
             this.where += ' and ';
         this.where += x;
-    }
-    databaseCustom(databaseCustom) {
-        this.promises.push((async () => {
-            if (databaseCustom?.buildSql) {
-                let item = new CustomSqlFilterBuilder(this.r);
-                await databaseCustom.buildSql(item);
-                if (item.sql) {
-                    this.addToWhere("(" + item.sql + ")");
+    };
+    FilterConsumerBridgeToSqlRequest.prototype.databaseCustom = function (databaseCustom) {
+        var _this = this;
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var item;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(databaseCustom === null || databaseCustom === void 0 ? void 0 : databaseCustom.buildSql)) return [3 /*break*/, 2];
+                        item = new CustomSqlFilterBuilder(this.r);
+                        return [4 /*yield*/, databaseCustom.buildSql(item)];
+                    case 1:
+                        _a.sent();
+                        if (item.sql) {
+                            this.addToWhere("(" + item.sql + ")");
+                        }
+                        _a.label = 2;
+                    case 2: return [2 /*return*/];
                 }
-            }
-        })());
-    }
-}
-export class CustomSqlFilterBuilder {
-    constructor(r) {
+            });
+        }); })());
+    };
+    return FilterConsumerBridgeToSqlRequest;
+}());
+exports.FilterConsumerBridgeToSqlRequest = FilterConsumerBridgeToSqlRequest;
+var CustomSqlFilterBuilder = /** @class */ (function () {
+    function CustomSqlFilterBuilder(r) {
         this.r = r;
         this.sql = '';
     }
-    addParameterAndReturnSqlToken(val, field) {
+    CustomSqlFilterBuilder.prototype.addParameterAndReturnSqlToken = function (val, field) {
         if (field)
             val = field.valueConverter.toDb(val);
         return this.r.addParameterAndReturnSqlToken(val);
-    }
-}
-export async function getDbNameProvider(meta) {
-    var result = new dbNameProviderImpl();
-    for (const f of meta.fields) {
-        result.map.set(f.key, await f.getDbName());
-    }
-    result.entityName = await meta.getDbName();
-    return result;
+    };
+    return CustomSqlFilterBuilder;
+}());
+exports.CustomSqlFilterBuilder = CustomSqlFilterBuilder;
+function getDbNameProvider(meta) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var result, _a, _b, f, _c, _d, _e, e_3_1, _f;
+        var e_3, _g;
+        return tslib_1.__generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    result = new dbNameProviderImpl();
+                    _h.label = 1;
+                case 1:
+                    _h.trys.push([1, 6, 7, 8]);
+                    _a = tslib_1.__values(meta.fields), _b = _a.next();
+                    _h.label = 2;
+                case 2:
+                    if (!!_b.done) return [3 /*break*/, 5];
+                    f = _b.value;
+                    _d = (_c = result.map).set;
+                    _e = [f.key];
+                    return [4 /*yield*/, f.getDbName()];
+                case 3:
+                    _d.apply(_c, _e.concat([_h.sent()]));
+                    _h.label = 4;
+                case 4:
+                    _b = _a.next();
+                    return [3 /*break*/, 2];
+                case 5: return [3 /*break*/, 8];
+                case 6:
+                    e_3_1 = _h.sent();
+                    e_3 = { error: e_3_1 };
+                    return [3 /*break*/, 8];
+                case 7:
+                    try {
+                        if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                    return [7 /*endfinally*/];
+                case 8:
+                    _f = result;
+                    return [4 /*yield*/, meta.getDbName()];
+                case 9:
+                    _f.entityName = _h.sent();
+                    return [2 /*return*/, result];
+            }
+        });
+    });
 }
-export class dbNameProviderImpl {
-    constructor() {
+exports.getDbNameProvider = getDbNameProvider;
+var dbNameProviderImpl = /** @class */ (function () {
+    function dbNameProviderImpl() {
         this.map = new Map();
     }
-    nameOf(field) {
+    dbNameProviderImpl.prototype.nameOf = function (field) {
         return this.map.get(field.key);
-    }
-    isDbReadonly(x) {
+    };
+    dbNameProviderImpl.prototype.isDbReadonly = function (x) {
         return (x.dbReadOnly || x.isServerExpression || this.nameOf(x) != x.options.dbName);
-    }
-}
+    };
+    return dbNameProviderImpl;
+}());
+exports.dbNameProviderImpl = dbNameProviderImpl;

package/src/filter/filter-consumer-bridge-to-url-builder.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });