fix(client): include types

closes #2141

closes prisma/prisma-client-js#660

src/packages/client/.packwatch.json

@@ -1 +1 @@
-{ "limit": "447.9 kB", "packageSize": "447.9 kB", "unpackedSize": "1.6 MB" }
+{"limit":"448.1 kB","packageSize":"448.1 kB","unpackedSize":"1.6 MB"}

src/packages/client/fixtures/blog/prisma/schema.prisma

@@ -9,11 +9,10 @@ generator client {
 }
 
 model User {
-  id                String  @default(cuid()) @id
-  email             String  @unique
-  name              String?
-  posts             Post[]
-  treeHouseMaterial Tree?
+  id    String  @default(cuid()) @id
+  email String  @unique
+  name  String?
+  posts Post[]
 }
 
 model Post {
@@ -27,7 +26,12 @@ model Post {
   author    User?    @relation(fields: [authorId], references: [id])
 }
 
-enum Tree {
-  OAK
-  DOUGLAS
+model Like {
+  id     String @default(cuid()) @id
+  userId String
+  user   User   @relation(fields: [userId], references: [id])
+  postId String
+  post   Post   @relation(fields: [postId], references: [id])
+
+  @@unique([userId, postId])
 }

src/packages/client/src/__tests__/types/blog/index.ts

@@ -143,6 +143,35 @@ async function main() {
   })
 
   const id = users[0].posts[0].author?.id
+
+  const like = await prisma.like.findOne({
+    where: {
+      userId_postId: {
+        postId: '',
+        userId: '',
+      },
+    },
+    include: { post: true },
+  })
+
+  like!.post
+
+  const like2 = await prisma.like.upsert({
+    where: {
+      userId_postId: {
+        userId: '',
+        postId: '',
+      },
+    },
+    create: {
+      post: { connect: { id: '' } },
+      user: { connect: { id: '' } },
+    },
+    update: {},
+    include: { post: true },
+  })
+
+  like2!.post
 }
 
 main().catch((e) => {

src/packages/client/src/__tests__/types/blog/schema.prisma

@@ -42,4 +42,14 @@ model MachineData {
   procFreq  Float
   procCores Int
   ram       Int
+}
+
+model Like {
+  id     String @default(cuid()) @id
+  userId String
+  user   User   @relation(fields: [userId], references: [id])
+  postId String
+  post   Post   @relation(fields: [postId], references: [id])
+
+  @@unique([userId, postId])
 }

src/packages/client/src/generation/TSClient.ts

@@ -550,7 +550,7 @@ export type ${getPayloadName(name)}<
   ? ${name}
   : S extends undefined
   ? never
-  : S extends ${getModelArgName(name, DMMF.ModelAction.findMany)}
+  : S extends ${argsName} | ${getModelArgName(name, DMMF.ModelAction.findMany)}
   ? 'include' extends U
     ? ${name} ${include.length > 0 ? ` & ${include}` : ''}
   : 'select' extends U