remult 3.3.18 → 3.3.19-next.1

package/remult-knex/index.js

@@ -420,24 +420,28 @@ var KnexEntityDataProvider = /** @class */ (function () {
             });
         });
     };
-    KnexEntityDataProvider.prototype.delete = function (id) {
+    KnexEntityDataProvider.prototype.delete = function (ids) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, f, where;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.init()];
+            var _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (ids.length === 0)
+                            return [2 /*return*/];
+                        return [4 /*yield*/, this.init()];
                     case 1:
-                        e = _a.sent();
+                        e = _b.sent();
                         f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
-                        filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
+                        filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, (_a = this.entity.idMetadata).getIdFilter.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(ids), false))).__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
-                        where = _a.sent();
+                        where = _b.sent();
                         return [4 /*yield*/, this.getEntityFrom(e)
                                 .delete()
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 3:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -445,8 +449,227 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.insert = function (data, options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, insertObject, _a, _b, x, v, key, e_5_1, insert, newId_1, result, result;
-            var e_5, _c;
+            var result_1, data_1, data_1_1, row, _a, _b, e_5_1, e, batches, result, batches_1, batches_1_1, batch, _c, _d, _e, _f, e_6_1;
+            var e_5, _g, e_6, _h;
+            var _this = this;
+            return tslib_1.__generator(this, function (_j) {
+                switch (_j.label) {
+                    case 0:
+                        if (data.length === 0)
+                            return [2 /*return*/, []];
+                        if (!(isMysqlKnex(this.knex) &&
+                            (0, RepositoryImplementation_js_1.isAutoIncrement)(this.entity.idMetadata.field) &&
+                            (options === null || options === void 0 ? void 0 : options.select) !== 'none')) return [3 /*break*/, 9];
+                        result_1 = [];
+                        _j.label = 1;
+                    case 1:
+                        _j.trys.push([1, 6, 7, 8]);
+                        data_1 = tslib_1.__values(data), data_1_1 = data_1.next();
+                        _j.label = 2;
+                    case 2:
+                        if (!!data_1_1.done) return [3 /*break*/, 5];
+                        row = data_1_1.value;
+                        _b = (_a = result_1).push;
+                        return [4 /*yield*/, this.insertOne(row, options)];
+                    case 3:
+                        _b.apply(_a, [_j.sent()]);
+                        _j.label = 4;
+                    case 4:
+                        data_1_1 = data_1.next();
+                        return [3 /*break*/, 2];
+                    case 5: return [3 /*break*/, 8];
+                    case 6:
+                        e_5_1 = _j.sent();
+                        e_5 = { error: e_5_1 };
+                        return [3 /*break*/, 8];
+                    case 7:
+                        try {
+                            if (data_1_1 && !data_1_1.done && (_g = data_1.return)) _g.call(data_1);
+                        }
+                        finally { if (e_5) throw e_5.error; }
+                        return [7 /*endfinally*/];
+                    case 8: return [2 /*return*/, result_1];
+                    case 9: return [4 /*yield*/, this.init()];
+                    case 10:
+                        e = _j.sent();
+                        batches = splitByMaxParameters(data, function (row) { return countKnexInsertBindParameters(_this.entity, e, row); }, knexMaxParametersInOneSqlStatement(this.knex));
+                        result = [];
+                        _j.label = 11;
+                    case 11:
+                        _j.trys.push([11, 16, 17, 18]);
+                        batches_1 = tslib_1.__values(batches), batches_1_1 = batches_1.next();
+                        _j.label = 12;
+                    case 12:
+                        if (!!batches_1_1.done) return [3 /*break*/, 15];
+                        batch = batches_1_1.value;
+                        _d = (_c = result.push).apply;
+                        _e = [result];
+                        _f = [[]];
+                        return [4 /*yield*/, this.insertBatch(batch, e, options)];
+                    case 13:
+                        _d.apply(_c, _e.concat([tslib_1.__spreadArray.apply(void 0, _f.concat([tslib_1.__read.apply(void 0, [(_j.sent())]), false]))]));
+                        _j.label = 14;
+                    case 14:
+                        batches_1_1 = batches_1.next();
+                        return [3 /*break*/, 12];
+                    case 15: return [3 /*break*/, 18];
+                    case 16:
+                        e_6_1 = _j.sent();
+                        e_6 = { error: e_6_1 };
+                        return [3 /*break*/, 18];
+                    case 17:
+                        try {
+                            if (batches_1_1 && !batches_1_1.done && (_h = batches_1.return)) _h.call(batches_1);
+                        }
+                        finally { if (e_6) throw e_6.error; }
+                        return [7 /*endfinally*/];
+                    case 18: return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    KnexEntityDataProvider.prototype.insertBatch = function (batch, e, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var cols, _loop_1, _a, _b, x, insertObjects, batch_1, batch_1_1, row, insertObject, cols_1, cols_1_1, x, v, key, e_7_1, e_8_1, insert, wantRows, result, ids;
+            var e_9, _c, e_8, _d, e_7, _e;
+            var _this = this;
+            return tslib_1.__generator(this, function (_f) {
+                switch (_f.label) {
+                    case 0:
+                        cols = [];
+                        _loop_1 = function (x) {
+                            if ((0, filter_consumer_bridge_to_sql_request_js_2.isDbReadonly)(x, e))
+                                return "continue";
+                            if (batch.some(function (row) {
+                                return translateValueAndHandleArrayAndHandleArray(x, row[x.key]) !=
+                                    undefined;
+                            }))
+                                cols.push(x);
+                        };
+                        try {
+                            for (_a = tslib_1.__values(this.entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                x = _b.value;
+                                _loop_1(x);
+                            }
+                        }
+                        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            }
+                            finally { if (e_9) throw e_9.error; }
+                        }
+                        insertObjects = [];
+                        _f.label = 1;
+                    case 1:
+                        _f.trys.push([1, 13, 14, 15]);
+                        batch_1 = tslib_1.__values(batch), batch_1_1 = batch_1.next();
+                        _f.label = 2;
+                    case 2:
+                        if (!!batch_1_1.done) return [3 /*break*/, 12];
+                        row = batch_1_1.value;
+                        insertObject = {};
+                        _f.label = 3;
+                    case 3:
+                        _f.trys.push([3, 8, 9, 10]);
+                        cols_1 = (e_7 = void 0, tslib_1.__values(cols)), cols_1_1 = cols_1.next();
+                        _f.label = 4;
+                    case 4:
+                        if (!!cols_1_1.done) return [3 /*break*/, 7];
+                        x = cols_1_1.value;
+                        v = translateValueAndHandleArrayAndHandleArray(x, row[x.key]);
+                        return [4 /*yield*/, e.$dbNameOf(x)];
+                    case 5:
+                        key = _f.sent();
+                        if (v != undefined)
+                            insertObject[key] = v;
+                        else if (x.allowNull)
+                            insertObject[key] = null;
+                        else
+                            insertObject[key] = this.knex.raw('DEFAULT');
+                        _f.label = 6;
+                    case 6:
+                        cols_1_1 = cols_1.next();
+                        return [3 /*break*/, 4];
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_7_1 = _f.sent();
+                        e_7 = { error: e_7_1 };
+                        return [3 /*break*/, 10];
+                    case 9:
+                        try {
+                            if (cols_1_1 && !cols_1_1.done && (_e = cols_1.return)) _e.call(cols_1);
+                        }
+                        finally { if (e_7) throw e_7.error; }
+                        return [7 /*endfinally*/];
+                    case 10:
+                        insertObjects.push(insertObject);
+                        _f.label = 11;
+                    case 11:
+                        batch_1_1 = batch_1.next();
+                        return [3 /*break*/, 2];
+                    case 12: return [3 /*break*/, 15];
+                    case 13:
+                        e_8_1 = _f.sent();
+                        e_8 = { error: e_8_1 };
+                        return [3 /*break*/, 15];
+                    case 14:
+                        try {
+                            if (batch_1_1 && !batch_1_1.done && (_d = batch_1.return)) _d.call(batch_1);
+                        }
+                        finally { if (e_8) throw e_8.error; }
+                        return [7 /*endfinally*/];
+                    case 15:
+                        insert = this.getEntityFrom(e).insert(insertObjects);
+                        wantRows = (options === null || options === void 0 ? void 0 : options.select) !== 'none';
+                        if (!((0, RepositoryImplementation_js_1.isAutoIncrement)(this.entity.idMetadata.field) && wantRows)) return [3 /*break*/, 17];
+                        return [4 /*yield*/, insert.returning(this.entity.idMetadata.field.dbName)];
+                    case 16:
+                        result = _f.sent();
+                        ids = result.map(function (r) {
+                            return r && typeof r === 'object'
+                                ? r[_this.entity.idMetadata.field.dbName]
+                                : r;
+                        });
+                        return [2 /*return*/, this.loadRowsByIds(ids)];
+                    case 17: return [4 /*yield*/, insert];
+                    case 18:
+                        _f.sent();
+                        if (!wantRows)
+                            return [2 /*return*/, batch.map(function () { return undefined; })];
+                        return [2 /*return*/, this.loadRowsByIds(batch.map(function (row) { return _this.entity.idMetadata.getId(row); }))];
+                }
+            });
+        });
+    };
+    KnexEntityDataProvider.prototype.loadRowsByIds = function (ids) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var found, byId;
+            var _a;
+            var _this = this;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.find({
+                            where: filter_interfaces_js_1.Filter.fromEntityFilter(this.entity, (_a = this.entity.idMetadata).getIdFilter.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(ids), false))),
+                        })];
+                    case 1:
+                        found = _b.sent();
+                        byId = new Map(found.map(function (row) { return [_this.entity.idMetadata.getId(row) + '', row]; }));
+                        return [2 /*return*/, ids.map(function (id) {
+                                var row = byId.get(id + '');
+                                if (!row)
+                                    throw new Error("Failed to insert row - result contained ".concat(found.length, " rows"));
+                                return row;
+                            })];
+                }
+            });
+        });
+    };
+    //@internal
+    KnexEntityDataProvider.prototype.insertOne = function (data, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var e, insertObject, _a, _b, x, v, key, e_10_1, insert, newId_1, result, result;
+            var e_10, _c;
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -477,14 +700,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_5_1 = _d.sent();
-                        e_5 = { error: e_5_1 };
+                        e_10_1 = _d.sent();
+                        e_10 = { error: e_10_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         insert = this.getEntityFrom(e).insert(insertObject);
@@ -534,8 +757,8 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     }
     FilterConsumerBridgeToKnexRequest.prototype.resolveWhere = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var p, p_1, p_1_1, pr, e_6_1;
-            var e_6, _a;
+            var p, p_1, p_1_1, pr, e_11_1;
+            var e_11, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -545,7 +768,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 6, 7, 8]);
-                        p_1 = (e_6 = void 0, tslib_1.__values(p)), p_1_1 = p_1.next();
+                        p_1 = (e_11 = 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];
@@ -559,14 +782,14 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_6_1 = _b.sent();
-                        e_6 = { error: e_6_1 };
+                        e_11_1 = _b.sent();
+                        e_11 = { error: e_11_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_6) throw e_6.error; }
+                        finally { if (e_11) throw e_11.error; }
                         return [7 /*endfinally*/];
                     case 8: return [3 /*break*/, 0];
                     case 9: return [2 /*return*/, this.result];
