Fix corner cases

CHANGELOG.md

@@ -187,8 +187,9 @@ This change log follows the format documented in [Keep a CHANGELOG].
   ```
 
   Also these functions now accept an object with `start` and `end` properties
-  instead of two arguments as an interval. All these functions, as before,
-  throw an exception if the start of the interval is after its end.
+  instead of two arguments as an interval. All these functions
+  throw `RangeError` if the start of the interval is after its end
+  or if any date in interval is `Invalid Date`.
 
   ```javascript
   // Before v2.0.0
@@ -311,7 +312,43 @@ This change log follows the format documented in [Keep a CHANGELOG].
 
   We introduce this change to make *date-fns* consistent with ECMAScript behavior
   that try to coerce arguments to the expected type
-  (which is also the case with other *date-fns* functions). 
+  (which is also the case with other *date-fns* functions).
+
+- **BREAKING**: `partialMethod` option in `distanceInWordsStrict` is renamed to `roundingMethod`.
+
+  ```javascript
+  // Before v2.0.0
+  var options = {partialMethod: 'ceil'}
+  // v2.0.0 onward
+  var options = {roundingMethod: 'ceil'}
+
+  var result = distanceInWordsStrict(
+    new Date(1986, 3, 4, 10, 32, 0),
+    new Date(1986, 3, 4, 10, 33, 1),
+    options
+  )
+  ```
+
+- **BREAKING**: functions now throw `RangeError` if optional values passed to `options`
+  are not `undefined` or have expected values.
+  This change is introduced for consistency with ECMAScript standard library which does the same.
+  See [docs/Options.js](https://github.com/date-fns/date-fns/blob/master/docs/Options.js)
+
+- **BREAKING**: all functions now handle arguments by following rules:
+
+  - as before, arguments expected to be `Date` are converted to `Date` using *date-fns'* `toDate` function;
+  - arguments expected to be numbers are converted to numbers using JavaScript's `Number` function;
+  - arguments expected to be strings arguments are converted to strings using JavaScript's `String` function.
+
+  If any of resulting arguments is invalid (i.e. `NaN` for numbers and `Invalid Date` for dates),
+  an invalid value will be returned:
+
+  - `false` for functions that return booleans (expect `isValid`);
+  - `Invalid Date` for functions that return dates;
+  - `NaN` for functions that return numbers;
+  - and `String('Invalid Date')` for functions that return strings.
+
+  See tests and PR [#460](https://github.com/date-fns/date-fns/pull/460) for exact behavior.
 
 - Every function now has `options` as the last argument which is passed to all its dependencies
   for consistency and future features.

docs/Options.js

@@ -6,9 +6,9 @@
  * An object passed as the last optional argument to all functions.
  *
  * @typedef {Object} Options
- * @property {Number} [weekStartsOn=0] - the index of the first day of the week (0 - Sunday).
+ * @property {0|1|2|3|4|5|6} [weekStartsOn=0] - the index of the first day of the week (0 - Sunday).
  *   Used by `differenceInCalendarWeeks`, `endOfWeek`, `isSameWeek`,
- *   `isThisWeek`, `lastDayOfWeek`, `setDay`, and `startOfWeek`
+ *   `lastDayOfWeek`, `parse`, `setDay`, and `startOfWeek`
  * @property {0|1|2} [additionalDigits=2] - the additional number of digits in the extended year format.
  *   Used by all functions that take String as Date-like argument.
  *   Internally, passed to `toDate` to specify which way to convert extended year formatted String to Date.
@@ -22,9 +22,19 @@
  *   If true, the result will indicate if the second date is earlier or later than the first
  * @property {'s'|'m'|'h'|'d'|'M'|'Y'} [unit] - used by `distanceInWordsStrict`.
  *   If specified, will force a unit
- * @property {'floor'|'ceil'|'round'} [partialMethod='floor'] - used by `distanceInWordsStrict`.
+ * @property {'floor'|'ceil'|'round'} [roundingMethod='floor'] - used by `distanceInWordsStrict`.
  *   Specifies, which way to round partial units
  *
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2.
+ *   Thrown by **all** functions
+ * @throws {RangeError} `options.weekStartsOn` must be between 0 and 6.
+ *   Thrown by `differenceInCalendarWeeks`, `endOfWeek`, `isSameWeek`,
+ *   `lastDayOfWeek`, `parse`, `setDay`, and `startOfWeek`.
+ * @throws {RangeError} `options.roundingMethod` must be 'floor', 'ceil' or 'round'.
+ *   Thrown by `distanceInWordsStrict`
+ * @throws {RangeError} `options.unit` must be 's', 'm', 'h', 'd', 'M' or 'Y'.
+ *   Thrown by `distanceInWordsStrict`
+ *
  * @example
  * // For 15 December 12345 AD, represent the start of the week in Esperanto,
  * // if the first day of the week is Monday:

src/addDays/index.js

@@ -11,7 +11,9 @@ import toDate from '../toDate/index.js'
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of days to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the days added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 10 days to 1 September 2014:

src/addDays/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {

src/addDays/test.js

@@ -31,4 +31,20 @@ describe('addDays', function () {
     addDays(date, 11)
     assert.deepEqual(date, new Date(2014, 8 /* Sep */, 1))
   })
+
+  it('returns `Invalid Date` if the given date is invalid', function () {
+    var result = addDays(new Date(NaN), 10)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('returns `Invalid Date` if the given amount is NaN', function () {
+    var result = addDays(new Date(2014, 8 /* Sep */, 1), NaN)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('throws `RangeError` if `options.additionalDigits` is not convertable to 0, 1, 2 or undefined', function () {
+    // $ExpectedMistake
+    var block = addDays.bind(null, new Date(2014, 8 /* Sep */, 1), 10, {additionalDigits: NaN})
+    assert.throws(block, RangeError)
+  })
 })

src/addHours/index.js

@@ -13,7 +13,9 @@ var MILLISECONDS_IN_HOUR = 3600000
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of hours to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the hours added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 2 hours to 10 July 2014 23:00:00:

src/addHours/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {

src/addHours/test.js

@@ -35,4 +35,20 @@ describe('addHours', function () {
     addHours(date, 10)
     assert.deepEqual(date, new Date(2014, 6 /* Jul */, 10, 23, 0))
   })
+
+  it('returns `Invalid Date` if the given date is invalid', function () {
+    var result = addHours(new Date(NaN), 2)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('returns `Invalid Date` if the given amount is NaN', function () {
+    var result = addHours(new Date(2014, 6 /* Jul */, 10, 23, 0), NaN)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('throws `RangeError` if `options.additionalDigits` is not convertable to 0, 1, 2 or undefined', function () {
+    // $ExpectedMistake
+    var block = addHours.bind(null, new Date(2014, 6 /* Jul */, 10, 23, 0), 2, {additionalDigits: NaN})
+    assert.throws(block, RangeError)
+  })
 })

src/addISOYears/index.js

@@ -14,7 +14,9 @@ import setISOYear from '../setISOYear/index.js'
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of ISO week-numbering years to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the ISO week-numbering years added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 5 ISO week-numbering years to 2 July 2010:

src/addISOYears/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {

src/addISOYears/test.js

@@ -42,4 +42,20 @@ describe('addISOYears', function () {
     var result = addISOYears(initialDate, 5)
     assert.deepEqual(result, expectedResult)
   })
+
+  it('returns `Invalid Date` if the given date is invalid', function () {
+    var result = addISOYears(new Date(NaN), 5)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('returns `Invalid Date` if the given amount is NaN', function () {
+    var result = addISOYears(new Date(2010, 6 /* Jul */, 2), NaN)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('throws `RangeError` if `options.additionalDigits` is not convertable to 0, 1, 2 or undefined', function () {
+    // $ExpectedMistake
+    var block = addISOYears.bind(null, new Date(2010, 6 /* Jul */, 2), 5, {additionalDigits: NaN})
+    assert.throws(block, RangeError)
+  })
 })

src/addMilliseconds/index.js

@@ -11,7 +11,9 @@ import toDate from '../toDate/index.js'
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of milliseconds to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the milliseconds added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 750 milliseconds to 10 July 2014 12:45:30.000:

src/addMilliseconds/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {

src/addMilliseconds/test.js

@@ -35,4 +35,20 @@ describe('addMilliseconds', function () {
     addMilliseconds(date, 250)
     assert.deepEqual(date, new Date(2014, 6 /* Jul */, 10, 12, 45, 30, 0))
   })
+
+  it('returns `Invalid Date` if the given date is invalid', function () {
+    var result = addMilliseconds(new Date(NaN), 750)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('returns `Invalid Date` if the given amount is NaN', function () {
+    var result = addMilliseconds(new Date(2014, 6 /* Jul */, 10, 12, 45, 30, 0), NaN)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('throws `RangeError` if `options.additionalDigits` is not convertable to 0, 1, 2 or undefined', function () {
+    // $ExpectedMistake
+    var block = addMilliseconds.bind(null, new Date(2014, 6 /* Jul */, 10, 12, 45, 30, 0), 750, {additionalDigits: NaN})
+    assert.throws(block, RangeError)
+  })
 })

src/addMinutes/index.js

@@ -13,7 +13,9 @@ var MILLISECONDS_IN_MINUTE = 60000
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of minutes to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the minutes added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 30 minutes to 10 July 2014 12:00:00:

src/addMinutes/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {

src/addMinutes/test.js

@@ -35,4 +35,20 @@ describe('addMinutes', function () {
     addMinutes(date, 25)
     assert.deepEqual(date, new Date(2014, 6 /* Jul */, 10, 12, 0))
   })
+
+  it('returns `Invalid Date` if the given date is invalid', function () {
+    var result = addMinutes(new Date(NaN), 30)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('returns `Invalid Date` if the given amount is NaN', function () {
+    var result = addMinutes(new Date(2014, 6 /* Jul */, 10, 12, 0), NaN)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('throws `RangeError` if `options.additionalDigits` is not convertable to 0, 1, 2 or undefined', function () {
+    // $ExpectedMistake
+    var block = addMinutes.bind(null, new Date(2014, 6 /* Jul */, 10, 12, 0), 30, {additionalDigits: NaN})
+    assert.throws(block, RangeError)
+  })
 })

src/addMonths/index.js

@@ -12,7 +12,9 @@ import getDaysInMonth from '../getDaysInMonth/index.js'
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of months to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the months added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 5 months to 1 September 2014:

src/addMonths/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {

src/addMonths/test.js

@@ -48,4 +48,20 @@ describe('addMonths', function () {
     var result = addMonths(initialDate, 1)
     assert.deepEqual(result, expectedResult)
   })
+
+  it('returns `Invalid Date` if the given date is invalid', function () {
+    var result = addMonths(new Date(NaN), 5)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('returns `Invalid Date` if the given amount is NaN', function () {
+    var result = addMonths(new Date(2014, 8 /* Sep */, 1), NaN)
+    assert(result instanceof Date && isNaN(result))
+  })
+
+  it('throws `RangeError` if `options.additionalDigits` is not convertable to 0, 1, 2 or undefined', function () {
+    // $ExpectedMistake
+    var block = addMonths.bind(null, new Date(2014, 8 /* Sep */, 1), 5, {additionalDigits: NaN})
+    assert.throws(block, RangeError)
+  })
 })

src/addQuarters/index.js

@@ -11,7 +11,9 @@ import addMonths from '../addMonths/index.js'
  * @param {Date|String|Number} date - the date to be changed
  * @param {Number} amount - the amount of quarters to be added
  * @param {Options} [options] - the object with options. See [Options]{@link docs/Options}
+ * @param {0|1|2} [options.additionalDigits=2] - passed to `toDate`. See [toDate]{@link docs/toDate}
  * @returns {Date} the new date with the quarters added
+ * @throws {RangeError} `options.additionalDigits` must be 0, 1 or 2
  *
  * @example
  * // Add 1 quarter to 1 September 2014:

src/addQuarters/index.js.flow

@@ -7,13 +7,13 @@ type Interval = {
 }
 
 type Options = {
-  weekStartsOn?: number,
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6,
   additionalDigits?: 0 | 1 | 2,
   locale?: Locale,
   includeSeconds?: boolean,
   addSuffix?: boolean,
   unit?: 's' | 'm' | 'h' | 'd' | 'M' | 'Y',
-  partialMethod?: 'floor' | 'ceil' | 'round'
+  roundingMethod?: 'floor' | 'ceil' | 'round'
 }
 
 type Locale = {