merge dev to main (v2.10.0) (#1907)

zenstackhq · Dec 5, 2024 · 7cc5f00 · 7cc5f00
2 parents 251c699 + 4c8b86f
commit 7cc5f00
Show file tree

Hide file tree

Showing 53 changed files with 11,760 additions and 4,830 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.9.4",
+    "version": "2.10.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",

diff --git a/packages/ide/jetbrains/build.gradle.kts b/packages/ide/jetbrains/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.9.4"
+version = "2.10.0"
 
 repositories {
     mavenCentral()

diff --git a/packages/ide/jetbrains/package.json b/packages/ide/jetbrains/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.9.4",
+  "version": "2.10.0",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

diff --git a/packages/language/package.json b/packages/language/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "2.9.4",
+    "version": "2.10.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

diff --git a/packages/misc/redwood/package.json b/packages/misc/redwood/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.9.4",
+    "version": "2.10.0",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.9.4",
+  "version": "2.10.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

diff --git a/packages/plugins/openapi/tests/baseline/rpc-3.0.0.baseline.yaml b/packages/plugins/openapi/tests/baseline/rpc-3.0.0.baseline.yaml
@@ -180,7 +180,7 @@ components:
                     $ref: '#/components/schemas/Post_ItemListRelationFilter'
                 profile:
                     oneOf:
-                        - $ref: '#/components/schemas/ProfileNullableRelationFilter'
+                        - $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/ProfileWhereInput'
                     nullable: true
         UserOrderByWithRelationInput:
@@ -241,7 +241,7 @@ components:
                     $ref: '#/components/schemas/Post_ItemListRelationFilter'
                 profile:
                     oneOf:
-                        - $ref: '#/components/schemas/ProfileNullableRelationFilter'
+                        - $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/ProfileWhereInput'
                     nullable: true
         UserScalarWhereWithAggregatesInput:
@@ -319,7 +319,7 @@ components:
                         - type: string
                 user:
                     oneOf:
-                        - $ref: '#/components/schemas/UserRelationFilter'
+                        - $ref: '#/components/schemas/UserScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
         ProfileOrderByWithRelationInput:
             type: object
@@ -364,7 +364,7 @@ components:
                     nullable: true
                 user:
                     oneOf:
-                        - $ref: '#/components/schemas/UserRelationFilter'
+                        - $ref: '#/components/schemas/UserScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
         ProfileScalarWhereWithAggregatesInput:
             type: object
@@ -455,7 +455,7 @@ components:
                     nullable: true
                 author:
                     oneOf:
-                        - $ref: '#/components/schemas/UserNullableRelationFilter'
+                        - $ref: '#/components/schemas/UserNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
                     nullable: true
         Post_ItemOrderByWithRelationInput:
@@ -538,7 +538,7 @@ components:
                     nullable: true
                 author:
                     oneOf:
-                        - $ref: '#/components/schemas/UserNullableRelationFilter'
+                        - $ref: '#/components/schemas/UserNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
                     nullable: true
         Post_ItemScalarWhereWithAggregatesInput:
@@ -951,7 +951,7 @@ components:
                     $ref: '#/components/schemas/Post_ItemWhereInput'
                 none:
                     $ref: '#/components/schemas/Post_ItemWhereInput'
-        ProfileNullableRelationFilter:
+        ProfileNullableScalarRelationFilter:
             type: object
             properties:
                 is:
@@ -1105,7 +1105,7 @@ components:
                         - type: string
                         - $ref: '#/components/schemas/NestedStringNullableFilter'
                     nullable: true
-        UserRelationFilter:
+        UserScalarRelationFilter:
             type: object
             properties:
                 is:
@@ -1198,7 +1198,7 @@ components:
                     oneOf:
                         - type: integer
                         - $ref: '#/components/schemas/NestedIntFilter'
-        UserNullableRelationFilter:
+        UserNullableScalarRelationFilter:
             type: object
             properties:
                 is:
@@ -2660,14 +2660,14 @@ components:
                         - type: string
                         - $ref: '#/components/schemas/NullableStringFieldUpdateOperationsInput'
                     nullable: true
-        UserArgs:
+        UserDefaultArgs:
             type: object
             properties:
                 select:
                     $ref: '#/components/schemas/UserSelect'
                 include:
                     $ref: '#/components/schemas/UserInclude'
-        ProfileArgs:
+        ProfileDefaultArgs:
             type: object
             properties:
                 select:
@@ -2684,31 +2684,31 @@ components:
                 profile:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/ProfileArgs'
+                        - $ref: '#/components/schemas/ProfileDefaultArgs'
                 _count:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserCountOutputTypeArgs'
+                        - $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
         ProfileInclude:
             type: object
             properties:
                 user:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
         Post_ItemInclude:
             type: object
             properties:
                 author:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
         UserCountOutputTypeSelect:
             type: object
             properties:
                 posts:
                     type: boolean
-        UserCountOutputTypeArgs:
+        UserCountOutputTypeDefaultArgs:
             type: object
             properties:
                 select:
@@ -2733,11 +2733,11 @@ components:
                 profile:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/ProfileArgs'
+                        - $ref: '#/components/schemas/ProfileDefaultArgs'
                 _count:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserCountOutputTypeArgs'
+                        - $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
         ProfileSelect:
             type: object
             properties:
@@ -2748,7 +2748,7 @@ components:
                 user:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
                 userId:
                     type: boolean
         Post_ItemSelect:
@@ -2765,7 +2765,7 @@ components:
                 author:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
                 authorId:
                     type: boolean
                 published:

diff --git a/packages/plugins/openapi/tests/baseline/rpc-3.1.0.baseline.yaml b/packages/plugins/openapi/tests/baseline/rpc-3.1.0.baseline.yaml
@@ -183,7 +183,7 @@ components:
                     $ref: '#/components/schemas/Post_ItemListRelationFilter'
                 profile:
                     oneOf:
-                        - $ref: '#/components/schemas/ProfileNullableRelationFilter'
+                        - $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/ProfileWhereInput'
                         - type: 'null'
         UserOrderByWithRelationInput:
@@ -244,7 +244,7 @@ components:
                     $ref: '#/components/schemas/Post_ItemListRelationFilter'
                 profile:
                     oneOf:
-                        - $ref: '#/components/schemas/ProfileNullableRelationFilter'
+                        - $ref: '#/components/schemas/ProfileNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/ProfileWhereInput'
                         - type: 'null'
         UserScalarWhereWithAggregatesInput:
@@ -322,7 +322,7 @@ components:
                         - type: string
                 user:
                     oneOf:
-                        - $ref: '#/components/schemas/UserRelationFilter'
+                        - $ref: '#/components/schemas/UserScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
         ProfileOrderByWithRelationInput:
             type: object
@@ -367,7 +367,7 @@ components:
                         - type: 'null'
                 user:
                     oneOf:
-                        - $ref: '#/components/schemas/UserRelationFilter'
+                        - $ref: '#/components/schemas/UserScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
         ProfileScalarWhereWithAggregatesInput:
             type: object
@@ -458,7 +458,7 @@ components:
                         - type: 'null'
                 author:
                     oneOf:
-                        - $ref: '#/components/schemas/UserNullableRelationFilter'
+                        - $ref: '#/components/schemas/UserNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
                         - type: 'null'
         Post_ItemOrderByWithRelationInput:
@@ -541,7 +541,7 @@ components:
                         - type: 'null'
                 author:
                     oneOf:
-                        - $ref: '#/components/schemas/UserNullableRelationFilter'
+                        - $ref: '#/components/schemas/UserNullableScalarRelationFilter'
                         - $ref: '#/components/schemas/UserWhereInput'
                         - type: 'null'
         Post_ItemScalarWhereWithAggregatesInput:
@@ -959,7 +959,7 @@ components:
                     $ref: '#/components/schemas/Post_ItemWhereInput'
                 none:
                     $ref: '#/components/schemas/Post_ItemWhereInput'
-        ProfileNullableRelationFilter:
+        ProfileNullableScalarRelationFilter:
             type: object
             properties:
                 is:
@@ -1116,7 +1116,7 @@ components:
                         - type: string
                         - $ref: '#/components/schemas/NestedStringNullableFilter'
                         - type: 'null'
-        UserRelationFilter:
+        UserScalarRelationFilter:
             type: object
             properties:
                 is:
@@ -1212,7 +1212,7 @@ components:
                     oneOf:
                         - type: integer
                         - $ref: '#/components/schemas/NestedIntFilter'
-        UserNullableRelationFilter:
+        UserNullableScalarRelationFilter:
             type: object
             properties:
                 is:
@@ -2689,14 +2689,14 @@ components:
                         - type: string
                         - $ref: '#/components/schemas/NullableStringFieldUpdateOperationsInput'
                         - type: 'null'
-        UserArgs:
+        UserDefaultArgs:
             type: object
             properties:
                 select:
                     $ref: '#/components/schemas/UserSelect'
                 include:
                     $ref: '#/components/schemas/UserInclude'
-        ProfileArgs:
+        ProfileDefaultArgs:
             type: object
             properties:
                 select:
@@ -2713,31 +2713,31 @@ components:
                 profile:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/ProfileArgs'
+                        - $ref: '#/components/schemas/ProfileDefaultArgs'
                 _count:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserCountOutputTypeArgs'
+                        - $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
         ProfileInclude:
             type: object
             properties:
                 user:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
         Post_ItemInclude:
             type: object
             properties:
                 author:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
         UserCountOutputTypeSelect:
             type: object
             properties:
                 posts:
                     type: boolean
-        UserCountOutputTypeArgs:
+        UserCountOutputTypeDefaultArgs:
             type: object
             properties:
                 select:
@@ -2762,11 +2762,11 @@ components:
                 profile:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/ProfileArgs'
+                        - $ref: '#/components/schemas/ProfileDefaultArgs'
                 _count:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserCountOutputTypeArgs'
+                        - $ref: '#/components/schemas/UserCountOutputTypeDefaultArgs'
         ProfileSelect:
             type: object
             properties:
@@ -2777,7 +2777,7 @@ components:
                 user:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
                 userId:
                     type: boolean
         Post_ItemSelect:
@@ -2794,7 +2794,7 @@ components:
                 author:
                     oneOf:
                         - type: boolean
-                        - $ref: '#/components/schemas/UserArgs'
+                        - $ref: '#/components/schemas/UserDefaultArgs'
                 authorId:
                     type: boolean
                 published: