From e7579bbe8d7b96bd2a9b8d358582f15b06c1a940 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Nov 2026 12:06:24 -0800 Subject: [PATCH 1/2] [CI] Bump version 3.10.3 (#2925) Co-authored-by: ymc9 <104139426+ymc9@users.noreply.github.com> --- package.json | 2 +- packages/auth-adapters/better-auth/package.json | 2 +- packages/cli/package.json | 2 +- packages/clients/client-helpers/package.json | 2 +- packages/clients/fetch-client/package.json | 2 +- packages/clients/tanstack-query/package.json | 2 +- packages/common-helpers/package.json | 2 +- packages/config/eslint-config/package.json | 2 +- packages/config/tsdown-config/package.json | 2 +- packages/config/typescript-config/package.json | 2 +- packages/config/vitest-config/package.json | 2 +- packages/create-zenstack/package.json | 2 +- packages/ide/vscode/package.json | 2 +- packages/language/package.json | 2 +- packages/orm/package.json | 2 +- packages/plugins/policy/package.json | 2 +- packages/plugins/soft-delete/package.json | 2 +- packages/schema/package.json | 2 +- packages/sdk/package.json | 2 +- packages/server/package.json | 2 +- packages/testtools/package.json | 2 +- packages/zod/package.json | 2 +- samples/orm/package.json | 2 +- samples/taskforge/package.json | 2 +- tests/e2e/package.json | 2 +- tests/regression/package.json | 2 +- tests/runtimes/bun/package.json | 2 +- tests/runtimes/edge-runtime/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 00398b36f..a8f674ac9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "zenstack-v3", "displayName": "ZenStack", "description": "ZenStack", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json index 08e806e97..1b7c48b4e 100644 --- a/packages/auth-adapters/better-auth/package.json +++ b/packages/auth-adapters/better-auth/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/better-auth", "displayName": "ZenStack Better Auth Adapter", "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/cli/package.json b/packages/cli/package.json index 02650d855..16c9baef1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/cli", "displayName": "ZenStack CLI", "description": "FullStack database toolkit with built-in access control and automatic API generation.", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/clients/client-helpers/package.json b/packages/clients/client-helpers/package.json index 43c235378..a908d2b6d 100644 --- a/packages/clients/client-helpers/package.json +++ b/packages/clients/client-helpers/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/client-helpers", "displayName": "ZenStack Client Helpers", "description": "Helpers for implementing clients that consume ZenStack's CRUD service", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/clients/fetch-client/package.json b/packages/clients/fetch-client/package.json index f86c226ff..ee2c1445b 100644 --- a/packages/clients/fetch-client/package.json +++ b/packages/clients/fetch-client/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/fetch-client", "displayName": "ZenStack Fetch Client", "description": "Simple fetch-based client for consuming ZenStack's RPC-style CRUD API", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json index e0bdb8515..84fb1cc62 100644 --- a/packages/clients/tanstack-query/package.json +++ b/packages/clients/tanstack-query/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/tanstack-query", "displayName": "ZenStack TanStack Query Integration", "description": "TanStack Query Client for consuming ZenStack v3's CRUD service", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json index 638b02c4a..2991162cf 100644 --- a/packages/common-helpers/package.json +++ b/packages/common-helpers/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/common-helpers", "displayName": "ZenStack Common Helpers", "description": "ZenStack Common Helpers", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json index ddc601ae4..890cc00da 100644 --- a/packages/config/eslint-config/package.json +++ b/packages/config/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/eslint-config", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "private": true, "license": "MIT" diff --git a/packages/config/tsdown-config/package.json b/packages/config/tsdown-config/package.json index 35e896dce..c68bed400 100644 --- a/packages/config/tsdown-config/package.json +++ b/packages/config/tsdown-config/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/tsdown-config", - "version": "3.10.2", + "version": "3.10.3", "private": true, "type": "module", "license": "MIT", diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json index 55e740d2d..05dc9ac71 100644 --- a/packages/config/typescript-config/package.json +++ b/packages/config/typescript-config/package.json @@ -1,6 +1,6 @@ { "name": "@zenstackhq/typescript-config", - "version": "3.10.2", + "version": "3.10.3", "private": true, "license": "MIT" } diff --git a/packages/config/vitest-config/package.json b/packages/config/vitest-config/package.json index 624de4d11..fbfada4b1 100644 --- a/packages/config/vitest-config/package.json +++ b/packages/config/vitest-config/package.json @@ -1,7 +1,7 @@ { "name": "@zenstackhq/vitest-config", "type": "module", - "version": "3.10.2", + "version": "3.10.3", "private": true, "license": "MIT", "exports": { diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json index 74f37f09a..7ceaa83d0 100644 --- a/packages/create-zenstack/package.json +++ b/packages/create-zenstack/package.json @@ -2,7 +2,7 @@ "name": "create-zenstack", "displayName": "Create ZenStack", "description": "Create a new ZenStack project", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json index a997f11c1..9458a58a1 100644 --- a/packages/ide/vscode/package.json +++ b/packages/ide/vscode/package.json @@ -1,7 +1,7 @@ { "name": "zenstack-v3", "publisher": "zenstack", - "version": "3.10.2", + "version": "3.10.3", "displayName": "ZenStack V3 Language Tools", "description": "VSCode extension for ZenStack (v3) ZModel language", "private": true, diff --git a/packages/language/package.json b/packages/language/package.json index a323203e7..ae040537c 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/language", "displayName": "ZenStack Language Tooling", "description": "ZenStack ZModel language specification", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/orm/package.json b/packages/orm/package.json index 26c460a0e..b4aac21b4 100644 --- a/packages/orm/package.json +++ b/packages/orm/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/orm", "displayName": "ZenStack ORM", "description": "ZenStack ORM", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json index f0b15f6b5..3fb1394f5 100644 --- a/packages/plugins/policy/package.json +++ b/packages/plugins/policy/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/plugin-policy", "displayName": "ZenStack Access Policy Plugin", "description": "ZenStack plugin that enforces access control policies defined in the schema", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/plugins/soft-delete/package.json b/packages/plugins/soft-delete/package.json index 259e406e7..c602a5855 100644 --- a/packages/plugins/soft-delete/package.json +++ b/packages/plugins/soft-delete/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/plugin-soft-delete", "displayName": "ZenStack Soft Delete Plugin", "description": "ZenStack plugin that implements soft-delete by intercepting Kysely queries", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/schema/package.json b/packages/schema/package.json index 90b53de02..e1bed28c2 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/schema", "displayName": "ZenStack Schema Object Model", "description": "TypeScript representation of ZModel schema", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b51c4cace..5480d4108 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/sdk", "displayName": "ZenStack SDK", "description": "Utilities for building ZenStack plugins", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/server/package.json b/packages/server/package.json index d9f423b66..21ce43702 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/server", "displayName": "ZenStack Automatic CRUD Server", "description": "ZenStack automatic CRUD API handlers and server adapters for popular frameworks", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/testtools/package.json b/packages/testtools/package.json index 78a0c7a56..2d3f3c0ca 100644 --- a/packages/testtools/package.json +++ b/packages/testtools/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/testtools", "displayName": "ZenStack Test Tools", "description": "ZenStack Test Tools", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/packages/zod/package.json b/packages/zod/package.json index fb413a5c2..c69aaead9 100644 --- a/packages/zod/package.json +++ b/packages/zod/package.json @@ -2,7 +2,7 @@ "name": "@zenstackhq/zod", "displayName": "ZenStack Zod Integration", "description": "Automatically deriving Zod schemas from ZModel schemas", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "author": { "name": "ZenStack Team", diff --git a/samples/orm/package.json b/samples/orm/package.json index 5201ee9f6..020464c03 100644 --- a/samples/orm/package.json +++ b/samples/orm/package.json @@ -1,6 +1,6 @@ { "name": "sample-orm", - "version": "3.10.2", + "version": "3.10.3", "description": "", "main": "index.js", "private": true, diff --git a/samples/taskforge/package.json b/samples/taskforge/package.json index 9c8eadd2c..b77afcc96 100644 --- a/samples/taskforge/package.json +++ b/samples/taskforge/package.json @@ -1,6 +1,6 @@ { "name": "taskforge", - "version": "3.10.2", + "version": "3.10.3", "type": "module", "private": true, "description": "A CLI for a team collaboration / project-tracking platform, built on ZenStack v3 (ORM) and better-auth.", diff --git a/tests/e2e/package.json b/tests/e2e/package.json index 010da3537..b3048ba7b 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -1,6 +1,6 @@ { "name": "e2e", - "version": "3.10.2", + "version": "3.10.3", "private": true, "type": "module", "scripts": { diff --git a/tests/regression/package.json b/tests/regression/package.json index 42f2316fc..f7ed4cd42 100644 --- a/tests/regression/package.json +++ b/tests/regression/package.json @@ -1,6 +1,6 @@ { "name": "regression", - "version": "3.10.2", + "version": "3.10.3", "private": true, "type": "module", "scripts": { diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json index e428c8751..748598b1b 100644 --- a/tests/runtimes/bun/package.json +++ b/tests/runtimes/bun/package.json @@ -1,6 +1,6 @@ { "name": "bun-e2e", - "version": "3.10.2", + "version": "3.10.3", "private": true, "type": "module", "scripts": { diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json index 40ab06d2f..961c32e4d 100644 --- a/tests/runtimes/edge-runtime/package.json +++ b/tests/runtimes/edge-runtime/package.json @@ -1,6 +1,6 @@ { "name": "edge-runtime-e2e", - "version": "3.10.2", + "version": "3.10.3", "private": true, "type": "module", "scripts": { From e839e34516f7520f50b4835002f106c62b40c5f3 Mon Sep 17 00:00:00 2001 From: kuldeepzz <125124603+kuldeepsinh19@users.noreply.github.com> Date: Fri, 20 Nov 2026 02:29:51 +0530 Subject: [PATCH 2/2] fix(better-auth): support compound where in update and delete (#2901) Co-authored-by: Yiming Cao --- .../auth-adapters/better-auth/package.json | 1 + .../auth-adapters/better-auth/src/adapter.ts | 115 ++++++--- .../better-auth/test/adapter-db.test.ts | 238 ++++++++++++++++++ pnpm-lock.yaml | 3 + 4 files changed, 319 insertions(+), 38 deletions(-) create mode 100644 packages/auth-adapters/better-auth/test/adapter-db.test.ts diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json index 1b7c48b4e..885e82384 100644 --- a/packages/auth-adapters/better-auth/package.json +++ b/packages/auth-adapters/better-auth/package.json @@ -70,6 +70,7 @@ "@types/tmp": "catalog:", "@zenstackhq/cli": "workspace:*", "@zenstackhq/eslint-config": "workspace:*", + "@zenstackhq/testtools": "workspace:*", "@zenstackhq/tsdown-config": "workspace:*", "@zenstackhq/typescript-config": "workspace:*", "@zenstackhq/vitest-config": "workspace:*", diff --git a/packages/auth-adapters/better-auth/src/adapter.ts b/packages/auth-adapters/better-auth/src/adapter.ts index c393f3319..357cca2ce 100644 --- a/packages/auth-adapters/better-auth/src/adapter.ts +++ b/packages/auth-adapters/better-auth/src/adapter.ts @@ -1,5 +1,6 @@ import type { BetterAuthOptions, Where } from 'better-auth'; import { BetterAuthError } from '@better-auth/core/error'; +import { ORMErrorReason, QueryUtils } from '@zenstackhq/orm'; import type { ClientContract, ModelOperations, UpdateInput } from '@zenstackhq/orm'; import type { GetModels, SchemaDef } from '@zenstackhq/orm/schema'; import { @@ -44,6 +45,14 @@ export const zenstackAdapter = (db: ClientContract w.operator === 'eq' || !w.operator; + const convertWhereCondition = (model: string, w: Where) => ({ + [getFieldName({ model, field: w.field })]: isEqualityCondition(w) + ? w.value + : { + [operatorToORMOperator(w.operator!)]: w.value, + }, + }); const convertWhereClause = (model: string, where?: Where[]): any => { if (!where || !where.length) return {}; if (where.length === 1) { @@ -51,37 +60,12 @@ export const zenstackAdapter = (db: ClientContract w.connector === 'AND' || !w.connector); const or = where.filter((w) => w.connector === 'OR'); - const andClause = and.map((w) => { - return { - [getFieldName({ model, field: w.field })]: - w.operator === 'eq' || !w.operator - ? w.value - : { - [operatorToORMOperator(w.operator)]: w.value, - }, - }; - }); - const orClause = or.map((w) => { - return { - [getFieldName({ model, field: w.field })]: - w.operator === 'eq' || !w.operator - ? w.value - : { - [operatorToORMOperator(w.operator)]: w.value, - }, - }; - }); + const andClause = and.map((w) => convertWhereCondition(model, w)); + const orClause = or.map((w) => convertWhereCondition(model, w)); return { ...(andClause.length ? { AND: andClause } : {}), @@ -89,6 +73,37 @@ export const zenstackAdapter = (db: ClientContract { + const result: Record = {}; + const and: Record[] = []; + const or: Record[] = []; + for (const w of where) { + const field = getFieldName({ model, field: w.field }); + if (w.connector === 'OR') { + or.push(convertWhereCondition(model, w)); + } else if (isEqualityCondition(w) && !(field in result)) { + result[field] = w.value; + } else { + and.push(convertWhereCondition(model, w)); + } + } + if (and.length) result['AND'] = and; + if (or.length) result['OR'] = or; + + const isUnique = QueryUtils.getUniqueFields(db.$schema, model).some( + (unique) => 'def' in unique && result[unique.name] !== undefined && result[unique.name] !== null, + ); + return { where: result, isUnique }; + }; + + // checked by `reason` rather than `instanceof ORMError`, in case the app loads another copy of the ORM + const isNotFoundError = (err: unknown) => + (err as { reason?: unknown } | null)?.reason === ORMErrorReason.NOT_FOUND; + function requireModelDb(db: ClientContract, model: string) { const modelDb = db[model as keyof typeof db]; if (!modelDb) { @@ -145,11 +160,32 @@ export const zenstackAdapter = (db: ClientContract { const modelDb = requireModelDb(db, model); - const whereClause = convertWhereClause(model, where); - return await modelDb.update({ - where: whereClause, - data: update as UpdateInput, any>, - }); + const data = update as UpdateInput, any>; + const uniqueWhere = convertUniqueWhereClause(model, where); + let updateWhere = uniqueWhere.where; + if (!uniqueWhere.isUnique) { + // No unique field to select the row by: find a matching row, then update it by its id, + // keeping the original conditions as a guard in case the row changed in between. + const filter = convertWhereClause(model, where); + const idFields = QueryUtils.requireIdFields(db.$schema, model); + const found: any = await modelDb.findFirst({ + where: filter, + select: Object.fromEntries(idFields.map((f) => [f, true])), + }); + if (!found) return null; + const idWhere = + idFields.length === 1 + ? { [idFields[0]!]: found[idFields[0]!] } + : { [idFields.join('_')]: Object.fromEntries(idFields.map((f) => [f, found[f]])) }; + updateWhere = { ...idWhere, AND: [filter] }; + } + try { + return await modelDb.update({ where: updateWhere as any, data }); + } catch (err) { + // better-auth expects `null` when no row matches + if (isNotFoundError(err)) return null; + throw err; + } }, async updateMany({ model, where, update }) { @@ -164,13 +200,16 @@ export const zenstackAdapter = (db: ClientContract { const modelDb = requireModelDb(db, model); - const whereClause = convertWhereClause(model, where); + const uniqueWhere = convertUniqueWhereClause(model, where); + if (!uniqueWhere.isUnique) { + await modelDb.deleteMany({ where: convertWhereClause(model, where) }); + return; + } try { - await modelDb.delete({ - where: whereClause, - }); - } catch { + await modelDb.delete({ where: uniqueWhere.where as any }); + } catch (err) { // If the record doesn't exist, we don't want to throw an error + if (!isNotFoundError(err)) throw err; } }, diff --git a/packages/auth-adapters/better-auth/test/adapter-db.test.ts b/packages/auth-adapters/better-auth/test/adapter-db.test.ts new file mode 100644 index 000000000..a6ff14265 --- /dev/null +++ b/packages/auth-adapters/better-auth/test/adapter-db.test.ts @@ -0,0 +1,238 @@ +import type { BetterAuthOptions } from '@better-auth/core'; +import type { BetterAuthDBSchema } from 'better-auth/db'; +import { createTestClient } from '@zenstackhq/testtools'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; +import { zenstackAdapter } from '../src/adapter'; + +const zmodel = ` +model SsoProvider { + id String @id + providerId String @unique + issuer String +} + +model DeviceCode { + id String @id + status String + userId String? +} + +model ApiToken { + id String @id + token String @unique + userId String +} +`; + +// Plugin models, so better-auth's adapter factory knows the fields and transforms `where` like it does at runtime. +const pluginSchema = { + ssoProvider: { + modelName: 'ssoProvider', + fields: { + providerId: { type: 'string', required: true, unique: true }, + issuer: { type: 'string', required: true }, + }, + }, + deviceCode: { + modelName: 'deviceCode', + fields: { + status: { type: 'string', required: true }, + userId: { type: 'string', required: false }, + }, + }, + apiToken: { + modelName: 'apiToken', + fields: { + token: { type: 'string', required: true, unique: true }, + userId: { type: 'string', required: true }, + }, + }, +} satisfies BetterAuthDBSchema; + +const authOptions = { + plugins: [{ id: 'test-models', schema: pluginSchema }], +} as unknown as BetterAuthOptions; + +describe('ZenStack Better Auth adapter with a database', () => { + let db: any; + let adapter: ReturnType>; + + beforeEach(async () => { + db = await createTestClient(zmodel); + const provider = db.$schema.provider.type === 'postgresql' ? 'postgresql' : 'sqlite'; + adapter = zenstackAdapter(db, { provider })(authOptions); + }); + + afterEach(async () => { + await db?.$disconnect(); + }); + + it('updates with a unique field plus extra conditions, like @better-auth/sso row locks (#2694)', async () => { + await db.ssoProvider.create({ data: { id: 'sso-1', providerId: 'acme', issuer: 'https://idp.acme.test' } }); + + const row = await adapter.update<{ id: string; providerId: string }>({ + model: 'ssoProvider', + where: [ + { field: 'id', value: 'sso-1' }, + { field: 'providerId', value: 'acme' }, + ], + update: { providerId: 'acme' }, + }); + + expect(row).toMatchObject({ id: 'sso-1', providerId: 'acme' }); + }); + + it('updates with a compound where inside a transaction (#2694)', async () => { + await db.ssoProvider.create({ data: { id: 'sso-1', providerId: 'acme', issuer: 'https://idp.acme.test' } }); + + const row = await adapter.transaction((trx) => + trx.update<{ id: string; issuer: string }>({ + model: 'ssoProvider', + where: [ + { field: 'id', value: 'sso-1' }, + { field: 'providerId', value: 'acme' }, + ], + update: { issuer: 'https://idp2.acme.test' }, + }), + ); + + expect(row).toMatchObject({ id: 'sso-1', issuer: 'https://idp2.acme.test' }); + }); + + it('updates a single row when the where has no unique field (#2694)', async () => { + await db.deviceCode.create({ data: { id: 'device-1', status: 'pending', userId: null } }); + await db.deviceCode.create({ data: { id: 'device-2', status: 'pending', userId: null } }); + + const row = await adapter.update<{ id: string }>({ + model: 'deviceCode', + where: [{ field: 'status', value: 'pending' }], + update: { status: 'approved' }, + }); + + await expect(db.deviceCode.count({ where: { status: 'approved' } })).resolves.toBe(1); + await expect(db.deviceCode.findUnique({ where: { id: row!.id } })).resolves.toMatchObject({ + status: 'approved', + }); + }); + + it('returns null when a compound update matches nothing (#2694)', async () => { + await db.ssoProvider.create({ data: { id: 'sso-1', providerId: 'acme', issuer: 'https://idp.acme.test' } }); + + const row = await adapter.update({ + model: 'ssoProvider', + where: [ + { field: 'id', value: 'sso-1' }, + { field: 'providerId', value: 'other' }, + ], + update: { providerId: 'other' }, + }); + + expect(row).toBeNull(); + await expect(db.ssoProvider.findUnique({ where: { id: 'sso-1' } })).resolves.toMatchObject({ + providerId: 'acme', + }); + }); + + it('claims a row only once with a compare-and-swap update, like device authorization (#2694)', async () => { + await db.deviceCode.create({ data: { id: 'device-1', status: 'pending', userId: null } }); + const claim = (userId: string) => + adapter.update<{ id: string; userId: string | null }>({ + model: 'deviceCode', + where: [ + { field: 'id', value: 'device-1' }, + { field: 'status', value: 'pending' }, + { field: 'userId', value: null }, + ], + update: { userId }, + }); + + await expect(claim('user-1')).resolves.toMatchObject({ id: 'device-1', userId: 'user-1' }); + await expect(claim('user-2')).resolves.toBeNull(); + await expect(db.deviceCode.findUnique({ where: { id: 'device-1' } })).resolves.toMatchObject({ + userId: 'user-1', + }); + }); + + it('updates without a unique field and returns the updated row (#2694)', async () => { + await db.deviceCode.create({ data: { id: 'device-1', status: 'pending', userId: null } }); + + const row = await adapter.update({ + model: 'deviceCode', + where: [{ field: 'status', value: 'pending' }], + update: { status: 'approved' }, + }); + + // the update changes the filtered field, so the row must not be read back with the original filter + expect(row).toMatchObject({ id: 'device-1', status: 'approved' }); + }); + + it('returns null when updating a missing row by id (#2694)', async () => { + const row = await adapter.update({ + model: 'deviceCode', + where: [{ field: 'id', value: 'missing' }], + update: { status: 'approved' }, + }); + + expect(row).toBeNull(); + }); + + it('updates rows matched with OR conditions (#2694)', async () => { + await db.deviceCode.create({ data: { id: 'device-1', status: 'pending', userId: null } }); + + const row = await adapter.update({ + model: 'deviceCode', + where: [ + { field: 'status', value: 'denied', connector: 'OR' }, + { field: 'status', value: 'pending', connector: 'OR' }, + ], + update: { status: 'approved' }, + }); + + expect(row).toMatchObject({ id: 'device-1', status: 'approved' }); + }); + + it('deletes with a unique field plus extra conditions (#2694)', async () => { + await db.apiToken.create({ data: { id: 'token-1', token: 'secret', userId: 'user-1' } }); + + await adapter.delete({ + model: 'apiToken', + where: [ + { field: 'id', value: 'token-1' }, + { field: 'userId', value: 'user-1' }, + ], + }); + + await expect(db.apiToken.findUnique({ where: { id: 'token-1' } })).resolves.toBeNull(); + }); + + it('keeps the row when a compound delete matches nothing (#2694)', async () => { + await db.apiToken.create({ data: { id: 'token-1', token: 'secret', userId: 'user-1' } }); + + await expect( + adapter.delete({ + model: 'apiToken', + where: [ + { field: 'id', value: 'token-1' }, + { field: 'userId', value: 'user-2' }, + ], + }), + ).resolves.toBeUndefined(); + + await expect(db.apiToken.findUnique({ where: { id: 'token-1' } })).resolves.not.toBeNull(); + }); + + it('deletes without a unique field (#2694)', async () => { + await db.apiToken.create({ data: { id: 'token-1', token: 'secret', userId: 'user-1' } }); + await db.apiToken.create({ data: { id: 'token-2', token: 'other', userId: 'user-2' } }); + + await adapter.delete({ model: 'apiToken', where: [{ field: 'userId', value: 'user-1' }] }); + + await expect(db.apiToken.findMany({ orderBy: { id: 'asc' } })).resolves.toMatchObject([{ id: 'token-2' }]); + }); + + it('does not throw when deleting a missing row by id', async () => { + await expect( + adapter.delete({ model: 'apiToken', where: [{ field: 'id', value: 'missing' }] }), + ).resolves.toBeUndefined(); + }); +}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d153c351..0695b6d4c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -193,6 +193,9 @@ importers: '@zenstackhq/eslint-config': specifier: workspace:* version: link:../../config/eslint-config + '@zenstackhq/testtools': + specifier: workspace:* + version: link:../../testtools '@zenstackhq/tsdown-config': specifier: workspace:* version: link:../../config/tsdown-config