✨ Refactor IdHelper to encapsulate options and simplify regex generation; remove unused getIdRegex utility

Author: max-programming

src/id-helper.ts

@@ -12,13 +12,31 @@ export class IdHelper<
 
   constructor(public prefix: P, public options: Partial<Options<S>> = {}) {}
 
-  public generate(): GeneratedId<P, SeparatorOrDefault<S>> {
+  private get optionsOrDefaults() {
     const {
       separator = IdHelper.DEFAULT_SEPARATOR,
       length = IdHelper.DEFAULT_LENGTH,
       customAlphabets = IdHelper.DEFAULT_ALPHABETS,
     } = this.options;
 
+    return {
+      separator,
+      length,
+      customAlphabets,
+    } as Options<S>;
+  }
+
+  public get regex(): RegExp {
+    const { separator, length, customAlphabets } = this.optionsOrDefaults;
+
+    return new RegExp(
+      `^${this.prefix}${separator}[${customAlphabets}]{${length}}$`
+    );
+  }
+
+  public generate(): GeneratedId<P, SeparatorOrDefault<S>> {
+    const { separator, length, customAlphabets } = this.optionsOrDefaults;
+
     const nanoid = customAlphabet(customAlphabets, length);
 
     const id = nanoid();

src/utils.ts

@@ -1,26 +1,14 @@
 import { IdHelper } from "../id-helper";
 import { custom as vCustom } from "valibot";
-import { getIdRegex } from "../utils";
 import type { GeneratedId, SeparatorOrDefault } from "../types";
 
 export function createValibotIdSchema<
   P extends string,
   S extends string | undefined = undefined
 >(idHelper: IdHelper<P, S>) {
-  const {
-    separator = IdHelper.DEFAULT_SEPARATOR,
-    length = IdHelper.DEFAULT_LENGTH,
-    customAlphabets = IdHelper.DEFAULT_ALPHABETS,
-  } = idHelper.options;
-
-  const idRegex = getIdRegex(
-    idHelper.prefix,
-    separator,
-    length,
-    customAlphabets
-  );
+  const { regex } = idHelper;
 
   return vCustom<GeneratedId<P, SeparatorOrDefault<S>>>(val => {
-    return typeof val === "string" && idRegex.test(val);
+    return typeof val === "string" && regex.test(val);
   }, "Invalid ID Format");
 }

src/validators/validbot.ts

@@ -6,15 +6,7 @@ export function createZodIdSchema<
   P extends string,
   S extends string | undefined = undefined
 >(idHelper: IdHelper<P, S>) {
-  const {
-    separator = IdHelper.DEFAULT_SEPARATOR,
-    length = IdHelper.DEFAULT_LENGTH,
-    customAlphabets = IdHelper.DEFAULT_ALPHABETS,
-  } = idHelper.options;
-
-  const regex = new RegExp(
-    `^${idHelper.prefix}${separator}[${customAlphabets}]{${length}}$`
-  );
+  const { regex } = idHelper;
 
   return zodCustom<GeneratedId<P, SeparatorOrDefault<S>>>(val => {
     return typeof val === "string" && regex.test(val);