Merge pull request #663 from zenstackhq/dev

ymc9 · web-flow · commit 7dd398c597db · 2026-02-06T12:38:50.000Z
merge dev to main (v3.3.3)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack",
     "packageManager": "pnpm@10.23.0",
     "type": "module",
diff --git a/packages/auth-adapters/better-auth/package.json b/packages/auth-adapters/better-auth/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/better-auth",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
     "type": "module",
     "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.3.2",
+    "version": "3.3.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team"
diff --git a/packages/cli/src/actions/proxy.ts b/packages/cli/src/actions/proxy.ts
@@ -24,6 +24,7 @@ import { Pool as PgPool } from 'pg';
 import { CliError } from '../cli-error';
 import { getVersion } from '../utils/version-utils';
 import { getOutputPath, getSchemaFile, loadSchemaDocument } from './action-utils';
+import type { SchemaDef } from '@zenstackhq/orm/schema';
 
 type Options = {
     output?: string;
@@ -72,9 +73,25 @@ export async function run(options: Options) {
 
     const schemaModule = (await jiti.import(path.join(outputPath, 'schema'))) as any;
 
-    const db = new ZenStackClient(schemaModule.schema, {
+    // Build omit configuration for computed fields
+    const schema = schemaModule.schema as SchemaDef;
+    const omit: Record<string, Record<string, boolean>> = {};
+    for (const [modelName, modelDef] of Object.entries(schema.models)) {
+        const computedFields: Record<string, boolean> = {};
+        for (const [fieldName, fieldDef] of Object.entries(modelDef.fields)) {
+            if (fieldDef.computed === true) {
+                computedFields[fieldName] = true;
+            }
+        }
+        if (Object.keys(computedFields).length > 0) {
+            omit[modelName] = computedFields;
+        }
+    }
+
+    const db = new ZenStackClient(schema, {
         dialect: dialect,
         log: log && log.length > 0 ? log : undefined,
+        omit: Object.keys(omit).length > 0 ? omit : undefined,
     });
 
     // check whether the database is reachable
diff --git a/packages/clients/client-helpers/package.json b/packages/clients/client-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/client-helpers",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "Helpers for implementing clients that consume ZenStack's CRUD service",
     "type": "module",
     "scripts": {
diff --git a/packages/clients/tanstack-query/package.json b/packages/clients/tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tanstack-query",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "TanStack Query Client for consuming ZenStack v3's CRUD service",
     "type": "module",
     "scripts": {
diff --git a/packages/common-helpers/package.json b/packages/common-helpers/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {
diff --git a/packages/config/eslint-config/package.json b/packages/config/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "type": "module",
     "private": true,
     "license": "MIT"
diff --git a/packages/config/typescript-config/package.json b/packages/config/typescript-config/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": true,
     "license": "MIT"
 }
diff --git 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.3.2",
+    "version": "3.3.3",
     "private": true,
     "license": "MIT",
     "exports": {
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.3.2",
+    "version": "3.3.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
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [
diff --git a/packages/language/res/stdlib.zmodel b/packages/language/res/stdlib.zmodel
@@ -426,6 +426,9 @@ attribute @db.Uuid() @@@targetField([StringField]) @@@prisma
 attribute @db.Xml() @@@targetField([StringField]) @@@prisma
 attribute @db.Inet() @@@targetField([StringField]) @@@prisma
 attribute @db.Citext() @@@targetField([StringField]) @@@prisma
+attribute @db.TinyText() @@@targetField([StringField]) @@@prisma
+attribute @db.MediumText() @@@targetField([StringField]) @@@prisma
+attribute @db.LongText() @@@targetField([StringField]) @@@prisma
 
 // Boolean type modifiers
 
@@ -437,16 +440,26 @@ attribute @db.Int() @@@targetField([IntField]) @@@prisma
 attribute @db.Integer() @@@targetField([IntField]) @@@prisma
 attribute @db.SmallInt() @@@targetField([IntField]) @@@prisma
 attribute @db.Oid() @@@targetField([IntField]) @@@prisma
+attribute @db.UnsignedInt() @@@targetField([IntField]) @@@prisma
+attribute @db.UnsignedSmallInt() @@@targetField([IntField]) @@@prisma
+attribute @db.MediumInt() @@@targetField([IntField]) @@@prisma
+attribute @db.UnsignedMediumInt() @@@targetField([IntField]) @@@prisma
+attribute @db.TinyInt(_ length: Int?) @@@targetField([IntField]) @@@prisma
+attribute @db.UnsignedTinyInt(_ length: Int?) @@@targetField([IntField]) @@@prisma
+attribute @db.Year() @@@targetField([IntField]) @@@prisma
 
 // BigInt type modifiers
 
 attribute @db.BigInt() @@@targetField([BigIntField]) @@@prisma
+attribute @db.UnsignedBigInt() @@@targetField([BigIntField]) @@@prisma
 
 // Float/Decimal type modifiers
 attribute @db.DoublePrecision() @@@targetField([FloatField, DecimalField]) @@@prisma
 attribute @db.Real() @@@targetField([FloatField, DecimalField]) @@@prisma
 attribute @db.Decimal(_ p: Int?, _ s: Int?) @@@targetField([FloatField, DecimalField]) @@@prisma
 attribute @db.Money() @@@targetField([FloatField, DecimalField]) @@@prisma
+attribute @db.Float() @@@targetField([FloatField]) @@@prisma
+attribute @db.Double() @@@targetField([FloatField]) @@@prisma
 
 // DateTime type modifiers
 
@@ -455,6 +468,8 @@ attribute @db.Timestamptz(_ x: Int?) @@@targetField([DateTimeField]) @@@prisma
 attribute @db.Date() @@@targetField([DateTimeField]) @@@prisma
 attribute @db.Time(_ x: Int?) @@@targetField([DateTimeField]) @@@prisma
 attribute @db.Timetz(_ x: Int?) @@@targetField([DateTimeField]) @@@prisma
+attribute @db.DateTime(_ x: Int?) @@@targetField([DateTimeField]) @@@prisma
+
 
 // Json type modifiers
 
@@ -464,6 +479,12 @@ attribute @db.JsonB() @@@targetField([JsonField]) @@@prisma
 // Bytes type modifiers
 
 attribute @db.ByteA() @@@targetField([BytesField]) @@@prisma
+attribute @db.LongBlob() @@@targetField([BytesField]) @@@prisma
+attribute @db.Binary(_ n: Int?) @@@targetField([BytesField]) @@@prisma
+attribute @db.VarBinary(_ n: Int?) @@@targetField([BytesField]) @@@prisma
+attribute @db.TinyBlob() @@@targetField([BytesField]) @@@prisma
+attribute @db.Blob() @@@targetField([BytesField]) @@@prisma
+attribute @db.MediumBlob() @@@targetField([BytesField]) @@@prisma
 
 /**
  * Specifies the schema to use in a multi-schema PostgreSQL database.
diff --git a/packages/orm/package.json b/packages/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/orm",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack ORM",
     "type": "module",
     "scripts": {
diff --git a/packages/orm/src/client/crud/dialects/base-dialect.ts b/packages/orm/src/client/crud/dialects/base-dialect.ts
@@ -513,7 +513,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
                 }
 
                 case 'has': {
-                    clauses.push(this.buildArrayContains(receiver, this.eb.val(value)));
+                    clauses.push(this.buildArrayContains(receiver, this.eb.val(value), fieldType));
                     break;
                 }
 
@@ -1442,7 +1442,11 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
     /**
      * Builds an expression that checks if an array contains a single value.
      */
-    abstract buildArrayContains(field: Expression<unknown>, value: Expression<unknown>): AliasableExpression<SqlBool>;
+    abstract buildArrayContains(
+        field: Expression<unknown>,
+        value: Expression<unknown>,
+        elemType?: string,
+    ): AliasableExpression<SqlBool>;
 
     /**
      * Builds an expression that checks if an array contains all values from another array.
diff --git a/packages/orm/src/client/crud/dialects/mysql.ts b/packages/orm/src/client/crud/dialects/mysql.ts
@@ -231,6 +231,7 @@ export class MySqlCrudDialect<Schema extends SchemaDef> extends LateralJoinDiale
     override buildArrayContains(
         _field: Expression<unknown>,
         _value: Expression<unknown>,
+        _elemType?: string,
     ): AliasableExpression<SqlBool> {
         throw createNotSupportedError('MySQL does not support native array operations');
     }
diff --git a/packages/orm/src/client/crud/dialects/postgresql.ts b/packages/orm/src/client/crud/dialects/postgresql.ts
@@ -284,9 +284,20 @@ export class PostgresCrudDialect<Schema extends SchemaDef> extends LateralJoinDi
         return this.eb.cast(arr, sql`${sql.raw(mappedType)}[]`);
     }
 
-    override buildArrayContains(field: Expression<unknown>, value: Expression<unknown>): AliasableExpression<SqlBool> {
-        // PostgreSQL @> operator expects array on both sides, so wrap single value in array
-        return this.eb(field, '@>', sql`ARRAY[${value}]`);
+    override buildArrayContains(
+        field: Expression<unknown>,
+        value: Expression<unknown>,
+        elemType?: string,
+    ): AliasableExpression<SqlBool> {
+        // PostgreSQL @> operator expects array on both sides, so wrap single value in a typed array
+        const arrayExpr = sql`ARRAY[${value}]`;
+        if (elemType) {
+            const mappedType = this.getSqlType(elemType);
+            const typedArray = this.eb.cast(arrayExpr, sql`${sql.raw(mappedType)}[]`);
+            return this.eb(field, '@>', typedArray);
+        } else {
+            return this.eb(field, '@>', arrayExpr);
+        }
     }
 
     override buildArrayHasEvery(field: Expression<unknown>, values: Expression<unknown>): AliasableExpression<SqlBool> {
diff --git a/packages/orm/src/client/crud/dialects/sqlite.ts b/packages/orm/src/client/crud/dialects/sqlite.ts
@@ -456,6 +456,7 @@ export class SqliteCrudDialect<Schema extends SchemaDef> extends BaseCrudDialect
     override buildArrayContains(
         _field: Expression<unknown>,
         _value: Expression<unknown>,
+        _elemType?: string,
     ): AliasableExpression<SqlBool> {
         throw createNotSupportedError('SQLite does not support native array operations');
     }
diff --git a/packages/orm/src/client/helpers/schema-db-pusher.ts b/packages/orm/src/client/helpers/schema-db-pusher.ts
@@ -440,6 +440,7 @@ export class SchemaDbPusher<Schema extends SchemaDef> {
 
     private get floatType() {
         return match<string, ColumnDataType | RawBuilder<unknown>>(this.schema.provider.type)
+            .with('postgresql', () => 'double precision')
             .with('mysql', () => sql.raw('double'))
             .otherwise(() => 'real');
     }
diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/plugin-policy",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack Policy Plugin",
     "type": "module",
     "scripts": {
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/schema",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack Runtime Schema",
     "type": "module",
     "scripts": {
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack SDK",
     "type": "module",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack automatic CRUD API handlers and server adapters",
     "type": "module",
     "scripts": {
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/testtools",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "ZenStack Test Tools",
     "type": "module",
     "scripts": {
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/zod",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "",
     "type": "module",
     "main": "index.js",
diff --git a/samples/orm/package.json b/samples/orm/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sample-blog",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "description": "",
     "main": "index.js",
     "private": true,
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -1,6 +1,6 @@
 {
     "name": "e2e",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/package.json b/tests/regression/package.json
@@ -1,6 +1,6 @@
 {
     "name": "regression",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": true,
     "type": "module",
     "scripts": {
diff --git a/tests/regression/test/issue-651.test.ts b/tests/regression/test/issue-651.test.ts
diff --git a/tests/runtimes/bun/package.json b/tests/runtimes/bun/package.json
diff --git a/tests/runtimes/edge-runtime/package.json b/tests/runtimes/edge-runtime/package.json
diff --git a/turbo.json b/turbo.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.3.2",`
	`3`	`+ "version": "3.3.3",`
`4`	`4`	`"description": "ZenStack",`
`5`	`5`	`"packageManager": "pnpm@10.23.0",`
`6`	`6`	`"type": "module",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/better-auth",`
`3`		`- "version": "3.3.2",`
	`3`	`+ "version": "3.3.3",`
`4`	`4`	`"description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",`
`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/client-helpers",`
`3`		`- "version": "3.3.2",`
	`3`	`+ "version": "3.3.3",`
`4`	`4`	`"description": "Helpers for implementing clients that consume ZenStack's CRUD service",`
`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/tanstack-query",`
`3`		`- "version": "3.3.2",`
	`3`	`+ "version": "3.3.3",`
`4`	`4`	`"description": "TanStack Query Client for consuming ZenStack v3's CRUD service",`
`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/common-helpers",`
`3`		`- "version": "3.3.2",`
	`3`	`+ "version": "3.3.3",`
`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": "@zenstackhq/eslint-config",`
`3`		`- "version": "3.3.2",`
	`3`	`+ "version": "3.3.3",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/typescript-config",`
`3`		`- "version": "3.3.2",`
	`3`	`+ "version": "3.3.3",`
`4`	`4`	`"private": true,`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/vitest-config",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "3.3.2",`
	`4`	`+ "version": "3.3.3",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"exports": {`