test(preconditions): add test case

Author: TomokiMiyauci

_tools/meta.ts

@@ -69,11 +69,6 @@ export const makeOptions = (version: string): BuildOptions => ({
       version: "1.1.1",
       subPath: "number/is_negative_number",
     },
-    "https://deno.land/x/[email protected]/date/is_valid_date.ts": {
-      name: "@miyauci/isx",
-      version: "1.1.1",
-      subPath: "date/is_valid_date",
-    },
     "https://deno.land/x/[email protected]/mod.ts": {
       name: "@httpland/http-middleware",
       version: "1.0.0",

deps.ts

@@ -12,7 +12,6 @@ export { isNull } from "https://deno.land/x/[email protected]/is_null.ts";
 export { isString } from "https://deno.land/x/[email protected]/is_string.ts";
 export { isNumber } from "https://deno.land/x/[email protected]/is_number.ts";
 export { isNegativeNumber } from "https://deno.land/x/[email protected]/number/is_negative_number.ts";
-export { isValidDate } from "https://deno.land/x/[email protected]/date/is_valid_date.ts";
 export { trim } from "https://deno.land/x/[email protected]/trim.ts";
 export { toLowerCase } from "https://deno.land/x/[email protected]/to_lower_case.ts";
 export {

preconditions/if_match_test.ts

@@ -29,6 +29,15 @@ describe("IfMatch", () => {
           new Request("test:"),
           new Response(null, { headers: { [RepresentationHeader.ETag]: "" } }),
         ],
+        [
+          new Request("test:"),
+          new Response(null, {
+            headers: {
+              [ConditionalHeader.IfMatch]: "",
+              [RepresentationHeader.ETag]: "",
+            },
+          }),
+        ],
       ];
 
       table.forEach(([request, response]) => {

preconditions/if_modified_since_test.ts

@@ -77,6 +77,15 @@ describe("IfModifiedSince", () => {
             headers: { [RepresentationHeader.LastModified]: "" },
           }),
         ],
+        [
+          new Request("test:"),
+          new Response(null, {
+            headers: {
+              [ConditionalHeader.IfModifiedSince]: "",
+              [RepresentationHeader.LastModified]: "",
+            },
+          }),
+        ],
       ];
 
       table.forEach(([request, response]) => {

preconditions/if_none_match_test.ts

@@ -30,6 +30,15 @@ describe("IfNoneMatch", () => {
           new Request("test:"),
           new Response(null, { headers: { [RepresentationHeader.ETag]: "" } }),
         ],
+        [
+          new Request("test:"),
+          new Response(null, {
+            headers: {
+              [ConditionalHeader.IfNoneMatch]: "",
+              [RepresentationHeader.ETag]: "",
+            },
+          }),
+        ],
       ];
 
       table.forEach(([request, response]) => {

preconditions/utils.ts

@@ -4,10 +4,11 @@
 import {
   compareStrong,
   compareWeak,
+  isErr,
   isString,
-  isValidDate,
   parseETag,
   parseHttpDate,
+  unsafe,
 } from "../deps.ts";
 import { parse } from "../if_match.ts";
 
@@ -50,18 +51,21 @@ export function ifModifiedSince(
   fieldValue: string,
   lastModified: string,
 ): boolean {
-  const date = parseHttpDate(fieldValue);
+  const dateContainer = unsafe(() => parseHttpDate(fieldValue));
 
-  if (!isValidDate(date)) {
+  if (isErr(dateContainer)) {
     throw SyntaxError(Msg.InvalidField);
   }
 
-  const lastMod = parseHttpDate(lastModified);
+  const date = dateContainer.value;
+  const lastModContainer = unsafe(() => parseHttpDate(lastModified));
 
-  if (!isValidDate(lastMod)) {
+  if (isErr(lastModContainer)) {
     throw SyntaxError(Msg.InvalidLastModified);
   }
 
+  const lastMod = lastModContainer.value;
+
   // The origin server SHOULD NOT perform the requested
   // method if the selected representation's last modification date is
   // earlier than or equal to the date provided in the field-value;
@@ -75,18 +79,21 @@ export function ifUnmodifiedSince(
   fieldValue: string,
   lastModified: string,
 ): boolean {
-  const date = parseHttpDate(fieldValue);
+  const dateContainer = unsafe(() => parseHttpDate(fieldValue));
 
-  if (!isValidDate(date)) {
+  if (isErr(dateContainer)) {
     throw SyntaxError(Msg.InvalidField);
   }
 
-  const lastMod = parseHttpDate(lastModified);
+  const lastModContainer = unsafe(() => parseHttpDate(lastModified));
 
-  if (!isValidDate(lastMod)) {
+  if (isErr(lastModContainer)) {
     throw SyntaxError(Msg.InvalidLastModified);
   }
 
+  const date = dateContainer.value;
+  const lastMod = lastModContainer.value;
+
   // The origin server MUST NOT perform the requested method
   // if the selected representation's last modification date is more
   // recent than the date provided in the field-value;
@@ -114,18 +121,21 @@ export function ifRange(fieldValue: string, headers: IfRangeHeaders): boolean {
 
   if (!isString(lastModified)) throw Error();
 
-  const left = parseHttpDate(fieldValue);
+  const leftContainer = unsafe(() => parseHttpDate(fieldValue));
 
-  if (!isValidDate(left)) {
+  if (isErr(leftContainer)) {
     throw SyntaxError(Msg.InvalidField);
   }
 
-  const right = parseHttpDate(lastModified);
+  const rightContainer = unsafe(() => parseHttpDate(lastModified));
 
-  if (!isValidDate(right)) {
+  if (isErr(rightContainer)) {
     throw SyntaxError(Msg.InvalidLastModified);
   }
 
+  const left = leftContainer.value;
+  const right = rightContainer.value;
+
   return left.getTime() === right.getTime();
 }
 

preconditions/utils_test.ts

@@ -125,6 +125,17 @@ describe("ifModifiedSince", () => {
       assertThrows(() => ifModifiedSince(filedValue, lastModified));
     });
   });
+
+  it("should return false if the input is invalid syntax", () => {
+    const table: [string, string][] = [
+      ["", "Mon, 06 Mar 2023 12:00:00 GMT"],
+      ["Mon, 06 Mar 2023 12:00:00 GMT", ""],
+    ];
+
+    table.forEach(([filedValue, etag]) => {
+      assertThrows(() => ifModifiedSince(filedValue, etag));
+    });
+  });
 });
 
 describe("ifUnmodifiedSince", () => {
@@ -221,6 +232,7 @@ describe("ifRange", () => {
       ["", { etag: "" }],
       ["", { etag: "", lastModified: "" }],
       [`""`, { etag: `"` }],
+      [`""`, {}],
       [`Sep`, { lastModified: "" }],
     ];