cidr-regex 4.0.4 → 4.1.0

package/dist/index.d.ts

@@ -0,0 +1,16 @@
+type Options = {
+    /**
+    Only match an exact string. Useful with `RegExp#test()` to check if a string is an IP address. *(`false` matches any IP address in a string)*
+  
+    @default false
+    */
+    readonly exact?: boolean;
+};
+declare const cidrRegex: {
+    ({ exact }?: Options): RegExp;
+    v4({ exact }?: Options): RegExp;
+    v6({ exact }?: Options): RegExp;
+};
+export declare const v4: ({ exact }?: Options) => RegExp;
+export declare const v6: ({ exact }?: Options) => RegExp;
+export default cidrRegex;

package/dist/index.js

@@ -0,0 +1,13 @@
+import ipRegex from 'ip-regex';
+
+const defaultOpts = { exact: false };
+const v4str = `${ipRegex.v4().source}\\/(3[0-2]|[12]?[0-9])`;
+const v6str = `${ipRegex.v6().source}\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])`;
+const v4exact = new RegExp(`^${v4str}$`);
+const v6exact = new RegExp(`^${v6str}$`);
+const v46exact = new RegExp(`(?:^${v4str}$)|(?:^${v6str}$)`);
+const cidrRegex = ({ exact } = defaultOpts) => exact ? v46exact : new RegExp(`(?:${v4str})|(?:${v6str})`, "g");
+const v4 = cidrRegex.v4 = ({ exact } = defaultOpts) => exact ? v4exact : new RegExp(v4str, "g");
+const v6 = cidrRegex.v6 = ({ exact } = defaultOpts) => exact ? v6exact : new RegExp(v6str, "g");
+
+export { cidrRegex as default, v4, v6 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cidr-regex",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "Regular expression for matching IP addresses in CIDR notation",
   "author": "silverwind <me@silverwind.io>",
   "contributors": [
@@ -9,25 +9,33 @@
   "repository": "silverwind/cidr-regex",
   "license": "BSD-2-Clause",
   "type": "module",
-  "exports": "./index.js",
   "sideEffects": false,
+  "main": "./dist/index.js",
+  "exports": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "engines": {
     "node": ">=14"
   },
-  "files": [
-    "index.js",
-    "index.d.ts"
-  ],
   "dependencies": {
     "ip-regex": "^5.0.0"
   },
   "devDependencies": {
+    "@types/node": "20.12.12",
     "eslint": "8.57.0",
-    "eslint-config-silverwind": "83.0.1",
+    "eslint-config-silverwind": "85.1.4",
+    "eslint-config-silverwind-typescript": "3.2.7",
     "tsd": "0.31.0",
-    "updates": "16.0.0",
-    "versions": "12.0.1",
-    "vitest": "1.4.0",
-    "vitest-config-silverwind": "7.0.3"
+    "typescript": "5.4.5",
+    "typescript-config-silverwind": "4.3.2",
+    "updates": "16.1.1",
+    "versions": "12.0.2",
+    "vite": "5.2.11",
+    "vite-config-silverwind": "1.1.2",
+    "vite-plugin-dts": "3.9.1",
+    "vitest": "1.6.0",
+    "vitest-config-silverwind": "9.0.6"
   }
 }

package/index.d.ts

@@ -1,43 +0,0 @@
-export type Options = {
-  /**
-  Only match an exact string. Useful with `RegExp#test()` to check if a string is an IP address. *(`false` matches any IP address in a string)*
-
-  @default false
-  */
-  readonly exact?: boolean;
-}
-
-/**
-@returns A regex for matching IPv4 CIDRs.
-*/
-export function v4(options?: Options): RegExp;
-
-/**
-@returns A regex for matching IPv6 CIDRs.
-*/
-export function v6(options?: Options): RegExp;
-
-/**
-Regular expression for matching IP addresses in CIDR notation
-
-@returns A regex for matching both IPv4 and IPv6 CIDRs.
-
-@example
-```
-// Contains a CIDR IP address?
-cidrRegex().test("foo 192.168.0.1/24");
-//=> true
-
-// Is a CIDR IP address?
-cidrRegex({exact: true}).test("foo 192.168.0.1/24");
-//=> false
-
-cidrRegex.v6({exact: true}).test("1:2:3:4:5:6:7:8/64");
-//=> true
-
-// Extract CIDRs from string
-"foo 192.168.0.1/24 bar 1:2:3:4:5:6:7:8/64 baz".match(cidrRegex());
-//=> ["192.168.0.1/24", "1:2:3:4:5:6:7:8/64"]
-```
-*/
-export default function cidrRegex(options?: Options): RegExp;

package/index.js

@@ -1,15 +0,0 @@
-import ipRegex from "ip-regex";
-
-const defaultOpts = {exact: false};
-const v4str = `${ipRegex.v4().source}\\/(3[0-2]|[12]?[0-9])`;
-const v6str = `${ipRegex.v6().source}\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])`;
-
-// pre-compile only the exact regexes as global flag makes regex objects stateful
-const v4exact = new RegExp(`^${v4str}$`);
-const v6exact = new RegExp(`^${v6str}$`);
-const v46exact = new RegExp(`(?:^${v4str}$)|(?:^${v6str}$)`);
-
-const cidrRegex = ({exact} = defaultOpts) => exact ? v46exact : new RegExp(`(?:${v4str})|(?:${v6str})`, "g");
-export const v4 = cidrRegex.v4 = ({exact} = defaultOpts) => exact ? v4exact : new RegExp(v4str, "g");
-export const v6 = cidrRegex.v6 = ({exact} = defaultOpts) => exact ? v6exact : new RegExp(v6str, "g");
-export default cidrRegex;