oneentry 1.0.49 → 1.0.51

package/dist/admins/adminsApi.js

@@ -19,8 +19,8 @@ class AdminsApi extends oneEntry_1.default {
      * @returns Returns all AdminEntity user objects
      */
     async getAdminsInfo(langCode = this._defaultLangCode, offset = 0, limit = 30) {
-        const result = await this._fetchGet(`?langCode=${langCode}&offset=${offset}&limit=${limit}`);
-        return this._normalizeData(result, langCode);
+        const response = await this._fetchGet(`?langCode=${langCode}&offset=${offset}&limit=${limit}`);
+        return this._normalizeData(response, langCode);
     }
 }
 exports.default = AdminsApi;

package/dist/attribute-sets/attributeSetsApi.js

@@ -19,7 +19,7 @@ class AttributesSetsApi extends oneEntry_1.default {
      */
     async getAttributesByMarker(marker, langCode = this._defaultLangCode) {
         const result = await this._fetchGet(`/${marker}/attributes?langCode=${langCode}`);
-        return this._normalizeData(result, langCode);
+        return this._dataPostProcess(result, langCode);
     }
     /**
      * Get a single attribute with data from the attribute sets.

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

@@ -41,6 +41,6 @@ interface IAttributesSetsEntity {
         position: string | number | null;
         extendedValue: string | number | null;
         extendedValueType: string | number | null;
-    }>;
+    }> | Record<string, any>;
 }
 export { IAttributesSets, IAttributesSetsEntity };

package/dist/base/oneEntry.d.ts

@@ -14,4 +14,6 @@ export default abstract class OneEntry {
     protected _fetchDelete(path: string): Promise<any>;
     protected _queryParamsToString(query: IProductsQuery | IUploadingQuery): string;
     protected _normalizeData(data: any, langCode?: string): any;
+    protected _clearArray(data: Record<string, any>): any;
+    protected _dataPostProcess(data: any, langCode?: string): any;
 }

package/dist/base/oneEntry.js

@@ -26,8 +26,8 @@ class OneEntry {
         };
         if (!this._NO_FETCH) {
             const response = await fetch(this._getFullPath(path), options);
-            const result = await response.json();
-            return result;
+            // const result = await response.json()
+            return await response.json();
         }
         else {
             return new Promise((resolve, reject) => {
@@ -37,6 +37,7 @@ class OneEntry {
                         data += chunk;
                     });
                     res.on('end', () => {
+                        // const result = new Result(JSON.parse(data))
                         resolve(JSON.parse(data));
                     });
                 });
@@ -142,5 +143,30 @@ class OneEntry {
             return normalizeData;
         }
     }
+    _clearArray(data) {
+        if (Array.isArray(data)) {
+            return data.map(item => this._clearArray(item));
+        }
+        else {
+            const dataWithoutArray = {};
+            for (let key in data) {
+                if (Array.isArray(data[key]) && data[key].length === 1) {
+                    dataWithoutArray[key] = data[key][0];
+                }
+                else if (typeof data[key] === 'object' && data[key] && !Array.isArray(data[key])) {
+                    dataWithoutArray[key] = this._clearArray(data[key]);
+                }
+                else {
+                    dataWithoutArray[key] = data[key];
+                }
+            }
+            return dataWithoutArray;
+        }
+    }
+    _dataPostProcess(data, langCode = this._defaultLangCode) {
+        const normalize = this._normalizeData(data, langCode);
+        const result = this._clearArray(normalize);
+        return result;
+    }
 }
 exports.default = OneEntry;

package/dist/base/result.d.ts

@@ -0,0 +1,8 @@
+export default class Result {
+    body: any;
+    constructor(data: Response | string);
+    blob(): Promise<Result>;
+    json(): Promise<Result>;
+    makeDataWithoutLang(langCode: string, data?: any): any;
+    makeDataWithoutArray(data?: any): any;
+}

package/dist/base/result.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Result {
+    constructor(data) {
+        this.body = data;
+    }
+    async blob() {
+        this.body = await this.body.blob();
+        return this;
+    }
+    async json() {
+        this.body = await typeof this.body === 'string' ? JSON.parse(this.body) : this.body.json();
+        return this;
+    }
+    makeDataWithoutLang(langCode, data) {
+        if (data) {
+            if (Array.isArray(data)) {
+                return data.map((item) => this.makeDataWithoutLang(langCode, item));
+            }
+            else {
+                for (let key in data) {
+                    if (typeof data[key] === 'object' && data[key] && langCode in data[key]) {
+                        data[key] = data[key][langCode];
+                    }
+                    else if (typeof data[key] === 'object' && data[key] != null) {
+                        data[key] = this.makeDataWithoutLang(langCode, data[key]);
+                    }
+                    else if (Array.isArray(data[key])) {
+                        data[key] = data.map((item) => this.makeDataWithoutLang(langCode, item));
+                    }
+                }
+                return data;
+            }
+        }
+        else {
+            if (Array.isArray(this.body)) {
+                this.body = this.body.map((item) => this.makeDataWithoutLang(langCode, item));
+            }
+            else {
+                for (let key in this.body) {
+                    if (typeof this.body[key] === 'object' && this.body[key] && langCode in this.body[key]) {
+                        this.body[key] = this.body[key][langCode];
+                    }
+                    else if (typeof this.body[key] === 'object' && this.body[key] != null) {
+                        this.body[key] = this.makeDataWithoutLang(langCode, this.body[key]);
+                    }
+                    else if (Array.isArray(this.body[key])) {
+                        this.body[key] = this.body[key].map((item) => this.makeDataWithoutLang(langCode, item));
+                    }
+                }
+            }
+            return this;
+        }
+    }
+    makeDataWithoutArray(data) {
+        if (data) {
+            if (Array.isArray(data)) {
+                return data.map(item => this.makeDataWithoutArray(item));
+            }
+            else {
+                for (let key in data) {
+                    if (Array.isArray(data[key]) && data[key].length === 1) {
+                        data[key] = data[key][0];
+                    }
+                    else if (typeof data[key] === 'object' && data[key] && !Array.isArray(data[key])) {
+                        data[key] = this.makeDataWithoutArray(data[key]);
+                    }
+                }
+                return data;
+            }
+        }
+        else {
+            if (Array.isArray(this.body)) {
+                return this.body.map(item => this.makeDataWithoutArray(item));
+            }
+            else {
+                for (let key in this.body) {
+                    if (Array.isArray(this.body[key]) && this.body[key].length === 1) {
+                        this.body[key] = this.body[key][0];
+                    }
+                    else if (typeof this.body[key] === 'object' && this.body[key] && !Array.isArray(this.body[key])) {
+                        this.body[key] = this.makeDataWithoutArray(this.body[key]);
+                    }
+                }
+                return this;
+            }
+        }
+    }
+}
+exports.default = Result;

package/dist/base/utils.d.ts

@@ -57,7 +57,7 @@ interface IAttributeSetEntity {
     identifier: string;
     typeId: number;
     localizeInfos: LocalizeType;
-    schema: object;
+    schema: Record<string, any>;
     position: {
         id: number;
         objectId: number;

package/dist/blocks/blocksApi.js

@@ -32,7 +32,7 @@ class BlocksApi extends oneEntry_1.default {
      */
     async getBlockByMarker(marker, langCode = this._defaultLangCode) {
         const result = await this._fetchGet(`/marker/${marker}?langCode=${langCode}`);
-        return this._normalizeData(result, langCode);
+        return this._dataPostProcess(result, langCode);
     }
 }
 exports.default = BlocksApi;

