@globalbrain/sefirot 4.31.0 → 4.32.0

package/lib/validation/validators/beforeOrEqual.ts

@@ -1,9 +1,5 @@
 import { type Day, isDay } from '../../support/Day'
 
 export function beforeOrEqual(value: unknown, date: Day): boolean {
-  if (!isDay(value) || !isDay(date)) {
-    return false
-  }
-
-  return value.isBefore(date) || value.isSame(date)
+  return isDay(value) && isDay(date) && (value.isBefore(date, 'day') || value.isSame(date, 'day'))
 }

package/lib/validation/validators/decimal.ts

@@ -1,11 +1,9 @@
-import { isNumber, isString } from '../../support/Utils'
-
-const regExp = /^[-]?\d*(\.\d+)?$/
-
 export function decimal(value: unknown): boolean {
-  if (!(isString(value) || isNumber(value))) {
-    return false
-  }
-
-  return regExp.test(String(value))
+  const num = Number(value)
+  return (
+    !Number.isNaN(num)
+    && num >= Number.MIN_SAFE_INTEGER
+    && num <= Number.MAX_SAFE_INTEGER
+    && num.toString() === value?.toString().replace(/(?:(\.\d*[1-9])|\.)0+$/, '$1')
+  )
 }

package/lib/validation/validators/email.ts

@@ -1,12 +1,8 @@
-import { isString } from '../../support/Utils'
+export const hostnameRE = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*?\.(?:xn--[a-z0-9-]{2,59}|[a-z]{2,63})\.?$/i
 
