remult 0.18.1-exp.2 → 0.18.1-exp.21

package/remult-knex/index.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createKnexDataProvider = exports.buildColumn = exports.KnexSchemaBuilder = exports.FilterConsumerBridgeToKnexRequest = exports.KnexDataProvider = void 0;
+exports.createKnexDataProvider = exports.buildColumn = exports.KnexSchemaBuilder = exports.KnexDataProvider = void 0;
 var tslib_1 = require("tslib");
-var knex_1 = require("knex");
 var filter_interfaces_1 = require("../src/filter/filter-interfaces");
 var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
 var context_1 = require("../src/context");
@@ -10,10 +9,17 @@ var remult3_1 = require("../src/remult3");
 var valueConverters_1 = require("../src/valueConverters");
 var column_1 = require("../src/column");
 var sort_1 = require("../src/sort");
+var remult_proxy_1 = require("../src/remult-proxy");
 var KnexDataProvider = /** @class */ (function () {
     function KnexDataProvider(knex) {
         this.knex = knex;
     }
+    KnexDataProvider.getDb = function (remult) {
+        var r = (remult || remult_proxy_1.remult).dataProvider;
+        if (!r.knex)
+            throw "the data provider is not an KnexDataProvider";
+        return r.knex;
+    };
     KnexDataProvider.prototype.getEntityDataProvider = function (entity) {
         return new KnexEntityDataProvider(entity, this.knex);
     };
@@ -46,7 +52,7 @@ var KnexDataProvider = /** @class */ (function () {
             });
         });
     };
-    KnexDataProvider.customFilter = function (build) {
+    KnexDataProvider.rawFilter = function (build) {
         var _a;
         return _a = {},
             _a[filter_interfaces_1.customDatabaseFilterToken] = {
@@ -54,6 +60,30 @@ var KnexDataProvider = /** @class */ (function () {
             },
             _a;
     };
+    KnexDataProvider.filterToRaw = function (entity, condition) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var repo, b, _a, r;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        repo = remult3_1.getRepository(entity);
+                        _a = FilterConsumerBridgeToKnexRequest.bind;
+                        return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(repo.metadata)];
+                    case 1:
+                        b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent()]))();
+                        b._addWhere = false;
+                        return [4 /*yield*/, (repo.translateWhereToFilter(condition))];
+                    case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
+                    case 3:
+                        _b.sent();
+                        return [4 /*yield*/, b.resolveWhere()];
+                    case 4:
+                        r = _b.sent();
+                        return [2 /*return*/, function (knex) { return r.forEach(function (y) { return y(knex); }); }];
+                }
+            });
+        });
+    };
     return KnexDataProvider;
 }());
 exports.KnexDataProvider = KnexDataProvider;
@@ -75,7 +105,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
                         r = _a.sent();
-                        return [4 /*yield*/, this.knex(e.entityName)
+                        return [4 /*yield*/, this.knex(e.$entityName)
                                 .count().where(function (b) { return r.forEach(function (w) { return w(b); }); })];
                     case 3:
                         result = (_a.sent());
@@ -108,7 +138,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 if (x.isServerExpression) {
                                 }
                                 else {
-                                    cols.push(e.nameOf(x));
+                                    cols.push(e.$dbNameOf(x));
                                     colKeys.push(x);
                                 }
                             }
@@ -120,7 +150,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                             }
                             finally { if (e_1) throw e_1.error; }
                         }
-                        query = this.knex(e.entityName).select(cols);
+                        query = this.knex(e.$entityName).select(cols);
                         if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 3];
                         br = new FilterConsumerBridgeToKnexRequest(e);
                         options.where.__applyToConsumer(br);
@@ -135,7 +165,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         }
                         if (options.orderBy) {
                             query = query.orderBy(options.orderBy.Segments.map(function (s) { return ({
-                                column: e.nameOf(s.field),
+                                column: e.$dbNameOf(s.field),
                                 order: s.isDescending ? "desc" : "asc"
                             }); }));
                         }
