@globalbrain/sefirot 4.30.1 → 4.32.0

package/lib/support/Utils.ts

@@ -1,49 +1,16 @@
-// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
-// @ts-ignore internal
-import baseGetTag from 'lodash-es/_baseGetTag'
-
-import _isDate from 'lodash-es/isDate'
-import _isError from 'lodash-es/isError'
-import _isNumber from 'lodash-es/isNumber'
-import _isPlainObject from 'lodash-es/isPlainObject'
-import _isString from 'lodash-es/isString'
-
-export function isBlob(value: unknown): value is Blob {
-  return value instanceof Blob || baseGetTag(value) === '[object Blob]'
-}
-
-export function isDate(value: unknown): value is Date {
-  return _isDate(value)
-}
-
-export function isError<T extends Error = Error>(value: unknown): value is T {
-  return _isError(value)
-}
-
-export function isFile(value: unknown): value is File {
-  return value instanceof File || baseGetTag(value) === '[object File]'
-}
-
-export function isFormData(value: unknown): value is FormData {
-  return value instanceof FormData || baseGetTag(value) === '[object FormData]'
-}
-
+/** @deprecated */
 export function isNumber(value: unknown): value is number {
-  return _isNumber(value)
+  return Number.isFinite(value)
 }
 
 export function isObject(value: unknown): value is Record<string, unknown> {
-  return _isPlainObject(value)
-}
-
-export function isRequest(value: unknown): value is Request {
-  return value instanceof Request || baseGetTag(value) === '[object Request]'
-}
+  if (value == null || typeof value !== 'object') { return false }
 
-export function isResponse(value: unknown): value is Response {
-  return value instanceof Response || baseGetTag(value) === '[object Response]'
+  const proto = Object.getPrototypeOf(value)
+  return proto === null || proto === Object.prototype
 }
 
+/** @deprecated */
 export function isString(value: unknown): value is string {
-  return _isString(value)
+  return typeof value === 'string'
 }

package/lib/validation/Rule.ts

@@ -1,7 +1,7 @@
 import { type ValidationRuleWithParams } from '@vuelidate/core'
 import { type MessageProps as VMessageProps, helpers } from '@vuelidate/validators'
 import { type Lang } from '../composables/Lang'
