Merge pull request #132 from zenstackhq/dev

ymc9 · web-flow · commit 94a0c6faf151 · 2025-07-31T07:24:13.000Z
merge dev to main (v3.0.0-alpha.16)
diff --git a/README.md b/README.md
@@ -145,9 +145,10 @@ Now you can use the compiled TypeScript schema to instantiate a database client.
 import { ZenStackClient } from '@zenstackhq/runtime';
 import { schema } from './zenstack/schema';
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 
 const client = new ZenStackClient(schema, {
-    dialectConfig: { database: new SQLite('./dev.db') },
+    dialect: new SqliteDialect({ database: new SQLite('./dev.db') }),
 });
 ```
 
@@ -156,13 +157,14 @@ const client = new ZenStackClient(schema, {
 ```ts
 import { ZenStackClient } from '@zenstackhq/runtime';
 import { schema } from './zenstack/schema';
+import { PostgresDialect } from 'kysely';
 import { Pool } from 'pg';
 import { parseIntoClientConfig } from 'pg-connection-string';
 
 const client = new ZenStackClient(schema, {
-    dialectConfig: {
+    dialect: new PostgresDialect({
         pool: new Pool(parseIntoClientConfig(process.env.DATABASE_URL)),
-    },
+    }),
 });
 ```
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "description": "ZenStack",
     "packageManager": "pnpm@10.12.1",
     "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/cli/src/actions/generate.ts b/packages/cli/src/actions/generate.ts
@@ -50,7 +50,7 @@ import { ZenStackClient } from '@zenstackhq/runtime';
 import { schema } from '${outputPath}/schema';
 
 const client = new ZenStackClient(schema, {
-    dialectConfig: { ... }
+    dialect: { ... }
 });
 \`\`\`
 `);
