oneentry 1.0.136 → 1.0.137

package/dist/menus/menusSchemas.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MenuEntitySchema = exports.MenusPagesSchema = void 0;
+const zod_1 = require("zod");
+/**
+ * Menu pages schema (recursive)
+ * Can have children that are also menu pages
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+exports.MenusPagesSchema = zod_1.z.lazy(() => zod_1.z.object({
+    children: zod_1.z.union([zod_1.z.array(exports.MenusPagesSchema), exports.MenusPagesSchema]).optional(),
+    id: zod_1.z.number().nullable(),
+    pageUrl: zod_1.z.string().nullable(),
+    localizeInfos: zod_1.z.record(zod_1.z.string(), zod_1.z.any()),
+    attributeValues: zod_1.z.record(zod_1.z.string(), zod_1.z.any()),
+    position: zod_1.z.number(),
+    parentId: zod_1.z.number().nullable(),
+}));
+/**
+ * Menu entity schema
+ * Includes all fields returned by the API
+ */
+exports.MenuEntitySchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    identifier: zod_1.z.string(),
+    localizeInfos: zod_1.z.record(zod_1.z.string(), zod_1.z.any()),
+    pages: zod_1.z.union([zod_1.z.array(exports.MenusPagesSchema), exports.MenusPagesSchema]),
+});

package/dist/orders/ordersApi.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const asyncModules_1 = __importDefault(require("../base/asyncModules"));
+const ordersSchemas_1 = require("./ordersSchemas");
 /**
  * Controllers for working with orders.
  * @handle /api/content/orders-storage
@@ -49,7 +50,9 @@ class OrdersApi extends asyncModules_1.default {
      */
     async getAllOrdersByMarker(marker, langCode = this.state.lang, offset = 0, limit = 30) {
         const result = await this._fetchGet(`/marker/${marker}/orders?langCode=${langCode}&limit=${limit}&offset=${offset}`);
-        return this._normalizeData(result);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(result, ordersSchemas_1.OrdersResponseSchema);
+        return this._normalizeData(validated);
     }
     /**
      * Retrieve one order storage object by marker.
@@ -78,7 +81,9 @@ class OrdersApi extends asyncModules_1.default {
      */
     async getOrderByMarkerAndId(marker, id, langCode = this.state.lang) {
         const result = await this._fetchGet(`/marker/${marker}/orders/${id}?langCode=${langCode}`);
-        return this._normalizeData(result);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(result, ordersSchemas_1.OrderEntitySchema);
+        return this._normalizeData(validated);
     }
     /**
      * Creation of an order in the order storage.
@@ -115,7 +120,9 @@ class OrdersApi extends asyncModules_1.default {
             : [body.formData];
         body.formData = formData;
         const result = await this._fetchPost(`/marker/${marker}/orders`, body);
-        return this._normalizeData(result);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(result, ordersSchemas_1.CreateOrderResponseSchema);
+        return this._normalizeData(validated);
     }
     /**
      * Changing an order in the orders storage
@@ -154,7 +161,9 @@ class OrdersApi extends asyncModules_1.default {
             : [body.formData];
         body.formData = formData;
         const result = await this._fetchPut(`/marker/${marker}/orders/${id}?langCode=${langCode}`, body);
-        return this._normalizeData(result);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(result, ordersSchemas_1.UpdateOrderResponseSchema);
+        return this._normalizeData(validated);
     }
 }
 exports.default = OrdersApi;

package/dist/orders/ordersInterfaces.d.ts

@@ -86,7 +86,7 @@ interface IOrdersApi {
      * @description This method requires user authorization.
      * @see For more information about configuring the {@link https://js-sdk.oneentry.cloud/docs/category/authprovider authorization module}, see the documentation in the  {@link https://js-sdk.oneentry.cloud/docs/category/authprovider configuration settings section of the SDK}.
      */
