Fix withValidation example

nota · Dec 14, 2024 · 9cde0a4 · 9cde0a4
1 parent b63eb5c
commit 9cde0a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/pkgs/examples/simple/withValidation.ts b/pkgs/examples/simple/withValidation.ts
@@ -1,6 +1,7 @@
 import { newZodValidator, ZodApiEndpoints } from "@notainc/typed-api-spec/zod";
-import { ValidateError, withValidation } from "@notainc/typed-api-spec/fetch";
-import { z, ZodError } from "zod";
+import { withValidation } from "@notainc/typed-api-spec/fetch";
+import { z } from "zod";
+import { SpecValidatorError } from "@notainc/typed-api-spec/fetch";
 
 const GITHUB_API_ORIGIN = "https://api.github.com";
 
@@ -47,9 +48,11 @@ const main = async () => {
         `${GITHUB_API_ORIGIN}/repos/nota/typed-api-spec/topics?page=1`,
         { headers: { Accept: "application/vnd.github+json" } },
       );
-    } catch (e: unknown) {
-      if (e instanceof ValidateError) {
-        console.log("error thrown", (e.error as ZodError).format());
+    } catch (e) {
+      if (e instanceof SpecValidatorError) {
+        console.log("error thrown", e.error);
+      } else {
+        throw e;
       }
     }
   }

diff --git a/pkgs/typed-api-spec/src/core/index.ts b/pkgs/typed-api-spec/src/core/index.ts
@@ -3,3 +3,6 @@ export * from "./query-string";
 export * from "./spec";
 export * from "./type";
 export * from "./url";
+export * from "./validator/validate";
+export * from "./validator/request";
+export * from "./validator/response";
diff --git a/pkgs/typed-api-spec/src/fetch/validation.ts b/pkgs/typed-api-spec/src/fetch/validation.ts
@@ -5,13 +5,13 @@ import {
   AnySpecValidator,
   RequestSpecValidatorGenerator,
   runSpecValidator,
-} from "../core/validator/request";
+} from "../core";
 import {
   AnyResponseSpecValidator,
   ResponseSpecValidatorGenerator,
   runResponseSpecValidator,
-} from "../core/validator/response";
-import { ValidatorInputError } from "../core/validator/validate";
+} from "../core";
+import { ValidatorInputError } from "../core";
 
 const dummyHost = "https://example.com";