Release 6.0.2

Author: rsaenen

CHANGELOG.md

@@ -1,3 +1,5 @@
+### [6.0.2]
+- Fix issue with date/min-date/max-date validators with Moment.js and NgbDateStruct for months January and December
 ### [6.0.1]
 - Date supports Moment.js
 ### [6.0.0]

package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/ng-packagr/ng-package.schema.json",
   "name": "ngx-custom-validators",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Angular custom directives for validation",
   "scripts": {
     "ng": "ng",

src/app/date/validator.spec.ts

@@ -20,6 +20,26 @@ describe('Date', () => {
     expect(date(control)).toBeNull();
   });
 
+  it('"moment(2018-01-01)" should be date', () => {
+    const control = new FormControl(moment('2018-01-01'));
+    expect(date(control)).toBeNull();
+  });
+
+  it('"moment(2018-12-31)" should be date', () => {
+    const control = new FormControl(moment('2018-12-31'));
+    expect(date(control)).toBeNull();
+  });
+
+  it('"object { year: 2017, month: 1, day: 11}" should be date', () => {
+    const control = new FormControl({ year: 2017, month: 1, day: 11});
+    expect(date(control)).toBeNull();
+  });
+
+  it('"object { year: 2017, month: 12, day: 11}" should be date', () => {
+    const control = new FormControl({ year: 2017, month: 12, day: 11});
+    expect(date(control)).toBeNull();
+  });
+
   it('"2013-13-12" should not be date', () => {
     const control = new FormControl('2013-13-12');
     expect(date(control)).toEqual(error);
@@ -34,4 +54,14 @@ describe('Date', () => {
     const control = new FormControl(moment('2018-17-56'));
     expect(date(control)).toEqual(error);
   });
+
+  it('"moment(2018-13-01)" should not be date', () => {
+    const control = new FormControl(moment('2018-13-01'));
+    expect(date(control)).toEqual(error);
+  });
+
+  it('"object { year: 2017, month: 13, day: 11}" should not be date', () => {
+    const control = new FormControl({ year: 2017, month: 13, day: 11});
+    expect(date(control)).toEqual(error);
+  });
 });

src/app/min-date/validator.spec.ts

@@ -1,7 +1,8 @@
+import * as moment from 'moment';
 import { FormControl } from '@angular/forms';
-
 import { minDate } from './validator';
 
+
 describe('MinDate', () => {
   let control: FormControl;
 
@@ -30,6 +31,11 @@ describe('MinDate', () => {
     expect(minDate('2016-09-09')(control)).toBeNull();
   });
 
+  it('"Date(2016-09-10)" moment should equal to "null"', () => {
+    control = new FormControl('2016-09-10');
+    expect(minDate(moment('2016-09-09'))(control)).toBeNull();
+  });
+
   it('() => Date("2016-09-08)" should equal to "{minDate: true, error: \'lower than minDate\'}"', () => {
     control = new FormControl('2016-09-08');
     expect(minDate('2016-09-09')(control)).toEqual({minDate: true, error: 'lower than minDate'});
@@ -64,6 +70,12 @@ describe('MinDate', () => {
     expect(minDate(obj)(control)).toEqual({minDate: true, error: 'lower than minDate'});
   });
 
+  it('Date object { year: 2017, month: 11, day: 11} moment should equal to "{minDate: true, error: \'lower than minDate\'}"', () => {
+    const obj = { year: 2017, month: 11, day: 11};
+    control = new FormControl(moment('2017-10-01'));
+    expect(minDate(obj)(control)).toEqual({minDate: true, error: 'lower than minDate'});
+  });
+
   it('Date form control should equal to "null"', () => {
     const control2 = new FormControl('2017-01-01');
     control = new FormControl('2018-11-01');

src/app/util/lang.ts

@@ -11,12 +11,12 @@ export function parseDate(obj: any): string {
     // Moment.js
     if (obj._d instanceof Date) {
       const d = obj._d as Date;
-      return `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
+      return `${d.getFullYear()}-${d.getMonth() + 1}-${d.getDate()}`;
     }
 
     // NgbDateStruct
     if (typeof obj === 'object' && obj.year != null && obj.month != null && obj.day != null) {
-      return `${obj.year}-${+obj.month - 1}-${obj.day}`;
+      return `${obj.year}-${+obj.month}-${obj.day}`;
     }
   } catch (e) {}
   return obj;