@@ -580,13 +803,13 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     FilterConsumerBridgeToKnexRequest.prototype.or = function (orElements) {
         var _this = this;
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var result, _loop_1, this_1, orElements_1, orElements_1_1, element, state_1, e_7_1;
-            var e_7, _a;
+            var result, _loop_2, this_1, orElements_1, orElements_1_1, element, state_1, e_12_1;
+            var e_12, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         result = [];
-                        _loop_1 = function (element) {
+                        _loop_2 = function (element) {
                             var f, where;
                             return tslib_1.__generator(this, function (_c) {
                                 switch (_c.label) {
@@ -619,7 +842,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                     case 2:
                         if (!!orElements_1_1.done) return [3 /*break*/, 5];
                         element = orElements_1_1.value;
-                        return [5 /*yield**/, _loop_1(element)];
+                        return [5 /*yield**/, _loop_2(element)];
                     case 3:
                         state_1 = _b.sent();
                         if (typeof state_1 === "object")
@@ -630,14 +853,14 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_7_1 = _b.sent();
-                        e_7 = { error: e_7_1 };
+                        e_12_1 = _b.sent();
+                        e_12 = { error: e_12_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_12) throw e_12.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (result.length > 0) {
@@ -807,8 +1030,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     }
     KnexSchemaBuilder.prototype.ensureSchema = function (entities) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var entities_1, entities_1_1, entity, e, err_2, e_8_1;
-            var e_8, _a;
+            var entities_1, entities_1_1, entity, e, err_2, e_13_1;
+            var e_13, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -842,14 +1065,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_8_1 = _b.sent();
-                        e_8 = { error: e_8_1 };
+                        e_13_1 = _b.sent();
+                        e_13 = { error: e_13_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
                             if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_13) throw e_13.error; }
                         return [7 /*endfinally*/];
                     case 12: return [2 /*return*/];
                 }
@@ -877,7 +1100,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
         });
     };
     KnexSchemaBuilder.prototype.createTableKnexCommand = function (entity, e) {
-        var e_9, _a;
+        var e_14, _a;
         var _this = this;
         var cols = new Map();
         try {
@@ -889,15 +1112,15 @@ var KnexSchemaBuilder = /** @class */ (function () {
                 });
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         return this.knex.schema.createTable(e.$entityName, function (b) {
-            var e_10, _a;
+            var e_15, _a;
             try {
                 for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var x = _c.value;
@@ -910,12 +1133,12 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_10_1) { e_10 = { error: e_10_1 }; }
+            catch (e_15_1) { e_15 = { error: e_15_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_10) throw e_10.error; }
+                finally { if (e_15) throw e_15.error; }
             }
             b.primary(entity.idMetadata.fields.map(function (f) { return e.$dbNameOf(f); }));
         });
@@ -952,8 +1175,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
     };
     KnexSchemaBuilder.prototype.verifyAllColumns = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, _loop_2, this_2, _a, _b, col, e_11_1, err_3;
-            var e_11, _c;
+            var e, _loop_3, this_2, _a, _b, col, e_16_1, err_3;
+            var e_16, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(entity, function (x) { return x; })];
@@ -962,7 +1185,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         _d.label = 2;
                     case 2:
                         _d.trys.push([2, 11, , 12]);
