@naturalcycles/js-lib 14.192.0 → 14.192.1

package/dist/datetime/dateInterval.js

@@ -66,13 +66,13 @@ class DateInterval {
         return this.start.cmp(d.start) || this.end.cmp(d.end);
     }
     getDays(incl = '[]') {
-        return localDate_1.LocalDate.range(this.start, this.end, incl, 1, 'day');
+        return (0, localDate_1.localDateRange)(this.start, this.end, incl, 1, 'day');
     }
     /**
      * Returns an array of LocalDates that are included in the interval.
      */
     range(incl = '[]', step = 1, stepUnit = 'day') {
-        return localDate_1.LocalDate.range(this.start, this.end, incl, step, stepUnit);
+        return (0, localDate_1.localDateRange)(this.start, this.end, incl, step, stepUnit);
     }
     toString() {
         return [this.start, this.end].join('/');

package/dist/datetime/localDate.d.ts

@@ -35,11 +35,6 @@ export declare class LocalDate {
     static earliest(items: LocalDateInput[]): LocalDate;
     static latestOrUndefined(items: LocalDateInput[]): LocalDate | undefined;
     static latest(items: LocalDateInput[]): LocalDate;
-    static range(min: LocalDateInput, max: LocalDateInput, incl?: Inclusiveness, step?: number, stepUnit?: LocalDateUnit): LocalDate[];
-    /**
-     * Experimental, returns the range as Iterable2.
-     */
-    static rangeIt(min: LocalDateInput, max: LocalDateInput, incl?: Inclusiveness, step?: number, stepUnit?: LocalDateUnit): Iterable2<LocalDate>;
     get(unit: LocalDateUnitStrict): number;
     set(unit: LocalDateUnitStrict, v: number, mutate?: boolean): LocalDate;
     year(): number;
@@ -135,6 +130,11 @@ export declare class LocalDate {
     toJSON(): IsoDateString;
     format(fmt: Intl.DateTimeFormat | LocalDateFormatter): string;
 }
+export declare function localDateRange(min: LocalDateInput, max: LocalDateInput, incl?: Inclusiveness, step?: number, stepUnit?: LocalDateUnit): LocalDate[];
+/**
+ * Experimental, returns the range as Iterable2.
+ */
+export declare function localDateRangeIt(min: LocalDateInput, max: LocalDateInput, incl?: Inclusiveness, step?: number, stepUnit?: LocalDateUnit): Iterable2<LocalDate>;
 /**
  * Convenience wrapper around `LocalDate.of`
  */

package/dist/datetime/localDate.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.localDateOrToday = exports.localDateOrUndefined = exports.localDateToday = exports.localDate = exports.LocalDate = void 0;
+exports.localDateOrToday = exports.localDateOrUndefined = exports.localDateToday = exports.localDate = exports.localDateRangeIt = exports.localDateRange = exports.LocalDate = void 0;
 const assert_1 = require("../error/assert");
 const iterable2_1 = require("../iter/iterable2");
 const localTime_1 = require("./localTime");
@@ -104,39 +104,6 @@ class LocalDate {
             .map(i => LocalDate.of(i))
             .reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
     }
-    static range(min, max, incl = '[)', step = 1, stepUnit = 'day') {
-        return this.rangeIt(min, max, incl, step, stepUnit).toArray();
-    }
-    /**
-     * Experimental, returns the range as Iterable2.
-     */
-    static rangeIt(min, max, incl = '[)', step = 1, stepUnit = 'day') {
-        if (stepUnit === 'week') {
-            step *= 7;
-            stepUnit = 'day';
-        }
-        const $min = LocalDate.of(min).startOf(stepUnit);
-        const $max = LocalDate.of(max).startOf(stepUnit);
-        let value = $min;
-        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-        if (value.isAfter($min, incl[0] === '[')) {
-            // ok
-        }
-        else {
-            value.plus(1, stepUnit, true);
-        }
-        const rightInclusive = incl[1] === ']';
-        return iterable2_1.Iterable2.of({
-            *[Symbol.iterator]() {
-                while (value.isBefore($max, rightInclusive)) {
-                    yield value;
-                    // We don't mutate, because we already returned `current`
-                    // in the previous iteration
-                    value = value.plus(step, stepUnit);
-                }
-            },
-        });
-    }
     get(unit) {
         return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day;
     }
@@ -473,6 +440,41 @@ class LocalDate {
     }
 }
 exports.LocalDate = LocalDate;
+function localDateRange(min, max, incl = '[)', step = 1, stepUnit = 'day') {
+    return localDateRangeIt(min, max, incl, step, stepUnit).toArray();
+}
+exports.localDateRange = localDateRange;
+/**
+ * Experimental, returns the range as Iterable2.
+ */
+function localDateRangeIt(min, max, incl = '[)', step = 1, stepUnit = 'day') {
+    if (stepUnit === 'week') {
+        step *= 7;
+        stepUnit = 'day';
+    }
+    const $min = LocalDate.of(min).startOf(stepUnit);
+    const $max = LocalDate.of(max).startOf(stepUnit);
+    let value = $min;
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
+    if (value.isAfter($min, incl[0] === '[')) {
+        // ok
+    }
+    else {
+        value.plus(1, stepUnit, true);
+    }
+    const rightInclusive = incl[1] === ']';
+    return iterable2_1.Iterable2.of({
+        *[Symbol.iterator]() {
+            while (value.isBefore($max, rightInclusive)) {
+                yield value;
+                // We don't mutate, because we already returned `current`
+                // in the previous iteration
+                value = value.plus(step, stepUnit);
+            }
+        },
+    });
+}
+exports.localDateRangeIt = localDateRangeIt;
 /**
  * Convenience wrapper around `LocalDate.of`
  */

package/dist-esm/datetime/dateInterval.js

@@ -1,4 +1,4 @@
-import { LocalDate } from './localDate';
+import { LocalDate, localDateRange } from './localDate';
 /**
  * Class that supports ISO8601 "Time interval" standard that looks like `2022-02-24/2022-03-30`.
  *
@@ -63,13 +63,13 @@ export class DateInterval {
         return this.start.cmp(d.start) || this.end.cmp(d.end);
     }
     getDays(incl = '[]') {
-        return LocalDate.range(this.start, this.end, incl, 1, 'day');
+        return localDateRange(this.start, this.end, incl, 1, 'day');
     }
     /**
      * Returns an array of LocalDates that are included in the interval.
      */
     range(incl = '[]', step = 1, stepUnit = 'day') {
-        return LocalDate.range(this.start, this.end, incl, step, stepUnit);
+        return localDateRange(this.start, this.end, incl, step, stepUnit);
     }
     toString() {
         return [this.start, this.end].join('/');

package/dist-esm/datetime/localDate.js

@@ -101,39 +101,6 @@ export class LocalDate {
             .map(i => LocalDate.of(i))
             .reduce((max, item) => (max.isSameOrAfter(item) ? max : item));
     }
-    static range(min, max, incl = '[)', step = 1, stepUnit = 'day') {
-        return this.rangeIt(min, max, incl, step, stepUnit).toArray();
-    }
-    /**
-     * Experimental, returns the range as Iterable2.
-     */
-    static rangeIt(min, max, incl = '[)', step = 1, stepUnit = 'day') {
-        if (stepUnit === 'week') {
-            step *= 7;
-            stepUnit = 'day';
-        }
-        const $min = LocalDate.of(min).startOf(stepUnit);
-        const $max = LocalDate.of(max).startOf(stepUnit);
-        let value = $min;
-        // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-        if (value.isAfter($min, incl[0] === '[')) {
-            // ok
-        }
-        else {
-            value.plus(1, stepUnit, true);
-        }
-        const rightInclusive = incl[1] === ']';
-        return Iterable2.of({
-            *[Symbol.iterator]() {
-                while (value.isBefore($max, rightInclusive)) {
-                    yield value;
-                    // We don't mutate, because we already returned `current`
-                    // in the previous iteration
-                    value = value.plus(step, stepUnit);
-                }
-            },
-        });
-    }
     get(unit) {
         return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day;
     }
@@ -469,6 +436,39 @@ export class LocalDate {
         return fmt(this);
     }
 }
