@naturalcycles/js-lib 15.8.1 → 15.9.1

package/src/array/array.util.ts

@@ -61,9 +61,9 @@ export function _pushUniq<T>(a: T[], ...items: T[]): T[] {
  * Mutates the array (same as normal `push`).
  */
 export function _pushUniqBy<T>(a: T[], mapper: Mapper<T, any>, ...items: T[]): T[] {
-  const mappedSet = new Set(a.map((item, i) => mapper(item, i)))
-  items.forEach((item, i) => {
-    const mapped = mapper(item, i)
+  const mappedSet = new Set(a.map(mapper))
+  items.forEach(item => {
+    const mapped = mapper(item)
     if (!mappedSet.has(mapped)) {
       a.push(item)
       mappedSet.add(mapped)
@@ -91,8 +91,9 @@ export function _pushUniqBy<T>(a: T[], mapper: Mapper<T, any>, ...items: T[]): T
  */
 export function _uniqBy<T>(arr: readonly T[], mapper: Mapper<T, any>): T[] {
   const map = new Map<any, T>()
-  for (const [i, item] of arr.entries()) {
-    const key = item === undefined || item === null ? item : mapper(item, i)
+  for (let i = 0; i < arr.length; i++) {
+    const item = arr[i]!
+    const key = item === undefined || item === null ? item : mapper(item)
     if (!map.has(key)) map.set(key, item)
   }
   return [...map.values()]
@@ -119,9 +120,16 @@ export function _uniqBy<T>(arr: readonly T[], mapper: Mapper<T, any>): T[] {
  * Returning `undefined` from the Mapper will EXCLUDE the item.
  */
 export function _by<T>(items: readonly T[], mapper: Mapper<T, any>): StringMap<T> {
-  return Object.fromEntries(
-    items.map((item, i) => [mapper(item, i), item]).filter(([k]) => k !== undefined) as [any, T][],
-  )
+  const map: StringMap<T> = {}
+  for (let i = 0; i < items.length; i++) {
+    const v = items[i]!
+    const k = mapper(v)
+    if (k !== undefined) {
+      map[k] = v
+    }
+  }
+
+  return map
 }
 
 /**
@@ -131,12 +139,15 @@ export function _mapBy<ITEM, KEY>(
   items: readonly ITEM[],
   mapper: Mapper<ITEM, KEY>,
 ): Map<KEY, ITEM> {
-  return new Map(
-    items.map((item, i) => [mapper(item, i), item]).filter(([k]) => k !== undefined) as [
-      KEY,
-      ITEM,
-    ][],
-  )
+  const map = new Map<KEY, ITEM>()
+  for (let i = 0; i < items.length; i++) {
+    const item = items[i]!
+    const key = mapper(item)
+    if (key !== undefined) {
+      map.set(key, item)
+    }
+  }
+  return map
 }
 
 /**
@@ -152,14 +163,31 @@ export function _mapBy<ITEM, KEY>(
  */
 export function _groupBy<T>(items: readonly T[], mapper: Mapper<T, any>): StringMap<T[]> {
   const map: StringMap<T[]> = {}
-  for (const [i, item] of items.entries()) {
-    const key = mapper(item, i)
-    if (key === undefined) continue
-    ;(map[key] ||= []).push(item)
+
+  for (let i = 0; i < items.length; i++) {
+    const item = items[i]!
+    const key = mapper(item)
+    if (key !== undefined) {
+      ;(map[key] ||= []).push(item)
+    }
   }
   return map
 }
 
+export interface MutateOptions {
+  /**
+   * Defaults to false.
+   */
+  mutate?: boolean
+}
+
+export interface SortOptions extends MutateOptions {
+  /**
+   * Defaults to 'asc'.
+   */
+  dir?: SortDirection
+}
+
 /**
  * _sortBy([{age: 20}, {age: 10}], 'age')
  * // => [{age: 10}, {age: 20}]
@@ -167,34 +195,34 @@ export function _groupBy<T>(items: readonly T[], mapper: Mapper<T, any>): String
  * Same:
  * _sortBy([{age: 20}, {age: 10}], o => o.age)
  */
-export function _sortBy<T>(
+export function _sortBy<T, COMPARE_TYPE extends string | number>(
   items: T[],
-  mapper: Mapper<T, any>,
-  mutate = false,
-  dir: SortDirection = 'asc',
+  mapper: Mapper<T, COMPARE_TYPE>,
+  opt: SortOptions = {},
 ): T[] {
-  const mod = dir === 'desc' ? -1 : 1
-  return (mutate ? items : [...items]).sort((_a, _b) => {
-    const [a, b] = [_a, _b].map(mapper)
-    if (typeof a === 'number' && typeof b === 'number') return (a - b) * mod
-    return String(a).localeCompare(String(b)) * mod
+  const mod = opt.dir === 'desc' ? -1 : 1
+
+  return (opt.mutate ? items : [...items]).sort((_a, _b) => {
+    // This implementation may call mapper more than once per item,
+    // but the benchmarks show no significant difference in performance.
+    const a = mapper(_a)
+    const b = mapper(_b)
+    // if (typeof a === 'number' && typeof b === 'number') return (a - b) * mod
+    // return String(a).localeCompare(String(b)) * mod
+    if (a > b) return mod
+    if (a < b) return -mod
+    return 0
   })
 }
 
-/**
- * Alias for _sortBy with descending order.
- */
-export function _sortDescBy<T>(items: T[], mapper: Mapper<T, any>, mutate = false): T[] {
-  return _sortBy(items, mapper, mutate, 'desc')
-}
-
 /**
  * Similar to `Array.find`, but the `predicate` may return `END` to stop the iteration early.
  *
  * Use `Array.find` if you don't need to stop the iteration early.
  */
 export function _find<T>(items: readonly T[], predicate: AbortablePredicate<T>): T | undefined {
-  for (const [i, item] of items.entries()) {
+  for (let i = 0; i < items.length; i++) {
+    const item = items[i]!
     const result = predicate(item, i)
     if (result === END) return
     if (result) return item
@@ -290,9 +318,8 @@ export function _count<T>(
 export function _countBy<T>(items: Iterable<T>, mapper: Mapper<T, any>): StringMap<number> {
   const map: StringMap<number> = {}
 
-  let i = 0
   for (const item of items) {
-    const key = mapper(item, i++)
+    const key = mapper(item)
     map[key] = (map[key] || 0) + 1
   }
 
@@ -360,10 +387,9 @@ export function _sumBy<T, N extends number>(
   mapper: Mapper<T, N | undefined>,
 ): N {
   let sum = 0 as N
-  let i = 0
 
   for (const n of items) {
-    const v = mapper(n, i++)
+    const v = mapper(n)
     if (typeof v === 'number') {
       // count only numbers, nothing else
       sum = (sum + v) as N
@@ -407,8 +433,8 @@ export function _mapToObject<T, V>(
  * Fisher–Yates algorithm.
  * Based on: https://stackoverflow.com/a/12646864/4919972
  */
-export function _shuffle<T>(array: T[], mutate = false): T[] {
-  const a = mutate ? array : [...array]
+export function _shuffle<T>(array: T[], opt: MutateOptions = {}): T[] {
+  const a = opt.mutate ? array : [...array]
 
   for (let i = a.length - 1; i > 0; i--) {
     const j = Math.floor(Math.random() * (i + 1))
@@ -505,8 +531,9 @@ export function _maxByOrUndefined<T>(
   let maxItem: T | undefined
   let max: number | string | undefined
 
-  for (const [i, item] of array.entries()) {
-    const v = mapper(item, i)
+  for (let i = 0; i < array.length; i++) {
+    const item = array[i]!
+    const v = mapper(item)
     if (v !== undefined && (max === undefined || v > max)) {
       maxItem = item
       max = v
@@ -524,8 +551,9 @@ export function _minByOrUndefined<T>(
   let minItem: T | undefined
   let min: number | string | undefined
 
-  for (const [i, item] of array.entries()) {
-    const v = mapper(item, i)
+  for (let i = 0; i < array.length; i++) {
+    const item = array[i]!
+    const v = mapper(item)
     if (v !== undefined && (min === undefined || v < min)) {
       minItem = item
       min = v

package/src/datetime/dateInterval.ts

@@ -1,4 +1,4 @@
-import type { Inclusiveness, IsoDate } from '../types.js'
+import type { IsoDate } from '../types.js'
 import type { LocalDate, LocalDateInput, LocalDateUnit } from './localDate.js'
 import { localDate } from './localDate.js'
 
@@ -60,16 +60,13 @@ export class DateInterval {
   /**
    * Ranges of DateInterval (start, end) are INCLUSIVE.
    */
-  includes(d: LocalDateInput, incl: Inclusiveness = '[]'): boolean {
-    d = localDate(d)
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    return d.isAfter(this.start, incl[0] === '[') && d.isBefore(this.end, incl[1] === ']')
+  includes(d: LocalDateInput): boolean {
+    return localDate(d).isBetween(this.start, this.end, '[]')
   }
 
-  intersects(int: DateIntervalConfig, inclusive = true): boolean {
+  intersects(int: DateIntervalConfig): boolean {
     const $int = DateInterval.parse(int)
-    const incl = inclusive ? '[]' : '()'
-    return this.includes($int.start, incl) || this.includes($int.end, incl)
+    return this.includes($int.start) || this.includes($int.end)
   }
 
   /**
@@ -81,15 +78,15 @@ export class DateInterval {
     return this.start.compare(d.start) || this.end.compare(d.end)
   }
 
-  getDays(incl: Inclusiveness = '[]'): LocalDate[] {
-    return localDate.range(this.start, this.end, incl, 1, 'day')
+  getDays(): LocalDate[] {
+    return localDate.range(this.start, this.end, '[]', 1, 'day')
   }
 
   /**
    * Returns an array of LocalDates that are included in the interval.
    */
-  range(incl: Inclusiveness = '[]', step = 1, stepUnit: LocalDateUnit = 'day'): LocalDate[] {
-    return localDate.range(this.start, this.end, incl, step, stepUnit)
+  range(step = 1, stepUnit: LocalDateUnit = 'day'): LocalDate[] {
+    return localDate.range(this.start, this.end, '[]', step, stepUnit)
   }
 
   toString(): DateIntervalString {

package/src/datetime/localDate.ts

@@ -1,3 +1,4 @@
+import type { MutateOptions, SortOptions } from '../array/array.util.js'
 import { _assert } from '../error/assert.js'
 import { Iterable2 } from '../iter/iterable2.js'
 import type {
@@ -5,7 +6,6 @@ import type {
   IsoDate,
   IsoDateTime,
   MonthId,
-  SortDirection,
   UnixTimestamp,
   UnixTimestampMillis,
 } from '../types.js'
@@ -41,8 +41,8 @@ export class LocalDate {
     return unit === 'year' ? this.year : unit === 'month' ? this.month : this.day
   }
 
-  set(unit: LocalDateUnitStrict, v: number, mutate = false): LocalDate {
-    const t = mutate ? this : this.clone()
+  set(unit: LocalDateUnitStrict, v: number, opt: MutateOptions = {}): LocalDate {
+    const t = opt.mutate ? this : this.clone()
 
     if (unit === 'year') {
       t.year = v
@@ -117,10 +117,9 @@ export class LocalDate {
     return this.compare(d) >= 0
   }
 
-  isBetween(min: LocalDateInput, max: LocalDateInput, incl: Inclusiveness = '[)'): boolean {
+  isBetween(min: LocalDateInput, max: LocalDateInput, incl: Inclusiveness): boolean {
     let r = this.compare(min)
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (r < 0 || (r === 0 && incl[0] === '(')) return false
+    if (r < 0) return false
     r = this.compare(max)
     if (r > 0 || (r === 0 && incl[1] === ')')) return false
     return true
@@ -326,7 +325,7 @@ export class LocalDate {
     return this.plus(-num, 'year')
   }
 
-  plus(num: number, unit: LocalDateUnit, mutate = false): LocalDate {
+  plus(num: number, unit: LocalDateUnit, opt: MutateOptions = {}): LocalDate {
     num = Math.floor(num) // if a fractional number like 0.5 is passed - it will be floored, as LocalDate only deals with "whole days" as minimal unit
     let { day, month, year } = this
 
@@ -387,7 +386,7 @@ export class LocalDate {
       }
     }
 
-    if (mutate) {
+    if (opt.mutate) {
       this.year = year
       this.month = month
       this.day = day
@@ -397,8 +396,8 @@ export class LocalDate {
     return new LocalDate(year, month, day)
   }
 
-  minus(num: number, unit: LocalDateUnit, mutate = false): LocalDate {
-    return this.plus(-num, unit, mutate)
+  minus(num: number, unit: LocalDateUnit, opt: MutateOptions = {}): LocalDate {
+    return this.plus(-num, unit, opt)
   }
 
   startOf(unit: LocalDateUnitStrict): LocalDate {
@@ -717,9 +716,9 @@ class LocalDateFactory {
   /**
    * Sorts an array of LocalDates in `dir` order (ascending by default).
    */
-  sort(items: LocalDate[], dir: SortDirection = 'asc', mutate = false): LocalDate[] {
-    const mod = dir === 'desc' ? -1 : 1
-    return (mutate ? items : [...items]).sort((a, b) => a.compare(b) * mod)
+  sort(items: LocalDate[], opt: SortOptions = {}): LocalDate[] {
+    const mod = opt.dir === 'desc' ? -1 : 1
+    return (opt.mutate ? items : [...items]).sort((a, b) => a.compare(b) * mod)
   }
 
   /**
@@ -779,7 +778,7 @@ class LocalDateFactory {
   range(
     min: LocalDateInput,
     max: LocalDateInput,
-    incl: Inclusiveness = '[)',
+    incl: Inclusiveness,
     step = 1,
     stepUnit: LocalDateUnit = 'day',
   ): LocalDate[] {
@@ -793,7 +792,7 @@ class LocalDateFactory {
   rangeIterable(
     min: LocalDateInput,
     max: LocalDateInput,
-    incl: Inclusiveness = '[)',
+    incl: Inclusiveness,
     step = 1,
     stepUnit: LocalDateUnit = 'day',
   ): Iterable2<LocalDate> {
@@ -806,11 +805,11 @@ class LocalDateFactory {
     const $max = this.fromInput(max).startOf(stepUnit)
 
     let value = $min
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (value.isAfter($min, incl[0] === '[')) {
+
+    if (value.isSameOrAfter($min)) {
       // ok
     } else {
-      value.plus(1, stepUnit, true)
+      value.plus(1, stepUnit, { mutate: true })
     }
 
     const rightInclusive = incl[1] === ']'

package/src/datetime/localTime.ts

@@ -1,3 +1,4 @@
+import type { MutateOptions } from '../array/array.util.js'
 import { _assert } from '../error/assert.js'
 import { _ms } from '../time/time.util.js'
 import type {
@@ -189,8 +190,8 @@ export class LocalTime {
     return this.$date.getSeconds()
   }
 
-  set(unit: LocalTimeUnit, v: number, mutate = false): LocalTime {
-    const t = mutate ? this : this.clone()
+  set(unit: LocalTimeUnit, v: number, opt: MutateOptions = {}): LocalTime {
+    const t = opt.mutate ? this : this.clone()
 
     if (unit === 'year') {
       t.$date.setFullYear(v)
@@ -205,7 +206,7 @@ export class LocalTime {
     } else if (unit === 'second') {
       t.$date.setSeconds(v)
     } else if (unit === 'week') {
-      setWeek(t.$date, v, true)
+      setWeek(t.$date, v, { mutate: true })
     }
 
     return t
@@ -297,8 +298,8 @@ export class LocalTime {
     return this.plus(delta, 'day')
   }
 
-  setComponents(c: Partial<DateTimeObject>, mutate = false): LocalTime {
-    const d = mutate ? this.$date : new Date(this.$date)
+  setComponents(c: Partial<DateTimeObject>, opt: MutateOptions = {}): LocalTime {
+    const d = opt.mutate ? this.$date : new Date(this.$date)
 
     // Year, month and day set all-at-once, to avoid 30/31 (and 28/29) mishap
     if (c.day || c.month !== undefined || c.year !== undefined) {
@@ -319,7 +320,7 @@ export class LocalTime {
       d.setSeconds(c.second)
     }
 
-    return mutate ? this : new LocalTime(d)
+    return opt.mutate ? this : new LocalTime(d)
   }
 
   plusSeconds(num: number): LocalTime {
@@ -378,22 +379,22 @@ export class LocalTime {
     return this.plus(-num, 'year')
   }
 
-  plus(num: number, unit: LocalTimeUnit, mutate = false): LocalTime {
+  plus(num: number, unit: LocalTimeUnit, opt: MutateOptions = {}): LocalTime {
     if (unit === 'week') {
       num *= 7
       unit = 'day'
     }
 
     if (unit === 'year' || unit === 'month') {
-      const d = addMonths(this.$date, unit === 'month' ? num : num * 12, mutate)
-      return mutate ? this : localTime.fromInput(d)
+      const d = addMonths(this.$date, unit === 'month' ? num : num * 12, opt)
+      return opt.mutate ? this : localTime.fromInput(d)
     }
 
-    return this.set(unit, this.get(unit) + num, mutate)
+    return this.set(unit, this.get(unit) + num, opt)
   }
 
-  minus(num: number, unit: LocalTimeUnit, mutate = false): LocalTime {
-    return this.plus(num * -1, unit, mutate)
+  minus(num: number, unit: LocalTimeUnit, opt: MutateOptions = {}): LocalTime {
+    return this.plus(num * -1, unit, opt)
   }
 
   absDiff(other: LocalTimeInput, unit: LocalTimeUnit): number {
@@ -429,9 +430,9 @@ export class LocalTime {
     return Math.trunc(r) || 0
   }
 
-  startOf(unit: LocalTimeUnit, mutate = false): LocalTime {
+  startOf(unit: LocalTimeUnit, opt: MutateOptions = {}): LocalTime {
     if (unit === 'second') return this
-    const d = mutate ? this.$date : new Date(this.$date)
+    const d = opt.mutate ? this.$date : new Date(this.$date)
     d.setSeconds(0, 0)
 
     if (unit !== 'minute') {
@@ -448,18 +449,18 @@ export class LocalTime {
             d.setDate(1)
           } else {
             // week
-            startOfWeek(d, true)
+            startOfWeek(d, { mutate: true })
           }
         }
       }
     }
 
-    return mutate ? this : new LocalTime(d)
+    return opt.mutate ? this : new LocalTime(d)
   }
 
-  endOf(unit: LocalTimeUnit, mutate = false): LocalTime {
+  endOf(unit: LocalTimeUnit, opt: MutateOptions = {}): LocalTime {
     if (unit === 'second') return this
-    const d = mutate ? this.$date : new Date(this.$date)
+    const d = opt.mutate ? this.$date : new Date(this.$date)
     d.setSeconds(59, 0)
 
     if (unit !== 'minute') {
@@ -474,7 +475,7 @@ export class LocalTime {
           }
 
           if (unit === 'week') {
-            endOfWeek(d, true)
+            endOfWeek(d, { mutate: true })
           } else {
             // year or month
             const lastDay = localDate.getMonthLength(d.getFullYear(), d.getMonth() + 1)
@@ -484,7 +485,7 @@ export class LocalTime {
       }
     }
 
-    return mutate ? this : new LocalTime(d)
+    return opt.mutate ? this : new LocalTime(d)
   }
 
   /**
@@ -517,10 +518,9 @@ export class LocalTime {
     return this.compare(d) >= 0
   }
 
-  isBetween(min: LocalTimeInput, max: LocalTimeInput, incl: Inclusiveness = '[)'): boolean {
+  isBetween(min: LocalTimeInput, max: LocalTimeInput, incl: Inclusiveness): boolean {
     let r = this.compare(min)
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (r < 0 || (r === 0 && incl[0] === '(')) return false
+    if (r < 0) return false
     r = this.compare(max)
     if (r > 0 || (r === 0 && incl[1] === ')')) return false
     return true
@@ -1004,9 +1004,9 @@ class LocalTimeFactory {
     return Intl.supportedValuesOf('timeZone').includes(tz)
   }
 
-  sort(items: LocalTime[], dir: SortDirection = 'asc', mutate = false): LocalTime[] {
+  sort(items: LocalTime[], dir: SortDirection = 'asc', opt: MutateOptions = {}): LocalTime[] {
     const mod = dir === 'desc' ? -1 : 1
-    return (mutate ? items : [...items]).sort((a, b) => {
+    return (opt.mutate ? items : [...items]).sort((a, b) => {
       const v1 = a.$date.valueOf()
       const v2 = b.$date.valueOf()
       if (v1 === v2) return 0
@@ -1057,8 +1057,8 @@ function getWeek(date: Date): number {
   return Math.round(diff / MILLISECONDS_IN_WEEK) + 1
 }
 
-function setWeek(date: Date, week: number, mutate = false): Date {
-  const d = mutate ? date : new Date(date)
+function setWeek(date: Date, week: number, opt: MutateOptions = {}): Date {
+  const d = opt.mutate ? date : new Date(date)
   const diff = getWeek(d) - week
   d.setDate(d.getDate() - diff * 7)
   return d
@@ -1070,7 +1070,7 @@ function startOfWeekYear(date: Date): Date {
   const fourthOfJanuary = new Date(0)
   fourthOfJanuary.setFullYear(year, 0, 4)
   fourthOfJanuary.setHours(0, 0, 0, 0)
-  return startOfWeek(fourthOfJanuary, true)
+  return startOfWeek(fourthOfJanuary, { mutate: true })
 }
 
 // based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/getISOWeekYear/index.ts
@@ -1080,12 +1080,12 @@ function getWeekYear(date: Date): number {
   const fourthOfJanuaryOfNextYear = new Date(0)
   fourthOfJanuaryOfNextYear.setFullYear(year + 1, 0, 4)
   fourthOfJanuaryOfNextYear.setHours(0, 0, 0, 0)
-  const startOfNextYear = startOfWeek(fourthOfJanuaryOfNextYear, true)
+  const startOfNextYear = startOfWeek(fourthOfJanuaryOfNextYear, { mutate: true })
 
   const fourthOfJanuaryOfThisYear = new Date(0)
   fourthOfJanuaryOfThisYear.setFullYear(year, 0, 4)
   fourthOfJanuaryOfThisYear.setHours(0, 0, 0, 0)
-  const startOfThisYear = startOfWeek(fourthOfJanuaryOfThisYear, true)
+  const startOfThisYear = startOfWeek(fourthOfJanuaryOfThisYear, { mutate: true })
 
   if (date.getTime() >= startOfNextYear.getTime()) {
     return year + 1
@@ -1097,8 +1097,8 @@ function getWeekYear(date: Date): number {
 }
 
 // based on: https://github.com/date-fns/date-fns/blob/fd6bb1a0bab143f2da068c05a9c562b9bee1357d/src/startOfWeek/index.ts
-function startOfWeek(date: Date, mutate = false): Date {
-  const d = mutate ? date : new Date(date)
+function startOfWeek(date: Date, opt: MutateOptions = {}): Date {
+  const d = opt.mutate ? date : new Date(date)
 
   const day = d.getDay()
   const diff = (day < weekStartsOn ? 7 : 0) + day - weekStartsOn
@@ -1109,8 +1109,8 @@ function startOfWeek(date: Date, mutate = false): Date {
 }
 
 // based on: https://github.com/date-fns/date-fns/blob/master/src/endOfWeek/index.ts
-function endOfWeek(date: Date, mutate = false): Date {
-  const d = mutate ? date : new Date(date)
+function endOfWeek(date: Date, opt: MutateOptions = {}): Date {
+  const d = opt.mutate ? date : new Date(date)
 
   const day = d.getDay()
   const diff = (day < weekStartsOn ? -7 : 0) + 6 - (day - weekStartsOn)
@@ -1119,8 +1119,8 @@ function endOfWeek(date: Date, mutate = false): Date {
   return d
 }
 
-function addMonths(d: Date, num: number, mutate = false): Date {
-  if (!mutate) d = new Date(d)
+function addMonths(d: Date, num: number, opt: MutateOptions = {}): Date {
+  if (!opt.mutate) d = new Date(d)
 
   let day = d.getDate()
   let month = d.getMonth() + 1 + num

package/src/datetime/timeInterval.ts

@@ -1,4 +1,4 @@
-import type { Inclusiveness, UnixTimestamp } from '../types.js'
+import type { UnixTimestamp } from '../types.js'
 import type { LocalTime, LocalTimeInput } from './localTime.js'
 import { localTime } from './localTime.js'
 
@@ -74,11 +74,10 @@ export class TimeInterval {
     return this.cmp(d) >= 0
   }
 
-  includes(d: LocalTimeInput, incl: Inclusiveness = '[)'): boolean {
+  includes(d: LocalTimeInput): boolean {
     d = localTime.fromInput(d).unix
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (d < this.$start || (d === this.$start && incl[0] === '(')) return false
-    if (d > this.$end || (d === this.$end && incl[1] === ')')) return false
+    if (d < this.$start) return false
+    if (d > this.$end) return false
     return true
   }
 

package/src/http/fetcher.ts

@@ -803,7 +803,7 @@ export class Fetcher {
     }
 
     // Because all header values are stringified, so `a: undefined` becomes `undefined` as a string
-    _filterNullishValues(req.init.headers, true)
+    _filterNullishValues(req.init.headers, { mutate: true })
 
     // setup url
     const baseUrl = opt.baseUrl || this.cfg.baseUrl

package/src/json-schema/jsonSchema.util.ts

@@ -32,5 +32,5 @@ export function mergeJsonSchemaObjects<T1 extends AnyObject, T2 extends AnyObjec
 
   // `additionalProperties` remains the same
 
-  return _filterNullishValues(s1, true) as any
+  return _filterNullishValues(s1, { mutate: true }) as any
 }

package/src/log/commonLogger.ts

@@ -1,4 +1,6 @@
 // copy-pasted to avoid weird circular dependency
+import type { MutateOptions } from '../array/array.util.js'
+
 const _noop = (..._args: any[]): undefined => undefined
 
 /**
@@ -57,10 +59,10 @@ export const commonLoggerNoop: CommonLogger = {
 export function commonLoggerMinLevel(
   logger: CommonLogger,
   minLevel: CommonLogLevel,
-  mutate = false,
+  opt: MutateOptions = {},
 ): CommonLogger {
   const level = commonLogLevelNumber[minLevel]
-  if (mutate) {
+  if (opt.mutate) {
     if (level > commonLogLevelNumber['log']) {
       logger.log = _noop
       if (level > commonLogLevelNumber['warn']) {

package/src/math/math.util.ts

@@ -29,7 +29,6 @@ export function _averageOrNull(values: number[] | undefined | null): number | nu
 export function _averageWeighted(values: number[], weights: number[]): number {
   let numerator = 0
   let denominator = 0
-  // eslint-disable-next-line unicorn/no-for-loop
   for (let i = 0; i < values.length; i++) {
     numerator += values[i]! * weights[i]!
     denominator += weights[i]!