package/dist/blocks/blocksInterfaces.d.ts

@@ -32,6 +32,6 @@ interface ICustomSetting {
         includes: string;
         keywords: string;
         strict: string;
-    }>;
+    }> | Record<string, any>;
 }
 export { IBlocks, IBlocksEntity };

package/dist/forms/formsApi.js

@@ -20,7 +20,7 @@ class FormsApi extends oneEntry_1.default {
      */
     async getAllForms(langCode = this._defaultLangCode, offset = 0, limit = 30) {
         const result = await this._fetchGet(`?langCode=${langCode}&offset=${offset}&limit=${limit}`);
-        return this._normalizeData(result, langCode);
+        return this._dataPostProcess(result, langCode);
     }
     /**
      * Get one form by form marker.
@@ -32,7 +32,7 @@ class FormsApi extends oneEntry_1.default {
      */
     async getFormByMarker(marker, langCode = this._defaultLangCode) {
         const result = await this._fetchGet(`/marker/${marker}?langCode=${langCode}`);
-        return this._normalizeData(result, langCode);
+        return this._dataPostProcess(result, langCode);
     }
 }
 exports.default = FormsApi;

package/dist/forms/formsInterfaces.d.ts

@@ -26,12 +26,12 @@ interface IForms {
  */
 interface IFormsEntity {
     attributeSetId: number | null;
-    attributes: Array<IAttributes>;
+    attributes: Array<IAttributes> | Record<string, any>;
     id: number;
     identifier: string;
     localizeInfos: Record<string, any>;
     position: number;
-    processingData: object | string;
+    processingData: Record<string, any> | string;
     processingType: string;
     version: number;
 }

package/dist/formsData/formsDataApi.js

@@ -20,7 +20,7 @@ class FormsDataApi extends oneEntry_1.default {
      */
     async getFormsData(langCode = this._defaultLangCode, offset = 0, limit = 30) {
         const result = await this._fetchGet(`?langCode=${langCode}&offset=${offset}&limit=${limit}`);
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
     /**
      * Find all product page objects with pagination and multiple filtering.
@@ -42,7 +42,7 @@ class FormsDataApi extends oneEntry_1.default {
      */
     async postFormsData(data) {
         const result = await this._fetchPost('', JSON.stringify(data));
-        return this._normalizeData(result);
+        return this._dataPostProcess(result);
     }
     /**
      * Get one object of form data by marker.
@@ -56,7 +56,7 @@ class FormsDataApi extends oneEntry_1.default {
      */
     async getFormsDataByMarker(marker, langCode = this._defaultLangCode, offset = 0, limit = 30) {
         const result = await this._fetchGet(`/marker/${marker}?langCode=${langCode}&offset=${offset}&limit=${limit}`);
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
 }
 exports.default = FormsDataApi;

package/dist/formsData/formsDataInterfaces.d.ts

@@ -47,7 +47,10 @@ interface IFormData {
     [langcode: string]: Array<{
         marker?: string;
         value?: string;
-    }>;
+    }> | {
+        marker?: string;
+        value?: string;
+    };
 }
 /**
  * interface to create an object of information about saving data using the form

package/dist/menus/menusApi.js

@@ -35,7 +35,7 @@ class MenusApi extends oneEntry_1.default {
             return page;
         });
         result.pages = pages;
-        return this._normalizeData(result, langCode);
+        return this._dataPostProcess(result, langCode);
     }
 }
 exports.default = MenusApi;

package/dist/menus/menusInterfaces.d.ts

@@ -18,7 +18,7 @@ interface IMenus {
  * @property {number | null} parentId - The menu parent id.
  */
 interface IMenusPages {
-    children?: Array<IMenusPages>;
+    children?: Array<IMenusPages> | IMenusPages;
     id: number;
     pageUrl: string;
     localizeInfos: Record<string, any>;
@@ -38,6 +38,6 @@ interface IMenusEntity {
     id: number;
     identifier: string;
     localizeInfos: Record<string, any>;
-    pages: Array<IMenusPages>;
+    pages: Array<IMenusPages> | IMenusPages;
 }
 export { IMenus, IMenusEntity };

package/dist/pages/pagesInterfaces.d.ts

@@ -62,11 +62,11 @@ interface IPositionForm {
     id: number;
     version: number;
     identifier: string;
-    attributes: Array<IAttributes>;
+    attributes: Array<IAttributes> | IAttributes;
     attributeSetId: number;
     processingType: string;
     localizeInfos: Record<string, any>;
-    processingData: object;
+    processingData: Record<string, any>;
     position: number;
 }
 /**

package/dist/products/productsApi.d.ts

@@ -133,7 +133,7 @@ export default class ProductApi extends OneEntry implements IProductApi {
      *
      * @param {number} [id] - Product id.
      *
-     * @param {string} [langCode] Language code parameter. Default "en_US". You can also pass several language parameters ['en_US', 'it_IT']
+     * @param {string} [langCode] Language code parameter. Default "en_US".
      *
      * @returns  ProductEntity object.
      */

package/dist/products/productsApi.js

@@ -45,7 +45,7 @@ class ProductApi extends oneEntry_1.default {
     async getProducts(langCode = this._defaultLangCode, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
         const result = await this._fetchGet(`?langCode=${langCode}&` + this._queryParamsToString(query));
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
     /**
      * Search for all product page objects with pagination that do not have a category.
@@ -73,7 +73,7 @@ class ProductApi extends oneEntry_1.default {
     async getProductsEmptyPage(langCode = this._defaultLangCode, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
         const result = await this._fetchGet(`/empty-page?langCode=${langCode}&` + this._queryParamsToString(query));
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
     /**
      * Search for all product page objects with pagination for the selected category.
@@ -104,7 +104,7 @@ class ProductApi extends oneEntry_1.default {
     async getProductsPageById(id, langCode = this._defaultLangCode, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
         const result = await this._fetchGet(`/page/${id}?langCode=${langCode}&` + this._queryParamsToString(query));
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
     /**
      * Search for all product page objects with pagination for the selected category (by its URL).
@@ -135,7 +135,7 @@ class ProductApi extends oneEntry_1.default {
     async getProductsPageByUrl(url = this._defaultLangCode, langCode, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
         const result = await this._fetchGet(`/page/url/${url}?langCode=${langCode}&` + this._queryParamsToString(query));
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
     /**
      * Find all related product page objects.
@@ -158,20 +158,20 @@ class ProductApi extends oneEntry_1.default {
     async getRelatedProductsById(id, langCode = this._defaultLangCode, userQuery) {
         const query = { ...this._defaultQuery, ...userQuery };
         const result = await this._fetchGet(`/${id}/related?langCode=${langCode}&` + this._queryParamsToString(query));
-        return this._normalizeData(result.items, langCode);
+        return this._dataPostProcess(result.items, langCode);
     }
     /**
      * Retrieve one product object.
      *
      * @param {number} [id] - Product id.
      *
-     * @param {string} [langCode] Language code parameter. Default "en_US". You can also pass several language parameters ['en_US', 'it_IT']
+     * @param {string} [langCode] Language code parameter. Default "en_US".
      *
      * @returns  ProductEntity object.
      */
     async getProductById(id, langCode = this._defaultLangCode) {
         const result = await this._fetchGet(`/${id}?langCode=${langCode}`);
-        return this._normalizeData(result, langCode);
+        return this._dataPostProcess(result, langCode);
     }
     /**
      * Find all product page objects with pagination and multiple filtering.
@@ -244,7 +244,7 @@ class ProductApi extends oneEntry_1.default {
                 productsList.push(result);
             });
         }));
-        return this._normalizeData(productsList, langCode);
+        return this._dataPostProcess(productsList, langCode);
     }
 }
 exports.default = ProductApi;

package/dist/products/productsInterfaces.d.ts

@@ -117,6 +117,6 @@ interface IProductsEntity {
     shortDescTemplateIdentifier: string;
     attributeValues: Record<string, any>;
     position: number;
-    productPages: Array<Object>;
+    productPages: Array<Record<string, any>> | Record<string, any>;
 }
 export { IFilterParams, IProductsQuery, IProductApi, IProductsEntity };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",