@@ -169,7 +199,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(this.entity)];
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(this.entity)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -198,13 +228,13 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 7];
                         x = _b.value;
-                        if (!e.isDbReadonly(x)) return [3 /*break*/, 4];
+                        if (!filter_consumer_bridge_to_sql_request_1.isDbReadonly(x, e)) return [3 /*break*/, 4];
                         return [3 /*break*/, 6];
                     case 4:
                         if (!(data[x.key] !== undefined)) return [3 /*break*/, 6];
                         v = x.valueConverter.toDb(data[x.key]);
                         if (!(v !== undefined)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, e.nameOf(x)];
+                        return [4 /*yield*/, e.$dbNameOf(x)];
                     case 5:
                         key = _d.sent();
                         updateObject[key] = v;
@@ -226,7 +256,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
                         where = _d.sent();
-                        return [4 /*yield*/, this.knex(e.entityName).update(updateObject).where(function (b) { return where.forEach(function (w) { return w(b); }); })];
+                        return [4 /*yield*/, this.knex(e.$entityName).update(updateObject).where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 12:
                         _d.sent();
                         return [2 /*return*/, this.find({ where: filter_interfaces_1.Filter.fromEntityFilter(this.entity, resultFilter) }).then(function (y) { return y[0]; })];
@@ -247,7 +277,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _a.sent();
-                        return [4 /*yield*/, this.knex(e.entityName).delete().where(function (b) { return where.forEach(function (w) { return w(b); }); })];
+                        return [4 /*yield*/, this.knex(e.$entityName).delete().where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 3:
                         _a.sent();
                         return [2 /*return*/];
@@ -257,7 +287,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
     };
     KnexEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e, resultFilter, insertObject, _a, _b, x, v, key, e_3_1, insert, result, newId_1;
+            var e, resultFilter, insertObject, _a, _b, x, v, key, e_3_1, insert, newId_1, result, result;
             var e_3, _c;
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
@@ -278,12 +308,12 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 7];
                         x = _b.value;
-                        if (!e.isDbReadonly(x)) return [3 /*break*/, 4];
+                        if (!filter_consumer_bridge_to_sql_request_1.isDbReadonly(x, e)) return [3 /*break*/, 4];
                         return [3 /*break*/, 6];
                     case 4:
                         v = x.valueConverter.toDb(data[x.key]);
                         if (!(v != undefined)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, e.nameOf(x)];
+                        return [4 /*yield*/, e.$dbNameOf(x)];
                     case 5:
                         key = _d.sent();
                         insertObject[key] = v;
@@ -303,19 +333,27 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 10:
-                        insert = this.knex(e.entityName).insert(insertObject);
-                        if (!remult3_1.isAutoIncrement(this.entity.idMetadata.field)) return [3 /*break*/, 12];
-                        return [4 /*yield*/, insert.returning(this.entity.idMetadata.field.key)];
+                        insert = this.knex(e.$entityName).insert(insertObject);
+                        if (!remult3_1.isAutoIncrement(this.entity.idMetadata.field)) return [3 /*break*/, 15];
+                        if (!(this.knex.client.config.client === 'mysql2')) return [3 /*break*/, 12];
+                        return [4 /*yield*/, insert];
                     case 11:
                         result = _d.sent();
-                        newId_1 = result[0].id;
-                        resultFilter = new filter_interfaces_1.Filter(function (x) { return x.isEqualTo(_this.entity.idMetadata.field, newId_1); });
+                        newId_1 = result[0];
                         return [3 /*break*/, 14];
-                    case 12: return [4 /*yield*/, insert];
+                    case 12: return [4 /*yield*/, insert.returning(this.entity.idMetadata.field.key)];
                     case 13:
-                        _d.sent();
+                        result = _d.sent();
+                        newId_1 = result[0].id;
                         _d.label = 14;
