coveo.analytics 2.23.8 → 2.23.9

package/dist/definitions/client/analytics.d.ts

@@ -99,6 +99,7 @@ export declare class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdP
     private removeEmptyPayloadValues;
     private removeUnknownParameters;
     private processCustomParameters;
+    private mapCustomParametersToCustomData;
     private lowercaseKeys;
     private validateParams;
     private ensureAnonymousUserWhenUsingApiKey;

package/dist/definitions/client/utils.d.ts

@@ -1 +1,2 @@
 export declare const keysOf: <T>(o: T) => Extract<keyof T, string>[];
+export declare function isObject(o: any): boolean;

package/dist/library.es.js

@@ -359,7 +359,10 @@ const getRandomValues = (rnds) => {
     return rnds;
 };
 
-const keysOf = Object.keys;
+const keysOf = Object.keys;
+function isObject(o) {
+    return o !== null && typeof o === 'object' && !Array.isArray(o);
+}
 
 const ticketKeysMapping = {
     id: 'svc_ticket_id',
@@ -912,7 +915,9 @@ class CoveoAnalyticsClient {
             const validateParams = (currentPayload) => this.validateParams(currentPayload);
             const processMeasurementProtocolConversionStep = (currentPayload) => usesMeasurementProtocol ? convertKeysToMeasurementProtocol(currentPayload) : currentPayload;
             const removeUnknownParameters = (currentPayload) => usesMeasurementProtocol ? this.removeUnknownParameters(currentPayload) : currentPayload;
-            const processCustomParameters = (currentPayload) => usesMeasurementProtocol ? this.processCustomParameters(currentPayload) : currentPayload;
+            const processCustomParameters = (currentPayload) => usesMeasurementProtocol
+                ? this.processCustomParameters(currentPayload)
+                : this.mapCustomParametersToCustomData(currentPayload);
             const payloadToSend = yield [
                 cleanPayloadStep,
                 validateParams,
@@ -1078,13 +1083,30 @@ class CoveoAnalyticsClient {
     }
     processCustomParameters(payload) {
         const { custom } = payload, rest = __rest(payload, ["custom"]);
-        const lowercasedCustom = this.lowercaseKeys(custom);
+        let lowercasedCustom = {};
+        if (custom && isObject(custom)) {
+            lowercasedCustom = this.lowercaseKeys(custom);
+        }
         const newPayload = convertCustomMeasurementProtocolKeys(rest);
         return Object.assign(Object.assign({}, lowercasedCustom), newPayload);
     }
+    mapCustomParametersToCustomData(payload) {
+        const { custom } = payload, rest = __rest(payload, ["custom"]);
+        if (custom && isObject(custom)) {
+            const lowercasedCustom = this.lowercaseKeys(custom);
+            return Object.assign(Object.assign({}, rest), { customData: Object.assign(Object.assign({}, lowercasedCustom), payload.customData) });
+        }
+        else {
+            return payload;
+        }
+    }
     lowercaseKeys(custom) {
-        const keys = Object.keys(custom || {});
-        return keys.reduce((all, key) => (Object.assign(Object.assign({}, all), { [key.toLowerCase()]: custom[key] })), {});
+        const keys = Object.keys(custom);
+        let result = {};
+        keys.forEach((key) => {
+            result[key.toLowerCase()] = custom[key];
+        });
+        return result;
     }
     validateParams(payload) {
         const { anonymizeIp } = payload, rest = __rest(payload, ["anonymizeIp"]);

package/dist/library.js

@@ -506,7 +506,10 @@ var getRandomValues = function (rnds) {
     return rnds;
 };
 
-var keysOf = Object.keys;
+var keysOf = Object.keys;
+function isObject(o) {
+    return o !== null && typeof o === 'object' && !Array.isArray(o);
+}
 
 var ticketKeysMapping = {
     id: 'svc_ticket_id',
@@ -82808,7 +82811,9 @@ var CoveoAnalyticsClient = (function () {
                             return usesMeasurementProtocol ? _this.removeUnknownParameters(currentPayload) : currentPayload;
                         };
                         processCustomParameters = function (currentPayload) {
-                            return usesMeasurementProtocol ? _this.processCustomParameters(currentPayload) : currentPayload;
+                            return usesMeasurementProtocol
+                                ? _this.processCustomParameters(currentPayload)
+                                : _this.mapCustomParametersToCustomData(currentPayload);
                         };
                         return [4, [
                                 cleanPayloadStep,
@@ -83078,16 +83083,30 @@ var CoveoAnalyticsClient = (function () {
     };
     CoveoAnalyticsClient.prototype.processCustomParameters = function (payload) {
         var custom = payload.custom, rest = __rest(payload, ["custom"]);
-        var lowercasedCustom = this.lowercaseKeys(custom);
+        var lowercasedCustom = {};
+        if (custom && isObject(custom)) {
+            lowercasedCustom = this.lowercaseKeys(custom);
+        }
         var newPayload = convertCustomMeasurementProtocolKeys(rest);
         return __assign(__assign({}, lowercasedCustom), newPayload);
     };
+    CoveoAnalyticsClient.prototype.mapCustomParametersToCustomData = function (payload) {
+        var custom = payload.custom, rest = __rest(payload, ["custom"]);
+        if (custom && isObject(custom)) {
+            var lowercasedCustom = this.lowercaseKeys(custom);
+            return __assign(__assign({}, rest), { customData: __assign(__assign({}, lowercasedCustom), payload.customData) });
+        }
+        else {
+            return payload;
+        }
+    };
     CoveoAnalyticsClient.prototype.lowercaseKeys = function (custom) {
-        var keys = Object.keys(custom || {});
-        return keys.reduce(function (all, key) {
-            var _a;
-            return (__assign(__assign({}, all), (_a = {}, _a[key.toLowerCase()] = custom[key], _a)));
-        }, {});
+        var keys = Object.keys(custom);
+        var result = {};
+        keys.forEach(function (key) {
+            result[key.toLowerCase()] = custom[key];
+        });
+        return result;
     };
     CoveoAnalyticsClient.prototype.validateParams = function (payload) {
         var anonymizeIp = payload.anonymizeIp, rest = __rest(payload, ["anonymizeIp"]);
@@ -83450,7 +83469,7 @@ var Plugins = (function () {
         }
         var actionFunction = plugin[fn];
         if (!actionFunction) {
-            throw new Error("The function \"" + fn + "\" does not exists on the plugin \"" + name + "\".");
+            throw new Error("The function \"" + fn + "\" does not exist on the plugin \"" + name + "\".");
         }
         if (typeof actionFunction !== 'function') {
             throw new Error("\"" + fn + "\" of the plugin \"" + name + "\" is not a function.");

package/dist/react-native.es.js

@@ -420,7 +420,10 @@ const addPageViewToHistory = (pageViewValue) => __awaiter(void 0, void 0, void 0
     yield store.addElementAsync(historyElement);
 });
 
-const keysOf = Object.keys;
+const keysOf = Object.keys;
+function isObject(o) {
+    return o !== null && typeof o === 'object' && !Array.isArray(o);
+}
 
 const ticketKeysMapping = {
     id: 'svc_ticket_id',
@@ -912,7 +915,9 @@ class CoveoAnalyticsClient {
             const validateParams = (currentPayload) => this.validateParams(currentPayload);
             const processMeasurementProtocolConversionStep = (currentPayload) => usesMeasurementProtocol ? convertKeysToMeasurementProtocol(currentPayload) : currentPayload;
             const removeUnknownParameters = (currentPayload) => usesMeasurementProtocol ? this.removeUnknownParameters(currentPayload) : currentPayload;
-            const processCustomParameters = (currentPayload) => usesMeasurementProtocol ? this.processCustomParameters(currentPayload) : currentPayload;
+            const processCustomParameters = (currentPayload) => usesMeasurementProtocol
+                ? this.processCustomParameters(currentPayload)
+                : this.mapCustomParametersToCustomData(currentPayload);
             const payloadToSend = yield [
                 cleanPayloadStep,
                 validateParams,
@@ -1078,13 +1083,30 @@ class CoveoAnalyticsClient {
     }
     processCustomParameters(payload) {
         const { custom } = payload, rest = __rest(payload, ["custom"]);
-        const lowercasedCustom = this.lowercaseKeys(custom);
+        let lowercasedCustom = {};
+        if (custom && isObject(custom)) {
+            lowercasedCustom = this.lowercaseKeys(custom);
+        }
         const newPayload = convertCustomMeasurementProtocolKeys(rest);
         return Object.assign(Object.assign({}, lowercasedCustom), newPayload);
     }
+    mapCustomParametersToCustomData(payload) {
+        const { custom } = payload, rest = __rest(payload, ["custom"]);
+        if (custom && isObject(custom)) {
+            const lowercasedCustom = this.lowercaseKeys(custom);
+            return Object.assign(Object.assign({}, rest), { customData: Object.assign(Object.assign({}, lowercasedCustom), payload.customData) });
+        }
+        else {
+            return payload;
+        }
+    }
     lowercaseKeys(custom) {
-        const keys = Object.keys(custom || {});
-        return keys.reduce((all, key) => (Object.assign(Object.assign({}, all), { [key.toLowerCase()]: custom[key] })), {});
+        const keys = Object.keys(custom);
+        let result = {};
+        keys.forEach((key) => {
+            result[key.toLowerCase()] = custom[key];
+        });
+        return result;
     }
     validateParams(payload) {
         const { anonymizeIp } = payload, rest = __rest(payload, ["anonymizeIp"]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "coveo.analytics",
-    "version": "2.23.8",
+    "version": "2.23.9",
     "description": "📈 Coveo analytics client (node and browser compatible) ",
     "main": "dist/library.js",
     "module": "dist/library.es.js",

package/src/client/analytics.ts

@@ -34,6 +34,7 @@ import {isApiKey} from './token';
 import {isReactNative, ReactNativeRuntimeWarning} from '../react-native/react-native-utils';
 import {doNotTrack} from '../donottrack';
 import {NullStorage} from '../storage';
+import {isObject} from './utils';
 
 export const Version = 'v15';
 
@@ -294,7 +295,9 @@ export class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdProvider
         const removeUnknownParameters: ProcessPayloadStep = (currentPayload) =>
             usesMeasurementProtocol ? this.removeUnknownParameters(currentPayload) : currentPayload;
         const processCustomParameters: ProcessPayloadStep = (currentPayload) =>
-            usesMeasurementProtocol ? this.processCustomParameters(currentPayload) : currentPayload;
+            usesMeasurementProtocol
+                ? this.processCustomParameters(currentPayload)
+                : this.mapCustomParametersToCustomData(currentPayload);
 
         const payloadToSend = await [
             cleanPayloadStep,
@@ -489,8 +492,10 @@ export class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdProvider
 
     private processCustomParameters(payload: IRequestPayload): IRequestPayload {
         const {custom, ...rest} = payload;
-
-        const lowercasedCustom = this.lowercaseKeys(custom);
+        let lowercasedCustom = {};
+        if (custom && isObject(custom)) {
+            lowercasedCustom = this.lowercaseKeys(custom);
+        }
 
         const newPayload = convertCustomMeasurementProtocolKeys(rest);
 
@@ -500,16 +505,23 @@ export class CoveoAnalyticsClient implements AnalyticsClient, VisitorIdProvider
         };
     }
 
-    private lowercaseKeys(custom: any) {
-        const keys = Object.keys(custom || {});
+    private mapCustomParametersToCustomData(payload: IRequestPayload): IRequestPayload {
+        const {custom, ...rest} = payload;
+        if (custom && isObject(custom)) {
+            const lowercasedCustom = this.lowercaseKeys(custom);
+            return {...rest, customData: {...lowercasedCustom, ...payload.customData}};
+        } else {
+            return payload;
+        }
+    }
 
-        return keys.reduce(
-            (all, key) => ({
-                ...all,
-                [key.toLowerCase()]: custom[key],
-            }),
-            {}
-        );
+    private lowercaseKeys(custom: Record<string, unknown>) {
+        const keys = Object.keys(custom);
+        let result: Record<string, unknown> = {};
+        keys.forEach((key) => {
+            result[key.toLowerCase() as string] = custom[key];
+        });
+        return result;
     }
 
     private validateParams(payload: IRequestPayload): IRequestPayload {

package/src/client/utils.ts

@@ -1,3 +1,6 @@
 // Object.keys returns `string[]` this adds types
 // see https://github.com/microsoft/TypeScript/pull/12253#issuecomment-393954723
 export const keysOf = Object.keys as <T>(o: T) => Extract<keyof T, string>[];
+export function isObject(o: any): boolean {
+    return o !== null && typeof o === 'object' && !Array.isArray(o);
+}

package/src/coveoua/plugins.ts

@@ -38,7 +38,7 @@ export class Plugins {
         }
         const actionFunction = plugin[fn];
         if (!actionFunction) {
-            throw new Error(`The function "${fn}" does not exists on the plugin "${name}".`);
+            throw new Error(`The function "${fn}" does not exist on the plugin "${name}".`);
         }
         if (typeof actionFunction !== 'function') {
             throw new Error(`"${fn}" of the plugin "${name}" is not a function.`);