diff --git a/packages/codegen-core/.gitignore b/packages/codegen-core/.gitignore index 71dbc8c3c..e0a0cbb0f 100644 --- a/packages/codegen-core/.gitignore +++ b/packages/codegen-core/.gitignore @@ -1,16 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist + +# test files +.gen diff --git a/packages/openapi-python-tests/pydantic/v2/.gitignore b/packages/openapi-python-tests/pydantic/v2/.gitignore index 8924a47ec..e0a0cbb0f 100644 --- a/packages/openapi-python-tests/pydantic/v2/.gitignore +++ b/packages/openapi-python-tests/pydantic/v2/.gitignore @@ -1,19 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen diff --git a/packages/openapi-python-tests/sdks/.gitignore b/packages/openapi-python-tests/sdks/.gitignore index 8924a47ec..e0a0cbb0f 100644 --- a/packages/openapi-python-tests/sdks/.gitignore +++ b/packages/openapi-python-tests/sdks/.gitignore @@ -1,19 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/.gitignore b/packages/openapi-ts-tests/@orpc/contract/v1/.gitignore new file mode 100644 index 000000000..c8ad94d76 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/.gitignore @@ -0,0 +1,9 @@ +.DS_Store +.idea +.tmp +logs +node_modules + +.env +coverage +dist diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-contract-name/@orpc/contract.gen.ts similarity index 100% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-contract-name/@orpc/contract.gen.ts diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-contract-name/zod.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-contract-name/zod.gen.ts similarity index 61% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-contract-name/zod.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-contract-name/zod.gen.ts index a5d3596f2..f43f854eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-contract-name/zod.gen.ts +++ b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-contract-name/zod.gen.ts @@ -1,23 +1,23 @@ // This file is auto-generated by @hey-api/openapi-ts -import { z } from 'zod'; +import * as z from 'zod'; export const zUser = z.object({ id: z.string(), email: z.email(), name: z.string(), - createdAt: z.optional(z.iso.datetime()) + createdAt: z.iso.datetime().optional() }); export const zCreateUserInput = z.object({ email: z.email(), name: z.string(), - password: z.optional(z.string().min(8)) + password: z.string().min(8).optional() }); export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) + email: z.email().optional(), + name: z.string().optional() }); export const zPost = z.object({ @@ -25,27 +25,27 @@ export const zPost = z.object({ title: z.string(), content: z.string(), authorId: z.string(), - status: z.optional(z.enum([ + status: z.enum([ 'draft', 'published', 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) + ]).optional(), + createdAt: z.iso.datetime().optional() }); export const zCreatePostInput = z.object({ title: z.string(), content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) + status: z.enum(['draft', 'published']).optional() }); export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + limit: z.int().optional().default(10), + offset: z.int().optional().default(0) + }).optional() }); /** @@ -55,8 +55,8 @@ export const zGetUsersResponse = z.array(zUser); export const zCreateUserData = z.object({ body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) + path: z.never().optional(), + query: z.never().optional() }); /** @@ -65,14 +65,14 @@ export const zCreateUserData = z.object({ export const zCreateUserResponse = zUser; export const zDeleteUserData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) + query: z.never().optional(), + headers: z.object({ + 'X-Request-Id': z.string().optional() + }).optional() }); /** @@ -81,11 +81,11 @@ export const zDeleteUserData = z.object({ export const zDeleteUserResponse = z.void(); export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -98,7 +98,7 @@ export const zUpdateUserData = z.object({ path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -107,16 +107,16 @@ export const zUpdateUserData = z.object({ export const zUpdateUserResponse = zUser; export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + authorId: z.string().optional(), + status: z.enum([ 'draft', 'published', 'archived' - ])) - })) + ]).optional() + }).optional() }); /** @@ -126,8 +126,8 @@ export const zGetPostsResponse = z.array(zPost); export const zCreatePostData = z.object({ body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), + path: z.never().optional(), + query: z.never().optional(), headers: z.object({ 'X-Author-Id': z.string() }) @@ -139,13 +139,13 @@ export const zCreatePostData = z.object({ export const zCreatePostResponse = zPost; export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ postId: z.string() }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) + query: z.object({ + includeComments: z.boolean().optional().default(false) + }).optional() }); /** diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-router-name/@orpc/contract.gen.ts similarity index 100% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-router-name/@orpc/contract.gen.ts diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-group-key/zod.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-router-name/zod.gen.ts similarity index 61% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-group-key/zod.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-router-name/zod.gen.ts index a5d3596f2..f43f854eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-group-key/zod.gen.ts +++ b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/custom-router-name/zod.gen.ts @@ -1,23 +1,23 @@ // This file is auto-generated by @hey-api/openapi-ts -import { z } from 'zod'; +import * as z from 'zod'; export const zUser = z.object({ id: z.string(), email: z.email(), name: z.string(), - createdAt: z.optional(z.iso.datetime()) + createdAt: z.iso.datetime().optional() }); export const zCreateUserInput = z.object({ email: z.email(), name: z.string(), - password: z.optional(z.string().min(8)) + password: z.string().min(8).optional() }); export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) + email: z.email().optional(), + name: z.string().optional() }); export const zPost = z.object({ @@ -25,27 +25,27 @@ export const zPost = z.object({ title: z.string(), content: z.string(), authorId: z.string(), - status: z.optional(z.enum([ + status: z.enum([ 'draft', 'published', 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) + ]).optional(), + createdAt: z.iso.datetime().optional() }); export const zCreatePostInput = z.object({ title: z.string(), content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) + status: z.enum(['draft', 'published']).optional() }); export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + limit: z.int().optional().default(10), + offset: z.int().optional().default(0) + }).optional() }); /** @@ -55,8 +55,8 @@ export const zGetUsersResponse = z.array(zUser); export const zCreateUserData = z.object({ body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) + path: z.never().optional(), + query: z.never().optional() }); /** @@ -65,14 +65,14 @@ export const zCreateUserData = z.object({ export const zCreateUserResponse = zUser; export const zDeleteUserData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) + query: z.never().optional(), + headers: z.object({ + 'X-Request-Id': z.string().optional() + }).optional() }); /** @@ -81,11 +81,11 @@ export const zDeleteUserData = z.object({ export const zDeleteUserResponse = z.void(); export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -98,7 +98,7 @@ export const zUpdateUserData = z.object({ path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -107,16 +107,16 @@ export const zUpdateUserData = z.object({ export const zUpdateUserResponse = zUser; export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + authorId: z.string().optional(), + status: z.enum([ 'draft', 'published', 'archived' - ])) - })) + ]).optional() + }).optional() }); /** @@ -126,8 +126,8 @@ export const zGetPostsResponse = z.array(zPost); export const zCreatePostData = z.object({ body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), + path: z.never().optional(), + query: z.never().optional(), headers: z.object({ 'X-Author-Id': z.string() }) @@ -139,13 +139,13 @@ export const zCreatePostData = z.object({ export const zCreatePostResponse = zPost; export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ postId: z.string() }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) + query: z.object({ + includeComments: z.boolean().optional().default(false) + }).optional() }); /** diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/default/@orpc/contract.gen.ts similarity index 100% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/default/@orpc/contract.gen.ts diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-router-name/zod.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/default/zod.gen.ts similarity index 61% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-router-name/zod.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/default/zod.gen.ts index a5d3596f2..f43f854eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/custom-router-name/zod.gen.ts +++ b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.0.x/default/zod.gen.ts @@ -1,23 +1,23 @@ // This file is auto-generated by @hey-api/openapi-ts -import { z } from 'zod'; +import * as z from 'zod'; export const zUser = z.object({ id: z.string(), email: z.email(), name: z.string(), - createdAt: z.optional(z.iso.datetime()) + createdAt: z.iso.datetime().optional() }); export const zCreateUserInput = z.object({ email: z.email(), name: z.string(), - password: z.optional(z.string().min(8)) + password: z.string().min(8).optional() }); export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) + email: z.email().optional(), + name: z.string().optional() }); export const zPost = z.object({ @@ -25,27 +25,27 @@ export const zPost = z.object({ title: z.string(), content: z.string(), authorId: z.string(), - status: z.optional(z.enum([ + status: z.enum([ 'draft', 'published', 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) + ]).optional(), + createdAt: z.iso.datetime().optional() }); export const zCreatePostInput = z.object({ title: z.string(), content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) + status: z.enum(['draft', 'published']).optional() }); export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + limit: z.int().optional().default(10), + offset: z.int().optional().default(0) + }).optional() }); /** @@ -55,8 +55,8 @@ export const zGetUsersResponse = z.array(zUser); export const zCreateUserData = z.object({ body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) + path: z.never().optional(), + query: z.never().optional() }); /** @@ -65,14 +65,14 @@ export const zCreateUserData = z.object({ export const zCreateUserResponse = zUser; export const zDeleteUserData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) + query: z.never().optional(), + headers: z.object({ + 'X-Request-Id': z.string().optional() + }).optional() }); /** @@ -81,11 +81,11 @@ export const zDeleteUserData = z.object({ export const zDeleteUserResponse = z.void(); export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -98,7 +98,7 @@ export const zUpdateUserData = z.object({ path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -107,16 +107,16 @@ export const zUpdateUserData = z.object({ export const zUpdateUserResponse = zUser; export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + authorId: z.string().optional(), + status: z.enum([ 'draft', 'published', 'archived' - ])) - })) + ]).optional() + }).optional() }); /** @@ -126,8 +126,8 @@ export const zGetPostsResponse = z.array(zPost); export const zCreatePostData = z.object({ body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), + path: z.never().optional(), + query: z.never().optional(), headers: z.object({ 'X-Author-Id': z.string() }) @@ -139,13 +139,13 @@ export const zCreatePostData = z.object({ export const zCreatePostResponse = zPost; export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ postId: z.string() }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) + query: z.object({ + includeComments: z.boolean().optional().default(false) + }).optional() }); /** diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-contract-name/@orpc/contract.gen.ts similarity index 100% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-contract-name/@orpc/contract.gen.ts diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/default/zod.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-contract-name/zod.gen.ts similarity index 61% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/default/zod.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-contract-name/zod.gen.ts index a5d3596f2..f43f854eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/default/zod.gen.ts +++ b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-contract-name/zod.gen.ts @@ -1,23 +1,23 @@ // This file is auto-generated by @hey-api/openapi-ts -import { z } from 'zod'; +import * as z from 'zod'; export const zUser = z.object({ id: z.string(), email: z.email(), name: z.string(), - createdAt: z.optional(z.iso.datetime()) + createdAt: z.iso.datetime().optional() }); export const zCreateUserInput = z.object({ email: z.email(), name: z.string(), - password: z.optional(z.string().min(8)) + password: z.string().min(8).optional() }); export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) + email: z.email().optional(), + name: z.string().optional() }); export const zPost = z.object({ @@ -25,27 +25,27 @@ export const zPost = z.object({ title: z.string(), content: z.string(), authorId: z.string(), - status: z.optional(z.enum([ + status: z.enum([ 'draft', 'published', 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) + ]).optional(), + createdAt: z.iso.datetime().optional() }); export const zCreatePostInput = z.object({ title: z.string(), content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) + status: z.enum(['draft', 'published']).optional() }); export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + limit: z.int().optional().default(10), + offset: z.int().optional().default(0) + }).optional() }); /** @@ -55,8 +55,8 @@ export const zGetUsersResponse = z.array(zUser); export const zCreateUserData = z.object({ body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) + path: z.never().optional(), + query: z.never().optional() }); /** @@ -65,14 +65,14 @@ export const zCreateUserData = z.object({ export const zCreateUserResponse = zUser; export const zDeleteUserData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) + query: z.never().optional(), + headers: z.object({ + 'X-Request-Id': z.string().optional() + }).optional() }); /** @@ -81,11 +81,11 @@ export const zDeleteUserData = z.object({ export const zDeleteUserResponse = z.void(); export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -98,7 +98,7 @@ export const zUpdateUserData = z.object({ path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -107,16 +107,16 @@ export const zUpdateUserData = z.object({ export const zUpdateUserResponse = zUser; export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + authorId: z.string().optional(), + status: z.enum([ 'draft', 'published', 'archived' - ])) - })) + ]).optional() + }).optional() }); /** @@ -126,8 +126,8 @@ export const zGetPostsResponse = z.array(zPost); export const zCreatePostData = z.object({ body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), + path: z.never().optional(), + query: z.never().optional(), headers: z.object({ 'X-Author-Id': z.string() }) @@ -139,13 +139,13 @@ export const zCreatePostData = z.object({ export const zCreatePostResponse = zPost; export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ postId: z.string() }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) + query: z.object({ + includeComments: z.boolean().optional().default(false) + }).optional() }); /** diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-router-name/@orpc/contract.gen.ts similarity index 100% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-router-name/@orpc/contract.gen.ts diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-contract-name/zod.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-router-name/zod.gen.ts similarity index 61% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-contract-name/zod.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-router-name/zod.gen.ts index a5d3596f2..f43f854eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-contract-name/zod.gen.ts +++ b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/custom-router-name/zod.gen.ts @@ -1,23 +1,23 @@ // This file is auto-generated by @hey-api/openapi-ts -import { z } from 'zod'; +import * as z from 'zod'; export const zUser = z.object({ id: z.string(), email: z.email(), name: z.string(), - createdAt: z.optional(z.iso.datetime()) + createdAt: z.iso.datetime().optional() }); export const zCreateUserInput = z.object({ email: z.email(), name: z.string(), - password: z.optional(z.string().min(8)) + password: z.string().min(8).optional() }); export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) + email: z.email().optional(), + name: z.string().optional() }); export const zPost = z.object({ @@ -25,27 +25,27 @@ export const zPost = z.object({ title: z.string(), content: z.string(), authorId: z.string(), - status: z.optional(z.enum([ + status: z.enum([ 'draft', 'published', 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) + ]).optional(), + createdAt: z.iso.datetime().optional() }); export const zCreatePostInput = z.object({ title: z.string(), content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) + status: z.enum(['draft', 'published']).optional() }); export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + limit: z.int().optional().default(10), + offset: z.int().optional().default(0) + }).optional() }); /** @@ -55,8 +55,8 @@ export const zGetUsersResponse = z.array(zUser); export const zCreateUserData = z.object({ body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) + path: z.never().optional(), + query: z.never().optional() }); /** @@ -65,14 +65,14 @@ export const zCreateUserData = z.object({ export const zCreateUserResponse = zUser; export const zDeleteUserData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) + query: z.never().optional(), + headers: z.object({ + 'X-Request-Id': z.string().optional() + }).optional() }); /** @@ -81,11 +81,11 @@ export const zDeleteUserData = z.object({ export const zDeleteUserResponse = z.void(); export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -98,7 +98,7 @@ export const zUpdateUserData = z.object({ path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -107,16 +107,16 @@ export const zUpdateUserData = z.object({ export const zUpdateUserResponse = zUser; export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + authorId: z.string().optional(), + status: z.enum([ 'draft', 'published', 'archived' - ])) - })) + ]).optional() + }).optional() }); /** @@ -126,8 +126,8 @@ export const zGetPostsResponse = z.array(zPost); export const zCreatePostData = z.object({ body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), + path: z.never().optional(), + query: z.never().optional(), headers: z.object({ 'X-Author-Id': z.string() }) @@ -139,13 +139,13 @@ export const zCreatePostData = z.object({ export const zCreatePostResponse = zPost; export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ postId: z.string() }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) + query: z.object({ + includeComments: z.boolean().optional().default(false) + }).optional() }); /** diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/default/@orpc/contract.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/default/@orpc/contract.gen.ts similarity index 100% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/zod/default/@orpc/contract.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/default/@orpc/contract.gen.ts diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-group-key/zod.gen.ts b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/default/zod.gen.ts similarity index 61% rename from packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-group-key/zod.gen.ts rename to packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/default/zod.gen.ts index a5d3596f2..f43f854eb 100644 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-group-key/zod.gen.ts +++ b/packages/openapi-ts-tests/@orpc/contract/v1/__snapshots__/3.1.x/default/zod.gen.ts @@ -1,23 +1,23 @@ // This file is auto-generated by @hey-api/openapi-ts -import { z } from 'zod'; +import * as z from 'zod'; export const zUser = z.object({ id: z.string(), email: z.email(), name: z.string(), - createdAt: z.optional(z.iso.datetime()) + createdAt: z.iso.datetime().optional() }); export const zCreateUserInput = z.object({ email: z.email(), name: z.string(), - password: z.optional(z.string().min(8)) + password: z.string().min(8).optional() }); export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) + email: z.email().optional(), + name: z.string().optional() }); export const zPost = z.object({ @@ -25,27 +25,27 @@ export const zPost = z.object({ title: z.string(), content: z.string(), authorId: z.string(), - status: z.optional(z.enum([ + status: z.enum([ 'draft', 'published', 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) + ]).optional(), + createdAt: z.iso.datetime().optional() }); export const zCreatePostInput = z.object({ title: z.string(), content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) + status: z.enum(['draft', 'published']).optional() }); export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + limit: z.int().optional().default(10), + offset: z.int().optional().default(0) + }).optional() }); /** @@ -55,8 +55,8 @@ export const zGetUsersResponse = z.array(zUser); export const zCreateUserData = z.object({ body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) + path: z.never().optional(), + query: z.never().optional() }); /** @@ -65,14 +65,14 @@ export const zCreateUserData = z.object({ export const zCreateUserResponse = zUser; export const zDeleteUserData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) + query: z.never().optional(), + headers: z.object({ + 'X-Request-Id': z.string().optional() + }).optional() }); /** @@ -81,11 +81,11 @@ export const zDeleteUserData = z.object({ export const zDeleteUserResponse = z.void(); export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -98,7 +98,7 @@ export const zUpdateUserData = z.object({ path: z.object({ userId: z.string() }), - query: z.optional(z.never()) + query: z.never().optional() }); /** @@ -107,16 +107,16 @@ export const zUpdateUserData = z.object({ export const zUpdateUserResponse = zUser; export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ + body: z.never().optional(), + path: z.never().optional(), + query: z.object({ + authorId: z.string().optional(), + status: z.enum([ 'draft', 'published', 'archived' - ])) - })) + ]).optional() + }).optional() }); /** @@ -126,8 +126,8 @@ export const zGetPostsResponse = z.array(zPost); export const zCreatePostData = z.object({ body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), + path: z.never().optional(), + query: z.never().optional(), headers: z.object({ 'X-Author-Id': z.string() }) @@ -139,13 +139,13 @@ export const zCreatePostData = z.object({ export const zCreatePostResponse = zPost; export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), + body: z.never().optional(), path: z.object({ postId: z.string() }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) + query: z.object({ + includeComments: z.boolean().optional().default(false) + }).optional() }); /** diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/package.json b/packages/openapi-ts-tests/@orpc/contract/v1/package.json new file mode 100644 index 000000000..954db4861 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/package.json @@ -0,0 +1,18 @@ +{ + "name": "@test/openapi-ts-orpc-contract-v1", + "version": "0.0.0", + "private": true, + "type": "module", + "scripts": { + "typecheck": "tsgo --noEmit" + }, + "devDependencies": { + "@hey-api/openapi-ts": "workspace:*", + "@orpc/contract": "1.13.4", + "typescript": "5.9.3", + "zod": "4.3.6" + }, + "engines": { + "node": ">=20.19.0" + } +} diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/test/3.0.x.test.ts b/packages/openapi-ts-tests/@orpc/contract/v1/test/3.0.x.test.ts new file mode 100644 index 000000000..533c776f4 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/test/3.0.x.test.ts @@ -0,0 +1,70 @@ +import fs from 'node:fs'; +import path from 'node:path'; + +import { createClient } from '@hey-api/openapi-ts'; + +import { getFilePaths } from '../../../../utils'; +import { snapshotsDir, tmpDir } from './constants'; +import { createOrpcContractConfig } from './utils'; + +const version = '3.0.x'; + +const outputDir = path.join(tmpDir, version); + +describe(`OpenAPI ${version}`, () => { + const createConfig = createOrpcContractConfig({ openApiVersion: version, outputDir }); + + const scenarios = [ + { + config: createConfig({ + input: 'orpc-contract.yaml', + output: 'default', + }), + description: 'generate oRPC contracts with Zod schemas', + }, + { + config: createConfig({ + input: 'orpc-contract.yaml', + output: 'custom-contract-name', + plugins: [ + 'zod', + { + contractNameBuilder: (id: string) => `${id}Rpc`, + name: '@orpc/contract', + }, + ], + }), + description: 'generate oRPC contracts with custom contract name builder', + }, + { + config: createConfig({ + input: 'orpc-contract.yaml', + output: 'custom-router-name', + plugins: [ + 'zod', + { + name: '@orpc/contract', + routerName: 'contract', + }, + ], + }), + description: 'generate oRPC contracts with custom router name', + }, + ]; + + it.each(scenarios)('$description', async ({ config }) => { + await createClient(config); + + const outputString = config.output as string; + const filePaths = getFilePaths(outputString); + + await Promise.all( + filePaths.map(async (filePath) => { + const fileContent = fs.readFileSync(filePath, 'utf-8'); + await expect(fileContent).toMatchFileSnapshot( + path.join(snapshotsDir, version, filePath.slice(outputDir.length + 1)), + ); + }), + ); + }); +}); diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/test/3.1.x.test.ts b/packages/openapi-ts-tests/@orpc/contract/v1/test/3.1.x.test.ts new file mode 100644 index 000000000..fdd6542b6 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/test/3.1.x.test.ts @@ -0,0 +1,69 @@ +import fs from 'node:fs'; +import path from 'node:path'; + +import { createClient } from '@hey-api/openapi-ts'; + +import { getFilePaths } from '../../../../utils'; +import { snapshotsDir, tmpDir } from './constants'; +import { createOrpcContractConfig } from './utils'; + +const version = '3.1.x'; + +const outputDir = path.join(tmpDir, version); + +describe(`OpenAPI ${version}`, () => { + const createConfig = createOrpcContractConfig({ openApiVersion: version, outputDir }); + + const scenarios = [ + { + config: createConfig({ + input: 'orpc-contract.yaml', + output: 'default', + }), + description: 'generate oRPC contracts with Zod schemas', + }, + { + config: createConfig({ + input: 'orpc-contract.yaml', + output: 'custom-contract-name', + plugins: [ + 'zod', + { + contractNameBuilder: (id: string) => `${id}Rpc`, + name: '@orpc/contract', + }, + ], + }), + description: 'generate oRPC contracts with custom contract name builder', + }, + { + config: createConfig({ + input: 'orpc-contract.yaml', + output: 'custom-router-name', + plugins: [ + 'zod', + { + name: '@orpc/contract', + routerName: 'contract', + }, + ], + }), + description: 'generate oRPC contracts with custom router name', + }, + ]; + + it.each(scenarios)('$description', async ({ config }) => { + await createClient(config); + + const filePaths = getFilePaths(config.output as string); + + await Promise.all( + filePaths.map(async (filePath) => { + const fileContent = fs.readFileSync(filePath, 'utf-8'); + await expect(fileContent).toMatchFileSnapshot( + path.join(snapshotsDir, version, filePath.slice(outputDir.length + 1)), + ); + }), + ); + }); +}); diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/test/constants.ts b/packages/openapi-ts-tests/@orpc/contract/v1/test/constants.ts new file mode 100644 index 000000000..e72988d8b --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/test/constants.ts @@ -0,0 +1,4 @@ +import path from 'node:path'; + +export const snapshotsDir = path.join(__dirname, '..', '__snapshots__'); +export const tmpDir = path.join(__dirname, '..', '.tmp'); diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/test/globalTeardown.ts b/packages/openapi-ts-tests/@orpc/contract/v1/test/globalTeardown.ts new file mode 100644 index 000000000..7c8712f70 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/test/globalTeardown.ts @@ -0,0 +1,7 @@ +import fs from 'node:fs'; + +import { tmpDir } from './constants'; + +export function teardown() { + fs.rmSync(tmpDir, { force: true, recursive: true }); +} diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/test/utils.ts b/packages/openapi-ts-tests/@orpc/contract/v1/test/utils.ts new file mode 100644 index 000000000..0bee4bdbd --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/test/utils.ts @@ -0,0 +1,31 @@ +import path from 'node:path'; + +import type { UserConfig } from '@hey-api/openapi-ts'; + +import { getSpecsPath } from '../../../../utils'; + +export const createOrpcContractConfig = + ({ openApiVersion, outputDir }: { openApiVersion: string; outputDir: string }) => + (userConfig: UserConfig) => { + const input = userConfig.input instanceof Array ? userConfig.input[0]! : userConfig.input; + const inputPath = path.join( + getSpecsPath(), + openApiVersion, + typeof input === 'string' ? input : (input.path as string), + ); + const output = userConfig.output instanceof Array ? userConfig.output[0]! : userConfig.output; + const outputPath = typeof output === 'string' ? output : (output?.path ?? ''); + return { + plugins: ['zod', '@orpc/contract'], + ...userConfig, + input: + typeof userConfig.input === 'string' + ? inputPath + : { + ...userConfig.input, + path: inputPath, + }, + logs: { level: 'silent', path: './logs' }, + output: path.join(outputDir, outputPath), + } as UserConfig; + }; diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/tsconfig.json b/packages/openapi-ts-tests/@orpc/contract/v1/tsconfig.json new file mode 100644 index 000000000..ea443bd57 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../tsconfig.base.json", + "include": ["test/**/*", "__snapshots__/**/*"], + "exclude": [".gen/**/*"], + "references": [{ "path": "../../../../openapi-ts" }] +} diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/turbo.json b/packages/openapi-ts-tests/@orpc/contract/v1/turbo.json new file mode 100644 index 000000000..116151cc6 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/turbo.json @@ -0,0 +1,10 @@ +{ + "$schema": "../../../../../node_modules/turbo/schema.json", + "extends": ["//"], + "tasks": { + "build": { + "dependsOn": [], + "outputs": ["dist/**"] + } + } +} diff --git a/packages/openapi-ts-tests/@orpc/contract/v1/vitest.setup.ts b/packages/openapi-ts-tests/@orpc/contract/v1/vitest.setup.ts new file mode 100644 index 000000000..c6178ba40 --- /dev/null +++ b/packages/openapi-ts-tests/@orpc/contract/v1/vitest.setup.ts @@ -0,0 +1,7 @@ +import { fileURLToPath } from 'node:url'; + +import { beforeAll } from 'vitest'; + +beforeAll(() => { + process.chdir(fileURLToPath(new URL('.', import.meta.url))); +}); diff --git a/packages/openapi-ts-tests/main/.gitignore b/packages/openapi-ts-tests/main/.gitignore index f75222cd2..b3207e677 100644 --- a/packages/openapi-ts-tests/main/.gitignore +++ b/packages/openapi-ts-tests/main/.gitignore @@ -1,21 +1,16 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen test/generated generated/ diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts deleted file mode 100644 index 3d28a965e..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-contract-name/@orpc/contract.gen.ts +++ /dev/null @@ -1,56 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { oc } from '@orpc/contract'; - -import { zFooBarPostResponse, zFooBarPutResponse, zFooPostResponse, zFooPutResponse, zGetFooBarResponse, zGetFooResponse } from '../zod.gen'; - -export const base = oc.$route({ inputStructure: 'detailed' }); - -export const getFooRpc = base.route({ - method: 'GET', - path: '/foo', - tags: ['fooBaz'] -}).output(zGetFooResponse); - -export const fooPostRpc = base.route({ - method: 'POST', - path: '/foo', - operationId: 'foo.-post', - tags: ['fooBaz'] -}).output(zFooPostResponse); - -export const fooPutRpc = base.route({ - method: 'PUT', - path: '/foo', - operationId: '/foo/-put/', - tags: ['fooBaz'] -}).output(zFooPutResponse); - -export const getFooBarRpc = base.route({ - method: 'GET', - path: '/foo/bar', - tags: ['barBaz'] -}).output(zGetFooBarResponse); - -export const fooBarPostRpc = base.route({ - method: 'POST', - path: '/foo/bar', - operationId: 'foo.bar.post', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPostResponse); - -export const fooBarPutRpc = base.route({ - method: 'PUT', - path: '/foo/bar', - operationId: '/foo/bar/put/', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPutResponse); - -export const router = { - getFoo: getFooRpc, - post: fooBarPostRpc, - put: fooBarPutRpc, - getFooBar: getFooBarRpc -}; - -export type Router = typeof router; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-contract-name/zod.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-contract-name/zod.gen.ts deleted file mode 100644 index b3dfa5f90..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-contract-name/zod.gen.ts +++ /dev/null @@ -1,69 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { z } from 'zod'; - -export const zGetFooData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooResponse = z.string(); - -export const zFooPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPostResponse = z.string(); - -export const zFooPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPutResponse = z.string(); - -export const zGetFooBarData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooBarResponse = z.string(); - -export const zFooBarPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPostResponse = z.string(); - -export const zFooBarPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPutResponse = z.string(); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts deleted file mode 100644 index a5d0c632e..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts +++ /dev/null @@ -1,56 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { oc } from '@orpc/contract'; - -import { zFooBarPostResponse, zFooBarPutResponse, zFooPostResponse, zFooPutResponse, zGetFooBarResponse, zGetFooResponse } from '../zod.gen'; - -export const base = oc.$route({ inputStructure: 'detailed' }); - -export const getFooContract = base.route({ - method: 'GET', - path: '/foo', - tags: ['fooBaz'] -}).output(zGetFooResponse); - -export const fooPostContract = base.route({ - method: 'POST', - path: '/foo', - operationId: 'foo.-post', - tags: ['fooBaz'] -}).output(zFooPostResponse); - -export const fooPutContract = base.route({ - method: 'PUT', - path: '/foo', - operationId: '/foo/-put/', - tags: ['fooBaz'] -}).output(zFooPutResponse); - -export const getFooBarContract = base.route({ - method: 'GET', - path: '/foo/bar', - tags: ['barBaz'] -}).output(zGetFooBarResponse); - -export const fooBarPostContract = base.route({ - method: 'POST', - path: '/foo/bar', - operationId: 'foo.bar.post', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPostResponse); - -export const fooBarPutContract = base.route({ - method: 'PUT', - path: '/foo/bar', - operationId: '/foo/bar/put/', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPutResponse); - -export const router = { - getFoo: getFooContract, - post: fooBarPostContract, - put: fooBarPutContract, - getFooBar: getFooBarContract -}; - -export type Router = typeof router; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-group-key/zod.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-group-key/zod.gen.ts deleted file mode 100644 index b3dfa5f90..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-group-key/zod.gen.ts +++ /dev/null @@ -1,69 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { z } from 'zod'; - -export const zGetFooData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooResponse = z.string(); - -export const zFooPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPostResponse = z.string(); - -export const zFooPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPutResponse = z.string(); - -export const zGetFooBarData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooBarResponse = z.string(); - -export const zFooBarPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPostResponse = z.string(); - -export const zFooBarPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPutResponse = z.string(); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts deleted file mode 100644 index 6e763c1f8..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-router-name/@orpc/contract.gen.ts +++ /dev/null @@ -1,56 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { oc } from '@orpc/contract'; - -import { zFooBarPostResponse, zFooBarPutResponse, zFooPostResponse, zFooPutResponse, zGetFooBarResponse, zGetFooResponse } from '../zod.gen'; - -export const base = oc.$route({ inputStructure: 'detailed' }); - -export const getFooContract = base.route({ - method: 'GET', - path: '/foo', - tags: ['fooBaz'] -}).output(zGetFooResponse); - -export const fooPostContract = base.route({ - method: 'POST', - path: '/foo', - operationId: 'foo.-post', - tags: ['fooBaz'] -}).output(zFooPostResponse); - -export const fooPutContract = base.route({ - method: 'PUT', - path: '/foo', - operationId: '/foo/-put/', - tags: ['fooBaz'] -}).output(zFooPutResponse); - -export const getFooBarContract = base.route({ - method: 'GET', - path: '/foo/bar', - tags: ['barBaz'] -}).output(zGetFooBarResponse); - -export const fooBarPostContract = base.route({ - method: 'POST', - path: '/foo/bar', - operationId: 'foo.bar.post', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPostResponse); - -export const fooBarPutContract = base.route({ - method: 'PUT', - path: '/foo/bar', - operationId: '/foo/bar/put/', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPutResponse); - -export const contract = { - getFoo: getFooContract, - post: fooBarPostContract, - put: fooBarPutContract, - getFooBar: getFooBarContract -}; - -export type Contract = typeof contract; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-router-name/zod.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-router-name/zod.gen.ts deleted file mode 100644 index b3dfa5f90..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/custom-router-name/zod.gen.ts +++ /dev/null @@ -1,69 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { z } from 'zod'; - -export const zGetFooData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooResponse = z.string(); - -export const zFooPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPostResponse = z.string(); - -export const zFooPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPutResponse = z.string(); - -export const zGetFooBarData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooBarResponse = z.string(); - -export const zFooBarPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPostResponse = z.string(); - -export const zFooBarPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPutResponse = z.string(); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/default/@orpc/contract.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/default/@orpc/contract.gen.ts deleted file mode 100644 index a5d0c632e..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/default/@orpc/contract.gen.ts +++ /dev/null @@ -1,56 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { oc } from '@orpc/contract'; - -import { zFooBarPostResponse, zFooBarPutResponse, zFooPostResponse, zFooPutResponse, zGetFooBarResponse, zGetFooResponse } from '../zod.gen'; - -export const base = oc.$route({ inputStructure: 'detailed' }); - -export const getFooContract = base.route({ - method: 'GET', - path: '/foo', - tags: ['fooBaz'] -}).output(zGetFooResponse); - -export const fooPostContract = base.route({ - method: 'POST', - path: '/foo', - operationId: 'foo.-post', - tags: ['fooBaz'] -}).output(zFooPostResponse); - -export const fooPutContract = base.route({ - method: 'PUT', - path: '/foo', - operationId: '/foo/-put/', - tags: ['fooBaz'] -}).output(zFooPutResponse); - -export const getFooBarContract = base.route({ - method: 'GET', - path: '/foo/bar', - tags: ['barBaz'] -}).output(zGetFooBarResponse); - -export const fooBarPostContract = base.route({ - method: 'POST', - path: '/foo/bar', - operationId: 'foo.bar.post', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPostResponse); - -export const fooBarPutContract = base.route({ - method: 'PUT', - path: '/foo/bar', - operationId: '/foo/bar/put/', - tags: ['fooBaz', 'barBaz'] -}).output(zFooBarPutResponse); - -export const router = { - getFoo: getFooContract, - post: fooBarPostContract, - put: fooBarPutContract, - getFooBar: getFooBarContract -}; - -export type Router = typeof router; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/default/zod.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/default/zod.gen.ts deleted file mode 100644 index b3dfa5f90..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/zod/default/zod.gen.ts +++ /dev/null @@ -1,69 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { z } from 'zod'; - -export const zGetFooData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooResponse = z.string(); - -export const zFooPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPostResponse = z.string(); - -export const zFooPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooPutResponse = z.string(); - -export const zGetFooBarData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zGetFooBarResponse = z.string(); - -export const zFooBarPostData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPostResponse = z.string(); - -export const zFooBarPutData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * OK - */ -export const zFooBarPutResponse = z.string(); diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts deleted file mode 100644 index 8adb5e83c..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-group-key/@orpc/contract.gen.ts +++ /dev/null @@ -1,110 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { oc } from '@orpc/contract'; - -import { zCreatePostData, zCreatePostResponse, zCreateUserData, zCreateUserResponse, zDeleteUserData, zGetPostByIdData, zGetPostByIdResponse, zGetPostsData, zGetPostsResponse, zGetUserByIdData, zGetUserByIdResponse, zGetUsersData, zGetUsersResponse, zUpdateUserData, zUpdateUserResponse } from '../zod.gen'; - -export const base = oc.$route({ inputStructure: 'detailed' }); - -/** - * Get all users - */ -export const getUsersContract = base.route({ - method: 'GET', - path: '/users', - operationId: 'getUsers', - summary: 'Get all users', - tags: ['users'] -}).input(zGetUsersData).output(zGetUsersResponse); - -/** - * Create a new user - */ -export const createUserContract = base.route({ - method: 'POST', - path: '/users', - operationId: 'createUser', - summary: 'Create a new user', - tags: ['users'], - successStatus: 201 -}).input(zCreateUserData).output(zCreateUserResponse); - -/** - * Delete a user - */ -export const deleteUserContract = base.route({ - method: 'DELETE', - path: '/users/{userId}', - operationId: 'deleteUser', - summary: 'Delete a user', - tags: ['users'] -}).input(zDeleteUserData); - -/** - * Get a user by ID - */ -export const getUserByIdContract = base.route({ - method: 'GET', - path: '/users/{userId}', - operationId: 'getUserById', - summary: 'Get a user by ID', - tags: ['users'] -}).input(zGetUserByIdData).output(zGetUserByIdResponse); - -/** - * Update a user - */ -export const updateUserContract = base.route({ - method: 'PUT', - path: '/users/{userId}', - operationId: 'updateUser', - summary: 'Update a user', - tags: ['users'] -}).input(zUpdateUserData).output(zUpdateUserResponse); - -/** - * Get all posts - */ -export const getPostsContract = base.route({ - method: 'GET', - path: '/posts', - operationId: 'getPosts', - summary: 'Get all posts', - tags: ['posts'] -}).input(zGetPostsData).output(zGetPostsResponse); - -/** - * Create a new post - */ -export const createPostContract = base.route({ - method: 'POST', - path: '/posts', - operationId: 'createPost', - summary: 'Create a new post', - tags: ['posts'], - successStatus: 201 -}).input(zCreatePostData).output(zCreatePostResponse); - -/** - * Get a post by ID - */ -export const getPostByIdContract = base.route({ - method: 'GET', - path: '/posts/{postId}', - operationId: 'getPostById', - summary: 'Get a post by ID', - tags: ['posts'] -}).input(zGetPostByIdData).output(zGetPostByIdResponse); - -export const router = { - getUsers: getUsersContract, - createUser: createUserContract, - deleteUser: deleteUserContract, - getUserById: getUserByIdContract, - updateUser: updateUserContract, - getPosts: getPostsContract, - createPost: createPostContract, - getPostById: getPostByIdContract -}; - -export type Router = typeof router; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-router-name/zod.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-router-name/zod.gen.ts deleted file mode 100644 index a5d3596f2..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/custom-router-name/zod.gen.ts +++ /dev/null @@ -1,154 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { z } from 'zod'; - -export const zUser = z.object({ - id: z.string(), - email: z.email(), - name: z.string(), - createdAt: z.optional(z.iso.datetime()) -}); - -export const zCreateUserInput = z.object({ - email: z.email(), - name: z.string(), - password: z.optional(z.string().min(8)) -}); - -export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) -}); - -export const zPost = z.object({ - id: z.string(), - title: z.string(), - content: z.string(), - authorId: z.string(), - status: z.optional(z.enum([ - 'draft', - 'published', - 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) -}); - -export const zCreatePostInput = z.object({ - title: z.string(), - content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) -}); - -export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) -}); - -/** - * List of users - */ -export const zGetUsersResponse = z.array(zUser); - -export const zCreateUserData = z.object({ - body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * User created - */ -export const zCreateUserResponse = zUser; - -export const zDeleteUserData = z.object({ - body: z.optional(z.never()), - path: z.object({ - userId: z.string() - }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) -}); - -/** - * User deleted - */ -export const zDeleteUserResponse = z.void(); - -export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), - path: z.object({ - userId: z.string() - }), - query: z.optional(z.never()) -}); - -/** - * User found - */ -export const zGetUserByIdResponse = zUser; - -export const zUpdateUserData = z.object({ - body: zUpdateUserInput, - path: z.object({ - userId: z.string() - }), - query: z.optional(z.never()) -}); - -/** - * User updated - */ -export const zUpdateUserResponse = zUser; - -export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ - 'draft', - 'published', - 'archived' - ])) - })) -}); - -/** - * List of posts - */ -export const zGetPostsResponse = z.array(zPost); - -export const zCreatePostData = z.object({ - body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), - headers: z.object({ - 'X-Author-Id': z.string() - }) -}); - -/** - * Post created - */ -export const zCreatePostResponse = zPost; - -export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), - path: z.object({ - postId: z.string() - }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) -}); - -/** - * Post found - */ -export const zGetPostByIdResponse = zPost; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/default/@orpc/contract.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/default/@orpc/contract.gen.ts deleted file mode 100644 index 8adb5e83c..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/default/@orpc/contract.gen.ts +++ /dev/null @@ -1,110 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { oc } from '@orpc/contract'; - -import { zCreatePostData, zCreatePostResponse, zCreateUserData, zCreateUserResponse, zDeleteUserData, zGetPostByIdData, zGetPostByIdResponse, zGetPostsData, zGetPostsResponse, zGetUserByIdData, zGetUserByIdResponse, zGetUsersData, zGetUsersResponse, zUpdateUserData, zUpdateUserResponse } from '../zod.gen'; - -export const base = oc.$route({ inputStructure: 'detailed' }); - -/** - * Get all users - */ -export const getUsersContract = base.route({ - method: 'GET', - path: '/users', - operationId: 'getUsers', - summary: 'Get all users', - tags: ['users'] -}).input(zGetUsersData).output(zGetUsersResponse); - -/** - * Create a new user - */ -export const createUserContract = base.route({ - method: 'POST', - path: '/users', - operationId: 'createUser', - summary: 'Create a new user', - tags: ['users'], - successStatus: 201 -}).input(zCreateUserData).output(zCreateUserResponse); - -/** - * Delete a user - */ -export const deleteUserContract = base.route({ - method: 'DELETE', - path: '/users/{userId}', - operationId: 'deleteUser', - summary: 'Delete a user', - tags: ['users'] -}).input(zDeleteUserData); - -/** - * Get a user by ID - */ -export const getUserByIdContract = base.route({ - method: 'GET', - path: '/users/{userId}', - operationId: 'getUserById', - summary: 'Get a user by ID', - tags: ['users'] -}).input(zGetUserByIdData).output(zGetUserByIdResponse); - -/** - * Update a user - */ -export const updateUserContract = base.route({ - method: 'PUT', - path: '/users/{userId}', - operationId: 'updateUser', - summary: 'Update a user', - tags: ['users'] -}).input(zUpdateUserData).output(zUpdateUserResponse); - -/** - * Get all posts - */ -export const getPostsContract = base.route({ - method: 'GET', - path: '/posts', - operationId: 'getPosts', - summary: 'Get all posts', - tags: ['posts'] -}).input(zGetPostsData).output(zGetPostsResponse); - -/** - * Create a new post - */ -export const createPostContract = base.route({ - method: 'POST', - path: '/posts', - operationId: 'createPost', - summary: 'Create a new post', - tags: ['posts'], - successStatus: 201 -}).input(zCreatePostData).output(zCreatePostResponse); - -/** - * Get a post by ID - */ -export const getPostByIdContract = base.route({ - method: 'GET', - path: '/posts/{postId}', - operationId: 'getPostById', - summary: 'Get a post by ID', - tags: ['posts'] -}).input(zGetPostByIdData).output(zGetPostByIdResponse); - -export const router = { - getUsers: getUsersContract, - createUser: createUserContract, - deleteUser: deleteUserContract, - getUserById: getUserByIdContract, - updateUser: updateUserContract, - getPosts: getPostsContract, - createPost: createPostContract, - getPostById: getPostByIdContract -}; - -export type Router = typeof router; diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/default/zod.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/default/zod.gen.ts deleted file mode 100644 index a5d3596f2..000000000 --- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/zod/default/zod.gen.ts +++ /dev/null @@ -1,154 +0,0 @@ -// This file is auto-generated by @hey-api/openapi-ts - -import { z } from 'zod'; - -export const zUser = z.object({ - id: z.string(), - email: z.email(), - name: z.string(), - createdAt: z.optional(z.iso.datetime()) -}); - -export const zCreateUserInput = z.object({ - email: z.email(), - name: z.string(), - password: z.optional(z.string().min(8)) -}); - -export const zUpdateUserInput = z.object({ - email: z.optional(z.email()), - name: z.optional(z.string()) -}); - -export const zPost = z.object({ - id: z.string(), - title: z.string(), - content: z.string(), - authorId: z.string(), - status: z.optional(z.enum([ - 'draft', - 'published', - 'archived' - ])), - createdAt: z.optional(z.iso.datetime()) -}); - -export const zCreatePostInput = z.object({ - title: z.string(), - content: z.string(), - status: z.optional(z.enum(['draft', 'published'])) -}); - -export const zGetUsersData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - limit: z.optional(z.int()).default(10), - offset: z.optional(z.int()).default(0) - })) -}); - -/** - * List of users - */ -export const zGetUsersResponse = z.array(zUser); - -export const zCreateUserData = z.object({ - body: zCreateUserInput, - path: z.optional(z.never()), - query: z.optional(z.never()) -}); - -/** - * User created - */ -export const zCreateUserResponse = zUser; - -export const zDeleteUserData = z.object({ - body: z.optional(z.never()), - path: z.object({ - userId: z.string() - }), - query: z.optional(z.never()), - headers: z.optional(z.object({ - 'X-Request-Id': z.optional(z.string()) - })) -}); - -/** - * User deleted - */ -export const zDeleteUserResponse = z.void(); - -export const zGetUserByIdData = z.object({ - body: z.optional(z.never()), - path: z.object({ - userId: z.string() - }), - query: z.optional(z.never()) -}); - -/** - * User found - */ -export const zGetUserByIdResponse = zUser; - -export const zUpdateUserData = z.object({ - body: zUpdateUserInput, - path: z.object({ - userId: z.string() - }), - query: z.optional(z.never()) -}); - -/** - * User updated - */ -export const zUpdateUserResponse = zUser; - -export const zGetPostsData = z.object({ - body: z.optional(z.never()), - path: z.optional(z.never()), - query: z.optional(z.object({ - authorId: z.optional(z.string()), - status: z.optional(z.enum([ - 'draft', - 'published', - 'archived' - ])) - })) -}); - -/** - * List of posts - */ -export const zGetPostsResponse = z.array(zPost); - -export const zCreatePostData = z.object({ - body: zCreatePostInput, - path: z.optional(z.never()), - query: z.optional(z.never()), - headers: z.object({ - 'X-Author-Id': z.string() - }) -}); - -/** - * Post created - */ -export const zCreatePostResponse = zPost; - -export const zGetPostByIdData = z.object({ - body: z.optional(z.never()), - path: z.object({ - postId: z.string() - }), - query: z.optional(z.object({ - includeComments: z.optional(z.boolean()).default(false) - })) -}); - -/** - * Post found - */ -export const zGetPostByIdResponse = zPost; diff --git a/packages/openapi-ts-tests/main/test/plugins.test.ts b/packages/openapi-ts-tests/main/test/plugins.test.ts index d8ee473cd..426e15a52 100644 --- a/packages/openapi-ts-tests/main/test/plugins.test.ts +++ b/packages/openapi-ts-tests/main/test/plugins.test.ts @@ -580,56 +580,6 @@ for (const version of versions) { }), description: 'generate Angular requests and resources (class)', }, - { - config: createConfig({ - input: version === '2.0.x' ? 'sdk-instance.yaml' : 'orpc-contract.yaml', - output: 'default', - plugins: ['zod', '@orpc/contract'], - }), - description: 'generate oRPC contracts with Zod schemas', - }, - { - config: createConfig({ - input: version === '2.0.x' ? 'sdk-instance.yaml' : 'orpc-contract.yaml', - output: 'custom-contract-name', - plugins: [ - 'zod', - { - contractNameBuilder: (id: string) => `${id}Rpc`, - name: '@orpc/contract', - }, - ], - }), - description: 'generate oRPC contracts with custom contract name builder', - }, - { - config: createConfig({ - input: version === '2.0.x' ? 'sdk-instance.yaml' : 'orpc-contract.yaml', - output: 'custom-group-key', - plugins: [ - 'zod', - { - groupKeyBuilder: (operation) => operation.method, - name: '@orpc/contract', - }, - ], - }), - description: 'generate oRPC contracts with custom group key builder', - }, - { - config: createConfig({ - input: version === '2.0.x' ? 'sdk-instance.yaml' : 'orpc-contract.yaml', - output: 'custom-router-name', - plugins: [ - 'zod', - { - name: '@orpc/contract', - routerName: 'contract', - }, - ], - }), - description: 'generate oRPC contracts with custom router name', - }, ]; it.each(scenarios)('$description', async ({ config }) => { diff --git a/packages/openapi-ts-tests/sdks/.gitignore b/packages/openapi-ts-tests/sdks/.gitignore index 8924a47ec..e0a0cbb0f 100644 --- a/packages/openapi-ts-tests/sdks/.gitignore +++ b/packages/openapi-ts-tests/sdks/.gitignore @@ -1,19 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen diff --git a/packages/openapi-ts-tests/valibot/v1/.gitignore b/packages/openapi-ts-tests/valibot/v1/.gitignore index 8924a47ec..e0a0cbb0f 100644 --- a/packages/openapi-ts-tests/valibot/v1/.gitignore +++ b/packages/openapi-ts-tests/valibot/v1/.gitignore @@ -1,19 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen diff --git a/packages/openapi-ts-tests/zod/v3/.gitignore b/packages/openapi-ts-tests/zod/v3/.gitignore index 8924a47ec..e0a0cbb0f 100644 --- a/packages/openapi-ts-tests/zod/v3/.gitignore +++ b/packages/openapi-ts-tests/zod/v3/.gitignore @@ -1,19 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen diff --git a/packages/openapi-ts-tests/zod/v4/.gitignore b/packages/openapi-ts-tests/zod/v4/.gitignore index 8924a47ec..e0a0cbb0f 100644 --- a/packages/openapi-ts-tests/zod/v4/.gitignore +++ b/packages/openapi-ts-tests/zod/v4/.gitignore @@ -1,19 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist # test files -.gen/ +.gen diff --git a/packages/openapi-ts/src/plugins/@orpc/contract/config.ts b/packages/openapi-ts/src/plugins/@orpc/contract/config.ts index fab169fa6..b4c266fd5 100644 --- a/packages/openapi-ts/src/plugins/@orpc/contract/config.ts +++ b/packages/openapi-ts/src/plugins/@orpc/contract/config.ts @@ -1,7 +1,5 @@ -import type { OperationsStrategy } from '~/openApi/shared/locations'; -import { definePluginConfig } from '~/plugins/shared/utils/config'; -import type { PluginContext } from '~/plugins/types'; -import { resolveNaming } from '~/utils/naming'; +import type { OperationsStrategy, PluginContext } from '@hey-api/shared'; +import { definePluginConfig, resolveNaming } from '@hey-api/shared'; import { handler } from './plugin'; import type { OrpcContractPlugin, RouterConfig, UserRouterConfig } from './types'; diff --git a/packages/openapi-ts/src/plugins/@orpc/contract/plugin.ts b/packages/openapi-ts/src/plugins/@orpc/contract/plugin.ts index c9e7af0bd..bf1de8d4d 100644 --- a/packages/openapi-ts/src/plugins/@orpc/contract/plugin.ts +++ b/packages/openapi-ts/src/plugins/@orpc/contract/plugin.ts @@ -1,12 +1,9 @@ import type { NodeName } from '@hey-api/codegen-core'; +import type { IR } from '@hey-api/shared'; +import { applyNaming, OperationPath, OperationStrategy, toCase } from '@hey-api/shared'; -import type { IR } from '~/ir/types'; -import { OperationPath, OperationStrategy } from '~/openApi/shared/locations'; -import { createOperationComment } from '~/plugins/shared/utils/operation'; -import { $ } from '~/ts-dsl'; -import type { ObjectTsDsl } from '~/ts-dsl/expr/object'; -import { applyNaming, toCase } from '~/utils/naming'; - +import { $ } from '../../../ts-dsl'; +import { createOperationComment } from '../../shared/utils/operation'; import type { OrpcContractPlugin, RouterConfig } from './types'; function hasInput(operation: IR.OperationObject): boolean { @@ -86,7 +83,7 @@ type NestedLeaf = { type: 'leaf'; value: NodeName }; type NestedNode = { children: Map; type: 'node' }; type NestedValue = NestedLeaf | NestedNode; -function buildNestedObject(node: NestedNode): ObjectTsDsl { +function buildNestedObject(node: NestedNode): ReturnType { const obj = $.object(); for (const [key, child] of node.children) { if (child.type === 'leaf') { diff --git a/packages/shared/.gitignore b/packages/shared/.gitignore index 71dbc8c3c..e0a0cbb0f 100644 --- a/packages/shared/.gitignore +++ b/packages/shared/.gitignore @@ -1,16 +1,14 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist + +# test files +.gen diff --git a/packages/vite-plugin/.gitignore b/packages/vite-plugin/.gitignore index 00262055b..2f60996a3 100644 --- a/packages/vite-plugin/.gitignore +++ b/packages/vite-plugin/.gitignore @@ -1,19 +1,18 @@ .DS_Store .idea -.tsdown .tmp -junit.xml +.tsdown logs node_modules -npm-debug.log* temp -yarn-debug.log* -yarn-error.log* -*.iml -dist -coverage .env +coverage +dist + +# test files +.gen + # test files test/generated diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index daedd97e9..19aa9f53d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1461,6 +1461,21 @@ importers: specifier: 0.16.0 version: 0.16.0 + packages/openapi-ts-tests/@orpc/contract/v1: + devDependencies: + '@hey-api/openapi-ts': + specifier: workspace:* + version: link:../../../../openapi-ts + '@orpc/contract': + specifier: 1.13.4 + version: 1.13.4 + typescript: + specifier: 5.9.3 + version: 5.9.3 + zod: + specifier: 4.3.6 + version: 4.3.6 + packages/openapi-ts-tests/main: devDependencies: '@angular-devkit/build-angular': diff --git a/vitest.config.ts b/vitest.config.ts index cd1535f34..d98cad771 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -67,6 +67,15 @@ export default defineConfig({ setupFiles: ['./vitest.setup.ts'], }, }, + { + extends: true, + test: { + globalSetup: ['./test/globalTeardown.ts'], + name: '@test/openapi-ts-orpc-contract-v1', + root: 'packages/openapi-ts-tests/@orpc/contract/v1', + setupFiles: ['./vitest.setup.ts'], + }, + }, { extends: true, test: {