@naturalcycles/js-lib 14.93.0 → 14.94.0

package/dist/datetime/dateInterval.d.ts

@@ -19,11 +19,20 @@ export declare class DateInterval {
     isSameOrBefore(d: DateIntervalConfig): boolean;
     isAfter(d: DateIntervalConfig): boolean;
     isSameOrAfter(d: DateIntervalConfig): boolean;
+    /**
+     * Ranges of DateInterval (start, end) are INCLUSIVE.
+     */
+    includes(d: LocalDateConfig): boolean;
     /**
      * DateIntervals compare by start date.
      * If it's the same - then by end date.
      */
     cmp(d: DateIntervalConfig): -1 | 0 | 1;
+    /**
+     * Returns an array of LocalDates that are included in the interval.
+     * Ranges are INCLUSIVE.
+     */
+    getDays(): LocalDate[];
     toString(): string;
-    private toJSON;
+    toJSON(): string;
 }

package/dist/datetime/dateInterval.js

@@ -42,6 +42,13 @@ class DateInterval {
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
     }
+    /**
+     * Ranges of DateInterval (start, end) are INCLUSIVE.
+     */
+    includes(d) {
+        d = localDate_1.LocalDate.of(d);
+        return d.isSameOrAfter(this.start) && d.isSameOrBefore(this.end);
+    }
     /**
      * DateIntervals compare by start date.
      * If it's the same - then by end date.
@@ -50,6 +57,19 @@ class DateInterval {
         d = DateInterval.parse(d);
         return this.start.cmp(d.start) || this.end.cmp(d.end);
     }
+    /**
+     * Returns an array of LocalDates that are included in the interval.
+     * Ranges are INCLUSIVE.
+     */
+    getDays() {
+        const days = [];
+        let current = this.start;
+        do {
+            days.push(current);
+            current = current.add(1, 'day');
+        } while (current.isSameOrBefore(this.end));
+        return days;
+    }
     toString() {
         return [this.start, this.end].join('/');
     }

package/dist/datetime/localDate.d.ts

@@ -2,6 +2,7 @@ import { Sequence } from '../seq/seq';
 import { IsoDate, UnixTimestamp } from '../types';
 import { LocalTime } from './localTime';
 export declare type LocalDateUnit = 'year' | 'month' | 'day';