-/* eslint-disable-next-line no-control-regex */
-const regExp = /^(?:[A-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[A-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|[\x01-\x09\x0B\x0C\x0E-\x7F])*")@(?:(?:[a-z0-9](?:[a-z0-9-_]*[a-z0-9])?\.)+[a-z0-9]{2,}(?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21-\x5A\x53-\x7F]|\\[\x01-\x09\x0B\x0C\x0E-\x7F])+)\])$/i
+// https://colinhacks.com/essays/reasonable-email-regex
+const emailRE = new RegExp(`^(?!\\.)(?!.+\\.\\.)[\\w'+\\-.]*[\\w'+\\-]@${hostnameRE.source.slice(1)}`, 'i')
 
 export function email(value: unknown): boolean {
-  if (!isString(value)) {
-    return false
-  }
-
-  return regExp.test(value)
+  return typeof value === 'string' && emailRE.test(value)
 }

package/lib/validation/validators/fileExtension.ts

@@ -1,20 +1,12 @@
-import { getExtension } from '../../support/File'
-import { isFile } from '../../support/Utils'
-
 export function fileExtension(value: unknown, extensions: string[]): boolean {
-  if (!isFile(value)) {
-    return false
-  }
+  if (!(value instanceof File)) { return false }
 
-  const fileExtension = getExtension(value)
+  extensions = extensions.map((ext) => ext.toLowerCase())
+  const fileExtension = value.name.split('.').pop()!.toLowerCase()
 
-  return extensions.some((extension) => {
-    // If the extention option is `jpg`, we'll consider other variants such as
-    // `JPG`, `jpeg`, or `JPEG` to be valid as well for the sake of simplicity.
-    if (extension === 'jpg') {
-      return ['jpg', 'jpeg', 'JPG', 'JPEG'].includes(fileExtension)
-    }
+  if (fileExtension === 'jpg' || fileExtension === 'jpeg') {
+    return extensions.includes('jpg') || extensions.includes('jpeg')
+  }
 
-    return fileExtension === extension
-  })
+  return extensions.includes(fileExtension)
 }

package/lib/validation/validators/hms.ts

@@ -1,21 +1,32 @@
-import { HmsMap, type HmsType, isHms } from '../../support/Day'
+import { type HmsType } from '../../support/Day'
+import { isObject } from '../../support/Utils'
 
-export function hms(value: unknown, required: HmsType[] = ['h', 'm', 's']): boolean {
-  if (!isHms(value, required)) {
-    return false
-  }
+const hourRE = /^(?:[01]?\d|2[0-3])$/
+const minuteAndSecondRE = /^[0-5]?\d$/
 
-  return required.every((r) => {
-    const _value = value[HmsMap[r]]
+export function hms(
+  value: unknown,
+  required: HmsType[] = ['h', 'm', 's'],
+  rejectNull = false
+): boolean {
+  if (!isObject(value)) { return false }
 
-    if (_value === null) {
-      return true
-    }
+  const { hour, minute, second } = value
+  const requiredSet = new Set(required)
 
-    const valueAsNumber = Number(_value)
+  return (
+    isValidPart(hour, requiredSet.has('h'), hourRE)
+    && isValidPart(minute, requiredSet.has('m'), minuteAndSecondRE)
+    && isValidPart(second, requiredSet.has('s'), minuteAndSecondRE)
+  )
 
-    return (r === 'h')
-      ? (valueAsNumber >= 0 && valueAsNumber < 24)
-      : (valueAsNumber >= 0 && valueAsNumber < 60)
-  })
+  function isValidPart(
+    v: unknown,
+    req: boolean,
+    re: RegExp
+  ): v is string | null | undefined {
+    if (v === undefined) { return !req }
+    if (v === null) { return !rejectNull || !req }
+    return typeof v === 'string' && re.test(v)
+  }
 }

package/lib/validation/validators/index.ts

@@ -18,10 +18,8 @@ export * from './month'
 export * from './negativeInteger'
 export * from './positiveInteger'
 export * from './required'
-export * from './requiredHms'
 export * from './requiredHmsIf'
 export * from './requiredIf'
-export * from './requiredYmd'
 export * from './requiredYmdIf'
 export * from './slackChannelName'
 export * from './url'

package/lib/validation/validators/maxFileSize.ts

@@ -1,17 +1,7 @@
-import { isFile } from '../../support/Utils'
-
 export function maxFileSize(value: unknown, size: string): boolean {
-  if (!isFile(value)) {
-    return false
-  }
+  if (!(value instanceof File)) { return false }
 
-  const factor = /gb/i.test(size)
-    ? 1e9
-    : /mb/i.test(size)
-      ? 1e6
-      : /kb/i.test(size)
-        ? 1e3
-        : 1
+  const factor = /gb/i.test(size) ? 1e9 : /mb/i.test(size) ? 1e6 : /kb/i.test(size) ? 1e3 : 1
 
-  return value.size <= factor * +size.replace(/[^\d\.]/g, '')
+  return value.size <= factor * Number.parseFloat(size.replace(/[^\d.]/g, ''))
 }

package/lib/validation/validators/maxLength.ts

@@ -1,9 +1,3 @@
-import { isString } from '../../support/Utils'
-
 export function maxLength(value: unknown, length: number): boolean {
-  if (!(isString(value) || Array.isArray(value))) {
-    return false
-  }
-
-  return value.length <= length
+  return (typeof value === 'string' || Array.isArray(value)) && value.length <= length
 }

package/lib/validation/validators/maxTotalFileSize.ts

@@ -1,31 +1,8 @@
-import { isFile } from '../../support/Utils'
-
-/**
- * Validates if the total size of the given files is smaller than the
- * given size.
- */
 export function maxTotalFileSize(value: unknown, size: string): boolean {
-  if (!isArrayOfFiles(value)) {
-    return false
-  }
-
-  if (value.length === 0) {
-    return true
-  }
-
-  const factor = /gb/i.test(size)
-    ? 1e9
-    : /mb/i.test(size)
-      ? 1e6
-      : /kb/i.test(size)
-        ? 1e3
-        : 1
+  if (!Array.isArray(value) || value.some((v) => !(v instanceof File))) { return false }
 
+  const factor = /gb/i.test(size) ? 1e9 : /mb/i.test(size) ? 1e6 : /kb/i.test(size) ? 1e3 : 1
   const total = value.reduce((total, file) => total + file.size, 0)
 
-  return total <= factor * +size.replace(/[^\d\.]/g, '')
-}
-
-function isArrayOfFiles(value: unknown): value is File[] {
-  return Array.isArray(value) && value.every((v) => isFile(v))
+  return total <= factor * Number.parseFloat(size.replace(/[^\d.]/g, ''))
 }

package/lib/validation/validators/maxValue.ts

@@ -1,9 +1,5 @@
-import { isDate, isNumber, isString } from '../../support/Utils'
+import { decimal } from './decimal'
 
 export function maxValue(value: unknown, max: number) {
-  if (isNumber(value) || isString(value) || isDate(value)) {
-    return +value <= max
-  }
-
-  return false
+  return (decimal(value) || value instanceof Date) && Number(value) <= max
 }

package/lib/validation/validators/minLength.ts

@@ -1,9 +1,3 @@
-import { isString } from '../../support/Utils'
-
 export function minLength(value: unknown, length: number): boolean {
-  if (!(isString(value) || Array.isArray(value))) {
-    return false
-  }
-
-  return value.length >= length
+  return (typeof value === 'string' || Array.isArray(value)) && value.length >= length
 }

package/lib/validation/validators/minValue.ts

@@ -1,9 +1,5 @@
-import { isDate, isNumber, isString } from '../../support/Utils'
+import { decimal } from './decimal'
 
 export function minValue(value: unknown, min: number) {
-  if (isNumber(value) || isString(value) || isDate(value)) {
-    return +value >= min
-  }
-
-  return false
+  return (decimal(value) || value instanceof Date) && Number(value) >= min
 }

package/lib/validation/validators/month.ts

@@ -1,9 +1,3 @@
-import { isNumber } from '../../support/Utils'
-
 export function month(value: unknown): boolean {
-  if (!isNumber(value)) {
-    return false
-  }
-
-  return value > 0 && value < 13
+  return Number.isInteger(value) && value > 0 && value < 13
 }

package/lib/validation/validators/negativeInteger.ts

@@ -1,9 +1,3 @@
-import { isNumber } from '../../support/Utils'
-
 export function negativeInteger(value: unknown): boolean {
-  if (!isNumber(value)) {
-    return false
-  }
-
-  return Number.isInteger(value) && value < 0
+  return Number.isInteger(value) && value < 0 && value >= Number.MIN_SAFE_INTEGER
 }

package/lib/validation/validators/positiveInteger.ts

@@ -1,9 +1,3 @@
-import { isNumber } from '../../support/Utils'
-
 export function positiveInteger(value: unknown): boolean {
-  if (!isNumber(value)) {
-    return false
-  }
-
-  return Number.isInteger(value) && value > 0
+  return Number.isInteger(value) && value > 0 && value <= Number.MAX_SAFE_INTEGER
 }

package/lib/validation/validators/required.ts

@@ -1,29 +1,6 @@
-import { isDate, isString } from '../../support/Utils'
-
-export function required(value: unknown): boolean {
-  if (isString(value)) {
-    value = value.trim()
-  }
-
-  return _required(value)
-}
-
-export function _required(value: unknown): boolean {
-  if (Array.isArray(value)) {
-    return !!value.length
-  }
-
-  if (value == null) {
-    return false
-  }
-
-  if (value === false) {
-    return true
-  }
-
-  if (isDate(value)) {
-    return !Number.isNaN(value.getTime())
-  }
-
-  return !!String(value).length
+export function required(value: unknown, trim = true): boolean {
+  if (value == null) { return false }
+  if (typeof value === 'number' || value instanceof Date) { return !Number.isNaN(+value) }
+  if (Array.isArray(value)) { return !!value.length }
+  return trim ? !!String(value).trim() : !!String(value)
 }

package/lib/validation/validators/requiredHmsIf.ts

@@ -1,19 +1,17 @@
 import { type HmsType } from '../../support/Day'
-import { requiredHms } from './requiredHms'
+import { hms } from './hms'
 import { type RequiredIfCondition } from './requiredIf'
 
-export async function requiredHmsIf(value: unknown, condition: RequiredIfCondition, required: HmsType[] = ['h', 'm', 's']): Promise<boolean> {
-  if (typeof condition === 'boolean' && condition) {
-    return requiredHms(value, required)
-  }
-
-  if (typeof condition === 'string' && condition) {
-    return requiredHms(value, required)
-  }
-
-  if (typeof condition === 'function' && (await condition())) {
-    return requiredHms(value, required)
-  }
+export async function requiredHmsIf(
+  value: unknown,
+  condition: RequiredIfCondition,
+  required: HmsType[] = ['h', 'm', 's']
+): Promise<boolean> {
+  if (
+    (typeof condition === 'boolean' && condition)
+    || (typeof condition === 'string' && condition)
+    || (typeof condition === 'function' && (await condition()))
+  ) { return hms(value, required, true) }
 
   return true
 }

package/lib/validation/validators/requiredIf.ts

@@ -3,17 +3,11 @@ import { required } from './required'
 export type RequiredIfCondition = boolean | string | (() => boolean) | (() => Promise<boolean>)
 
 export async function requiredIf(value: unknown, condition: RequiredIfCondition): Promise<boolean> {
-  if (typeof condition === 'boolean' && condition) {
-    return required(value)
-  }
-
-  if (typeof condition === 'string' && condition) {
-    return required(value)
-  }
-
-  if (typeof condition === 'function' && (await condition())) {
-    return required(value)
-  }
+  if (
+    (typeof condition === 'boolean' && condition)
+    || (typeof condition === 'string' && condition)
+    || (typeof condition === 'function' && (await condition()))
+  ) { return required(value) }
 
   return true
 }

package/lib/validation/validators/requiredYmdIf.ts

@@ -1,19 +1,17 @@
 import { type YmdType } from '../../support/Day'
 import { type RequiredIfCondition } from './requiredIf'
-import { requiredYmd } from './requiredYmd'
+import { ymd } from './ymd'
 
-export async function requiredYmdIf(value: unknown, condition: RequiredIfCondition, required: YmdType[] = ['y', 'm', 'd']): Promise<boolean> {
-  if (typeof condition === 'boolean' && condition) {
-    return requiredYmd(value, required)
-  }
-
-  if (typeof condition === 'string' && condition) {
-    return requiredYmd(value, required)
-  }
-
-  if (typeof condition === 'function' && (await condition())) {
-    return requiredYmd(value, required)
-  }
+export async function requiredYmdIf(
+  value: unknown,
+  condition: RequiredIfCondition,
+  required: YmdType[] = ['y', 'm', 'd']
+): Promise<boolean> {
+  if (
+    (typeof condition === 'boolean' && condition)
+    || (typeof condition === 'string' && condition)
+    || (typeof condition === 'function' && (await condition()))
+  ) { return ymd(value, required, true) }
 
   return true
 }

package/lib/validation/validators/slackChannelName.ts

@@ -1,16 +1,16 @@
-import { isString } from '../../support/Utils'
-
 export interface SlackChannelNameOptions {
   offset?: number
 }
 
-export function slackChannelName(value: unknown, options: SlackChannelNameOptions = {}): boolean {
-  if (!isString(value)) {
-    return false
-  }
-
-  const { offset = 0 } = options
-  const maxLength = /* Slack channel name max length */ 80 - offset
-
-  return new RegExp(`^[\\p{Ll}\\p{Lm}\\p{Lo}\\p{M}\\p{N}_-]{1,${maxLength}}$`, 'u').test(value)
+export function slackChannelName(
+  value: unknown,
+  { offset = 0 }: SlackChannelNameOptions = {}
+): boolean {
+  return (
+    typeof value === 'string'
+    && /^[\p{L}\p{N}\p{M}_-]+$/u.test(value)
+    && /\p{L}|\p{N}/u.test(value)
+    && value.length <= 80 - offset
+    && value.toLowerCase() === value
+  )
 }

package/lib/validation/validators/url.ts

@@ -1,11 +1,13 @@
-import { isString } from '../../support/Utils'
+import { hostnameRE } from './email'
 
-const regExp = /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00A1-\uFFFF][a-z0-9\u00A1-\uFFFF_-]{0,62})?[a-z0-9\u00A1-\uFFFF]\.)+(?:[a-z\u00A1-\uFFFF]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i
+const protocolRE = /^https?:$/i
 
 export function url(value: unknown): boolean {
-  if (!isString(value)) {
+  if (typeof value !== 'string') { return false }
+  try {
+    const url = new URL(value)
+    return protocolRE.test(url.protocol) && hostnameRE.test(url.hostname)
+  } catch {
     return false
   }
-
-  return regExp.test(value)
 }

package/lib/validation/validators/ymd.ts

@@ -1,32 +1,38 @@
-import day from 'dayjs'
-import { YmdMap, type YmdType, isYmd } from '../../support/Day'
-
-export function ymd(value: unknown, required: YmdType[] = ['y', 'm', 'd']): boolean {
-  if (!isYmd(value, required)) {
-    return false
+import { type YmdType } from '../../support/Day'
+import { isObject } from '../../support/Utils'
+
+export function ymd(
+  value: unknown,
+  required: YmdType[] = ['y', 'm', 'd'],
+  rejectNull = false
+): boolean {
+  if (!isObject(value)) { return false }
+
+  const { year, month, date } = value
+  const requiredSet = new Set(required)
+
+  if (
+    !isValidPart(year, requiredSet.has('y'), 1000, 2999)
+    || !isValidPart(month, requiredSet.has('m'), 1, 12)
+    || !isValidPart(date, requiredSet.has('d'), 1, 31)
+  ) { return false }
+
+  const now = new Date()
+  const y = year ?? now.getFullYear()
+  const m = month ?? (year ? 1 : now.getMonth() + 1)
+  const d = date ?? (year || month ? 1 : now.getDate())
+
+  const dt = new Date(y, m - 1, d)
+  return dt.getFullYear() === y && dt.getMonth() === m - 1 && dt.getDate() === d
+
+  function isValidPart(
+    v: unknown,
+    req: boolean,
+    min: number,
+    max: number
+  ): v is number | null | undefined {
+    if (v === undefined) { return !req }
+    if (v === null) { return !rejectNull || !req }
+    return Number.isInteger(v) && v >= min && v <= max
   }
-
-  return required.every((r) => {
-    const _value = value[YmdMap[r]]
-
-    if (_value === null) {
-      return true
-    }
-
-    if (r === 'y') {
-      return _value > 0 && _value <= 9999
-    }
-
-    if (r === 'm') {
-      return _value > 0 && _value <= 12
-    }
-
-    const d = day(new Date(2020, value.month ? value.month - 1 : 1, _value))
-
-    if (d.month() + 1 !== (value.month ?? 1)) {
-      return false
-    }
-
-    return d.isValid()
-  })
 }