@scaleway/regex 2.2.2 → 2.4.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2.4.0 (2022-09-08)
+
+
+### Features
+
+* **regex:** add ip regexes ([#972](https://github.com/scaleway/scaleway-lib/issues/972)) ([98c6ded](https://github.com/scaleway/scaleway-lib/commit/98c6deda557af0cd41b1a6064946af2dea6680c2))
+
+
+
+## 2.3.0 (2022-08-01)
+
+
+### Features
+
+* add new regex `alphaDashes` to the list ([#901](https://github.com/scaleway/scaleway-lib/issues/901)) ([608f823](https://github.com/scaleway/scaleway-lib/commit/608f8230badb68dcbcb5eab95c1661f97652a042))
+
+
+
+### 2.2.3 (2022-04-26)
+
+
+### Bug Fixes
+
+* **regex:** improve url regex ([#736](https://github.com/scaleway/scaleway-lib/issues/736)) ([c340227](https://github.com/scaleway/scaleway-lib/commit/c340227da34141c978237e7659404df84e680d7a))
+
+
+
 ### 2.2.2 (2022-04-05)
 
 **Note:** Version bump only for package @scaleway/regex

package/dist/index.browser.js

@@ -1,6 +1,7 @@
 const alpha = /^[a-zA-Z]*$/;
 const alphaLower = /^[a-z]+$/;
 const alphanum = /^[a-zA-Z0-9]*$/;
+const alphaDashes = /^[a-zA-Z-]*$/;
 const alphanumdash = /^[a-zA-Z0-9-]*$/;
 const alphanumdashdots = /^[a-zA-Z0-9-.]*$/;
 const alphanumdashdotsorempty = /^$|^[a-zA-Z0-9-.]*$/;
@@ -12,21 +13,36 @@ const alphanumLowercase = /^[a-z0-9]+$/;
 const alphanumSpacesDotsUnderscoreDash = /^[a-zA-Z0-9-.\s_]*$/;
 const alphanumUnderscoreDash = /^[a-zA-Z0-9_-]*$/;
 const alphanumUnderscoreDollarDash = /^[a-zA-Z0-9_$-]*$/;
-const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/; // eslint-disable-next-line no-control-regex
-
+const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/;
 const ascii = /^[\x00-\x7F]+$/;
 const backupKey = /^[A-Z0-9]{32}$/;
 const basicDomain = /^[a-z0-9-]+(\.[a-z0-9-]{1,63})+$/;
 const cron = /^[0-9,/*-]+$/;
 const digits = /^[0-9]*$/;
-const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/; // Used by W3C
-
+const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/;
 const email = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 const fourDigitsCode = /^[0-9]{4}$/;
 const phone = /^\+[0-9]*/;
 const spaces = /^\s*$/;
 const sixDigitsCode = /^[0-9]{6}$/;
-const url = /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/;
+const url = /^http(s)?:\/\/?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
 const hexadecimal = /^[0-9a-fA-F]+$/;
+const v4 = '(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}';
+const v6segment = '[a-fA-F\\d]{1,4}';
+const v6 = `
+(?:
+(?:${v6segment}:){7}(?:${v6segment}|:)|
+(?:${v6segment}:){6}(?:${v4}|:${v6segment}|:)|
+(?:${v6segment}:){5}(?::${v4}|(?::${v6segment}){1,2}|:)|
+(?:${v6segment}:){4}(?:(?::${v6segment}){0,1}:${v4}|(?::${v6segment}){1,3}|:)|
+(?:${v6segment}:){3}(?:(?::${v6segment}){0,2}:${v4}|(?::${v6segment}){1,4}|:)|
+(?:${v6segment}:){2}(?:(?::${v6segment}){0,3}:${v4}|(?::${v6segment}){1,5}|:)|
+(?:${v6segment}:){1}(?:(?::${v6segment}){0,4}:${v4}|(?::${v6segment}){1,6}|:)|
+(?::(?:(?::${v6segment}){0,5}:${v4}|(?::${v6segment}){1,7}|:))
+)(?:%[0-9a-zA-Z]{1,})?
+`.replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim();
+const ip = new RegExp(`^(?:${v4}|${v6})$`);
+const ipv4 = new RegExp(`^${v4}$`);
+const ipv6 = new RegExp(`^${v6}$`);
 
-export { absoluteLinuxPath, alpha, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, macAddress, phone, sixDigitsCode, spaces, url };
+export { absoluteLinuxPath, alpha, alphaDashes, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, ip, ipv4, ipv6, macAddress, phone, sixDigitsCode, spaces, url };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 declare const alpha: RegExp;
 declare const alphaLower: RegExp;
 declare const alphanum: RegExp;
+declare const alphaDashes: RegExp;
 declare const alphanumdash: RegExp;
 declare const alphanumdashdots: RegExp;
 declare const alphanumdashdotsorempty: RegExp;
@@ -26,5 +27,8 @@ declare const spaces: RegExp;
 declare const sixDigitsCode: RegExp;
 declare const url: RegExp;
 declare const hexadecimal: RegExp;
+declare const ip: RegExp;
+declare const ipv4: RegExp;
+declare const ipv6: RegExp;
 
-export { absoluteLinuxPath, alpha, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, macAddress, phone, sixDigitsCode, spaces, url };
+export { absoluteLinuxPath, alpha, alphaDashes, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, ip, ipv4, ipv6, macAddress, phone, sixDigitsCode, spaces, url };

package/dist/index.js

@@ -1,6 +1,7 @@
 const alpha = /^[a-zA-Z]*$/;
 const alphaLower = /^[a-z]+$/;
 const alphanum = /^[a-zA-Z0-9]*$/;
+const alphaDashes = /^[a-zA-Z-]*$/;
 const alphanumdash = /^[a-zA-Z0-9-]*$/;
 const alphanumdashdots = /^[a-zA-Z0-9-.]*$/;
 const alphanumdashdotsorempty = /^$|^[a-zA-Z0-9-.]*$/;
@@ -12,21 +13,36 @@ const alphanumLowercase = /^[a-z0-9]+$/;
 const alphanumSpacesDotsUnderscoreDash = /^[a-zA-Z0-9-.\s_]*$/;
 const alphanumUnderscoreDash = /^[a-zA-Z0-9_-]*$/;
 const alphanumUnderscoreDollarDash = /^[a-zA-Z0-9_$-]*$/;
-const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/; // eslint-disable-next-line no-control-regex
-
+const absoluteLinuxPath = /(^\/$|^(\/[a-zA-Z0-9_]+)*$)/;
 const ascii = /^[\x00-\x7F]+$/;
 const backupKey = /^[A-Z0-9]{32}$/;
 const basicDomain = /^[a-z0-9-]+(\.[a-z0-9-]{1,63})+$/;
 const cron = /^[0-9,/*-]+$/;
 const digits = /^[0-9]*$/;
-const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/; // Used by W3C
-
+const macAddress = /^([0-9a-fA-F][0-9a-fA-F]:){5}([0-9a-fA-F][0-9a-fA-F])$/;
 const email = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 const fourDigitsCode = /^[0-9]{4}$/;
 const phone = /^\+[0-9]*/;
 const spaces = /^\s*$/;
 const sixDigitsCode = /^[0-9]{6}$/;
-const url = /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/;
+const url = /^http(s)?:\/\/?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
 const hexadecimal = /^[0-9a-fA-F]+$/;
+const v4 = '(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}';
+const v6segment = '[a-fA-F\\d]{1,4}';
+const v6 = `
+(?:
+(?:${v6segment}:){7}(?:${v6segment}|:)|
+(?:${v6segment}:){6}(?:${v4}|:${v6segment}|:)|
+(?:${v6segment}:){5}(?::${v4}|(?::${v6segment}){1,2}|:)|
+(?:${v6segment}:){4}(?:(?::${v6segment}){0,1}:${v4}|(?::${v6segment}){1,3}|:)|
+(?:${v6segment}:){3}(?:(?::${v6segment}){0,2}:${v4}|(?::${v6segment}){1,4}|:)|
+(?:${v6segment}:){2}(?:(?::${v6segment}){0,3}:${v4}|(?::${v6segment}){1,5}|:)|
+(?:${v6segment}:){1}(?:(?::${v6segment}){0,4}:${v4}|(?::${v6segment}){1,6}|:)|
+(?::(?:(?::${v6segment}){0,5}:${v4}|(?::${v6segment}){1,7}|:))
+)(?:%[0-9a-zA-Z]{1,})?
+`.replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim();
+const ip = new RegExp(`^(?:${v4}|${v6})$`);
+const ipv4 = new RegExp(`^${v4}$`);
+const ipv6 = new RegExp(`^${v6}$`);
 
-export { absoluteLinuxPath, alpha, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, macAddress, phone, sixDigitsCode, spaces, url };
+export { absoluteLinuxPath, alpha, alphaDashes, alphaLower, alphanum, alphanumLowercase, alphanumSpacesDotsUnderscoreDash, alphanumUnderscoreDash, alphanumUnderscoreDollarDash, alphanumdash, alphanumdashdots, alphanumdashdotsorempty, alphanumdashdotsspaces, alphanumdashorempty, alphanumdashspaces, alphanumdots, ascii, backupKey, basicDomain, cron, digits, email, fourDigitsCode, hexadecimal, ip, ipv4, ipv6, macAddress, phone, sixDigitsCode, spaces, url };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/regex",
-  "version": "2.2.2",
+  "version": "2.4.0",
   "description": "A small utility to use regex",
   "type": "module",
   "main": "dist/index.js",
@@ -18,5 +18,5 @@
     "directory": "packages/regex"
   },
   "license": "MIT",
-  "gitHead": "f5789858da50231e50baa15f68e757696c838a65"
+  "gitHead": "39fe32a6a46b5296c34b7c9a2f52eb753648e4e9"
 }