perf(parse): simplify regex pattern

Author: TomokiMiyauci

_abnf.ts

@@ -1,26 +1,13 @@
-import {
-  atomic,
-  either,
-  maybe,
-  namedCapture,
-  sequence,
-  suffix,
-} from "npm:compose-regexp";
+import { either, namedCapture, sequence, suffix } from "npm:compose-regexp";
 import { optimize } from "https://esm.sh/regexp-tree";
 
 const tchar = /[!#$%&'*+.^_`|~\dA-Za-z-]/;
-const token = atomic(suffix("+", tchar));
+const token = suffix("+", tchar);
 const SP = / /;
 
 const OWS = /[ \t]*/;
 const BWS = OWS;
 
-const element = sequence(
-  atomic(
-    maybe(atomic(/.*?/), atomic(suffix("*", OWS, ",", OWS, maybe(/.*?/)))),
-  ),
-);
-
 const DQUOTE = /"/;
 const obsText = /[\x80-\xFF]/;
 const HTAB = /\t/;
@@ -30,7 +17,7 @@ const quotedPair = sequence("\\", either(HTAB, SP, VCHAR, obsText));
 
 const quotedString = sequence(
   DQUOTE,
-  atomic(suffix("*", either(qdtext, quotedPair))),
+  suffix("*", either(qdtext, quotedPair)),
   DQUOTE,
 );
 
@@ -46,6 +33,5 @@ const authParam = sequence(
 );
 
 if (import.meta.main) {
-  console.log("element: ", element);
   console.log("authParam: ", optimize(authParam).toRegExp());
 }

deps.ts

@@ -6,7 +6,13 @@ 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";
+export {
+  isQuotedString,
+  type QuotedString,
+} from "https://deno.land/x/[email protected]/quoted_string.ts";
+export {
+  isToken,
+  type Token,
+} from "https://deno.land/x/[email protected]/token.ts";
 export { parseListFields } from "https://deno.land/x/[email protected]/list.ts";
 export { default as escapeStringRegExp } from "https://esm.sh/[email protected]?pin=v118";

parse.ts

@@ -7,6 +7,8 @@ import {
   isString,
   isToken,
   parseListFields,
+  type QuotedString,
+  type Token,
   toLowerCase,
 } from "./deps.ts";
 import { Msg } from "./constants.ts";
@@ -64,37 +66,20 @@ export function parseAuthorization(input: string): Authorization {
   return { authScheme, params };
 }
 
-/** Generate from _abnf.ts. */
-const reAuthParam =
-  /^(?<key>(?=([\w!#$%&'*+.^`|~-]+))\2)[\t ]*=[\t ]*(?:(?<token>(?=([\w!#$%&'*+.^`|~-]+))\4)|(?<quotedString>"(?=((?:\t| |!|[ \x23-\x5B\x5D-\x7E]|[\x80-\xFF]|\\(?:\t| |[\x21-\x7E]|[\x80-\xFF]))*))\6"))$/;
-
 type AuthParamGroups =
   & { key: string }
   & ({ token: string; quotedString: never } | {
     token: never;
     quotedString: string;
   });
 
-/** Parse string into {@link AuthParam}.
+/** Parse string into {@link AuthParams}.
  * @throws {SyntaxError} It the input is invalid [auth-param](https://www.rfc-editor.org/rfc/rfc9110.html#section-11.2-5).
  * @throws {Error} If the auth param key is duplicated.
  */
 export function parseAuthParams(input: string): AuthParams {
   const list = parseListFields(input);
-
-  const entries = list.map((el) => {
-    const result = reAuthParam.exec(el);
-
-    if (!result || !result.groups) throw new SyntaxError(Msg.InvalidSyntax);
-
-    const groups = result.groups as AuthParamGroups;
-    const value = isString(groups.token)
-      ? groups.token
-      : groups.quotedString.replace(/\\(.)/g, "$1");
-
-    return [groups.key, value] as const;
-  });
-
+  const entries = list.map(parseAuthParam);
   const duplicates = duplicate(
     entries
       .map<string>(head)
@@ -105,3 +90,25 @@ export function parseAuthParams(input: string): AuthParams {
 
   return Object.fromEntries(entries);
 }
+
+type AuthParam = [key: string, value: Token | QuotedString];
+
+/** Generate from _abnf.ts. */
+const reAuthParam =
+  /^(?<key>[\w!#$%&'*+.^`|~-]+?)[\t ]*?=[\t ]*?(?:(?<token>[\w!#$%&'*+.^`|~-]+?)|(?<quotedString>"(?:\t| |!|[ \x23-\x5B\x5D-\x7E]|[\x80-\xFF]|\\(?:\t| |[\x21-\x7E]|[\x80-\xFF]))*?"))$/;
+
+/** Parse string into {@link AuthParam}.
+ * @throws {SyntaxError} It the input is invalid [auth-param](https://www.rfc-editor.org/rfc/rfc9110.html#section-11.2-5).
+ */
+function parseAuthParam(input: string): AuthParam {
+  const result = reAuthParam.exec(input);
+
+  if (!result || !result.groups) throw new SyntaxError(Msg.InvalidSyntax);
+
+  const groups = result.groups as AuthParamGroups;
+  const value = isString(groups.token)
+    ? groups.token as Token
+    : groups.quotedString.replace(/\\(.)/g, "$1") as QuotedString;
+
+  return [groups.key as Token, value];
+}