lumen-framework 3.0.1 → 3.0.3

package/dist/index.js

@@ -3728,10 +3728,11 @@ var MIME_TYPE = "application/vnd.api+json";
 
 // src/packages/jsonapi/errors/not-acceptable-error.ts
 var NotAcceptableError = class extends TypeError {
-  constructor(contentType) {
+  constructor(accept) {
     super(line`
-      Media type parameters is not supported. Try your request again
-      without specifying '${contentType.replace(MIME_TYPE, "")}'.
+      Every '${MIME_TYPE}' in Accept: '${accept}' has media type parameters,
+      which are not supported. Try your request again with '${MIME_TYPE}'
+      without parameters.
     `);
   }
 };
@@ -3741,8 +3742,9 @@ var not_acceptable_error_default = createServerError(NotAcceptableError, 406);
 var UnsupportedMediaTypeError = class extends TypeError {
   constructor(contentType) {
     super(line`
-      Media type parameters is not supported. Try your request again
-      without specifying '${contentType.replace(MIME_TYPE, "")}'.
+      Media type parameters are not supported in Content-Type:
+      '${contentType}'. Try your request again with Content-Type:
+      '${MIME_TYPE}' without parameters.
     `);
   }
 };
@@ -3757,17 +3759,59 @@ var InvalidContentTypeError = class extends TypeError {
     `);
   }
 };
-var invalid_content_type_error_default = createServerError(InvalidContentTypeError, 400);
+var invalid_content_type_error_default = createServerError(InvalidContentTypeError, 415);
+
+// src/packages/jsonapi/utils/media-type.ts
+var QUALITY = /^q\s*=/i;
+function splitUnquoted(value, delimiter) {
+  const parts = [];
+  let current = "";
+  let quoted = false;
+  let escaped = false;
+  for (const char of value) {
+    if (escaped) {
+      escaped = false;
+    } else if (quoted && char === "\\") {
+      escaped = true;
+    } else if (char === '"') {
+      quoted = !quoted;
+    } else if (!quoted && char === delimiter) {
+      parts.push(current);
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  return [...parts, current];
+}
+function parseMediaType(value) {
+  const [type = "", ...params] = splitUnquoted(value, ";").map(
+    (part) => part.trim()
+  );
+  return {
+    type: type.toLowerCase(),
+    params: params.filter(Boolean)
+  };
+}
+function parseAccept(value) {
+  return splitUnquoted(value, ",").map((range) => {
+    const { type, params } = parseMediaType(range);
+    const quality = params.findIndex((param) => QUALITY.test(param));
+    return {
+      type,
+      params: quality === -1 ? params : params.slice(0, quality)
+    };
+  }).filter(({ type }) => type.length > 0);
+}
 
 // src/packages/jsonapi/utils/is-jsonapi.ts
 function isJSONAPI(value) {
-  return value.startsWith(MIME_TYPE);
+  return parseMediaType(value).type === MIME_TYPE;
 }
 
-// src/packages/jsonapi/utils/has-media-type.ts
-var PATTERN2 = /^application\/vnd.api\+json;charset=.+$/;
-function hasMediaType(value) {
-  return PATTERN2.test(value);
+// src/packages/jsonapi/utils/has-media-type-params.ts
+function hasMediaTypeParams(value) {
+  return parseMediaType(value).params.length > 0;
 }
 
 // src/utils/env.ts
@@ -3868,9 +3912,12 @@ function createResponder(req, res) {
 }
 
 // src/packages/server/utils/validate-accept.ts
-function validateAccept(contentType) {
-  if (contentType && hasMediaType(contentType)) {
-    throw new not_acceptable_error_default(contentType);
+function validateAccept(accept) {
+  if (accept) {
+    const ranges = parseAccept(accept).filter(({ type }) => type === MIME_TYPE);
+    if (ranges.length && ranges.every(({ params }) => params.length)) {
+      throw new not_acceptable_error_default(accept);
+    }
   }
   return true;
 }
@@ -3879,7 +3926,7 @@ function validateAccept(contentType) {
 function validateContentType(contentType) {
   if (!contentType || !isJSONAPI(contentType)) {
     throw new invalid_content_type_error_default(contentType);
-  } else if (hasMediaType(contentType)) {
+  } else if (hasMediaTypeParams(contentType)) {
     throw new unsupported_media_type_error_default(contentType);
   }
   return true;