merge dev to main (v2.7.4) (#1808)

ymc9 · AmruthPillai · thomassnielsen · web-flow · commit df9b0ff504fe · 2024-10-25T14:13:59.000-07:00
Co-authored-by: Amruth Pillai &lt;im.amruth@gmail.com&gt;
Co-authored-by: Thomas Sunde Nielsen &lt;me@thomassnielsen.com&gt;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.7.3",
+    "version": "2.7.4",
     "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.3"
+version = "2.7.4"
 
 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.3",
+  "version": "2.7.4",
   "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.3",
+    "version": "2.7.4",
     "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.3",
+    "version": "2.7.4",
     "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.3",
+  "version": "2.7.4",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
diff --git a/packages/plugins/openapi/src/rest-generator.ts b/packages/plugins/openapi/src/rest-generator.ts
@@ -847,8 +847,10 @@ export class RESTfulOpenAPIGenerator extends OpenAPIGeneratorBase {
 
     private generateModelEntity(model: DataModel, mode: 'read' | 'create' | 'update'): OAPI.SchemaObject {
         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));
+        // For compound ids each component is also exposed as a separate fields for read operations,
+        // but not required for write operations
+        const fields =
+            idFields.length > 1 && mode === 'read' ? model.fields : model.fields.filter((f) => !isIdField(f));
 
         const attributes: Record<string, OAPI.SchemaObject> = {};
         const relationships: Record<string, OAPI.ReferenceObject | OAPI.SchemaObject> = {};
diff --git a/packages/plugins/openapi/tests/baseline/rest-3.0.0.baseline.yaml b/packages/plugins/openapi/tests/baseline/rest-3.0.0.baseline.yaml
@@ -3143,14 +3143,6 @@ components:
                             type: string
                         attributes:
                             type: object
-                            required:
-                                - postId
-                                - userId
-                            properties:
-                                postId:
-                                    type: string
-                                userId:
-                                    type: string
                         relationships:
                             type: object
                             properties:
@@ -3178,13 +3170,6 @@ components:
                             type: string
                         type:
                             type: string
-                        attributes:
-                            type: object
-                            properties:
-                                postId:
-                                    type: string
-                                userId:
-                                    type: string
                         relationships:
                             type: object
                             properties:
diff --git a/packages/plugins/openapi/tests/baseline/rest-3.1.0.baseline.yaml b/packages/plugins/openapi/tests/baseline/rest-3.1.0.baseline.yaml
@@ -3155,16 +3155,6 @@ components:
                     properties:
                         type:
                             type: string
-                        attributes:
-                            type: object
-                            required:
-                                - postId
-                                - userId
-                            properties:
-                                postId:
-                                    type: string
-                                userId:
-                                    type: string
                         relationships:
                             type: object
                             properties:
@@ -3192,13 +3182,6 @@ components:
                             type: string
                         type:
                             type: string
-                        attributes:
-                            type: object
-                            properties:
-                                postId:
-                                    type: string
-                                userId:
-                                    type: string
                         relationships:
                             type: object
                             properties:
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.3",
+    "version": "2.7.4",
     "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.3",
+    "version": "2.7.4",
     "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.3",
+    "version": "2.7.4",
     "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.3",
+    "version": "2.7.4",
     "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.3",
+    "version": "2.7.4",
     "author": {
         "name": "ZenStack Team"
     },
diff --git a/packages/schema/src/plugins/enhancer/enhance/index.ts b/packages/schema/src/plugins/enhancer/enhance/index.ts
@@ -515,15 +515,11 @@ export function enhance(prisma: any, context?: EnhancementContext<${authTypePara
         return source;
     }
 
-    private removeCreateFromDelegateInput(
-        typeAlias: TypeAliasDeclaration,
-        delegateModels: DelegateInfo,
-        source: string
-    ) {
+    private removeCreateFromDelegateInput(typeAlias: TypeAliasDeclaration, delegateInfo: DelegateInfo, source: string) {
         // remove create/connectOrCreate/upsert fields from delegate's input types because
         // delegate models cannot be created directly
         const typeName = typeAlias.getName();
-        const delegateModelNames = delegateModels.map(([delegate]) => delegate.name);
+        const delegateModelNames = delegateInfo.map(([delegate]) => delegate.name);
         const delegateCreateUpdateInputRegex = new RegExp(
             `^(${delegateModelNames.join('|')})(Unchecked)?(Create|Update).*Input$`
         );
@@ -538,17 +534,24 @@ export function enhance(prisma: any, context?: EnhancementContext<${authTypePara
         return source;
     }
 
-    private readonly ModelCreateUpdateInputRegex = /(\S+)(Unchecked)?(Create|Update).*Input/;
-
     private removeDiscriminatorFromConcreteInput(
         typeAlias: TypeAliasDeclaration,
-        _delegateInfo: DelegateInfo,
+        delegateInfo: DelegateInfo,
         source: string
     ) {
         // remove discriminator field from the create/update input because discriminator cannot be set directly
         const typeName = typeAlias.getName();
 
-        const match = typeName.match(this.ModelCreateUpdateInputRegex);
+        const delegateModelNames = delegateInfo.map(([delegate]) => delegate.name);
+        const concreteModelNames = delegateInfo
+            .map(([_, concretes]) => concretes.flatMap((c) => c.name))
+            .flatMap((name) => name);
+        const allModelNames = [...new Set([...delegateModelNames, ...concreteModelNames])];
+        const concreteCreateUpdateInputRegex = new RegExp(
+            `^(${allModelNames.join('|')})(Unchecked)?(Create|Update).*Input$`
+        );
+
+        const match = typeName.match(concreteCreateUpdateInputRegex);
         if (match) {
             const modelName = match[1];
             const dataModel = this.model.declarations.find(
diff --git a/packages/schema/src/plugins/zod/generator.ts b/packages/schema/src/plugins/zod/generator.ts
@@ -10,6 +10,7 @@ import {
     isEnumFieldReference,
     isForeignKeyField,
     isFromStdlib,
+    isIdField,
     parseOptionAsStrings,
     resolvePath,
 } from '@zenstackhq/sdk';
@@ -291,8 +292,10 @@ export class ZodSchemaGenerator {
         sf.replaceWithText((writer) => {
             const scalarFields = model.fields.filter(
                 (field) =>
+                    // id fields are always included
+                    isIdField(field) ||
                     // regular fields only
-                    !isDataModel(field.type.reference?.ref) && !isForeignKeyField(field)
+                    (!isDataModel(field.type.reference?.ref) && !isForeignKeyField(field))
             );
 
             const relations = model.fields.filter((field) => isDataModel(field.type.reference?.ref));
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "2.7.3",
+    "version": "2.7.4",
     "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.3",
+    "version": "2.7.4",
     "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
@@ -720,8 +720,9 @@ class RequestHandler extends APIHandlerBase {
         const attributes: any = parsed.data.attributes;
 
         if (attributes) {
-            const schemaName = `${upperCaseFirst(type)}${upperCaseFirst(mode)}Schema`;
-            // zod-parse attributes if a schema is provided
+            // use the zod schema (that only contains non-relation fields) to validate the payload,
+            // if available
+            const schemaName = `${upperCaseFirst(type)}${upperCaseFirst(mode)}ScalarSchema`;
             const payloadSchema = zodSchemas?.models?.[schemaName];
             if (payloadSchema) {
                 const parsed = payloadSchema.safeParse(attributes);
@@ -756,6 +757,7 @@ class RequestHandler extends APIHandlerBase {
         }
 
         const { error, attributes, relationships } = this.processRequestBody(type, requestBody, zodSchemas, 'create');
+
         if (error) {
             return error;
         }
@@ -776,18 +778,16 @@ class RequestHandler extends APIHandlerBase {
 
                 if (relationInfo.isCollection) {
                     createPayload.data[key] = {
-                        connect: enumerate(data.data).map((item: any) => ({
-                            [this.makePrismaIdKey(relationInfo.idFields)]: item.id,
-                        })),
+                        connect: enumerate(data.data).map((item: any) =>
+                            this.makeIdConnect(relationInfo.idFields, item.id)
+                        ),
                     };
                 } else {
                     if (typeof data.data !== 'object') {
                         return this.makeError('invalidRelationData');
                     }
                     createPayload.data[key] = {
-                        connect: {
-                            [this.makePrismaIdKey(relationInfo.idFields)]: data.data.id,
-                        },
+                        connect: this.makeIdConnect(relationInfo.idFields, data.data.id),
                     };
                 }
 
@@ -868,9 +868,7 @@ class RequestHandler extends APIHandlerBase {
             } else {
                 updateArgs.data = {
                     [relationship]: {
-                        connect: {
-                            [this.makePrismaIdKey(relationInfo.idFields)]: parsed.data.data.id,
-                        },
+                        connect: this.makeIdConnect(relationInfo.idFields, parsed.data.data.id),
                     },
                 };
             }
@@ -1236,11 +1234,11 @@ class RequestHandler extends APIHandlerBase {
         return r.toString();
     }
 
-    private makePrismaIdFilter(idFields: FieldInfo[], resourceId: string) {
+    private makePrismaIdFilter(idFields: FieldInfo[], resourceId: string, nested: boolean = true) {
         const decodedId = decodeURIComponent(resourceId);
         if (idFields.length === 1) {
             return { [idFields[0].name]: this.coerce(idFields[0].type, decodedId) };
-        } else {
+        } else if (nested) {
             return {
                 // TODO: support `@@id` with custom name
                 [idFields.map((idf) => idf.name).join(prismaIdDivider)]: idFields.reduce(
@@ -1251,6 +1249,14 @@ class RequestHandler extends APIHandlerBase {
                     {}
                 ),
             };
+        } else {
+            return idFields.reduce(
+                (acc, curr, idx) => ({
+                    ...acc,
+                    [curr.name]: this.coerce(curr.type, decodedId.split(this.idDivider)[idx]),
+                }),
+                {}
+            );
         }
     }
 
@@ -1261,6 +1267,22 @@ class RequestHandler extends APIHandlerBase {
         return idFields.reduce((acc, curr) => ({ ...acc, [curr.name]: true }), {});
     }
 
+    private makeIdConnect(idFields: FieldInfo[], id: string | number) {
+        if (idFields.length === 1) {
+            return { [idFields[0].name]: this.coerce(idFields[0].type, id) };
+        } else {
+            return {
+                [this.makePrismaIdKey(idFields)]: idFields.reduce(
+                    (acc, curr, idx) => ({
+                        ...acc,
+                        [curr.name]: this.coerce(curr.type, `${id}`.split(this.idDivider)[idx]),
+                    }),
+                    {}
+                ),
+            };
+        }
+    }
+
     private makeIdKey(idFields: FieldInfo[]) {
         return idFields.map((idf) => idf.name).join(this.idDivider);
     }
@@ -1594,11 +1616,11 @@ class RequestHandler extends APIHandlerBase {
                 const values = value.split(',').filter((i) => i);
                 const filterValue =
                     values.length > 1
-                        ? { OR: values.map((v) => this.makePrismaIdFilter(info.idFields, v)) }
-                        : this.makePrismaIdFilter(info.idFields, value);
+                        ? { OR: values.map((v) => this.makePrismaIdFilter(info.idFields, v, false)) }
+                        : this.makePrismaIdFilter(info.idFields, value, false);
                 return { some: filterValue };
             } else {
-                return { is: this.makePrismaIdFilter(info.idFields, value) };
+                return { is: this.makePrismaIdFilter(info.idFields, value, false) };
             }
         } else {
             const coerced = this.coerce(fieldInfo.type, value);
diff --git a/packages/server/src/next/app-route-handler.ts b/packages/server/src/next/app-route-handler.ts
diff --git a/packages/server/tests/api/rest.test.ts b/packages/server/tests/api/rest.test.ts
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
diff --git a/tests/regression/tests/issue-1763.test.ts b/tests/regression/tests/issue-1763.test.ts

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.3",`
	`3`	`+ "version": "2.7.4",`
`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.3"`
	`12`	`+version = "2.7.4"`
`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.3",`
	`3`	`+ "version": "2.7.4",`
`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.3",`
	`3`	`+ "version": "2.7.4",`
`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.3",`
	`4`	`+ "version": "2.7.4",`
`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.3",`
	`4`	`+ "version": "2.7.4",`
`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.3",`
	`4`	`+ "version": "2.7.4",`
`5`	`5`	`"description": "ZenStack plugin for generating SWR hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`