|
1 |
| -import { DMMF } from '@prisma/generator-helper'; |
| 1 | +import type { DMMF } from '@prisma/generator-helper'; |
2 | 2 | import {
|
3 | 3 | PluginOptions,
|
4 | 4 | createProject,
|
@@ -59,7 +59,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,
|
59 | 59 | });
|
60 | 60 | sf.addStatements([
|
61 | 61 | `import { useContext } from 'react';`,
|
62 |
| - `import { RequestHandlerContext, type RequestOptions } from '@zenstackhq/swr/runtime';`, |
| 62 | + `import { RequestHandlerContext, type RequestOptions, type PickEnumerable } from '@zenstackhq/swr/runtime';`, |
63 | 63 | `import * as request from '@zenstackhq/swr/runtime';`,
|
64 | 64 | ]);
|
65 | 65 |
|
@@ -193,7 +193,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,
|
193 | 193 | `HasSelectOrTake extends Prisma.Or<Prisma.Extends<'skip', Prisma.Keys<T>>, Prisma.Extends<'take', Prisma.Keys<T>>>`,
|
194 | 194 | `OrderByArg extends Prisma.True extends HasSelectOrTake ? { orderBy: Prisma.${model.name}GroupByArgs['orderBy'] }: { orderBy?: Prisma.${model.name}GroupByArgs['orderBy'] },`,
|
195 | 195 | `OrderFields extends Prisma.ExcludeUnderscoreKeys<Prisma.Keys<Prisma.MaybeTupleToUnion<T['orderBy']>>>`,
|
196 |
| - `ByFields extends Prisma.TupleToUnion<T['by']>`, |
| 196 | + `ByFields extends Prisma.MaybeTupleToUnion<T['by']>`, |
197 | 197 | `ByValid extends Prisma.Has<ByFields, OrderFields>`,
|
198 | 198 | `HavingFields extends Prisma.GetHavingFields<T['having']>`,
|
199 | 199 | `HavingValid extends Prisma.Has<ByFields, HavingFields>`,
|
@@ -243,7 +243,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,
|
243 | 243 | ];
|
244 | 244 | const inputType = `Prisma.SubsetIntersection<T, Prisma.${model.name}GroupByArgs, OrderByArg> & InputErrors`;
|
245 | 245 | const returnType = `{} extends InputErrors ?
|
246 |
| - Array<Prisma.PickArray<Prisma.${model.name}GroupByOutputType, T['by']> & |
| 246 | + Array<PickEnumerable<Prisma.${model.name}GroupByOutputType, T['by']> & |
247 | 247 | {
|
248 | 248 | [P in ((keyof T) & (keyof Prisma.${model.name}GroupByOutputType))]: P extends '_count'
|
249 | 249 | ? T[P] extends boolean
|
|
0 commit comments