remult 0.18.1-exp.8 → 0.18.1-exp.9

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

@@ -125,13 +125,37 @@ testAll("put with validations on entity fails", async ({ remult, createEntity })
     x = await s.find({ where: { myId: 1 } });
     expect(x[0].name).toBe('noam');
 });
-testAll("test date with null works", async ({ createEntity }) => {
+testAll("test date only with null works", async ({ createEntity }) => {
     let repo = await createEntity(testDateWithNull);
     let r = repo.create({ id: 0 });
     await r.save();
     r = await repo.findFirst();
     expect(r.d).toBeNull();
     expect(await repo.count({ d: null })).toBe(1);
+    r.d = new Date(1976, 5, 16);
+    await r.save();
+    expect(r.d.getFullYear()).toBe(1976);
+    r = await repo.findFirst();
+    expect(r.d.getFullYear()).toBe(1976);
+    r.d = null;
+    await r.save();
+    expect(r.d).toBeNull();
+}, false);
+testAll("test date with null works", async ({ createEntity }) => {
+    let repo = await createEntity(testDateWithNull);
+    let r = repo.create({ id: 0 });
+    await r.save();
+    r = await repo.findFirst();
+    expect(r.fullDate).toBeNull("expected null after");
+    expect(await repo.count({ fullDate: null })).toBe(1);
+    r.fullDate = new Date(1976, 5, 16);
+    await r.save();
+    expect(r.fullDate.getFullYear()).toBe(1976);
+    r = await repo.findFirst();
+    expect(r.fullDate.getFullYear()).toBe(1976);
+    r.fullDate = null;
+    await r.save();
+    expect(r.fullDate).toBeNull();
 }, false);
 testAll("test original value of date", async ({ createEntity }) => {
     let r = await (await createEntity(testDateWithNull)).create({ id: 1, d: new Date(1976, 6, 16) }).save();
@@ -141,6 +165,7 @@ let testDateWithNull = class testDateWithNull extends EntityBase {
     constructor() {
         super(...arguments);
         this.id = 0;
+        this.fullDate = null;
     }
 };
 __decorate([
@@ -151,6 +176,10 @@ __decorate([
     Fields.dateOnly({ allowNull: true }),
     __metadata("design:type", Date)
 ], testDateWithNull.prototype, "d", void 0);
+__decorate([
+    Fields.date({ allowNull: true }),
+    __metadata("design:type", Date)
+], testDateWithNull.prototype, "fullDate", void 0);
 testDateWithNull = __decorate([
     Entity('testDateWithNull', { allowApiCrud: true })
 ], testDateWithNull);

package/esm/src/valueConverters.js

@@ -3,6 +3,8 @@ export class ValueConverters {
 }
 ValueConverters.Date = {
     toJson: (val) => {
+        if (val === null)
+            return null;
         if (!val)
             return '';
         if (typeof (val) === "string")
@@ -15,6 +17,8 @@ ValueConverters.Date = {
         }
     },
     fromJson: (val) => {
+        if (val === null)
+            return null;
         if (val == undefined)
             return undefined;
         if (val == '')
@@ -70,10 +74,7 @@ ValueConverters.DateOnly = {
     } //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
     ,
     fromDb: (val) => {
-        var d = val;
-        if (!d)
-            return null;
-        return val;
+        return ValueConverters.Date.fromDb(val);
     },
     fieldTypeInDb: 'date',
     displayValue: (value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.18.1-exp.8",
+    "version": "0.18.1-exp.9",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

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

@@ -347,7 +347,7 @@ db_tests_setup_1.testAll("put with validations on entity fails", function (_a) {
         });
     });
 });
-db_tests_setup_1.testAll("test date with null works", function (_a) {
+db_tests_setup_1.testAll("test date only with null works", function (_a) {
     var createEntity = _a.createEntity;
     return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var repo, r, _b;
@@ -368,6 +368,60 @@ db_tests_setup_1.testAll("test date with null works", function (_a) {
                     return [4 /*yield*/, repo.count({ d: null })];
                 case 4:
                     _b.apply(void 0, [_c.sent()]).toBe(1);
+                    r.d = new Date(1976, 5, 16);
+                    return [4 /*yield*/, r.save()];
+                case 5:
+                    _c.sent();
+                    expect(r.d.getFullYear()).toBe(1976);
+                    return [4 /*yield*/, repo.findFirst()];
+                case 6:
+                    r = _c.sent();
+                    expect(r.d.getFullYear()).toBe(1976);
+                    r.d = null;
+                    return [4 /*yield*/, r.save()];
+                case 7:
+                    _c.sent();
+                    expect(r.d).toBeNull();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}, false);
+db_tests_setup_1.testAll("test date with null works", function (_a) {
+    var createEntity = _a.createEntity;
+    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var repo, r, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, createEntity(testDateWithNull)];
+                case 1:
+                    repo = _c.sent();
+                    r = repo.create({ id: 0 });
+                    return [4 /*yield*/, r.save()];
+                case 2:
+                    _c.sent();
+                    return [4 /*yield*/, repo.findFirst()];
+                case 3:
+                    r = _c.sent();
+                    expect(r.fullDate).toBeNull("expected null after");
+                    _b = expect;
+                    return [4 /*yield*/, repo.count({ fullDate: null })];
+                case 4:
+                    _b.apply(void 0, [_c.sent()]).toBe(1);
+                    r.fullDate = new Date(1976, 5, 16);
+                    return [4 /*yield*/, r.save()];
+                case 5:
+                    _c.sent();
+                    expect(r.fullDate.getFullYear()).toBe(1976);
+                    return [4 /*yield*/, repo.findFirst()];
+                case 6:
+                    r = _c.sent();
+                    expect(r.fullDate.getFullYear()).toBe(1976);
+                    r.fullDate = null;
+                    return [4 /*yield*/, r.save()];
+                case 7:
+                    _c.sent();
+                    expect(r.fullDate).toBeNull();
                     return [2 /*return*/];
             }
         });
@@ -394,6 +448,7 @@ var testDateWithNull = /** @class */ (function (_super) {
     function testDateWithNull() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.id = 0;
+        _this.fullDate = null;
         return _this;
     }
     tslib_1.__decorate([
@@ -404,6 +459,10 @@ var testDateWithNull = /** @class */ (function (_super) {
         remult3_1.Fields.dateOnly({ allowNull: true }),
         tslib_1.__metadata("design:type", Date)
     ], testDateWithNull.prototype, "d", void 0);
+    tslib_1.__decorate([
+        remult3_1.Fields.date({ allowNull: true }),
+        tslib_1.__metadata("design:type", Date)
+    ], testDateWithNull.prototype, "fullDate", void 0);
     testDateWithNull = tslib_1.__decorate([
         remult3_1.Entity('testDateWithNull', { allowApiCrud: true })
     ], testDateWithNull);

package/src/valueConverters.js

@@ -8,6 +8,8 @@ var ValueConverters = /** @class */ (function () {
     }
     ValueConverters.Date = {
         toJson: function (val) {
+            if (val === null)
+                return null;
             if (!val)
                 return '';
             if (typeof (val) === "string")
@@ -20,6 +22,8 @@ var ValueConverters = /** @class */ (function () {
             }
         },
         fromJson: function (val) {
+            if (val === null)
+                return null;
             if (val == undefined)
                 return undefined;
             if (val == '')
@@ -75,10 +79,7 @@ var ValueConverters = /** @class */ (function () {
         } //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
         ,
         fromDb: function (val) {
-            var d = val;
-            if (!d)
-                return null;
-            return val;
+            return ValueConverters.Date.fromDb(val);
         },
         fieldTypeInDb: 'date',
         displayValue: function (value) {