@danielhritcu/zenstack-orm 3.5.15 → 3.5.16

package/dist/index.cjs

@@ -3252,6 +3252,7 @@ var BaseOperationHandler = class {
         const sourceField = vr.relation;
         const isSelfReferencing = field === sourceField;
         const { value: rewrittenValue, plan: nestedPlan } = this.rewriteNestedVirtualRelationArgs(vr.targetModel, value, virtualRelations);
+        const discriminatorTarget = vr.where ? this.resolveFilteredRelationDiscriminatorTarget(model, vr.targetModel, vr.where) : void 0;
         if (isSelfReferencing) {
           plans.push({
             kind: "filtered",
@@ -3260,6 +3261,7 @@ var BaseOperationHandler = class {
             sourceModel: vr.targetModel,
             single: vr.single,
             discriminatorWhere: vr.where,
+            discriminatorTarget,
             introducedSourceField: false,
             nestedPlan
           });
@@ -3287,6 +3289,7 @@ var BaseOperationHandler = class {
             sourceModel: vr.targetModel,
             single: vr.single,
             introducedSourceField: selection[sourceField] === void 0,
+            discriminatorTarget,
             nestedPlan
           });
         }
@@ -3384,6 +3387,24 @@ var BaseOperationHandler = class {
       plan: combinedPlan
     };
   }
+  resolveFilteredRelationDiscriminatorTarget(parentModel, relationModel, where) {
+    const keys = Object.keys(where);
+    const parentMatches = keys.every((key) => {
+      const field = getField(this.schema, parentModel, key);
+      return !!field && !field.relation;
+    });
+    if (parentMatches) {
+      return "parent";
+    }
+    const relationMatches = keys.every((key) => {
+      const field = getField(this.schema, relationModel, key);
+      return !!field && !field.relation;
+    });
+    if (relationMatches) {
+      return "relation";
+    }
+    return "parent";
+  }
   applyVirtualRelationPlan(data, plan) {
     if (!plan || data == null) return data;
     if (Array.isArray(data)) return data.map((item) => this.applyVirtualRelationPlan(item, plan));
@@ -3396,11 +3417,17 @@ var BaseOperationHandler = class {
       if (sel.kind === "actual") {
         result[sel.field] = sel.nestedPlan ? this.applyVirtualRelationPlan(sourceValue, sel.nestedPlan) : sourceValue;
       } else if (sel.kind === "filtered") {
-        let value = sel.single ? Array.isArray(sourceValue) ? sourceValue[0] ?? null : sourceValue ?? null : sourceValue;
+        let value = sourceValue;
         if (sel.discriminatorWhere && value != null) {
-          const matches = Object.entries(sel.discriminatorWhere).every(([key, val]) => result[key] === val);
-          if (!matches) value = null;
+          if (sel.discriminatorTarget === "relation") {
+            const matchesRelation = /* @__PURE__ */ __name((item) => item != null && typeof item === "object" && Object.entries(sel.discriminatorWhere).every(([key, expected]) => item[key] === expected), "matchesRelation");
+            value = Array.isArray(value) ? value.filter(matchesRelation) : matchesRelation(value) ? value : null;
+          } else {
+            const matches = Object.entries(sel.discriminatorWhere).every(([key, val]) => result[key] === val);
+            if (!matches) value = null;
+          }
         }
+        value = sel.single ? Array.isArray(value) ? value[0] ?? null : value ?? null : value;
         if (sel.nestedPlan) {
           value = this.applyVirtualRelationPlan(value, sel.nestedPlan);
         }