oneentry 1.0.176 → 1.0.178

package/esm/events/eventsInterfaces.d.ts

@@ -20,7 +20,7 @@ interface IEvents {
      * @handleName subscribeByMarker
      * @param {string} marker - The marker identifying the event. Example: "product_price_change".
      * @param {number} productId - The ID of the product to subscribe to. Example: 12345.
-     * @param {string} [langCode] - Optional language code for localization. Default: "en_US".
+     * @param {string} [langCode] - Optional language code for localization. Default: the client's language.
      * @returns {Promise<boolean | IError>} A promise that resolves to any type or an error.
      * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
      * @description This method subscribes to an event on a product by its marker.
@@ -31,7 +31,7 @@ interface IEvents {
      * @handleName unsubscribeByMarker
      * @param {string} marker - The marker identifying the event. Example: "product_price_change".
      * @param {number} productId - ID of the product to unsubscribe from. Example: 12345.
-     * @param {string} [langCode] - Optional language code for localization. Default: "en_US".
+     * @param {string} [langCode] - Optional language code for localization. Default: the client's language.
      * @returns {Promise<boolean | IError>} A promise that resolves to any type or an error.
      * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
      * @description This method unsubscribes from an event on a product by its marker.
@@ -42,7 +42,7 @@ interface IEvents {
      * @handleName getAllEvents
      * @returns {Promise<IContentApiEvent[] | IError>} A promise that resolves to an array of events or an error.
      * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
-     * @description This method returns all available events.
+     * @description This method returns all available events. This method requires user authorization — without it the API answers `401 Unauthorized`.
      */
     getAllEvents(): Promise<IContentApiEvent[] | IError>;
     /**
@@ -85,16 +85,12 @@ interface IEvents {
  * @property {number} total - Total number of found records. Example: 100.
  * @property {ISubscriptionItem[]} items - Subscriptions, each with an event marker and a product ID.
  * @example
- [
-   {
-     eventMarker: 'product_price_change',
-     productId: 12345
-   },
-   {
-     eventMarker: 'product_stock_update',
-     productId: 67890
-   }
- ]
+ {
+   "total": 1,
+   "items": [
+     { "eventMarker": "lessPrice", "productId": 2954 }
+   ]
+ }
  * @property { string } items.eventMarker - Event marker.
  * @property { number } items.productId - Product ID.
  * @description Represents a response from the events API containing a total count and an array of subscription items.
@@ -173,4 +169,4 @@ interface ISubscribeFormEvent {
     formDataId: number;
     status?: string;
 }
-export type { IContentApiEvent, IEvents, IFormSubscriptionsResponse, IListFormSubscription, ISubscribeBody, ISubscribeFormEvent, ISubscriptions, };
+export type { IContentApiEvent, IEvents, IFormSubscriptionsResponse, IListFormSubscription, ISubscribeBody, ISubscribeFormEvent, ISubscriptionItem, ISubscriptions, };

package/esm/file-uploading/fileUploadingApi.d.ts

@@ -99,6 +99,7 @@ export default class FileUploadingApi extends AsyncModules implements IFileUploa
      * @param {string} filename - The name to give the created file.
      * @param {string} [mimeType] - Optional MIME type for the file.
      * @returns {Promise<File>} A promise that resolves to a File object.
+     * @throws {Error} When the URL answers with an error status — the body of the error page is not turned into a file.
      */
     createFileFromUrl(url: string, filename: string, mimeType?: string): Promise<File>;
     /**
@@ -108,10 +109,9 @@ export default class FileUploadingApi extends AsyncModules implements IFileUploa
      * @param {string} type - Storage type; determines the folder the file is stored in, for example `"page"`. Example: "page".
      * @param {string} entity - Name of the entity the file belongs to; sets the folder name in the storage. Example: "editor".
      * @param {string} filename - File name. Example: "file.png".
-     * @param {string} [template] - Preview template: its numeric ID or its marker, for example `"preview"`. Without it, no preview is generated. Example: "preview_template".
-     * @returns {Promise<Response | IError>} Returns a promise that resolves to a Response object containing the file data or an error object if there was an issue.
-     * @throws {IError} When isShell=false and an error occurs during the fetch
+     * @param {string} [template] - Kept for compatibility: `GET /files` ignores it — the answer is the original file with any value, an unknown template included (CMS-1101, CMS-1128). Previews are made on `upload`.
+     * @returns {Promise<Response>} Resolves to the raw `Response` of the request — also on an error: check `response.ok`. A missing file answers `404` with a JSON body but a `content-type` taken from the requested file name (`image/png` …).
      * @see {@link https://js-sdk.oneentry.cloud/docs/file-uploading/getFile getFile} documentation.
      */
-    getFile(id: number, type: string, entity: string, filename: string, template?: string): Promise<Response | IError>;
+    getFile(id: number, type: string, entity: string, filename: string, template?: string): Promise<Response>;
 }

package/esm/file-uploading/fileUploadingApi.js

@@ -83,7 +83,10 @@ export default class FileUploadingApi extends AsyncModules {
         const query = { ...this._defaultQuery, ...fileQuery };
         // The endpoint answers 200 with an empty body, which _parseJson reads as `{}`;
         // _fetchBoolean turns that into the declared `true` (CMS-1072)
-        return this._fetchBoolean(() => this._fetchDelete(`?filename=${filename}&` + this._queryParamsToString(query)));
+        return this._fetchBoolean(() => this._fetchDelete(
+        // The name is encoded like the other parameters: `#` cut the query and dropped
+        // type/entity/id, `&id=` added parameters of its own
+        `?` + this._queryParamsToString({ filename, ...query })));
     }
     /**
      * Public search across the content of files attached to records.
@@ -133,10 +136,15 @@ export default class FileUploadingApi extends AsyncModules {
      * @param {string} filename - The name to give the created file.
      * @param {string} [mimeType] - Optional MIME type for the file.
      * @returns {Promise<File>} A promise that resolves to a File object.
+     * @throws {Error} When the URL answers with an error status — the body of the error page is not turned into a file.
      */
     async createFileFromUrl(url, filename, mimeType) {
         // eslint-disable-next-line no-undef
         const response = await fetch(url);
+        // A 404 page of the storage used to become the "file" and was then uploaded as is
+        if (!response.ok) {
+            throw new Error(`OneEntry SDK: createFileFromUrl got ${response.status} from ${url}`);
+        }
         const blob = await response.blob();
         const file = new File([blob], filename, { type: mimeType || blob.type });
         return file;
@@ -148,14 +156,14 @@ export default class FileUploadingApi extends AsyncModules {
      * @param {string} type - Storage type; determines the folder the file is stored in, for example `"page"`. Example: "page".
      * @param {string} entity - Name of the entity the file belongs to; sets the folder name in the storage. Example: "editor".
      * @param {string} filename - File name. Example: "file.png".
-     * @param {string} [template] - Preview template: its numeric ID or its marker, for example `"preview"`. Without it, no preview is generated. Example: "preview_template".
-     * @returns {Promise<Response | IError>} Returns a promise that resolves to a Response object containing the file data or an error object if there was an issue.
-     * @throws {IError} When isShell=false and an error occurs during the fetch
+     * @param {string} [template] - Kept for compatibility: `GET /files` ignores it — the answer is the original file with any value, an unknown template included (CMS-1101, CMS-1128). Previews are made on `upload`.
+     * @returns {Promise<Response>} Resolves to the raw `Response` of the request — also on an error: check `response.ok`. A missing file answers `404` with a JSON body but a `content-type` taken from the requested file name (`image/png` …).
      * @see {@link https://js-sdk.oneentry.cloud/docs/file-uploading/getFile getFile} documentation.
      */
     async getFile(id, type, entity, filename, template) {
         // eslint-disable-next-line no-undef
-        const response = await fetch(this._getFullPath(`?id=${id}&type=${type}&entity=${entity}${`&filename=${filename}`}${template ? `&template=${template}` : ''}`), {
+        const response = await fetch(this._getFullPath('?' +
+            this._queryParamsToString({ id, type, entity, filename, template })), {
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json',

package/esm/file-uploading/fileUploadingInterfaces.d.ts

@@ -66,11 +66,10 @@ interface IFileUploading {
      * @param {string} type - Storage type; determines the folder the file is stored in, for example `"page"`. Example: "page".
      * @param {string} entity - Name of the entity the file belongs to; sets the folder name in the storage. Example: "editor".
      * @param {string} filename - File name. Example: "file.png".
-     * @param {string} [template] - Preview template: its numeric ID or its marker, for example `"preview"`. Without it, no preview is generated. Example: "1".
-     * @returns {Response | IError} Returns a promise that resolves to a Response object containing the file data or an error object if there was an issue.
-     * @throws {IError} - If there is an error during the fetch operation, it will return an error object.
+     * @param {string} [template] - Kept for compatibility: `GET /files` ignores it — the answer is the original file with any value, an unknown template included (CMS-1101, CMS-1128). Previews are made on `upload`.
+     * @returns {Response} The raw `Response` of the request — also on an error: check `response.ok`. A missing file answers `404` with a JSON body but a `content-type` taken from the file name. No IError is returned and nothing is thrown on an HTTP error.
      */
-    getFile(id: number, type: string, entity: string, filename: string, template?: string): Promise<Response | IError>;
+    getFile(id: number, type: string, entity: string, filename: string, template?: string): Promise<Response>;
     /**
      * Public search across the content of files attached to records.
      * @handleName searchFileContent
@@ -186,7 +185,7 @@ interface IFileSearchItem {
  * The `IFileSearchQueryLanguage` interface describes how the query language was resolved.
  * @interface IFileSearchQueryLanguage
  * @property {string[]} resolved - Languages the query was actually run in. Example: ["english"].
- * @property {string} source - How they were chosen: "explicit" when taken from `langCode`, otherwise detected. Example: "explicit".
+ * @property {string} source - How they were chosen: `"explicit"` when taken from `langCode`; detected otherwise (seen: `"script"`). Detection runs only with `langCode: ""` — by default the client's language is sent. Example: "explicit".
  * @property {string[]} candidates - Languages that were considered. Example: ["english"].
  * @description How the query language was resolved for the search.
  */
@@ -202,7 +201,7 @@ interface IFileSearchQueryLanguage {
  * @property {number} offset - Number of records to skip. Example: 0.
  * @property {number} limit - Maximum number of records to return. Example: 10.
  * @property {IFileSearchQueryLanguage} queryLanguage - How the query language was resolved.
- * @property {string[]} warnings - Warnings about the search, empty when there are none.
+ * @property {string[]} warnings - Warning codes, empty when there are none. Seen: `processing_disabled` (content indexing is off — `items` is always empty), `query_language_capped`, `query_too_common`.
  * @property {IFileSearchItem[]} items - Files that match the query.
  * @description The result of a file content search.
  */

package/esm/filters/filtersApi.js

@@ -29,8 +29,8 @@ export default class FiltersApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/filters/getFilterByMarker getFilterByMarker} documentation.
      */
     async getFilterByMarker(marker, langCode = this.state.lang) {
-        const data = await this._fetchGet(`/marker/${this._pathSegment(marker)}?langCode=${langCode}`);
+        const data = await this._fetchGet(`/marker/${this._pathSegment(marker)}?langCode=${encodeURIComponent(langCode)}`);
         const validated = await this._validateResponse(data, schema('ContentFilterSchema'));
-        return this._normalizeData(validated);
+        return this._normalizeData(validated, langCode);
     }
 }

package/esm/forms/formsApi.js

@@ -31,7 +31,7 @@ export default class FormsApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms/getAllForms getAllForms} documentation.
      */
     async getAllForms(langCode = this.state.lang, offset = 0, limit = 30) {
-        const result = await this._fetchGet(`?langCode=${langCode}&offset=${offset}&limit=${limit}`);
+        const result = await this._fetchGet(`?langCode=${encodeURIComponent(langCode)}&offset=${encodeURIComponent(String(offset))}&limit=${encodeURIComponent(String(limit))}`);
         // Validate response if validation is enabled
         const validated = await this._validateResponse(result, schema('FormsResponseSchema'));
         return this._normalizeData(validated, langCode);
@@ -46,7 +46,7 @@ export default class FormsApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms/getFormByMarker getFormByMarker} documentation.
      */
     async getFormByMarker(marker, langCode = this.state.lang) {
-        const result = await this._fetchGet(`/marker/${this._pathSegment(marker)}?langCode=${langCode}`);
+        const result = await this._fetchGet(`/marker/${this._pathSegment(marker)}?langCode=${encodeURIComponent(langCode)}`);
         // Validate response if validation is enabled
         const validated = await this._validateResponse(result, schema('FormEntitySchema'));
         return this._normalizeData(validated, langCode);

package/esm/forms/formsInterfaces.d.ts

@@ -69,10 +69,9 @@ interface IFromPages {
  * @property {number} version - Version number of the object; changes with each update. Example: 1.
  * @property {number} position - Position of the object, used for sorting. Example: 1.
  * @property {string} identifier - Text identifier (marker) of the object. Example: "form_contact_us".
- * @property {string} processingType - How form submissions are processed, for example `"email"` or `"url"`. Example: "async".
+ * @property {string} processingType - How form submissions are processed: the processing type chosen in the form settings. Example: "script".
  * @property {number | null} templateId - ID of the template used by the form, or `null` when the form has no template. Example: 6789.
  * @property {IFormAttribute[]} attributes - Form fields with their localization, validators and form-specific flags, sorted by `position`. The API returns an empty object for forms with no attributes — the SDK normalizes it to an empty array.
- * @property {number | string} [total] - Total count of related entries. Example: "1".
  * @property {IFormConfig[]} [moduleFormConfigs] - Form configurations of the module associated with the form.
  * @description This interface defines the structure of a form entity, including its identifiers, attributes, and processing data.
  */
@@ -87,7 +86,6 @@ interface IFormsEntity {
     processingType: string;
     templateId: number | null;
     attributes: IFormAttribute[];
-    total?: number | string;
     moduleFormConfigs?: IFormConfig[];
 }
 /**

package/esm/forms/formsSchemas.d.ts

@@ -13,8 +13,7 @@ export declare const FormEntitySchema: z.ZodObject<{
     type: z.ZodNullable<z.ZodString>;
     attributeSetId: z.ZodNullable<z.ZodNumber>;
     templateId: z.ZodNullable<z.ZodNumber>;
-    total: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
-    attributes: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+    attributes: z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>;
     moduleFormConfigs: z.ZodOptional<z.ZodArray<z.ZodAny>>;
 }, z.core.$strip>;
 /**
@@ -32,8 +31,7 @@ export declare const FormsResponseSchema: z.ZodObject<{
         type: z.ZodNullable<z.ZodString>;
         attributeSetId: z.ZodNullable<z.ZodNumber>;
         templateId: z.ZodNullable<z.ZodNumber>;
-        total: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
-        attributes: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+        attributes: z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>;
         moduleFormConfigs: z.ZodOptional<z.ZodArray<z.ZodAny>>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
@@ -50,7 +48,6 @@ export declare const SingleFormSchema: z.ZodObject<{
     type: z.ZodNullable<z.ZodString>;
     attributeSetId: z.ZodNullable<z.ZodNumber>;
     templateId: z.ZodNullable<z.ZodNumber>;
-    total: z.ZodOptional<z.ZodUnion<readonly [z.ZodNumber, z.ZodString]>>;
-    attributes: z.ZodOptional<z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>>;
+    attributes: z.ZodUnion<readonly [z.ZodArray<z.ZodAny>, z.ZodRecord<z.ZodString, z.ZodAny>]>;
     moduleFormConfigs: z.ZodOptional<z.ZodArray<z.ZodAny>>;
 }, z.core.$strip>;

package/esm/forms/formsSchemas.js

@@ -13,10 +13,8 @@ export const FormEntitySchema = z.object({
     type: z.string().nullable(),
     attributeSetId: z.number().nullable(),
     templateId: z.number().nullable(),
-    total: z.union([z.number(), z.string()]).optional(),
-    attributes: z
-        .union([z.array(z.any()), z.record(z.string(), z.any())])
-        .optional(),
+    // Required as in IFormsEntity: a form without fields comes as `{}`
+    attributes: z.union([z.array(z.any()), z.record(z.string(), z.any())]),
     moduleFormConfigs: z.array(z.any()).optional(),
 });
 /**

package/esm/forms-data/formsDataApi.d.ts

@@ -136,14 +136,40 @@ export default class FormsDataApi extends AsyncModules implements IFormsData {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/getFormsDataByMarker getFormsDataByMarker} documentation.
      */
     getFormsDataByMarker(marker: string, formModuleConfigId: number, body?: IFormsDataFilter, isExtended?: number, langCode?: string, offset?: number, limit?: number): Promise<IFormsByMarkerDataEntity | IError>;
+    /**
+     * Wrap the caller's flat `formData` array under its language code and upload any
+     * file fields, so the submit endpoints receive `{ [langCode]: [...] }`. Shared by
+     * postFormsData and updateFormsDataByid so the two never diverge.
+     * @param {FormDataType[]} rawFormData - Flat array of form fields.
+     * @param {string} langCode - Language code the fields are wrapped under.
+     * @returns {Promise<object>} The locale-keyed formData and the first upload error, if any.
+     */
+    private _buildLocalizedFormData;
     /**
      * Update one object of form data by id. Requires user authentication.
      * @handleName updateFormsDataByid
      * @param {number} id - Form data ID. Example: 1.
+     * @param {IBodyPostFormData} body - Form data to save: the same fields as in `postFormsData` (`formIdentifier`, `formModuleConfigId`, `moduleEntityIdentifier`, `replayTo`, `status`, `formData`). The flat `formData` array is wrapped under `langCode` before sending, exactly like `postFormsData`.
+     * @param {string} [langCode] - Language code the form fields are saved under. Default: "en_US".
+     * @example
+        {
+          "formIdentifier": "test-form",
+          "formModuleConfigId": 2,
+          "moduleEntityIdentifier": "blog",
+          "replayTo": null,
+          "status": "sent",
+          "formData": [
+            {
+              "marker": "name",
+              "type": "string",
+              "value": "Test"
+            }
+          ]
+        }
      * @returns {Promise<IUpdateFormsData | IError>} Returns an object containing the updated form data or an error object if there was an issue.
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/updateFormsDataByid updateFormsDataByid} documentation.
      */
-    updateFormsDataByid(id: number, body?: object): Promise<IUpdateFormsData | IError>;
+    updateFormsDataByid(id: number, body: IBodyPostFormData, langCode?: string): Promise<IUpdateFormsData | IError>;
     /**
      * Update form data status by id. Requires user authentication.
      * @handleName updateFormsDataStatusByid

package/esm/forms-data/formsDataApi.js

@@ -66,67 +66,13 @@ export default class FormsDataApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/postFormsData postFormsData} documentation.
      */
     async postFormsData(body, langCode = this.state.lang) {
-        const formData = {};
-        // filter button fields; keep spam fields so the captcha token in their `value` reaches the server
-        formData[langCode] = Array.isArray(body.formData)
-            ? body.formData.filter((fd) => fd.type !== 'button')
-            : [body.formData].filter((fd) => fd.type !== 'button');
-        /**
-         * Handle file uploads if fileQuery is present
-         * Check if there is any element in formData[langCode] that contains one of the specified types
-         */
-        if (formData[langCode].find((fd) => ['file', 'image', 'groupOfImages'].includes(fd.type))) {
-            // Create an instance of FileUploadingApi with the current state
-            const fileUploader = new FileUploadingApi(this.state);
-            // Process each element in formData[langCode] asynchronously
-            formData[langCode] = await Promise.all(formData[langCode].map(async (field) => {
-                // Check if the type is one of the specified types
-                if (['file', 'image', 'groupOfImages'].includes(field.type)) {
-                    // Work on a copy: the caller's field keeps its File and its fileQuery,
-                    // so a reused body sends the same form again (CMS-1071)
-                    const fd = { ...field };
-                    // If fileQuery does not exist, we create it and assign it to an object with the following properties:
-                    if (!fd.fileQuery) {
-                        const fileQuery = {
-                            type: 'page',
-                            entity: 'editor',
-                            // Generate a random 4-digit ID
-                            id: Number(Math.floor(Math.random() * 10000)
-                                .toString()
-                                .padStart(4, '0')),
-                        };
-                        fd.fileQuery = fileQuery;
-                    }
-                    // Convert fd.value to an array if it is a FileList, otherwise use it directly
-                    const filesArray = typeof FileList !== 'undefined' && fd.value instanceof FileList
-                        ? Array.from(fd.value)
-                        : fd.value;
-                    // If filesArray is an array, upload the files it holds asynchronously
-                    if (Array.isArray(filesArray)) {
-                        const uploadPromises = filesArray.map((file) => 
-                        // An entry that is already in storage is passed through: a
-                        // second upload would send the descriptor itself as the file
-                        // and the endpoint answers `value[0].filename is required`.
-                        this._isUploadable(file)
-                            ? fileUploader.upload(file, fd.fileQuery).catch((e) => e)
-                            : file);
-                        fd.value = (await Promise.all(uploadPromises)).flat();
-                    }
-                    // If fd.value is a single File or Blob, upload it
-                    else if (this._isUploadable(fd.value)) {
-                        fd.value = await fileUploader
-                            .upload(fd.value, fd.fileQuery)
-                            .catch((e) => e); // Catch any errors during upload
-                    }
-                    // Remove the 'fileQuery' property from the object after processing
-                    delete fd.fileQuery;
-                    // Remove the 'contentType' property from the file object because it is not needed and not valid
-                    fd.value = this._stripContentType(fd.value);
-                    return fd;
-                }
-                // Return the form data element untouched
-                return field;
-            }));
+        // Wrap the flat formData under langCode (and upload any files) before sending
+        const { formData, uploadError } = await this._buildLocalizedFormData(body.formData, langCode);
+        if (uploadError) {
+            if (this.state.isShell) {
+                return uploadError;
+            }
+            throw uploadError;
         }
         // The wrapped formData goes into a new body: written back into the caller's
         // object, a second call with it wrapped the wrapper and answered `400` (CMS-1071)
@@ -234,23 +180,128 @@ export default class FormsDataApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/getFormsDataByMarker getFormsDataByMarker} documentation.
      */
     async getFormsDataByMarker(marker, formModuleConfigId, body = {}, isExtended = 0, langCode = this.state.lang, offset = 0, limit = 30) {
-        const result = await this._fetchPost(`/marker/${this._pathSegment(marker)}?formModuleConfigId=${formModuleConfigId}&isExtended=${isExtended}&langCode=${langCode}&offset=${offset}&limit=${limit}`, this._stripEmptyDates(body));
+        const result = await this._fetchPost(`/marker/${this._pathSegment(marker)}?formModuleConfigId=${encodeURIComponent(String(formModuleConfigId))}&isExtended=${encodeURIComponent(String(isExtended))}&langCode=${encodeURIComponent(langCode)}&offset=${encodeURIComponent(String(offset))}&limit=${encodeURIComponent(String(limit))}`, this._stripEmptyDates(body));
         // Validate response if validation is enabled
         const validated = await this._validateResponse(result, schema('FormsByMarkerDataResponseSchema'));
         return this._normalizeData(validated, langCode);
     }
+    /**
+     * Wrap the caller's flat `formData` array under its language code and upload any
+     * file fields, so the submit endpoints receive `{ [langCode]: [...] }`. Shared by
+     * postFormsData and updateFormsDataByid so the two never diverge.
+     * @param {FormDataType[]} rawFormData - Flat array of form fields.
+     * @param {string} langCode - Language code the fields are wrapped under.
+     * @returns {Promise<object>} The locale-keyed formData and the first upload error, if any.
+     */
+    async _buildLocalizedFormData(rawFormData, langCode) {
+        const formData = {};
+        // filter button fields; keep spam fields so the captcha token in their `value` reaches the server
+        formData[langCode] = Array.isArray(rawFormData)
+            ? rawFormData.filter((fd) => fd.type !== 'button')
+            : [rawFormData].filter((fd) => fd.type !== 'button');
+        /**
+         * Handle file uploads if fileQuery is present
+         * Check if there is any element in formData[langCode] that contains one of the specified types
+         */
+        if (formData[langCode].find((fd) => ['file', 'image', 'groupOfImages'].includes(fd.type))) {
+            // Create an instance of FileUploadingApi with the current state
+            const fileUploader = new FileUploadingApi(this.state);
+            // Process each element in formData[langCode] asynchronously
+            formData[langCode] = await Promise.all(formData[langCode].map(async (field) => {
+                // Check if the type is one of the specified types
+                if (['file', 'image', 'groupOfImages'].includes(field.type)) {
+                    // Work on a copy: the caller's field keeps its File and its fileQuery,
+                    // so a reused body sends the same form again (CMS-1071)
+                    const fd = { ...field };
+                    // If fileQuery does not exist, we create it and assign it to an object with the following properties:
+                    if (!fd.fileQuery) {
+                        const fileQuery = {
+                            type: 'page',
+                            entity: 'editor',
+                            // Generate a random 4-digit ID
+                            id: Number(Math.floor(Math.random() * 10000)
+                                .toString()
+                                .padStart(4, '0')),
+                        };
+                        fd.fileQuery = fileQuery;
+                    }
+                    // Convert fd.value to an array if it is a FileList, otherwise use it directly
+                    const filesArray = typeof FileList !== 'undefined' && fd.value instanceof FileList
+                        ? Array.from(fd.value)
+                        : fd.value;
+                    // If filesArray is an array, upload the files it holds asynchronously
+                    if (Array.isArray(filesArray)) {
+                        const uploadPromises = filesArray.map((file) => 
+                        // An entry that is already in storage is passed through: a
+                        // second upload would send the descriptor itself as the file
+                        // and the endpoint answers `value[0].filename is required`.
+                        this._isUploadable(file)
+                            ? fileUploader.upload(file, fd.fileQuery).catch((e) => e)
+                            : file);
+                        fd.value = (await Promise.all(uploadPromises)).flat();
+                    }
+                    // If fd.value is a single File or Blob, upload it
+                    else if (this._isUploadable(fd.value)) {
+                        fd.value = await fileUploader
+                            .upload(fd.value, fd.fileQuery)
+                            .catch((e) => e); // Catch any errors during upload
+                    }
+                    // Remove the 'fileQuery' property from the object after processing
+                    delete fd.fileQuery;
+                    // Remove the 'contentType' property from the file object because it is not needed and not valid
+                    fd.value = this._stripContentType(fd.value);
+                    return fd;
+                }
+                // Return the form data element untouched
+                return field;
+            }));
+        }
+        // A failed upload used to be sent to the platform as the field's value, and the caller
+        // got a success: the form is not sent, the upload's error is the answer
+        const uploadError = formData[langCode]
+            .flatMap((field) => Array.isArray(field === null || field === void 0 ? void 0 : field.value) ? field.value : [field === null || field === void 0 ? void 0 : field.value])
+            .find((value) => this._isErrorResponse(value));
+        return { formData, uploadError };
+    }
     /**
      * Update one object of form data by id. Requires user authentication.
      * @handleName updateFormsDataByid
      * @param {number} id - Form data ID. Example: 1.
+     * @param {IBodyPostFormData} body - Form data to save: the same fields as in `postFormsData` (`formIdentifier`, `formModuleConfigId`, `moduleEntityIdentifier`, `replayTo`, `status`, `formData`). The flat `formData` array is wrapped under `langCode` before sending, exactly like `postFormsData`.
+     * @param {string} [langCode] - Language code the form fields are saved under. Default: "en_US".
+     * @example
+        {
+          "formIdentifier": "test-form",
+          "formModuleConfigId": 2,
+          "moduleEntityIdentifier": "blog",
+          "replayTo": null,
+          "status": "sent",
+          "formData": [
+            {
+              "marker": "name",
+              "type": "string",
+              "value": "Test"
+            }
+          ]
+        }
      * @returns {Promise<IUpdateFormsData | IError>} Returns an object containing the updated form data or an error object if there was an issue.
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/updateFormsDataByid updateFormsDataByid} documentation.
      */
-    async updateFormsDataByid(id, body = {}) {
-        const result = await this._fetchPut(`/${id}`, body);
+    async updateFormsDataByid(id, body, langCode = this.state.lang) {
+        // Wrap the flat formData under langCode (and upload any files) — the endpoint
+        // rejects a flat array with `400 formData must be ... keyed by lang code`
+        const { formData, uploadError } = await this._buildLocalizedFormData(body.formData, langCode);
+        if (uploadError) {
+            if (this.state.isShell) {
+                return uploadError;
+            }
+            throw uploadError;
+        }
+        const result = await this._fetchPut(`/${this._pathSegment(String(id))}`, { ...body, formData });
         // Validate response if validation is enabled
         const validated = await this._validateResponse(result, schema('UpdateFormsDataSchema'));
-        return validated;
+        // The fields went in under `langCode`, so unwrap the response from the same locale
+        return this._normalizeData(validated, langCode);
     }
     /**
      * Update form data status by id. Requires user authentication.
@@ -261,7 +312,7 @@ export default class FormsDataApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/updateFormsDataStatusByid updateFormsDataStatusByid} documentation.
      */
     async updateFormsDataStatusByid(id, body = {}) {
-        const result = await this._fetchPut(`/${id}/update-status`, body);
+        const result = await this._fetchPut(`/${this._pathSegment(String(id))}/update-status`, body);
         return result;
     }
     /**
@@ -272,8 +323,8 @@ export default class FormsDataApi extends AsyncModules {
      * @see {@link https://js-sdk.oneentry.cloud/docs/forms-data/deleteFormsDataByid deleteFormsDataByid} documentation.
      */
     async deleteFormsDataByid(id) {
-        const result = await this._fetchDelete(`/${id}`);
-        return result;
+        const result = await this._fetchDelete(`/${this._pathSegment(String(id))}`);
+        return this._asBoolean(result);
     }
     /**
      * Semantic (vector) search for form data.

package/esm/forms-data/formsDataInterfaces.d.ts

@@ -225,9 +225,14 @@ interface IFormDataEntity {
         "id": 1,
         "formIdentifier": "form",
         "time": "2025-06-06T19:07:45.993Z",
-        "formData": {},
-        "attributeSetIdentifier": "form",
-        "actionMessage": "Action message string"
+        "formData": [
+          {
+            "marker": "name",
+            "type": "string",
+            "value": "Test"
+          }
+        ],
+        "attributeSetIdentifier": "form"
       }
     ]
  * @property {number} total - Total number of found records. Example: 100.
@@ -241,13 +246,13 @@ interface IFormsDataEntity {
  * Represents the structure of a form data entity.
  * @interface IFormByMarkerDataEntity
  * @property {number} id - ID of the form data record. Example: 12345.
- * @property {null | number} parentId - ID of the parent form data record; `null` for a top-level record. Example: 123.
+ * @property {null | number} [parentId] - ID of the parent form data record; `null` for a top-level record. Returned only with `isExtended` = 1. Example: 123.
  * @property {string} formIdentifier - Marker of the form. Example: "contact_form".
- * @property {number} depth - Example: 1.
- * @property {string | null} ip - IP address the form was submitted from. Example: '127.0.0.1'.
- * @property {string | null} fingerprint - Device fingerprint of the sender. Example: 'fingerprint'.
- * @property {string | null} status - Moderation status of the record: "sent", "moderation", "approved", "banned" or "deleted"; `null` when the form does not moderate. Example: 'approved'.
- * @property {string | null} userIdentifier - Text identifier (marker) of the user. Example: "admin".
+ * @property {number} [depth] - Nesting depth of the record. Returned only with `isExtended` = 1. Example: 1.
+ * @property {string | null} [ip] - IP address the form was submitted from. Not returned by the by-marker list. Example: '127.0.0.1'.
+ * @property {string | null} [fingerprint] - Device fingerprint of the sender. Not returned by the by-marker list. Example: 'fingerprint'.
+ * @property {string | null} [status] - Moderation status of the record: "sent", "moderation", "approved", "banned" or "deleted"; `null` when the form does not moderate. Returned only with `isExtended` = 1. Example: 'approved'.
+ * @property {string | null} [userIdentifier] - Text identifier (marker) of the user. Returned only with `isExtended` = 1. Example: "admin".
  * @property {FormDataType[]} formData - Submitted fields, **already unwrapped from the locale**: the API returns `{ "en_US": [ … ] }` and the SDK hands over the array for the requested `langCode`. Read `formData` directly — `formData[langCode]` is `undefined`.
  * @example
     [
@@ -260,7 +265,7 @@ interface IFormsDataEntity {
  * @property {string | null} attributeSetIdentifier - Marker of the attribute set used by the form. Example: "product_attributes".
  * @property {Date | string} time - Date and time the form data was last changed. Example: "2023-10-01T12:00:00Z".
  * @property {string} entityIdentifier - Marker of the entity the record belongs to. Example: "test".
- * @property {boolean} isUserAdmin - Whether the record was submitted by an admin. Example: true.
+ * @property {boolean} [isUserAdmin] - Whether the record was submitted by an admin. Returned only with `isExtended` = 1. Example: true.
  * @property {number} formModuleConfigId - ID of the form module configuration. Example: 2.
  * @property {string} [moduleIdentifier] - Marker of the module. Example: "blog".
  * @property {number} entityId - ID of the entity the record belongs to. Example: 2.
@@ -287,7 +292,7 @@ interface IFormByMarkerDataEntity {
 /**
  * Represents a collection of form data entities.
  * @interface IFormsByMarkerDataEntity
- * @property {IFormByMarkerDataEntity[]} items - Form data records.
+ * @property {IFormByMarkerDataEntity[]} items - Form data records. The example shows a record with `isExtended` = 1; without it `parentId`, `depth`, `status`, `userIdentifier` and `isUserAdmin` are not returned.
  * @example
     [
       {
@@ -295,7 +300,6 @@ interface IFormByMarkerDataEntity {
         "parentId": null,
         "formIdentifier": "test-form",
         "depth": 0,
-        "ip": null,
         "status": null,
         "userIdentifier": null,
         "formData": [
@@ -862,4 +866,4 @@ interface IListOptionValue {
     value: string;
     extended: IListOptionExtended;
 }
-export type { FormDataPostType, FormDataStatus, FormDataType, IBodyPostFormData, IBodyPostTypeList, IBodyPostTypeSpam, IBodyPostTypeText, IBodyTypeEntity, IBodyTypeFile, IBodyTypeImageGroupOfImages, IBodyTypeRadioButtonList, IBodyTypeStringNumberFloat, IBodyTypeText, IBodyTypeTextWithHeader, IBodyTypeTimeDate, IBodyTypeTimeInterval, ICaptchaEvent, ICaptchaValue, IFileValue, IFormByMarkerDataEntity, IFormDataEntity, IFormDataSearchEntity, IFormsByMarkerDataEntity, IFormsData, IFormsDataEntity, IFormsDataFilter, IFormsDataSearchResponse, IFormsDataVectorSearch, IImageValue, IImageValueParams, IListOptionExtended, IListOptionValue, IPostFormResponse, IPostFormResponseData, ITextEditorParams, ITextSubmissionValue, ITextValue, ITextWithHeaderValue, ITimeDateValue, IUpdateFormsData, };
+export type { FormDataPostType, FormDataStatus, FormDataType, IBodyPostFormData, IBodyPostTypeList, IBodyPostTypeSpam, IBodyPostTypeText, IBodyTypeEntity, IBodyTypeFile, IBodyTypeImageGroupOfImages, IBodyTypeRadioButtonList, IBodyTypeStringNumberFloat, IBodyTypeText, IBodyTypeTextWithHeader, IBodyTypeTimeDate, IBodyTypeTimeInterval, ICaptchaEvent, ICaptchaValue, IFileValue, IFormByMarkerDataEntity, IFormDataEntity, IFormDataSearchEntity, IFormsByMarkerDataEntity, IFormsData, IFormsDataEntity, IFormsDataFilter, IFormsDataSearchResponse, IFormsDataVectorSearch, IImageValue, IImageValueParams, IListOptionExtended, IListOptionValue, IPostFormResponse, IPostFormResponseData, ITextEditorParams, ITextSubmissionValue, ITextSubmissionValueHtml, ITextSubmissionValueMd, ITextSubmissionValuePlain, ITextValue, ITextWithHeaderValue, ITimeDateValue, IUpdateFormsData, };

package/esm/general-types/generalTypesInterfaces.d.ts

@@ -19,7 +19,7 @@ interface IGeneralTypes {
  * Represents a general type entity.
  * @interface IGeneralTypesEntity
  * @property {number} id - ID of the type. Example: 1.
- * @property {BlockType} type - Type name: a `BlockType` value such as `"product"` or `"service"`. Example: "product", "category", "etc".
+ * @property {BlockType} type - Type name: a `BlockType` value such as `"product"`, `"catalog_page"`, `"product_block"` or `"service"`. Example: "product".
  * @description Represents a general type entity with an identifier and a type.
  */
 interface IGeneralTypesEntity {