diff --git a/packages/cli/src/actions/templates.ts b/packages/cli/src/actions/templates.ts
@@ -27,14 +27,15 @@ model Post {
 `;
 
 export const STARTER_MAIN_TS = `import { ZenStackClient } from '@zenstackhq/runtime';
-import { schema } from './zenstack/schema';
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
+import { schema } from './zenstack/schema';
 
 async function main() {
     const client = new ZenStackClient(schema, {
-        dialectConfig: {
+        dialect: new SqliteDialect({
             database: new SQLite('./zenstack/dev.db'),
-        },
+        }),
     });
     const user = await client.user.create({
         data: {
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.15",
+    "version": "3.0.0-alpha.16",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {
@@ -69,14 +69,14 @@
         "@paralleldrive/cuid2": "^2.2.2",
         "decimal.js": "^10.4.3",
         "json-stable-stringify": "^1.3.0",
-        "kysely": "catalog:",
         "nanoid": "^5.0.9",
         "ts-pattern": "catalog:",
         "ulid": "^3.0.0",
         "uuid": "^11.0.5"
     },
     "peerDependencies": {
         "better-sqlite3": "^11.8.1",
+        "kysely": "catalog:",
         "pg": "^8.13.1",
         "zod": "catalog:"
     },
diff --git a/packages/runtime/src/client/client-impl.ts b/packages/runtime/src/client/client-impl.ts
@@ -1,18 +1,14 @@
 import { invariant, lowerCaseFirst } from '@zenstackhq/common-helpers';
-import type { QueryExecutor, SqliteDialectConfig } from 'kysely';
+import type { QueryExecutor } from 'kysely';
 import {
     CompiledQuery,
     DefaultConnectionProvider,
     DefaultQueryExecutor,
     Kysely,
     Log,
-    PostgresDialect,
     sql,
-    SqliteDialect,
     type KyselyProps,
-    type PostgresDialectConfig,
 } from 'kysely';
-import { match } from 'ts-pattern';
 import type { GetModels, ProcedureDef, SchemaDef } from '../schema';
 import type { AuthType } from '../schema/auth';
 import type { UnwrapTuplePromises } from '../utils/type-utils';
@@ -88,18 +84,17 @@ export class ClientImpl<Schema extends SchemaDef> {
             this.kyselyRaw = baseClient.kyselyRaw;
             this.auth = baseClient.auth;
         } else {
-            const dialect = this.getKyselyDialect();
-            const driver = new ZenStackDriver(dialect.createDriver(), new Log(this.$options.log ?? []));
-            const compiler = dialect.createQueryCompiler();
-            const adapter = dialect.createAdapter();
+            const driver = new ZenStackDriver(options.dialect.createDriver(), new Log(this.$options.log ?? []));
+            const compiler = options.dialect.createQueryCompiler();
+            const adapter = options.dialect.createAdapter();
             const connectionProvider = new DefaultConnectionProvider(driver);
 
             this.kyselyProps = {
                 config: {
-                    dialect,
+                    dialect: options.dialect,
                     log: this.$options.log,
                 },
-                dialect,
+                dialect: options.dialect,
                 driver,
                 executor: executor ?? new ZenStackQueryExecutor(this, driver, compiler, adapter, connectionProvider),
             };
@@ -135,21 +130,6 @@ export class ClientImpl<Schema extends SchemaDef> {
         return new ClientImpl(this.schema, this.$options, this, executor);
     }
 
-    private getKyselyDialect() {
-        return match(this.schema.provider.type)
-            .with('sqlite', () => this.makeSqliteKyselyDialect())
-            .with('postgresql', () => this.makePostgresKyselyDialect())
-            .exhaustive();
-    }
-
-    private makePostgresKyselyDialect(): PostgresDialect {
-        return new PostgresDialect(this.options.dialectConfig as PostgresDialectConfig);
-    }
-
-    private makeSqliteKyselyDialect(): SqliteDialect {
-        return new SqliteDialect(this.options.dialectConfig as SqliteDialectConfig);
-    }
-
     // overload for interactive transaction
     $transaction<T>(
         callback: (tx: ClientContract<Schema>) => Promise<T>,
diff --git a/packages/runtime/src/client/options.ts b/packages/runtime/src/client/options.ts
@@ -1,17 +1,11 @@
-import type { Expression, ExpressionBuilder, KyselyConfig, PostgresDialectConfig, SqliteDialectConfig } from 'kysely';
-import type { DataSourceProvider, GetModel, GetModels, ProcedureDef, SchemaDef } from '../schema';
-import type { Optional, PrependParameter } from '../utils/type-utils';
+import type { Dialect, Expression, ExpressionBuilder, KyselyConfig } from 'kysely';
+import type { GetModel, GetModels, ProcedureDef, SchemaDef } from '../schema';
+import type { PrependParameter } from '../utils/type-utils';
 import type { ClientContract, CRUD, ProcedureFunc } from './contract';
 import type { BaseCrudDialect } from './crud/dialects/base';
 import type { RuntimePlugin } from './plugin';
 import type { ToKyselySchema } from './query-builder';
 
-type DialectConfig<Provider extends DataSourceProvider> = Provider['type'] extends 'sqlite'
-    ? Optional<SqliteDialectConfig, 'database'>
-    : Provider['type'] extends 'postgresql'
-      ? Optional<PostgresDialectConfig, 'pool'>
-      : never;
-
 export type ZModelFunctionContext<Schema extends SchemaDef> = {
     dialect: BaseCrudDialect<Schema>;
     model: GetModels<Schema>;
@@ -29,9 +23,9 @@ export type ZModelFunction<Schema extends SchemaDef> = (
  */
 export type ClientOptions<Schema extends SchemaDef> = {
     /**
-     * Database dialect configuration.
+     * Kysely dialect.
      */
-    dialectConfig: DialectConfig<Schema['provider']>;
+    dialect: Dialect;
 
     /**
      * Custom function definitions.
diff --git a/packages/runtime/test/client-api/computed-fields.test.ts b/packages/runtime/test/client-api/computed-fields.test.ts
@@ -55,7 +55,7 @@ import { schema } from './schema';
 
 async function main() {
     const client = new ZenStackClient(schema, {
-        dialectConfig: {} as any,
+        dialect: {} as any,
         computedFields: {
             User: {
                 upperName: (eb) => eb.fn('upper', ['name']),
@@ -122,7 +122,7 @@ import { schema } from './schema';
 
 async function main() {
     const client = new ZenStackClient(schema, {
-        dialectConfig: {} as any,
+        dialect: {} as any,
         computedFields: {
             User: {
                 upperName: (eb) => eb.lit(null),
diff --git a/packages/runtime/test/client-api/default-values.test.ts b/packages/runtime/test/client-api/default-values.test.ts
@@ -1,5 +1,6 @@
 import { isCuid } from '@paralleldrive/cuid2';
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 import { isValid as isValidUlid } from 'ulid';
 import { validate as isValidUuid } from 'uuid';
 import { describe, expect, it } from 'vitest';
@@ -68,7 +69,7 @@ const schema = {
 describe('default values tests', () => {
     it('supports generators', async () => {
         const client = new ZenStackClient(schema, {
-            dialectConfig: { database: new SQLite(':memory:') },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await client.$pushSchema();
 
diff --git a/packages/runtime/test/client-api/name-mapping.test.ts b/packages/runtime/test/client-api/name-mapping.test.ts
@@ -1,4 +1,5 @@
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 import { describe, expect, it } from 'vitest';
 import { ZenStackClient } from '../../src';
 import { type SchemaDef, ExpressionUtils } from '../../src/schema';
@@ -59,7 +60,7 @@ describe('Name mapping tests', () => {
 
     it('works with model and implicit field mapping', async () => {
         const client = new ZenStackClient(schema, {
-            dialectConfig: { database: new SQLite(':memory:') },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await client.$pushSchema();
         const r1 = await client.foo.create({
@@ -91,7 +92,7 @@ describe('Name mapping tests', () => {
 
     it('works with explicit field mapping', async () => {
         const client = new ZenStackClient(schema, {
-            dialectConfig: { database: new SQLite(':memory:') },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await client.$pushSchema();
         const r1 = await client.foo.create({
diff --git a/packages/runtime/test/plugin/kysely-on-query.test.ts b/packages/runtime/test/plugin/kysely-on-query.test.ts
@@ -1,5 +1,5 @@
 import SQLite from 'better-sqlite3';
-import { InsertQueryNode, Kysely, PrimitiveValueListNode, ValuesNode, type QueryResult } from 'kysely';
+import { InsertQueryNode, Kysely, PrimitiveValueListNode, SqliteDialect, ValuesNode, type QueryResult } from 'kysely';
 import { beforeEach, describe, expect, it } from 'vitest';
 import { ZenStackClient, type ClientContract } from '../../src/client';
 import { schema } from '../schemas/basic';
@@ -9,7 +9,7 @@ describe('Kysely onQuery tests', () => {
 
     beforeEach(async () => {
         _client = new ZenStackClient(schema, {
-            dialectConfig: { database: new SQLite(':memory:') },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await _client.$pushSchema();
     });
diff --git a/packages/runtime/test/plugin/mutation-hooks.test.ts b/packages/runtime/test/plugin/mutation-hooks.test.ts
@@ -1,5 +1,5 @@
 import SQLite from 'better-sqlite3';
-import { DeleteQueryNode, InsertQueryNode, UpdateQueryNode } from 'kysely';
+import { DeleteQueryNode, InsertQueryNode, SqliteDialect, UpdateQueryNode } from 'kysely';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 import { ZenStackClient, type ClientContract } from '../../src';
 import { schema } from '../schemas/basic';
@@ -9,9 +9,7 @@ describe('Entity  lifecycle tests', () => {
 
     beforeEach(async () => {
         _client = new ZenStackClient(schema, {
-            dialectConfig: {
-                database: new SQLite(':memory:'),
-            },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await _client.$pushSchema();
     });
diff --git a/packages/runtime/test/plugin/query-lifecycle.test.ts b/packages/runtime/test/plugin/query-lifecycle.test.ts
@@ -1,4 +1,5 @@
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 import { beforeEach, describe, expect, it } from 'vitest';
 import { definePlugin, ZenStackClient, type ClientContract } from '../../src/client';
 import { schema } from '../schemas/basic';
@@ -8,9 +9,7 @@ describe('Query interception tests', () => {
 
     beforeEach(async () => {
         _client = new ZenStackClient(schema, {
-            dialectConfig: {
-                database: new SQLite(':memory:'),
-            },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await _client.$pushSchema();
     });
diff --git a/packages/runtime/test/query-builder/query-builder.test.ts b/packages/runtime/test/query-builder/query-builder.test.ts
@@ -1,5 +1,6 @@
 import { createId } from '@paralleldrive/cuid2';
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 import { describe, expect, it } from 'vitest';
 import { ZenStackClient } from '../../src';
 import { getSchema } from '../schemas/basic';
@@ -9,9 +10,7 @@ describe('Client API tests', () => {
 
     it('works with queries', async () => {
         const client = new ZenStackClient(schema, {
-            dialectConfig: {
-                database: new SQLite(':memory:'),
-            },
+            dialect: new SqliteDialect({ database: new SQLite(':memory:') }),
         });
         await client.$pushSchema();
 
diff --git a/packages/runtime/test/schemas/delegate/typecheck.ts b/packages/runtime/test/schemas/delegate/typecheck.ts
@@ -1,11 +1,10 @@
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 import { ZenStackClient } from '../../../dist';
 import { schema } from './schema';
 
 const client = new ZenStackClient(schema, {
-    dialectConfig: {
-        database: new SQLite('./zenstack/test.db'),
-    },
+    dialect: new SqliteDialect({ database: new SQLite('./zenstack/test.db') }),
 });
 
 async function find() {
diff --git a/packages/runtime/test/schemas/typing/typecheck.ts b/packages/runtime/test/schemas/typing/typecheck.ts
@@ -1,12 +1,11 @@
 import SQLite from 'better-sqlite3';
+import { SqliteDialect } from 'kysely';
 import { ZenStackClient } from '../../../dist';
 import { Role, type Identity, type IdentityProvider } from './models';
 import { schema } from './schema';
 
 const client = new ZenStackClient(schema, {
-    dialectConfig: {
-        database: new SQLite('./zenstack/test.db'),
-    },
+    dialect: new SqliteDialect({ database: new SQLite('./zenstack/test.db') }),
     computedFields: {
         User: {
             postCount: (eb) =>
diff --git a/packages/runtime/test/utils.ts b/packages/runtime/test/utils.ts
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json
diff --git a/packages/zod/package.json b/packages/zod/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/samples/blog/README.md b/samples/blog/README.md
diff --git a/samples/blog/main.ts b/samples/blog/main.ts
diff --git a/samples/blog/package.json b/samples/blog/package.json
diff --git a/tests/e2e/package.json b/tests/e2e/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-v3",`
`3`		`- "version": "3.0.0-alpha.15",`
	`3`	`+ "version": "3.0.0-alpha.16",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "pnpm@10.12.1",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/common-helpers",`
`3`		`- "version": "3.0.0-alpha.15",`
	`3`	`+ "version": "3.0.0-alpha.16",`
`4`	`4`	`"description": "ZenStack Common Helpers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-zenstack",`
`3`		`- "version": "3.0.0-alpha.15",`
	`3`	`+ "version": "3.0.0-alpha.16",`
`4`	`4`	`"description": "Create a new ZenStack project",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.0.0-alpha.15",`
	`3`	`+ "version": "3.0.0-alpha.16",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack",`
`3`	`3`	`"publisher": "zenstack",`
`4`		`- "version": "3.0.0-alpha.15",`
	`4`	`+ "version": "3.0.0-alpha.16",`
`5`	`5`	`"displayName": "ZenStack Language Tools",`
`6`	`6`	`"description": "VSCode extension for ZenStack ZModel language",`
`7`	`7`	`"private": true,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`	`3`	`"description": "ZenStack ZModel language specification",`
`4`		`- "version": "3.0.0-alpha.15",`
	`4`	`+ "version": "3.0.0-alpha.16",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"author": "ZenStack Team",`
`7`	`7`	`"files": [`