Merge pull request #12 from iway1/custom-errors

Adds custom error messages to supported checks (string regex, etc)
iway1 · Dec 16, 2022 · 03bce89 · 03bce89
2 parents 40d8d33 + 8a31ad0
commit 03bce89
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 30 deletions.
diff --git a/packages/test-app/src/server.ts b/packages/test-app/src/server.ts
@@ -216,7 +216,13 @@ const router = t.router({
                 return "It's an input";
             }),
         emailTextInput: t.procedure
-            .input(z.object({ email: z.string().email("Bad email") }))
+            .input(
+                z.object({
+                    email: z
+                        .string()
+                        .email("That's an invalid email (custom message)"),
+                })
+            )
             .query(({ input }) => {
                 return "It's good";
             }),

diff --git a/packages/trpc-panel/package.json b/packages/trpc-panel/package.json
@@ -7,8 +7,8 @@
   "typings": "lib/src/index.d.ts",
   "type": "module",
   "scripts": {
-    "test": "jest",
-    "build": "npx rollup --config rollup.config.js",
+    "test": "Echo 'No test specified' && exit 1",
+    "build": "npx rollup --bundleConfigAsCjs --config rollup.config.js",
     "dev": "rollup --config rollup.config.js --watch"
   },
   "author": "",
@@ -43,48 +43,43 @@
     "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-replace": "^5.0.1",
-    "@rollup/plugin-typescript": "^9.0.2",
+    "@rollup/plugin-terser": "^0.2.0",
+    "@rollup/plugin-typescript": "^10.0.1",
     "@tanstack/react-query": "^4.18.0",
     "@trpc/client": "^10.4.2",
     "@trpc/react-query": "^10.4.2",
     "@trpc/server": "^10.0.0",
-    "@types/jest": "^29.2.4",
     "@types/react": "^18.0.21",
     "@types/react-dom": "^18.0.6",
     "ajv": "^8.11.2",
+    "ajv-formats": "^2.1.1",
     "autoprefixer": "^10.4.13",
     "devalue": "^4.2.0",
     "gulp": "^4.0.2",
     "gulp-inline-source": "^4.0.0",
     "gulp-replace": "^1.1.3",
-    "jest": "^29.3.1",
     "postcss": "^8.4.19",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.39.5",
     "react-hot-toast": "^2.4.0",
-    "rollup": "^3.6.0",
+    "rollup": "^3.7.4",
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-serve": "^2.0.1",
-    "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-visualizer": "^5.8.3",
     "superjson": "^1.12.0",
     "tailwindcss": "^3.2.4",
     "tslib": "^2.4.1",
     "typescript": "^4.9.3",
     "url": "^0.11.0",
-    "zod": "^3.19.1",
-    "zod-to-json-schema": "^3.19.1"
+    "zod": "^3.19.1"
   },
   "dependencies": {
-    "@rollup/plugin-terser": "^0.2.0",
-    "ajv-formats": "^2.1.1",
     "fs": "^0.0.1-security",
     "path": "^0.12.7",
-    "rollup-plugin-terser": "^7.0.2",
     "url": "^0.11.0",
-    "zod-to-json-schema": "^3.19.3"
+    "zod-to-json-schema": "^3.20.0"
   }
 }
diff --git a/packages/trpc-panel/rollup.config.js b/packages/trpc-panel/rollup.config.js
@@ -1,16 +1,15 @@
-import pkg from "./package.json" assert { type: "json" };
 import typescript from "@rollup/plugin-typescript";
 import json from "@rollup/plugin-json";
 import babel from "@rollup/plugin-babel";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import commonjs from "@rollup/plugin-commonjs";
 import copy from "rollup-plugin-copy";
 import replace from "@rollup/plugin-replace";
-import { terser } from "rollup-plugin-terser";
+import terser from "@rollup/plugin-terser";
 import postcss from "rollup-plugin-postcss";
 import path from "path";
-const isWatching =
-    process.argv.includes("-w") || process.argv.includes("--watch");
+const isWatching = process.env.ROLLUP_WATCH;
+
 export default [
     {
         input: "src/index.ts",
@@ -25,8 +24,8 @@ export default [
             // commonjs(),
         ],
         output: [
-            { file: pkg.main, format: "cjs", sourcemap: true },
-            { file: pkg.module, format: "es" },
+            { file: "lib/index.js", format: "cjs", sourcemap: true },
+            { file: "lib/index.mjs", format: "es" },
         ],
     },
     {

diff --git a/packages/trpc-panel/src/parse/parse-router.ts b/packages/trpc-panel/src/parse/parse-router.ts
@@ -47,10 +47,6 @@ const inputParserMap = {
     },
 };
 
-const jsonSchemaParserMap = {
-    zod: zodToJsonSchema,
-};
-
 function inputType(_: unknown): SupportedInputType | "unsupported" {
     return "zod";
 }
@@ -111,7 +107,7 @@ function nodeAndInputSchemaFromInputs(
     if (!inputs.length) {
         return {
             parseInputResult: "success",
-            schema: zodToJsonSchema<undefined>(emptyZodObject),
+            schema: zodToJsonSchema(emptyZodObject, { errorMessages: true }),
             node: inputParserMap["zod"](emptyZodObject, {
                 path: [],
                 optional: false,
@@ -127,11 +123,10 @@ function nodeAndInputSchemaFromInputs(
     if (iType == "unsupported") {
         return { parseInputResult: "failure" };
     }
-    const jsonSchemaParser = jsonSchemaParserMap[iType];
 
     return {
         parseInputResult: "success",
-        schema: jsonSchemaParser(input as any), //
+        schema: zodToJsonSchema(input as any, { errorMessages: true }), //
         node: zodSelectorFunction((input as any)._def, {
             path: [],
             options,

diff --git a/packages/trpc-panel/src/tests/parsers/zod/parseZodArrayDef.test.ts b/packages/trpc-panel/src/tests/parsers/zod/parseZodArrayDef.test.ts