Merge branch 'alternation-engine' of github.com:drizzle-team/drizzle-orm into alternation-engine

Author: AndriiSherman

.github/workflows/release-feature-branch.yaml

@@ -237,7 +237,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18'
+          node-version: '22'
           registry-url: 'https://registry.npmjs.org'
 
       - uses: pnpm/action-setup@v3
@@ -334,7 +334,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18'
+          node-version: '22'
           registry-url: 'https://registry.npmjs.org'
 
       - uses: pnpm/action-setup@v3
@@ -415,4 +415,4 @@ jobs:
         working-directory: ${{ matrix.package }}
         shell: bash
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

.github/workflows/release-latest.yaml

@@ -360,7 +360,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18'
+          node-version: '22'
           registry-url: 'https://registry.npmjs.org'
 
       - uses: pnpm/action-setup@v3

.github/workflows/unpublish-release-feature-branch.yaml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.18'
+          node-version: '22'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Unpublish

.nvmrc

@@ -1 +1 @@
-18.18
+22

changelogs/drizzle-arktype/0.1.3.md

@@ -0,0 +1,3 @@
+- TS language server performance improvements
+- Fixed [Buffer is not defined using drizzle-arktype client side with vite](https://github.com/drizzle-team/drizzle-orm/issues/4383)
+- Fixed [[BUG]: drizzle-arktype Buffer is undefined](https://github.com/drizzle-team/drizzle-orm/issues/4371)

changelogs/drizzle-orm/0.44.0.md

@@ -0,0 +1,91 @@
+## Error handling
+
+Starting from this version, we’ve introduced a new `DrizzleQueryError` that wraps all errors from database drivers and provides a set of useful information:
+
+1. A proper stack trace to identify which exact `Drizzle` query failed
+2. The generated SQL string and its parameters
+3. The original stack trace from the driver that caused the DrizzleQueryError
+
+## Drizzle `cache` module
+
+Drizzle sends every query straight to your database by default. There are no hidden actions, no automatic caching or invalidation - you’ll always see exactly what runs. If you want caching, you must opt in.
+
+By default, Drizzle uses a explicit caching strategy (i.e. `global: false`), so nothing is ever cached unless you ask. This prevents surprises or hidden performance traps in your application. Alternatively, you can flip on all caching (global: true) so that every select will look in cache first.
+
+Out first native integration was built together with Upstash team and let you natively use `upstash` as a cache for your drizzle queries
+
+```ts
+import { upstashCache } from "drizzle-orm/cache/upstash";
+import { drizzle } from "drizzle-orm/...";
+
+const db = drizzle(process.env.DB_URL!, {
+  cache: upstashCache({
+    // 👇 Redis credentials (optional — can also be pulled from env vars)
+    url: '<UPSTASH_URL>',
+    token: '<UPSTASH_TOKEN>',
+    // 👇 Enable caching for all queries by default (optional)
+    global: true,
+    // 👇 Default cache behavior (optional)
+    config: { ex: 60 }
+  })
+});
+```
+
+You can also implement your own cache, as Drizzle exposes all the necessary APIs, such as get, put, mutate, etc.
+You can find full implementation details on the [website](https://orm.drizzle.team/docs/cache#custom-cache)
+
+```ts
+import Keyv from "keyv";
+export class TestGlobalCache extends Cache {
+  private globalTtl: number = 1000;
+  // This object will be used to store which query keys were used
+  // for a specific table, so we can later use it for invalidation.
+  private usedTablesPerKey: Record<string, string[]> = {};
+  constructor(private kv: Keyv = new Keyv()) {
+    super();
+  }
+  // For the strategy, we have two options:
+  // - 'explicit': The cache is used only when .$withCache() is added to a query.
+  // - 'all': All queries are cached globally.
+  // The default behavior is 'explicit'.
+  override strategy(): "explicit" | "all" {
+    return "all";
+  }
+  // This function accepts query and parameters that cached into key param,
+  // allowing you to retrieve response values for this query from the cache.
+  override async get(key: string): Promise<any[] | undefined> {
+    ...
+  }
+  // This function accepts several options to define how cached data will be stored:
+  // - 'key': A hashed query and parameters.
+  // - 'response': An array of values returned by Drizzle from the database.
+  // - 'tables': An array of tables involved in the select queries. This information is needed for cache invalidation.
+  //
+  // For example, if a query uses the "users" and "posts" tables, you can store this information. Later, when the app executes
+  // any mutation statements on these tables, you can remove the corresponding key from the cache.
+  // If you're okay with eventual consistency for your queries, you can skip this option.
+  override async put(
+    key: string,
+    response: any,
+    tables: string[],
+    config?: CacheConfig,
+  ): Promise<void> {
+    ...
+  }
+  // This function is called when insert, update, or delete statements are executed.
+  // You can either skip this step or invalidate queries that used the affected tables.
+  //
+  // The function receives an object with two keys:
+  // - 'tags': Used for queries labeled with a specific tag, allowing you to invalidate by that tag.
+  // - 'tables': The actual tables affected by the insert, update, or delete statements,
+  //   helping you track which tables have changed since the last cache update.
+  override async onMutate(params: {
+    tags: string | string[];
+    tables: string | string[] | Table<any> | Table<any>[];
+  }): Promise<void> {
+    ...
+  }
+}
+```
+
+For more usage example you can check our [docs](https://orm.drizzle.team/docs/cache#cache-usage-examples)

changelogs/drizzle-orm/0.44.1.md

@@ -0,0 +1 @@
+- [[BUG]: Drizzle can no longer run on Durable Objects](https://github.com/drizzle-team/drizzle-orm/issues/4586)

changelogs/drizzle-typebox/0.3.3.md

@@ -0,0 +1 @@
+- TS language server performance improvements

changelogs/drizzle-valibot/0.4.2.md

@@ -0,0 +1 @@
+- TS language server performance improvements

changelogs/drizzle-zod/0.8.0.md

@@ -0,0 +1 @@
+- Support for Zod v4: Starting with this release, `drizzle-zod` now requires Zod v3.25 or later

changelogs/drizzle-zod/0.8.1.md

@@ -0,0 +1,3 @@
+- Support for Zod v4: Starting with this release, `drizzle-zod` now requires Zod v3.25.1 or later
+
+This version was released to resolve several compatibility issues with the `ZodObject` type, which were fixed in `[email protected]`, so version `0.8.0` can be skipped

changelogs/drizzle-zod/0.8.2.md

@@ -0,0 +1 @@
+- [[BUG]: drizzle-zod: incorrect inferred types for columns .generatedAlwaysAsIdentity()](https://github.com/drizzle-team/drizzle-orm/issues/4553)

drizzle-arktype/benchmarks/types.ts

@@ -0,0 +1,30 @@
+import { bench, setup } from '@ark/attest';
+import { type } from 'arktype';
+import { boolean, integer, pgTable, text } from 'drizzle-orm/pg-core';
+import { createSelectSchema } from '~/index.ts';
+
+const users = pgTable('users', {
+	id: integer().primaryKey(),
+	firstName: text().notNull(),
+	middleName: text(),
+	lastName: text().notNull(),
+	age: integer().notNull(),
+	admin: boolean().notNull().default(false),
+});
+
+const teardown = setup();
+
+bench('select schema', () => {
+	return createSelectSchema(users);
+}).types([13129, 'instantiations']);
+
+bench('select schema with refinements', () => {
+	return createSelectSchema(users, {
+		firstName: (t) => t.atMostLength(100),
+		middleName: (t) => t.atMostLength(100),
+		lastName: (t) => t.atMostLength(100),
+		age: type.number.atLeast(1),
+	});
+}).types([21631, 'instantiations']);
+
+teardown();

drizzle-arktype/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-arktype",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"description": "Generate arktype schemas from Drizzle ORM schemas",
 	"type": "module",
 	"scripts": {
@@ -9,7 +9,8 @@
 		"test:types": "cd tests && tsc",
 		"pack": "(cd dist && npm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
 		"publish": "npm publish package.tgz",
-		"test": "vitest run"
+		"test": "vitest run",
+		"bench:types": "tsx ./benchmarks/types.ts"
 	},
 	"exports": {
 		".": {
@@ -59,16 +60,18 @@
 		"drizzle-orm": ">=0.36.0"
 	},
 	"devDependencies": {
+		"@ark/attest": "^0.45.8",
 		"@rollup/plugin-typescript": "^11.1.0",
 		"@types/node": "^18.15.10",
 		"arktype": "^2.1.10",
 		"cpy": "^10.1.0",
 		"drizzle-orm": "link:../drizzle-orm/dist",
-		"json-rules-engine": "7.3.0",
+		"json-rules-engine": "7.3.1",
 		"rimraf": "^5.0.0",
-		"rollup": "^3.20.7",
+		"rollup": "^3.29.5",
+		"tsx": "^4.19.3",
 		"vite-tsconfig-paths": "^4.3.2",
-		"vitest": "^1.6.0",
+		"vitest": "^3.1.3",
 		"zx": "^7.2.2"
 	}
 }

drizzle-arktype/src/column.ts

@@ -59,7 +59,9 @@ import { isColumnType, isWithEnum } from './utils.ts';
 
 export const literalSchema = type.string.or(type.number).or(type.boolean).or(type.null);
 export const jsonSchema = literalSchema.or(type.unknown.as<any>().array()).or(type.object.as<Record<string, any>>());
-export const bufferSchema = type.instanceOf(Buffer); // eslint-disable-line no-instanceof/no-instanceof
+export const bufferSchema = type.unknown.narrow((value) => value instanceof Buffer).as<Buffer>().describe( // eslint-disable-line no-instanceof/no-instanceof
+	'a Buffer instance',
+);
 
 export function columnToSchema(column: Column): Type {
 	let schema!: Type;

drizzle-arktype/src/column.types.ts

@@ -1,23 +1,17 @@
 import { Type, type } from 'arktype';
-import type { Assume, Column } from 'drizzle-orm';
-import type { ColumnIsGeneratedAlwaysAs, IsEnumDefined, IsNever, IsUnknown, Json } from './utils.ts';
+import type { Column } from 'drizzle-orm';
+import type { Json } from './utils.ts';
 
-export type ArktypeNullable<TSchema> = Type<type.infer<TSchema> | null, {}>;
+export type ArktypeNullable<TSchema> = Type<type.infer<TSchema> | null>;
 
-export type ArktypeOptional<TSchema> = [Type<type.infer<TSchema>, {}>, '?'];
-
-export type GetEnumValuesFromColumn<TColumn extends Column> = TColumn['_'] extends { enumValues: [string, ...string[]] }
-	? TColumn['_']['enumValues']
-	: undefined;
+export type ArktypeOptional<TSchema> = [Type<type.infer<TSchema>>, '?'];
 
 export type GetArktypeType<
-	TData,
-	TColumnType extends string,
-	TEnumValues extends [string, ...string[]] | undefined,
-> = IsEnumDefined<TEnumValues> extends true ? Type<Assume<TEnumValues, any[]>[number]>
-	: TColumnType extends 'PgJson' | 'PgJsonb' | 'MySqlJson' | 'SingleStoreJson' | 'SQLiteTextJson' | 'SQLiteBlobJson'
-		? IsUnknown<TData> extends true ? Type<Json> : Type<TData>
-	: Type<TData>;
+	TColumn extends Column,
+> = TColumn['_']['columnType'] extends
+	'PgJson' | 'PgJsonb' | 'MySqlJson' | 'SingleStoreJson' | 'SQLiteTextJson' | 'SQLiteBlobJson'
+	? unknown extends TColumn['_']['data'] ? Type<Json> : Type<TColumn['_']['data']>
+	: Type<TColumn['_']['data']>;
 
 type HandleSelectColumn<
 	TSchema,
@@ -28,27 +22,20 @@ type HandleSelectColumn<
 type HandleInsertColumn<
 	TSchema,
 	TColumn extends Column,
-> = ColumnIsGeneratedAlwaysAs<TColumn> extends true ? never
-	: TColumn['_']['notNull'] extends true ? TColumn['_']['hasDefault'] extends true ? ArktypeOptional<TSchema>
-		: TSchema
+> = TColumn['_']['notNull'] extends true ? TColumn['_']['hasDefault'] extends true ? ArktypeOptional<TSchema>
+	: TSchema
 	: ArktypeOptional<ArktypeNullable<TSchema>>;
 
 type HandleUpdateColumn<
 	TSchema,
 	TColumn extends Column,
-> = ColumnIsGeneratedAlwaysAs<TColumn> extends true ? never
-	: TColumn['_']['notNull'] extends true ? ArktypeOptional<TSchema>
+> = TColumn['_']['notNull'] extends true ? ArktypeOptional<TSchema>
 	: ArktypeOptional<ArktypeNullable<TSchema>>;
 
 export type HandleColumn<
 	TType extends 'select' | 'insert' | 'update',
 	TColumn extends Column,
-> = GetArktypeType<
-	TColumn['_']['data'],
-	TColumn['_']['columnType'],
-	GetEnumValuesFromColumn<TColumn>
-> extends infer TSchema ? TType extends 'select' ? HandleSelectColumn<TSchema, TColumn>
-	: TType extends 'insert' ? HandleInsertColumn<TSchema, TColumn>
-	: TType extends 'update' ? HandleUpdateColumn<TSchema, TColumn>
-	: TSchema
-	: Type;
+> = TType extends 'select' ? HandleSelectColumn<GetArktypeType<TColumn>, TColumn>
+	: TType extends 'insert' ? HandleInsertColumn<GetArktypeType<TColumn>, TColumn>
+	: TType extends 'update' ? HandleUpdateColumn<GetArktypeType<TColumn>, TColumn>
+	: GetArktypeType<TColumn>;

drizzle-arktype/src/index.ts

@@ -1,7 +1,6 @@
 export { bufferSchema, jsonSchema, literalSchema } from './column.ts';
 export * from './column.types.ts';
 export * from './schema.ts';
-export type { BuildSchema } from './schema.types.internal.ts';
 export * from './schema.types.internal.ts';
 export * from './schema.types.ts';
 export * from './utils.ts';