From 6d425fd8e6fc94ed521d9b83dae9399ec56ad067 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Tue, 28 Apr 2026 16:23:30 -0700 Subject: [PATCH 1/3] fix(better-auth): resolve type incompatibility from duplicate @better-auth/core instances pnpm creates two instances of @better-auth/core due to different peer dependency contexts (@better-auth/cli pulls in @better-auth/telemetry which creates a separate resolution). Importing BetterAuthOptions and Where directly from @better-auth/core resolved to the wrong instance, making those types incompatible with the ones used internally by better-auth/adapters. Fix by importing BetterAuthOptions and Where from better-auth instead, which resolves to the same instance that createAdapterFactory uses. Also pin @better-auth/core via pnpm override to prevent further drift. Co-Authored-By: Claude Sonnet 4.6 --- package.json | 3 ++- packages/auth-adapters/better-auth/src/adapter.ts | 5 ++--- pnpm-lock.yaml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5637d83c2..7742f77e7 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,8 @@ "overrides": { "cookie@<0.7.0": ">=0.7.0", "lodash-es@>=4.0.0 <=4.17.22": ">=4.17.23", - "lodash@>=4.0.0 <=4.17.22": ">=4.17.23" + "lodash@>=4.0.0 <=4.17.22": ">=4.17.23", + "@better-auth/core": "1.4.19" } }, "funding": "https://github.com/sponsors/zenstackhq" diff --git a/packages/auth-adapters/better-auth/src/adapter.ts b/packages/auth-adapters/better-auth/src/adapter.ts index 27b2d4f59..2c498278e 100644 --- a/packages/auth-adapters/better-auth/src/adapter.ts +++ b/packages/auth-adapters/better-auth/src/adapter.ts @@ -1,5 +1,4 @@ -import type { BetterAuthOptions } from '@better-auth/core'; -import type { DBAdapter, Where } from '@better-auth/core/db/adapter'; +import type { BetterAuthOptions, Where } from 'better-auth'; import { BetterAuthError } from '@better-auth/core/error'; import type { ClientContract, ModelOperations, UpdateInput } from '@zenstackhq/orm'; import type { GetModels, SchemaDef } from '@zenstackhq/orm/schema'; @@ -213,7 +212,7 @@ export const zenstackAdapter = (db: ClientContract => { + return (options: BetterAuthOptions) => { lazyOptions = options; return adapter(options); }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9f654c7e0..a1d27680a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,6 +101,7 @@ overrides: cookie@<0.7.0: '>=0.7.0' lodash-es@>=4.0.0 <=4.17.22: '>=4.17.23' lodash@>=4.0.0 <=4.17.22: '>=4.17.23' + '@better-auth/core': 1.4.19 importers: From 39446875b0678301ef2d7a96ab8583be87c8e00c Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Tue, 28 Apr 2026 16:25:23 -0700 Subject: [PATCH 2/3] chore: bump Kysely --- pnpm-lock.yaml | 88 ++++++++++++++++++++++++++++++--------------- pnpm-workspace.yaml | 2 +- 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1d27680a..fbbfc9426 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,8 +43,8 @@ catalogs: specifier: ^10.4.3 version: 10.6.0 kysely: - specifier: ~0.28.16 - version: 0.28.16 + specifier: 0.29.0-rc.0 + version: 0.29.0-rc.0 langium: specifier: 3.5.0 version: 3.5.0 @@ -170,10 +170,10 @@ importers: devDependencies: '@better-auth/cli': specifier: 1.4.19 - version: 1.4.19(@better-fetch/fetch@1.1.21)(@sveltejs/kit@2.53.2(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.53.5)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(svelte@5.53.5)(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(@types/better-sqlite3@7.6.13)(@types/sql.js@1.4.9)(better-call@1.1.8(zod@4.3.6))(bun-types@1.3.3)(jose@6.1.2)(kysely@0.28.16)(magicast@0.5.1)(mysql2@3.16.1)(nanostores@1.0.1)(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sql.js@1.13.0)(svelte@5.53.5)(vitest@4.0.14(@edge-runtime/vm@5.0.0)(@types/node@25.5.2)(happy-dom@20.8.9)(jiti@2.6.1)(jsdom@27.1.0)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3)) + version: 1.4.19(@better-fetch/fetch@1.1.21)(@sveltejs/kit@2.53.2(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.53.5)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(svelte@5.53.5)(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(@types/better-sqlite3@7.6.13)(@types/sql.js@1.4.9)(better-call@1.1.8(zod@4.3.6))(bun-types@1.3.3)(jose@6.1.2)(kysely@0.29.0-rc.0)(magicast@0.5.1)(mysql2@3.16.1)(nanostores@1.0.1)(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sql.js@1.13.0)(svelte@5.53.5)(vitest@4.0.14(@edge-runtime/vm@5.0.0)(@types/node@25.5.2)(happy-dom@20.8.9)(jiti@2.6.1)(jsdom@27.1.0)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3)) '@better-auth/core': specifier: 1.4.19 - version: 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1) + version: 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1) '@types/tmp': specifier: 'catalog:' version: 0.2.6 @@ -194,10 +194,10 @@ importers: version: link:../../config/vitest-config better-auth: specifier: 1.4.19 - version: 1.4.19(f276412306c0f31e69da8456c8cd9497) + version: 1.4.19(52fc553c3e1a6dccbcb4b75397bc07d8) kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 tmp: specifier: 'catalog:' version: 0.2.5 @@ -605,7 +605,7 @@ importers: version: 1.3.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 mysql2: specifier: 'catalog:' version: 3.16.1 @@ -678,7 +678,7 @@ importers: version: link:../../orm kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 ts-pattern: specifier: 'catalog:' version: 5.7.1 @@ -756,7 +756,7 @@ importers: version: 10.6.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 packages/server: dependencies: @@ -880,7 +880,7 @@ importers: version: 11.1.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 mysql2: specifier: 'catalog:' version: 3.16.1 @@ -969,7 +969,7 @@ importers: version: 12.5.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 lorem-ipsum: specifier: ^2.0.8 version: 2.0.8 @@ -1079,7 +1079,7 @@ importers: version: 12.5.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 zod: specifier: 'catalog:' version: 4.1.12 @@ -1119,7 +1119,7 @@ importers: version: 12.5.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 lorem-ipsum: specifier: ^2.0.8 version: 2.0.8 @@ -1204,7 +1204,7 @@ importers: version: 10.6.0 kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 ts-pattern: specifier: 'catalog:' version: 5.7.1 @@ -1290,10 +1290,10 @@ importers: version: link:../../../packages/testtools kysely: specifier: 'catalog:' - version: 0.28.16 + version: 0.29.0-rc.0 kysely-bun-sqlite: specifier: ^0.4.0 - version: 0.4.0(kysely@0.28.16) + version: 0.4.0(kysely@0.29.0-rc.0) pg: specifier: 'catalog:' version: 8.16.3 @@ -6573,6 +6573,10 @@ packages: resolution: {integrity: sha512-3i5pmOiZvMDj00qhrIVbH0AnioVTx22DMP7Vn5At4yJO46iy+FM8Y/g61ltenLVSo3fiO8h8Q3QOFgf/gQ72ww==} engines: {node: '>=20.0.0'} + kysely@0.29.0-rc.0: + resolution: {integrity: sha512-l4XqxSrriS0ji3Z4kisx+9Ql/2/As5k+XHR+33krJ7cGfBLv/gjPF9VKEuklNDrDgJcAnI0yJlsfFwOU8dR4eA==} + engines: {node: '>=20.0.0'} + langium-cli@3.5.0: resolution: {integrity: sha512-TPIzIiMAQwTPPphtHGSrFXo4t0orx3aRh0syg9jnOihvBkBDvsQdJP9fBo9hp5Qaosklpc2CfbH0wh/dkgZcJA==} engines: {node: '>=18.0.0'} @@ -9725,25 +9729,25 @@ snapshots: '@bcoe/v8-coverage@1.0.2': {} - '@better-auth/cli@1.4.19(@better-fetch/fetch@1.1.21)(@sveltejs/kit@2.53.2(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.53.5)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(svelte@5.53.5)(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(@types/better-sqlite3@7.6.13)(@types/sql.js@1.4.9)(better-call@1.1.8(zod@4.3.6))(bun-types@1.3.3)(jose@6.1.2)(kysely@0.28.16)(magicast@0.5.1)(mysql2@3.16.1)(nanostores@1.0.1)(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sql.js@1.13.0)(svelte@5.53.5)(vitest@4.0.14(@edge-runtime/vm@5.0.0)(@types/node@25.5.2)(happy-dom@20.8.9)(jiti@2.6.1)(jsdom@27.1.0)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))': + '@better-auth/cli@1.4.19(@better-fetch/fetch@1.1.21)(@sveltejs/kit@2.53.2(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.53.5)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(svelte@5.53.5)(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(@types/better-sqlite3@7.6.13)(@types/sql.js@1.4.9)(better-call@1.1.8(zod@4.3.6))(bun-types@1.3.3)(jose@6.1.2)(kysely@0.29.0-rc.0)(magicast@0.5.1)(mysql2@3.16.1)(nanostores@1.0.1)(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sql.js@1.13.0)(svelte@5.53.5)(vitest@4.0.14(@edge-runtime/vm@5.0.0)(@types/node@25.5.2)(happy-dom@20.8.9)(jiti@2.6.1)(jsdom@27.1.0)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))': dependencies: '@babel/core': 7.29.0 '@babel/preset-react': 7.28.5(@babel/core@7.29.0) '@babel/preset-typescript': 7.28.5(@babel/core@7.29.0) - '@better-auth/core': 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1) - '@better-auth/telemetry': 1.4.19(@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1)) + '@better-auth/core': 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1) + '@better-auth/telemetry': 1.4.19(@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1)) '@better-auth/utils': 0.3.0 '@clack/prompts': 0.11.0 '@mrleebo/prisma-ast': 0.13.1 '@prisma/client': 5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)) '@types/pg': 8.16.0 - better-auth: 1.4.19(f276412306c0f31e69da8456c8cd9497) + better-auth: 1.4.19(52fc553c3e1a6dccbcb4b75397bc07d8) better-sqlite3: 12.5.0 c12: 3.3.3(magicast@0.5.1) chalk: 5.6.2 commander: 12.1.0 dotenv: 17.2.3 - drizzle-orm: 0.41.0(@prisma/client@5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)))(@types/better-sqlite3@7.6.13)(@types/pg@8.16.0)(@types/sql.js@1.4.9)(better-sqlite3@12.5.0)(bun-types@1.3.3)(kysely@0.28.16)(mysql2@3.16.1)(pg@8.16.3)(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(sql.js@1.13.0) + drizzle-orm: 0.41.0(@prisma/client@5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)))(@types/better-sqlite3@7.6.13)(@types/pg@8.16.0)(@types/sql.js@1.4.9)(better-sqlite3@12.5.0)(bun-types@1.3.3)(kysely@0.29.0-rc.0)(mysql2@3.16.1)(pg@8.16.3)(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(sql.js@1.13.0) open: 10.2.0 pg: 8.16.3 prettier: 3.8.1 @@ -9808,9 +9812,20 @@ snapshots: nanostores: 1.0.1 zod: 4.3.6 - '@better-auth/telemetry@1.4.19(@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1))': + '@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1)': dependencies: - '@better-auth/core': 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1) + '@better-auth/utils': 0.3.0 + '@better-fetch/fetch': 1.1.21 + '@standard-schema/spec': 1.0.0 + better-call: 1.1.8(zod@4.3.6) + jose: 6.1.2 + kysely: 0.29.0-rc.0 + nanostores: 1.0.1 + zod: 4.3.6 + + '@better-auth/telemetry@1.4.19(@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1))': + dependencies: + '@better-auth/core': 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1) '@better-auth/utils': 0.3.0 '@better-fetch/fetch': 1.1.21 @@ -12654,10 +12669,10 @@ snapshots: baseline-browser-mapping@2.9.11: {} - better-auth@1.4.19(f276412306c0f31e69da8456c8cd9497): + better-auth@1.4.19(52fc553c3e1a6dccbcb4b75397bc07d8): dependencies: '@better-auth/core': 1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1) - '@better-auth/telemetry': 1.4.19(@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.28.16)(nanostores@1.0.1)) + '@better-auth/telemetry': 1.4.19(@better-auth/core@1.4.19(@better-auth/utils@0.3.0)(@better-fetch/fetch@1.1.21)(better-call@1.1.8(zod@4.3.6))(jose@6.1.2)(kysely@0.29.0-rc.0)(nanostores@1.0.1)) '@better-auth/utils': 0.3.0 '@better-fetch/fetch': 1.1.21 '@noble/ciphers': 2.0.1 @@ -12672,7 +12687,7 @@ snapshots: '@prisma/client': 5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)) '@sveltejs/kit': 2.53.2(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.53.5)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)))(svelte@5.53.5)(typescript@5.9.3)(vite@7.3.1(@types/node@25.5.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(tsx@4.20.3)(yaml@2.8.2)) better-sqlite3: 12.5.0 - drizzle-orm: 0.41.0(@prisma/client@5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)))(@types/better-sqlite3@7.6.13)(@types/pg@8.16.0)(@types/sql.js@1.4.9)(better-sqlite3@12.5.0)(bun-types@1.3.3)(kysely@0.28.16)(mysql2@3.16.1)(pg@8.16.3)(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(sql.js@1.13.0) + drizzle-orm: 0.41.0(@prisma/client@5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)))(@types/better-sqlite3@7.6.13)(@types/pg@8.16.0)(@types/sql.js@1.4.9)(better-sqlite3@12.5.0)(bun-types@1.3.3)(kysely@0.29.0-rc.0)(mysql2@3.16.1)(pg@8.16.3)(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(sql.js@1.13.0) mysql2: 3.16.1 next: 16.1.6(@babel/core@7.29.0)(react-dom@19.2.0(react@19.2.0))(react@19.2.0) pg: 8.16.3 @@ -13328,6 +13343,21 @@ snapshots: pg: 8.16.3 prisma: 6.19.0(magicast@0.5.1)(typescript@5.9.3) sql.js: 1.13.0 + optional: true + + drizzle-orm@0.41.0(@prisma/client@5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)))(@types/better-sqlite3@7.6.13)(@types/pg@8.16.0)(@types/sql.js@1.4.9)(better-sqlite3@12.5.0)(bun-types@1.3.3)(kysely@0.29.0-rc.0)(mysql2@3.16.1)(pg@8.16.3)(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3))(sql.js@1.13.0): + optionalDependencies: + '@prisma/client': 5.22.0(prisma@6.19.0(magicast@0.5.1)(typescript@5.9.3)) + '@types/better-sqlite3': 7.6.13 + '@types/pg': 8.16.0 + '@types/sql.js': 1.4.9 + better-sqlite3: 12.5.0 + bun-types: 1.3.3 + kysely: 0.29.0-rc.0 + mysql2: 3.16.1 + pg: 8.16.3 + prisma: 6.19.0(magicast@0.5.1)(typescript@5.9.3) + sql.js: 1.13.0 dts-resolver@2.1.3: {} @@ -14728,13 +14758,15 @@ snapshots: knitwork@1.3.0: {} - kysely-bun-sqlite@0.4.0(kysely@0.28.16): + kysely-bun-sqlite@0.4.0(kysely@0.29.0-rc.0): dependencies: bun-types: 1.3.3 - kysely: 0.28.16 + kysely: 0.29.0-rc.0 kysely@0.28.16: {} + kysely@0.29.0-rc.0: {} + langium-cli@3.5.0: dependencies: chalk: 5.3.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index ea399eb70..5d3c6cbcc 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -15,7 +15,7 @@ catalog: '@types/tmp': ^0.2.6 better-sqlite3: ^12.5.0 decimal.js: ^10.4.3 - kysely: ~0.28.16 + kysely: 0.29.0-rc.0 langium: 3.5.0 langium-cli: 3.5.0 next: 16.1.6 From 55beba03aa32f44277ded13c498812babfbad426 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Tue, 28 Apr 2026 16:40:32 -0700 Subject: [PATCH 3/3] fix: fix build --- packages/orm/src/utils/kysely-utils.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/orm/src/utils/kysely-utils.ts b/packages/orm/src/utils/kysely-utils.ts index 140cb6a81..cd6878bd8 100644 --- a/packages/orm/src/utils/kysely-utils.ts +++ b/packages/orm/src/utils/kysely-utils.ts @@ -2,10 +2,12 @@ import { AddColumnNode, AddConstraintNode, AddIndexNode, + AddValueNode, AggregateFunctionNode, AliasNode, AlterColumnNode, AlterTableNode, + AlterTypeNode, AndNode, BinaryOperationNode, CaseNode, @@ -77,6 +79,7 @@ import { RefreshMaterializedViewNode, RenameColumnNode, RenameConstraintNode, + RenameValueNode, ReturningNode, SchemableIdentifierNode, SelectAllNode, @@ -407,6 +410,15 @@ export class DefaultOperationNodeVisitor extends OperationNodeVisitor { protected override visitCollate(node: CollateNode): void { this.defaultVisit(node); } + protected override visitAlterType(node: AlterTypeNode): void { + this.defaultVisit(node); + } + protected override visitAddValue(node: AddValueNode): void { + this.defaultVisit(node); + } + protected override visitRenameValue(node: RenameValueNode): void { + this.defaultVisit(node); + } } export type AnyKysely = Kysely;