chore: fix zod extending with openapi not triggering at appropriate time

brunotot · Aug 29, 2024 · 489a597 · 489a597
1 parent d213bc9
commit 489a597
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/packages/shared/src/config/Contract.config.ts b/packages/shared/src/config/Contract.config.ts
@@ -1,7 +1,7 @@
 import { type AppRouter } from "@ts-rest/core";
 import { type generateOpenApi } from "@ts-rest/open-api";
-import { z } from "zod";
 import { type TODO } from "./Types.config";
+import { z } from "./Zod.config";
 
 export type OperationMapper = NonNullable<Parameters<typeof generateOpenApi>[2]>["operationMapper"];
 

diff --git a/packages/shared/src/config/Entity.config.ts b/packages/shared/src/config/Entity.config.ts
@@ -1,5 +1,5 @@
-import { z } from "zod";
 import { ObjectId } from "./Types.config";
+import { z } from "./Zod.config";
 
 export const BASE_ENTITY_SCHEMA = {
   _id: z.instanceof(ObjectId).optional(),

diff --git a/packages/shared/src/config/Zod.config.ts b/packages/shared/src/config/Zod.config.ts
@@ -0,0 +1,5 @@
+import z from "zod";
+import { extendZodWithOpenApi } from "@anatine/zod-openapi";
+extendZodWithOpenApi(z);
+
+export { z };
diff --git a/packages/shared/src/config/index.ts b/packages/shared/src/config/index.ts
@@ -1,3 +1,7 @@
+import z from "zod";
+import { extendZodWithOpenApi } from "@anatine/zod-openapi";
+extendZodWithOpenApi(z);
+
 export * from "./Contract.config";
 export * from "./Entity.config";
 export * from "./ResponseError.config";

diff --git a/packages/shared/src/domain/ErrorLog/ErrorLog.domain.ts b/packages/shared/src/domain/ErrorLog/ErrorLog.domain.ts
@@ -1,5 +1,5 @@
 import { Entity } from "../../config/Entity.config";
-import z from "zod";
+import { z } from "../../config/Zod.config";
 
 /** @hidden */
 export const ErrorLog = Entity("ErrorLog", {

diff --git a/packages/shared/src/domain/User/User.domain.ts b/packages/shared/src/domain/User/User.domain.ts
@@ -1,6 +1,5 @@
-import { Role } from "../../config";
-import { Entity } from "../../config/Entity.config";
-import z from "zod";
+import { Role, Entity } from "../../config";
+import { z } from "../../config/Zod.config";
 
 /** @hidden */
 export const User = Entity("User", {

diff --git a/packages/shared/src/domain/User/User.typedef.ts b/packages/shared/src/domain/User/User.typedef.ts
@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { z } from "../../config/Zod.config";
 import { User } from "./User.domain";
 
 /** @hidden */

diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -2,10 +2,6 @@
  * @packageDocumentation This shared package supplies backend and frontend with a set of config, models, types, utils and web components.
  */
 
-import z from "zod";
-import { extendZodWithOpenApi } from "@anatine/zod-openapi";
-extendZodWithOpenApi(z);
-
 export * from "./config";
 export * from "./domain";
 export * from "./errors";