-                        _loop_2 = function (col) {
+                        _loop_3 = function (col) {
                             return tslib_1.__generator(this, function (_e) {
                                 switch (_e.label) {
                                     case 0:
@@ -984,7 +1207,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     case 4:
                         if (!!_b.done) return [3 /*break*/, 7];
                         col = _b.value;
-                        return [5 /*yield**/, _loop_2(col)];
+                        return [5 /*yield**/, _loop_3(col)];
                     case 5:
                         _d.sent();
                         _d.label = 6;
@@ -993,14 +1216,14 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_11_1 = _d.sent();
-                        e_11 = { error: e_11_1 };
+                        e_16_1 = _d.sent();
+                        e_16 = { error: e_16_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_11) throw e_11.error; }
+                        finally { if (e_16) throw e_16.error; }
                         return [7 /*endfinally*/];
                     case 10: return [3 /*break*/, 12];
                     case 11:
@@ -1113,6 +1336,68 @@ function createKnexDataProvider(config) {
         });
     });
 }
+var defaultMaxParametersInOneSqlStatement = 2000;
+function isMysqlKnex(knex) {
+    var client = knex.client.config.client;
+    return client === 'mysql2' || client === 'mysql';
+}
+function knexMaxParametersInOneSqlStatement(knex) {
+    var _a;
+    var client = String((_a = knex.client.config.client) !== null && _a !== void 0 ? _a : '');
+    if (client.includes('sqlite'))
+        return 999;
+    return defaultMaxParametersInOneSqlStatement;
+}
+function splitByMaxParameters(items, parametersInItem, maxParameters) {
+    var e_17, _a;
+    var batches = [];
+    var batch = [];
+    var params = 0;
+    try {
+        for (var items_1 = tslib_1.__values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
+            var item = items_1_1.value;
+            var n = parametersInItem(item);
+            if (batch.length > 0 && params + n > maxParameters) {
+                batches.push(batch);
+                batch = [];
+                params = 0;
+            }
+            batch.push(item);
+            params += n;
+        }
+    }
+    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+    finally {
+        try {
+            if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
+        }
+        finally { if (e_17) throw e_17.error; }
+    }
+    if (batch.length)
+        batches.push(batch);
+    return batches;
+}
+function countKnexInsertBindParameters(entity, e, row) {
+    var e_18, _a;
+    var n = 0;
+    try {
+        for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var x = _c.value;
+            if ((0, filter_consumer_bridge_to_sql_request_js_2.isDbReadonly)(x, e))
+                continue;
+            if (translateValueAndHandleArrayAndHandleArray(x, row[x.key]) != undefined)
+                n++;
+        }
+    }
+    catch (e_18_1) { e_18 = { error: e_18_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_18) throw e_18.error; }
+    }
+    return n;
+}
 function translateValueAndHandleArrayAndHandleArray(field, val) {
     var result = field.valueConverter.toDb(val);
     if (Array.isArray(result))