refactor: minify precedence

Author: mdjastrzebski

src/constructs/anchors.ts

@@ -4,31 +4,31 @@ import type { EncodedRegex } from '../types';
  * Start of string anchor. Matches the start of of string. In `multiline` mode, also matches immediately following a newline.
  */
 export const startOfString: EncodedRegex = {
-  k: 'atom',
+  k: 0,
   p: '^',
 };
 
 /**
  * End of string anchor. Matches the end of a string. In `multiline` mode, also matches immediately preceding a newline.
  */
 export const endOfString: EncodedRegex = {
-  k: 'atom',
+  k: 0,
   p: '$',
 };
 
 /**
  * Word boundary anchor. Matches the position where one side is a word character (alphanumeric or underscore) and the other side is a non-word character (anything else).
  */
 export const wordBoundary: EncodedRegex = {
-  k: 'atom',
+  k: 0,
   p: '\\b',
 };
 
 /**
  * Non-word boundary anchor. Matches the position where both sides are word characters.
  */
 export const nonWordBoundary: EncodedRegex = {
-  k: 'atom',
+  k: 0,
   p: '\\B',
 };
 

src/constructs/capture.ts

@@ -21,13 +21,13 @@ export function capture(sequence: RegexSequence, options?: CaptureOptions): Enco
   const name = options?.name;
   if (name) {
     return {
-      k: 'atom',
+      k: 0,
       p: `(?<${name}>${encode(sequence).p})`,
     };
   }
 
   return {
-    k: 'atom',
+    k: 0,
     p: `(${encode(sequence).p})`,
   };
 }
