@monkeyplus/flow 6.0.51 → 6.0.52

package/modules/content/query.mjs

@@ -311,37 +311,50 @@ export function processContentQuery(entries, query, allEntries) {
   if (query.with) {
     try {
       const withRelations = JSON.parse(query.with);
-      const hydrateValue = (val, instruction) => {
+      const hydrateValue = (val, instruction, isRootEntry = false) => {
         if (Array.isArray(val)) {
-          return val.map((v) => hydrateValue(v, instruction));
+          return val.map((v) => hydrateValue(v, instruction, isRootEntry));
         }
         if (typeof val === "string") {
           const found = allEntries.find((e) => e.path === val);
           if (!found) return val;
           let hydratedFound = { ...found, data: JSON.parse(JSON.stringify(found.data)) };
           if (typeof instruction === "object" && instruction !== null && instruction.with) {
-            hydratedFound = hydrateEntry(hydratedFound, instruction.with);
+            hydratedFound = hydrateEntry(hydratedFound, instruction.with, true);
           }
           if (instruction === "raw" || typeof instruction === "object" && instruction !== null && instruction.raw) {
             return hydratedFound;
           }
           return hydratedFound.data;
         }
+        if (typeof val === "object" && val !== null) {
+          if (typeof instruction === "object" && instruction !== null && instruction.with) {
+            const hydratedObj = { ...val };
+            for (const [field, subInstruction] of Object.entries(instruction.with)) {
+              if (!subInstruction) continue;
+              const actualField = isRootEntry && !field.startsWith("data.") ? `data.${field}` : field;
+              const rawValue = getField(hydratedObj, actualField);
+              const resolved = hydrateValue(rawValue, subInstruction, false);
+              setField(hydratedObj, actualField, resolved);
+            }
+            return hydratedObj;
+          }
+        }
         return val;
       };
-      const hydrateEntry = (entry, relations) => {
+      const hydrateEntry = (entry, relations, isRootEntry = true) => {
         for (const [field, instruction] of Object.entries(relations)) {
           if (!instruction) continue;
-          const actualField = field.startsWith("data.") ? field : `data.${field}`;
+          const actualField = isRootEntry && !field.startsWith("data.") ? `data.${field}` : field;
           const rawValue = getField(entry, actualField);
-          const resolved = hydrateValue(rawValue, instruction);
+          const resolved = hydrateValue(rawValue, instruction, false);
           setField(entry, actualField, resolved);
         }
         return entry;
       };
       entries = entries.map((entry) => {
         const hydratedEntry = { ...entry, data: JSON.parse(JSON.stringify(entry.data)) };
-        return hydrateEntry(hydratedEntry, withRelations);
+        return hydrateEntry(hydratedEntry, withRelations, true);
       });
     } catch {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "6.0.51",
+  "version": "6.0.52",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {