Merge remote-tracking branch 'origin/dev' into tanstack-query-prefetch

Author: ymc9

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.4.1",
+    "version": "2.7.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

packages/ide/jetbrains/.idea/misc.xml

@@ -1,30 +1,61 @@
 # Changelog
 
 ## [Unreleased]
+
+### Fixed
+
+-   ZModel validation issues when accessing fields defined in a base model from `future().` or `this.`.
+
+## 2.5.0
+
+### Added
+
+-   A new `path` parameter to the `@@validate` attribute for providing an optional path to the field that caused the error.
+
+## 2.4.0
+
+### Added
+
+-   The `uuid()` function is updated to support the new UUID version feature from Prisma.
+
+## 2.3.0
+
 ### Added
-- New `check()` policy rule function.
+
+-   New `check()` policy rule function.
 
 ### Fixed
-- Fixed the issue with formatting schemas containing `Unsupported` type. 
+
+-   Fixed the issue with formatting schemas containing `Unsupported` type.
 
 ## 2.2.0
+
 ### Added
-- Support comparing fields from different models in mutation policy rules ("create", "update", and "delete).
+
+-   Support comparing fields from different models in mutation policy rules ("create", "update", and "delete).
 
 ## 2.1.0
+
 ### Added
-- Support using ZModel type names (e.g., `DateTime`) as model field names.
-- `auth()` is resolved from all reachable schema files.
+
+-   Support using ZModel type names (e.g., `DateTime`) as model field names.
+-   `auth()` is resolved from all reachable schema files.
 
 ## 2.0.0
+
 ### Added
-- ZenStack V2 release!
+
+-   ZenStack V2 release!
 
 ## 1.11.0
+
 ### Added
-- Added support to complex usage of `@@index` attribute like `@@index([content(ops: raw("gin_trgm_ops"))], type: Gin)`.
+
+-   Added support to complex usage of `@@index` attribute like `@@index([content(ops: raw("gin_trgm_ops"))], type: Gin)`.
+
 ### Fixed
-- Fixed several ZModel validation issues related to model inheritance.
+
+-   Fixed several ZModel validation issues related to model inheritance.
 
 ## 1.7.0
 

packages/ide/jetbrains/CHANGELOG.md

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.4.1"
+version = "2.7.0"
 
 repositories {
     mavenCentral()

packages/ide/jetbrains/build.gradle.kts

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.4.1",
+  "version": "2.7.0",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "2.4.1",
+    "version": "2.7.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/language/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.4.1",
+    "version": "2.7.0",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

packages/misc/redwood/package.json

@@ -1,9 +1,8 @@
-import { ForbiddenError } from '@redwoodjs/graphql-server';
+import { ForbiddenError, ValidationError } from '@redwoodjs/graphql-server';
 import {
     CrudFailureReason,
     EnhancementOptions,
     PrismaErrorCode,
-    ValidationError,
     enhance,
     isPrismaClientKnownRequestError,
     type AuthUser,
@@ -47,7 +46,7 @@ export function useZenStack<PrismaClient extends object>(
 
 // Transforms ZenStack errors into appropriate RedwoodJS errors
 function transformError(error: unknown) {
-    if (isPrismaClientKnownRequestError(error) && error.code === PrismaErrorCode.CONSTRAINED_FAILED) {
+    if (isPrismaClientKnownRequestError(error) && error.code === PrismaErrorCode.CONSTRAINT_FAILED) {
         if (
             error.meta?.reason === CrudFailureReason.ACCESS_POLICY_VIOLATION ||
             error.meta?.reason === CrudFailureReason.RESULT_NOT_READABLE

packages/misc/redwood/src/graphql.ts

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.4.1",
+  "version": "2.7.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/openapi/package.json

@@ -409,14 +409,17 @@ export class RESTfulOpenAPIGenerator extends OpenAPIGeneratorBase {
     private generateFilterParameters(model: DataModel) {
         const result: OAPI.ParameterObject[] = [];
 
+        const hasMultipleIds = model.fields.filter((f) => isIdField(f)).length > 1;
+
         for (const field of model.fields) {
             if (isForeignKeyField(field)) {
                 // no filtering with foreign keys because one can filter
                 // directly on the relationship
                 continue;
             }
 
-            if (isIdField(field)) {
+            // For multiple ids, make each id field filterable like a regular field
+            if (isIdField(field) && !hasMultipleIds) {
                 // id filter
                 result.push(this.makeFilterParameter(field, 'id', 'Id filter'));
                 continue;
@@ -843,7 +846,9 @@ export class RESTfulOpenAPIGenerator extends OpenAPIGeneratorBase {
     }
 
     private generateModelEntity(model: DataModel, mode: 'read' | 'create' | 'update'): OAPI.SchemaObject {
-        const fields = model.fields.filter((f) => !isIdField(f));
+        const idFields = model.fields.filter((f) => isIdField(f));
+        // For compound ids, each component is also exposed as a separate field
+        const fields = idFields.length > 1 ? model.fields : model.fields.filter((f) => !isIdField(f));
 
         const attributes: Record<string, OAPI.SchemaObject> = {};
         const relationships: Record<string, OAPI.ReferenceObject | OAPI.SchemaObject> = {};
@@ -869,6 +874,9 @@ export class RESTfulOpenAPIGenerator extends OpenAPIGeneratorBase {
                     !(isDataModel(field.$resolvedType?.decl) && field.type.array)
                 ) {
                     required.push(field.name);
+                } else if (mode === 'read') {
+                    // Until we support sparse fieldsets, all fields are required for read operations
+                    required.push(field.name);
                 }
             }
         }
@@ -886,8 +894,8 @@ export class RESTfulOpenAPIGenerator extends OpenAPIGeneratorBase {
 
         if (mode === 'create') {
             // 'id' is required if there's no default value
-            const idField = model.fields.find((f) => isIdField(f));
-            if (idField && !hasAttribute(idField, '@default')) {
+            const idFields = model.fields.filter((f) => isIdField(f));
+            if (idFields.length && idFields.every((f) => !hasAttribute(f, '@default'))) {
                 properties = { id: { type: 'string' }, ...properties };
                 toplevelRequired.unshift('id');
             }

packages/plugins/openapi/src/rest-generator.ts

@@ -637,18 +637,13 @@ export class RPCOpenAPIGenerator extends OpenAPIGeneratorBase {
 
         schemas['_Meta'] = {
             type: 'object',
+            description: 'Meta information about the request or response',
             properties: {
-                meta: {
-                    type: 'object',
-                    description: 'Meta information about the request or response',
-                    properties: {
-                        serialization: {
-                            description: 'Serialization metadata',
-                        },
-                    },
-                    additionalProperties: true,
+                serialization: {
+                    description: 'Serialization metadata',
                 },
             },
+            additionalProperties: true,
         };
 
         schemas['_Error'] = {