remult 0.22.1 → 0.22.2

package/esm/remult-mongo.js

@@ -59,7 +59,7 @@ class MongoEntityDataProvider {
         this.entity = entity;
         this.session = session;
     }
-    translateFromJson(row, nameProvider) {
+    translateFromDb(row, nameProvider) {
         let result = {};
         for (const col of this.entity.fields) {
             let val = row[nameProvider.$dbNameOf(col)];
@@ -69,7 +69,7 @@ class MongoEntityDataProvider {
         }
         return result;
     }
-    translateToJson(row, nameProvider) {
+    translateToDb(row, nameProvider) {
         let result = {};
         for (const col of this.entity.fields) {
             let val = col.valueConverter.toDb(row[col.key]);
@@ -109,7 +109,7 @@ class MongoEntityDataProvider {
         }
         return await Promise.all(await collection
             .find(where, op)
-            .map((x) => this.translateFromJson(x, e))
+            .map((x) => this.translateFromDb(x, e))
             .toArray());
     }
     async update(id, data) {
@@ -129,7 +129,7 @@ class MongoEntityDataProvider {
         for (const f of this.entity.fields) {
             if (!f.dbReadOnly && !f.isServerExpression) {
                 if (keys.includes(f.key)) {
-                    newR[f.key] = f.valueConverter.toJson(data[f.key]);
+                    newR[f.key] = f.valueConverter.toDb(data[f.key]);
                 }
             }
         }
@@ -148,10 +148,10 @@ class MongoEntityDataProvider {
     }
     async insert(data) {
         let { collection, e } = await this.collection();
-        let r = await collection.insertOne(await this.translateToJson(data, e), {
+        let r = await collection.insertOne(await this.translateToDb(data, e), {
             session: this.session,
         });
-        return await this.translateFromJson(await collection.findOne({ _id: r.insertedId }, { session: this.session }), e);
+        return await this.translateFromDb(await collection.findOne({ _id: r.insertedId }, { session: this.session }), e);
     }
     async collection() {
         const e = await dbNamesOf(this.entity);

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

@@ -199,4 +199,24 @@ testMongoNoTrans('transactions mongo no trans', async ({ db, createEntity }) =>
     }
     expect(await x.count()).toBe(1);
 }, false);
+testMongoNoTrans('test Dates', async ({ createEntity }) => {
+    const c = class {
+    };
+    describeClass(c, Entity('test_dates_on_mongo'), {
+        id: Fields.integer(),
+        date: Fields.date(),
+    });
+    const r = await createEntity(c);
+    let x = await r.insert({ id: 1, date: new Date(1976, 5, 16) });
+    const client = new MongoClient('mongodb://localhost:27017/local');
+    await client.connect();
+    const mongoDb = client.db('test');
+    expect((await mongoDb.collection(await r.metadata.getDbName()).findOne())
+        .date instanceof Date).toBe(true);
+    x.date = new Date(1978, 2, 15);
+    await r.save(x);
+    expect((await mongoDb.collection(await r.metadata.getDbName()).findOne())
+        .date instanceof Date).toBe(true);
+    //let z = await r.save({ ...x, date: new Date(1978, 2, 15) })
+}, false);
 import '../shared-tests';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.22.1",
+    "version": "0.22.2",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/remult-mongo.js

@@ -101,7 +101,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
         this.entity = entity;
         this.session = session;
     }
-    MongoEntityDataProvider.prototype.translateFromJson = function (row, nameProvider) {
+    MongoEntityDataProvider.prototype.translateFromDb = function (row, nameProvider) {
         var e_1, _a;
         var result = {};
         try {
@@ -122,7 +122,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
         }
         return result;
     };
-    MongoEntityDataProvider.prototype.translateToJson = function (row, nameProvider) {
+    MongoEntityDataProvider.prototype.translateToDb = function (row, nameProvider) {
         var e_2, _a;
         var result = {};
         try {
@@ -206,7 +206,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                         _e = (_d = Promise).all;
                         return [4 /*yield*/, collection
                                 .find(where, op)
-                                .map(function (x) { return _this.translateFromJson(x, e); })
+                                .map(function (x) { return _this.translateFromDb(x, e); })
                                 .toArray()];
                     case 3: return [4 /*yield*/, _e.apply(_d, [_g.sent()])];
                     case 4: return [2 /*return*/, _g.sent()];
@@ -250,7 +250,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                                 f_1 = _e.value;
                                 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]);
+                                        newR[f_1.key] = f_1.valueConverter.toDb(data[f_1.key]);
                                     }
                                 }
                             }
@@ -305,13 +305,13 @@ var MongoEntityDataProvider = /** @class */ (function () {
                     case 1:
                         _a = _e.sent(), collection = _a.collection, e = _a.e;
                         _c = (_b = collection).insertOne;
-                        return [4 /*yield*/, this.translateToJson(data, e)];
+                        return [4 /*yield*/, this.translateToDb(data, e)];
                     case 2: return [4 /*yield*/, _c.apply(_b, [_e.sent(), {
                                 session: this.session,
                             }])];
                     case 3:
                         r = _e.sent();
-                        _d = this.translateFromJson;
+                        _d = this.translateFromDb;
                         return [4 /*yield*/, collection.findOne({ _id: r.insertedId }, { session: this.session })];
                     case 4: return [4 /*yield*/, _d.apply(this, [_e.sent(), e])];
                     case 5: return [2 /*return*/, _e.sent()];

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

@@ -390,4 +390,54 @@ exports.testMongoNoTrans('transactions mongo no trans', function (_a) {
         });
     });
 }, false);
+exports.testMongoNoTrans('test Dates', function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var c, r, x, client, mongoDb, _b, _c, _d, _e, _f, _g;
+        return tslib_1.__generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    c = /** @class */ (function () {
+                        function class_2() {
+                        }
+                        return class_2;
+                    }());
+                    DecoratorReplacer_1.describeClass(c, remult3_1.Entity('test_dates_on_mongo'), {
+                        id: remult3_1.Fields.integer(),
+                        date: remult3_1.Fields.date(),
+                    });
+                    return [4 /*yield*/, createEntity(c)];
+                case 1:
+                    r = _h.sent();
+                    return [4 /*yield*/, r.insert({ id: 1, date: new Date(1976, 5, 16) })];
+                case 2:
+                    x = _h.sent();
+                    client = new mongodb_1.MongoClient('mongodb://localhost:27017/local');
+                    return [4 /*yield*/, client.connect()];
+                case 3:
+                    _h.sent();
+                    mongoDb = client.db('test');
+                    _b = expect;
+                    _d = (_c = mongoDb).collection;
+                    return [4 /*yield*/, r.metadata.getDbName()];
+                case 4: return [4 /*yield*/, _d.apply(_c, [_h.sent()]).findOne()];
+                case 5:
+                    _b.apply(void 0, [(_h.sent())
+                            .date instanceof Date]).toBe(true);
+                    x.date = new Date(1978, 2, 15);
+                    return [4 /*yield*/, r.save(x)];
+                case 6:
+                    _h.sent();
+                    _e = expect;
+                    _g = (_f = mongoDb).collection;
+                    return [4 /*yield*/, r.metadata.getDbName()];
+                case 7: return [4 /*yield*/, _g.apply(_f, [_h.sent()]).findOne()];
+                case 8:
+                    _e.apply(void 0, [(_h.sent())
+                            .date instanceof Date]).toBe(true);
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
 require("../shared-tests");