fix(if_match): change if-match header parser logic

ignore empty element

Author: TomokiMiyauci

deps.ts

@@ -13,6 +13,7 @@ export { isString } from "https://deno.land/x/isx@1.1.1/is_string.ts";
 export { isNumber } from "https://deno.land/x/isx@1.1.1/is_number.ts";
 export { isNegativeNumber } from "https://deno.land/x/isx@1.1.1/number/is_negative_number.ts";
 export { isValidDate } from "https://deno.land/x/isx@1.1.1/date/is_valid_date.ts";
+export { trim } from "https://deno.land/x/prelude_js@1.0.0/trim.ts";
 export {
   type Handler,
   type Middleware,

if_match.ts

@@ -3,7 +3,7 @@
 
 // TODO(miyauci): External Packaging
 
-import { type ETag, parseETag } from "./deps.ts";
+import { type ETag, parseETag, trim } from "./deps.ts";
 
 export type IfMatch = Star | ETag[];
 export type IfNoneMatch = IfMatch;
@@ -13,12 +13,11 @@ export type Star = "*";
  * @throws {SyntaxError} If the input is invalid.
  */
 export function parse(input: string): IfMatch | IfNoneMatch {
-  input = input.trim();
-
   if (input === "*") return input;
 
   return input
     .split(",")
+    .map(trim)
     .filter(Boolean)
     .map(parseETag);
 }

if_match_test.ts

@@ -6,9 +6,6 @@ describe("parse", () => {
   it("should return star", () => {
     const table: string[] = [
       "*",
-      " *",
-      "* ",
-      "   *  ",
     ];
 
     table.forEach((input) => {
@@ -20,6 +17,8 @@ describe("parse", () => {
     const table: string[] = [
       "",
       "     ",
+      " , ",
+      ", , ,",
     ];
 
     table.forEach((input) => {
@@ -62,6 +61,10 @@ describe("parse", () => {
       `* *`,
       `**`,
       `"", *`,
+      " *",
+      "* ",
+      "   *  ",
+      "a,",
     ];
 
     table.forEach((input) => {

preconditions/utils.ts

@@ -50,13 +50,13 @@ export function ifModifiedSince(
   fieldValue: string,
   lastModified: string,
 ): boolean {
-  const date = parseHttpDate(fieldValue.trim());
+  const date = parseHttpDate(fieldValue);
 
   if (!isValidDate(date)) {
     throw SyntaxError(Msg.InvalidField);
   }
 
-  const lastMod = parseHttpDate(lastModified.trim());
+  const lastMod = parseHttpDate(lastModified);
 
   if (!isValidDate(lastMod)) {
     throw SyntaxError(Msg.InvalidLastModified);
@@ -75,13 +75,13 @@ export function ifUnmodifiedSince(
   fieldValue: string,
   lastModified: string,
 ): boolean {
-  const date = parseHttpDate(fieldValue.trim());
+  const date = parseHttpDate(fieldValue);
 
   if (!isValidDate(date)) {
     throw SyntaxError(Msg.InvalidField);
   }
 
-  const lastMod = parseHttpDate(lastModified.trim());
+  const lastMod = parseHttpDate(lastModified);
 
   if (!isValidDate(lastMod)) {
     throw SyntaxError(Msg.InvalidLastModified);