@danielhritcu/zenstack-orm 3.5.14 → 3.5.16

package/dist/index.js

@@ -3202,6 +3202,8 @@ var BaseOperationHandler = class {
       if (vr.kind === "filtered") {
         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",
@@ -3210,11 +3212,13 @@ var BaseOperationHandler = class {
             sourceModel: vr.targetModel,
             single: vr.single,
             discriminatorWhere: vr.where,
-            introducedSourceField: false
+            discriminatorTarget,
+            introducedSourceField: false,
+            nestedPlan
           });
         } else {
-          const nestedArgs = value === true ? {} : {
-            ...value
+          const nestedArgs = rewrittenValue === true ? {} : {
+            ...rewrittenValue
           };
           const where = nestedArgs.where ? {
             ...nestedArgs.where,
@@ -3235,15 +3239,18 @@ var BaseOperationHandler = class {
             sourceField,
             sourceModel: vr.targetModel,
             single: vr.single,
-            introducedSourceField: selection[sourceField] === void 0
+            introducedSourceField: selection[sourceField] === void 0,
+            discriminatorTarget,
+            nestedPlan
           });
         }
       } else if (vr.kind === "through") {
         const path = vr.path;
         const [sourceField, ...restPath] = path;
         if (!sourceField) continue;
-        let throughValue = value === true ? true : {
-          ...value
+        const { value: rewrittenValue, plan: nestedPlan } = this.rewriteNestedVirtualRelationArgs(vr.targetModel, value, virtualRelations);
+        let throughValue = rewrittenValue === true ? true : {
+          ...rewrittenValue
         };
         for (let i = restPath.length - 1; i >= 0; i--) {
           throughValue = {
@@ -3260,7 +3267,27 @@ var BaseOperationHandler = class {
           sourceField,
           sourceModel: vr.targetModel,
           path: restPath,
-          introducedSourceField: selection[sourceField] === void 0
+          introducedSourceField: selection[sourceField] === void 0,
+          nestedPlan
+        });
+      }
+    }
+    for (const [field, value] of Object.entries(nextSelection)) {
+      const fieldDef = getField(this.schema, model, field);
+      if (!fieldDef?.relation || value === true || !value || typeof value !== "object") {
+        continue;
+      }
+      const { value: rewrittenValue, plan: nestedPlan } = this.rewriteNestedVirtualRelationArgs(fieldDef.type, value, virtualRelations);
+      if (rewrittenValue !== value) {
+        nextSelection[field] = rewrittenValue;
+      }
+      if (nestedPlan) {
+        plans.push({
+          kind: "actual",
+          field,
+          sourceField: field,
+          sourceModel: fieldDef.type,
+          nestedPlan
         });
       }
     }
@@ -3271,6 +3298,64 @@ var BaseOperationHandler = class {
       } : void 0
     };
   }
+  rewriteNestedVirtualRelationArgs(model, value, virtualRelations) {
+    if (value === true || !value || typeof value !== "object" || Array.isArray(value)) {
+      return {
+        value
+      };
+    }
+    let changed = false;
+    const nextValue = {
+      ...value
+    };
+    let combinedPlan;
+    const mergePlan = /* @__PURE__ */ __name((plan) => {
+      if (!plan) return;
+      if (!combinedPlan) {
+        combinedPlan = {
+          selections: [
+            ...plan.selections
+          ]
+        };
+      } else {
+        combinedPlan.selections.push(...plan.selections);
+      }
+    }, "mergePlan");
+    if (nextValue["select"] && typeof nextValue["select"] === "object") {
+      const { selection, plan } = this.rewriteSelectionMap(model, nextValue["select"], virtualRelations);
+      nextValue["select"] = selection;
+      changed = true;
+      mergePlan(plan);
+    }
+    if (nextValue["include"] && typeof nextValue["include"] === "object") {
+      const { selection, plan } = this.rewriteSelectionMap(model, nextValue["include"], virtualRelations);
+      nextValue["include"] = selection;
+      changed = true;
+      mergePlan(plan);
+    }
+    return {
+      value: changed ? nextValue : value,
+      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));
@@ -3280,15 +3365,30 @@ var BaseOperationHandler = class {
     };
     for (const sel of plan.selections) {
       const sourceValue = this.normalizeVirtualRelationValue(result[sel.sourceField]);
-      if (sel.kind === "filtered") {
-        let value = sel.single ? Array.isArray(sourceValue) ? sourceValue[0] ?? null : sourceValue ?? null : sourceValue;
+      if (sel.kind === "actual") {
+        result[sel.field] = sel.nestedPlan ? this.applyVirtualRelationPlan(sourceValue, sel.nestedPlan) : sourceValue;
+      } else if (sel.kind === "filtered") {
+        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);
         }
         result[sel.field] = value;
       } else if (sel.kind === "through") {
-        result[sel.field] = this.extractThroughValue(sourceValue, sel.path ?? []);
+        let value = this.extractThroughValue(sourceValue, sel.path ?? []);
+        if (sel.nestedPlan) {
+          value = this.applyVirtualRelationPlan(value, sel.nestedPlan);
+        }
+        result[sel.field] = value;
       }
       if (sel.introducedSourceField) {
         delete result[sel.sourceField];