oneentry 1.0.121 → 1.0.122

package/dist/attribute-sets/attributeSetsInterfaces.d.ts

@@ -12,10 +12,10 @@ interface IAttributesSets {
 /**
  * Represents an interface object of IListTitle.
  *
- * @property {string} title
- * @property {number | string} value
- * @property {string | number | null} position
- * @property {object} extended
+ * @property {string} title - The title or name associated with the list item.
+ * @property {number | string} value - The value of the list item, which can be either a number or a string depending on the context.
+ * @property {string | number | null} position - The position of the list item, which can be represented as a string, number, or null if not applicable.
+ * @property {object} extended - An object containing additional properties or metadata related to the list item. This could include any extra details that extend the basic information.
  */
 interface IListTitle {
     title: string;
@@ -53,15 +53,15 @@ interface IAttributesSetsEntity {
 /**
  * Represents an interface object of IAttributeSetsEntity.
  *
- * @property {number} id -
- * @property {string} identifier -
- * @property {boolean} isVisible -
- * @property {any} schema -
- * @property {string} title -
- * @property {any} type -
- * @property {number} typeId -
- * @property {string} updatedDate -
- * @property {number} version -
+ * @property {number} id - The unique identifier of the attribute set entity.
+ * @property {string} identifier - A string that uniquely identifies the attribute set.
+ * @property {boolean} isVisible - Indicates whether the attribute set is visible or not.
+ * @property {any} schema - The schema definition associated with the attribute set. This could represent the structure or rules for the data.
+ * @property {string} title - The title or name of the attribute set.
+ * @property {any} type - The type of the attribute set, which could be a specific classification or category.
+ * @property {number} typeId - The numerical identifier representing the type of the attribute set.
+ * @property {string} updatedDate - The date when the attribute set was last updated, represented as a string. Consider using Date for better date handling.
+ * @property {number} version - The version number of the attribute set, used for tracking changes or updates.
  */
 interface IAttributeSetsEntity {
     id: number;

package/dist/base/stateModule.d.ts

@@ -4,7 +4,7 @@ export default class StateModule {
     lang: string | undefined;
     token: string | undefined;
     accessToken: string | undefined;
-    multipleResponse: boolean;
+    traficLimit: boolean;
     refreshToken: string | undefined;
     customAuth: boolean;
     _NO_FETCH: boolean;

package/dist/base/stateModule.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class StateModule {
     constructor(url, config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         this.url = url;
         this.lang = (_a = config.langCode) !== null && _a !== void 0 ? _a : 'en_US';
         this.token = config.token;
-        this.multipleResponse = !!((_b = config.traficLimit) !== null && _b !== void 0 ? _b : true);
-        this.refreshToken = (_d = (_c = config.auth) === null || _c === void 0 ? void 0 : _c.refreshToken) !== null && _d !== void 0 ? _d : undefined;
-        this.customAuth = (_f = (_e = config.auth) === null || _e === void 0 ? void 0 : _e.customAuth) !== null && _f !== void 0 ? _f : false;
+        this.traficLimit = config.traficLimit || false;
+        this.refreshToken = (_c = (_b = config.auth) === null || _b === void 0 ? void 0 : _b.refreshToken) !== null && _c !== void 0 ? _c : undefined;
+        this.customAuth = (_e = (_d = config.auth) === null || _d === void 0 ? void 0 : _d.customAuth) !== null && _e !== void 0 ? _e : false;
         this.errorsFunctions = {
             '400': undefined,
             '401': undefined,
@@ -16,20 +16,20 @@ class StateModule {
             '404': undefined,
             '500': undefined,
         };
-        this.saveFunction = (_h = (_g = config.auth) === null || _g === void 0 ? void 0 : _g.saveFunction) !== null && _h !== void 0 ? _h : null;
+        this.saveFunction = (_g = (_f = config.auth) === null || _f === void 0 ? void 0 : _f.saveFunction) !== null && _g !== void 0 ? _g : null;
         if (config.errors) {
-            this.isShell = (_j = config.errors.isShell) !== null && _j !== void 0 ? _j : true;
+            this.isShell = (_h = config.errors.isShell) !== null && _h !== void 0 ? _h : true;
             if (config.errors.customErrors) {
                 this.errorsFunctions['400'] =
-                    (_k = config.errors.customErrors['400']) !== null && _k !== void 0 ? _k : undefined;
+                    (_j = config.errors.customErrors['400']) !== null && _j !== void 0 ? _j : undefined;
                 this.errorsFunctions['401'] =
-                    (_l = config.errors.customErrors['401']) !== null && _l !== void 0 ? _l : undefined;
+                    (_k = config.errors.customErrors['401']) !== null && _k !== void 0 ? _k : undefined;
                 this.errorsFunctions['403'] =
-                    (_m = config.errors.customErrors['403']) !== null && _m !== void 0 ? _m : undefined;
+                    (_l = config.errors.customErrors['403']) !== null && _l !== void 0 ? _l : undefined;
                 this.errorsFunctions['404'] =
-                    (_o = config.errors.customErrors['404']) !== null && _o !== void 0 ? _o : undefined;
+                    (_m = config.errors.customErrors['404']) !== null && _m !== void 0 ? _m : undefined;
                 this.errorsFunctions['500'] =
-                    (_p = config.errors.customErrors['400']) !== null && _p !== void 0 ? _p : undefined;
+                    (_o = config.errors.customErrors['400']) !== null && _o !== void 0 ? _o : undefined;
             }
         }
         else {

package/dist/base/syncModules.js

@@ -249,138 +249,6 @@ class SyncModules {
         });
         return schedules;
     }
-    // /**
-    //  * Function to generate intervals for a specific date
-    //  *
-    //  * @param date
-    //  * @param schedule
-    //  * @param utcIntervals
-    //  */
-    // protected _generateFormIntervalsForDate(
-    //   date: Date,
-    //   schedule: { inEveryWeek: boolean; intervals: any[]; inEveryMonth: boolean },
-    //   utcIntervals: Set<Array<string>>,
-    // ) {
-    //   // inEveryWeek
-    //   if (schedule.inEveryWeek && !schedule.inEveryMonth) {
-    //     let currentDate = new Date(date);
-    //     // Вычисляем последний день текущего месяца
-    //     const endOfMonth = new Date(
-    //       currentDate.getFullYear(),
-    //       currentDate.getMonth() + 1,
-    //       0,
-    //     );
-    //     while (currentDate <= endOfMonth) {
-    //       schedule.intervals?.forEach((timeRange: [any, any]) => {
-    //         const [startTime, endTime] = timeRange;
-    //         const intervalStart = new Date(currentDate);
-    //         intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-    //         const intervalEnd = new Date(currentDate);
-    //         intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-    //         // Добавляем строку JSON в Set для уникальности
-    //         utcIntervals.add([
-    //           intervalStart.toISOString(),
-    //           intervalEnd.toISOString(),
-    //         ]);
-    //       });
-    //       currentDate = this._addDays(currentDate, 7); // Переходим к следующей неделе
-    //     }
-    //   }
-    //   // inEveryMonth
-    //   if (schedule.inEveryMonth && !schedule.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; // Если вышли, пропускаем этот месяц
-    //       }
-    //       schedule.intervals?.forEach((timeRange: [any, any]) => {
-    //         const [startTime, endTime] = timeRange;
-    //         const intervalStart = new Date(currentDate);
-    //         intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-    //         const intervalEnd = new Date(currentDate);
-    //         intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-    //         utcIntervals.add([
-    //           intervalStart.toISOString(),
-    //           intervalEnd.toISOString(),
-    //         ]);
-    //       });
-    //     }
-    //   }
-    //   // inEveryMonth && inEveryWeek
-    //   if (schedule.inEveryMonth && schedule.inEveryWeek) {
-    //     const startDate = new Date(date); // Начальная дата
-    //     const targetDayOfWeek = startDate.getUTCDay(); // Определяем день недели начальной даты
-    //     const numberOfMonths = 12; // Количество месяцев, на которые нужно повторить
-    //     console.log(startDate);
-    //     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
-    //       ) {
-    //         schedule.intervals.forEach((timeRange: [any, any]) => {
-    //           const [startTime, endTime] = timeRange;
-    //           const intervalStart = new Date(currentDate);
-    //           intervalStart.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
-    //           const intervalEnd = new Date(currentDate);
-    //           intervalEnd.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
-    //           utcIntervals.add([
-    //             intervalStart.toISOString(),
-    //             intervalEnd.toISOString(),
-    //           ]);
-    //         });
-    //         // Переходим к следующей неделе (следующему такому же дню недели)
-    //         currentDate.setUTCDate(currentDate.getUTCDate() + 7);
-    //       }
-    //     }
-    //   }
-    // }
-    // /**
-    //  * Add TimeIntervals to schedules Form
-    //  *
-    //  * @param schedules
-    //  * @returns schedules with timeIntervals
-    //  */
-    // _addTimeIntervalsToSchedulesForm(schedules: any[]) {
-    //   schedules?.forEach((schedule: any) => {
-    //     const utcIntervals: Set<Array<string>> = new Set();
-    //     const startDate = new Date(schedule.range[0]);
-    //     const endDate = new Date(schedule.range[1]);
-    //     const isSameDay = startDate.toISOString() === endDate.toISOString();
-    //     // console.log(JSON.stringify(schedule));
-    //     if (isSameDay) {
-    //       this._generateFormIntervalsForDate(startDate, schedule, utcIntervals);
-    //     } else {
-    //       for (
-    //         let currentDate = new Date(startDate);
-    //         currentDate <= endDate;
-    //         currentDate = this._addDays(currentDate, 1)
-    //       ) {
-    //         this._generateFormIntervalsForDate(
-    //           currentDate,
-    //           schedule,
-    //           utcIntervals,
-    //         );
-    //       }
-    //     }
-    //     // schedule.timeIntervals = Array.from(utcIntervals).sort();
-    //   });
-    //   return schedules;
-    // }
     /**
      * normalizeAttr
      *

package/dist/blocks/blocksApi.js

@@ -25,7 +25,7 @@ class BlocksApi extends asyncModules_1.default {
      */
     async getBlocks(type, langCode = this.state.lang, offset = 0, limit = 30) {
         const response = await this._fetchGet(`?langCode=${langCode}&type=${type}&offset=${offset}&limit=${limit}`);
-        if (this.state.multipleResponse) {
+        if (!this.state.traficLimit) {
             const normalizeResponse = this._normalizeData(response);
             await Promise.all(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -93,7 +93,7 @@ class BlocksApi extends asyncModules_1.default {
         delete normalizeResponse.customSettings;
         delete normalizeResponse.attributesSetIdentifier;
         delete normalizeResponse.productPageUrls;
-        if (this.state.multipleResponse) {
+        if (!this.state.traficLimit) {
             if (normalizeResponse.type === 'similar_products_block') {
                 try {
                     await this.getSimilarProducts(normalizeResponse.identifier, langCode, offset, limit).then((result) => {

package/dist/formsData/formsDataApi.js

@@ -79,7 +79,9 @@ class FormsDataApi extends asyncModules_1.default {
                             type: 'page',
                             entity: 'editor',
                             // Generate a random 4-digit ID
-                            id: Number(Math.floor(Math.random() * 10000).toString().padStart(4, '0')),
+                            id: Number(Math.floor(Math.random() * 10000)
+                                .toString()
+                                .padStart(4, '0')),
                         };
                         fd.fileQuery = fileQuery;
                     }

package/dist/pages/pagesApi.d.ts

@@ -88,4 +88,16 @@ export default class PageApi extends AsyncModules implements IPageApi {
      * @returns Returns all created pages as an array of PageEntity objects or an empty array [] (if there is no data)
      */
     searchPage(name: string, langCode?: string): Promise<Array<IPagesEntity> | IError>;
+    /**
+     * addTemplateToPages
+     * @param data
+     * @returns
+     */
+    protected addTemplateToPages(data: IPagesEntity[]): Promise<IPagesEntity[]>;
+    /**
+     * addTemplateToPage by page templateIdentifier
+     * @param data - page object
+     * @returns
+     */
+    protected addTemplateToPage(data: IPagesEntity): Promise<IPagesEntity>;
 }

package/dist/pages/pagesApi.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const asyncModules_1 = __importDefault(require("../base/asyncModules"));
+const templatesApi_1 = __importDefault(require("../templates/templatesApi"));
 /**
  * Controllers for working with page objects, including catalog pages
  * @handle /api/content/pages
@@ -22,7 +23,8 @@ class PageApi extends asyncModules_1.default {
      * @returns Returns all created pages without parents as an array of PageEntity objects or an empty array [] (if there is no data)
      */
     async getRootPages(langCode = this.state.lang) {
-        const result = await this._fetchGet(`/root?langCode=${langCode}`);
+        const data = await this._fetchGet(`/root?langCode=${langCode}`);
+        const result = await this.addTemplateToPages(data);
         return this._normalizeData(result, langCode);
     }
     /**
@@ -33,7 +35,8 @@ class PageApi extends asyncModules_1.default {
      * @returns Returns all created pages as an array of PageEntity objects or an empty array [] (if there is no data)
      */
     async getPages(langCode = this.state.lang) {
-        const result = await this._fetchGet(`?langCode=${langCode}`);
+        const data = await this._fetchGet(`?langCode=${langCode}`);
+        const result = await this.addTemplateToPages(data);
         return this._normalizeData(result, langCode);
     }
     /**
@@ -45,7 +48,8 @@ class PageApi extends asyncModules_1.default {
      * @returns Returns PageEntity object
      */
     async getPageById(id, langCode = this.state.lang) {
-        const result = await this._fetchGet(`/${id}?langCode=${langCode}`);
+        const data = await this._fetchGet(`/${id}?langCode=${langCode}`);
+        const result = await this.addTemplateToPage(data);
         return this._normalizeData(result, langCode);
     }
     /**
@@ -58,7 +62,8 @@ class PageApi extends asyncModules_1.default {
      */
     async getPageByUrl(url, langCode = this.state.lang) {
         const data = await this._fetchGet(`/url/${url}?langCode=${langCode}`);
-        return this._normalizeData(data, langCode);
+        const result = await this.addTemplateToPage(data);
+        return this._normalizeData(result, langCode);
     }
     /**
      * Get child pages object with information as an array.
@@ -70,7 +75,8 @@ class PageApi extends asyncModules_1.default {
      */
     async getChildPagesByParentUrl(url, langCode = this.state.lang) {
         const data = await this._fetchGet(`/${url}/children?langCode=${langCode}`);
-        return this._normalizeData(data, langCode);
+        const result = await this.addTemplateToPages(data);
+        return this._normalizeData(result, langCode);
     }
     /**
      * Get all blocks by page url.
@@ -97,7 +103,7 @@ class PageApi extends asyncModules_1.default {
             delete item.attributesSetIdentifier;
             return item;
         });
-        if (this.state.multipleResponse) {
+        if (!this.state.traficLimit) {
             class StaffModule extends asyncModules_1.default {
                 constructor(state) {
                     super(state);
@@ -172,17 +178,50 @@ class PageApi extends asyncModules_1.default {
      * @returns Returns all created pages as an array of PageEntity objects or an empty array [] (if there is no data)
      */
     async searchPage(name, langCode = this.state.lang) {
-        const searchPages = await this._fetchGet(`/quick/search?lang=${langCode}&name=${name}`);
-        if (this.state.multipleResponse) {
+        const data = await this._fetchGet(`/quick/search?lang=${langCode}&name=${name}`);
+        if (!this.state.traficLimit) {
             const pageList = [];
-            await Promise.all(searchPages.map(async (page) => {
+            await Promise.all(data.map(async (page) => {
                 await this.getPageById(page.id, langCode).then((result) => {
                     pageList.push(result);
                 });
             }));
-            return this._dataPostProcess(pageList, langCode);
+            const result = await this.addTemplateToPages(pageList);
+            return this._dataPostProcess(result, langCode);
+        }
+        const result = await this.addTemplateToPages(data);
+        return this._normalizeData(result, langCode);
+    }
+    /**
+     * addTemplateToPages
+     * @param data
+     * @returns
+     */
+    async addTemplateToPages(data) {
+        return Promise.all(data.map(async (d) => {
+            const result = await this.addTemplateToPage(d);
+            return result;
+        }));
+    }
+    /**
+     * addTemplateToPage by page templateIdentifier
+     * @param data - page object
+     * @returns
+     */
+    async addTemplateToPage(data) {
+        if ('templateIdentifier' in data && data.templateIdentifier) {
+            // Create an instance of templatesApi with the current state
+            const Templates = new templatesApi_1.default(this.state);
+            // get template by marker
+            const result = await Templates.getTemplateByMarker('template');
+            return {
+                ...data,
+                template: result,
+            };
+        }
+        else {
+            return data;
         }
-        return this._normalizeData(searchPages, langCode);
     }
 }
 exports.default = PageApi;

package/dist/pages/pagesInterfaces.d.ts

@@ -127,5 +127,6 @@ interface IPagesEntity {
     products?: number;
     templateIdentifier: string | null;
     type: Types;
+    template?: any;
 }
 export type { IPageApi, IPageConfig, IPagesEntity, IPositionBlock, IPositionForm, };

package/dist/products/productsApi.js

@@ -295,7 +295,7 @@ class ProductApi extends asyncModules_1.default {
      */
     async searchProduct(name, langCode = this.state.lang) {
         const searchProducts = await this._fetchGet(`/quick/search?langCode=${langCode}&name=${name}`);
-        if (this.state.multipleResponse) {
+        if (!this.state.traficLimit) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const productsList = [];
             await Promise.all(searchProducts.map(async (product) => {

package/dist/templates/templatesApi.js

@@ -63,7 +63,7 @@ class TemplatesPreviewApi extends asyncModules_1.default {
      * @returns Returns a TemplateEntity object
      */
     async getTemplateByMarker(marker, langCode = this.state.lang) {
-        const result = await this._fetchGet(`/${marker}?langCode=${langCode}`);
+        const result = await this._fetchGet(`/marker/${marker}?langCode=${langCode}`);
         return this._normalizeData(result);
     }
 }

package/package.json

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