@naturalcycles/js-lib 14.261.1 → 14.263.0

package/dist/bot.js

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BotReason = exports.BotDetectionService = void 0;
 const env_1 = require("./env");
+const botRegex = /bot|spider|crawl|headless|electron|phantom|slimer|proximic|cincraw|snapchat|slurp|MicrosoftPreview/i;
 /**
  * Service to detect bots and CDP (Chrome DevTools Protocol).
  *
@@ -40,7 +41,7 @@ class BotDetectionService {
         const { userAgent } = navigator;
         if (!userAgent)
             return BotReason.NoUserAgent;
-        if (/bot|headless|electron|phantom|slimer/i.test(userAgent)) {
+        if (botRegex.test(userAgent)) {
             return BotReason.UserAgent;
         }
         if (navigator.webdriver) {

package/dist/datetime/localDate.d.ts

@@ -21,6 +21,18 @@ export declare class LocalDate {
     setMonth(v: number): LocalDate;
     setDay(v: number): LocalDate;
     get dayOfWeek(): ISODayOfWeek;
+    /**
+     * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the same week as this.
+     * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+     * relation to `this`.
+     */
+    setDayOfWeek(dow: ISODayOfWeek): LocalDate;
+    /**
+     * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the future,
+     * in relation to this.
+     * If this LocalDate is Monday, and desired DoW is also Monday - `this` is returned.
+     */
+    setNextDayOfWeek(dow: ISODayOfWeek): LocalDate;
     isSame(d: LocalDateInput): boolean;
     isBefore(d: LocalDateInput, inclusive?: boolean): boolean;
     isSameOrBefore(d: LocalDateInput): boolean;

package/dist/datetime/localDate.js