@@ -43,7 +43,7 @@ export function capture(sequence: RegexSequence, options?: CaptureOptions): Enco
  */
 export function ref(name: string): Reference {
   return {
-    k: 'atom',
+    k: 0,
     p: `\\k<${name}>`,
     name,
   };

src/constructs/char-class.ts

@@ -81,7 +81,7 @@ function encodeCharClass(
   isNegated?: boolean,
 ): EncodedRegex {
   return {
-    k: 'atom',
+    k: 0,
     p: `[${isNegated ? '^' : ''}${this.e.join('')}]`,
   };
 }

src/constructs/char-escape.ts

@@ -5,15 +5,15 @@ import type { CharacterEscape, EncodedRegex } from '../types';
  * Specifically this one is NOT a character escape.
  */
 export const any: EncodedRegex = {
-  k: 'atom',
+  k: 0,
   p: '.',
 };
 
 /**
  * Matches any digit (0-9).
  */
 export const digit: CharacterEscape = {
-  k: 'atom',
+  k: 0,
   p: '\\d',
   e: ['\\d'],
 };
@@ -22,7 +22,7 @@ export const digit: CharacterEscape = {
  * Matches any non-digit (0-9) character.
  */
 export const nonDigit: CharacterEscape = {
-  k: 'atom',
+  k: 0,
   p: '\\D',
   e: ['\\D'],
 };
@@ -31,7 +31,7 @@ export const nonDigit: CharacterEscape = {
  * Matches any word character (alphanumeric or underscore).
  */
 export const word: CharacterEscape = {
-  k: 'atom',
+  k: 0,
   p: '\\w',
   e: ['\\w'],
 };
@@ -40,7 +40,7 @@ export const word: CharacterEscape = {
  * Matches any non-word (alphanumeric or underscore) character.
  */
 export const nonWord: CharacterEscape = {
-  k: 'atom',
+  k: 0,
   p: '\\W',
   e: ['\\W'],
 };
@@ -49,7 +49,7 @@ export const nonWord: CharacterEscape = {
  * Matches any whitespace character (space, tab, newline, etc.).
  */
 export const whitespace: CharacterEscape = {
-  k: 'atom',
+  k: 0,
   p: '\\s',
   e: ['\\s'],
 };
@@ -58,7 +58,7 @@ export const whitespace: CharacterEscape = {
  * Matches any non-whitespace (space, tab, newline, etc.) character.
  */
 export const nonWhitespace: CharacterEscape = {
-  k: 'atom',
+  k: 0,
   p: '\\S',
   e: ['\\S'],
 };

src/constructs/choice-of.ts

@@ -18,7 +18,7 @@ export function choiceOf(...alternatives: RegexSequence[]): EncodedRegex {
   }
 
   return {
-    k: 'disjunction',
+    k: 2,
     p: encodedAlternatives.map((n) => n.p).join('|'),
   };
 }

src/constructs/lookahead.ts

@@ -17,7 +17,7 @@ import type { EncodedRegex, RegexSequence } from '../types';
  */
 export function lookahead(sequence: RegexSequence): EncodedRegex {
   return {
-    k: 'atom',
+    k: 0,
     p: `(?=${encode(sequence).p})`,
   };
 }

src/constructs/lookbehind.ts

@@ -17,7 +17,7 @@ import type { EncodedRegex, RegexSequence } from '../types';
  */
 export function lookbehind(sequence: RegexSequence): EncodedRegex {
   return {
-    k: 'atom',
+    k: 0,
     p: `(?<=${encode(sequence).p})`,
   };
 }

src/constructs/negative-lookahead.ts

@@ -17,7 +17,7 @@ import type { EncodedRegex, RegexSequence } from '../types';
  */
 export function negativeLookahead(sequence: RegexSequence): EncodedRegex {
   return {
-    k: 'atom',
+    k: 0,
     p: `(?!${encode(sequence).p})`,
   };
 }

src/constructs/negative-lookbehind.ts

@@ -17,7 +17,7 @@ import type { EncodedRegex, RegexSequence } from '../types';
  */
 export function negativeLookbehind(sequence: RegexSequence): EncodedRegex {
   return {
-    k: 'atom',
+    k: 0,
     p: `(?<!${encode(sequence).p})`,
   };
 }

src/constructs/quantifiers.ts

@@ -15,7 +15,7 @@ export interface QuantifierOptions {
 export function zeroOrMore(sequence: RegexSequence, options?: QuantifierOptions): EncodedRegex {
   const elements = ensureElements(sequence);
   return {
-    k: 'sequence',
+    k: 1,
     p: `${encodeAtomic(elements)}*${options?.greedy === false ? '?' : ''}`,
   };
 }
@@ -29,7 +29,7 @@ export function zeroOrMore(sequence: RegexSequence, options?: QuantifierOptions)
 export function oneOrMore(sequence: RegexSequence, options?: QuantifierOptions): EncodedRegex {
   const elements = ensureElements(sequence);
   return {
-    k: 'sequence',
+    k: 1,
     p: `${encodeAtomic(elements)}+${options?.greedy === false ? '?' : ''}`,
   };
 }
@@ -43,7 +43,7 @@ export function oneOrMore(sequence: RegexSequence, options?: QuantifierOptions):
 export function optional(sequence: RegexSequence, options?: QuantifierOptions): EncodedRegex {
   const elements = ensureElements(sequence);
   return {
-    k: 'sequence',
+    k: 1,
     p: `${encodeAtomic(elements)}?${options?.greedy === false ? '?' : ''}`,
   };
 }

src/constructs/repeat.ts

@@ -22,13 +22,13 @@ export function repeat(sequence: RegexSequence, options: RepeatOptions): Encoded
 
   if (typeof options === 'number') {
     return {
-      k: 'sequence',
+      k: 1,
       p: `${encodeAtomic(elements)}{${options}}`,
     };
   }
 
   return {
-    k: 'sequence',
+    k: 1,
     p: `${encodeAtomic(elements)}{${options.min},${options?.max ?? ''}}${
       options.greedy === false ? '?' : ''
     }`,

src/constructs/unicode.ts

@@ -23,7 +23,7 @@ export function unicodeChar(codePoint: number): CharacterEscape {
       : `\\u{${codePoint.toString(16)}}`; // 1-6 digit hex (requires unicode-aware mode)
 
   return {
-    k: 'atom',
+    k: 0,
     p: escape,
     e: [escape],
   };
@@ -50,7 +50,7 @@ export function unicodeProperty(property: string, value?: string): CharacterEsca
   const escape = `\\p{${property}${value ? `=${value}` : ''}}`;
 
   return {
-    k: 'atom',
+    k: 0,
     p: escape,
     e: [escape],
   };

src/encoder.ts

@@ -10,16 +10,16 @@ export function encode(sequence: RegexSequence): EncodedRegex {
   }
 
   return {
-    k: 'sequence',
+    k: 1,
     p: encoded
-      .map((n) => (n.k === 'disjunction' ? encodeAtomic(n) : n.p))
+      .map((n) => (n.k === 2 ? encodeAtomic(n) : n.p))
       .join(''),
   };
 }
 
 export function encodeAtomic(sequence: RegexSequence): string {
   const encoded = encode(sequence);
-  return encoded.k === 'atom' ? encoded.p : `(?:${encoded.p})`;
+  return encoded.k === 0 ? encoded.p : `(?:${encoded.p})`;
 }
 
 function encodeElement(element: RegexElement): EncodedRegex {
@@ -51,7 +51,7 @@ function encodeText(text: string): EncodedRegex {
 
   return {
     // Optimize for single character case
-    k: text.length === 1 ? 'atom' : 'sequence',
+    k: text.length === 1 ? 0 : 1,
     p: escapeText(text),
   };
 }
@@ -61,7 +61,7 @@ function encodeRegExp(regexp: RegExp): EncodedRegex {
 
   return {
     // Encode at safe precedence
-    k: isAtomicPattern(p) ? 'atom' : 'disjunction',
+    k: isAtomicPattern(p) ? 0 : 2,
     p,
   };
 }

src/types.ts

@@ -28,7 +28,7 @@ export interface EncodedRegex {
 /**
  * Precedence of given regex pattern.
  */
-export type EncodePrecedence = 'atom' | 'sequence' | 'disjunction';
+export type EncodePrecedence = 0 | 1 | 2;
 
 /**
  * Regex patter that can be encoded by calling the `encode` method.