Skip to content

support trpc v11 #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type-check": "tsc"
},
"dependencies": {
"@trpc/server": "10.5.0",
"@trpc/server": "11.0.0-rc.593",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be changed to 11.0.1 across the board.

"express": "4.18.2",
"trpc-playground": "workspace:1.0.4"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"type-check": "tsc"
},
"dependencies": {
"@trpc/server": "10.5.0",
"@trpc/server": "11.0.0-rc.593",
"next": "13.0.7",
"react": "18.2.0",
"react-dom": "18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type-check": "tsc"
},
"dependencies": {
"@trpc/server": "10.5.0",
"@trpc/server": "11.0.0-rc.593",
"superjson": "^1.8.1",
"zod": "3.14.4"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@babel/core": "^7.20.5",
"@preact/preset-vite": "2.5.0",
"@trpc/server": "10.5.0",
"@trpc/server": "11.0.0-rc.593",
"@types/cors": "2.8.13",
"@types/express": "4.17.15",
"autoprefixer": "10.4.13",
Expand Down
6 changes: 3 additions & 3 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"@trpc-playground/query-extension": "workspace:1.0.1",
"@trpc-playground/typescript-extension": "workspace:1.0.0",
"@trpc-playground/utils": "workspace:1.0.1",
"@trpc/client": "10.5.0",
"@trpc/react-query": "10.5.0",
"@trpc/client": "11.0.0-rc.593",
"@trpc/react-query": "11.0.0-rc.593",
"clsx": "^1.2.1",
"jotai": "^1.11.2",
"object-inspect": "^1.12.2",
Expand All @@ -71,7 +71,7 @@
},
"devDependencies": {
"@trpc-playground/types": "workspace:1.0.0",
"@trpc/server": "10.5.0",
"@trpc/server": "11.0.0-rc.593",
"@types/object-inspect": "1.8.1",
"@types/react": "17.0.44",
"@types/react-input-autosize": "2.2.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/trpc-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"type-check": "tsc"
},
"peerDependencies": {
"@trpc/server": "^10",
"@trpc/server": "11.0.0-rc.593",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"@trpc/server": "11.0.0-rc.593",
"@trpc/server": "^11",

"zod": "^3"
},
"dependencies": {
Expand All @@ -61,7 +61,7 @@
"zod-to-ts": "^1.1.2"
},
"devDependencies": {
"@trpc/server": "10.5.0",
"@trpc/server": "11.0.0-rc.593",
"@types/aws-lambda": "8.10.109",
"@types/express": "4.17.15",
"@types/koa": "2.13.5",
Expand Down
41 changes: 21 additions & 20 deletions packages/trpc-playground/src/get-default-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,33 @@ export const getProcedureSchemas = (procedures: Procedures) => {
const procedureTypes: ProcedureTypes = { queries: {}, mutations: {} }

Object.entries(procedures)
.filter(([, { _def }]) => _def.query || _def.mutation)
.filter(([, { _def }]) => _def.type === 'query' || _def.type === 'mutation')
.forEach(([procedureName, procedure]) => {
const inputParser = getInputFromInputParsers(procedure._def.inputs)
if (typeof inputParser === 'function') {
return z.any()
}

const defaultInputValue = inputParser ? getDefaultForDef(inputParser._def) : ''

let procedureType = ''
let docsType = ''

if (inputParser) {
const { node } = zodToTs(inputParser)
procedureType = `input: ${printNode(node)}`

docsType = printNode(createTypeAlias(node, 'input', inputParser.description))
}
// const inputParser = getInputFromInputParsers(procedure._def.inputs)
// if (typeof inputParser === 'function') {
// return z.any()
// }
//
// const defaultInputValue = inputParser ? getDefaultForDef(inputParser._def) : ''
const defaultInputValue = ''

const procedureType = ''
const docsType = ''

// if (inputParser) {
// const { node } = zodToTs(inputParser)
// procedureType = `input: ${printNode(node)}`
//
// docsType = printNode(createTypeAlias(node, 'input', inputParser.description))
// }
Comment on lines +30 to +46

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like all of the changes in that gist should be in this PR. Thoughts?


const procedureDefaults = {
inputLength: defaultInputValue.length,
value: `await trpc.${procedureName}.${procedure._def.query ? 'query' : 'mutate'}(${defaultInputValue})`,
value: `await trpc.${procedureName}.${procedure._def.type === 'query' ? 'query' : 'mutate'}(${defaultInputValue})`,
}

const procedureObject = procedure._def.query ? procedureSchemas.queries : procedureSchemas.mutations
const typeProcedureObject = procedure._def.query ? procedureTypes.queries : procedureTypes.mutations
const procedureObject = procedure._def.type === 'query' ? procedureSchemas.queries : procedureSchemas.mutations
const typeProcedureObject = procedure._def.type === 'query' ? procedureTypes.queries : procedureTypes.mutations
procedureObject[procedureName] = { default: procedureDefaults, type: docsType }
typeProcedureObject[procedureName] = procedureType
})
Expand Down
6 changes: 3 additions & 3 deletions packages/trpc-playground/src/zod-resolve-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ const buildTrpcTsType = (router: AnyRouter, procedureTypes: ProcedureTypes) => {
const procedureObject = {} as Record<string, string>

Object.entries(procedures)
.filter(([, { _def }]) => _def.query || _def.mutation)
.filter(([, { _def }]) => _def.type === 'query' || _def.type === 'mutation')
.forEach(([name, procedure]) => {
let procedureTypeDef = ''

const inputType = procedureTypes.mutations[name] || procedureTypes.queries[name] || ''
if (procedure._def?.query) procedureTypeDef += `query: (${inputType}) => void,`
else if (procedure._def?.mutation) procedureTypeDef += `mutate: (${inputType}) => void,`
if (procedure._def?.type === 'query') procedureTypeDef += `query: (${inputType}) => void,`
else if (procedure._def?.type === 'mutation') procedureTypeDef += `mutate: (${inputType}) => void,`

lodash.set(procedureObject, name, `{${procedureTypeDef}}`)
})
Expand Down
4 changes: 2 additions & 2 deletions packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"type-check": "tsc"
},
"peerDependencies": {
"@trpc/server": "^10"
"@trpc/server": "11.0.0-rc.593"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to be strict about peer dependencies.

Suggested change
"@trpc/server": "11.0.0-rc.593"
"@trpc/server": "^11"

},
"dependencies": {
"ts-essentials": "^9.3.0"
},
"devDependencies": {
"@trpc/server": "10.5.0"
"@trpc/server": "11.0.0-rc.593"
}
}
Loading