Fix virtual fields typed as never when mixed with relation fields in select/include (#384)

borisno2 · claude · web-flow · commit 6b7284adc828 · 2026-03-27T06:46:35.000Z
* Fix virtual fields typed as \`never\` when mixed with relation fields in select/include Adds a \`StripVirtualFromArgs\` utility type to the generated \`.opensaas/types.ts\` that strips virtual field keys from the select/include object before passing it to \`Prisma.*GetPayload<>\`. This prevents Prisma from trying to resolve virtual field names (which don't exist in its schema), which previously produced \`never\` that poisoned the intersection with the virtual fields type. Closes #383 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * regenerate schema * Update prisma.test.ts.snap --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/.changeset/fix-virtual-fields-never-select.md b/.changeset/fix-virtual-fields-never-select.md
@@ -0,0 +1,5 @@
+---
+'@opensaas/stack-cli': patch
+---
+
+Fix virtual fields typed as `never` when mixed with relation fields in `select` or when using `include`
diff --git a/examples/auth-demo/prisma/schema.prisma b/examples/auth-demo/prisma/schema.prisma
@@ -18,7 +18,7 @@ model Post {
   authorId      String?   @map("author")
   author        User?     @relation(fields: [authorId], references: [id])
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 
   @@index([authorId])
 }
@@ -33,7 +33,7 @@ model User {
   accounts      Account[]
   posts         Post[]
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 }
 
 model Session {
@@ -45,7 +45,7 @@ model Session {
   userId    String?   @map("user")
   user      User?     @relation(fields: [userId], references: [id])
   createdAt DateTime  @default(now())
-  updatedAt DateTime  @updatedAt
+  updatedAt DateTime  @default(now()) @updatedAt
 
   @@index([userId])
 }
@@ -64,7 +64,7 @@ model Account {
   userId                String?   @map("user")
   user                  User?     @relation(fields: [userId], references: [id])
   createdAt             DateTime  @default(now())
-  updatedAt             DateTime  @updatedAt
+  updatedAt             DateTime  @default(now()) @updatedAt
 
   @@index([userId])
 }
@@ -75,5 +75,5 @@ model Verification {
   value      String
   expiresAt  DateTime?
   createdAt  DateTime  @default(now())
-  updatedAt  DateTime  @updatedAt
+  updatedAt  DateTime  @default(now()) @updatedAt
 }
diff --git a/examples/blog/prisma/schema.prisma b/examples/blog/prisma/schema.prisma
@@ -13,7 +13,7 @@ model Settings {
   maintenanceMode Boolean  @default(false)
   maxUploadSize   Int?
   createdAt       DateTime @default(now())
-  updatedAt       DateTime @updatedAt
+  updatedAt       DateTime @default(now()) @updatedAt
 }
 
 model User {
@@ -23,7 +23,7 @@ model User {
   password  String
   posts     Post[]
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  updatedAt DateTime @default(now()) @updatedAt
 }
 
 model Post {
@@ -38,7 +38,7 @@ model Post {
   authorId      String?   @map("author")
   author        User?     @relation(fields: [authorId], references: [id])
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 
   @@index([authorId])
 }
diff --git a/examples/composable-dashboard/prisma/schema.prisma b/examples/composable-dashboard/prisma/schema.prisma
@@ -14,7 +14,7 @@ model User {
   password  String
   posts     Post[]
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  updatedAt DateTime @default(now()) @updatedAt
 }
 
 model Post {
@@ -28,7 +28,7 @@ model Post {
   authorId      String?   @map("author")
   author        User?     @relation(fields: [authorId], references: [id])
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 
   @@index([authorId])
 }
diff --git a/examples/custom-field/prisma/schema.prisma b/examples/custom-field/prisma/schema.prisma
@@ -15,7 +15,7 @@ model User {
   favoriteColor String?
   posts         Post[]
   createdAt     DateTime @default(now())
-  updatedAt     DateTime @updatedAt
+  updatedAt     DateTime @default(now()) @updatedAt
 }
 
 model Post {
@@ -29,7 +29,7 @@ model Post {
   authorId    String?   @map("author")
   author      User?     @relation(fields: [authorId], references: [id])
   createdAt   DateTime  @default(now())
-  updatedAt   DateTime  @updatedAt
+  updatedAt   DateTime  @default(now()) @updatedAt
 
   @@index([authorId])
 }
diff --git a/examples/file-upload-demo/prisma/schema.prisma b/examples/file-upload-demo/prisma/schema.prisma
@@ -14,7 +14,7 @@ model User {
   avatar    Json?
   posts     Post[]
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  updatedAt DateTime @default(now()) @updatedAt
 }
 
 model Post {
@@ -26,5 +26,7 @@ model Post {
   authorId   String?  @map("author")
   author     User?    @relation(fields: [authorId], references: [id])
   createdAt  DateTime @default(now())
-  updatedAt  DateTime @updatedAt
+  updatedAt  DateTime @default(now()) @updatedAt
+
+  @@index([authorId])
 }
diff --git a/examples/json-demo/prisma/schema.prisma b/examples/json-demo/prisma/schema.prisma
@@ -14,7 +14,7 @@ model Product {
   settings      Json?
   configuration Json
   createdAt     DateTime @default(now())
-  updatedAt     DateTime @updatedAt
+  updatedAt     DateTime @default(now()) @updatedAt
 }
 
 model Article {
@@ -23,5 +23,5 @@ model Article {
   content   Json?
   taxonomy  Json?
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  updatedAt DateTime @default(now()) @updatedAt
 }
diff --git a/examples/rag-openai-chatbot/prisma/schema.prisma b/examples/rag-openai-chatbot/prisma/schema.prisma
@@ -15,5 +15,5 @@ model KnowledgeBase {
   published        Boolean  @default(true)
   contentEmbedding Json?
   createdAt        DateTime @default(now())
-  updatedAt        DateTime @updatedAt
+  updatedAt        DateTime @default(now()) @updatedAt
 }
diff --git a/examples/starter-auth/prisma/schema.prisma b/examples/starter-auth/prisma/schema.prisma
@@ -18,7 +18,7 @@ model Post {
   authorId      String?   @map("author")
   author        User?     @relation(fields: [authorId], references: [id])
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 
   @@index([authorId])
 }
@@ -33,7 +33,7 @@ model User {
   accounts      Account[]
   posts         Post[]
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 }
 
 model Session {
@@ -45,7 +45,7 @@ model Session {
   userId    String?   @map("user")
   user      User?     @relation(fields: [userId], references: [id])
   createdAt DateTime  @default(now())
-  updatedAt DateTime  @updatedAt
+  updatedAt DateTime  @default(now()) @updatedAt
 
   @@index([userId])
 }
@@ -64,7 +64,7 @@ model Account {
   userId                String?   @map("user")
   user                  User?     @relation(fields: [userId], references: [id])
   createdAt             DateTime  @default(now())
-  updatedAt             DateTime  @updatedAt
+  updatedAt             DateTime  @default(now()) @updatedAt
 
   @@index([userId])
 }
@@ -75,5 +75,5 @@ model Verification {
   value      String
   expiresAt  DateTime?
   createdAt  DateTime  @default(now())
-  updatedAt  DateTime  @updatedAt
+  updatedAt  DateTime  @default(now()) @updatedAt
 }
diff --git a/examples/starter/prisma/schema.prisma b/examples/starter/prisma/schema.prisma
@@ -14,7 +14,7 @@ model User {
   password  String
   posts     Post[]
   createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  updatedAt DateTime @default(now()) @updatedAt
 }
 
 model Post {
@@ -28,7 +28,7 @@ model Post {
   authorId      String?   @map("author")
   author        User?     @relation(fields: [authorId], references: [id])
   createdAt     DateTime  @default(now())
-  updatedAt     DateTime  @updatedAt
+  updatedAt     DateTime  @default(now()) @updatedAt
 
   @@index([authorId])
 }
diff --git a/examples/tiptap-demo/prisma/schema.prisma b/examples/tiptap-demo/prisma/schema.prisma
@@ -13,7 +13,7 @@ model User {
   email     String    @unique
   articles  Article[]
   createdAt DateTime  @default(now())
-  updatedAt DateTime  @updatedAt
+  updatedAt DateTime  @default(now()) @updatedAt
 }
 
 model Article {
@@ -26,5 +26,7 @@ model Article {
   authorId    String?   @map("author")
   author      User?     @relation(fields: [authorId], references: [id])
   createdAt   DateTime  @default(now())
-  updatedAt   DateTime  @updatedAt
+  updatedAt   DateTime  @default(now()) @updatedAt
+
+  @@index([authorId])
 }
diff --git a/packages/cli/src/commands/__snapshots__/generate.test.ts.snap b/packages/cli/src/commands/__snapshots__/generate.test.ts.snap
@@ -150,6 +150,14 @@ import type { Session as OpensaasSession, StorageUtils, ServerActionProps, Acces
 import type { PrismaClient, Prisma } from './prisma-client/client'
 import type { PluginServices } from './plugin-types'
 
+// Utility: strips virtual field keys from select/include so Prisma GetPayload never sees them
+type StripVirtualFromArgs<T, VirtualKeys extends string> =
+  T extends { select: infer S extends object }
+    ? Omit<T, 'select'> & { select: Omit<S, VirtualKeys> }
+    : T extends { include: infer I extends object }
+      ? Omit<T, 'include'> & { include: Omit<I, VirtualKeys> }
+      : T
+
 /**
  * Virtual fields for User - computed fields not in database
  * These are added to query results via resolveOutput hooks
@@ -443,6 +451,14 @@ import type { Session as OpensaasSession, StorageUtils, ServerActionProps, Acces
 import type { PrismaClient, Prisma } from './prisma-client/client'
 import type { PluginServices } from './plugin-types'
 
+// Utility: strips virtual field keys from select/include so Prisma GetPayload never sees them
+type StripVirtualFromArgs<T, VirtualKeys extends string> =
+  T extends { select: infer S extends object }
+    ? Omit<T, 'select'> & { select: Omit<S, VirtualKeys> }
+    : T extends { include: infer I extends object }
+      ? Omit<T, 'include'> & { include: Omit<I, VirtualKeys> }
+      : T
+
 /**
  * Custom DB type that uses Prisma's conditional types with virtual and transformed field support
  * Types change based on select/include - relationships only present when explicitly included
diff --git a/packages/cli/src/generator/__snapshots__/types.test.ts.snap b/packages/cli/src/generator/__snapshots__/types.test.ts.snap
diff --git a/packages/cli/src/generator/types.test.ts b/packages/cli/src/generator/types.test.ts
diff --git a/packages/cli/src/generator/types.ts b/packages/cli/src/generator/types.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@opensaas/stack-cli': patch
 +---
++
 +Fix virtual fields typed as `never` when mixed with relation fields in `select` or when using `include`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ model Product {`
`14`	`14`	`settings Json?`
`15`	`15`	`configuration Json`
`16`	`16`	`createdAt DateTime @default(now())`
`17`		`- updatedAt DateTime @updatedAt`
	`17`	`+ updatedAt DateTime @default(now()) @updatedAt`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`model Article {`
`@@ -23,5 +23,5 @@ model Article {`
`23`	`23`	`content Json?`
`24`	`24`	`taxonomy Json?`
`25`	`25`	`createdAt DateTime @default(now())`
`26`		`- updatedAt DateTime @updatedAt`
	`26`	`+ updatedAt DateTime @default(now()) @updatedAt`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ model KnowledgeBase {`
`15`	`15`	`published Boolean @default(true)`
`16`	`16`	`contentEmbedding Json?`
`17`	`17`	`createdAt DateTime @default(now())`
`18`		`- updatedAt DateTime @updatedAt`
	`18`	`+ updatedAt DateTime @default(now()) @updatedAt`
`19`	`19`	`}`