Merge pull request #51 from Shahidul1004/fix-invalid-types-for-groupB…

…y-function

Fix invalid types for the "groupBy" function

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"
  },

src/helpers.ts

@@ -67,15 +67,19 @@ export function generateBaseRouter(
 ) {
  const outputDir = parseEnvValue(options.generator.output as EnvValue);
  sourceFile.addStatements(/* ts */ `
- import { Context } from '${getRelativePath(outputDir, config.contextPath, options.schemaPath)}';
+ import { Context } from '${getRelativePath(
+ outputDir,
+ config.contextPath,
+ options.schemaPath,
+ )}';
  `);
 
  if (config.trpcOptionsPath) {
  sourceFile.addStatements(/* ts */ `
  import trpcOptions from '${getRelativePath(
  outputDir,
  config.trpcOptionsPath,
- options.schemaPath
+ options.schemaPath,
  )}';
  `);
  }
@@ -143,14 +147,20 @@ export function generateProcedure(
  baseOpType: string,
  config: Config,
 ) {
+ 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 */ `${name}: ${getProcedureName(config)}
-  .input(${typeName})
-  .${getProcedureTypeByOpName(baseOpType)}(async ({ ctx, input }) => {
-  const ${name} = await ctx.prisma.${uncapitalizeFirstLetter(
+ .input(${typeName})
+ .${getProcedureTypeByOpName(baseOpType)}(async ({ ctx, input }) => {
+ const ${name} = await ctx.prisma.${uncapitalizeFirstLetter(
  modelName,
- )}.${opType.replace('One', '')}(input);
-  return ${name};
-  }),`);
+ )}.${opType.replace('One', '')}(${input});
+ return ${name};
+ }),`);
 }
 
 export function generateRouterSchemaImports(