@monkeyplus/flow 6.0.51 → 6.0.53

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.53",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {

package/src/public/vite.mjs

@@ -341,6 +341,7 @@ export function createFlowViteConfig(options = {}) {
     }
   }
   const { imports: userImports, ...userAutoImport } = options.userFlowConfig?.autoImport || {};
+  const uiOptions = options.userFlowConfig?.ui || {};
   return defineConfig({
     plugins: [
       createFlowVirtualServerModules(projectRoot, flowConfig),
@@ -354,7 +355,8 @@ export function createFlowViteConfig(options = {}) {
       createFlowEmptyFileFallback(),
       Vue(),
       ui({
-        router: false,
+        ...uiOptions,
+        router: uiOptions.router || false,
         components: {
           dts: resolve(projectRoot, ".flow/types/components.d.ts"),
           ...options.userFlowConfig?.components,
@@ -364,7 +366,7 @@ export function createFlowViteConfig(options = {}) {
             ...options.userFlowConfig?.components?.resolvers || []
           ]
         },
-        prose: true,
+        prose: uiOptions.prose || true,
         autoImport: {
           dts: resolve(projectRoot, ".flow/types/auto-imports.d.ts"),
           imports: [
@@ -391,6 +393,7 @@ export function createFlowViteConfig(options = {}) {
           ],
           ...userAutoImport
         }
+        // colorMode:
       }),
       nitro({
         ...flowNitroConfig,

package/src/runtime/config.d.ts

@@ -1,3 +1,4 @@
+import type { NuxtUIOptions } from '@nuxt/ui/unplugin';
 import type { NitroConfig } from 'nitro/types';
 import type { Options as AutoimportOptions } from 'unplugin-auto-import/types';
 import type { Options as ComponentOptions } from 'unplugin-vue-components/types';
@@ -66,6 +67,7 @@ export type UserFlowConfig = Partial<FlowConfig> & Record<string, unknown> & {
     siteUrl?: string;
     components?: Partial<ComponentOptions>;
     autoImport?: Partial<AutoimportOptions>;
+    ui?: Omit<NuxtUIOptions, 'components' | 'autoImport'>;
 };
 export type FlowModuleNitroConfig = NitroConfig & {
     runtimeConfig: any;