-                    case 14: return [2 /*return*/, this.find({ where: resultFilter }).then(function (y) {
+                    case 14:
+                        resultFilter = new filter_interfaces_1.Filter(function (x) { return x.isEqualTo(_this.entity.idMetadata.field, newId_1); });
+                        return [3 /*break*/, 17];
+                    case 15: return [4 /*yield*/, insert];
+                    case 16:
+                        _d.sent();
+                        _d.label = 17;
+                    case 17: return [2 /*return*/, this.find({ where: resultFilter }).then(function (y) {
                             return y[0];
                         })];
                 }
@@ -449,16 +487,16 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     };
     FilterConsumerBridgeToKnexRequest.prototype.isNull = function (col) {
         var _this = this;
-        this.result.push(function (b) { return b.whereNull(_this.nameProvider.nameOf(col)); });
+        this.result.push(function (b) { return b.whereNull(_this.nameProvider.$dbNameOf(col)); });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isNotNull = function (col) {
         var _this = this;
-        this.result.push(function (b) { return b.whereNotNull(_this.nameProvider.nameOf(col)); });
+        this.result.push(function (b) { return b.whereNotNull(_this.nameProvider.$dbNameOf(col)); });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isIn = function (col, val) {
         var _this = this;
         this.result.push(function (knex) {
-            return knex.whereIn(_this.nameProvider.nameOf(col), val.map(function (x) { return col.valueConverter.toDb(x); }));
+            return knex.whereIn(_this.nameProvider.$dbNameOf(col), val.map(function (x) { return col.valueConverter.toDb(x); }));
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isEqualTo = function (col, val) {
@@ -481,7 +519,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     };
     FilterConsumerBridgeToKnexRequest.prototype.containsCaseInsensitive = function (col, val) {
         var _this = this;
-        this.result.push(function (b) { return b.whereRaw('lower (' + _this.nameProvider.nameOf(col) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')"); });
+        this.result.push(function (b) { return b.whereRaw('lower (' + _this.nameProvider.$dbNameOf(col) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')"); });
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 return [2 /*return*/];
@@ -490,7 +528,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     };
     FilterConsumerBridgeToKnexRequest.prototype.add = function (col, val, operator) {
         var _this = this;
-        this.result.push(function (b) { return b.where(_this.nameProvider.nameOf(col), operator, col.valueConverter.toDb(val)); });
+        this.result.push(function (b) { return b.where(_this.nameProvider.$dbNameOf(col), operator, col.valueConverter.toDb(val)); });
     };
     FilterConsumerBridgeToKnexRequest.prototype.databaseCustom = function (databaseCustom) {
         var _this = this;
@@ -512,7 +550,6 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
     };
     return FilterConsumerBridgeToKnexRequest;
 }());
-exports.FilterConsumerBridgeToKnexRequest = FilterConsumerBridgeToKnexRequest;
 var KnexSchemaBuilder = /** @class */ (function () {
     function KnexSchemaBuilder(knex) {
         this.knex = knex;
@@ -525,7 +562,10 @@ var KnexSchemaBuilder = /** @class */ (function () {
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        console.info("start verify structure");
+                        if (!remult)
+                            remult = remult_proxy_1.RemultProxy.defaultRemult;
+                        if (KnexSchemaBuilder.logToConsole)
+                            console.time("Knex Auto create tables and columns");
                         _e.label = 1;
                     case 1:
                         _e.trys.push([1, 12, 13, 14]);
@@ -552,7 +592,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     case 7: return [3 /*break*/, 10];
                     case 8:
                         err_2 = _e.sent();
-                        _b = (_a = console).log;
+                        _b = (_a = console).error;
                         _c = "failed verify structure of ";
                         return [4 /*yield*/, metadata.getDbName()];
                     case 9:
@@ -572,7 +612,10 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         }
                         finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
-                    case 14: return [2 /*return*/];
+                    case 14:
+                        if (KnexSchemaBuilder.logToConsole)
+                            console.timeEnd("Knex Auto create tables and columns");
+                        return [2 /*return*/];
                 }
             });
         });
@@ -583,10 +626,10 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var e_7, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(entity)];
                     case 1:
                         e = _d.sent();
-                        return [4 /*yield*/, this.knex.schema.hasTable(e.entityName)];
+                        return [4 /*yield*/, this.knex.schema.hasTable(e.$entityName)];
                     case 2:
                         if (!!(_d.sent())) return [3 /*break*/, 4];
                         cols_1 = new Map();
@@ -594,8 +637,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
                             for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 f = _b.value;
                                 cols_1.set(f, {
-                                    name: e.nameOf(f),
-                                    readonly: e.isDbReadonly(f)
+                                    name: e.$dbNameOf(f),
+                                    readonly: filter_consumer_bridge_to_sql_request_1.isDbReadonly(f, e)
                                 });
                             }
                         }
@@ -606,7 +649,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                             }
                             finally { if (e_7) throw e_7.error; }
                         }
-                        return [4 /*yield*/, logSql(this.knex.schema.createTable(e.entityName, function (b) {
+                        return [4 /*yield*/, logSql(this.knex.schema.createTable(e.$entityName, function (b) {
                                 var e_8, _a;
                                 try {
                                     for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -643,19 +686,19 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var e, col, colName;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(entity)];
                     case 1:
                         e = _a.sent();
-                        if (e.isDbReadonly(c(entity)))
+                        if (filter_consumer_bridge_to_sql_request_1.isDbReadonly(c(entity), e))
                             return [2 /*return*/];
                         col = c(entity);
-                        colName = e.nameOf(col);
-                        return [4 /*yield*/, this.knex.schema.hasColumn(e.entityName, colName)];
+                        colName = e.$dbNameOf(col);
+                        return [4 /*yield*/, this.knex.schema.hasColumn(e.$entityName, colName)];
                     case 2:
                         if (!!(_a.sent())) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.knex.schema.alterTable(e.entityName, function (b) {
+                        return [4 /*yield*/, logSql(this.knex.schema.alterTable(e.$entityName, function (b) {
                                 buildColumn(col, colName, b);
-                            })];
+                            }))];
                     case 3:
                         _a.sent();
                         _a.label = 4;
@@ -670,7 +713,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var e_9, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(entity)];
                     case 1:
                         e = _d.sent();
                         _d.label = 2;
@@ -680,7 +723,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        if (!!e.isDbReadonly(col)) return [3 /*break*/, 2];
+                                        if (!!filter_consumer_bridge_to_sql_request_1.isDbReadonly(col, e)) return [3 /*break*/, 2];
                                         return [4 /*yield*/, this_2.addColumnIfNotExist(entity, function () { return col; })];
                                     case 1:
                                         _a.sent();
@@ -693,7 +736,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         _d.label = 3;
                     case 3:
                         _d.trys.push([3, 8, 9, 10]);
-                        _a = tslib_1.__values(entity.fields), _b = _a.next();
+                        _a = tslib_1.__values(entity.fields.toArray()), _b = _a.next();
                         _d.label = 4;
                     case 4:
                         if (!!_b.done) return [3 /*break*/, 7];
@@ -726,6 +769,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
             });
         });
     };
+    //@internal
+    KnexSchemaBuilder.logToConsole = true;
     return KnexSchemaBuilder;
 }());
 exports.KnexSchemaBuilder = KnexSchemaBuilder;
@@ -780,7 +825,8 @@ function buildColumn(x, dbName, b) {
 }
 exports.buildColumn = buildColumn;
 function logSql(who) {
-    //console.log(who.toSQL().sql);
+    if (KnexSchemaBuilder.logToConsole)
+        console.info(who.toSQL());
     return who;
 }
 function createKnexDataProvider(config, autoCreateTables) {
@@ -789,15 +835,16 @@ function createKnexDataProvider(config, autoCreateTables) {
         var k, result;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    k = knex_1.default(config);
+                case 0: return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('knex')); })];
+                case 1:
+                    k = (_a.sent()).default(config);
                     result = new KnexDataProvider(k);
-                    if (!autoCreateTables) return [3 /*break*/, 2];
+                    if (!autoCreateTables) return [3 /*break*/, 3];
                     return [4 /*yield*/, new KnexSchemaBuilder(k).verifyStructureOfAllEntities(new context_1.Remult(result))];
-                case 1:
+                case 2:
                     _a.sent();
-                    _a.label = 2;
-                case 2: return [2 /*return*/, result];
+                    _a.label = 3;
+                case 3: return [2 /*return*/, result];
             }
         });
     });

