resafe 1.0.2 → 1.0.3

package/dist/index.cjs

@@ -321,9 +321,21 @@ var Formatter = class _Formatter {
   red() {
     return this.code("38;2;255;85;85");
   }
+  yellow() {
+    return this.code("38;2;255;200;50");
+  }
+  blue() {
+    return this.code("38;2;100;149;237");
+  }
+  green() {
+    return this.code("38;2;85;255;85");
+  }
   pastelRedBg() {
     return this.code("48;2;255;85;85");
   }
+  pastelYellowBg() {
+    return this.code("48;2;255;200;50");
+  }
   toString() {
     return `${this.parts}${this.text}${ESC}0m`;
   }
@@ -332,53 +344,82 @@ var Formatter = class _Formatter {
   }
 };
 var fmt = (text) => Formatter.create(text);
-var log = {
-  error: (msg, regex, extra) => {
-    let firstLine = `${fmt(" RESAFE ").bold().pastelRedBg().white()} ${fmt(msg).white()}`;
-    if (regex) {
-      firstLine += ` ${fmt("regex").red()}${fmt("=").darkGray()}${fmt(regex).white()}`;
-    }
-    import_node_process.stdout.write(`${firstLine}
-`);
-    if (extra) log.quote(extra);
-  },
-  warn: (msg, regex, extra) => {
-    let firstLine = `${fmt(" RESAFE ").bold().pastelRedBg().white()} ${fmt(msg).white()}`;
-    if (regex) {
-      firstLine += ` ${fmt("regex").red()}${fmt("=").darkGray()}${fmt(regex).white()}`;
-    }
-    import_node_process.stdout.write(`${firstLine}
+function formatLogLine(prefixBg, msg, options) {
+  const prefix = prefixBg(fmt(" RESAFE ").bold()).white();
+  let line = `${prefix} ${fmt(msg).white()}`;
+  if (options?.property) {
+    const prop = options.property;
+    const nameFmt = prop.color ? prop.color(fmt(prop.name)) : fmt(prop.name).bold();
+    line += ` ${nameFmt}${fmt("=").darkGray()}${fmt(prop.value).white()}`;
+  }
+  import_node_process.stdout.write(`${line}
 `);
-    if (extra) log.quote(extra);
-  },
-  hint: (msg) => {
-    const lines = Array.isArray(msg) ? msg : [msg];
-    log.quote(lines);
-  },
-  quote: (lines) => {
-    lines.forEach((line) => {
-      import_node_process.stdout.write(`  ${fmt("\u2502").darkGray()} ${fmt(line).white()}
+  if (options?.lines) {
+    for (const l of options.lines) {
+      import_node_process.stdout.write(`  ${fmt("\u2502").darkGray()} ${fmt(l).white()}
 `);
-    });
+    }
     import_node_process.stdout.write("\n");
   }
+}
+var log = {
+  error: (msg, options) => formatLogLine((f) => f.pastelRedBg(), msg, options),
+  warn: (msg, options) => formatLogLine((f) => f.pastelYellowBg(), msg, options)
 };
 
 // src/index.ts
 function check(regex, options = {}) {
+  if (regex == null || regex === "") {
+    const err = new Error("Empty regex. Provide a valid pattern.");
+    log.warn("Empty regex!", {
+      lines: ["? Provide a valid regex."]
+    });
+    if (options.throwErr) throw err;
+    return null;
+  }
+  if (typeof regex !== "string" && !(regex instanceof RegExp)) {
+    const err = new TypeError("Regex must be string or RegExp");
+    log.error("Invalid regex!", {
+      property: { name: "type", value: typeof regex }
+    });
+    throw err;
+  }
   const pattern = typeof regex === "string" ? regex : regex.source;
+  try {
+    new RegExp(pattern);
+  } catch (err) {
+    if (err instanceof SyntaxError) {
+      log.error("Invalid regex syntax!", {
+        lines: [`? ${err.message}`]
+      });
+      if (options.throwErr) throw err;
+      return null;
+    }
+    throw err;
+  }
+  if (/\\u\{[0-9A-Fa-f]+\}/.test(pattern)) {
+    log.warn("Unicode escape sequences may not be fully supported", {
+      property: { name: "pattern", value: pattern }
+    });
+  }
   const result = analyze(pattern, options);
   const radius = Number(result.radius.toFixed(4));
-  if (!result.safe && !options.silent) {
-    log.error("Unsafe Regex!", `/${pattern}/`, [
-      `Spectral radius: ${radius} (threshold: ${options.threshold ?? 1})`,
-      "? Consider simplifying quantifiers"
-    ]);
-  }
-  if (!result.safe && options.throwErr) {
-    throw new Error(
-      `Unsafe regex (spectral radius ${radius})`
-    );
+  if (!result.safe) {
+    const err = new Error(`Unsafe regex (spectral radius ${radius})`);
+    if (!options.silent) {
+      log.error("Unsafe Regex!", {
+        property: {
+          name: "regex",
+          value: `/${pattern}/`,
+          color: (f) => f.red()
+        },
+        lines: [
+          `Spectral radius: ${radius} (threshold: ${options.threshold ?? 1})`,
+          "? Consider simplifying quantifiers"
+        ]
+      });
+    }
+    if (options.throwErr) throw err;
   }
   return result;
 }

package/dist/index.d.cts

@@ -10,7 +10,7 @@ interface Options extends Config {
     silent?: boolean;
     throwErr?: boolean;
 }
-declare function check(regex: string | RegExp, options?: Options): Result;
-declare function checkAsync(regex: string | RegExp, options?: Options): Promise<Result>;
+declare function check(regex: string | RegExp, options?: Options): Result | null;
+declare function checkAsync(regex: string | RegExp, options?: Options): Promise<Result | null>;
 
 export { type Config, type Options, type Result, check, checkAsync };

package/dist/index.d.ts

@@ -10,7 +10,7 @@ interface Options extends Config {
     silent?: boolean;
     throwErr?: boolean;
 }
-declare function check(regex: string | RegExp, options?: Options): Result;
-declare function checkAsync(regex: string | RegExp, options?: Options): Promise<Result>;
+declare function check(regex: string | RegExp, options?: Options): Result | null;
+declare function checkAsync(regex: string | RegExp, options?: Options): Promise<Result | null>;
 
 export { type Config, type Options, type Result, check, checkAsync };

package/dist/index.js

@@ -294,9 +294,21 @@ var Formatter = class _Formatter {
   red() {
     return this.code("38;2;255;85;85");
   }
+  yellow() {
+    return this.code("38;2;255;200;50");
+  }
+  blue() {
+    return this.code("38;2;100;149;237");
+  }
+  green() {
+    return this.code("38;2;85;255;85");
+  }
   pastelRedBg() {
     return this.code("48;2;255;85;85");
   }
+  pastelYellowBg() {
+    return this.code("48;2;255;200;50");
+  }
   toString() {
     return `${this.parts}${this.text}${ESC}0m`;
   }
@@ -305,53 +317,82 @@ var Formatter = class _Formatter {
   }
 };
 var fmt = (text) => Formatter.create(text);
-var log = {
-  error: (msg, regex, extra) => {
-    let firstLine = `${fmt(" RESAFE ").bold().pastelRedBg().white()} ${fmt(msg).white()}`;
-    if (regex) {
-      firstLine += ` ${fmt("regex").red()}${fmt("=").darkGray()}${fmt(regex).white()}`;
-    }
-    stdout.write(`${firstLine}
-`);
-    if (extra) log.quote(extra);
-  },
-  warn: (msg, regex, extra) => {
-    let firstLine = `${fmt(" RESAFE ").bold().pastelRedBg().white()} ${fmt(msg).white()}`;
-    if (regex) {
-      firstLine += ` ${fmt("regex").red()}${fmt("=").darkGray()}${fmt(regex).white()}`;
-    }
-    stdout.write(`${firstLine}
+function formatLogLine(prefixBg, msg, options) {
+  const prefix = prefixBg(fmt(" RESAFE ").bold()).white();
+  let line = `${prefix} ${fmt(msg).white()}`;
+  if (options?.property) {
+    const prop = options.property;
+    const nameFmt = prop.color ? prop.color(fmt(prop.name)) : fmt(prop.name).bold();
+    line += ` ${nameFmt}${fmt("=").darkGray()}${fmt(prop.value).white()}`;
+  }
+  stdout.write(`${line}
 `);
-    if (extra) log.quote(extra);
-  },
-  hint: (msg) => {
-    const lines = Array.isArray(msg) ? msg : [msg];
-    log.quote(lines);
-  },
-  quote: (lines) => {
-    lines.forEach((line) => {
-      stdout.write(`  ${fmt("\u2502").darkGray()} ${fmt(line).white()}
+  if (options?.lines) {
+    for (const l of options.lines) {
+      stdout.write(`  ${fmt("\u2502").darkGray()} ${fmt(l).white()}
 `);
-    });
+    }
     stdout.write("\n");
   }
+}
+var log = {
+  error: (msg, options) => formatLogLine((f) => f.pastelRedBg(), msg, options),
+  warn: (msg, options) => formatLogLine((f) => f.pastelYellowBg(), msg, options)
 };
 
 // src/index.ts
 function check(regex, options = {}) {
+  if (regex == null || regex === "") {
+    const err = new Error("Empty regex. Provide a valid pattern.");
+    log.warn("Empty regex!", {
+      lines: ["? Provide a valid regex."]
+    });
+    if (options.throwErr) throw err;
+    return null;
+  }
+  if (typeof regex !== "string" && !(regex instanceof RegExp)) {
+    const err = new TypeError("Regex must be string or RegExp");
+    log.error("Invalid regex!", {
+      property: { name: "type", value: typeof regex }
+    });
+    throw err;
+  }
   const pattern = typeof regex === "string" ? regex : regex.source;
+  try {
+    new RegExp(pattern);
+  } catch (err) {
+    if (err instanceof SyntaxError) {
+      log.error("Invalid regex syntax!", {
+        lines: [`? ${err.message}`]
+      });
+      if (options.throwErr) throw err;
+      return null;
+    }
+    throw err;
+  }
+  if (/\\u\{[0-9A-Fa-f]+\}/.test(pattern)) {
+    log.warn("Unicode escape sequences may not be fully supported", {
+      property: { name: "pattern", value: pattern }
+    });
+  }
   const result = analyze(pattern, options);
   const radius = Number(result.radius.toFixed(4));
-  if (!result.safe && !options.silent) {
-    log.error("Unsafe Regex!", `/${pattern}/`, [
-      `Spectral radius: ${radius} (threshold: ${options.threshold ?? 1})`,
-      "? Consider simplifying quantifiers"
-    ]);
-  }
-  if (!result.safe && options.throwErr) {
-    throw new Error(
-      `Unsafe regex (spectral radius ${radius})`
-    );
+  if (!result.safe) {
+    const err = new Error(`Unsafe regex (spectral radius ${radius})`);
+    if (!options.silent) {
+      log.error("Unsafe Regex!", {
+        property: {
+          name: "regex",
+          value: `/${pattern}/`,
+          color: (f) => f.red()
+        },
+        lines: [
+          `Spectral radius: ${radius} (threshold: ${options.threshold ?? 1})`,
+          "? Consider simplifying quantifiers"
+        ]
+      });
+    }
+    if (options.throwErr) throw err;
   }
   return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resafe",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "🛡️ Detects ReDoS vulnerabilities in regexes using Thompson NFA construction and spectral radius analysis",
   "license": "MIT",
   "homepage": "https://resafe.js.org",