remult 0.11.2 → 0.12.2

package/index.d.ts

@@ -1,4 +1,4 @@
-export { Field, UuidField, FieldsMetadata, Entity, 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, 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 { EntityOptions } from './src/entity';
 export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider } from './src/data-interfaces';
 export { SqlCommand, SqlImplementation, SqlResult } from './src/sql-command';

package/index.js

@@ -1,6 +1,6 @@
 "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.Entity = exports.UuidField = exports.Field = void 0;
+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;
 /*
  * Public API Surface of remult
  */
@@ -8,6 +8,7 @@ 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, "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; } });
 Object.defineProperty(exports, "ControllerBase", { enumerable: true, get: function () { return remult3_1.ControllerBase; } });
 Object.defineProperty(exports, "FieldType", { enumerable: true, get: function () { return remult3_1.FieldType; } });

package/package.json

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

package/remult-knex/index.js

@@ -366,11 +366,12 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         var _this = this;
         var statement = '';
         this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var _loop_1, this_1, orElements_1, orElements_1_1, element, e_5_1;
+            var result, _loop_1, this_1, orElements_1, orElements_1_1, element, e_5_1;
             var e_5, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        result = [];
                         _loop_1 = function (element) {
                             var f, where;
                             return tslib_1.__generator(this, function (_a) {
@@ -383,7 +384,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                                     case 1:
                                         where = _a.sent();
                                         if (where.length > 0) {
-                                            this_1.result.push(function (b) {
+                                            result.push(function (b) {
                                                 b.orWhere(function (b) {
                                                     where.forEach(function (x) { return x(b); });
                                                 });
@@ -420,7 +421,11 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
                         }
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/];
+                    case 8:
+                        if (result.length > 0) {
+                            this.result.push(function (b) { return b.where(function (x) { return result.find(function (y) { return y(x); }); }); });
+                        }
+                        return [2 /*return*/];
                 }
             });
         }); })());

package/src/remult3/RepositoryImplementation.d.ts

@@ -218,6 +218,10 @@ interface columnInfo {
     key: string;
     settings: (remult: Remult) => FieldOptions;
 }
+export declare type BuildEntityFields<entityType> = {
+    [Properties in keyof Partial<OmitEB<entityType>>]: any;
+};
+export declare function BuildEntity<entityType>(c: ClassType<entityType>, key: string, fields: BuildEntityFields<entityType>, ...options: (EntityOptions<entityType> | ((options: EntityOptions<entityType>, remult: Remult) => void))[]): void;
 export declare function Entity<entityType>(key: string, ...options: (EntityOptions<entityType> | ((options: EntityOptions<entityType>, remult: Remult) => void))[]): (target: any) => any;
 export declare class EntityBase {
     get _(): EntityRef<this>;

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.Entity = exports.decorateColumnSettings = exports.Field = exports.UuidField = exports.ValueListFieldType = exports.IntegerField = exports.DateOnlyField = exports.JsonField = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.Entity = exports.BuildEntity = exports.decorateColumnSettings = exports.Field = exports.UuidField = exports.ValueListFieldType = exports.IntegerField = exports.DateOnlyField = exports.JsonField = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
 var tslib_1 = require("tslib");
 var column_1 = require("../column");
 var context_1 = require("../context");
@@ -2337,6 +2337,20 @@ function decorateColumnSettings(settings, remult) {
     return settings;
 }
 exports.decorateColumnSettings = decorateColumnSettings;
+function BuildEntity(c, key, fields) {
+    var options = [];
+    for (var _i = 3; _i < arguments.length; _i++) {
+        options[_i - 3] = arguments[_i];
+    }
+    Entity.apply(void 0, tslib_1.__spread([key], options))(c);
+    for (var fieldKey in fields) {
+        if (Object.prototype.hasOwnProperty.call(fields, fieldKey)) {
+            var element = fields[fieldKey];
+            element(c.prototype, fieldKey);
+        }
+    }
+}
+exports.BuildEntity = BuildEntity;
 function Entity(key) {
     var options = [];
     for (var _i = 1; _i < arguments.length; _i++) {

package/src/shared-tests/db-tests.db-tests.js

@@ -1210,6 +1210,67 @@ db_tests_setup_1.testAll("Paging", function (_a) {
         });
     });
 }, false);
+db_tests_setup_1.testAll("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*/, createEntity(testFilter)];
+                case 1:
+                    s = _c.sent();
+                    return [4 /*yield*/, s.insert({ id: 1, a: 'a', b: 'b', c: 'c' })];
+                case 2:
+                    _c.sent();
+                    _b = expect;
+                    return [4 /*yield*/, s.count({
+                            a: 'z',
+                            $and: [testFilter.search('')]
+                        })];
+                case 3:
+                    _b.apply(void 0, [_c.sent()]).toBe(0);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+var testFilter = /** @class */ (function () {
+    function testFilter() {
+        this.id = 0;
+        this.a = '';
+        this.b = '';
+        this.c = '';
+    }
+    testFilter.search = filter_interfaces_1.Filter.createCustom(function (remult, str) { return ({
+        $and: [{
+                $or: [
+                    { a: 'a' },
+                    { b: 'a' },
+                    { c: 'a' }
+                ]
+            }]
+    }); });
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", Number)
+    ], testFilter.prototype, "id", void 0);
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", String)
+    ], testFilter.prototype, "a", void 0);
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", String)
+    ], testFilter.prototype, "b", void 0);
+    tslib_1.__decorate([
+        remult3_1.Field(),
+        tslib_1.__metadata("design:type", String)
+    ], testFilter.prototype, "c", void 0);
+    testFilter = tslib_1.__decorate([
+        remult3_1.Entity("testfilter", { allowApiCrud: true })
+    ], testFilter);
+    return testFilter;
+}());
 var testStringWithNull = /** @class */ (function (_super) {
     tslib_1.__extends(testStringWithNull, _super);
     function testStringWithNull() {

package/src/shared-tests/test-custom-id-column.spec.js

@@ -18,9 +18,10 @@ describe("custom id column", function () {
                             }
                             return class_1;
                         }(remult3_1.EntityBase));
-                        remult3_1.Entity('custom', { allowApiCrud: true })(type);
-                        remult3_1.Field()(type.prototype, 'a');
-                        remult3_1.Field()(type.prototype, 'b');
+                        remult3_1.BuildEntity(type, 'custom', {
+                            a: remult3_1.Field(),
+                            b: remult3_1.Field()
+                        }, { allowApiCrud: true });
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
                         c = _b.sent();