package/remult-mongo.d.ts

@@ -1,9 +1,16 @@
-import { MongoClient, Db } from 'mongodb';
-import { DataProvider, EntityDataProvider, EntityMetadata } from '.';
+import type { MongoClient, Db } from 'mongodb';
+import { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata, Remult } from '.';
+import { RepositoryOverloads } from './src/remult3';
 export declare class MongoDataProvider implements DataProvider {
     private db;
     private client;
     constructor(db: Db, client: MongoClient);
+    static getDb(remult?: Remult): Db;
     getEntityDataProvider(entity: EntityMetadata<any>): EntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
+    static filterToRaw<entityType>(entity: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>): Promise<{
+        $and: any[];
+    } | {
+        $and?: undefined;
+    }>;
 }

package/remult-mongo.js

@@ -4,11 +4,19 @@ exports.MongoDataProvider = void 0;
 var tslib_1 = require("tslib");
 var _1 = require(".");
 var filter_consumer_bridge_to_sql_request_1 = require("./src/filter/filter-consumer-bridge-to-sql-request");
+var remult3_1 = require("./src/remult3");
+var remult_proxy_1 = require("./src/remult-proxy");
 var MongoDataProvider = /** @class */ (function () {
     function MongoDataProvider(db, client) {
         this.db = db;
         this.client = client;
     }
+    MongoDataProvider.getDb = function (remult) {
+        var r = (remult || remult_proxy_1.remult).dataProvider;
+        if (!r.db)
+            throw "the data provider is not a MongoDataProvider";
+        return r.db;
+    };
     MongoDataProvider.prototype.getEntityDataProvider = function (entity) {
         return new MongoEntityDataProvider(this.db, entity);
     };
@@ -42,6 +50,30 @@ var MongoDataProvider = /** @class */ (function () {
             });
         });
     };
