oneentry 1.0.135 → 1.0.136

package/dist/base/syncModules.d.ts

@@ -78,6 +78,25 @@ export default abstract class SyncModules {
      * @returns {any} Schedules with added time intervals.
      */
     _addTimeIntervalsToSchedules(schedules: any[]): any;
+    /**
+     * Generates intervals for a specific date for form schedules.
+     * @param {Date} date - The date for which to generate intervals.
+     * @param {object} interval - The interval configuration.
+     * @param {boolean} interval.inEveryWeek - Indicates whether the schedule is weekly.
+     * @param {boolean} interval.inEveryMonth - Indicates whether the schedule is monthly.
+     * @param {any[]} timeIntervals - The time intervals to process.
+     * @param {Set<Array<string>>} utcIntervals - A set to store unique intervals.
+     */
+    protected _generateIntervalsForFormDate(date: Date, interval: {
+        inEveryWeek: boolean;
+        inEveryMonth: boolean;
+    }, timeIntervals: any[], utcIntervals: Set<Array<string>>): void;
+    /**
+     * Adds time intervals to form schedules (different structure).
+     * @param {any[]} intervals - The intervals to process.
+     * @returns {any} Intervals with added time intervals.
+     */
+    _addTimeIntervalsToFormSchedules(intervals: any[]): any;
     /**
      * Normalizes attributes within the data.
      * @param {any} data - The data to normalize.

package/dist/base/syncModules.js

@@ -258,13 +258,124 @@ class SyncModules {
         });
         return schedules;
     }
+    /**
+     * Generates intervals for a specific date for form schedules.
+     * @param {Date} date - The date for which to generate intervals.
+     * @param {object} interval - The interval configuration.
+     * @param {boolean} interval.inEveryWeek - Indicates whether the schedule is weekly.
+     * @param {boolean} interval.inEveryMonth - Indicates whether the schedule is monthly.
+     * @param {any[]} timeIntervals - The time intervals to process.
+     * @param {Set<Array<string>>} utcIntervals - A set to store unique intervals.
+     */
+    _generateIntervalsForFormDate(date, interval, timeIntervals, utcIntervals) {
+        const generateTimeSlotsForDate = (currentDate) => {
+            timeIntervals.forEach((timeInterval) => {
+                let currentStart = timeInterval.start;
+                const endTime = timeInterval.end;
+                while (currentStart.hours < endTime.hours ||
+                    (currentStart.hours === endTime.hours &&
+                        currentStart.minutes < endTime.minutes)) {
+                    const intervalStart = new Date(currentDate);
+                    intervalStart.setUTCHours(currentStart.hours, currentStart.minutes, 0, 0);
+                    const nextMinutes = currentStart.minutes + timeInterval.period;
+                    const nextHours = currentStart.hours + Math.floor(nextMinutes / 60);
+                    const minutes = nextMinutes % 60;
+                    if (nextHours > endTime.hours ||
+                        (nextHours === endTime.hours && minutes > endTime.minutes)) {
+                        break;
+                    }
+                    const intervalEnd = new Date(currentDate);
+                    intervalEnd.setUTCHours(nextHours, minutes, 0, 0);
+                    utcIntervals.add([
+                        intervalStart.toISOString(),
+                        intervalEnd.toISOString(),
+                    ]);
+                    currentStart = { hours: nextHours, minutes };
+                }
+            });
+        };
+        // Handle weekly schedules
+        if (interval.inEveryWeek && !interval.inEveryMonth) {
+            let currentDate = new Date(date);
+            const endOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
+            while (currentDate <= endOfMonth) {
+                generateTimeSlotsForDate(currentDate);
+                currentDate = this._addDays(currentDate, 7);
+            }
+        }
+        // Handle monthly schedules
+        if (interval.inEveryMonth && !interval.inEveryWeek) {
+            const startDate = new Date(date);
+            const targetDayOfMonth = startDate.getUTCDate();
+            const numberOfMonths = 12;
+            for (let i = 0; i < numberOfMonths; i++) {
+                const currentDate = new Date(startDate);
+                currentDate.setUTCMonth(currentDate.getUTCMonth() + i);
+                currentDate.setUTCDate(targetDayOfMonth);
+                if (currentDate.getUTCMonth() !== (startDate.getUTCMonth() + i) % 12) {
+                    continue;
+                }
+                generateTimeSlotsForDate(currentDate);
+            }
+        }
+        // Handle both weekly and monthly schedules
+        if (interval.inEveryMonth && interval.inEveryWeek) {
+            const startDate = new Date(date);
+            const targetDayOfWeek = startDate.getUTCDay();
+            const numberOfMonths = 12;
+            for (let i = 0; i < numberOfMonths; i++) {
+                const currentDate = new Date(startDate);
+                currentDate.setUTCMonth(currentDate.getUTCMonth() + i);
+                currentDate.setUTCDate(1);
+                const daysUntilTargetDay = (targetDayOfWeek - currentDate.getUTCDay() + 7) % 7;
+                currentDate.setUTCDate(currentDate.getUTCDate() + daysUntilTargetDay);
+                while (currentDate.getUTCMonth() ===
+                    (startDate.getUTCMonth() + i) % 12) {
+                    generateTimeSlotsForDate(currentDate);
+                    currentDate.setUTCDate(currentDate.getUTCDate() + 7);
+                }
+            }
+        }
+    }
+    /**
+     * Adds time intervals to form schedules (different structure).
+     * @param {any[]} intervals - The intervals to process.
+     * @returns {any} Intervals with added time intervals.
+     */
+    _addTimeIntervalsToFormSchedules(intervals) {
+        intervals.forEach((interval) => {
+            var _a, _b;
+            if (!interval.intervals || !Array.isArray(interval.intervals)) {
+                return;
+            }
+            const utcIntervals = new Set();
+            const startDate = new Date(interval.range[0]);
+            const endDate = new Date(interval.range[1]);
+            const isSameDay = startDate.toISOString() === endDate.toISOString();
+            const intervalConfig = {
+                inEveryWeek: (_a = interval.inEveryWeek) !== null && _a !== void 0 ? _a : false,
+                inEveryMonth: (_b = interval.inEveryMonth) !== null && _b !== void 0 ? _b : false,
+            };
+            if (isSameDay) {
+                this._generateIntervalsForFormDate(startDate, intervalConfig, interval.intervals, utcIntervals);
+            }
+            else {
+                for (let currentDate = new Date(startDate); currentDate <= endDate; currentDate = this._addDays(currentDate, 1)) {
+                    this._generateIntervalsForFormDate(currentDate, intervalConfig, interval.intervals, utcIntervals);
+                }
+            }
+            interval.timeIntervals = Array.from(utcIntervals).sort();
+        });
+        return intervals;
+    }
     /**
      * Normalizes attributes within the data.
      * @param {any} data - The data to normalize.
      * @returns {any} Normalized attributes.
      */
     _normalizeAttr(data) {
-        // For regular attributes collections
+        var _a;
+        // For regular attributes collections - pages, products, etc.
         if ('attributeValues' in data) {
             for (const attr in data.attributeValues) {
                 const d = data.attributeValues[attr];
@@ -288,33 +399,43 @@ class SyncModules {
                 attributeValues: this._sortAttributes(data.attributeValues),
             };
         }
-        // for forms attributes
+        // for forms attributes - forms attributes collections
         if ('attributes' in data) {
             const d = data.attributes;
-            // console.log('Schedules:: ', JSON.stringify(d));
             for (const attr in d) {
                 // Normalize numbers
-                if (d[attr].type === 'integer' || d[attr].type === 'float') {
-                    const numValue = Number(d[attr].value);
-                    d[attr].value = isNaN(numValue) ? null : numValue;
-                }
+                // if (d[attr].type === 'integer' || d[attr].type === 'float') {
+                //   const numValue = Number(d[attr].value);
+                //   d[attr].value = isNaN(numValue) ? null : numValue;
+                // }
                 // Add time intervals
                 if (d[attr].type === 'timeInterval') {
-                    // const schedules = d[attr].localizeInfos.intervals;
-                    // console.log('Schedules:: ', JSON.stringify(schedules));
-                    // if (Array.isArray(schedules) && schedules.length > 0) {
-                    //   const result = this._addTimeIntervalsToSchedulesForm(schedules);
-                    //   d[attr].localizeInfos.intervals = result;
-                    // }
+                    const intervals = (_a = d[attr].localizeInfos) === null || _a === void 0 ? void 0 : _a.intervals;
+                    // console.log('Schedules:: ', JSON.stringify(intervals));
+                    if (intervals && Array.isArray(intervals) && intervals.length > 0) {
+                        const result = this._addTimeIntervalsToFormSchedules(intervals);
+                        d[attr].localizeInfos.intervals = result;
+                    }
                 }
             }
             return data;
         }
-        // !!! For single attribute
-        if ('attributes' in data) {
-            // console.log('Schedules:: ', JSON.stringify(data));
+        //  For single attribute - for attribute sets
+        if ('type' in data) {
+            // Normalize numbers
+            if (data.type === 'integer' || data.type === 'float') {
+                const numValue = Number(data.value);
+                data.value = isNaN(numValue) ? null : numValue;
+            }
+            // Add time intervals
+            if (data.type === 'timeInterval') {
+                const schedules = data.value;
+                if (Array.isArray(schedules) && schedules.length > 0) {
+                    const result = this._addTimeIntervalsToSchedules(schedules);
+                    data.value = result;
+                }
+            }
         }
-        // console.log('Schedules:: ', JSON.stringify(data));
         return data;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.135",
+  "version": "1.0.136",
   "description": "OneEntry NPM package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",