@scaleway/regex 2.2.3 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/dist/index.browser.js +24 -1
  3. package/dist/index.d.ts +8 -1
  4. package/dist/index.js +24 -1
  5. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -3,6 +3,33 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## 2.5.0 (2022-09-13)
7
+
8
+
9
+ ### Features
10
+
11
+ * **regex:** add cidr regex ([#982](https://github.com/scaleway/scaleway-lib/issues/982)) ([dc32290](https://github.com/scaleway/scaleway-lib/commit/dc3229007463f7f1ab5267a2efd9851bb629b625))
12
+
13
+
14
+
15
+ ## 2.4.0 (2022-09-08)
16
+
17
+
18
+ ### Features
19
+
20
+ * **regex:** add ip regexes ([#972](https://github.com/scaleway/scaleway-lib/issues/972)) ([98c6ded](https://github.com/scaleway/scaleway-lib/commit/98c6deda557af0cd41b1a6064946af2dea6680c2))
21
+
22
+
23
+
24
+ ## 2.3.0 (2022-08-01)
25
+
26
+
27
+ ### Features
28
+
29
+ * 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))
30
+
31
+
32
+
6
33
  ### 2.2.3 (2022-04-26)
7
34
 
8
35
 
package/dist/index.browser.js CHANGED
@@ -1,6 +1,7 @@
1
1
  const alpha = /^[a-zA-Z]*$/;
2
2
  const alphaLower = /^[a-z]+$/;
3
3
  const alphanum = /^[a-zA-Z0-9]*$/;
4
+ const alphaDashes = /^[a-zA-Z-]*$/;
4
5
  const alphanumdash = /^[a-zA-Z0-9-]*$/;
5
6
  const alphanumdashdots = /^[a-zA-Z0-9-.]*$/;
6
7
  const alphanumdashdotsorempty = /^$|^[a-zA-Z0-9-.]*$/;
@@ -26,5 +27,27 @@ const spaces = /^\s*$/;
26
27
  const sixDigitsCode = /^[0-9]{6}$/;
27
28
  const url = /^http(s)?:\/\/?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
28
29
  const hexadecimal = /^[0-9a-fA-F]+$/;
30
+ 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}';
31
+ const v6segment = '[a-fA-F\\d]{1,4}';
32
+ const v6 = `
33
+ (?:
34
+ (?:${v6segment}:){7}(?:${v6segment}|:)|
35
+ (?:${v6segment}:){6}(?:${v4}|:${v6segment}|:)|
36
+ (?:${v6segment}:){5}(?::${v4}|(?::${v6segment}){1,2}|:)|
37
+ (?:${v6segment}:){4}(?:(?::${v6segment}){0,1}:${v4}|(?::${v6segment}){1,3}|:)|
38
+ (?:${v6segment}:){3}(?:(?::${v6segment}){0,2}:${v4}|(?::${v6segment}){1,4}|:)|
39
+ (?:${v6segment}:){2}(?:(?::${v6segment}){0,3}:${v4}|(?::${v6segment}){1,5}|:)|
40
+ (?:${v6segment}:){1}(?:(?::${v6segment}){0,4}:${v4}|(?::${v6segment}){1,6}|:)|
41
+ (?::(?:(?::${v6segment}){0,5}:${v4}|(?::${v6segment}){1,7}|:))
42
+ )(?:%[0-9a-zA-Z]{1,})?
43
+ `.replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim();
44
+ const cidrv4 = `${v4}\\/(3[0-2]|[12]?[0-9])`;
45
+ const cidrv6 = `${v6}\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])`;
46
+ const ip = new RegExp(`^(?:${v4}|${v6})$`);
47
+ const ipv4 = new RegExp(`^${v4}$`);
48
+ const ipv6 = new RegExp(`^${v6}$`);
49
+ const ipCidr = new RegExp(`(?:^${cidrv4}$)|(?:^${cidrv6}$)`);
50
+ const ipv4Cidr = new RegExp(`^${cidrv4}$`);
51
+ const ipv6Cidr = new RegExp(`^${cidrv6}$`);
29
52
 
30
- 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 };
53
+ 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, ipCidr, ipv4, ipv4Cidr, ipv6, ipv6Cidr, macAddress, phone, sixDigitsCode, spaces, url };
package/dist/index.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  declare const alpha: RegExp;
2
2
  declare const alphaLower: RegExp;
3
3
  declare const alphanum: RegExp;
