chore: refactor

Author: jaworek

src/characterClasses.ts

@@ -1,5 +1,5 @@
 import type { Any, Digit, Whitespace, Word } from './types';
-import type { CompilerMap } from './types-internal';
+import type { CharacterClassCompilerMap } from './types-internal';
 
 export const whitespace: Whitespace = { type: 'whitespace' };
 
@@ -14,4 +14,4 @@ export const compilers = {
   digit: '\\d',
   word: '\\w',
   any: '.',
-} satisfies CompilerMap;
+} satisfies CharacterClassCompilerMap;

src/compiler.ts

@@ -34,26 +34,26 @@ function compileSingle(elements: RegexElement): string {
     return elements;
   }
 
-  if ('children' in elements) {
-    const compiledChildren = compileList(elements.children);
+  if (!('children' in elements)) {
+    const characterCompiler = characterClasses[elements.type];
 
-    if (elements.type === 'repeat') {
-      return compileRepeat(elements.config, compiledChildren);
+    if (!characterCompiler) {
+      throw new Error(`Unknown character type ${elements.type}`);
     }
 
-    const elementCompiler = quantifiers[elements.type];
-    if (!elementCompiler) {
-      throw new Error(`Unknown elements type ${elements.type}`);
-    }
-
-    return elementCompiler(compiledChildren);
+    return characterCompiler;
   }
 
-  const characterCompiler = characterClasses[elements.type];
+  const compiledChildren = compileList(elements.children);
+
+  if (elements.type === 'repeat') {
+    return compileRepeat(elements.config, compiledChildren);
+  }
 
-  if (!characterCompiler) {
-    throw new Error(`Unknown character type ${elements.type}`);
+  const elementCompiler = quantifiers[elements.type];
+  if (!elementCompiler) {
+    throw new Error(`Unknown elements type ${elements.type}`);
   }
 
-  return characterCompiler;
+  return elementCompiler(compiledChildren);
 }

src/types-internal.ts

@@ -1,5 +1,6 @@
 // Compilation
 export type ElementCompiler = (compiledChildren: string) => string;
-export type CompilerMap =
-  | Record<string, ElementCompiler>
-  | Record<string, string>;
+
+export type CompilerMap = Record<string, ElementCompiler>;
+
+export type CharacterClassCompilerMap = Record<string, string>;