remult 0.13.16 → 0.13.19

package/package.json

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

package/readme.md

@@ -21,6 +21,8 @@
 	<a href="https://snyk.io/test/npm/remult">
 		<img alt="snyk" src="https://snyk.io/test/npm/remult/badge.svg"/>
 		</a>
+	<a href="https://github.com/remult/remult/pulse" alt="Activity">
+        <img src="https://img.shields.io/github/commit-activity/m/remult/remult" /></a>
 </div>
 
 ## What is Remult?

package/remult-knex/index.js

@@ -18,28 +18,28 @@ var KnexDataProvider = /** @class */ (function () {
     };
     KnexDataProvider.prototype.transaction = function (action) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var t, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            var t, err_1;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0: return [4 /*yield*/, this.knex.transaction()];
                     case 1:
-                        t = _b.sent();
-                        _b.label = 2;
+                        t = _a.sent();
+                        _a.label = 2;
                     case 2:
-                        _b.trys.push([2, 5, , 7]);
+                        _a.trys.push([2, 5, , 7]);
                         return [4 /*yield*/, action(new KnexDataProvider(t))];
                     case 3:
-                        _b.sent();
+                        _a.sent();
                         return [4 /*yield*/, t.commit()];
                     case 4:
-                        _b.sent();
+                        _a.sent();
                         return [3 /*break*/, 7];
                     case 5:
-                        _a = _b.sent();
+                        err_1 = _a.sent();
                         return [4 /*yield*/, t.rollback()];
                     case 6:
-                        _b.sent();
-                        return [3 /*break*/, 7];
+                        _a.sent();
+                        throw err_1;
                     case 7: return [2 /*return*/];
                 }
             });
@@ -516,7 +516,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
     }
     KnexSchemaBuilder.prototype.verifyStructureOfAllEntities = function (remult) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var allEntities_1, allEntities_1_1, entity, metadata, err_1, _a, _b, _c, e_6_1;
+            var allEntities_1, allEntities_1_1, entity, metadata, err_2, _a, _b, _c, e_6_1;
             var e_6, _d;
             return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
@@ -547,12 +547,12 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         _e.label = 7;
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        err_1 = _e.sent();
+                        err_2 = _e.sent();
                         _b = (_a = console).log;
                         _c = "failed verify structure of ";
                         return [4 /*yield*/, metadata.getDbName()];
                     case 9:
-                        _b.apply(_a, [_c + (_e.sent()) + " ", err_1]);
+                        _b.apply(_a, [_c + (_e.sent()) + " ", err_2]);
                         return [3 /*break*/, 10];
                     case 10:
                         allEntities_1_1 = allEntities_1.next();
@@ -662,7 +662,7 @@ 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_9_1, err_2;
+            var e, _loop_2, this_2, _a, _b, col, e_9_1, err_3;
             var e_9, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
@@ -714,8 +714,8 @@ var KnexSchemaBuilder = /** @class */ (function () {
                         return [7 /*endfinally*/];
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        err_2 = _d.sent();
-                        console.log(err_2);
+                        err_3 = _d.sent();
+                        console.log(err_3);
                         return [3 /*break*/, 12];
                     case 12: return [2 /*return*/];
                 }

package/remult-mongo.js

@@ -14,29 +14,29 @@ var MongoDataProvider = /** @class */ (function () {
     };
     MongoDataProvider.prototype.transaction = function (action) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var session, _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            var session, err_1;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0: return [4 /*yield*/, this.client.startSession()];
                     case 1:
-                        session = _b.sent();
+                        session = _a.sent();
                         session.startTransaction();
-                        _b.label = 2;
+                        _a.label = 2;
                     case 2:
-                        _b.trys.push([2, 5, , 7]);
+                        _a.trys.push([2, 5, , 7]);
                         return [4 /*yield*/, action(new MongoDataProvider(this.db, undefined))];
                     case 3:
-                        _b.sent();
+                        _a.sent();
                         return [4 /*yield*/, session.commitTransaction()];
                     case 4:
-                        _b.sent();
+                        _a.sent();
                         return [3 /*break*/, 7];
                     case 5:
-                        _a = _b.sent();
+                        err_1 = _a.sent();
                         return [4 /*yield*/, session.abortTransaction()];
                     case 6:
-                        _b.sent();
-                        return [3 /*break*/, 7];
+                        _a.sent();
+                        throw err_1;
                     case 7: return [2 /*return*/];
                 }
             });

package/server/expressBridge.d.ts

@@ -19,7 +19,7 @@ export declare function remultExpress(options?: {
     logApiEndPoints?: boolean;
     defaultGetLimit?: number;
     entities?: ClassType<any>[];
-    controllers?: [];
+    controllers?: ClassType<any>[];
 }): RemultExpressBridge;
 export interface RemultExpressBridge extends express.RequestHandler {
     getRemult(req: express.Request): Promise<Remult>;

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

@@ -176,7 +176,18 @@ db_tests_setup_1.testAll("transactions", function (_a) {
     });
 });
 var client = new mongodb_1.MongoClient("mongodb://localhost:27017/local");