+export declare type Inclusiveness = '()' | '[]' | '[)' | '(]';
 export declare type LocalDateConfig = LocalDate | string;
 /**
  * @experimental
@@ -42,6 +43,7 @@ export declare class LocalDate {
     isSameOrBefore(d: LocalDateConfig): boolean;
     isAfter(d: LocalDateConfig): boolean;
     isSameOrAfter(d: LocalDateConfig): boolean;
+    isBetween(min: LocalDateConfig, max: LocalDateConfig, incl?: Inclusiveness): boolean;
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal

package/dist/datetime/localDate.js

@@ -131,6 +131,15 @@ class LocalDate {
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
     }
+    isBetween(min, max, incl = '[)') {
+        let r = this.cmp(min);
+        if (r < 0 || (r === 0 && incl[0] === '('))
+            return false;
+        r = this.cmp(max);
+        if (r > 0 || (r === 0 && incl[1] === ')'))
+            return false;
+        return true;
+    }
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal

package/dist/datetime/localTime.d.ts

@@ -1,5 +1,5 @@
 import { IsoDate, IsoDateTime, UnixTimestamp } from '../types';
-import { LocalDate } from './localDate';
+import { Inclusiveness, LocalDate } from './localDate';
 export declare type LocalTimeUnit = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
 export declare type LocalTimeConfig = LocalTime | Date | IsoDateTime | UnixTimestamp;
 export interface LocalTimeComponents {
@@ -64,6 +64,7 @@ export declare class LocalTime {
     isSameOrBefore(d: LocalTimeConfig): boolean;
     isAfter(d: LocalTimeConfig): boolean;
     isSameOrAfter(d: LocalTimeConfig): boolean;
+    isBetween(min: LocalTimeConfig, max: LocalTimeConfig, incl?: Inclusiveness): boolean;
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal

package/dist/datetime/localTime.js

@@ -263,6 +263,15 @@ class LocalTime {
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
     }
+    isBetween(min, max, incl = '[)') {
+        let r = this.cmp(min);
+        if (r < 0 || (r === 0 && incl[0] === '('))
+            return false;
+        r = this.cmp(max);
+        if (r > 0 || (r === 0 && incl[1] === ')'))
+            return false;
+        return true;
+    }
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal

package/dist/index.d.ts

@@ -64,8 +64,8 @@ export * from './string/leven';
 export * from './datetime/localDate';
 export * from './datetime/localTime';
 export * from './datetime/dateInterval';
-import { LocalDateConfig, LocalDateUnit } from './datetime/localDate';
+import { LocalDateConfig, LocalDateUnit, Inclusiveness } from './datetime/localDate';
 import { LocalTimeConfig, LocalTimeUnit, LocalTimeComponents } from './datetime/localTime';
 import { DateIntervalConfig } from './datetime/dateInterval';
-export type { DateIntervalConfig, LocalDateConfig, LocalDateUnit, LocalTimeConfig, LocalTimeUnit, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateTime, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
+export type { DateIntervalConfig, LocalDateConfig, LocalDateUnit, Inclusiveness, LocalTimeConfig, LocalTimeUnit, LocalTimeComponents, AbortableMapper, AbortablePredicate, AbortableAsyncPredicate, AbortableAsyncMapper, PQueueCfg, MemoCache, AsyncMemoCache, PromiseDecoratorCfg, PromiseDecoratorResp, ErrorData, ErrorObject, HttpErrorData, HttpErrorResponse, Admin401ErrorData, Admin403ErrorData, StringMap, PromiseMap, AnyObject, AnyFunction, ValuesOf, ValueOf, KeyValueTuple, ObjectMapper, ObjectPredicate, InstanceId, IsoDate, IsoDateTime, Reviver, PMapOptions, Mapper, AsyncMapper, Predicate, AsyncPredicate, BatchResult, DeferredPromise, PRetryOptions, PTimeoutOptions, TryCatchOptions, StringifyAnyOptions, JsonStringifyFunction, Merge, ReadonlyDeep, Promisable, Simplify, ConditionalPick, ConditionalExcept, Class, UnixTimestamp, Integer, BaseDBEntity, SavedDBEntity, Saved, Unsaved, CreatedUpdated, CreatedUpdatedId, ObjectWithId, AnyObjectWithId, JsonSchema, JsonSchemaAny, JsonSchemaOneOf, JsonSchemaAllOf, JsonSchemaAnyOf, JsonSchemaNot, JsonSchemaRef, JsonSchemaConst, JsonSchemaEnum, JsonSchemaString, JsonSchemaNumber, JsonSchemaBoolean, JsonSchemaNull, JsonSchemaRootObject, JsonSchemaObject, JsonSchemaArray, JsonSchemaTuple, JsonSchemaBuilder, CommonLogLevel, CommonLogWithLevelFunction, CommonLogFunction, CommonLogger, };
 export { is, _createPromiseDecorator, _stringMapValues, _stringMapEntries, _objectKeys, pMap, _passthroughMapper, _passUndefinedMapper, _passthroughPredicate, _passNothingPredicate, _noop, ErrorMode, pDefer, AggregatedError, pRetry, pRetryFn, pTimeout, pTimeoutFn, _tryCatch, _TryCatch, _stringifyAny, jsonSchema, JsonSchemaAnyBuilder, commonLoggerMinLevel, commonLoggerNoop, commonLogLevelNumber, commonLoggerPipe, commonLoggerPrefix, commonLoggerCreate, PQueue, END, SKIP, };

package/dist-esm/datetime/dateInterval.js

@@ -39,6 +39,13 @@ export class DateInterval {
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
     }
+    /**
+     * Ranges of DateInterval (start, end) are INCLUSIVE.
+     */
+    includes(d) {
+        d = LocalDate.of(d);
+        return d.isSameOrAfter(this.start) && d.isSameOrBefore(this.end);
+    }
     /**
      * DateIntervals compare by start date.
      * If it's the same - then by end date.
@@ -47,6 +54,19 @@ export class DateInterval {
         d = DateInterval.parse(d);
         return this.start.cmp(d.start) || this.end.cmp(d.end);
     }
+    /**
+     * Returns an array of LocalDates that are included in the interval.
+     * Ranges are INCLUSIVE.
+     */
+    getDays() {
+        const days = [];
+        let current = this.start;
+        do {
+            days.push(current);
+            current = current.add(1, 'day');
+        } while (current.isSameOrBefore(this.end));
+        return days;
+    }
     toString() {
         return [this.start, this.end].join('/');
     }

package/dist-esm/datetime/localDate.js

@@ -128,6 +128,15 @@ export class LocalDate {
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
     }
+    isBetween(min, max, incl = '[)') {
+        let r = this.cmp(min);
+        if (r < 0 || (r === 0 && incl[0] === '('))
+            return false;
+        r = this.cmp(max);
+        if (r > 0 || (r === 0 && incl[1] === ')'))
+            return false;
+        return true;
+    }
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal

