merge dev to main (v3.9.3)

package.json

@@ -2,7 +2,7 @@
     "name": "zenstack-v3",
     "displayName": "ZenStack",
     "description": "ZenStack",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

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.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

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.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

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.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

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.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

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.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

packages/common-helpers/package.json

@@ -2,7 +2,7 @@
     "name": "@zenstackhq/common-helpers",
     "displayName": "ZenStack Common Helpers",
     "description": "ZenStack Common Helpers",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

packages/config/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "type": "module",
     "private": true,
     "license": "MIT"

packages/config/tsdown-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/tsdown-config",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "private": true,
     "type": "module",
     "license": "MIT",

packages/config/typescript-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/typescript-config",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "private": true,
     "license": "MIT"
 }

packages/config/vitest-config/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/vitest-config",
     "type": "module",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "private": true,
     "license": "MIT",
     "exports": {

packages/create-zenstack/package.json

@@ -2,7 +2,7 @@
     "name": "create-zenstack",
     "displayName": "Create ZenStack",
     "description": "Create a new ZenStack project",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack-v3",
     "publisher": "zenstack",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "displayName": "ZenStack V3 Language Tools",
     "description": "VSCode extension for ZenStack (v3) ZModel language",
     "private": true,

packages/language/package.json

@@ -2,7 +2,7 @@
     "name": "@zenstackhq/language",
     "displayName": "ZenStack Language Tooling",
     "description": "ZenStack ZModel language specification",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

packages/language/src/utils.ts

@@ -745,7 +745,7 @@ export function getPluginDocuments(model: Model, schemaPath: string): string[] {
         }
 
         const provider = getLiteral<string>(providerField.value);
-        if (!provider) {
+        if (!provider || typeof provider !== 'string') {
             continue;
         }
 

packages/language/src/validator.ts

@@ -9,6 +9,7 @@ import type {
     GeneratorDecl,
     InvocationExpr,
     Model,
+    Plugin,
     Procedure,
     TypeDef,
     ZModelAstType,
@@ -17,6 +18,7 @@ import type { ZModelServices } from './module';
 import AttributeValidator from './validators/attribute-validator';
 import DataModelValidator from './validators/datamodel-validator';
 import DataSourceValidator from './validators/datasource-validator';
+import PluginValidator from './validators/plugin-validator';
 import EnumValidator from './validators/enum-validator';
 import ExpressionValidator from './validators/expression-validator';
 import FunctionDeclValidator from './validators/function-decl-validator';
@@ -34,6 +36,7 @@ export function registerValidationChecks(services: ZModelServices) {
     const checks: ValidationChecks<ZModelAstType> = {
         Model: validator.checkModel,
         DataSource: validator.checkDataSource,
+        Plugin: validator.checkPlugin,
         GeneratorDecl: validator.checkGenerator,
         DataModel: validator.checkDataModel,
         TypeDef: validator.checkTypeDef,
@@ -96,4 +99,8 @@ export class ZModelValidator {
     checkProcedure(node: Procedure, accept: ValidationAcceptor): void {
         new ProcedureValidator().validate(node, accept);
     }
+
+    checkPlugin(node: Plugin, accept: ValidationAcceptor): void {
+        new PluginValidator().validate(node, accept);
+    }
 }

packages/language/src/validators/plugin-validator.ts

@@ -0,0 +1,31 @@
+import type { ValidationAcceptor } from 'langium';
+import { Plugin } from '../generated/ast';
+import { getStringLiteral } from '../utils';
+import { validateDuplicatedDeclarations, type AstValidator } from './common';
+
+/**
+ * Validates plugin declarations.
+ */
+export default class PluginValidator implements AstValidator<Plugin> {
+    validate(plugin: Plugin, accept: ValidationAcceptor): void {
+        validateDuplicatedDeclarations(plugin, plugin.fields, accept);
+        this.validateProvider(plugin, accept);
+    }
+
+    private validateProvider(plugin: Plugin, accept: ValidationAcceptor) {
+        const provider = plugin.fields.find((f) => f.name === 'provider');
+        if (!provider) {
+            accept('error', 'plugin must include a "provider" field', {
+                node: plugin,
+            });
+            return;
+        }
+
+        const providerValue = getStringLiteral(provider.value);
+        if (!providerValue) {
+            accept('error', '"provider" must be set to a non-empty string literal', {
+                node: provider.value,
+            });
+        }
+    }
+}

packages/language/test/plugin.test.ts

@@ -0,0 +1,119 @@
+import { describe, it } from 'vitest';
+import { loadSchema, loadSchemaWithError } from './utils';
+
+describe('Plugin tests', () => {
+    it('accepts plugins with a string provider', async () => {
+        await loadSchema(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model User {
+                id String @id @default(uuid())
+            }
+
+            plugin test {
+                provider = 'test'
+            }
+        `,
+        );
+    });
+
+    it('rejects plugins without a provider', async () => {
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model User {
+                id String @id @default(uuid())
+            }
+
+            plugin test {
+
+            }
+        `,
+            'plugin must include a "provider" field',
+        );
+    });
+
+    it('rejects plugins with an empty provider', async () => {
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model User {
+                id String @id @default(uuid())
+            }
+
+            plugin test {
+                provider = ''
+            }
+        `,
+            '"provider" must be set to a non-empty string literal',
+        );
+    });
+
+    it('rejects plugins with a non-string provider', async () => {
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model User {
+                id String @id @default(uuid())
+            }
+
+            plugin test {
+                provider = []
+            }
+        `,
+            '"provider" must be set to a non-empty string literal',
+        );
+
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model User {
+                id String @id @default(uuid())
+            }
+
+            plugin test {
+                provider = true
+            }
+        `,
+            '"provider" must be set to a non-empty string literal',
+        );
+
+        await loadSchemaWithError(
+            `
+            datasource db {
+                provider = 'sqlite'
+                url      = 'file:./dev.db'
+            }
+
+            model User {
+                id String @id @default(uuid())
+            }
+
+            plugin test {
+                provider = {}
+            }
+        `,
+            '"provider" must be set to a non-empty string literal',
+        );
+    });
+});

packages/orm/package.json

@@ -2,7 +2,7 @@
     "name": "@zenstackhq/orm",
     "displayName": "ZenStack ORM",
     "description": "ZenStack ORM",
-    "version": "3.9.2",
+    "version": "3.9.3",
     "type": "module",
     "author": {
         "name": "ZenStack Team",

packages/orm/src/client/crud/dialects/sqlite.ts

@@ -99,7 +99,7 @@ export class SqliteCrudDialect<Schema extends SchemaDef> extends BaseCrudDialect
                           ? new Date(value).toISOString()
                           : value;
                 case 'Decimal':
-                    return (value as Decimal).toString();
+                    return value !== null ? value.toString() : value;
                 case 'Bytes':
                     return Buffer.from(value as Uint8Array);
                 default:

packages/orm/src/client/executor/name-mapper.ts

@@ -14,6 +14,7 @@ import {
     InsertQueryNode,
     type OperationNode,
     OperationNodeTransformer,
+    type OrderByItemNode,
     PrimitiveValueListNode,
     type QueryId,
     ReferenceNode,
@@ -185,6 +186,52 @@ export class QueryNameMapper extends OperationNodeTransformer {
         };
     }
 
+    protected override transformOrderByItem(node: OrderByItemNode, queryId?: QueryId) {
+        const result = super.transformOrderByItem(node, queryId);
+        return { ...result, orderBy: this.qualifyShadowedOrderByRef(result.orderBy) };
+    }
+
+    // When a column's enum type has `@map`-ed values, selecting it emits a computed
+    // `CASE ... END AS "column"` projection. In SQL, an unqualified `ORDER BY column` resolves
+    // to that output alias rather than the underlying column, silently switching the sort from
+    // native enum order to alphabetical order of the mapped-back labels. Re-qualify such
+    // references with their resolved table/alias so they keep pointing at the real column.
+    private qualifyShadowedOrderByRef(node: OperationNode): OperationNode {
+        let columnName: string | undefined;
+        if (ReferenceNode.is(node) && ColumnNode.is(node.column) && !node.table) {
+            columnName = node.column.column.name;
+        } else if (ColumnNode.is(node)) {
+            columnName = node.column.name;
+        }
+        if (!columnName) {
+            return node;
+        }
+
+        const scope = this.resolveFieldFromScopes(columnName);
+        if (!scope?.model) {
+            return node;
+        }
+
+        // we're inspecting a post-transform name: a renamed field's reference has already been
+        // rewritten to its column name, so if the resolved field's column differs from the name
+        // we're holding, the resolution is a name collision with an unrelated (renamed) field —
+        // qualifying based on it could point at the wrong table
+        if (this.mapFieldName(scope.model, columnName) !== columnName) {
+            return node;
+        }
+
+        // and only when the enum-value mapping actually rewrites the projection
+        const fieldDef = getField(this.schema, scope.model, columnName);
+        const enumDef = fieldDef && getEnum(this.schema, fieldDef.type);
+        if (!enumDef || Object.keys(this.getEnumValueMapping(enumDef)).length === 0) {
+            return node;
+        }
+
+        const tableName =
+            scope.alias && IdentifierNode.is(scope.alias) ? scope.alias.name : this.mapTableName(scope.model);
+        return ReferenceNode.create(ColumnNode.create(columnName), TableNode.create(tableName));
+    }
+
     protected override transformReference(node: ReferenceNode, queryId?: QueryId) {
         if (!ColumnNode.is(node.column)) {
             return super.transformReference(node, queryId);