contentful 11.12.2 → 11.12.3

package/dist/contentful.cjs

@@ -22098,7 +22098,7 @@ var stringify$2 = function stringify(object, prefix, generateArrayPrefix, commaR
   }
   if (obj === null) {
     if (strictNullHandling) {
-      return encoder && !encodeValuesOnly ? encoder(prefix, defaults$1.encoder, charset, 'key', format) : prefix;
+      return formatter(encoder && !encodeValuesOnly ? encoder(prefix, defaults$1.encoder, charset, 'key', format) : prefix);
     }
     obj = '';
   }
@@ -22117,7 +22117,9 @@ var stringify$2 = function stringify(object, prefix, generateArrayPrefix, commaR
   if (generateArrayPrefix === 'comma' && isArray$1(obj)) {
     // we need to join elements in
     if (encodeValuesOnly && encoder) {
-      obj = utils$1.maybeMap(obj, encoder);
+      obj = utils$1.maybeMap(obj, function (v) {
+        return v == null ? v : encoder(v);
+      });
     }
     objKeys = [{
       value: obj.length > 0 ? obj.join(',') || null : void undefined
@@ -22238,6 +22240,9 @@ var stringify_1 = function (object, opts) {
   var sideChannel = getSideChannel();
   for (var i = 0; i < objKeys.length; ++i) {
     var key = objKeys[i];
+    if (typeof key === 'undefined' || key === null) {
+      continue;
+    }
     var value = obj[key];
     if (options.skipNulls && value === null) {
       continue;
@@ -22249,10 +22254,10 @@ var stringify_1 = function (object, opts) {
   if (options.charsetSentinel) {
     if (options.charset === 'iso-8859-1') {
       // encodeURIComponent('&#10003;'), the "numeric entity" representation of a checkmark
-      prefix += 'utf8=%26%2310003%3B&';
+      prefix += 'utf8=%26%2310003%3B' + options.delimiter;
     } else {
       // encodeURIComponent('✓')
-      prefix += 'utf8=%E2%9C%93&';
+      prefix += 'utf8=%E2%9C%93' + options.delimiter;
     }
   }
   return joined.length > 0 ? prefix + joined : '';
@@ -22317,8 +22322,8 @@ var parseValues = function parseQueryStringValues(str, options) {
   var cleanStr = options.ignoreQueryPrefix ? str.replace(/^\?/, '') : str;
   cleanStr = cleanStr.replace(/%5B/gi, '[').replace(/%5D/gi, ']');
   var limit = options.parameterLimit === Infinity ? void undefined : options.parameterLimit;
-  var parts = cleanStr.split(options.delimiter, options.throwOnLimitExceeded ? limit + 1 : limit);
-  if (options.throwOnLimitExceeded && parts.length > limit) {
+  var parts = cleanStr.split(options.delimiter, options.throwOnLimitExceeded && typeof limit !== 'undefined' ? limit + 1 : limit);
+  if (options.throwOnLimitExceeded && typeof limit !== 'undefined' && parts.length > limit) {
     throw new RangeError('Parameter limit exceeded. Only ' + limit + ' parameter' + (limit === 1 ? '' : 's') + ' allowed.');
   }
   var skipIndex = -1; // Keep track of where the utf8 sentinel was found
@@ -22425,8 +22430,13 @@ var parseObject = function (chain, val, options, valuesParsed) {
   }
   return leaf;
 };
-var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
-  var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
+
+// Split a key like "a[b][c[]]" into ['a', '[b]', '[c[]]'] while preserving
+// qs parse semantics for depth/prototype guards.
+var splitKeyIntoSegments = function splitKeyIntoSegments(originalKey, options) {
+  var key = options.allowDots ? originalKey.replace(/\.([^.[]+)/g, '[$1]') : originalKey;
+
+  // depth <= 0 keeps the whole key as one segment
   if (options.depth <= 0) {
     if (!options.plainObjects && has.call(Object.prototype, key)) {
       if (!options.allowPrototypes) {
@@ -22435,37 +22445,67 @@ var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
     }
     return [key];
   }
-  var brackets = /(\[[^[\]]*])/;
-  var child = /(\[[^[\]]*])/g;
-  var segment = brackets.exec(key);
-  var parent = segment ? key.slice(0, segment.index) : key;
-  var keys = [];
+  var segments = [];
+
+  // parent before the first '[' (may be empty if key starts with '[')
+  var first = key.indexOf('[');
+  var parent = first >= 0 ? key.slice(0, first) : key;
   if (parent) {
     if (!options.plainObjects && has.call(Object.prototype, parent)) {
       if (!options.allowPrototypes) {
         return;
       }
     }
-    keys[keys.length] = parent;
-  }
-  var i = 0;
-  while ((segment = child.exec(key)) !== null && i < options.depth) {
-    i += 1;
-    var segmentContent = segment[1].slice(1, -1);
-    if (!options.plainObjects && has.call(Object.prototype, segmentContent)) {
-      if (!options.allowPrototypes) {
-        return;
+    segments[segments.length] = parent;
+  }
+  var n = key.length;
+  var open = first;
+  var collected = 0;
+  while (open >= 0 && collected < options.depth) {
+    var level = 1;
+    var i = open + 1;
+    var close = -1;
+
+    // balance nested '[' and ']' inside this bracket group using a nesting level counter
+    while (i < n && close < 0) {
+      var cu = key.charCodeAt(i);
+      if (cu === 0x5B) {
+        // '['
+        level += 1;
+      } else if (cu === 0x5D) {
+        // ']'
+        level -= 1;
+        if (level === 0) {
+          close = i; // found matching close; loop will exit by condition
+        }
       }
+      i += 1;
     }
-    keys[keys.length] = segment[1];
+    if (close < 0) {
+      // Unterminated group: wrap the raw remainder in one bracket pair so it stays
+      // a single literal segment (e.g. "[[]b" -> "[[]b]"); we do not infer missing ']'.
+      segments[segments.length] = '[' + key.slice(open) + ']';
+      return segments;
+    }
+    var seg = key.slice(open, close + 1);
+    // prototype guard for the content of this group
+    var content = seg.slice(1, -1);
+    if (!options.plainObjects && has.call(Object.prototype, content) && !options.allowPrototypes) {
+      return;
+    }
+    segments[segments.length] = seg;
+    collected += 1;
+
+    // find the next '[' after this balanced group
+    open = key.indexOf('[', close + 1);
   }
-  if (segment) {
+  if (open >= 0) {
     if (options.strictDepth === true) {
       throw new RangeError('Input depth exceeded depth option of ' + options.depth + ' and strictDepth is true');
     }
-    keys[keys.length] = '[' + key.slice(segment.index) + ']';
+    segments[segments.length] = '[' + key.slice(open) + ']';
   }
-  return keys;
+  return segments;
 };
 var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesParsed) {
   if (!givenKey) {
@@ -23937,7 +23977,9 @@ function checkEnableTimelinePreviewIsAllowed(host, timelinePreview) {
     return false;
   }
   const isValidConfig = isValidTimelinePreviewConfig(timelinePreview);
-  const isValidHost = typeof host === 'string' && host.startsWith('preview');
+  // Show error if used outside of CPA.
+  // Opt-out of the error if a custom domain is used and CPA could not be idenfified
+  const isValidHost = typeof host === 'string' && (!host.includes('contentful') || host.startsWith('preview'));
   if (isValidConfig && !isValidHost) {
     throw new ValidationError('timelinePreview', `The 'timelinePreview' parameter can only be used with the CPA. Please set host to 'preview.contentful.com' or 'preview.eu.contentful.com' to enable Timeline Preview.
       `);

package/dist/esm/utils/validate-params.js

@@ -54,7 +54,9 @@ function checkEnableTimelinePreviewIsAllowed(host, timelinePreview) {
         return false;
     }
     const isValidConfig = isValidTimelinePreviewConfig(timelinePreview);
-    const isValidHost = typeof host === 'string' && host.startsWith('preview');
+    // Show error if used outside of CPA.
+    // Opt-out of the error if a custom domain is used and CPA could not be idenfified
+    const isValidHost = typeof host === 'string' && (!host.includes('contentful') || host.startsWith('preview'));
     if (isValidConfig && !isValidHost) {
         throw new ValidationError('timelinePreview', `The 'timelinePreview' parameter can only be used with the CPA. Please set host to 'preview.contentful.com' or 'preview.eu.contentful.com' to enable Timeline Preview.
       `);