+    MongoDataProvider.filterToRaw = function (entity, condition) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var repo, b, _a, r;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        repo = remult3_1.getRepository(entity);
+                        _a = FilterConsumerBridgeToMongo.bind;
+                        return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(repo.metadata)];
+                    case 1:
+                        b = new (_a.apply(FilterConsumerBridgeToMongo, [void 0, _b.sent()]))();
+                        b._addWhere = false;
+                        return [4 /*yield*/, (repo.translateWhereToFilter(condition))];
+                    case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
+                    case 3:
+                        _b.sent();
+                        return [4 /*yield*/, b.resolveWhere()];
+                    case 4:
+                        r = _b.sent();
+                        return [2 /*return*/, r];
+                }
+            });
+        });
+    };
     return MongoDataProvider;
 }());
 exports.MongoDataProvider = MongoDataProvider;
@@ -60,7 +92,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
         try {
             for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
-                var val = row[nameProvider.nameOf(col)];
+                var val = row[nameProvider.$dbNameOf(col)];
                 if (isNull(val))
                     val = null;
                 result[col.key] = col.valueConverter.fromDb(val);
@@ -84,7 +116,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                 var val = col.valueConverter.toDb(row[col.key]);
                 if (val === null)
                     val = NULL;
-                result[nameProvider.nameOf(col)] = val;
+                result[nameProvider.$dbNameOf(col)] = val;
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -143,7 +175,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                             try {
                                 for (_b = tslib_1.__values(options.orderBy.Segments), _c = _b.next(); !_c.done; _c = _b.next()) {
                                     s = _c.value;
-                                    op.sort[e.nameOf(s.field)] = s.isDescending ? -1 : 1;
+                                    op.sort[e.$dbNameOf(s.field)] = s.isDescending ? -1 : 1;
                                 }
                             }
                             catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -267,10 +299,10 @@ var MongoEntityDataProvider = /** @class */ (function () {
             var e, collection;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(this.entity)];
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(this.entity)];
                     case 1:
                         e = _a.sent();
-                        collection = this.db.collection(e.entityName);
+                        collection = this.db.collection(e.$entityName);
                         return [2 /*return*/, { e: e, collection: collection }];
                 }
             });
