diff --git a/packages/runtime/package.json b/packages/runtime/package.json index a08d3cf42..b03386877 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -99,7 +99,7 @@ "zod-validation-error": "^1.5.0" }, "peerDependencies": { - "@prisma/client": "5.0.0 - 5.15.x" + "@prisma/client": "5.0.0 - 5.16.x" }, "author": { "name": "ZenStack Team" diff --git a/packages/schema/package.json b/packages/schema/package.json index a6d5851c5..ef84f183c 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -121,10 +121,10 @@ "zod-validation-error": "^1.5.0" }, "peerDependencies": { - "prisma": "5.0.0 - 5.15.x" + "prisma": "5.0.0 - 5.16.x" }, "devDependencies": { - "@prisma/client": "5.15.x", + "@prisma/client": "5.16.x", "@types/async-exit-hook": "^2.0.0", "@types/pluralize": "^0.0.29", "@types/semver": "^7.3.13", @@ -136,7 +136,7 @@ "@zenstackhq/runtime": "workspace:*", "dotenv": "^16.0.3", "esbuild": "^0.15.12", - "prisma": "5.15.x", + "prisma": "5.16.x", "renamer": "^4.0.0", "tmp": "^0.2.1", "tsc-alias": "^1.7.0", diff --git a/packages/schema/src/plugins/enhancer/enhance/index.ts b/packages/schema/src/plugins/enhancer/enhance/index.ts index 0993f323c..cef6efced 100644 --- a/packages/schema/src/plugins/enhancer/enhance/index.ts +++ b/packages/schema/src/plugins/enhancer/enhance/index.ts @@ -159,6 +159,11 @@ import type { Prisma, PrismaClient } from '${logicalPrismaClientDir}/index-fixed } private createLogicalPrismaEnhanceFunction(authTypeParam: string) { + const prismaVersion = getPrismaVersion(); + + // Prisma 5.16.0 introduced a new generic parameter to `DynamicClientExtensionThis` + const hasClientOptions = prismaVersion && semver.gte(prismaVersion, '5.16.0'); + return ` // overload for plain PrismaClient export function enhance & InternalArgs>( @@ -168,11 +173,13 @@ export function enhance & InternalArgs>( }; // overload for extended PrismaClient -export function enhance & InternalArgs>( - prisma: DynamicClientExtensionThis, - context?: EnhancementContext<${authTypeParam}>, options?: EnhancementOptions): DynamicClientExtensionThis${ - this.generatePermissionChecker ? ' & ModelCheckers' : '' - }; +export function enhance & InternalArgs${ + hasClientOptions ? ', ClientOptions' : '' + }>( + prisma: DynamicClientExtensionThis, + context?: EnhancementContext<${authTypeParam}>, options?: EnhancementOptions): DynamicClientExtensionThis${this.generatePermissionChecker ? ' & ModelCheckers' : ''}; export function enhance(prisma: any, context?: EnhancementContext<${authTypeParam}>, options?: EnhancementOptions): any { return createEnhancement(prisma, { diff --git a/packages/sdk/package.json b/packages/sdk/package.json index bf9d1005e..e5b7b22e7 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -18,8 +18,8 @@ "author": "", "license": "MIT", "dependencies": { - "@prisma/generator-helper": "5.15.x", - "@prisma/internals": "5.15.x", + "@prisma/generator-helper": "5.16.x", + "@prisma/internals": "5.16.x", "@zenstackhq/language": "workspace:*", "@zenstackhq/runtime": "workspace:*", "langium": "1.3.1", diff --git a/packages/testtools/src/schema.ts b/packages/testtools/src/schema.ts index fb90fac4b..c830b1a6d 100644 --- a/packages/testtools/src/schema.ts +++ b/packages/testtools/src/schema.ts @@ -134,6 +134,7 @@ export type SchemaLoadOptions = { preserveTsFiles?: boolean; generatePermissionChecker?: boolean; previewFeatures?: string[]; + prismaClientOptions?: object; }; const defaultOptions: SchemaLoadOptions = { @@ -254,7 +255,12 @@ export async function loadSchema(schema: string, options?: SchemaLoadOptions) { }); const PrismaClient = require(path.join(projectDir, 'node_modules/.prisma/client')).PrismaClient; - let prisma = new PrismaClient({ log: ['info', 'warn', 'error'] }); + + let clientOptions: object = { log: ['info', 'warn', 'error'] }; + if (options?.prismaClientOptions) { + clientOptions = { ...clientOptions, ...options.prismaClientOptions }; + } + let prisma = new PrismaClient(clientOptions); // https://github.com/prisma/prisma/issues/18292 prisma[Symbol.for('nodejs.util.inspect.custom')] = 'PrismaClient'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f21b359bb..3123afd97 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -398,8 +398,8 @@ importers: packages/runtime: dependencies: '@prisma/client': - specifier: 5.0.0 - 5.15.x - version: 5.15.0(prisma@5.15.0) + specifier: 5.0.0 - 5.16.x + version: 5.16.1(prisma@5.16.1) bcryptjs: specifier: ^2.4.3 version: 2.4.3 @@ -572,8 +572,8 @@ importers: version: 1.5.0(zod@3.22.4) devDependencies: '@prisma/client': - specifier: 5.15.x - version: 5.15.0(prisma@5.15.0) + specifier: 5.16.x + version: 5.16.1(prisma@5.16.1) '@types/async-exit-hook': specifier: ^2.0.0 version: 2.0.0 @@ -608,8 +608,8 @@ importers: specifier: ^0.15.12 version: 0.15.12 prisma: - specifier: 5.15.x - version: 5.15.0 + specifier: 5.16.x + version: 5.16.1 renamer: specifier: ^4.0.0 version: 4.0.0 @@ -627,11 +627,11 @@ importers: packages/sdk: dependencies: '@prisma/generator-helper': - specifier: 5.15.x - version: 5.15.0 + specifier: 5.16.x + version: 5.16.1 '@prisma/internals': - specifier: 5.15.x - version: 5.15.0 + specifier: 5.16.x + version: 5.16.1 '@zenstackhq/language': specifier: workspace:* version: link:../language/dist @@ -3846,8 +3846,8 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true - /@prisma/client@5.15.0(prisma@5.15.0): - resolution: {integrity: sha512-wPTeTjbd2Q0abOeffN7zCDCbkp9C9cF+e9HPiI64lmpehyq2TepgXE+sY7FXr7Rhbb21prLMnhXX27/E11V09w==} + /@prisma/client@5.16.1(prisma@5.16.1): + resolution: {integrity: sha512-wM9SKQjF0qLxdnOZIVAIMKiz6Hu7vDt4FFAih85K1dk/Rr2mdahy6d3QP41K62N9O0DJJA//gUDA3Mp49xsKIg==} engines: {node: '>=16.13'} requiresBuild: true peerDependencies: @@ -3856,7 +3856,7 @@ packages: prisma: optional: true dependencies: - prisma: 5.15.0 + prisma: 5.16.1 /@prisma/client@5.7.0: resolution: {integrity: sha512-cZmglCrfNbYpzUtz7HscVHl38e9CrUs31nrVoGUK1nIPXGgt8hT4jj2s657UXcNdQ/jBUxDgGmHyu2Nyrq1txg==} @@ -3869,28 +3869,28 @@ packages: optional: true dev: true - /@prisma/debug@5.15.0: - resolution: {integrity: sha512-QpEAOjieLPc/4sMny/WrWqtpIAmBYsgqwWlWwIctqZO0AbhQ9QcT6x2Ut3ojbDo/pFRCCA1Z1+xm2MUy7fAkZA==} + /@prisma/debug@5.16.1: + resolution: {integrity: sha512-JsNgZAg6BD9RInLSrg7ZYzo11N7cVvYArq3fHGSD89HSgtN0VDdjV6bib7YddbcO6snzjchTiLfjeTqBjtArVQ==} /@prisma/debug@5.7.0: resolution: {integrity: sha512-tZ+MOjWlVvz1kOEhNYMa4QUGURY+kgOUBqLHYIV8jmCsMuvA1tWcn7qtIMLzYWCbDcQT4ZS8xDgK0R2gl6/0wA==} dev: false - /@prisma/engines-version@5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022: - resolution: {integrity: sha512-3BEgZ41Qb4oWHz9kZNofToRvNeS4LZYaT9pienR1gWkjhky6t6K1NyeWNBkqSj2llgraUNbgMOCQPY4f7Qp5wA==} + /@prisma/engines-version@5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303: + resolution: {integrity: sha512-HkT2WbfmFZ9WUPyuJHhkiADxazHg8Y4gByrTSVeb3OikP6tjQ7txtSUGu9OBOBH0C13dPKN2qqH12xKtHu/Hiw==} /@prisma/engines-version@5.7.0-41.79fb5193cf0a8fdbef536e4b4a159cad677ab1b9: resolution: {integrity: sha512-V6tgRVi62jRwTm0Hglky3Scwjr/AKFBFtS+MdbsBr7UOuiu1TKLPc6xfPiyEN1+bYqjEtjxwGsHgahcJsd1rNg==} dev: false - /@prisma/engines@5.15.0: - resolution: {integrity: sha512-hXL5Sn9hh/ZpRKWiyPA5GbvF3laqBHKt6Vo70hYqqOhh5e0ZXDzHcdmxNvOefEFeqxra2DMz2hNbFoPvqrVe1w==} + /@prisma/engines@5.16.1: + resolution: {integrity: sha512-KkyF3eIUtBIyp5A/rJHCtwQO18OjpGgx18PzjyGcJDY/+vNgaVyuVd+TgwBgeq6NLdd1XMwRCI+58vinHsAdfA==} requiresBuild: true dependencies: - '@prisma/debug': 5.15.0 - '@prisma/engines-version': 5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022 - '@prisma/fetch-engine': 5.15.0 - '@prisma/get-platform': 5.15.0 + '@prisma/debug': 5.16.1 + '@prisma/engines-version': 5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303 + '@prisma/fetch-engine': 5.16.1 + '@prisma/get-platform': 5.16.1 /@prisma/engines@5.7.0: resolution: {integrity: sha512-TkOMgMm60n5YgEKPn9erIvFX2/QuWnl3GBo6yTRyZKk5O5KQertXiNnrYgSLy0SpsKmhovEPQb+D4l0SzyE7XA==} @@ -3902,12 +3902,12 @@ packages: '@prisma/get-platform': 5.7.0 dev: false - /@prisma/fetch-engine@5.15.0: - resolution: {integrity: sha512-z6AY5yyXxc20Klj7wwnfGP0iIUkVKzybqapT02zLYR/nf9ynaeN8bq73WRmi1TkLYn+DJ5Qy+JGu7hBf1pE78A==} + /@prisma/fetch-engine@5.16.1: + resolution: {integrity: sha512-oOkjaPU1lhcA/Rvr4GVfd1NLJBwExgNBE36Ueq7dr71kTMwy++a3U3oLd2ZwrV9dj9xoP6LjCcky799D9nEt4w==} dependencies: - '@prisma/debug': 5.15.0 - '@prisma/engines-version': 5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022 - '@prisma/get-platform': 5.15.0 + '@prisma/debug': 5.16.1 + '@prisma/engines-version': 5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303 + '@prisma/get-platform': 5.16.1 /@prisma/fetch-engine@5.7.0: resolution: {integrity: sha512-zIn/qmO+N/3FYe7/L9o+yZseIU8ivh4NdPKSkQRIHfg2QVTVMnbhGoTcecbxfVubeTp+DjcbjS0H9fCuM4W04w==} @@ -3917,10 +3917,10 @@ packages: '@prisma/get-platform': 5.7.0 dev: false - /@prisma/generator-helper@5.15.0: - resolution: {integrity: sha512-7pB3v57GU4Q/iBauGbvQQGenMJSu2ArQboge4Ca6bw0gA7nConfIHP48MdNIYCrBbNPcIVFmrNomyhqCb3IuWQ==} + /@prisma/generator-helper@5.16.1: + resolution: {integrity: sha512-WxV/msovIubvr20iIdPJN0MUj46J26ax+sV+vMQSCeVoHQW//xdJZoPnimG54M7+CA9kupXjVpgjiPX4rcKQeA==} dependencies: - '@prisma/debug': 5.15.0 + '@prisma/debug': 5.16.1 dev: false /@prisma/generator-helper@5.7.0: @@ -3929,10 +3929,10 @@ packages: '@prisma/debug': 5.7.0 dev: false - /@prisma/get-platform@5.15.0: - resolution: {integrity: sha512-1GULDkW4+/VQb73vihxCBSc4Chc2x88MA+O40tcZFjmBzG4/fF44PaXFxUqKSFltxU9L9GIMLhh0Gfkk/pUbtg==} + /@prisma/get-platform@5.16.1: + resolution: {integrity: sha512-R4IKnWnMkR2nUAbU5gjrPehdQYUUd7RENFD2/D+xXTNhcqczp0N+WEGQ3ViyI3+6mtVcjjNIMdnUTNyu3GxIgA==} dependencies: - '@prisma/debug': 5.15.0 + '@prisma/debug': 5.16.1 /@prisma/get-platform@5.7.0: resolution: {integrity: sha512-ZeV/Op4bZsWXuw5Tg05WwRI8BlKiRFhsixPcAM+5BKYSiUZiMKIi713tfT3drBq8+T0E1arNZgYSA9QYcglWNA==} @@ -3940,16 +3940,16 @@ packages: '@prisma/debug': 5.7.0 dev: false - /@prisma/internals@5.15.0: - resolution: {integrity: sha512-RTqzD4fTb74jENYPrn3bhD2vl56W84crSx58f7CyyCs2U3hKYIKfZ2kqMZ6psrqsVRCu7PNeCHdhM5kAimCimQ==} + /@prisma/internals@5.16.1: + resolution: {integrity: sha512-3N5i7PWNFU0qKulnQ8q5Nm8kZZxphFIeO0CvejgBS+7+9Cg9CEuJlwqwXpyT8MofvVe/7Q44zjhrenODNl5dTg==} dependencies: - '@prisma/debug': 5.15.0 - '@prisma/engines': 5.15.0 - '@prisma/fetch-engine': 5.15.0 - '@prisma/generator-helper': 5.15.0 - '@prisma/get-platform': 5.15.0 - '@prisma/prisma-schema-wasm': 5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022 - '@prisma/schema-files-loader': 5.15.0 + '@prisma/debug': 5.16.1 + '@prisma/engines': 5.16.1 + '@prisma/fetch-engine': 5.16.1 + '@prisma/generator-helper': 5.16.1 + '@prisma/get-platform': 5.16.1 + '@prisma/prisma-schema-wasm': 5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303 + '@prisma/schema-files-loader': 5.16.1 arg: 5.0.2 prompts: 2.4.2 dev: false @@ -3967,18 +3967,18 @@ packages: prompts: 2.4.2 dev: false - /@prisma/prisma-schema-wasm@5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022: - resolution: {integrity: sha512-bZYtXnHSP6nkZf20QZm4A/vzz3Psh+u6pMld4t6cdcZlQW0ZOZQ3/WWTOf5Pe+cqS/k4kciEM5urtH2SE01GCg==} + /@prisma/prisma-schema-wasm@5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303: + resolution: {integrity: sha512-l2yUdEkR3eKEBKsEs18/ZjMNsS7IUMLFWZOvtylhHs2pMY6UaxJN1ho0x8IB2z54VsKUp0fhqPm5LSi9FWmeCA==} dev: false /@prisma/prisma-schema-wasm@5.7.0-41.79fb5193cf0a8fdbef536e4b4a159cad677ab1b9: resolution: {integrity: sha512-w+HdQtux0dJDEn6BG3fgNn+fXErXiekj9n//uHRAgrmZghockJkhnikOmG8aSXjTb1Tu5DrGasBX+rYX6rHT1w==} dev: false - /@prisma/schema-files-loader@5.15.0: - resolution: {integrity: sha512-ZDIX4Gr5MdGOiik23DSYQ8cOd/Bkat+6yo5TbAF8UlKor9tJsrEVyGRo6DFu1AEvedjSeiwS88jD1dn03sxvyA==} + /@prisma/schema-files-loader@5.16.1: + resolution: {integrity: sha512-GRckmUI37R7MgheSBMTCBgV6Qg7geirKfhs2tHsD600vs38vKCHGXTuHWgJ2mZLO1hRwMIclCwRrIoob+JIw6Q==} dependencies: - '@prisma/prisma-schema-wasm': 5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022 + '@prisma/prisma-schema-wasm': 5.16.0-24.34ace0eb2704183d2c05b60b52fba5c43c13f303 fs-extra: 11.1.1 dev: false @@ -12479,13 +12479,13 @@ packages: hasBin: true dev: true - /prisma@5.15.0: - resolution: {integrity: sha512-JA81ACQSCi3a7NUOgonOIkdx8PAVkO+HbUOxmd00Yb8DgIIEpr2V9+Qe/j6MLxIgWtE/OtVQ54rVjfYRbZsCfw==} + /prisma@5.16.1: + resolution: {integrity: sha512-Z1Uqodk44diztImxALgJJfNl2Uisl9xDRvqybMKEBYJLNKNhDfAHf+ZIJbZyYiBhLMbKU9cYGdDVG5IIXEnL2Q==} engines: {node: '>=16.13'} hasBin: true requiresBuild: true dependencies: - '@prisma/engines': 5.15.0 + '@prisma/engines': 5.16.1 /process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} diff --git a/script/test-scaffold.ts b/script/test-scaffold.ts index 3d2941ae3..d841d2f4e 100644 --- a/script/test-scaffold.ts +++ b/script/test-scaffold.ts @@ -19,6 +19,6 @@ function run(cmd: string) { } run('npm init -y'); -run('npm i --no-audit --no-fund typescript prisma@5.15.x @prisma/client@5.15.x zod decimal.js @types/node'); +run('npm i --no-audit --no-fund typescript prisma@5.16.x @prisma/client@5.16.x zod decimal.js @types/node'); console.log('Test scaffold setup complete.'); diff --git a/tests/integration/test-run/package.json b/tests/integration/test-run/package.json index 12af545d3..e7af7e652 100644 --- a/tests/integration/test-run/package.json +++ b/tests/integration/test-run/package.json @@ -10,9 +10,9 @@ "author": "", "license": "ISC", "dependencies": { - "@prisma/client": "5.15.x", + "@prisma/client": "5.16.x", "@zenstackhq/runtime": "file:../../../packages/runtime/dist", - "prisma": "5.15.x", + "prisma": "5.16.x", "react": "^18.2.0", "swr": "^1.3.0", "typescript": "^4.9.3", diff --git a/tests/integration/tests/cli/plugins.test.ts b/tests/integration/tests/cli/plugins.test.ts index 462d966c0..5d811a0ac 100644 --- a/tests/integration/tests/cli/plugins.test.ts +++ b/tests/integration/tests/cli/plugins.test.ts @@ -75,7 +75,7 @@ describe('CLI Plugins Tests', () => { 'swr', '@tanstack/react-query@^5.0.0', '@trpc/server', - '@prisma/client@5.15.x', + '@prisma/client@5.16.x', `${path.join(__dirname, '../../../../.build/zenstackhq-language-' + ver + '.tgz')}`, `${path.join(__dirname, '../../../../.build/zenstackhq-sdk-' + ver + '.tgz')}`, `${path.join(__dirname, '../../../../.build/zenstackhq-runtime-' + ver + '.tgz')}`, @@ -85,7 +85,7 @@ describe('CLI Plugins Tests', () => { const devDepPkgs = [ 'typescript', '@types/react', - 'prisma@5.15.x', + 'prisma@5.16.x', `${path.join(__dirname, '../../../../.build/zenstack-' + ver + '.tgz')}`, `${path.join(__dirname, '../../../../.build/zenstackhq-tanstack-query-' + ver + '.tgz')}`, `${path.join(__dirname, '../../../../.build/zenstackhq-swr-' + ver + '.tgz')}`, diff --git a/tests/integration/tests/enhancements/with-policy/prisma-omit.test.ts b/tests/integration/tests/enhancements/with-policy/prisma-omit.test.ts index a9a1b49d2..0ce17e66f 100644 --- a/tests/integration/tests/enhancements/with-policy/prisma-omit.test.ts +++ b/tests/integration/tests/enhancements/with-policy/prisma-omit.test.ts @@ -1,7 +1,7 @@ import { loadSchema } from '@zenstackhq/testtools'; describe('prisma omit', () => { - it('test', async () => { + it('per query', async () => { const { prisma, enhance } = await loadSchema( ` model User { @@ -54,4 +54,70 @@ describe('prisma omit', () => { expect(found.value).toEqual(10); expect(found.profile.level).toBeUndefined(); }); + + it('global', async () => { + const { prisma, enhance } = await loadSchema( + ` + model User { + id String @id @default(cuid()) + name String + profile Profile? + age Int + value Int + @@allow('all', true) + } + + model Profile { + id String @id @default(cuid()) + user User @relation(fields: [userId], references: [id]) + userId String @unique + level Int + @@allow('all', true) + } + `, + { + previewFeatures: ['omitApi'], + prismaClientOptions: { + omit: { + user: { age: true, value: false }, + profile: { level: true }, + }, + }, + } + ); + + await prisma.user.create({ + data: { + name: 'John', + age: 25, + value: 10, + profile: { + create: { level: 2 }, + }, + }, + }); + + const db = enhance(); + + let found = await db.user.findFirst({ + include: { profile: true }, + }); + expect(found.age).toBeUndefined(); + expect(found.value).toEqual(10); + expect(found.profile.level).toBeUndefined(); + + found = await db.user.findFirst({ + omit: { age: false }, + include: { profile: true }, + }); + expect(found.age).toBe(25); + + found = await db.user.findFirst({ + select: { value: true, profile: true }, + }); + console.log(found); + expect(found.age).toBeUndefined(); + expect(found.value).toEqual(10); + expect(found.profile.level).toBeUndefined(); + }); }); diff --git a/tests/integration/tests/frameworks/nextjs/test-project/package.json b/tests/integration/tests/frameworks/nextjs/test-project/package.json index a0c2d4aa1..f225aeb02 100644 --- a/tests/integration/tests/frameworks/nextjs/test-project/package.json +++ b/tests/integration/tests/frameworks/nextjs/test-project/package.json @@ -9,7 +9,7 @@ "lint": "next lint" }, "dependencies": { - "@prisma/client": "5.15.x", + "@prisma/client": "5.16.x", "@types/node": "18.11.18", "@types/react": "18.0.27", "@types/react-dom": "18.0.10", @@ -22,6 +22,6 @@ "zod": "^3.22.4" }, "devDependencies": { - "prisma": "5.15.x" + "prisma": "5.16.x" } } diff --git a/tests/integration/tests/frameworks/trpc/test-project/package.json b/tests/integration/tests/frameworks/trpc/test-project/package.json index f0fbffbc3..f0000bdcf 100644 --- a/tests/integration/tests/frameworks/trpc/test-project/package.json +++ b/tests/integration/tests/frameworks/trpc/test-project/package.json @@ -9,7 +9,7 @@ "lint": "next lint" }, "dependencies": { - "@prisma/client": "5.15.x", + "@prisma/client": "5.16.x", "@tanstack/react-query": "^4.22.4", "@trpc/client": "^10.34.0", "@trpc/next": "^10.34.0", @@ -26,6 +26,6 @@ "zod": "^3.22.4" }, "devDependencies": { - "prisma": "5.15.x" + "prisma": "5.16.x" } } diff --git a/tests/regression/tests/issue-925.test.ts b/tests/regression/tests/issue-925.test.ts index 19ef210bf..b19d9d615 100644 --- a/tests/regression/tests/issue-925.test.ts +++ b/tests/regression/tests/issue-925.test.ts @@ -35,8 +35,7 @@ describe('Regression: issue 925', () => { ).resolves.toContain("Could not resolve reference to ReferenceTarget named 'test'."); }); - // eslint-disable-next-line jest/no-disabled-tests - it.skip('reference with this', async () => { + it('reference with this', async () => { await loadModel( ` model User {