oneentry 1.0.111 → 1.0.112

package/README.md

@@ -401,7 +401,7 @@ Example return:
       "id": 1764,
       "updatedDate": "2025-01-31T21:53:39.276Z",
       "version": 10,
-      "identifier": "my-id",
+      "identifier": "my_id",
       "title": "Set for pages",
       "schema": {
         "attribute1": {
@@ -409,7 +409,7 @@ Example return:
           "type": "string",
           "isPrice": false,
           "original": true,
-          "identifier": "stroka",
+          "identifier": "string",
           "localizeInfos": {
             "en_US": {
               "title": "String"
@@ -460,7 +460,7 @@ Example return:
 >
 >**schema:** Record<string, string> <br>
 >*Schema JSON description (attributes used by the set) of the attribute set* <br>
->example: OrderedMap { "attribute1": OrderedMap { "id": 1, "type": "string", "isPrice": false, "original": true, "identifier": "stroka", "localizeInfos": OrderedMap { "en_US": OrderedMap { "title": "String" } } } } <br>
+>example: OrderedMap { "attribute1": OrderedMap { "id": 1, "type": "string", "isPrice": false, "original": true, "identifier": "string", "localizeInfos": OrderedMap { "en_US": OrderedMap { "title": "String" } } } } <br>
 >
 >**title:** string <br>
 >*Attribute set name* <br>
@@ -722,7 +722,7 @@ Example return:
       "type": "string",
       "isPrice": false,
       "original": true,
-      "identifier": "stroka",
+      "identifier": "string",
       "localizeInfos": {
         "en_US": {
           "title": "String"
@@ -764,7 +764,7 @@ Example return:
 >
 >**schema*:** Record<string, string> <br>
 >*Schema JSON description (attributes used by the set) of the attribute set* <br>
->example: OrderedMap { "attribute1": OrderedMap { "id": 1, "type": "string", "isPrice": false, "original": true, "identifier": "stroka", "localizeInfos": OrderedMap { "en_US": OrderedMap { "title": "String" } } } } <br>
+>example: OrderedMap { "attribute1": OrderedMap { "id": 1, "type": "string", "isPrice": false, "original": true, "identifier": "string", "localizeInfos": OrderedMap { "en_US": OrderedMap { "title": "String" } } } } <br>
 >
 >**isVisible*:** boolean <br>
 >*Visibility flag of the set* <br>

package/dist/base/syncModules.d.ts

@@ -52,11 +52,31 @@ export default abstract class SyncModules {
         [k: string]: unknown;
     };
     /**
-     * addTimeIntervalsToSchedules
+     * Function to add days to a date
      *
-     * @param schedules
+     * @param date
+     * @param days
      * @returns
      */
+    protected _addDays(date: string | number | Date, days: number): Date;
+    /**
+     * Function to generate intervals for a specific date
+     *
+     * @param date
+     * @param schedule
+     * @param utcIntervals
+     */
+    protected _generateIntervalsForDate(date: string | number | Date, schedule: {
+        inEveryWeek: any;
+        times: any[];
+        inEveryMonth: any;
+    }, utcIntervals: any[][]): void;
+    /**
+     * Add TimeIntervals to schedules
+     *
+     * @param schedules
+     * @returns schedules with timeIntervals
+     */
     protected _addTimeIntervalsToSchedules(schedules: any[]): any[];
     /**
      * normalizeAttr

package/dist/base/syncModules.js

@@ -124,62 +124,85 @@ class SyncModules {
         }
     }
     /**
-     * addTimeIntervalsToSchedules
+     * Function to add days to a date
      *
-     * @param schedules
+     * @param date
+     * @param days
      * @returns
      */
-    _addTimeIntervalsToSchedules(schedules) {
-        // Function to add days
-        function addDays(date, days) {
-            const result = new Date(date);
-            result.setUTCDate(result.getUTCDate() + days);
-            return result;
+    _addDays(date, days) {
+        const result = new Date(date);
+        result.setUTCDate(result.getUTCDate() + days);
+        return result;
+    }
+    /**
+     * Function to generate intervals for a specific date
+     *
+     * @param date
+     * @param schedule
+     * @param utcIntervals
+     */
+    _generateIntervalsForDate(date, schedule, utcIntervals) {
+        // Generate intervals based on weekly repetition
+        if (schedule.inEveryWeek) {
+            for (let week = 0; week < 4; week++) {
+                schedule.times.forEach((timeRange) => {
+                    const [startTime, endTime] = timeRange;
+                    const intervalStart = this._addDays(date, week * 7);
+                    intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
+                    const intervalEnd = this._addDays(date, week * 7);
+                    intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
+                    utcIntervals.push([
+                        intervalStart.toISOString(),
+                        intervalEnd.toISOString(),
+                    ]);
+                });
+            }
         }
-        // Function to add months
-        function addMonths(date, months) {
-            const result = new Date(date);
-            result.setUTCMonth(result.getUTCMonth() + months);
-            return result;
+        // Generate intervals based on monthly repetition
+        if (schedule.inEveryMonth) {
+            for (let month = 0; month < 12; month++) {
+                schedule.times.forEach((timeRange) => {
+                    const [startTime, endTime] = timeRange;
+                    const intervalStart = new Date(date);
+                    intervalStart.setUTCMonth(intervalStart.getUTCMonth() + month);
+                    intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
+                    const intervalEnd = new Date(date);
+                    intervalEnd.setUTCMonth(intervalEnd.getUTCMonth() + month);
+                    intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
+                    utcIntervals.push([
+                        intervalStart.toISOString(),
+                        intervalEnd.toISOString(),
+                    ]);
+                });
+            }
         }
+    }
+    /**
+     * Add TimeIntervals to schedules
+     *
+     * @param schedules
+     * @returns schedules with timeIntervals
+     */
+    _addTimeIntervalsToSchedules(schedules) {
         schedules.forEach((scheduleGroup) => {
             scheduleGroup.values.forEach((schedule) => {
                 const utcIntervals = [];
-                const baseDate = new Date(schedule.dates[0]); // We use the first date as the base date
-                // Generate intervals based on weekly repetition
-                if (schedule.inEveryWeek) {
-                    for (let week = 0; week < 4; week++) {
-                        schedule.times.forEach((timeRange) => {
-                            const [startTime, endTime] = timeRange;
-                            const startDate = addDays(baseDate, week * 7);
-                            startDate.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-                            const endDate = addDays(baseDate, week * 7);
-                            endDate.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-                            utcIntervals.push([
-                                startDate.toISOString(),
-                                endDate.toISOString(),
-                            ]);
-                        });
-                    }
+                const startDate = new Date(schedule.dates[0]);
+                const endDate = new Date(schedule.dates[1]);
+                // Check if the dates are the same
+                const isSameDay = startDate.toISOString() === endDate.toISOString();
+                // If the dates are the same, process only the first date
+                if (isSameDay) {
+                    this._generateIntervalsForDate(startDate, schedule, utcIntervals);
                 }
-                // Generate intervals based on monthly repetition
-                if (schedule.inEveryMonth) {
-                    for (let month = 0; month < 12; month++) {
-                        // Предполагаем 12 месяцев в году
-                        schedule.times.forEach((timeRange) => {
-                            const [startTime, endTime] = timeRange;
-                            const startDate = addMonths(baseDate, month);
-                            startDate.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-                            const endDate = addMonths(baseDate, month);
-                            endDate.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-                            utcIntervals.push([
-                                startDate.toISOString(),
-                                endDate.toISOString(),
-                            ]);
-                        });
+                else {
+                    // Otherwise, process each day in the range
+                    for (let currentDate = new Date(startDate); currentDate <= endDate; currentDate = this._addDays(currentDate, 1)) {
+                        this._generateIntervalsForDate(currentDate, schedule, utcIntervals);
                     }
                 }
-                // Add the calculated intervals to the new timeIntervals field
+                // Add calculated intervals to the new field timeIntervals
                 schedule.timeIntervals = utcIntervals;
             });
         });

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "oneentry",
-  "version": "1.0.111",
+  "version": "1.0.112",
   "description": "OneEntry NPM package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "module",
   "files": [
     "/dist"
   ],
@@ -47,9 +48,9 @@
     "@microsoft/tsdoc": "^0.15.1",
     "@types/eslint-config-prettier": "^6.11.3",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.0",
-    "@typescript-eslint/eslint-plugin": "^8.22.0",
-    "@typescript-eslint/parser": "^8.22.0",
+    "@types/node": "^22.13.4",
+    "@typescript-eslint/eslint-plugin": "^8.24.0",
+    "@typescript-eslint/parser": "^8.24.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-import": "^2.31.0",
@@ -58,8 +59,8 @@
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "jest": "^29.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.4.2",
+    "prettier": "^3.5.1",
     "ts-jest": "^29.2.5",
     "typescript": "^5.7.3"
   }
-}
+}