Skip to content

Commit 8297c03

Browse files
authored
merge dev to main (v2.5.0) (#1680)
2 parents 61e07d0 + dc72b64 commit 8297c03

File tree

142 files changed

+10625
-850
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+10625
-850
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.4.1",
3+
"version": "2.5.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r build",

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ide/jetbrains/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44
### Added
5+
- A new `path` parameter to the `@@validate` attribute for providing an optional path to the field that caused the error.
6+
7+
## 2.4.0
8+
### Added
9+
- The `uuid()` function is updated to support the new UUID version feature from Prisma.
10+
11+
## 2.3.0
12+
### Added
513
- New `check()` policy rule function.
614

715
### Fixed

packages/ide/jetbrains/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.4.1"
12+
version = "2.5.0"
1313

1414
repositories {
1515
mavenCentral()

packages/ide/jetbrains/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jetbrains",
3-
"version": "2.4.1",
3+
"version": "2.5.0",
44
"displayName": "ZenStack JetBrains IDE Plugin",
55
"description": "ZenStack JetBrains IDE plugin",
66
"homepage": "https://zenstack.dev",

packages/language/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/language",
3-
"version": "2.4.1",
3+
"version": "2.5.0",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

packages/misc/redwood/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/redwood",
33
"displayName": "ZenStack RedwoodJS Integration",
4-
"version": "2.4.1",
4+
"version": "2.5.0",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

packages/misc/redwood/src/graphql.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import { ForbiddenError } from '@redwoodjs/graphql-server';
1+
import { ForbiddenError, ValidationError } from '@redwoodjs/graphql-server';
22
import {
33
CrudFailureReason,
44
EnhancementOptions,
55
PrismaErrorCode,
6-
ValidationError,
76
enhance,
87
isPrismaClientKnownRequestError,
98
type AuthUser,
@@ -47,7 +46,7 @@ export function useZenStack<PrismaClient extends object>(
4746

4847
// Transforms ZenStack errors into appropriate RedwoodJS errors
4948
function transformError(error: unknown) {
50-
if (isPrismaClientKnownRequestError(error) && error.code === PrismaErrorCode.CONSTRAINED_FAILED) {
49+
if (isPrismaClientKnownRequestError(error) && error.code === PrismaErrorCode.CONSTRAINT_FAILED) {
5150
if (
5251
error.meta?.reason === CrudFailureReason.ACCESS_POLICY_VIOLATION ||
5352
error.meta?.reason === CrudFailureReason.RESULT_NOT_READABLE

packages/plugins/openapi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/openapi",
33
"displayName": "ZenStack Plugin and Runtime for OpenAPI",
4-
"version": "2.4.1",
4+
"version": "2.5.0",
55
"description": "ZenStack plugin and runtime supporting OpenAPI",
66
"main": "index.js",
77
"repository": {

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -637,18 +637,13 @@ export class RPCOpenAPIGenerator extends OpenAPIGeneratorBase {
637637

638638
schemas['_Meta'] = {
639639
type: 'object',
640+
description: 'Meta information about the request or response',
640641
properties: {
641-
meta: {
642-
type: 'object',
643-
description: 'Meta information about the request or response',
644-
properties: {
645-
serialization: {
646-
description: 'Serialization metadata',
647-
},
648-
},
649-
additionalProperties: true,
642+
serialization: {
643+
description: 'Serialization metadata',
650644
},
651645
},
646+
additionalProperties: true,
652647
};
653648

654649
schemas['_Error'] = {

0 commit comments

Comments
 (0)