qrono 1.3.0 → 1.4.0

package/src/qrono.js

@@ -1,4 +1,4 @@
-/* @ts-self-types="../types/qrono.d.ts" */
+/* @ts-self-types="../types/qrono.d.ts" */
 import {
   has,
   given,
@@ -146,15 +146,12 @@ function valid() {
   return isValidDate(this.nativeDate)
 }
 
-function context(context) {
-  if (!context) {
-    return
-  }
-  for (const key of fields(defaultContext)) {
-    if (has(context, key)) {
-      this[key] = context[key]
-    }
+function context(arg) {
+  if (!arg) {
+    return { localtime: this.localtime, disambiguation: this.disambiguation }
   }
+  if ('localtime' in arg) this.localtime = arg.localtime
+  if ('disambiguation' in arg) this.disambiguation = arg.disambiguation
   return this
 }
 
@@ -184,7 +181,7 @@ function set(values) {
   }
   const dateOnly = !has(values, 'hour', 'minute', 'second', 'millisecond')
   const disambig = dateOnly ? 'later' : this.disambiguation
-  const baseDate = this.nativeDate ?? new Date(0, 0)
+  const baseDate = this.nativeDate ?? new Date(0, 0) // 1900-01-01T00:00:00.000Z
   const newDate = new Date(initialSafeDate.getTime())
   const requested = {
     year: args.year ?? baseDate.getFullYear(),
@@ -301,7 +298,7 @@ function parse(str) {
 // -----------------------------------------------------------------------------
 // Public methods
 // -----------------------------------------------------------------------------
-const p = (v, n) => String(v).padStart(n, '0')
+const pad0 = (v, n) => String(v).padStart(n, '0')
 
 // Basic
 Qrono.prototype.toString = function () {
@@ -310,16 +307,16 @@ Qrono.prototype.toString = function () {
     const offset = -t.getTimezoneOffset()
     const offsetAbs = Math.abs(offset)
     return (
-      `${p(t.getFullYear(), 4)}-` +
-      `${p(t.getMonth() + 1, 2)}-` +
-      `${p(t.getDate(), 2)}T` +
-      `${p(t.getHours(), 2)}:` +
-      `${p(t.getMinutes(), 2)}:` +
-      `${p(t.getSeconds(), 2)}.` +
-      `${p(t.getMilliseconds(), 3)}` +
+      `${pad0(t.getFullYear(), 4)}-` +
+      `${pad0(t.getMonth() + 1, 2)}-` +
+      `${pad0(t.getDate(), 2)}T` +
+      `${pad0(t.getHours(), 2)}:` +
+      `${pad0(t.getMinutes(), 2)}:` +
+      `${pad0(t.getSeconds(), 2)}.` +
+      `${pad0(t.getMilliseconds(), 3)}` +
       `${offset >= 0 ? '+' : '-'}` +
-      `${p(Math.trunc(offsetAbs / minutesPerHour), 2)}:` +
-      `${p(offsetAbs % minutesPerHour, 2)}`
+      `${pad0(Math.trunc(offsetAbs / minutesPerHour), 2)}:` +
+      `${pad0(offsetAbs % minutesPerHour, 2)}`
     )
   }
   return this[internal].nativeDate.toISOString()
@@ -386,7 +383,7 @@ Qrono.prototype.toDate = function (...args) {
 }
 
 // Accessor
-for (const [field, native, offset] of [
+for (const [field, native, base] of [
   ['year', 'FullYear', 0],
   ['month', 'Month', 1],
   ['day', 'Date', 0],
@@ -398,7 +395,7 @@ for (const [field, native, offset] of [
   Qrono.prototype[field] = function (value) {
     return given(value)
       ? this.clone({ [field]: value })
-      : this[internal].getNative(native) + offset
+      : this[internal].getNative(native) + base
   }
 }
 
@@ -435,7 +432,7 @@ Qrono.prototype.isLeapYear = function () {
   return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0)
 }
 
-Qrono.prototype.hasDstInYear = function () {
+Qrono.prototype.hasOffsetChangeInYear = function () {
   if (!this[internal].localtime) {
     return false
   }
@@ -446,18 +443,19 @@ Qrono.prototype.hasDstInYear = function () {
 }
 
 Qrono.prototype.isInDst = function () {
-  if (!this[internal].localtime) {
-    return false
+  if (!this[internal].localtime) return false
+  const offset = this.offset()
+  let past = false,
+    future = false
+  for (let i = 1; i <= 5; i += 2) {
+    if (this.month(-i).offset() < offset) past = true
+    if (this.month(i).offset() < offset) future = true
+    if (past && future) return true
   }
-  const offsets = Array.from({ length: 12 }, (_, index) =>
-    this.month(index + 1).offset()
-  )
-  const minOffset = Math.min(...offsets)
-  const maxOffset = Math.max(...offsets)
-  return minOffset !== maxOffset && this.offset() === maxOffset
+  return false
 }
 
-Qrono.prototype.isDstTransitionDay = function () {
+Qrono.prototype.hasOffsetChangeInDay = function () {
   if (!this[internal].localtime) {
     return false
   }
@@ -518,24 +516,30 @@ Qrono.prototype.startOfDay = function () {
   return this.clone(timestamp)
 }
 
-Qrono.prototype.isSame = function (another) {
-  return +this === +another
-}
-Qrono.prototype.isBefore = function (another) {
-  return this < another
-}
-Qrono.prototype.isAfter = function (another) {
-  return this > another
-}
-Qrono.prototype.isSameOrBefore = function (another) {
-  return this <= another
-}
-Qrono.prototype.isSameOrAfter = function (another) {
-  return this >= another
-}
-Qrono.prototype.isBetween = function (a, b) {
-  return (a <= this && this <= b) || (b <= this && this <= a)
-}
+function implementComparison(prototype) {
+  Object.assign(prototype, {
+    isSame(another) {
+      return +this === +another
+    },
+    isBefore(another) {
+      return this < another
+    },
+    isAfter(another) {
+      return this > another
+    },
+    isSameOrBefore(another) {
+      return this <= another
+    },
+    isSameOrAfter(another) {
+      return this >= another
+    },
+    isBetween(a, b) {
+      return (a <= this && this <= b) || (b <= this && this <= a)
+    },
+  })
+}
+
+implementComparison(Qrono.prototype)
 
 // Calculation
 Qrono.prototype.plus = function (...args) {
@@ -678,12 +682,10 @@ QronoDate.prototype.toArray = function () {
   return [this.year(), this.month(), this.day()]
 }
 
-QronoDate.prototype.startOfYear = function () {
-  return new QronoDate(this[internalDate].datetime.startOfYear())
-}
-
-QronoDate.prototype.startOfMonth = function () {
-  return new QronoDate(this[internalDate].datetime.startOfMonth())
+for (const name of ['Year', 'Month']) {
+  QronoDate.prototype[`startOf${name}`] = function () {
+    return new QronoDate(this[internalDate].datetime[`startOf${name}`]())
+  }
 }
 
 for (const field of ['year', 'month', 'day']) {
@@ -708,7 +710,11 @@ for (const method of [
     return this[internalDate].datetime[method]()
   }
 }
-for (const method of ['minutesInDay', 'hasDstInYear', 'isDstTransitionDay']) {
+for (const method of [
+  'minutesInDay',
+  'hasOffsetChangeInYear',
+  'hasOffsetChangeInDay',
+]) {
   QronoDate.prototype[method] = function () {
     return qrono(
       { disambiguation: 'later' },
@@ -725,24 +731,7 @@ QronoDate.prototype.endOfMonth = function () {
   return this.clone({ day: this.daysInMonth() })
 }
 
-QronoDate.prototype.isSame = function (another) {
-  return +this === +another
-}
-QronoDate.prototype.isBefore = function (another) {
-  return this < another
-}
-QronoDate.prototype.isAfter = function (another) {
-  return this > another
-}
-QronoDate.prototype.isSameOrBefore = function (another) {
-  return this <= another
-}
-QronoDate.prototype.isSameOrAfter = function (another) {
-  return this >= another
-}
-QronoDate.prototype.isBetween = function (a, b) {
-  return (a <= this && this <= b) || (b <= this && this <= a)
-}
+implementComparison(QronoDate.prototype)
 
 QronoDate.prototype.plus = function (...args) {
   return plusDate.call(this, 1, ...args)

package/types/qrono.d.ts

@@ -1,4 +1,4 @@
-export { qrono }
+export { qrono }
 
 /**
  * Creates a new Qrono instance.
@@ -426,7 +426,7 @@ declare namespace qrono {
     /**
      * Returns whether the Qrono instance has daylight saving time in the year.
      */
-    hasDstInYear(): boolean
+    hasOffsetChangeInYear(): boolean
 
     /**
      * Returns whether the Qrono instance is in daylight saving time.
@@ -436,7 +436,7 @@ declare namespace qrono {
     /**
      * Returns whether the Qrono instance is on a daylight saving time transition day.
      */
-    isDstTransitionDay(): boolean
+    hasOffsetChangeInDay(): boolean
 
     /**
      * Returns the number of minutes in the day of the Qrono instance.
@@ -689,12 +689,12 @@ declare namespace qrono {
     /**
      * Returns whether the QronoDate instance has daylight saving time in the year.
      */
-    hasDstInYear(): boolean
+    hasOffsetChangeInYear(): boolean
 
     /**
      * Returns whether the QronoDate instance is on a daylight saving time transition day.
      */
-    isDstTransitionDay(): boolean
+    hasOffsetChangeInDay(): boolean
 
     /**
      * Returns the number of minutes in the day of the QronoDate instance.