-    createOrder(marker: string, body: IOrderData, langCode: string): Promise<IBaseOrdersEntity | IError>;
+    createOrder(marker: string, body: IOrderData, langCode?: string): Promise<IBaseOrdersEntity | IError>;
     /**
      * Changing an order in the orders storage
      * @handleName updateOrderByMarkerAndId
@@ -419,8 +419,8 @@ interface IOrderByMarkerEntity {
     currency: string;
     paymentAccountIdentifier?: string;
     paymentAccountLocalizeInfos?: Record<string, any>;
-    paymentUrl: null | string;
+    paymentUrl: string | null;
     products: IOrderProducts[];
-    isCompleted: null | boolean;
+    isCompleted: boolean | null;
 }
 export type { IBaseOrdersEntity, IBaseOrdersEntityResponse, IOrderByMarkerEntity, IOrderData, IOrderProductData, IOrderProducts, IOrdersApi, IOrdersByMarkerEntity, IOrdersEntity, IOrdersFormData, IPaymentAccountIdentifiers, IPicture, };

package/dist/orders/ordersSchemas.d.ts

@@ -0,0 +1,158 @@
+/**
+ * Validation schemas for Orders module
+ * @description Zod schemas for validating orders-related API responses
+ */
+import { z } from 'zod';
+/**
+ * Order item schema
+ * @description Order item schema for validating orders-related API responses
+ */
+export declare const OrderItemSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    productId: z.ZodNumber;
+    quantity: z.ZodNumber;
+    price: z.ZodNumber;
+    total: z.ZodNumber;
+    attributes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+}, z.core.$strip>;
+/**
+ * Order entity schema
+ * @description Order entity schema for validating orders-related API responses
+ */
+export declare const OrderEntitySchema: z.ZodObject<{
+    id: z.ZodNumber;
+    identifier: z.ZodOptional<z.ZodString>;
+    statusMarker: z.ZodOptional<z.ZodString>;
+    statusIdentifier: z.ZodOptional<z.ZodString>;
+    userId: z.ZodOptional<z.ZodNumber>;
+    userIdentifier: z.ZodOptional<z.ZodString>;
+    total: z.ZodOptional<z.ZodNumber>;
+    totalSum: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
+    items: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodNumber;
+        productId: z.ZodNumber;
+        quantity: z.ZodNumber;
+        price: z.ZodNumber;
+        total: z.ZodNumber;
+        attributes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    }, z.core.$strip>>>;
+    products: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    formData: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+    createdAt: z.ZodOptional<z.ZodString>;
+    createdDate: z.ZodOptional<z.ZodString>;
+    updatedAt: z.ZodOptional<z.ZodString>;
+    storageId: z.ZodOptional<z.ZodNumber>;
+    formIdentifier: z.ZodOptional<z.ZodString>;
+    attributeSetIdentifier: z.ZodOptional<z.ZodString>;
+    currency: z.ZodOptional<z.ZodString>;
+    paymentAccountIdentifier: z.ZodOptional<z.ZodString>;
+    paymentAccountLocalizeInfos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+    paymentUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+    isCompleted: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
+}, z.core.$strip>;
+/**
+ * Orders list response schema
+ * @returns Orders list response schema
+ */
+export declare const OrdersResponseSchema: z.ZodObject<{
+    items: z.ZodArray<z.ZodObject<{
+        id: z.ZodNumber;
+        identifier: z.ZodOptional<z.ZodString>;
+        statusMarker: z.ZodOptional<z.ZodString>;
+        statusIdentifier: z.ZodOptional<z.ZodString>;
+        userId: z.ZodOptional<z.ZodNumber>;
+        userIdentifier: z.ZodOptional<z.ZodString>;
+        total: z.ZodOptional<z.ZodNumber>;
+        totalSum: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
+        items: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            id: z.ZodNumber;
+            productId: z.ZodNumber;
+            quantity: z.ZodNumber;
+            price: z.ZodNumber;
+            total: z.ZodNumber;
+            attributes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+        }, z.core.$strip>>>;
+        products: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+        formData: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+        createdAt: z.ZodOptional<z.ZodString>;
+        createdDate: z.ZodOptional<z.ZodString>;
+        updatedAt: z.ZodOptional<z.ZodString>;
+        storageId: z.ZodOptional<z.ZodNumber>;
+        formIdentifier: z.ZodOptional<z.ZodString>;
+        attributeSetIdentifier: z.ZodOptional<z.ZodString>;
+        currency: z.ZodOptional<z.ZodString>;
+        paymentAccountIdentifier: z.ZodOptional<z.ZodString>;
+        paymentAccountLocalizeInfos: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
+        paymentUrl: z.ZodNullable<z.ZodOptional<z.ZodString>>;
+        isCompleted: z.ZodNullable<z.ZodOptional<z.ZodBoolean>>;
+    }, z.core.$strip>>;
+    total: z.ZodNumber;
+}, z.core.$strip>;
+/**
+ * Order storage schema
+ * @returns Order storage validation schema
+ */
+export declare const OrderStorageSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    marker: z.ZodString;
+    name: z.ZodString;
+    isActive: z.ZodBoolean;
+    position: z.ZodOptional<z.ZodNumber>;
+    statuses: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodNumber;
+        marker: z.ZodString;
+        name: z.ZodString;
+        position: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>;
+/**
+ * Orders storage list response schema
+ * @returns Orders storage list response schema
+ */
+export declare const OrdersStorageResponseSchema: z.ZodArray<z.ZodObject<{
+    id: z.ZodNumber;
+    marker: z.ZodString;
+    name: z.ZodString;
+    isActive: z.ZodBoolean;
+    position: z.ZodOptional<z.ZodNumber>;
+    statuses: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodNumber;
+        marker: z.ZodString;
+        name: z.ZodString;
+        position: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>>>;
+}, z.core.$strip>>;
+/**
+ * Create order response schema
+ * API returns a simplified order object after creation
+ * @returns Create order response schema
+ */
+export declare const CreateOrderResponseSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    identifier: z.ZodOptional<z.ZodString>;
+    statusMarker: z.ZodOptional<z.ZodString>;
+    total: z.ZodOptional<z.ZodNumber>;
+    totalSum: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
+    createdAt: z.ZodOptional<z.ZodString>;
+    createdDate: z.ZodOptional<z.ZodString>;
+    formIdentifier: z.ZodOptional<z.ZodString>;
+    paymentAccountIdentifier: z.ZodOptional<z.ZodString>;
+    formData: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+    products: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    currency: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+/**
+ * Update order response schema
+ * API returns the full order object after update
+ */
+export declare const UpdateOrderResponseSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    formIdentifier: z.ZodOptional<z.ZodString>;
+    paymentAccountIdentifier: z.ZodOptional<z.ZodString>;
+    formData: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+    products: z.ZodOptional<z.ZodArray<z.ZodAny>>;
+    currency: z.ZodOptional<z.ZodString>;
+    totalSum: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
+    success: z.ZodOptional<z.ZodBoolean>;
+    message: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;

