merge dev to main (v2.13.0)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.12.3",
+    "version": "2.13.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r --filter=\"!./packages/ide/*\" build",

packages/ide/jetbrains/build.gradle.kts

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

packages/ide/jetbrains/package.json

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

packages/language/package.json

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

packages/misc/redwood/package.json

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

packages/plugins/openapi/package.json

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

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.12.3",
+    "version": "2.13.0",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {

packages/plugins/tanstack-query/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "2.12.3",
+    "version": "2.13.0",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "2.12.3",
+    "version": "2.13.0",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {

packages/runtime/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "2.12.3",
+    "version": "2.13.0",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",

packages/runtime/res/model-meta.d.ts

@@ -1 +1 @@
-export * from '.zenstack/model-meta';
+export { default } from '.zenstack/model-meta';

packages/runtime/src/enhancements/node/delegate.ts

@@ -902,7 +902,7 @@ export class DelegateProxyHandler extends DefaultPrismaProxyHandler {
         } else {
             // translate to plain `update` for nested write into base fields
             const findArgs = {
-                where: clone(args.where),
+                where: clone(args.where ?? {}),
                 select: this.queryUtils.makeIdSelection(model),
             };
             await this.injectUpdateHierarchy(db, model, findArgs);
@@ -959,7 +959,7 @@ export class DelegateProxyHandler extends DefaultPrismaProxyHandler {
                     this.injectWhereHierarchy(model, (args as any)?.where);
                     this.doProcessUpdatePayload(model, (args as any)?.data);
                 } else {
-                    const where = this.queryUtils.buildReversedQuery(context, false, false);
+                    const where = await this.queryUtils.buildReversedQuery(db, context, false, false);
                     await this.queryUtils.transaction(db, async (tx) => {
                         await this.doUpdateMany(tx, model, { ...args, where }, simpleUpdateMany);
                     });
@@ -1022,15 +1022,15 @@ export class DelegateProxyHandler extends DefaultPrismaProxyHandler {
             },
 
             delete: async (model, _args, context) => {
-                const where = this.queryUtils.buildReversedQuery(context, false, false);
+                const where = await this.queryUtils.buildReversedQuery(db, context, false, false);
                 await this.queryUtils.transaction(db, async (tx) => {
                     await this.doDelete(tx, model, { where });
                 });
                 delete context.parent['delete'];
             },
 
             deleteMany: async (model, _args, context) => {
-                const where = this.queryUtils.buildReversedQuery(context, false, false);
+                const where = await this.queryUtils.buildReversedQuery(db, context, false, false);
                 await this.queryUtils.transaction(db, async (tx) => {
                     await this.doDeleteMany(tx, model, where);
                 });
@@ -1095,7 +1095,7 @@ export class DelegateProxyHandler extends DefaultPrismaProxyHandler {
     private async doDeleteMany(db: CrudContract, model: string, where: any): Promise<{ count: number }> {
         // query existing entities with id
         const idSelection = this.queryUtils.makeIdSelection(model);
-        const findArgs = { where: clone(where), select: idSelection };
+        const findArgs = { where: clone(where ?? {}), select: idSelection };
         this.injectWhereHierarchy(model, findArgs.where);
 
         if (this.options.logPrismaQuery) {

packages/runtime/src/enhancements/node/policy/handler.ts

@@ -809,7 +809,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 const unsafe = isUnsafeMutate(model, args, this.modelMeta);
 
                 // handles the connection to upstream entity
-                const reversedQuery = this.policyUtils.buildReversedQuery(context, true, unsafe);
+                const reversedQuery = await this.policyUtils.buildReversedQuery(db, context, true, unsafe);
                 if ((!unsafe || context.field.isRelationOwner) && reversedQuery[context.field.backLink]) {
                     // if mutation is safe, or current field owns the relation (so the other side has no fk),
                     // and the reverse query contains the back link, then we can build a "connect" with it
@@ -885,7 +885,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 if (args.skipDuplicates) {
                     // get a reversed query to include fields inherited from upstream mutation,
                     // it'll be merged with the create payload for unique constraint checking
-                    const upstreamQuery = this.policyUtils.buildReversedQuery(context);
+                    const upstreamQuery = await this.policyUtils.buildReversedQuery(db, context);
                     if (await this.hasDuplicatedUniqueConstraint(model, item, upstreamQuery, db)) {
                         if (this.shouldLogQuery) {
                             this.logger.info(`[policy] \`createMany\` skipping duplicate ${formatObject(item)}`);
@@ -910,7 +910,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                     if (operation === 'disconnect') {
                         // disconnect filter is not unique, need to build a reversed query to
                         // locate the entity and use its id fields as unique filter
-                        const reversedQuery = this.policyUtils.buildReversedQuery(context);
+                        const reversedQuery = await this.policyUtils.buildReversedQuery(db, context);
                         const found = await db[model].findUnique({
                             where: reversedQuery,
                             select: this.policyUtils.makeIdSelection(model),
@@ -936,7 +936,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
         const visitor = new NestedWriteVisitor(this.modelMeta, {
             update: async (model, args, context) => {
                 // build a unique query including upstream conditions
-                const uniqueFilter = this.policyUtils.buildReversedQuery(context);
+                const uniqueFilter = await this.policyUtils.buildReversedQuery(db, context);
 
                 // handle not-found
                 const existing = await this.policyUtils.checkExistence(db, model, uniqueFilter, true);
@@ -997,7 +997,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                     if (preValueSelect) {
                         select = { ...select, ...preValueSelect };
                     }
-                    const reversedQuery = this.policyUtils.buildReversedQuery(context);
+                    const reversedQuery = await this.policyUtils.buildReversedQuery(db, context);
                     const currentSetQuery = { select, where: reversedQuery };
                     this.policyUtils.injectAuthGuardAsWhere(db, currentSetQuery, model, 'read');
 
@@ -1027,7 +1027,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 } else {
                     // we have to process `updateMany` separately because the guard may contain
                     // filters using relation fields which are not allowed in nested `updateMany`
-                    const reversedQuery = this.policyUtils.buildReversedQuery(context);
+                    const reversedQuery = await this.policyUtils.buildReversedQuery(db, context);
                     const updateWhere = this.policyUtils.and(reversedQuery, updateGuard);
                     if (this.shouldLogQuery) {
                         this.logger.info(
@@ -1066,7 +1066,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
 
             upsert: async (model, args, context) => {
                 // build a unique query including upstream conditions
-                const uniqueFilter = this.policyUtils.buildReversedQuery(context);
+                const uniqueFilter = await this.policyUtils.buildReversedQuery(db, context);
 
                 // branch based on if the update target exists
                 const existing = await this.policyUtils.checkExistence(db, model, uniqueFilter);
@@ -1090,7 +1090,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
 
                     // convert upsert to update
                     const convertedUpdate = {
-                        where: args.where,
+                        where: args.where ?? {},
                         data: this.validateUpdateInputSchema(model, args.update),
                     };
                     this.mergeToParent(context.parent, 'update', convertedUpdate);
@@ -1143,7 +1143,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
 
             set: async (model, args, context) => {
                 // find the set of items to be replaced
-                const reversedQuery = this.policyUtils.buildReversedQuery(context);
+                const reversedQuery = await this.policyUtils.buildReversedQuery(db, context);
                 const findCurrSetArgs = {
                     select: this.policyUtils.makeIdSelection(model),
                     where: reversedQuery,
@@ -1162,7 +1162,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
 
             delete: async (model, args, context) => {
                 // build a unique query including upstream conditions
-                const uniqueFilter = this.policyUtils.buildReversedQuery(context);
+                const uniqueFilter = await this.policyUtils.buildReversedQuery(db, context);
 
                 // handle not-found
                 await this.policyUtils.checkExistence(db, model, uniqueFilter, true);
@@ -1179,7 +1179,7 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                 } else {
                     // we have to process `deleteMany` separately because the guard may contain
                     // filters using relation fields which are not allowed in nested `deleteMany`
-                    const reversedQuery = this.policyUtils.buildReversedQuery(context);
+                    const reversedQuery = await this.policyUtils.buildReversedQuery(db, context);
                     const deleteWhere = this.policyUtils.and(reversedQuery, guard);
                     if (this.shouldLogQuery) {
                         this.logger.info(`[policy] \`deleteMany\` ${model}:\n${formatObject({ where: deleteWhere })}`);
@@ -1579,12 +1579,15 @@ export class PolicyProxyHandler<DbClient extends DbClientContract> implements Pr
                     if (this.shouldLogQuery) {
                         this.logger.info(
                             `[policy] \`findMany\` ${this.model}: ${formatObject({
-                                where: args.where,
+                                where: args.where ?? {},
                                 select: candidateSelect,
                             })}`
                         );
                     }
-                    const candidates = await tx[this.model].findMany({ where: args.where, select: candidateSelect });
+                    const candidates = await tx[this.model].findMany({
+                        where: args.where ?? {},
+                        select: candidateSelect,
+                    });
 
                     // build a ID filter based on id values filtered by the additional checker
                     const { idFilter } = this.buildIdFilterWithEntityChecker(candidates, entityChecker.func);

packages/runtime/src/enhancements/node/policy/policy-utils.ts

@@ -30,7 +30,6 @@ import {
 } from '../../../types';
 import { getVersion } from '../../../version';
 import type { InternalEnhancementOptions } from '../create-enhancement';
-import { Logger } from '../logger';
 import { QueryUtils } from '../query-utils';
 import type {
     DelegateConstraint,
@@ -47,7 +46,6 @@ import { formatObject, prismaClientKnownRequestError } from '../utils';
  * Access policy enforcement utilities
  */
 export class PolicyUtil extends QueryUtils {
-    private readonly logger: Logger;
     private readonly modelMeta: ModelMeta;
     private readonly policy: PolicyDef;
     private readonly zodSchemas?: ZodSchemas;
@@ -62,7 +60,6 @@ export class PolicyUtil extends QueryUtils {
     ) {
         super(db, options);
 
-        this.logger = new Logger(db);
         this.user = context?.user;
 
         ({

packages/runtime/src/enhancements/node/query-utils.ts

@@ -10,11 +10,17 @@ import {
 } from '../../cross';
 import type { CrudContract, DbClientContract } from '../../types';
 import { getVersion } from '../../version';
+import { formatObject } from '../edge';
 import { InternalEnhancementOptions } from './create-enhancement';
+import { Logger } from './logger';
 import { prismaClientUnknownRequestError, prismaClientValidationError } from './utils';
 
 export class QueryUtils {
-    constructor(private readonly prisma: DbClientContract, protected readonly options: InternalEnhancementOptions) {}
+    protected readonly logger: Logger;
+
+    constructor(private readonly prisma: DbClientContract, protected readonly options: InternalEnhancementOptions) {
+        this.logger = new Logger(prisma);
+    }
 
     getIdFields(model: string) {
         return getIdFields(this.options.modelMeta, model, true);
@@ -60,7 +66,12 @@ export class QueryUtils {
     /**
      * Builds a reversed query for the given nested path.
      */
-    buildReversedQuery(context: NestedWriteVisitorContext, forMutationPayload = false, unsafeOperation = false) {
+    async buildReversedQuery(
+        db: CrudContract,
+        context: NestedWriteVisitorContext,
+        forMutationPayload = false,
+        uncheckedOperation = false
+    ) {
         let result, currQuery: any;
         let currField: FieldInfo | undefined;
 
@@ -102,17 +113,35 @@ export class QueryUtils {
                     const shouldPreserveRelationCondition =
                         // doing a mutation
                         forMutationPayload &&
-                        // and it's a safe mutate
-                        !unsafeOperation &&
+                        // and it's not an unchecked mutate
+                        !uncheckedOperation &&
                         // and the current segment is the direct parent (the last one is the mutate itself),
                         // the relation condition should be preserved and will be converted to a "connect" later
                         i === context.nestingPath.length - 2;
 
                     if (fkMapping && !shouldPreserveRelationCondition) {
                         // turn relation condition into foreign key condition, e.g.:
                         //     { user: { id: 1 } } => { userId: 1 }
+
+                        let parentPk = visitWhere;
+                        if (Object.keys(fkMapping).some((k) => !(k in parentPk) || parentPk[k] === undefined)) {
+                            // it can happen that the parent condition actually doesn't contain all id fields
+                            // （when the parent condition is not a primary key but unique constraints)
+                            // and in such case we need to load it to get the pks
+
+                            if (this.options.logPrismaQuery && this.logger.enabled('info')) {
+                                this.logger.info(
+                                    `[reverseLookup] \`findUniqueOrThrow\` ${model}: ${formatObject(where)}`
+                                );
+                            }
+                            parentPk = await db[model].findUniqueOrThrow({
+                                where,
+                                select: this.makeIdSelection(model),
+                            });
+                        }
+
                         for (const [r, fk] of Object.entries<string>(fkMapping)) {
-                            currQuery[fk] = visitWhere[r];
+                            currQuery[fk] = parentPk[r];
                         }
 
                         if (i > 0) {

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.12.3",
+    "version": "2.13.0",
     "author": {
         "name": "ZenStack Team"
     },