@recombine-ai/engine 0.3.1 → 0.3.2

package/build/index.d.ts

@@ -1,7 +1,7 @@
 import { AIEngine } from './lib/ai';
 export { AIEngine } from './lib/ai';
 export declare const createAIEngine: typeof AIEngine.createAIEngine;
-export { delayFactory, Schedule } from './lib/schedule';
+export { delayFactory, Schedule, createScheduleQuery } from './lib/schedule';
 export { Scheduler, Logger } from './lib/interfaces';
 export * from './lib/bosun';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,eAAO,MAAM,cAAc,gCAA0B,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEpD,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAEnC,eAAO,MAAM,cAAc,gCAA0B,CAAA;AAErD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEpD,cAAc,aAAa,CAAA"}

package/build/index.js

@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.delayFactory = exports.createAIEngine = exports.AIEngine = void 0;
+exports.createScheduleQuery = exports.delayFactory = exports.createAIEngine = exports.AIEngine = void 0;
 const ai_1 = require("./lib/ai");
 var ai_2 = require("./lib/ai");
 Object.defineProperty(exports, "AIEngine", { enumerable: true, get: function () { return ai_2.AIEngine; } });
 exports.createAIEngine = ai_1.AIEngine.createAIEngine;
 var schedule_1 = require("./lib/schedule");
 Object.defineProperty(exports, "delayFactory", { enumerable: true, get: function () { return schedule_1.delayFactory; } });
+Object.defineProperty(exports, "createScheduleQuery", { enumerable: true, get: function () { return schedule_1.createScheduleQuery; } });
 __exportStar(require("./lib/bosun"), exports);

package/build/lib/schedule.d.ts

@@ -3,6 +3,29 @@
  * - note that Delay must not be negative
  */
 export declare function delayFactory(schedule: Schedule): (delay: Delay) => Date;
+/**
+ * Query over an object that follows {@link Schedule} interface
+ */
+export declare class ScheduleQuery {
+    private schedule;
+    constructor(schedule: Schedule);
+    /**
+     * Find next closest date after specified delay within the schedule
+     */
+    nextValidDate(delay: Delay): Date;
+    /**
+     * Finds next closest date that follows a specified date within the schedule
+     */
+    nextValidDate(date: Date): Date;
+    /** Returns next date  the schedule starting from _now_ */
+    next(): Date;
+    /**
+     * Checks if a specified date is within the schedule,
+     * if no date provided, checks if _now_ is within the schedule
+     */
+    isValid(date: Date): boolean;
+}
+export declare function createScheduleQuery(schedule: Schedule): ScheduleQuery;
 type Delay = [number, 'minutes' | 'hours' | 'days'] | [number, 'hours', number, 'minutes'] | [number, 'days', number, 'hours'] | [number, 'days', number, 'hours', number, 'minutes'];
 type singleInt = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
 type hours = `${0 | 1}${singleInt}` | '20' | '21' | '22' | '23';

package/build/lib/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../src/lib/schedule.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,WACH,KAAK,KAAG,IAAI,CAwCvD;AAkFD,KAAK,KAAK,GACJ,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC,GACtC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,GACpC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,GACjC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;AAE1D,KAAK,SAAS,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACtD,KAAK,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAC/D,KAAK,IAAI,GAAG,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,CAAA;AAC3D,KAAK,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAA;AAClG,KAAK,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAC1D,KAAK,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAE9F,KAAK,OAAO,GAAG,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,CAAA;AAE9D,UAAU,SAAS;IACf,IAAI,EAAE,QAAQ,EAAE,CAAA;IAChB,IAAI,EAAE,IAAI,CAAA;IACV,EAAE,EAAE,IAAI,CAAA;CACX;AAED,MAAM,WAAW,QAAQ;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../src/lib/schedule.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,WACH,KAAK,KAAG,IAAI,CAGvD;AAED;;GAEG;AACH,qBAAa,aAAa;IACV,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,QAAQ;IAEtC;;OAEG;IACH,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAEjC;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAuC/B,0DAA0D;IAC1D,IAAI;IAIJ;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,IAAI;CAIrB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,iBAErD;AAiFD,KAAK,KAAK,GACJ,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,MAAM,CAAC,GACtC,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,GACpC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,GACjC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;AAE1D,KAAK,SAAS,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AACtD,KAAK,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAC/D,KAAK,IAAI,GAAG,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,CAAA;AAC3D,KAAK,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAA;AAClG,KAAK,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAC1D,KAAK,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;AAE9F,KAAK,OAAO,GAAG,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,EAAE,CAAA;AAE9D,UAAU,SAAS;IACf,IAAI,EAAE,QAAQ,EAAE,CAAA;IAChB,IAAI,EAAE,IAAI,CAAA;IACV,EAAE,EAAE,IAAI,CAAA;CACX;AAED,MAAM,WAAW,QAAQ;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB"}

package/build/lib/schedule.js

@@ -1,37 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScheduleQuery = void 0;
 exports.delayFactory = delayFactory;
