@ptolemy2002/regex-utils 2.5.0 → 2.6.1

package/README.md

@@ -153,7 +153,7 @@ Checks if a string is a valid set of regular expression flags.
 
 ### interpretZodError
 #### Description
-Given a zod error, interprets it to `null` if no error is found, a single error message if there is a single error, or an array of error messages if there are multiple errors. The error messages will be in the format `<path>: <message>`.
+Given a zod error, interprets it to `null` if no error is found, a single error message if there is a single error, or an array of error messages if there are multiple errors. The error messages will be in the format `<path>: <message>`. If the error is with function arguments, "arguments.<index>" will be appended to the end of the path. Similarly, if the error is with a function return value, "returnValue" will be appended to the end of the path. Note that for function arguments, only the first seen error will be reported.
 
 #### Parameters
 - `e` (`ZodError`): The zod error to be interpreted.

package/dist/index.d.ts

@@ -17,11 +17,12 @@ export declare function isValidRegex(value: string, flags?: string): boolean;
 export declare function isValidRegexFlags(value: string): boolean;
 export type ZodValidator<O> = (v: O) => boolean;
 export type ZodValidatorWithErrors<O> = (v: O) => true | string | string[];
+export declare function isZodError(err: unknown): err is ZodError;
 export type InterpretZodErrorOptions = {
     prefix?: string | string[];
     separator?: string;
 };
-export declare function interpretZodError(e: ZodError, { prefix, separator }: InterpretZodErrorOptions): string | string[] | null;
+export declare function interpretZodError(e: ZodError, { prefix, separator }?: InterpretZodErrorOptions): string | string[] | null;
 export type ZodSafeParseable<O> = {
     safeParse: (v: unknown) => z.SafeParseReturnType<unknown, O>;
 };

package/dist/index.js

@@ -10,6 +10,7 @@ exports.regexMatchWhole = regexMatchWhole;
 exports.transformRegex = transformRegex;
 exports.isValidRegex = isValidRegex;
 exports.isValidRegexFlags = isValidRegexFlags;
+exports.isZodError = isZodError;
 exports.interpretZodError = interpretZodError;
 exports.zodValidate = zodValidate;
 exports.zodValidateWithErrors = zodValidateWithErrors;
@@ -111,10 +112,13 @@ function isValidRegex(value, flags = "") {
 function isValidRegexFlags(value) {
     return /^[gimsuy]*$/.test(value);
 }
-function interpretZodError(e, { prefix, separator = "." }) {
+function isZodError(err) {
+    return Boolean(err && (err instanceof zod_1.ZodError || err.name === 'ZodError'));
+}
+function interpretZodError(e, { prefix, separator = "." } = {}) {
     const { errors } = e;
     function formatIssue(issue) {
-        const { path: _path, message } = issue;
+        const { code, path: _path, message } = issue;
         let path = _path;
         if (typeof prefix === "string") {
             path = [prefix, ...path];
@@ -122,6 +126,16 @@ function interpretZodError(e, { prefix, separator = "." }) {
         else if (Array.isArray(prefix)) {
             path = [...prefix, ...path];
         }
+        if (code === "invalid_return_type") {
+            const returnTypeIssue = issue.returnTypeError.errors[0];
+            path = [...path, "returnType", ...returnTypeIssue.path];
+            return `${path.join(separator)}: ${returnTypeIssue.message}`;
+        }
+        else if (code === "invalid_arguments") {
+            const argumentsIssue = issue.argumentsError.errors[0];
+            path = [...path, "arguments", ...argumentsIssue.path];
+            return `${path.join(separator)}: ${argumentsIssue.message}`;
+        }
         if (path.length === 0)
             return message;
         return `${path.join(separator)}: ${message}`;
@@ -140,7 +154,7 @@ function zodValidate(p) {
 }
 class ZodInterpretedError extends Error {
     constructor(message = null, { prefix, joinSeparator = "\n", pathSeparator = "." } = {}) {
-        if (message instanceof zod_1.ZodError)
+        if (isZodError(message))
             message = interpretZodError(message, { prefix, separator: pathSeparator });
         super(Array.isArray(message) ? message.join(joinSeparator) : message ?? undefined);
         this.zodMessage = message;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ptolemy2002/regex-utils",
-    "version": "2.5.0",
+    "version": "2.6.1",
     "private": false,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",