4
+ declare const alphaDashes: RegExp;
4
5
  declare const alphanumdash: RegExp;
5
6
  declare const alphanumdashdots: RegExp;
6
7
  declare const alphanumdashdotsorempty: RegExp;
@@ -26,5 +27,11 @@ declare const spaces: RegExp;
26
27
  declare const sixDigitsCode: RegExp;
27
28
  declare const url: RegExp;
28
29
  declare const hexadecimal: RegExp;
30
+ declare const ip: RegExp;
31
+ declare const ipv4: RegExp;
32
+ declare const ipv6: RegExp;
33
+ declare const ipCidr: RegExp;
34
+ declare const ipv4Cidr: RegExp;
35
+ declare const ipv6Cidr: RegExp;
29
36
 
30
- 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 };
37
+ 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, ipCidr, ipv4, ipv4Cidr, ipv6, ipv6Cidr, macAddress, phone, sixDigitsCode, spaces, url };
package/dist/index.js CHANGED
@@ -1,6 +1,7 @@
1
1
  const alpha = /^[a-zA-Z]*$/;
2
2
  const alphaLower = /^[a-z]+$/;
3
3
  const alphanum = /^[a-zA-Z0-9]*$/;
4
+ const alphaDashes = /^[a-zA-Z-]*$/;
4
5
  const alphanumdash = /^[a-zA-Z0-9-]*$/;
5
6
  const alphanumdashdots = /^[a-zA-Z0-9-.]*$/;
6
7
  const alphanumdashdotsorempty = /^$|^[a-zA-Z0-9-.]*$/;
@@ -26,5 +27,27 @@ const spaces = /^\s*$/;
26
27
  const sixDigitsCode = /^[0-9]{6}$/;
27
28
  const url = /^http(s)?:\/\/?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
28
29
  const hexadecimal = /^[0-9a-fA-F]+$/;
30
+ 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}';
31
+ const v6segment = '[a-fA-F\\d]{1,4}';
32
+ const v6 = `
33
+ (?:
34
+ (?:${v6segment}:){7}(?:${v6segment}|:)|
35
+ (?:${v6segment}:){6}(?:${v4}|:${v6segment}|:)|
36
+ (?:${v6segment}:){5}(?::${v4}|(?::${v6segment}){1,2}|:)|
37
+ (?:${v6segment}:){4}(?:(?::${v6segment}){0,1}:${v4}|(?::${v6segment}){1,3}|:)|
38
+ (?:${v6segment}:){3}(?:(?::${v6segment}){0,2}:${v4}|(?::${v6segment}){1,4}|:)|
39
+ (?:${v6segment}:){2}(?:(?::${v6segment}){0,3}:${v4}|(?::${v6segment}){1,5}|:)|
40
+ (?:${v6segment}:){1}(?:(?::${v6segment}){0,4}:${v4}|(?::${v6segment}){1,6}|:)|
41
+ (?::(?:(?::${v6segment}){0,5}:${v4}|(?::${v6segment}){1,7}|:))
42
+ )(?:%[0-9a-zA-Z]{1,})?
43
+ `.replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim();
44
+ const cidrv4 = `${v4}\\/(3[0-2]|[12]?[0-9])`;
45
+ const cidrv6 = `${v6}\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])`;
46
+ const ip = new RegExp(`^(?:${v4}|${v6})$`);
47
+ const ipv4 = new RegExp(`^${v4}$`);
48
+ const ipv6 = new RegExp(`^${v6}$`);
49
+ const ipCidr = new RegExp(`(?:^${cidrv4}$)|(?:^${cidrv6}$)`);
50
+ const ipv4Cidr = new RegExp(`^${cidrv4}$`);
51
+ const ipv6Cidr = new RegExp(`^${cidrv6}$`);
29
52
 
30
- 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 };
53
+ 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, ipCidr, ipv4, ipv4Cidr, ipv6, ipv6Cidr, macAddress, phone, sixDigitsCode, spaces, url };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@scaleway/regex",
3
- "version": "2.2.3",
3
+ "version": "2.5.0",
4
4
  "description": "A small utility to use regex",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -18,5 +18,5 @@
18
18
  "directory": "packages/regex"
19
19
  },
20
20
  "license": "MIT",
21
- "gitHead": "ff7f6755c6eac35e88d2c8f177fc74c678095800"
21
+ "gitHead": "f404667dfd218b43e811786ecce2b9553b2c65a8"
22
22
  }