feat: use external validation for token

Author: TomokiMiyauci

_abnf.ts

@@ -67,10 +67,4 @@ if (import.meta.main) {
   console.log("challenge:", optimize(challenge).toRegExp());
   console.log("element: ", element);
   console.log("authParam: ", optimize(authParam).toRegExp());
-  console.log("token: ", optimize(token).toRegExp());
-  console.log("token68: ", optimize(token68).toRegExp());
-  console.log(
-    "quoted-string: ",
-    optimize(quotedString).toRegExp(),
-  );
 }

_dev_deps.ts

@@ -1,6 +1,7 @@
 export {
   assert,
   assertEquals,
+  assertFalse,
   assertIsError,
   assertThrows,
 } from "https://deno.land/[email protected]/testing/asserts.ts";

_tools/meta.ts

@@ -64,5 +64,15 @@ export const makeOptions = (version: string): BuildOptions => ({
       version: "1.3.1",
       subPath: "is_nullable.js",
     },
+    "https://deno.land/x/[email protected]/quoted_string.ts": {
+      name: "@httpland/http-utils",
+      version: "1.1.0",
+      subPath: "quoted_string.js",
+    },
+    "https://deno.land/x/[email protected]/token.ts": {
+      name: "@httpland/http-utils",
+      version: "1.1.0",
+      subPath: "token.js",
+    },
   },
 });

deno.lock

@@ -7,3 +7,5 @@ export { head } from "https://deno.land/x/[email protected]/head.ts";
 export { isString } from "https://deno.land/x/[email protected]/is_string.ts";
 export { isNullable } from "https://deno.land/x/[email protected]/is_nullable.ts";
 export { mapValues } from "https://deno.land/[email protected]/collections/map_values.ts";
+export { isQuotedString } from "https://deno.land/x/[email protected]/quoted_string.ts";
+export { isToken } from "https://deno.land/x/[email protected]/token.ts";

deps.ts

@@ -1,8 +1,15 @@
 // Copyright 2023-latest the httpland authors. All rights reserved. MIT license.
 // This module is browser compatible.
 
-import { isNullable, isString, mapValues, toLowerCase } from "./deps.ts";
-import { duplicate } from "./utils.ts";
+import {
+  isNullable,
+  isQuotedString,
+  isString,
+  isToken,
+  mapValues,
+  toLowerCase,
+} from "./deps.ts";
+import { assertToken, assertToken68, duplicate } from "./utils.ts";
 import { Msg } from "./constants.ts";
 import type { Authorization, AuthParams } from "./types.ts";
 
@@ -47,41 +54,6 @@ export function stringifyAuthorization(input: AuthorizationLike): string {
   return [input.authScheme, data].filter(Boolean).join(" ");
 }
 
-const reToken = /^(?=([\w!#$%&'*+.^`|~-]+))\1$/;
-
-export function assertToken(
-  input: string,
-  msg?: string,
-  constructor: ErrorConstructor = Error,
-): asserts input {
-  if (!isToken(input)) throw new constructor(msg);
-}
-
-export function isToken(input: string): boolean {
-  return reToken.test(input);
-}
-
-const reToken68 = /^(?=((?:[A-Za-z]|\d|[+./_~-])+))\1(?=(=*))\2$/;
-
-export function isToken68(input: string): boolean {
-  return reToken68.test(input);
-}
-
-export function assertToken68(
-  input: string,
-  msg?: string,
-  constructor: ErrorConstructor = Error,
-): asserts input {
-  if (!isToken68(input)) throw new constructor(msg);
-}
-
-const reQuotedString =
-  /^"(?=((?:\t| |!|[ \x23-\x5B\x5D-\x7E]|[\x80-\xFF]|\\(?:\t| |[\x21-\x7E]|[\x80-\xFF]))*))\1"$/;
-
-export function isQuotedString(input: string): boolean {
-  return reQuotedString.test(input);
-}
-
 function assertAuthParam(input: AuthParams): asserts input {
   for (const key in input) {
     assertToken(key, `token key ${Msg.InvalidToken}`);

stringify.ts

@@ -1,7 +1,7 @@
 // Copyright 2023-latest the httpland authors. All rights reserved. MIT license.
 // This module is browser compatible.
 
-import { trim } from "./deps.ts";
+import { isToken, trim } from "./deps.ts";
 
 export function duplicate<T>(list: readonly T[]): T[] {
   const duplicates = new Set<T>();
@@ -24,3 +24,34 @@ export function parseList(input: string): string[] {
     .map(trim)
     .filter(Boolean);
 }
+
+/**
+ * ```abnf
+ * token68 = 1*( ALPHA / DIGIT /
+ *           "-" / "." / "_" / "~" / "+" / "/" ) *"="
+ * ```
+ */
+const reToken68 = /^[\w.~+/-]+?=*?$/;
+
+/** Whether the input is [token68](https://www.rfc-editor.org/rfc/rfc9110.html#section-11.2-2) or not. */
+export function isToken68(input: string): boolean {
+  return reToken68.test(input);
+}
+
+/** Assert the input is [token68](https://www.rfc-editor.org/rfc/rfc9110.html#section-11.2-2). */
+export function assertToken68(
+  input: string,
+  msg?: string,
+  constructor: ErrorConstructor = Error,
+): asserts input {
+  if (!isToken68(input)) throw new constructor(msg);
+}
+
+/** Assert the input is [token](https://www.rfc-editor.org/rfc/rfc9110.html#section-5.6.2-2). */
+export function assertToken(
+  input: string,
+  msg?: string,
+  constructor: ErrorConstructor = Error,
+): asserts input {
+  if (!isToken(input)) throw new constructor(msg);
+}

utils.ts

@@ -1,5 +1,12 @@
-import { parseList } from "./utils.ts";
-import { assertEquals, describe, it } from "./_dev_deps.ts";
+import { assertToken, assertToken68, isToken68, parseList } from "./utils.ts";
+import {
+  assert,
+  assertEquals,
+  assertFalse,
+  assertThrows,
+  describe,
+  it,
+} from "./_dev_deps.ts";
 
 describe("parseList", () => {
   it("should return", () => {
@@ -67,3 +74,65 @@ describe("parseList", () => {
     });
   });
 });
+
+describe("isToken68", () => {
+  it("should return true", () => {
+    const table: string[] = [
+      "a",
+      "abcdefghijklmnopqrstuvwxyz",
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+      "0123456789",
+      "~",
+      "+",
+      "/",
+      "-",
+      "_",
+      ".",
+      "a=",
+      "a===========",
+    ];
+
+    table.forEach((input) => {
+      assert(isToken68(input));
+    });
+  });
+
+  it("should return false", () => {
+    const table: string[] = [
+      "",
+      " ",
+      " a",
+      "=",
+      "あ",
+      ":",
+      "`",
+      "a=a",
+    ];
+
+    table.forEach((input) => {
+      assertFalse(isToken68(input));
+    });
+  });
+});
+
+describe("assertToken68", () => {
+  it("should return void if the input is valid token68", () => {
+    assertFalse(assertToken68("a=="));
+  });
+
+  it("should throw error if the input is invalid token68", () => {
+    assertThrows(() => assertToken68(""));
+    assertThrows(() => assertToken68("?"));
+  });
+});
+
+describe("assertToken", () => {
+  it("should return void if the input is valid token", () => {
+    assertFalse(assertToken("a"));
+  });
+
+  it("should throw error if the input is invalid token", () => {
+    assertThrows(() => assertToken(""));
+    assertThrows(() => assertToken("a=="));
+  });
+});