remult 0.12.7 → 0.13.1

package/graphql.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.remultGraphql = void 0;
 var tslib_1 = require("tslib");
 var _1 = require(".");
-var valueConverters_1 = require("./valueConverters");
 var context_1 = require("./src/context");
 var remult3_1 = require("./src/remult3");
 var data_api_1 = require("./src/data-api");
 function remultGraphql(api) {
     var e_1, _a;
     var _this = this;
+    var _b;
     var r = new _1.Remult();
     var types = '';
     var query = '';
@@ -31,7 +31,7 @@ function remultGraphql(api) {
                                 type = "Boolean";
                             case Number:
                                 {
-                                    if (f.valueConverter === valueConverters_1.IntegerValueConverter)
+                                    if (((_b = f.valueConverter) === null || _b === void 0 ? void 0 : _b.fieldTypeInDb) == 'integer')
                                         type = "Int";
                                     else
                                         type = "Float";

package/index.d.ts

@@ -1,4 +1,4 @@
-export { Field, UuidField, FieldsMetadata, Entity, BuildEntity, EntityBase, ControllerBase, FieldRef, IdFieldRef, Fields, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FieldType, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, getFields, EntityRef, getEntityRef, SortSegments, ValueListFieldType, DateOnlyField, JsonField, IntegerField, OmitEB, Paginator, CaptionTransformer } from './src/remult3';
+export { Field, Fields, StringFieldOptions, FieldsMetadata, Entity, BuildEntity, EntityBase, ControllerBase, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FieldType, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, getFields, EntityRef, getEntityRef, SortSegments, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, OmitEB, Paginator, CaptionTransformer } from './src/remult3';
 export { EntityOptions } from './src/entity';
 export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider } from './src/data-interfaces';
 export { SqlCommand, SqlImplementation, SqlResult } from './src/sql-command';
@@ -19,3 +19,4 @@ export { Filter } from './src/filter/filter-interfaces';
 export { FilterConsumerBridgeToSqlRequest } from './src/filter/filter-consumer-bridge-to-sql-request';
 export { UrlBuilder } from './urlBuilder';
 export { Validators } from './src/validators';
+export { ValueConverters } from './valueConverters';

package/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Validators = exports.UrlBuilder = exports.FilterConsumerBridgeToSqlRequest = exports.Filter = exports.CompoundIdField = exports.OneToMany = exports.Sort = exports.IdEntity = exports.EventSource = exports.isBackend = exports.Remult = exports.Allow = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonDataProvider = exports.SqlDatabase = exports.WebSqlDataProvider = exports.ArrayEntityDataProvider = exports.InMemoryDataProvider = exports.RestDataProvider = exports.CaptionTransformer = exports.IntegerField = exports.JsonField = exports.DateOnlyField = exports.ValueListFieldType = exports.getEntityRef = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.BuildEntity = exports.Entity = exports.UuidField = exports.Field = void 0;
+exports.ValueConverters = exports.Validators = exports.UrlBuilder = exports.FilterConsumerBridgeToSqlRequest = exports.Filter = exports.CompoundIdField = exports.OneToMany = exports.Sort = exports.IdEntity = exports.EventSource = exports.isBackend = exports.Remult = exports.Allow = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonDataProvider = exports.SqlDatabase = exports.WebSqlDataProvider = exports.ArrayEntityDataProvider = exports.InMemoryDataProvider = exports.RestDataProvider = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getEntityRef = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.BuildEntity = exports.Entity = exports.Fields = exports.Field = void 0;
 /*
  * Public API Surface of remult
  */
 var remult3_1 = require("./src/remult3");
 Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return remult3_1.Field; } });
-Object.defineProperty(exports, "UuidField", { enumerable: true, get: function () { return remult3_1.UuidField; } });
+Object.defineProperty(exports, "Fields", { enumerable: true, get: function () { return remult3_1.Fields; } });
 Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return remult3_1.Entity; } });
 Object.defineProperty(exports, "BuildEntity", { enumerable: true, get: function () { return remult3_1.BuildEntity; } });
 Object.defineProperty(exports, "EntityBase", { enumerable: true, get: function () { return remult3_1.EntityBase; } });
