house keeping

Author: SKairinos

src/utils/schema.ts

@@ -42,27 +42,29 @@ export function numericId(schema: NumberSchema = YupNumber()) {
 // Limited Character Sets
 // -----------------------------------------------------------------------------
 
-export function limitCharSet(
+export function matchesCharSet(
   charSet: string,
   message: string,
   schema: StringSchema = YupString(),
 ) {
   return schema.matches(new RegExp(`^[${charSet}]*$`), message)
 }
 
-type CharSetOptions = Partial<{
+export type BuildCharSetOptions = Partial<{
   schema: StringSchema
   spaces: boolean
   specialChars: string
 }>
 
-function charSet(
+export function buildCharSet(
   charSet: string,
-  message: string,
-  options: CharSetOptions = {},
+  description: string,
+  options: BuildCharSetOptions = {},
 ) {
   const { schema, spaces = false, specialChars } = options
 
+  let message = `can only contain: ${description}`
+
   if (spaces) {
     charSet += " "
     message += ", spaces"
@@ -72,57 +74,45 @@ function charSet(
     message += `, special characters (${specialChars})`
   }
 
-  return limitCharSet(charSet, message, schema)
+  return matchesCharSet(charSet, message, schema)
 }
 
-export function alphaString(options?: CharSetOptions) {
-  return charSet(
-    "a-zA-Z",
-    "can only contain alpha characters (a-z, A-Z)",
-    options,
-  )
+export function alphaString(options?: BuildCharSetOptions) {
+  return buildCharSet("a-zA-Z", "alpha characters (a-z, A-Z)", options)
 }
 
-export function lowercaseAlphaString(options?: CharSetOptions) {
-  return charSet(
-    "a-z",
-    "can only contain lowercase alpha characters (a-z)",
-    options,
-  )
+export function lowercaseAlphaString(options?: BuildCharSetOptions) {
+  return buildCharSet("a-z", "lowercase alpha characters (a-z)", options)
 }
 
-export function lowercaseAlphanumericString(options?: CharSetOptions) {
-  return charSet(
+export function lowercaseAlphanumericString(options?: BuildCharSetOptions) {
+  return buildCharSet(
     "a-z0-9",
-    "can only contain lowercase alphanumeric characters (a-z, 0-9)",
+    "lowercase alphanumeric characters (a-z, 0-9)",
     options,
   )
 }
 
-export function uppercaseAlphaString(options?: CharSetOptions) {
-  return charSet(
-    "A-Z",
-    "can only contain uppercase alpha characters (A-Z)",
-    options,
-  )
+export function uppercaseAlphaString(options?: BuildCharSetOptions) {
+  return buildCharSet("A-Z", "uppercase alpha characters (A-Z)", options)
 }
 
-export function uppercaseAlphanumericString(options?: CharSetOptions) {
-  return charSet(
+export function uppercaseAlphanumericString(options?: BuildCharSetOptions) {
+  return buildCharSet(
     "A-Z0-9",
-    "can only contain uppercase alphanumeric characters (A-Z, 0-9)",
+    "uppercase alphanumeric characters (A-Z, 0-9)",
     options,
   )
 }
 
-export function numericString(options?: CharSetOptions) {
-  return charSet("0-9", "can only contain numbers (0-9)", options)
+export function numericString(options?: BuildCharSetOptions) {
+  return buildCharSet("0-9", "numbers (0-9)", options)
 }
 
-export function alphanumericString(options?: CharSetOptions) {
-  return charSet(
+export function alphanumericString(options?: BuildCharSetOptions) {
+  return buildCharSet(
     "a-zA-Z0-9",
-    "can only contain alphanumeric characters (a-z, A-Z, 0-9)",
+    "alphanumeric characters (a-z, A-Z, 0-9)",
     options,
   )
 }