package/dist-esm/datetime/localTime.js

@@ -260,6 +260,15 @@ export class LocalTime {
     isSameOrAfter(d) {
         return this.cmp(d) >= 0;
     }
+    isBetween(min, max, incl = '[)') {
+        let r = this.cmp(min);
+        if (r < 0 || (r === 0 && incl[0] === '('))
+            return false;
+        r = this.cmp(max);
+        if (r > 0 || (r === 0 && incl[1] === ')'))
+            return false;
+        return true;
+    }
     /**
      * Returns 1 if this > d
      * returns 0 if they are equal

package/package.json

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

package/src/datetime/dateInterval.ts

@@ -49,6 +49,14 @@ export class DateInterval {
     return this.cmp(d) >= 0
   }
 
+  /**
+   * Ranges of DateInterval (start, end) are INCLUSIVE.
+   */
+  includes(d: LocalDateConfig): boolean {
+    d = LocalDate.of(d)
+    return d.isSameOrAfter(this.start) && d.isSameOrBefore(this.end)
+  }
+
   /**
    * DateIntervals compare by start date.
    * If it's the same - then by end date.
@@ -58,11 +66,26 @@ export class DateInterval {
     return this.start.cmp(d.start) || this.end.cmp(d.end)
   }
 
+  /**
+   * Returns an array of LocalDates that are included in the interval.
+   * Ranges are INCLUSIVE.
+   */
+  getDays(): LocalDate[] {
+    const days: LocalDate[] = []
+    let current = this.start
+    do {
+      days.push(current)
+      current = current.add(1, 'day')
+    } while (current.isSameOrBefore(this.end))
+
+    return days
+  }
+
   toString(): string {
     return [this.start, this.end].join('/')
   }
 
-  private toJSON(): string {
+  toJSON(): string {
     return this.toString()
   }
 }

package/src/datetime/localDate.ts

@@ -4,6 +4,7 @@ import { END, IsoDate, UnixTimestamp } from '../types'
 import { LocalTime } from './localTime'
 
 export type LocalDateUnit = 'year' | 'month' | 'day'
+export type Inclusiveness = '()' | '[]' | '[)' | '(]'
 
 const m31 = new Set<number>([1, 3, 5, 7, 8, 10, 12])
 
@@ -194,6 +195,14 @@ export class LocalDate {
     return this.cmp(d) >= 0
   }
 
+  isBetween(min: LocalDateConfig, max: LocalDateConfig, incl: Inclusiveness = '[)'): boolean {
+    let r = this.cmp(min)
+    if (r < 0 || (r === 0 && incl[0] === '(')) return false
+    r = this.cmp(max)
+    if (r > 0 || (r === 0 && incl[1] === ')')) return false
+    return true
+  }
+
   /**
    * Returns 1 if this > d
    * returns 0 if they are equal

package/src/datetime/localTime.ts

@@ -1,7 +1,7 @@
 import { _assert } from '../error/assert'
 import { _ms } from '../time/time.util'
 import { IsoDate, IsoDateTime, UnixTimestamp } from '../types'
-import { LocalDate } from './localDate'
+import { Inclusiveness, LocalDate } from './localDate'
 
 export type LocalTimeUnit = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second'
 
@@ -322,6 +322,14 @@ export class LocalTime {
     return this.cmp(d) >= 0
   }
 
+  isBetween(min: LocalTimeConfig, max: LocalTimeConfig, incl: Inclusiveness = '[)'): boolean {
+    let r = this.cmp(min)
+    if (r < 0 || (r === 0 && incl[0] === '(')) return false
+    r = this.cmp(max)
+    if (r > 0 || (r === 0 && incl[1] === ')')) return false
+    return true
+  }
+
   /**
    * Returns 1 if this > d
    * returns 0 if they are equal

package/src/index.ts

@@ -159,7 +159,7 @@ export * from './string/leven'
 export * from './datetime/localDate'
 export * from './datetime/localTime'
 export * from './datetime/dateInterval'
-import { LocalDateConfig, LocalDateUnit } from './datetime/localDate'
+import { LocalDateConfig, LocalDateUnit, Inclusiveness } from './datetime/localDate'
 import { LocalTimeConfig, LocalTimeUnit, LocalTimeComponents } from './datetime/localTime'
 import { DateIntervalConfig } from './datetime/dateInterval'
 
@@ -167,6 +167,7 @@ export type {
   DateIntervalConfig,
   LocalDateConfig,
   LocalDateUnit,
+  Inclusiveness,
   LocalTimeConfig,
   LocalTimeUnit,
   LocalTimeComponents,