@@ -15,9 +15,8 @@ Object.defineProperty(exports, "FieldType", { enumerable: true, get: function ()
 Object.defineProperty(exports, "getFields", { enumerable: true, get: function () { return remult3_1.getFields; } });
 Object.defineProperty(exports, "getEntityRef", { enumerable: true, get: function () { return remult3_1.getEntityRef; } });
 Object.defineProperty(exports, "ValueListFieldType", { enumerable: true, get: function () { return remult3_1.ValueListFieldType; } });
-Object.defineProperty(exports, "DateOnlyField", { enumerable: true, get: function () { return remult3_1.DateOnlyField; } });
-Object.defineProperty(exports, "JsonField", { enumerable: true, get: function () { return remult3_1.JsonField; } });
-Object.defineProperty(exports, "IntegerField", { enumerable: true, get: function () { return remult3_1.IntegerField; } });
+Object.defineProperty(exports, "getValueList", { enumerable: true, get: function () { return remult3_1.getValueList; } });
+Object.defineProperty(exports, "ValueListInfo", { enumerable: true, get: function () { return remult3_1.ValueListInfo; } });
 Object.defineProperty(exports, "CaptionTransformer", { enumerable: true, get: function () { return remult3_1.CaptionTransformer; } });
 var rest_data_provider_1 = require("./src/data-providers/rest-data-provider"); //V
 Object.defineProperty(exports, "RestDataProvider", { enumerable: true, get: function () { return rest_data_provider_1.RestDataProvider; } });
@@ -56,3 +55,5 @@ var urlBuilder_1 = require("./urlBuilder");
 Object.defineProperty(exports, "UrlBuilder", { enumerable: true, get: function () { return urlBuilder_1.UrlBuilder; } });
 var validators_1 = require("./src/validators");
 Object.defineProperty(exports, "Validators", { enumerable: true, get: function () { return validators_1.Validators; } });
+var valueConverters_1 = require("./valueConverters");
+Object.defineProperty(exports, "ValueConverters", { enumerable: true, get: function () { return valueConverters_1.ValueConverters; } });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.12.7",
+    "version": "0.13.1",
     "description": "remult core lib",
     "homepage": "https://remult.dev/",
     "repository": {

package/postgres/postgres-data-provider.js

@@ -7,6 +7,7 @@ var pg_1 = require("pg");
 var context_1 = require("../src/context");
 var postgresColumnSyntax_1 = require("./postgresColumnSyntax");
 var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
+var remult3_1 = require("../src/remult3");
 var PostgresDataProvider = /** @class */ (function () {
     function PostgresDataProvider(pool) {
         this.pool = pool;
@@ -191,11 +192,11 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                                             try {
                                                 for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
                                                     x = _b.value;
-                                                    if (!e.isDbReadonly(x) || x == entity.idMetadata.field && entity.options.dbAutoIncrementId) {
+                                                    if (!e.isDbReadonly(x) || remult3_1.isAutoIncrement(x)) {
                                                         if (result.length != 0)
                                                             result += ',';
                                                         result += '\r\n  ';
-                                                        if (x == entity.idMetadata.field && entity.options.dbAutoIncrementId)
+                                                        if (remult3_1.isAutoIncrement(x))
                                                             result += e.nameOf(x) + ' serial';
                                                         else {
                                                             result += postgresColumnSyntax_1.postgresColumnSyntax(x, e.nameOf(x));

package/postgres/postgresColumnSyntax.js

@@ -12,7 +12,7 @@ function postgresColumnSyntax(x, dbName) {
     }
     else if (x.valueType == Date) {
         if (!x.valueConverter.fieldTypeInDb)
-            if (x.valueConverter == valueConverters_1.DateOnlyValueConverter)
+            if (x.valueConverter == valueConverters_1.ValueConverters.DateOnly)
                 result += " date";
             else
                 result += " timestamp";

package/readme.md

@@ -3,12 +3,18 @@
     <img src="https://github.com/remult/remult/raw/master/docs/.vuepress/public/logo.png" width="140" height="140">
   </a>
   <h1>Remult</h1>
+	<a href="https://circleci.com/gh/remult/remult/tree/master">
+		<img alt="CircleCI" src="https://circleci.com/gh/remult/remult/tree/master.svg?style=svg">
+	</a>
 	<a href="https://raw.githubusercontent.com/remult/remult/master/LICENSE">
 		<img alt="GitHub license" src="https://img.shields.io/badge/license-MIT-blue.svg">
 	</a>
-	<a href="https://badge.fury.io/js/remult">
+	<a href="https://www.npmjs.com/package/remult">
 		<img alt="npm version" src="https://badge.fury.io/js/remult.svg">
 	</a>
+	<a href="https://www.npmjs.com/package/remult">
+		<img alt="npm downloads" src="https://img.shields.io/npm/dm/remult">
+	</a>
 </div>
 
 ## What is Remult?

package/remult-knex/index.js

@@ -7,6 +7,7 @@ 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");
+var remult3_1 = require("../src/remult3");
 var valueConverters_1 = require("../valueConverters");
 var KnexDataProvider = /** @class */ (function () {
     function KnexDataProvider(knex) {
@@ -299,7 +300,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [7 /*endfinally*/];
                     case 10:
                         insert = this.knex(e.entityName).insert(insertObject);
-                        if (!this.entity.options.dbAutoIncrementId) return [3 /*break*/, 12];
+                        if (!remult3_1.isAutoIncrement(this.entity.idMetadata.field)) return [3 /*break*/, 12];
                         return [4 /*yield*/, insert.returning(this.entity.idMetadata.field.key)];
                     case 11:
                         result = _d.sent();
@@ -602,8 +603,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
                                 try {
                                     for (var _b = tslib_1.__values(entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                                         var x = _c.value;
-                                        if (!cols_1.get(x).readonly || x == entity.idMetadata.field && entity.options.dbAutoIncrementId) {
-                                            if (x == entity.idMetadata.field && entity.options.dbAutoIncrementId)
+                                        if (!cols_1.get(x).readonly || remult3_1.isAutoIncrement(x)) {
+                                            if (remult3_1.isAutoIncrement(x))
                                                 b.increments(cols_1.get(x).name);
                                             else {
                                                 buildColumn(x, cols_1.get(x).name, b);
@@ -739,7 +740,7 @@ function buildColumn(x, dbName, b) {
     }
     else if (x.valueType == Date) {
         if (!x.valueConverter.fieldTypeInDb)
-            if (x.valueConverter == valueConverters_1.DateOnlyValueConverter)
+            if (x.valueConverter == valueConverters_1.ValueConverters.DateOnly)
                 b.date(dbName);
             else
                 b.dateTime(dbName);
@@ -764,7 +765,7 @@ function buildColumn(x, dbName, b) {
             b.specificType(dbName, x.valueConverter.fieldTypeInDb);
     }
     else {
-        var c = b.string(dbName);
+        var c = b.string(dbName, x.options.maxLength);
         if (!x.allowNull)
             c.defaultTo('').notNullable();
     }

package/remult-mongo.js

@@ -195,7 +195,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                         try {
                             for (_d = tslib_1.__values(this.entity.fields), _e = _d.next(); !_e.done; _e = _d.next()) {
                                 f_1 = _e.value;
-                                if (!f_1.dbReadOnly && !f_1.isServerExpression && !(f_1 == this.entity.idMetadata.field && this.entity.options.dbAutoIncrementId)) {
+                                if (!f_1.dbReadOnly && !f_1.isServerExpression) {
                                     if (keys.includes(f_1.key)) {
                                         newR[f_1.key] = f_1.valueConverter.toJson(data[f_1.key]);
                                     }

package/server/expressBridge.js

@@ -806,35 +806,35 @@ var JobsInQueueEntity = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "userId", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "url", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Date(),
         tslib_1.__metadata("design:type", Date)
     ], JobsInQueueEntity.prototype, "submitTime", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Date(),
         tslib_1.__metadata("design:type", Date)
     ], JobsInQueueEntity.prototype, "doneTime", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.String(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "result", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], JobsInQueueEntity.prototype, "done", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], JobsInQueueEntity.prototype, "error", void 0);
     tslib_1.__decorate([
-        remult3_1.Field(),
+        remult3_1.Fields.Number(),
         tslib_1.__metadata("design:type", Number)
     ], JobsInQueueEntity.prototype, "progress", void 0);
     JobsInQueueEntity = tslib_1.__decorate([

package/src/backend-tests/backend-database-test-setup.backend-spec.d.ts

@@ -1,5 +1,5 @@
 import { dbTestWhatSignature } from "../shared-tests/db-tests-setup";
 export declare const testKnexPGSqlImpl: (key: string, what: dbTestWhatSignature, focus?: boolean) => void;
 export declare function testPostgresImplementation(key: string, what: dbTestWhatSignature, focus?: boolean): void;
-import '../shared-tests';
 export declare function testMongo(key: string, what: dbTestWhatSignature, focus?: boolean): void;
+import '../shared-tests';

package/src/backend-tests/backend-database-test-setup.backend-spec.js

@@ -143,7 +143,6 @@ function testPostgresImplementation(key, what, focus) {
 }
 exports.testPostgresImplementation = testPostgresImplementation;
 db_tests_setup_1.addDatabaseToTest(testPostgresImplementation);
-require("../shared-tests");
 var remult_3_entities_1 = require("../tests/remult-3-entities");
 var remult_mongo_1 = require("../../remult-mongo");
 db_tests_setup_1.testAll("transactions", function (_a) {
@@ -218,3 +217,4 @@ function testMongo(key, what, focus) {
 }
 exports.testMongo = testMongo;
 db_tests_setup_1.addDatabaseToTest(testMongo);
+require("../shared-tests");

package/src/backend-tests/my-test.backend-spec.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
+var __1 = require("../..");
 var context_1 = require("../context");
 var remult_knex_1 = require("../../remult-knex");
 var Knex = require("knex");
 var dotenv_1 = require("dotenv");
+var backend_database_test_setup_backend_spec_1 = require("./backend-database-test-setup.backend-spec");
+var entityWithValidations_1 = require("../shared-tests/entityWithValidations");
 dotenv_1.config();
 describe("test", function () {
     var remult;
@@ -21,3 +24,112 @@ describe("test", function () {
         });
     }); });
 });
+backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filter", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({
+                            where: __1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                return tslib_1.__generator(this, function (_a) {
+                                    build.sql = s.metadata.fields.myId.options.dbName + ' in (1,3)';
+                                    return [2 /*return*/];
+                                });
+                            }); })
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(2);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filter2", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({
+                            where: {
+                                $or: [
+                                    __1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                        return tslib_1.__generator(this, function (_a) {
+                                            build.sql = s.metadata.fields.myId.options.dbName + ' in (1,3)';
+                                            return [2 /*return*/];
+                                        });
+                                    }); }),
+                                    {
+                                        myId: 2
+                                    }
+                                ]
+                            }
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(3);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+backend_database_test_setup_backend_spec_1.testKnexPGSqlImpl("knex filter", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({
+                            where: remult_knex_1.KnexDataProvider.customFilter(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                return tslib_1.__generator(this, function (_a) {
+                                    return [2 /*return*/, function (build) { return build.whereIn(s.metadata.fields.myId.options.dbName, [1, 3]); }];
+                                });
+                            }); })
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(2);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+backend_database_test_setup_backend_spec_1.testKnexPGSqlImpl("knex filter2", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var s, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, entityWithValidations_1.entityWithValidations.create4RowsInDp(createEntity)];
+                case 1:
+                    s = _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.find({
+                            where: {
+                                $or: [remult_knex_1.KnexDataProvider.customFilter(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                        return tslib_1.__generator(this, function (_a) {
+                                            return [2 /*return*/, function (build) { return build.whereIn(s.metadata.fields.myId.options.dbName, [1, 3]); }];
+                                        });
+                                    }); }), {
+                                        myId: 4
+                                    }]
+                            }
+                        })];
+                case 2:
+                    _b.apply(void 0, [(_c.sent()).length]).toBe(3);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);

package/src/context.js

@@ -283,7 +283,7 @@ var Remult = /** @class */ (function () {
         }
         return r;
     };
-    Remult.apiBaseUrl = 'api';
+    Remult.apiBaseUrl = '/api';
     return Remult;
 }());
 exports.Remult = Remult;

package/src/data-api.js

@@ -48,56 +48,59 @@ var DataApi = /** @class */ (function () {
     };
     DataApi.prototype.count = function (response, request, filterBody) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, err_1;
-            var _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var _a, _b, _c, _d, err_1;
+            var _e;
+            return tslib_1.__generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
-                        _d.trys.push([0, 2, , 3]);
-                        _b = (_a = response).success;
-                        _c = {};
-                        return [4 /*yield*/, this.repository.count(this.buildWhere(request, filterBody))];
+                        if (!this.repository.metadata.apiReadAllowed) {
+                            response.forbidden();
+                            return [2 /*return*/];
+                        }
+                        _f.label = 1;
                     case 1:
-                        _b.apply(_a, [(_c.count = +(_d.sent()), _c)]);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        err_1 = _d.sent();
+                        _f.trys.push([1, 4, , 5]);
+                        _b = (_a = response).success;
+                        _e = {};
+                        _d = (_c = this.repository).count;
+                        return [4 /*yield*/, this.buildWhere(request, filterBody)];
+                    case 2: return [4 /*yield*/, _d.apply(_c, [_f.sent()])];
+                    case 3:
+                        _b.apply(_a, [(_e.count = +(_f.sent()), _e)]);
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_1 = _f.sent();
                         response.error(err_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     };
     DataApi.prototype.getArray = function (response, request, filterBody) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var findOptions, _b, hasId_1, w, sort, dir, limit, err_2;
+            var findOptions, _a, hasId_1, w, sort, dir, limit, err_2;
             var _this = this;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!this.repository.metadata.apiReadAllowed) {
                             response.forbidden();
                             return [2 /*return*/];
                         }
-                        _c.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _c.trys.push([1, 7, , 8]);
+                        _b.trys.push([1, 6, , 7]);
                         findOptions = { load: function () { return []; } };
-                        if (!((_a = this.repository.metadata.options) === null || _a === void 0 ? void 0 : _a.apiPrefilter)) return [3 /*break*/, 3];
-                        _b = findOptions;
-                        return [4 /*yield*/, filter_interfaces_2.Filter.resolve(this.repository.metadata.options.apiPrefilter)];
+                        _a = findOptions;
+                        return [4 /*yield*/, this.buildWhere(request, filterBody)];
                     case 2:
-                        _b.where = _c.sent();
-                        _c.label = 3;
-                    case 3:
-                        findOptions.where = this.buildWhere(request, filterBody);
-                        if (!this.remult.isAllowed(this.repository.metadata.options.apiRequireId)) return [3 /*break*/, 5];
+                        _a.where = _b.sent();
+                        if (!this.remult.isAllowed(this.repository.metadata.options.apiRequireId)) return [3 /*break*/, 4];
                         hasId_1 = false;
                         return [4 /*yield*/, filter_interfaces_2.Filter.fromEntityFilter(this.repository.metadata, findOptions.where)];
-                    case 4:
-                        w = _c.sent();
+                    case 3:
+                        w = _b.sent();
                         if (w) {
                             w.__applyToConsumer({
                                 containsCaseInsensitive: function () { },
@@ -122,8 +125,8 @@ var DataApi = /** @class */ (function () {
                             response.forbidden();
                             return [2 /*return*/];
                         }
-                        _c.label = 5;
-                    case 5:
+                        _b.label = 4;
+                    case 4:
                         if (request) {
                             sort = request.get("_sort");
                             if (sort != undefined) {
@@ -153,34 +156,52 @@ var DataApi = /** @class */ (function () {
                                     }
                                 });
                             }); })];
+                    case 5:
+                        _b.sent();
+                        return [3 /*break*/, 7];
                     case 6:
-                        _c.sent();
-                        return [3 /*break*/, 8];
-                    case 7:
-                        err_2 = _c.sent();
+                        err_2 = _b.sent();
                         response.error(err_2);
-                        return [3 /*break*/, 8];
-                    case 8: return [2 /*return*/];
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
     };
     DataApi.prototype.buildWhere = function (request, filterBody) {
-        var where = [];
-        where.push(this.repository.metadata.options.apiPrefilter);
-        if (request) {
-            where.push(filter_interfaces_1.buildFilterFromRequestParameters(this.repository.metadata, {
-                get: function (key) {
-                    var result = request.get(key);
-                    if (key.startsWith(filter_interfaces_1.customUrlToken) && result)
-                        return JSON.parse(result);
-                    return result;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var where, _a, _b;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        where = [];
+                        if (!this.repository.metadata.options.apiPrefilter) return [3 /*break*/, 3];
+                        if (!(typeof this.repository.metadata.options.apiPrefilter === "function")) return [3 /*break*/, 2];
+                        _b = (_a = where).push;
+                        return [4 /*yield*/, this.repository.metadata.options.apiPrefilter()];
+                    case 1:
+                        _b.apply(_a, [_c.sent()]);
+                        return [3 /*break*/, 3];
+                    case 2:
+                        where.push(this.repository.metadata.options.apiPrefilter);
+                        _c.label = 3;
+                    case 3:
+                        if (request) {
+                            where.push(filter_interfaces_1.buildFilterFromRequestParameters(this.repository.metadata, {
+                                get: function (key) {
+                                    var result = request.get(key);
+                                    if (key.startsWith(filter_interfaces_1.customUrlToken) && result)
+                                        return JSON.parse(result);
+                                    return result;
+                                }
+                            }));
+                        }
+                        if (filterBody)
+                            where.push(filter_interfaces_2.Filter.entityFilterFromJson(this.repository.metadata, filterBody));
+                        return [2 /*return*/, { $and: where }];
                 }
-            }));
-        }
-        if (filterBody)
-            where.push(filter_interfaces_2.Filter.entityFilterFromJson(this.repository.metadata, filterBody));
-        return { $and: where };
+            });
+        });
     };
     DataApi.prototype.doOnId = function (response, id, what) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {

package/src/data-providers/array-entity-data-provider.js

@@ -186,7 +186,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                 try {
                     for (var _b = (e_5 = void 0, tslib_1.__values(this.entity.fields)), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var f = _c.value;
-                        if (!f.dbReadOnly && !f.isServerExpression && !(f == this.entity.idMetadata.field && this.entity.options.dbAutoIncrementId)) {
+                        if (!f.dbReadOnly && !f.isServerExpression) {
                             if (keys.includes(f.key)) {
                                 newR[f.key] = f.valueConverter.toJson(data[f.key]);
                             }
@@ -218,29 +218,30 @@ var ArrayEntityDataProvider = /** @class */ (function () {
         throw new Error("couldn't find id to delete: " + id);
     };
     ArrayEntityDataProvider.prototype.insert = function (data) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var idf, lastRow, j;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         idf = this.entity.idMetadata.field;
                         if (!!(idf instanceof column_1.CompoundIdField)) return [3 /*break*/, 3];
-                        if (!this.entity.options.dbAutoIncrementId) return [3 /*break*/, 2];
+                        if (!(((_a = idf.options.valueConverter) === null || _a === void 0 ? void 0 : _a.fieldTypeInDb) === 'autoincrement')) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.find({ orderBy: new sort_1.Sort({ field: idf, isDescending: true }) })];
                     case 1:
-                        lastRow = _a.sent();
+                        lastRow = _b.sent();
                         if (lastRow.length > 0)
                             data[idf.key] = lastRow[0][idf.key] + 1;
                         else
                             data[idf.key] = 1;
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         if (data[idf.key])
                             this.rows.forEach(function (i) {
                                 if (data[idf.key] == i[idf.key])
                                     throw Error("id already exists");
                             });
-                        _a.label = 3;
+                        _b.label = 3;
                     case 3:
                         j = this.translateToJson(data);
                         this.verifyThatRowHasAllNotNullColumns(j);