@constructor-io/constructorio-node 3.9.0 → 3.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-node",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "Constructor.io Node.js client",
   "main": "src/constructorio.js",
   "scripts": {

package/src/modules/autocomplete.js

@@ -85,8 +85,9 @@ function createAutocompleteUrl(query, parameters, userParameters, options) {
   queryParams = helpers.cleanParams(queryParams);
 
   const queryString = qs.stringify(queryParams, { indices: false });
+  const cleanedQuery = query.replace(/^\//, '|'); // For compatibility with backend API
 
-  return `${serviceUrl}/autocomplete/${encodeURIComponent(query)}?${queryString}`;
+  return `${serviceUrl}/autocomplete/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(cleanedQuery))}?${queryString}`;
 }
 
 /**

package/src/modules/browse.js

@@ -135,7 +135,7 @@ function createBrowseUrlFromFilter(filterName, filterValue, parameters, userPara
   const queryParams = createQueryParams(parameters, userParameters, options);
   const queryString = qs.stringify(queryParams, { indices: false });
 
-  return `${serviceUrl}/browse/${encodeURIComponent(filterName)}/${encodeURIComponent(filterValue)}?${queryString}`;
+  return `${serviceUrl}/browse/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(filterName))}/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(filterValue))}?${queryString}`;
 }
 
 // Create URL from supplied IDs and parameters
@@ -176,11 +176,13 @@ function createBrowseUrlForFacetOptions(facetName, parameters, userParameters, o
 
   const queryParams = { ...createQueryParams(parameters, userParameters, options) };
 
+  queryParams.facet_name = facetName;
+
   delete queryParams._dt;
 
   const queryString = qs.stringify(queryParams, { indices: false });
 
-  return `${serviceUrl}/browse/facet_options?facet_name=${facetName}&${queryString}`;
+  return `${serviceUrl}/browse/facet_options?${queryString}`;
 }
 
 // Create request headers using supplied options and user parameters

package/src/modules/recommendations.js

@@ -76,7 +76,7 @@ function createRecommendationsUrl(podId, parameters, userParameters, options) {
 
   const queryString = qs.stringify(queryParams, { indices: false });
 
-  return `${serviceUrl}/recommendations/v1/pods/${podId}?${queryString}`;
+  return `${serviceUrl}/recommendations/v1/pods/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(podId))}?${queryString}`;
 }
 
 /**

package/src/modules/search.js

@@ -124,7 +124,7 @@ function createSearchUrl(query, parameters, userParameters, options) {
 
   const queryString = qs.stringify(queryParams, { indices: false });
 
-  return `${serviceUrl}/search/${encodeURIComponent(query)}?${queryString}`;
+  return `${serviceUrl}/search/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(query))}?${queryString}`;
 }
 
 /**

package/src/modules/tracker.js

@@ -385,7 +385,7 @@ class Tracker {
     if (term && typeof term === 'string') {
       // Ensure parameters are provided (required)
       if (parameters && typeof parameters === 'object' && !Array.isArray(parameters)) {
-        const url = `${this.options.serviceUrl}/autocomplete/${helpers.ourEncodeURIComponent(term)}/select?`;
+        const url = `${this.options.serviceUrl}/autocomplete/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(term))}/select?`;
         const queryParams = {};
         const {
           original_query,
@@ -479,7 +479,7 @@ class Tracker {
     if (term && typeof term === 'string') {
       // Ensure parameters are provided (required)
       if (parameters && typeof parameters === 'object' && !Array.isArray(parameters)) {
-        const url = `${this.options.serviceUrl}/autocomplete/${helpers.ourEncodeURIComponent(term)}/search?`;
+        const url = `${this.options.serviceUrl}/autocomplete/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(term))}/search?`;
         const queryParams = {};
         const { original_query, group_id, display_name } = parameters;
 
@@ -641,7 +641,7 @@ class Tracker {
     if (term && typeof term === 'string') {
       // Ensure parameters are provided (required)
       if (parameters && typeof parameters === 'object' && !Array.isArray(parameters)) {
-        const url = `${this.options.serviceUrl}/autocomplete/${helpers.ourEncodeURIComponent(term)}/click_through?`;
+        const url = `${this.options.serviceUrl}/autocomplete/${helpers.encodeURIComponentRFC3986(helpers.trimNonBreakingSpaces(term))}/click_through?`;
         const queryParams = {};
         const { item_name, name, item_id, customer_id, variation_id, result_id } = parameters;
 
@@ -740,7 +740,7 @@ class Tracker {
   trackConversion(term, parameters, userParameters, networkParameters = {}) {
     // Ensure parameters are provided (required)
     if (parameters && typeof parameters === 'object' && !Array.isArray(parameters)) {
-      const searchTerm = helpers.ourEncodeURIComponent(term) || 'TERM_UNKNOWN';
+      const searchTerm = term || 'TERM_UNKNOWN';
       const requestPath = `${this.options.serviceUrl}/v2/behavioral_action/conversion?`;
       const queryParams = {};
       const bodyParams = {};

package/src/utils/helpers.js

@@ -1,22 +1,9 @@
 /* eslint-disable no-param-reassign */
-const qs = require('qs');
-
 const utils = {
-  ourEncodeURIComponent: (str) => {
-    if (str && typeof str === 'string') {
-      const cleanedString = str
-        .replace(/\[/g, '%5B') // Replace [
-        .replace(/\]/g, '%5D') // Replace ]
-        .replace(/&/g, '%26'); // Replace &
-      const trimmedCleanedString = cleanedString.trim();
-      const parsedStrObj = qs.parse(`s=${trimmedCleanedString}`);
-
-      parsedStrObj.s = parsedStrObj.s.replace(/\s/g, ' ');
+  trimNonBreakingSpaces: (string) => string.replace(/\s/g, ' ').trim(),
 
-      return qs.stringify(parsedStrObj).split('=')[1];
-    }
-    return null;
-  },
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
+  encodeURIComponentRFC3986: (string) => encodeURIComponent(string).replace(/[!'()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`),
 
   cleanParams: (paramsObj) => {
     const cleanedParams = {};
@@ -27,7 +14,7 @@ const utils = {
       if (typeof paramValue === 'string') {
         // Replace non-breaking spaces (or any other type of spaces caught by the regex)
         // - with a regular white space
-        cleanedParams[paramKey] = decodeURIComponent(utils.ourEncodeURIComponent(paramValue));
+        cleanedParams[paramKey] = utils.trimNonBreakingSpaces(paramValue);
       } else {
         cleanedParams[paramKey] = paramValue;
       }