@@ -399,7 +431,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
         this.result.push(function () {
             var _a;
             return (_a = {},
-                _a[_this.nameProvider.nameOf(col)] = {
+                _a[_this.nameProvider.$dbNameOf(col)] = {
                     $in: val.map(function (x) { return col.valueConverter.toDb(x); })
                 },
                 _a);
@@ -435,7 +467,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
         this.result.push(function () {
             var _a, _b;
             return (_a = {},
-                _a[_this.nameProvider.nameOf(col)] = (_b = {}, _b[operator] = isNull(val) ? val : col.valueConverter.toDb(val), _b),
+                _a[_this.nameProvider.$dbNameOf(col)] = (_b = {}, _b[operator] = isNull(val) ? val : col.valueConverter.toDb(val), _b),
                 _a);
         });
     };

package/remult-next.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+import type { GetServerSideProps, NextApiRequest, PreviewData, NextApiHandler } from "next";
+import type { ParsedUrlQuery } from "querystring";
+import { RemultServer, RemultServerOptions } from "./server";
+export declare function remultNext(options?: RemultServerOptions<NextApiRequest>): RemultServer & NextApiHandler & {
+    getServerSideProps<P extends {
+        [key: string]: any;
+    } = {
+        [key: string]: any;
+    }, Q extends ParsedUrlQuery = ParsedUrlQuery, D extends PreviewData = PreviewData>(getServerPropsFunction: GetServerSideProps<P, Q, D>): GetServerSideProps<P, Q, D>;
+};

package/remult-next.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remultNext = void 0;
+var tslib_1 = require("tslib");
+var server_1 = require("./server");
+function remultNext(options) {
+    var _this = this;
+    var result = server_1.createRemultServer(options);
+    return Object.assign(function (req, res) { return result.handle(req, res); }, result, {
+        getRemult: function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return result.getRemult.apply(result, tslib_1.__spread(args));
+        },
+        handle: function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return result.handle.apply(result, tslib_1.__spread(args));
+        },
+        openApiDoc: function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return result.openApiDoc.apply(result, tslib_1.__spread(args));
+        },
+        registerRouter: function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return result.registerRouter.apply(result, tslib_1.__spread(args));
+        },
+        withRemult: function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return result.withRemult.apply(result, tslib_1.__spread(args));
+        },
+    }, {
+        getServerSideProps: function (getServerPropsFunction) {
+            return function (context) {
+                return new Promise(function (res, err) {
+                    result.withRemult(context, undefined, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        var r, e_1;
+                        return tslib_1.__generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    _a.trys.push([0, 2, , 3]);
+                                    return [4 /*yield*/, getServerPropsFunction(context)];
+                                case 1:
+                                    r = _a.sent();
+                                    res(JSON.parse(JSON.stringify(r)));
+                                    return [3 /*break*/, 3];
+                                case 2:
+                                    e_1 = _a.sent();
+                                    err(e_1);
+                                    return [3 /*break*/, 3];
+                                case 3: return [2 /*return*/];
+                            }
+                        });
+                    }); });
+                });
+            };
+        }
+    });
+}
+exports.remultNext = remultNext;

package/server/JsonEntityFileStorage.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonFileDataProvider = exports.JsonEntityFileStorage = void 0;
 var tslib_1 = require("tslib");
-var path = require("path");
-var fs = require("fs");
+var path = tslib_1.__importStar(require("path"));
+var fs = tslib_1.__importStar(require("fs"));
 var index_1 = require("../index");
 var JsonEntityFileStorage = /** @class */ (function () {
     function JsonEntityFileStorage(folderPath) {