@darkwolf/validator - npm Package Compare versions

Comparing version 13.21.74 to 13.21.75

constants.js

@@ -5,5 +5,10 @@ const BASE58_ALPHABET = 'AveDarkwo1f23456789BCEFGHJKLMNPQRSTUVWXYZbcdghijmnpqstuxyz'
 const UNIX_TIMESTAMP_REGEX = /^[1-9]\d{8,9}$/
+const UNIX_TIMESTAMP_LONG_REGEX = new RegExp(`^${UNIX_TIMESTAMP_REGEX.source.slice(1, -1)}(.\\d{1,9})?$`)
 const UUID_REGEX = /^[a-f\d]{8}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{4}-[a-f\d]{12}$/i
-const IPv4_REGEX = /^((\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$/
-const URL_REGEX = /^(https?:\/\/)?((([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|((\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]))(:\d+)?(\/[\w-.%+@&:~]*)*(\?[\w-.%+@&=:;,~]*)?(#[\w-]*)?$/i
+const IPV4_REGEX = /^((\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$/
+const PORT_REGEX = /^([1-9]\d{0,3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d{1}|6553[0-5])$/
+const HTTP_REGEX = /^http:\/\/.+$/
+const HTTPS_REGEX = /^https:\/\/.+$/
+const DOMAIN_REGEX = /^(([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}$/i
+const URL_REGEX = new RegExp(`^https?://(${IPV4_REGEX.source.slice(1, -1)}|${DOMAIN_REGEX.source.slice(1, -1)})(:${PORT_REGEX.source.slice(1, -1)})?(/[\\w-.%+@&:~]*)*(\\?[\\w-.%+@&=:;,~]*)?(#[\w-]*)?$`, 'i')
 const EMAIL_REGEX = /^[\w-.]+@(([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}$/i
@@ -24,4 +29,9 @@ const PHONE_NUMBER_REGEX = /^\+[1-9]\d{6,14}$/
   UNIX_TIMESTAMP_REGEX,
+  UNIX_TIMESTAMP_LONG_REGEX,
   UUID_REGEX,
-  IPv4_REGEX,
+  IPV4_REGEX,
+  PORT_REGEX,
+  HTTP_REGEX,
+  HTTPS_REGEX,
+  DOMAIN_REGEX,
   URL_REGEX,
@@ -28,0 +38,0 @@ EMAIL_REGEX,

index.js

@@ -134,17 +134,22 @@ const CodeError = require('@darkwolf/code-error')
 
-const isTimestamp = value => isInteger(value) && constants.TIMESTAMP_REGEX.test(value)
-const isUnixTimestamp = value => isInteger(value) && constants.UNIX_TIMESTAMP_REGEX.test(value)
-const isUUID = value => constants.UUID_REGEX.test(value)
-const isIPv4 = value => constants.IPv4_REGEX.test(value)
-const isUrl = value => constants.URL_REGEX.test(value)
-const isEmail = value => constants.EMAIL_REGEX.test(value)
-const isPhoneNumber = value => constants.PHONE_NUMBER_REGEX.test(value)
-const isASCII = value => constants.ASCII_REGEX.test(value)
-const isBase64 = value => constants.BASE64_REGEX.test(value)
-const isBase64Url = value => constants.BASE64URL_REGEX.test(value)
-const isBase58 = value => constants.BASE58_REGEX.test(value)
-const isJWT = value => constants.JWT_REGEX.test(value)
-const isHash = value => constants.HASH_REGEX.test(value)
-const isUid = value => constants.UID_REGEX.test(value)
-const isAuthToken = value => constants.AUTH_TOKEN_REGEX.test(value)
+const isTimestamp = value => isNumber(value) && constants.TIMESTAMP_REGEX.test(value)
+const isUnixTimestamp = value => isNumber(value) && constants.UNIX_TIMESTAMP_REGEX.test(value)
+const isUnixTimestampLong = value => isNumber(value) && constants.UNIX_TIMESTAMP_LONG_REGEX.test(value)
+const isUUID = value => isString(value) && constants.UUID_REGEX.test(value)
+const isIPv4 = value => isString(value) && constants.IPV4_REGEX.test(value)
+const isPort = value => isNumber(value) && constants.PORT_REGEX.test(value)
+const isHTTP = value => isString(value) && constants.HTTP_REGEX.test(value)
+const isHTTPS = value => isString(value) && constants.HTTPS_REGEX.test(value)
+const isDomain = value => isString(value) && constants.DOMAIN_REGEX.test(value)
+const isURL = value => isString(value) && constants.URL_REGEX.test(value)
+const isEmail = value => isString(value) && constants.EMAIL_REGEX.test(value)
+const isPhoneNumber = value => isString(value) && constants.PHONE_NUMBER_REGEX.test(value)
+const isASCII = value => isString(value) && constants.ASCII_REGEX.test(value)
+const isBase64 = value => isString(value) && constants.BASE64_REGEX.test(value)
+const isBase64URL = value => isString(value) && constants.BASE64URL_REGEX.test(value)
+const isBase58 = value => isString(value) && constants.BASE58_REGEX.test(value)
+const isJWT = value => isString(value) && constants.JWT_REGEX.test(value)
+const isHash = value => isString(value) && constants.HASH_REGEX.test(value)
+const isUID = value => isString(value) && constants.UID_REGEX.test(value)
+const isAuthToken = value => isString(value) && constants.AUTH_TOKEN_REGEX.test(value)
 
@@ -215,17 +220,30 @@ module.exports = {
   isJSON,
+  isJson: isJSON,
   isTimestamp,
   isUnixTimestamp,
   isUUID,
+  isUuid: isUUID,
   isIPv4,
-  isUrl,
+  isPort,
+  isHTTP,
+  isHttp: isHTTP,
+  isHTTPS,
+  isHttps: isHTTPS,
+  isDomain,
+  isURL,
+  isUrl: isURL,
   isEmail,
   isPhoneNumber,
   isASCII,
+  isAscii: isASCII,
   isBase64,
-  isBase64Url,
+  isBase64URL,
+  isBase64Url: isBase64URL,
   isBase58,
   isJWT,
+  isJwt: isJWT,
   isHash,
-  isUid,
+  isUID,
+  isUid: isUID,
   isAuthToken
 }

package.json

 {
   "name": "@darkwolf/validator",
-  "version": "13.21.74",
+  "version": "13.21.75",
   "description": "Validator",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -77,6 +77,16 @@ # Validator
 ### isJSON(value)
+### isJson(value)
 ### isTimestamp(value)
 ### isUnixTimestamp(value)
+### isUnixTimestampLong(value)
 ### isUUID(value)
+### isUuid(value)
 ### isIPv4(value)
+### isPort(value)
+### isHTTP(value)
+### isHttp(value)
+### isHTTPS(value)
+### isHttps(value)
+### isDomain(value)
+### isURL(value)
 ### isUrl(value)
@@ -86,8 +96,12 @@ ### isEmail(value)
 ### isASCII(value)
+### isAscii(value)
 ### isBase64(value)
+### isBase64URL(value)
 ### isBase64Url(value)
 ### isBase58(value)
 ### isJWT(value)
+### isJwt(value)
 ### isHash(value)
+### isUID(value)
 ### isUid(value)
 ### isAuthToken(value)

No alert changes

Improved metrics

Total package byte prevSize

14584

increased by12.4%

Lines of code

279

increased by11.16%

Number of lines in readme file

106

increased by15.22%

No dependency changes