merge dev to main (v2.7.2) (#1793)

ymc9 · web-flow · commit dbe6bb9fa5ae · 2024-10-21T10:08:53.000-07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "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.7.1"
+version = "2.7.2"
 
 repositories {
     mavenCentral()
diff --git a/packages/ide/jetbrains/package.json b/packages/ide/jetbrains/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "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.7.1",
+    "version": "2.7.2",
     "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.7.1",
+    "version": "2.7.2",
     "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.7.1",
+  "version": "2.7.2",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {
diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {
diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "author": {
         "name": "ZenStack Team"
     },
diff --git a/packages/schema/src/language-server/validator/datamodel-validator.ts b/packages/schema/src/language-server/validator/datamodel-validator.ts
@@ -7,13 +7,7 @@ import {
     isEnum,
     isStringLiteral,
 } from '@zenstackhq/language/ast';
-import {
-    getLiteral,
-    getModelFieldsWithBases,
-    getModelIdFields,
-    getModelUniqueFields,
-    isDelegateModel,
-} from '@zenstackhq/sdk';
+import { getModelFieldsWithBases, getModelIdFields, getModelUniqueFields, isDelegateModel } from '@zenstackhq/sdk';
 import { AstNode, DiagnosticInfo, ValidationAcceptor, getDocument } from 'langium';
 import { findUpInheritance } from '../../utils/ast-utils';
 import { IssueCodes, SCALAR_TYPES } from '../constants';
@@ -147,14 +141,13 @@ export default class DataModelValidator implements AstValidator<DataModel> {
             }
         }
 
+        if (!fields && !references) {
+            return { attr: relAttr, name, fields, references, valid: true };
+        }
+
         if (!fields || !references) {
-            if (this.isSelfRelation(field, name)) {
-                // self relations are partial
-                // https://www.prisma.io/docs/concepts/components/prisma-schema/relations/self-relations
-            } else {
-                if (accept) {
-                    accept('error', `Both "fields" and "references" must be provided`, { node: relAttr });
-                }
+            if (accept) {
+                accept('error', `"fields" and "references" must be provided together`, { node: relAttr });
             }
         } else {
             // validate "fields" and "references" typing consistency
@@ -203,34 +196,8 @@ export default class DataModelValidator implements AstValidator<DataModel> {
         return { attr: relAttr, name, fields, references, valid };
     }
 
-    private isSelfRelation(field: DataModelField, relationName?: string) {
-        if (field.type.reference?.ref === field.$container) {
-            // field directly references back to its type
-            return true;
-        }
-
-        if (relationName) {
-            // field's relation points to another type, and that type's opposite relation field
-            // points back
-            const oppositeModel = field.type.reference?.ref as DataModel;
-            if (oppositeModel) {
-                const oppositeModelFields = getModelFieldsWithBases(oppositeModel);
-                for (const oppositeField of oppositeModelFields) {
-                    // find the opposite relation with the matching name
-                    const relAttr = oppositeField.attributes.find((a) => a.decl.ref?.name === '@relation');
-                    if (relAttr) {
-                        const relNameExpr = relAttr.args.find((a) => !a.name || a.name === 'name');
-                        const relName = getLiteral<string>(relNameExpr?.value);
-                        if (relName === relationName && oppositeField.type.reference?.ref === field.$container) {
-                            // found an opposite relation field that points back to this field's type
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-
-        return false;
+    private isSelfRelation(field: DataModelField) {
+        return field.type.reference?.ref === field.$container;
     }
 
     private validateRelationField(contextModel: DataModel, field: DataModelField, accept: ValidationAcceptor) {
@@ -330,10 +297,10 @@ export default class DataModelValidator implements AstValidator<DataModel> {
             // if both the field is array, then it's an implicit many-to-many relation
             if (!(field.type.array && oppositeField.type.array)) {
                 [field, oppositeField].forEach((f) => {
-                    if (!this.isSelfRelation(f, thisRelation.name)) {
+                    if (!this.isSelfRelation(f)) {
                         accept(
                             'error',
-                            'Field for one side of relation must carry @relation attribute with both "fields" and "references" fields',
+                            'Field for one side of relation must carry @relation attribute with both "fields" and "references"',
                             { node: f }
                         );
                     }
diff --git a/packages/schema/tests/schema/validation/datamodel-validation.test.ts b/packages/schema/tests/schema/validation/datamodel-validation.test.ts
@@ -451,7 +451,7 @@ describe('Data Model Validation Tests', () => {
                 aId String
             }
         `)
-        ).toMatchObject(errorLike(`Both "fields" and "references" must be provided`));
+        ).toMatchObject(errorLike(`"fields" and "references" must be provided together`));
 
         // one-to-one inconsistent attribute
         expect(
@@ -541,7 +541,7 @@ describe('Data Model Validation Tests', () => {
         `)
         ).toMatchObject(
             errorLike(
-                `Field for one side of relation must carry @relation attribute with both "fields" and "references" fields`
+                `Field for one side of relation must carry @relation attribute with both "fields" and "references"`
             )
         );
 
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "2.7.1",
+    "version": "2.7.2",
     "displayName": "ZenStack Server-side Adapters",
     "description": "ZenStack server-side adapters",
     "homepage": "https://zenstack.dev",
diff --git a/packages/server/src/api/rest/index.ts b/packages/server/src/api/rest/index.ts
@@ -1231,15 +1231,16 @@ class RequestHandler extends APIHandlerBase {
     }
 
     private makePrismaIdFilter(idFields: FieldInfo[], resourceId: string) {
+        const decodedId = decodeURIComponent(resourceId);
         if (idFields.length === 1) {
-            return { [idFields[0].name]: this.coerce(idFields[0].type, resourceId) };
+            return { [idFields[0].name]: this.coerce(idFields[0].type, decodedId) };
         } else {
             return {
                 // TODO: support `@@id` with custom name
                 [idFields.map((idf) => idf.name).join(prismaIdDivider)]: idFields.reduce(
                     (acc, curr, idx) => ({
                         ...acc,
-                        [curr.name]: this.coerce(curr.type, resourceId.split(this.idDivider)[idx]),
+                        [curr.name]: this.coerce(curr.type, decodedId.split(this.idDivider)[idx]),
                     }),
                     {}
                 ),
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "private": true,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-monorepo",`
`3`		`- "version": "2.7.1",`
	`3`	`+ "version": "2.7.2",`
`4`	`4`	`"description": "",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "pnpm -r build",`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`group = "dev.zenstack"`
`12`		`-version = "2.7.1"`
	`12`	`+version = "2.7.2"`
`13`	`13`
`14`	`14`	`repositories {`
`15`	`15`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jetbrains",`
`3`		`- "version": "2.7.1",`
	`3`	`+ "version": "2.7.2",`
`4`	`4`	`"displayName": "ZenStack JetBrains IDE Plugin",`
`5`	`5`	`"description": "ZenStack JetBrains IDE plugin",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`		`- "version": "2.7.1",`
	`3`	`+ "version": "2.7.2",`
`4`	`4`	`"displayName": "ZenStack modeling language compiler",`
`5`	`5`	`"description": "ZenStack modeling language compiler",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/redwood",`
`3`	`3`	`"displayName": "ZenStack RedwoodJS Integration",`
`4`		`- "version": "2.7.1",`
	`4`	`+ "version": "2.7.2",`
`5`	`5`	`"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/openapi",`
`3`	`3`	`"displayName": "ZenStack Plugin and Runtime for OpenAPI",`
`4`		`- "version": "2.7.1",`
	`4`	`+ "version": "2.7.2",`
`5`	`5`	`"description": "ZenStack plugin and runtime supporting OpenAPI",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/swr",`
`3`	`3`	`"displayName": "ZenStack plugin for generating SWR hooks",`
`4`		`- "version": "2.7.1",`
	`4`	`+ "version": "2.7.2",`
`5`	`5`	`"description": "ZenStack plugin for generating SWR hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/tanstack-query",`
`3`	`3`	`"displayName": "ZenStack plugin for generating tanstack-query hooks",`
`4`		`- "version": "2.7.1",`
	`4`	`+ "version": "2.7.2",`
`5`	`5`	`"description": "ZenStack plugin for generating tanstack-query hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"exports": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/trpc",`
`3`	`3`	`"displayName": "ZenStack plugin for tRPC",`
`4`		`- "version": "2.7.1",`
	`4`	`+ "version": "2.7.2",`
`5`	`5`	`"description": "ZenStack plugin for tRPC",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/runtime",`
`3`	`3`	`"displayName": "ZenStack Runtime Library",`
`4`		`- "version": "2.7.1",`
	`4`	`+ "version": "2.7.2",`
`5`	`5`	`"description": "Runtime of ZenStack for both client-side and server-side environments.",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`