-import { _required } from './validators'
+import { required } from './validators'
 
 export interface RuleOptions {
   optional?: boolean
@@ -15,34 +15,19 @@ export interface MessageProps extends VMessageProps {
   lang: Lang
 }
 
-export function createRule(
-  options: RuleOptions
-): ValidationRuleWithParams {
+export function createRule(options: RuleOptions): ValidationRuleWithParams {
   const lang = typeof document !== 'undefined'
     ? (document.documentElement.lang === 'ja' ? 'ja' : 'en')
     : 'en'
 
   const params = options.params ?? {}
 
-  const validator = helpers.withParams(
-    params,
-    (value: unknown) => {
-      return options.optional && !_required(value)
-        ? true
-        : options.validation(value)
-    }
-  )
+  const validator = helpers.withParams(params, (value: unknown) => {
+    return options.optional && !required(value, false) ? true : options.validation(value)
+  })
 
   return helpers.withMessage(
     (params) => options.message({ ...params, lang }),
-    options.async
-      ? helpers.withAsync(validator, createParamsForAsyncValidator(params))
-      : validator
+    options.async ? helpers.withAsync(validator, Object.values(params)) : validator
   )
 }
-
-function createParamsForAsyncValidator(params: Record<string, any>) {
-  return Object.keys(params).map((key) => {
-    return params[key]
-  })
-}

package/lib/validation/rules/decimal.ts

@@ -1,8 +1,8 @@
 import { createRule } from '../Rule'
-import { decimal as baseDecimal, hyphen } from '../validators'
+import { decimal as baseDecimal } from '../validators'
 
 export const message = {
-  en: 'The value must be valid decimal numbers.',
+  en: 'The value must be a valid decimal number.',
   ja: 'この値は小数または10進数である必要があります。'
 }
 
@@ -10,6 +10,6 @@ export function decimal(msg?: string) {
   return createRule({
     message: ({ lang }) => msg ?? message[lang],
     optional: true,
-    validation: (value) => !hyphen(value) && baseDecimal(value)
+    validation: (value) => baseDecimal(value)
   })
 }

package/lib/validation/rules/email.ts

@@ -2,7 +2,7 @@ import { createRule } from '../Rule'
 import { email as baseEmail } from '../validators'
 
 export const message = {
-  en: 'The Email is invalid.',
+  en: 'The email is invalid.',
   ja: 'Emailの形式が正しくありません。'
 }
 

package/lib/validation/rules/index.ts

@@ -1,4 +1,3 @@
-export { and, not, or } from '@vuelidate/validators'
 export { after } from './after'
 export { afterOrEqual } from './afterOrEqual'
 export { before } from './before'
@@ -30,3 +29,4 @@ export { url } from './url'
 export { ymd } from './ymd'
 export { zeroOrNegativeInteger } from './zeroOrNegativeInteger'
 export { zeroOrPositiveInteger } from './zeroOrPositiveInteger'
+export { and, not, or } from '@vuelidate/validators'

package/lib/validation/rules/negativeInteger.ts

@@ -2,7 +2,7 @@ import { createRule } from '../Rule'
 import { negativeInteger as baseNegativeInteger } from '../validators'
 
 export const message = {
-  en: 'The value must be valid negative integer.',
+  en: 'The value must be a valid negative integer.',
   ja: 'この値は負の整数である必要があります。'
 }
 

package/lib/validation/rules/positiveInteger.ts

@@ -2,7 +2,7 @@ import { createRule } from '../Rule'
 import { positiveInteger as basePositiveInteger } from '../validators'
 
 export const message = {
-  en: 'The value must be valid positive integer.',
+  en: 'The value must be a valid positive integer.',
   ja: 'この値は正の整数である必要があります。'
 }
 

package/lib/validation/rules/requiredHms.ts

@@ -1,6 +1,6 @@
 import { type HmsType } from '../../support/Day'
 import { createRule } from '../Rule'
-import { requiredHms as baseRequiredHms } from '../validators/requiredHms'
+import { hms as baseHms } from '../validators/hms'
 
 export const message = {
   en: 'The field is required.',
@@ -10,6 +10,6 @@ export const message = {
 export function requiredHms(required?: HmsType[], msg?: string) {
   return createRule({
     message: ({ lang }) => msg ?? message[lang],
-    validation: (value) => baseRequiredHms(value, required)
+    validation: (value) => baseHms(value, required, true)
   })
 }

package/lib/validation/rules/requiredIf.ts

@@ -6,10 +6,7 @@ export const message = {
   ja: 'この項目は必須です。'
 }
 
-export function requiredIf(
-  condition: RequiredIfCondition,
-  msg?: string
-) {
+export function requiredIf(condition: RequiredIfCondition, msg?: string) {
   return createRule({
     async: true,
     params: { condition },

package/lib/validation/rules/requiredYmd.ts

@@ -1,6 +1,6 @@
 import { type YmdType } from '../../support/Day'
 import { createRule } from '../Rule'
-import { requiredYmd as baseRequiredYmd } from '../validators/requiredYmd'
+import { ymd as baseYmd } from '../validators/ymd'
 
 export const message = {
   en: 'The field is required.',
@@ -10,6 +10,6 @@ export const message = {
 export function requiredYmd(required?: YmdType[], msg?: string) {
   return createRule({
     message: ({ lang }) => msg ?? message[lang],
-    validation: (value) => baseRequiredYmd(value, required)
+    validation: (value) => baseYmd(value, required, true)
   })
 }

package/lib/validation/rules/slackChannelName.ts

@@ -1,5 +1,8 @@
 import { createRule } from '../Rule'
-import { type SlackChannelNameOptions, slackChannelName as baseSlackChannelName } from '../validators'
+import {
+  type SlackChannelNameOptions,
+  slackChannelName as baseSlackChannelName
+} from '../validators'
 
 export const message = {
   en: 'The slack channel name is invalid.',

package/lib/validation/rules/zeroOrNegativeInteger.ts

@@ -2,7 +2,7 @@ import { createRule } from '../Rule'
 import { negativeInteger as baseNegativeInteger, zero } from '../validators'
 
 export const message = {
-  en: 'The value must be zero or valid negative integer.',
+  en: 'The value must be zero or a valid negative integer.',
   ja: 'この値はゼロまたは負の整数である必要があります。'
 }
 

package/lib/validation/rules/zeroOrPositiveInteger.ts

@@ -2,7 +2,7 @@ import { createRule } from '../Rule'
 import { positiveInteger as basePositiveInteger, zero } from '../validators'
 
 export const message = {
-  en: 'The value must be zero or valid positive integer.',
+  en: 'The value must be zero or a valid positive integer.',
   ja: 'この値はゼロまたは正の整数である必要があります。'
 }
 

package/lib/validation/validators/after.ts

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

package/lib/validation/validators/afterOrEqual.ts

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

package/lib/validation/validators/before.ts

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

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
 }