package/dist/orders/ordersSchemas.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateOrderResponseSchema = exports.CreateOrderResponseSchema = exports.OrdersStorageResponseSchema = exports.OrderStorageSchema = exports.OrdersResponseSchema = exports.OrderEntitySchema = exports.OrderItemSchema = void 0;
+/**
+ * Validation schemas for Orders module
+ * @description Zod schemas for validating orders-related API responses
+ */
+const zod_1 = require("zod");
+/**
+ * Order item schema
+ * @description Order item schema for validating orders-related API responses
+ */
+exports.OrderItemSchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    productId: zod_1.z.number(),
+    quantity: zod_1.z.number(),
+    price: zod_1.z.number(),
+    total: zod_1.z.number(),
+    attributes: zod_1.z.record(zod_1.z.string(), zod_1.z.any()).optional(),
+});
+/**
+ * Order entity schema
+ * @description Order entity schema for validating orders-related API responses
+ */
+exports.OrderEntitySchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    identifier: zod_1.z.string().optional(),
+    statusMarker: zod_1.z.string().optional(),
+    statusIdentifier: zod_1.z.string().optional(),
+    userId: zod_1.z.number().optional(),
+    userIdentifier: zod_1.z.string().optional(),
+    total: zod_1.z.number().optional(),
+    totalSum: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).optional(),
+    items: zod_1.z.array(exports.OrderItemSchema).optional(),
+    products: zod_1.z.array(zod_1.z.any()).optional(),
+    formData: zod_1.z
+        .union([zod_1.z.array(zod_1.z.any()), zod_1.z.record(zod_1.z.string(), zod_1.z.any())])
+        .optional(),
+    createdAt: zod_1.z.string().optional(),
+    createdDate: zod_1.z.string().optional(),
+    updatedAt: zod_1.z.string().optional(),
+    storageId: zod_1.z.number().optional(),
+    formIdentifier: zod_1.z.string().optional(),
+    attributeSetIdentifier: zod_1.z.string().optional(),
+    currency: zod_1.z.string().optional(),
+    paymentAccountIdentifier: zod_1.z.string().optional(),
+    paymentAccountLocalizeInfos: zod_1.z.record(zod_1.z.string(), zod_1.z.any()).optional(),
+    paymentUrl: zod_1.z.string().optional().nullable(),
+    isCompleted: zod_1.z.boolean().optional().nullable(),
+});
+/**
+ * Orders list response schema
+ * @returns Orders list response schema
+ */
+exports.OrdersResponseSchema = zod_1.z.object({
+    items: zod_1.z.array(exports.OrderEntitySchema),
+    total: zod_1.z.number(),
+});
+/**
+ * Order storage schema
+ * @returns Order storage validation schema
+ */
+exports.OrderStorageSchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    marker: zod_1.z.string(),
+    name: zod_1.z.string(),
+    isActive: zod_1.z.boolean(),
+    position: zod_1.z.number().optional(),
+    statuses: zod_1.z
+        .array(zod_1.z.object({
+        id: zod_1.z.number(),
+        marker: zod_1.z.string(),
+        name: zod_1.z.string(),
+        position: zod_1.z.number().optional(),
+    }))
+        .optional(),
+});
+/**
+ * Orders storage list response schema
+ * @returns Orders storage list response schema
+ */
+exports.OrdersStorageResponseSchema = zod_1.z.array(exports.OrderStorageSchema);
+/**
+ * Create order response schema
+ * API returns a simplified order object after creation
+ * @returns Create order response schema
+ */
+exports.CreateOrderResponseSchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    identifier: zod_1.z.string().optional(),
+    statusMarker: zod_1.z.string().optional(),
+    total: zod_1.z.number().optional(),
+    totalSum: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).optional(),
+    createdAt: zod_1.z.string().optional(),
+    createdDate: zod_1.z.string().optional(),
+    formIdentifier: zod_1.z.string().optional(),
+    paymentAccountIdentifier: zod_1.z.string().optional(),
+    formData: zod_1.z
+        .union([zod_1.z.array(zod_1.z.any()), zod_1.z.record(zod_1.z.string(), zod_1.z.any())])
+        .optional(),
+    products: zod_1.z.array(zod_1.z.any()).optional(),
+    currency: zod_1.z.string().optional(),
+});
+/**
+ * Update order response schema
+ * API returns the full order object after update
+ */
+exports.UpdateOrderResponseSchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    formIdentifier: zod_1.z.string().optional(),
+    paymentAccountIdentifier: zod_1.z.string().optional(),
+    formData: zod_1.z
+        .union([zod_1.z.array(zod_1.z.any()), zod_1.z.record(zod_1.z.string(), zod_1.z.any())])
+        .optional(),
+    products: zod_1.z.array(zod_1.z.any()).optional(),
+    currency: zod_1.z.string().optional(),
+    totalSum: zod_1.z.union([zod_1.z.number(), zod_1.z.string()]).optional(),
+    success: zod_1.z.boolean().optional(),
+    message: zod_1.z.string().optional(),
+});