+exports.createScheduleQuery = createScheduleQuery;
 /**
  * @returns getNextTimePoint function that makes a date from a given {@link Delay}
  * - note that Delay must not be negative
  */
 function delayFactory(schedule) {
     return function getNextTimePoint(delay) {
-        const date = new Date();
-        const { holidays, timeZone, workingHours } = schedule;
-        const delayMs = getDelayTimeInMs(delay);
-        const [_, offsetDiffBefore] = convertToTimeZone(date, timeZone);
+        return createScheduleQuery(schedule).nextValidDate(delay);
+    };
+}
+/**
+ * Query over an object that follows {@link Schedule} interface
+ */
+class ScheduleQuery {
+    schedule;
+    constructor(schedule) {
+        this.schedule = schedule;
+    }
+    nextValidDate(dateOrDelay) {
+        const date = dateOrDelay instanceof Date ? dateOrDelay : new Date();
+        const [_, offsetDiffBefore] = convertToTimeZone(date, this.schedule.timeZone);
         const localOffsetBefore = date.getTimezoneOffset() * 60 * 1000;
-        date.setTime(date.getTime() + delayMs);
-        let [targetTzDate, offsetDiff] = convertToTimeZone(date, timeZone);
+        if (!(dateOrDelay instanceof Date)) {
+            const delayMs = getDelayTimeInMs(dateOrDelay);
+            date.setTime(date.getTime() + delayMs);
+        }
+        let [targetTzDate, offsetDiff] = convertToTimeZone(date, this.schedule.timeZone);
         const localOffsetAfterMs = targetTzDate.getTimezoneOffset() * 60 * 1000;
         const localOffsetChange = localOffsetAfterMs - localOffsetBefore;
         const targetTzOffsetChange = offsetDiff - offsetDiffBefore;
-        if (workingHours && workingHours?.length > 0) {
-            targetTzDate = getNextWorkingDate(targetTzDate, workingHours);
-        }
-        if (holidays && isHoliday(targetTzDate, holidays)) {
-            targetTzDate = skipHoliday(targetTzDate, holidays);
+        if (this.schedule.workingHours && this.schedule.workingHours?.length > 0) {
+            targetTzDate = getNextWorkingDate(targetTzDate, this.schedule);
         }
         const targetDate = new Date(targetTzDate.getTime() + offsetDiff + targetTzOffsetChange + localOffsetChange);
-        const [, offsetDiffTz] = convertToTimeZone(targetDate, timeZone);
+        const [, offsetDiffTz] = convertToTimeZone(targetDate, this.schedule.timeZone);
         const targetOffsetTzChange = offsetDiffTz - offsetDiff;
         return new Date(targetTzDate.getTime() +
             offsetDiff +
             targetTzOffsetChange +
             localOffsetChange +
             targetOffsetTzChange);
-    };
+    }
+    /** Returns next date  the schedule starting from _now_ */
+    next() {
+        return this.nextValidDate(new Date());
+    }
+    /**
+     * Checks if a specified date is within the schedule,
+     * if no date provided, checks if _now_ is within the schedule
+     */
+    isValid(date) {
+        const next = this.nextValidDate(date);
+        return date.toISOString() === next.toISOString();
+    }
+}
+exports.ScheduleQuery = ScheduleQuery;
+function createScheduleQuery(schedule) {
+    return new ScheduleQuery(schedule);
 }
 function getDelayTimeInMs(time) {
     const minutesIndex = time.findIndex((el) => el === 'minutes');
@@ -50,12 +78,13 @@ function convertToTimeZone(date, timeZone) {
     const offsetMS = date.getTime() - convertedDate.getTime();
     return [convertedDate, offsetMS];
 }
-function getNextWorkingDate(date, workingHours) {
+function getNextWorkingDate(date, schedule) {
     const currentDate = new Date(date);
     while (true) {
         const currentDay = getDayOfWeek(currentDate);
-        const daySchedule = workingHours.find((interval) => interval.days.includes(currentDay));
-        if (daySchedule) {
+        const daySchedule = schedule.workingHours.find((interval) => interval.days.includes(currentDay));
+        const holiday = schedule.holidays && isHoliday(currentDate, schedule);
+        if (daySchedule && !holiday) {
             const [fromHours, fromMinutes] = daySchedule.from.split(':').map(Number);
             const [toHours, toMinutes] = daySchedule.to.split(':').map(Number);
             if (fromHours > toHours) {
@@ -88,13 +117,11 @@ function getDayOfWeek(date) {
     ];
     return days[date.getDay()];
 }
-function isHoliday(date, holidays) {
-    const dateString = date.toISOString().split('T')[0];
-    return holidays.includes(dateString);
-}
-function skipHoliday(date, holidays) {
-    while (isHoliday(date, holidays)) {
-        date.setDate(date.getDate() + 1);
-    }
-    return date;
+function isHoliday(date, schedule) {
+    if (!schedule.holidays)
+        return false;
+    const offset = date.getTimezoneOffset();
+    const utcDate = new Date(date.getTime() - offset * 60 * 1000);
+    const dateString = utcDate.toISOString().split('T')[0];
+    return schedule.holidays.includes(dateString);
 }

package/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.3.1 → 0.3.2 (unstable)
+
+-   add `ScheduleQuery` class that provides three additional capabilities compared to `delayFactory`:
+    -   `query.nextValidDate(date: Date)` – to find next closest date after a specific date (rather than delay)
+    -   `query.next()` – gets closest date within provided schedule
+    -   `query.isValid(date)` – checks if provided date is within the schedule
+
 ### 0.3.0 → 0.3.1 (unstable)
 
 -   Fix: allow other models (as a string)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recombine-ai/engine",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "description": "Recombine AI engine for creating conversational AI agents",
     "main": "build/index.js",
     "types": "build/index.d.ts",