+export function localDateRange(min, max, incl = '[)', step = 1, stepUnit = 'day') {
+    return localDateRangeIt(min, max, incl, step, stepUnit).toArray();
+}
+/**
+ * Experimental, returns the range as Iterable2.
+ */
+export function localDateRangeIt(min, max, incl = '[)', step = 1, stepUnit = 'day') {
+    if (stepUnit === 'week') {
+        step *= 7;
+        stepUnit = 'day';
+    }
+    const $min = LocalDate.of(min).startOf(stepUnit);
+    const $max = LocalDate.of(max).startOf(stepUnit);
+    let value = $min;
+    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
+    if (value.isAfter($min, incl[0] === '[')) {
+        // ok
+    }
+    else {
+        value.plus(1, stepUnit, true);
+    }
+    const rightInclusive = incl[1] === ']';
+    return Iterable2.of({
+        *[Symbol.iterator]() {
+            while (value.isBefore($max, rightInclusive)) {
+                yield value;
+                // We don't mutate, because we already returned `current`
+                // in the previous iteration
+                value = value.plus(step, stepUnit);
+            }
+        },
+    });
+}
 /**
  * Convenience wrapper around `LocalDate.of`
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.192.0",
+  "version": "14.192.1",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/datetime/dateInterval.ts

@@ -1,5 +1,5 @@
 import type { Inclusiveness, LocalDateInput, LocalDateUnit } from './localDate'
-import { LocalDate } from './localDate'
+import { LocalDate, localDateRange } from './localDate'
 
 export type DateIntervalConfig = DateInterval | DateIntervalString
 export type DateIntervalString = string
@@ -81,14 +81,14 @@ export class DateInterval {
   }
 
   getDays(incl: Inclusiveness = '[]'): LocalDate[] {
-    return LocalDate.range(this.start, this.end, incl, 1, 'day')
+    return localDateRange(this.start, this.end, incl, 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)
+    return localDateRange(this.start, this.end, incl, step, stepUnit)
   }
 
   toString(): DateIntervalString {

package/src/datetime/localDate.ts

@@ -143,57 +143,6 @@ export class LocalDate {
       .reduce((max, item) => (max.isSameOrAfter(item) ? max : item))
   }
 
-  static range(
-    min: LocalDateInput,
-    max: LocalDateInput,
-    incl: Inclusiveness = '[)',
-    step = 1,
-    stepUnit: LocalDateUnit = 'day',
-  ): LocalDate[] {
-    return this.rangeIt(min, max, incl, step, stepUnit).toArray()
-  }
-
-  /**
-   * Experimental, returns the range as Iterable2.
-   */
-  static rangeIt(
-    min: LocalDateInput,
-    max: LocalDateInput,
-    incl: Inclusiveness = '[)',
-    step = 1,
-    stepUnit: LocalDateUnit = 'day',
-  ): Iterable2<LocalDate> {
-    if (stepUnit === 'week') {
-      step *= 7
-      stepUnit = 'day'
-    }
-
-    const $min = LocalDate.of(min).startOf(stepUnit)
-    const $max = LocalDate.of(max).startOf(stepUnit)
-
-    let value = $min
-    // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
-    if (value.isAfter($min, incl[0] === '[')) {
-      // ok
-    } else {
-      value.plus(1, stepUnit, true)
-    }
-
-    const rightInclusive = incl[1] === ']'
-
-    return Iterable2.of({
-      *[Symbol.iterator]() {
-        while (value.isBefore($max, rightInclusive)) {
-          yield value
-
-          // We don't mutate, because we already returned `current`
-          // in the previous iteration
-          value = value.plus(step, stepUnit)
-        }
-      },
-    })
-  }
-
   get(unit: LocalDateUnitStrict): number {
     return unit === 'year' ? this.$year : unit === 'month' ? this.$month : this.$day
   }