-var mongoDbPromise = client.connect().then(function (c) { return c.db("test"); });
+var done;
+var mongoDbPromise = client.connect().then(function (c) {
+    done = c;
+    return c.db("test");
+});
+afterAll(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    return tslib_1.__generator(this, function (_a) {
+        if (done)
+            done.close();
+        return [2 /*return*/];
+    });
+}); });
 function testMongo(key, what, focus) {
     var _this = this;
     if (focus === void 0) { focus = false; }

package/src/remult3/RepositoryImplementation.d.ts

@@ -46,6 +46,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     count(where?: EntityFilter<entityType>): Promise<number>;
     private cache;
     findFirst(where?: EntityFilter<entityType>, options?: FindFirstOptions<entityType>): Promise<entityType>;
+    private fieldsOf;
     create(item?: Partial<OmitEB<entityType>>): entityType;
     fromJson(json: any, newRow?: boolean): Promise<entityType>;
     findId(id: any, options?: FindFirstOptionsBase<entityType>): Promise<entityType>;

package/src/remult3/RepositoryImplementation.js

@@ -239,7 +239,7 @@ var RepositoryImplementation = /** @class */ (function () {
         if (!ref) {
             var instance = new this.entity(this.remult);
             try {
-                for (var _b = tslib_1.__values(this.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = tslib_1.__values(this.fieldsOf(entity)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var field = _c.value;
                     instance[field.key] = entity[field.key];
                 }
@@ -521,12 +521,16 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
+    RepositoryImplementation.prototype.fieldsOf = function (item) {
+        var keys = Object.keys(item);
+        return this.metadata.fields.toArray().filter(function (x) { return keys.includes(x.key); });
+    };
     RepositoryImplementation.prototype.create = function (item) {
         var e_8, _a;
         var r = new this.entity(this.remult);
         if (item)
             try {
-                for (var _b = tslib_1.__values(this.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = tslib_1.__values(this.fieldsOf(item)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var field = _c.value;
                     r[field.key] = item[field.key];
                 }
@@ -550,7 +554,7 @@ var RepositoryImplementation = /** @class */ (function () {
                     case 0:
                         obj = {};
                         try {
-                            for (_a = tslib_1.__values(this.metadata.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
+                            for (_a = tslib_1.__values(this.fieldsOf(json)), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 col = _b.value;
                                 if (json[col.key] !== undefined) {
                                     obj[col.key] = col.valueConverter.fromJson(json[col.key]);
@@ -1896,11 +1900,12 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     FieldRefImplementation.prototype.__performValidation = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var x, _a, _b, v, e_30_1;
+            var x, _a, _b, v, e_30_1, error_1;
             var e_30, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        _d.trys.push([0, 12, , 13]);
                         x = typeof (this.settings.validate);
                         if (!Array.isArray(this.settings.validate)) return [3 /*break*/, 9];
                         _d.label = 1;
@@ -1936,7 +1941,15 @@ var FieldRefImplementation = /** @class */ (function () {
                     case 10:
                         _d.sent();
                         _d.label = 11;
-                    case 11: return [2 /*return*/];
+                    case 11: return [3 /*break*/, 13];
+                    case 12:
+                        error_1 = _d.sent();
+                        if (typeof error_1 === "string")
+                            this.error = error_1;
+                        else
+                            this.error = error_1.message;
+                        return [3 /*break*/, 13];
+                    case 13: return [2 /*return*/];
                 }
             });
         });

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

@@ -18,8 +18,8 @@ function testAll(key, what, focus) {
     if (focus === void 0) { focus = false; }
     try {
         for (var databasesTesters_1 = tslib_1.__values(databasesTesters), databasesTesters_1_1 = databasesTesters_1.next(); !databasesTesters_1_1.done; databasesTesters_1_1 = databasesTesters_1.next()) {
-            var test = databasesTesters_1_1.value;
-            test(key, what, focus);
+            var test_1 = databasesTesters_1_1.value;
+            test_1(key, what, focus);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -40,8 +40,8 @@ function addDatabaseToTest(tester) {
     var e_2, _a;
     try {
         for (var loadedTests_1 = tslib_1.__values(loadedTests), loadedTests_1_1 = loadedTests_1.next(); !loadedTests_1_1.done; loadedTests_1_1 = loadedTests_1.next()) {
-            var test = loadedTests_1_1.value;
-            test(tester);
+            var test_2 = loadedTests_1_1.value;
+            test_2(tester);
         }
     }
     catch (e_2_1) { e_2 = { error: e_2_1 }; }

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

@@ -1546,3 +1546,33 @@ db_tests_setup_1.testAll("task with enum string", function (_a) {
         });
     });
 });
+db_tests_setup_1.testAll("test transaction rollback", function (_a) {
+    var db = _a.db;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var fail, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    fail = true;
+                    _c.label = 1;
+                case 1:
+                    _c.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, db.transaction(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            return tslib_1.__generator(this, function (_a) {
+                                throw "error";
+                            });
+                        }); })];
+                case 2:
+                    _c.sent();
+                    fail = false;
+                    return [3 /*break*/, 4];
+                case 3:
+                    _b = _c.sent();
+                    return [3 /*break*/, 4];
+                case 4:
+                    expect(fail).toBe(true);
+                    return [2 /*return*/];
+            }
+        });
+    });
+});