envalid - npm Package Compare versions

Comparing version 8.1.0 to 8.1.1

dist/validators.js

@@ -23,6 +23,5 @@ "use strict";
 // "best effort" regex-based IP address check
-// If you want a more exhaustive check, create your own custom validator, perhaps wrapping this
-// implementation (the source of the ipv4 regex below): https://github.com/validatorjs/validator.js/blob/master/src/lib/isIP.js
-var ipv4Regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/;
-var ipv6Regex = /([a-f0-9]+:+)+[a-f0-9]+/;
+// If you want a more exhaustive check, create your own custom validator
+var ipv4Regex = /^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}$/;
+var ipv6Regex = /^(([0-9a-f]{1,4}:){7}[0-9a-f]{1,4}|([0-9a-f]{1,4}:)+:([0-9a-f]{1,4}:)*[0-9a-f]{1,4}|([0-9a-f]{1,4}:)*::([0-9a-f]{1,4}:)*[0-9a-f]{0,4}|::|(([0-9a-f]{1,4}:){1,6}|:):((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9]))(%[0-9a-z.\-:]+)?$/i;
 var isIP = function (input) {
@@ -29,0 +28,0 @@ if (!input.length)

dist/validators.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../src/validators.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "envalid",
-  "version": "8.1.0",
+  "version": "8.1.1",
   "description": "Validation for your environment variables",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/validators.ts

@@ -18,7 +18,6 @@ import { EnvError } from './errors'
 // "best effort" regex-based IP address check
-// If you want a more exhaustive check, create your own custom validator, perhaps wrapping this
-// implementation (the source of the ipv4 regex below): https://github.com/validatorjs/validator.js/blob/master/src/lib/isIP.js
-const ipv4Regex =
-  /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/
-const ipv6Regex = /([a-f0-9]+:+)+[a-f0-9]+/
+// If you want a more exhaustive check, create your own custom validator
+const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}$/
+const ipv6Regex = /^(([0-9a-f]{1,4}:){7}[0-9a-f]{1,4}|([0-9a-f]{1,4}:)+:([0-9a-f]{1,4}:)*[0-9a-f]{1,4}|([0-9a-f]{1,4}:)*::([0-9a-f]{1,4}:)*[0-9a-f]{0,4}|::|(([0-9a-f]{1,4}:){1,6}|:):((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9]))(%[0-9a-z.\-:]+)?$/i
+
 const isIP = (input: string) => {
@@ -25,0 +24,0 @@ if (!input.length) return false

No alert changes

Improved metrics

Total package byte prevSize

84413

0.24%

Worsened metrics

Lines of code

1429

-0.07%

No dependency changes