@@ -583,6 +532,57 @@ export class LocalDate {
   }
 }
 
+export function localDateRange(
+  min: LocalDateInput,
+  max: LocalDateInput,
+  incl: Inclusiveness = '[)',
+  step = 1,
+  stepUnit: LocalDateUnit = 'day',
+): LocalDate[] {
+  return localDateRangeIt(min, max, incl, step, stepUnit).toArray()
+}
+
+/**
+ * Experimental, returns the range as Iterable2.
+ */
+export function localDateRangeIt(
+  min: LocalDateInput,
+  max: LocalDateInput,
+  incl: Inclusiveness = '[)',
+  step = 1,
+  stepUnit: LocalDateUnit = 'day',
+): Iterable2<LocalDate> {
+  if (stepUnit === 'week') {
+    step *= 7
+    stepUnit = 'day'
+  }
+
+  const $min = LocalDate.of(min).startOf(stepUnit)
+  const $max = LocalDate.of(max).startOf(stepUnit)
+
+  let value = $min
+  // eslint-disable-next-line @typescript-eslint/prefer-string-starts-ends-with
+  if (value.isAfter($min, incl[0] === '[')) {
+    // ok
+  } else {
+    value.plus(1, stepUnit, true)
+  }
+
+  const rightInclusive = incl[1] === ']'
+
+  return Iterable2.of({
+    *[Symbol.iterator]() {
+      while (value.isBefore($max, rightInclusive)) {
+        yield value
+
+        // We don't mutate, because we already returned `current`
+        // in the previous iteration
+        value = value.plus(step, stepUnit)
+      }
+    },
+  })
+}
+
 /**
  * Convenience wrapper around `LocalDate.of`
  */