qrono 1.2.1 → 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,
@@ -33,16 +33,6 @@ const defaultContext = {
   disambiguation: 'compatible',
 }
 
-for (const key of fields(defaultContext)) {
-  Qrono[key] = function (arg) {
-    if (given(arg)) {
-      defaultContext[key] = arg
-      return this
-    }
-    return defaultContext[key]
-  }
-}
-
 Qrono.context = function (context) {
   if (given(context)) {
     for (const key of fields(defaultContext)) {
@@ -56,16 +46,6 @@ Qrono.context = function (context) {
   return { ...defaultContext }
 }
 
-Qrono.asUtc = function () {
-  defaultContext.localtime = false
-  return this
-}
-
-Qrono.asLocaltime = function () {
-  defaultContext.localtime = true
-  return this
-}
-
 const monday = 1
 const tuesday = 2
 const wednesday = 3
@@ -111,9 +91,8 @@ function Qrono(...args) {
   self.context(defaultContext)
   if (args[0] instanceof Qrono) {
     const source = args.shift()
-    for (const key of fields(self)) {
-      self[key] = source[key]()
-    }
+    self.nativeDate = source.nativeDate()
+    self.context(source.context())
   }
   if (isObject(args[0]) && !hasDatetimeField(args[0])) {
     self.context(args.shift())
@@ -167,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
 }
 
@@ -205,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(),
@@ -322,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 () {
@@ -331,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()
@@ -373,25 +349,11 @@ Qrono.prototype.offset = function () {
     : 0
 }
 
-Qrono.prototype.localtime = function (arg) {
-  return given(arg) ? this.clone({ localtime: arg }) : this[internal].localtime
-}
-
-Qrono.prototype.disambiguation = function (arg) {
-  return given(arg)
-    ? this.clone({ disambiguation: arg })
-    : this[internal].disambiguation
-}
-
 Qrono.prototype.valid = function () {
   return this[internal].valid()
 }
 
 // Transform
-Qrono.prototype.numeric = function () {
-  return this[internal].nativeDate.getTime()
-}
-
 Qrono.prototype.toObject = function () {
   return {
     year: this.year(),
@@ -420,17 +382,8 @@ Qrono.prototype.toDate = function (...args) {
   return new QronoDate(this.clone(...args))
 }
 
-// Context
-Qrono.prototype.asUtc = function () {
-  return this.clone({ localtime: false })
-}
-
-Qrono.prototype.asLocaltime = function () {
-  return this.clone({ localtime: true })
-}
-
 // Accessor
-for (const [field, native, offset] of [
+for (const [field, native, base] of [
   ['year', 'FullYear', 0],
   ['month', 'Month', 1],
   ['day', 'Date', 0],
@@ -442,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
   }
 }
 
@@ -479,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
   }
@@ -490,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
   }
@@ -558,28 +512,34 @@ Qrono.prototype.startOfDay = function () {
   const timestamp = this.clone(
     { disambiguation: 'later' },
     { hour: 0, minute: 0, second: 0, millisecond: 0 }
-  ).numeric()
+  ).valueOf()
   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) {
@@ -594,7 +554,7 @@ function plus(sign, ...args) {
   const arg0 = args[0]
   const arg1 = args[1]
   if (Number.isFinite(arg0) && !Number.isFinite(arg1)) {
-    return this.clone(this.numeric() + arg0)
+    return this.clone(this.valueOf() + arg0)
   }
   let timeFields = null
   if (isObject(arg0)) {
@@ -710,10 +670,6 @@ QronoDate.prototype.toDatetime = function () {
   return qrono(this[internalDate].datetime.toArray())
 }
 
-QronoDate.prototype.numeric = function () {
-  return this[internalDate].datetime.numeric() / millisecondsPerDay
-}
-
 QronoDate.prototype.toObject = function () {
   return {
     year: this.year(),
@@ -726,17 +682,12 @@ 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}`]())
+  }
 }
 
-QronoDate.prototype.startOfDay = function () {
-  return this[internalDate].datetime.clone()
-}
 for (const field of ['year', 'month', 'day']) {
   QronoDate.prototype[field] = function (value) {
     if (given(value)) {
@@ -759,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' },
@@ -776,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.
@@ -217,40 +217,6 @@ declare namespace qrono {
    */
   export function context(context: Context): typeof qrono
 
-  /**
-   * Returns whether the global context is localtime.
-   */
-  export function localtime(): boolean
-
-  /**
-   * Sets whether localtime is enabled.
-   * @param value - True to set the global context localtime.
-   * @returns The qrono object.
-   */
-  export function localtime(value: boolean): typeof qrono
-
-  /**
-   * Returns the current global disambiguation option.
-   */
-  export function disambiguation(): Disambiguation
-
-  /**
-   * Sets the global disambiguation option.
-   * @param value - The disambiguation option to set.
-   * @returns The qrono object.
-   */
-  export function disambiguation(value: Disambiguation): typeof qrono
-
-  /**
-   * Returns new qrono instance with UTC context.
-   */
-  export function asUtc(): typeof qrono
-
-  /**
-   * Returns new qrono instance with localtime context.
-   */
-  export function asLocaltime(): typeof qrono
-
   /**
    * The four disambiguation options for resolving ambiguous local times,
    * mirroring the Temporal API.
@@ -320,40 +286,11 @@ declare namespace qrono {
      */
     offset(): number
 
-    /**
-     * Returns whether localtime is enabled for the Qrono instance.
-     */
-    localtime(): boolean
-
-    /**
-     * Sets whether localtime is enabled for the Qrono instance.
-     * @param yes - True to enable localtime, false to disable.
-     * @returns The Qrono instance.
-     */
-    localtime(yes: boolean): Qrono
-
-    /**
-     * Returns the current disambiguation option of the Qrono instance.
-     */
-    disambiguation(): Disambiguation
-
-    /**
-     * Sets the disambiguation option of the Qrono instance.
-     * @param value - The disambiguation option.
-     * @returns A new Qrono instance with the updated disambiguation.
-     */
-    disambiguation(value: Disambiguation): Qrono
-
     /**
      * Returns whether the Qrono instance is valid.
      */
     valid(): boolean
 
-    /**
-     * Returns the numeric value of the Qrono instance.
-     */
-    numeric(): number
-
     /**
      * Returns the object representation of the Qrono instance.
      */
@@ -377,18 +314,6 @@ declare namespace qrono {
      */
     toDate(): QronoDate
 
-    /**
-     * Sets the context to UTC.
-     * @returns The Qrono instance.
-     */
-    asUtc(): Qrono
-
-    /**
-     * Sets the context to localtime.
-     * @returns The Qrono instance.
-     */
-    asLocaltime(): Qrono
-
     /**
      * Returns the year of the Qrono instance.
      */
@@ -501,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.
@@ -511,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.
@@ -681,11 +606,6 @@ declare namespace qrono {
      */
     valid(): boolean
 
-    /**
-     * Returns the numeric value of the QronoDate instance.
-     */
-    numeric(): number
-
     /**
      * Returns the object representation of the QronoDate instance.
      */
@@ -769,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.
@@ -806,11 +726,6 @@ declare namespace qrono {
      */
     startOfMonth(): QronoDate
 
-    /**
-     * Returns a new QronoDate instance representing the start of the day.
-     */
-    startOfDay(): Qrono
-
     /**
      * Returns a new QronoDate instance representing the end of the year.
      */