From 4e20bd4e25cb9991e55ef249a4d4a4ffaf54ac43 Mon Sep 17 00:00:00 2001 From: shahidul1004 Date: Wed, 30 Nov 2022 02:57:56 +0600 Subject: [PATCH 1/3] Fix groupBy type --- src/helpers.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/helpers.ts b/src/helpers.ts index b4524e2..a402a6a 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -81,13 +81,18 @@ export function generateProcedure( opType: string, baseOpType: string, ) { + let input = 'input'; + const nameWithoutModel = name.replace(modelName as string, ''); + if (nameWithoutModel === "groupBy") { + input = '{ where: input.where, orderBy: input.orderBy, by: input.by, having: input.having, take: input.take, skip: input.skip }'; + } sourceFile.addStatements(/* ts */ ` .${getProcedureTypeByOpName(baseOpType)}("${name}", { input: ${typeName}, async resolve({ ctx, input }) { const ${name} = await ctx.prisma.${uncapitalizeFirstLetter( modelName, - )}.${opType.replace('One', '')}(input); + )}.${opType.replace('One', '')}(${input}); return ${name}; }, })`); From 85470f8d0b6ac46753be1f3ccae01b6096d3e4e0 Mon Sep 17 00:00:00 2001 From: omar-dulaimi Date: Sat, 31 Dec 2022 10:53:35 +0300 Subject: [PATCH 2/3] update deps --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index b421979..e1eef13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@prisma/internals": "^4.8.0", "pluralize": "^8.0.0", "prisma-trpc-shield-generator": "0.0.0-rc.4", - "prisma-zod-generator": "^0.8.8", + "prisma-zod-generator": "^0.8.9", "ts-morph": "^17.0.1", "tslib": "^2.4.1" }, @@ -26,7 +26,7 @@ "@types/node": "^18.11.18", "@types/pluralize": "^0.0.29", "prisma": "^4.8.0", - "trpc-shield": "^0.2.1", + "trpc-shield": "^0.3.0", "typescript": "^4.9.4", "zod": "^3.20.2" } @@ -2102,9 +2102,9 @@ } }, "node_modules/prisma-zod-generator": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/prisma-zod-generator/-/prisma-zod-generator-0.8.8.tgz", - "integrity": "sha512-CHE5KbZ8TCct3jGQY/IcMRqiYT1KekC7+reYTnvDXukA007KrOABVkvSQUTlXUW2Ns1wuW5D85NSq+88MCI+PA==", + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/prisma-zod-generator/-/prisma-zod-generator-0.8.9.tgz", + "integrity": "sha512-oBnkul5CR9Jh9R9BTg8HhvNxrP8n3kivvzPdvUsUpXWLsy6nojtO3SuDw1cg28aXApXgycvW1zS4lcxytqy5AQ==", "dependencies": { "@prisma/client": "^4.8.0", "@prisma/generator-helper": "^4.8.0", @@ -2685,12 +2685,12 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/trpc-shield": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/trpc-shield/-/trpc-shield-0.2.1.tgz", - "integrity": "sha512-WS0j3ikTSc/7S37I30SLnVLgILWzj49+QKmo1fIe7satB6ItM+RpgE+SxgtABoztDv9TOTr1Ab67R/cw07k4bA==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/trpc-shield/-/trpc-shield-0.3.0.tgz", + "integrity": "sha512-lMdDodAIn9M4y2oH4y3lqdv8csVtmINbDZByG9//gQJDsRT1UEX+BCaQJ3lVR7VZiwIJRaVVTnTS0nDQ6bF2lw==", "dev": true, "dependencies": { - "@trpc/server": "^10.6.0" + "@trpc/server": "^10.7.0" } }, "node_modules/ts-morph": { @@ -4382,9 +4382,9 @@ } }, "prisma-zod-generator": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/prisma-zod-generator/-/prisma-zod-generator-0.8.8.tgz", - "integrity": "sha512-CHE5KbZ8TCct3jGQY/IcMRqiYT1KekC7+reYTnvDXukA007KrOABVkvSQUTlXUW2Ns1wuW5D85NSq+88MCI+PA==", + "version": "0.8.9", + "resolved": "https://registry.npmjs.org/prisma-zod-generator/-/prisma-zod-generator-0.8.9.tgz", + "integrity": "sha512-oBnkul5CR9Jh9R9BTg8HhvNxrP8n3kivvzPdvUsUpXWLsy6nojtO3SuDw1cg28aXApXgycvW1zS4lcxytqy5AQ==", "requires": { "@prisma/client": "^4.8.0", "@prisma/generator-helper": "^4.8.0", @@ -4782,12 +4782,12 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "trpc-shield": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/trpc-shield/-/trpc-shield-0.2.1.tgz", - "integrity": "sha512-WS0j3ikTSc/7S37I30SLnVLgILWzj49+QKmo1fIe7satB6ItM+RpgE+SxgtABoztDv9TOTr1Ab67R/cw07k4bA==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/trpc-shield/-/trpc-shield-0.3.0.tgz", + "integrity": "sha512-lMdDodAIn9M4y2oH4y3lqdv8csVtmINbDZByG9//gQJDsRT1UEX+BCaQJ3lVR7VZiwIJRaVVTnTS0nDQ6bF2lw==", "dev": true, "requires": { - "@trpc/server": "^10.6.0" + "@trpc/server": "^10.7.0" } }, "ts-morph": { diff --git a/package.json b/package.json index e840cd6..c20b33e 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@prisma/internals": "^4.8.0", "pluralize": "^8.0.0", "prisma-trpc-shield-generator": "0.0.0-rc.4", - "prisma-zod-generator": "^0.8.8", + "prisma-zod-generator": "^0.8.9", "ts-morph": "^17.0.1", "tslib": "^2.4.1" }, @@ -40,7 +40,7 @@ "@types/node": "^18.11.18", "@types/pluralize": "^0.0.29", "prisma": "^4.8.0", - "trpc-shield": "^0.2.1", + "trpc-shield": "^0.3.0", "typescript": "^4.9.4", "zod": "^3.20.2" }, From 84bac9acdf312ad054843f325376018472715d52 Mon Sep 17 00:00:00 2001 From: omar-dulaimi Date: Sat, 31 Dec 2022 10:54:48 +0300 Subject: [PATCH 3/3] remove logs --- src/helpers.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/helpers.ts b/src/helpers.ts index 4c79ba0..1ace183 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -148,11 +148,7 @@ export function generateProcedure( config: Config, ) { let input = 'input'; - console.log({name}) - console.log({modelName}) const nameWithoutModel = name.replace(modelName as string, ''); - console.log({nameWithoutModel}) - console.log(";-----------;") if (nameWithoutModel === 'groupBy') { input = '{ where: input.where, orderBy: input.orderBy, by: input.by, having: input.having, take: input.take, skip: input.skip }';