package/dist/pages/pagesApi.d.ts

@@ -135,7 +135,8 @@ export default class PageApi extends AsyncModules implements IPageApi {
         ]
      * @returns {any} An array of page objects with template data added
      * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
-     * @description Add template data to pages
+     * @description Add template data to pages. Optimized to avoid N+1 query problem by fetching only unique templates in parallel.
+     * For example, if 100 pages use 3 different templates, this method makes 3 requests instead of 100.
      */
     protected addTemplateToPages(data: IPagesEntity[]): Promise<any | IError>;
     /**

package/dist/pages/pagesApi.js

@@ -7,6 +7,7 @@ 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"));
+const pagesSchemas_1 = require("./pagesSchemas");
 /**
  * Controllers for working with page objects, including catalog pages
  * @handle /api/content/pages
@@ -33,8 +34,10 @@ class PageApi extends asyncModules_1.default {
     async getRootPages(langCode = this.state.lang) {
         // Fetch data from the server using a GET request to retrieve root pages for the specified language code
         const data = await this._fetchGet(`/root?langCode=${langCode}`);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(data, pagesSchemas_1.PagesResponseSchema);
         // Add template information to each page in the fetched root pages data
-        const withTemplate = await this.addTemplateToPages(data);
+        const withTemplate = await this.addTemplateToPages(validated);
         // Normalize the data and return it; ensures consistent structure or handles errors
         return this._normalizeData(withTemplate, langCode);
     }
@@ -49,8 +52,10 @@ class PageApi extends asyncModules_1.default {
     async getPages(langCode = this.state.lang) {
         // Fetch data from the server using a GET request to retrieve all pages for the specified language code
         const data = await this._fetchGet(`?langCode=${langCode}`);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(data, pagesSchemas_1.PagesResponseSchema);
         // Add template information to each page in the fetched data
-        const withTemplate = await this.addTemplateToPages(data);
+        const withTemplate = await this.addTemplateToPages(validated);
         // Normalize the data and return it; ensures consistent structure or handles errors
         return this._normalizeData(withTemplate, langCode);
     }
@@ -66,8 +71,10 @@ class PageApi extends asyncModules_1.default {
     async getPageById(id, langCode = this.state.lang) {
         // Fetch data from the server using a GET request to retrieve page details by ID and language code
         const data = await this._fetchGet(`/${id}?langCode=${langCode}`);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(data, pagesSchemas_1.PageEntitySchema);
         // Add template information to the fetched page data
-        const withTemplate = await this.addTemplateToPage(data);
+        const withTemplate = await this.addTemplateToPage(validated);
         // Normalize the data and return it; ensures consistent structure or handles errors
         return this._normalizeData(withTemplate, langCode);
     }
@@ -83,8 +90,10 @@ class PageApi extends asyncModules_1.default {
     async getPageByUrl(url, langCode = this.state.lang) {
         // Fetch data from the server using a GET request with the specified URL and language code
         const data = await this._fetchGet(`/url/${url}?langCode=${langCode}`);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(data, pagesSchemas_1.PageEntitySchema);
         // Add template information to the fetched page data
-        const withTemplate = await this.addTemplateToPage(data);
+        const withTemplate = await this.addTemplateToPage(validated);
         // Normalize the result data and return it; ensures consistent structure or handles errors
         return this._normalizeData(withTemplate, langCode);
     }
@@ -100,8 +109,10 @@ class PageApi extends asyncModules_1.default {
     async getChildPagesByParentUrl(url, langCode = this.state.lang) {
         // Fetch data from the server using a GET request to retrieve child pages for the specified parent URL and language code
         const data = await this._fetchGet(`/${url}/children?langCode=${langCode}`);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(data, pagesSchemas_1.PagesResponseSchema);
         // Add template information to each of the fetched child pages
-        const withTemplate = await this.addTemplateToPages(data);
+        const withTemplate = await this.addTemplateToPages(validated);
         // Normalize the result data and return it; ensures consistent structure or handles errors
         return this._normalizeData(withTemplate, langCode);
     }
@@ -122,8 +133,8 @@ class PageApi extends asyncModules_1.default {
         normalizeResponse.map((item) => {
             const customSettings = item.customSettings;
             // Check if customSettings contains 'productConfig' property
-            // eslint-disable-next-line no-prototype-builtins
-            if (customSettings && customSettings.hasOwnProperty('productConfig')) {
+            if (customSettings &&
+                Object.prototype.hasOwnProperty.call(customSettings, 'productConfig')) {
                 // If 'countElementsPerRow' exists, set it on the item
                 if (customSettings.productConfig.countElementsPerRow)
                     item.countElementsPerRow =
@@ -140,25 +151,6 @@ class PageApi extends asyncModules_1.default {
         });
         // Check if traffic limit is not set
         if (!this.state.traficLimit) {
-            // Define a class 'StaffModule' extending 'AsyncModules'
-            class StaffModule extends asyncModules_1.default {
-                constructor(state) {
-                    super(state); // Call parent constructor
-                    this._url = state.url + '/api/content/blocks'; // Set URL for content blocks
-                }
-                // Method to fetch similar products by marker
-                async getSimilarProducts(marker, langCode = this.state.lang, offset = 0, limit = 30) {
-                    // Fetch similar products from the server
-                    const result = await this._fetchGet(`/${marker}/similar-products?langCode=${langCode}&offset=${offset}&limit=${limit}`);
-                    return this._normalizeData(result.items);
-                }
-                // Method to fetch products by block marker
-                async getProductsByBlockMarker(marker, langCode = this.state.lang, offset = 0, limit = 30) {
-                    // Fetch products from the server
-                    const result = await this._fetchGet(`/${marker}/products?langCode=${langCode}&offset=${offset}&limit=${limit}`);
-                    return this._normalizeData(result.items);
-                }
-            }
             // Create an instance of 'StaffModule' with the current state
             const staffModule = new StaffModule(this.state);
             // If the block type is 'similar_products_block', fetch similar products
@@ -204,8 +196,10 @@ class PageApi extends asyncModules_1.default {
     async getConfigPageByUrl(url) {
         // Fetch data from the server using a GET request to retrieve forms for the specified page URL and language code
         const result = await this._fetchGet(`/${url}/config`);
+        // Validate response if validation is enabled
+        const validated = this._validateResponse(result, pagesSchemas_1.PageConfigSchema);
         // return fetched data
-        return result;
+        return validated;
     }
     /**
      * Quick search for page objects with limited output.
@@ -283,16 +277,53 @@ class PageApi extends asyncModules_1.default {
         ]
      * @returns {any} An array of page objects with template data added
      * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
-     * @description Add template data to pages
+     * @description Add template data to pages. Optimized to avoid N+1 query problem by fetching only unique templates in parallel.
+     * For example, if 100 pages use 3 different templates, this method makes 3 requests instead of 100.
      */
     async addTemplateToPages(data) {
-        // Use Promise.all to handle an array of promises returned by mapping over 'data'
-        return Promise.all(data.map(async (d) => {
-            // For each element 'd' in the 'data' array, call 'addTemplateToPage'
-            const result = await this.addTemplateToPage(d);
-            // Return the result of 'addTemplateToPage' for the current element
-            return result;
+        // Step 1: Collect unique templateIdentifiers from all pages
+        const uniqueIdentifiers = [
+            ...new Set(data
+                .filter((page) => 'templateIdentifier' in page &&
+                page.templateIdentifier !== null &&
+                page.templateIdentifier !== '')
+                .map((page) => page.templateIdentifier)),
+        ];
+        // Step 2: If no templates needed, return pages as-is
+        if (uniqueIdentifiers.length === 0) {
+            return data;
+        }
+        // Step 3: Fetch unique templates in parallel (not N queries, but unique count queries)
+        const Templates = new templatesApi_1.default(this.state);
+        const templatePromises = uniqueIdentifiers.map((identifier) => Templates.getTemplateByMarker(identifier).catch((error) => {
+            // eslint-disable-next-line no-undef, no-console
+            console.error(`Template fetch error for ${identifier}: `, error);
+            return null; // Return null for failed templates
         }));
+        const templates = await Promise.all(templatePromises);
+        // Step 4: Create a Map for O(1) template lookup
+        const templateMap = new Map();
+        templates.forEach((template, index) => {
+            if (template !== null) {
+                templateMap.set(uniqueIdentifiers[index], template);
+            }
+        });
+        // Step 5: Apply templates to pages (no additional API calls)
+        return data.map((page) => {
+            if ('templateIdentifier' in page &&
+                page.templateIdentifier !== null &&
+                page.templateIdentifier !== '') {
+                const template = templateMap.get(page.templateIdentifier);
+                if (template) {
+                    return {
+                        ...page,
+                        template,
+                    };
+                }
+            }
+            // Return page without template if identifier is missing or template not found
+            return page;
+        });
     }
     /**
      * Add template data to page by page templateIdentifier
@@ -335,3 +366,25 @@ class PageApi extends asyncModules_1.default {
     }
 }
 exports.default = PageApi;
+/**
+ * Helper module for working with blocks (similar products and product blocks)
+ * @description Internal module for fetching products and similar products for blocks
+ */
+class StaffModule extends asyncModules_1.default {
+    constructor(state) {
+        super(state); // Call parent constructor
+        this._url = state.url + '/api/content/blocks'; // Set URL for content blocks
+    }
+    // Method to fetch similar products by marker
+    async getSimilarProducts(marker, langCode = this.state.lang, offset = 0, limit = 30) {
+        // Fetch similar products from the server
+        const result = await this._fetchGet(`/${marker}/similar-products?langCode=${langCode}&offset=${offset}&limit=${limit}`);
+        return this._normalizeData(result.items);
+    }
+    // Method to fetch products by block marker
+    async getProductsByBlockMarker(marker, langCode = this.state.lang, offset = 0, limit = 30) {
+        // Fetch products from the server
+        const result = await this._fetchGet(`/${marker}/products?langCode=${langCode}&offset=${offset}&limit=${limit}`);
+        return this._normalizeData(result.items);
+    }
+}

package/dist/pages/pagesInterfaces.d.ts

@@ -1,3 +1,4 @@
+import type { IBlockEntity } from 'blocks/blocksInterfaces';
 import type { IFormConfig } from 'forms/formsInterfaces';
 import type { ITemplateEntity } from 'templates/templatesInterfaces';
 import type { AttributeType, IAttributes, IError, ILocalizeInfo, LangType, Types } from '../base/utils';
@@ -85,12 +86,13 @@ interface IPageApi {
      * Quick search for page objects with limited output.
      * @handleName searchPage
      * @param {string} name - Text for searching page objects (search is performed on the title field of the localizeInfos object with the language taken into account). Example: "About Us".
+     * @param {string} [url] - Optional page URL to filter search results. Example: "catalog".
      * @param {string} [langCode] - Language code. Default: "en_US".
      * @returns {IPagesEntity[]} Returns all created pages as an array of PageEntity objects or an empty array [] (if there is no data)
      * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
      * @description This method performs a quick search for page objects with limited output.
      */
-    searchPage(name: string, langCode?: LangType): Promise<IPagesEntity[] | IError>;
+    searchPage(name: string, url?: string, langCode?: LangType): Promise<IPagesEntity[] | IError>;
 }
 /**
  * @interface IPageConfig
@@ -269,8 +271,6 @@ interface IPagesEntity {
     depth: number;
     localizeInfos: ILocalizeInfo;
     isVisible: boolean;
-    blocks?: any[];
-    forms?: any[];
     type: Types;
     templateIdentifier: string | null;
     attributeSetIdentifier: string | null;
@@ -278,11 +278,12 @@ interface IPagesEntity {
     moduleFormConfigs?: IFormConfig[];
     isSync: boolean;
     template?: ITemplateEntity;
+    blocks?: IBlockEntity[] | string[];
     position?: number;
     config?: Record<string, number>;
     products?: number;
-    childrenCount?: string | number;
-    total?: string | number;
+    childrenCount?: string;
+    total?: string;
     categoryPath?: string;
 }
 export type { IPageApi, IPageConfig, IPagesEntity, IPositionBlock, IPositionForm, };