@@ -48,6 +48,28 @@ class LocalDate {
     get dayOfWeek() {
         return (this.toDate().getDay() || 7);
     }
+    /**
+     * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the same week as this.
+     * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+     * relation to `this`.
+     */
+    setDayOfWeek(dow) {
+        (0, assert_1._assert)(localTime_1.VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        const delta = dow - this.dayOfWeek;
+        return this.plus(delta, 'day');
+    }
+    /**
+     * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the future,
+     * in relation to this.
+     * If this LocalDate is Monday, and desired DoW is also Monday - `this` is returned.
+     */
+    setNextDayOfWeek(dow) {
+        (0, assert_1._assert)(localTime_1.VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        let delta = dow - this.dayOfWeek;
+        if (delta < 0)
+            delta += 7;
+        return this.plus(delta, 'day');
+    }
     isSame(d) {
         d = exports.localDate.fromInput(d);
         return this.day === d.day && this.month === d.month && this.year === d.year;

package/dist/datetime/localTime.d.ts

@@ -26,6 +26,7 @@ export interface TimeObject {
     minute: number;
     second: number;
 }
+export declare const VALID_DAYS_OF_WEEK: Set<number>;
 export declare class LocalTime {
     $date: Date;
     constructor($date: Date);
@@ -104,7 +105,18 @@ export declare class LocalTime {
      * Based on ISO: 1-7 is Mon-Sun.
      */
     get dayOfWeek(): ISODayOfWeek;
-    setDayOfWeek(v: ISODayOfWeek): LocalTime;
+    /**
+     * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the same week as this.
+     * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+     * relation to `this`.
+     */
+    setDayOfWeek(dow: ISODayOfWeek): LocalTime;
+    /**
+     * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the future,
+     * in relation to this.
+     * If this LocalTime is Monday, and desired DoW is also Monday - `this` is returned.
+     */
+    setNextDayOfWeek(dow: ISODayOfWeek): LocalTime;
     setComponents(c: Partial<DateTimeObject>, mutate?: boolean): LocalTime;
     plusSeconds(num: number): LocalTime;
     plusMinutes(num: number): LocalTime;

package/dist/datetime/localTime.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.localTime = exports.LocalTime = exports.ISODayOfWeek = void 0;
+exports.localTime = exports.LocalTime = exports.VALID_DAYS_OF_WEEK = exports.ISODayOfWeek = void 0;
 const assert_1 = require("../error/assert");
 const time_util_1 = require("../time/time.util");
 const localDate_1 = require("./localDate");
@@ -20,7 +20,7 @@ const MILLISECONDS_IN_WEEK = 604800000;
 const SECONDS_IN_DAY = 86400;
 // const MILLISECONDS_IN_DAY = 86400000
 // const MILLISECONDS_IN_MINUTE = 60000
-const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7]);
+exports.VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7]);
 /**
  * It supports 2 forms:
  * 1. 2023-03-03
@@ -221,10 +221,27 @@ class LocalTime {
     get dayOfWeek() {
         return (this.$date.getDay() || 7);
     }
-    setDayOfWeek(v) {
-        (0, assert_1._assert)(VALID_DAYS_OF_WEEK.has(v), `Invalid dayOfWeek: ${v}`);
-        const dow = this.$date.getDay() || 7;
-        return this.plus(v - dow, 'day');
+    /**
+     * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the same week as this.
+     * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+     * relation to `this`.
+     */
+    setDayOfWeek(dow) {
+        (0, assert_1._assert)(exports.VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        const delta = dow - this.dayOfWeek;
+        return this.plus(delta, 'day');
+    }
+    /**
+     * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the future,
+     * in relation to this.
+     * If this LocalTime is Monday, and desired DoW is also Monday - `this` is returned.
+     */
+    setNextDayOfWeek(dow) {
+        (0, assert_1._assert)(exports.VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        let delta = dow - this.dayOfWeek;
+        if (delta < 0)
+            delta += 7;
+        return this.plus(delta, 'day');
     }
     setComponents(c, mutate = false) {
         const d = mutate ? this.$date : new Date(this.$date);

package/dist/json-schema/jsonSchemaBuilder.d.ts

@@ -14,7 +14,7 @@ export declare const jsonSchema: {
     ref<T = unknown>($ref: string): JsonSchemaAnyBuilder<T, JsonSchemaRef<T>>;
     enum<T = unknown>(enumValues: T[]): JsonSchemaAnyBuilder<T, JsonSchemaEnum<T>>;
     boolean(): JsonSchemaAnyBuilder<boolean, JsonSchemaBoolean>;
-    buffer(): JsonSchemaAnyBuilder<Buffer, JsonSchemaAny<Buffer>>;
+    buffer(): JsonSchemaAnyBuilder<Buffer<ArrayBufferLike>, JsonSchemaAny<Buffer<ArrayBufferLike>>>;
     number(): JsonSchemaNumberBuilder;
     integer(): JsonSchemaNumberBuilder;
     unixTimestamp(): JsonSchemaNumberBuilder;

package/dist-esm/bot.js

@@ -1,6 +1,7 @@
 // Relevant material:
 // https://deviceandbrowserinfo.com/learning_zone/articles/detecting-headless-chrome-puppeteer-2024
 import { isServerSide } from './env';
+const botRegex = /bot|spider|crawl|headless|electron|phantom|slimer|proximic|cincraw|snapchat|slurp|MicrosoftPreview/i;
 /**
  * Service to detect bots and CDP (Chrome DevTools Protocol).
  *
@@ -37,7 +38,7 @@ export class BotDetectionService {
         const { userAgent } = navigator;
         if (!userAgent)
             return BotReason.NoUserAgent;
-        if (/bot|headless|electron|phantom|slimer/i.test(userAgent)) {
+        if (botRegex.test(userAgent)) {
             return BotReason.UserAgent;
         }
         if (navigator.webdriver) {

package/dist-esm/datetime/localDate.js

@@ -1,6 +1,6 @@
 import { _assert } from '../error/assert';
 import { Iterable2 } from '../iter/iterable2';
-import { localTime } from './localTime';
+import { localTime, VALID_DAYS_OF_WEEK } from './localTime';
 const MDAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 /**
  * Regex is open-ended (no $ at the end) to support e.g Date+Time string to be parsed (time part will be dropped)
@@ -45,6 +45,28 @@ export class LocalDate {
     get dayOfWeek() {
         return (this.toDate().getDay() || 7);
     }
+    /**
+     * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the same week as this.
+     * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+     * relation to `this`.
+     */
+    setDayOfWeek(dow) {
+        _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        const delta = dow - this.dayOfWeek;
+        return this.plus(delta, 'day');
+    }
+    /**
+     * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the future,
+     * in relation to this.
+     * If this LocalDate is Monday, and desired DoW is also Monday - `this` is returned.
+     */
+    setNextDayOfWeek(dow) {
+        _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        let delta = dow - this.dayOfWeek;
+        if (delta < 0)
+            delta += 7;
+        return this.plus(delta, 'day');
+    }
     isSame(d) {
         d = localDate.fromInput(d);
         return this.day === d.day && this.month === d.month && this.year === d.year;

package/dist-esm/datetime/localTime.js

@@ -17,7 +17,7 @@ const MILLISECONDS_IN_WEEK = 604800000;
 const SECONDS_IN_DAY = 86400;
 // const MILLISECONDS_IN_DAY = 86400000
 // const MILLISECONDS_IN_MINUTE = 60000
-const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7]);
+export const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7]);
 /**
  * It supports 2 forms:
  * 1. 2023-03-03
@@ -218,10 +218,27 @@ export class LocalTime {
     get dayOfWeek() {
         return (this.$date.getDay() || 7);
     }
-    setDayOfWeek(v) {
-        _assert(VALID_DAYS_OF_WEEK.has(v), `Invalid dayOfWeek: ${v}`);
-        const dow = this.$date.getDay() || 7;
-        return this.plus(v - dow, 'day');
+    /**
+     * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the same week as this.
+     * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+     * relation to `this`.
+     */
+    setDayOfWeek(dow) {
+        _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        const delta = dow - this.dayOfWeek;
+        return this.plus(delta, 'day');
+    }
+    /**
+     * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the future,
+     * in relation to this.
+     * If this LocalTime is Monday, and desired DoW is also Monday - `this` is returned.
+     */
+    setNextDayOfWeek(dow) {
+        _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`);
+        let delta = dow - this.dayOfWeek;
+        if (delta < 0)
+            delta += 7;
+        return this.plus(delta, 'day');
     }
     setComponents(c, mutate = false) {
         const d = mutate ? this.$date : new Date(this.$date);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.261.1",
+  "version": "14.263.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build-esm-cjs",

package/src/bot.ts

@@ -19,6 +19,9 @@ export interface BotDetectionServiceCfg {
   treatCDPAsBotReason?: boolean
 }
 
+const botRegex =
+  /bot|spider|crawl|headless|electron|phantom|slimer|proximic|cincraw|snapchat|slurp|MicrosoftPreview/i
+
 /**
  * Service to detect bots and CDP (Chrome DevTools Protocol).
  *
@@ -60,7 +63,7 @@ export class BotDetectionService {
     const { userAgent } = navigator
     if (!userAgent) return BotReason.NoUserAgent
 
-    if (/bot|headless|electron|phantom|slimer/i.test(userAgent)) {
+    if (botRegex.test(userAgent)) {
       return BotReason.UserAgent
     }
 

package/src/datetime/localDate.ts

@@ -9,7 +9,7 @@ import type {
   UnixTimestamp,
   UnixTimestampMillis,
 } from '../types'
-import { DateObject, ISODayOfWeek, LocalTime, localTime } from './localTime'
+import { DateObject, ISODayOfWeek, LocalTime, localTime, VALID_DAYS_OF_WEEK } from './localTime'
 
 export type LocalDateUnit = LocalDateUnitStrict | 'week'
 export type LocalDateUnitStrict = 'year' | 'month' | 'day'
@@ -70,6 +70,29 @@ export class LocalDate {
     return (this.toDate().getDay() || 7) as ISODayOfWeek
   }
 
+  /**
+   * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the same week as this.
+   * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+   * relation to `this`.
+   */
+  setDayOfWeek(dow: ISODayOfWeek): LocalDate {
+    _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`)
+    const delta = dow - this.dayOfWeek
+    return this.plus(delta, 'day')
+  }
+
+  /**
+   * Returns LocalDate for the given DayOfWeek (e.g Monday), that is in the future,
+   * in relation to this.
+   * If this LocalDate is Monday, and desired DoW is also Monday - `this` is returned.
+   */
+  setNextDayOfWeek(dow: ISODayOfWeek): LocalDate {
+    _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`)
+    let delta = dow - this.dayOfWeek
+    if (delta < 0) delta += 7
+    return this.plus(delta, 'day')
+  }
+
   isSame(d: LocalDateInput): boolean {
     d = localDate.fromInput(d)
     return this.day === d.day && this.month === d.month && this.year === d.year

package/src/datetime/localTime.ts

@@ -50,7 +50,7 @@ const MILLISECONDS_IN_WEEK = 604800000
 const SECONDS_IN_DAY = 86400
 // const MILLISECONDS_IN_DAY = 86400000
 // const MILLISECONDS_IN_MINUTE = 60000
-const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7])
+export const VALID_DAYS_OF_WEEK = new Set([1, 2, 3, 4, 5, 6, 7])
 
 /**
  * It supports 2 forms:
@@ -272,10 +272,27 @@ export class LocalTime {
     return (this.$date.getDay() || 7) as ISODayOfWeek
   }
 
-  setDayOfWeek(v: ISODayOfWeek): LocalTime {
-    _assert(VALID_DAYS_OF_WEEK.has(v), `Invalid dayOfWeek: ${v}`)
-    const dow = this.$date.getDay() || 7
-    return this.plus(v - dow, 'day')
+  /**
+   * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the same week as this.
+   * It may move the time into the future, or the past, depending on how the desired DayOfWeek is in
+   * relation to `this`.
+   */
+  setDayOfWeek(dow: ISODayOfWeek): LocalTime {
+    _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`)
+    const delta = dow - this.dayOfWeek
+    return this.plus(delta, 'day')
+  }
+
+  /**
+   * Returns LocalTime for the given DayOfWeek (e.g Monday), that is in the future,
+   * in relation to this.
+   * If this LocalTime is Monday, and desired DoW is also Monday - `this` is returned.
+   */
+  setNextDayOfWeek(dow: ISODayOfWeek): LocalTime {
+    _assert(VALID_DAYS_OF_WEEK.has(dow), `Invalid dayOfWeek: ${dow}`)
+    let delta = dow - this.dayOfWeek
+    if (delta < 0) delta += 7
+    return this.plus(delta, 'day')
   }
 
   setComponents(c: Partial<DateTimeObject>, mutate = false): LocalTime {