@mablhq/mabl-cli 2.51.10 → 2.51.12

package/core/execution/ApiTestUtils.js

@@ -69,6 +69,7 @@ const EXPECT_FUNCTIONS = {
     EndsWith: `satisfy(value => value.endsWith(${EXPECTED_VALUE_TOKEN}))`,
     MatchesRegExp: `match(${EXPECTED_VALUE_TOKEN})`,
 };
+const MEDIA_TYPE_TOKEN = "[0-9A-Za-z!#$%&'*+.^_`|~-]+";
 function compareStringsCaseInsensitive(a, b) {
     a = a === null || a === void 0 ? void 0 : a.toUpperCase().toLowerCase();
     b = b === null || b === void 0 ? void 0 : b.toUpperCase().toLowerCase();
@@ -810,21 +811,23 @@ function isSupportedAuthType(authDefinition) {
 }
 exports.isSupportedAuthType = isSupportedAuthType;
 function isJson(contentType) {
-    return (!!contentType &&
-        (contentType.startsWith('application/json') ||
-            contentType.startsWith('application/vnd.api+json')));
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('application/json'), (ct) => ct.match(new RegExp(`${MEDIA_TYPE_TOKEN}\/${MEDIA_TYPE_TOKEN}\\+json.*`, 'i')));
 }
 exports.isJson = isJson;
 function isXML(contentType) {
-    return (!!contentType &&
-        (contentType.startsWith('application/xml') ||
-            contentType.startsWith('text/xml')));
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('application/xml'), (ct) => ct.startsWith('text/xml'), (ct) => ct.match(new RegExp(`${MEDIA_TYPE_TOKEN}\/${MEDIA_TYPE_TOKEN}\\+xml.*`, 'i')));
 }
 exports.isXML = isXML;
 function isText(contentType) {
-    return !!contentType && (contentType === null || contentType === void 0 ? void 0 : contentType.startsWith('text/'));
+    return contentTypeMatches(contentType, (ct) => ct.startsWith('text/'));
 }
 exports.isText = isText;
+function contentTypeMatches(contentType, ...predicates) {
+    if (!contentType) {
+        return false;
+    }
+    return predicates.some((predicate) => predicate(contentType));
+}
 function getFormDataArray(item) {
     var _a, _b, _c;
     if (getRequestMode(item) === 'formdata') {