@wpnuxt/core 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "wpnuxt",
   "configKey": "wpNuxt",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.3",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,5 +1,6 @@
 import { defu } from 'defu';
-import { promises, cpSync, existsSync, statSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { promises, cpSync, existsSync, statSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { useLogger, createResolver, resolveFiles, defineNuxtModule, addPlugin, addImports, addComponentsDir, addTemplate, addTypeTemplate, hasNuxtModule, installModule } from '@nuxt/kit';
 import { upperFirst } from 'scule';
@@ -64,16 +65,18 @@ const _parseDoc = async (doc) => {
     throw error;
   }
 };
-function processSelections(selections, level, query) {
+function processSelections(selections, level, query, canExtract = true) {
   if (!selections || selections.length === 0) return;
-  if (selections.length === 1 && selections[0]?.kind === "Field") {
-    query.nodes?.push(selections[0].name.value.trim());
+  const firstSelection = selections[0];
+  const hasSingleField = selections.length === 1 && firstSelection?.kind === "Field";
+  if (hasSingleField && canExtract && firstSelection.kind === "Field") {
+    query.nodes?.push(firstSelection.name.value.trim());
   }
   selections.forEach((s) => {
     if (s.kind === "FragmentSpread") {
       query.fragments?.push(s.name.value.trim());
     } else if (s.selectionSet?.selections) {
-      processSelections(s.selectionSet.selections, level + 1, query);
+      processSelections(s.selectionSet.selections, level + 1, query, canExtract && hasSingleField);
     }
   });
 }
@@ -110,13 +113,9 @@ async function prepareContext(ctx) {
     const fragmentSuffix = q.fragments?.length && q.nodes?.includes("nodes") ? "[]" : "";
     return q.fragments?.length ? q.fragments.map((f) => `${f}Fragment${fragmentSuffix}`).join(" | ") : "any";
   };
-  const queryFnExp = (q, typed = false, lazy = false) => {
-    const baseName = fnName(q.name);
-    const functionName = lazy ? `useLazy${q.name}` : baseName;
+  const queryFnExp = (q, typed = false) => {
+    const functionName = fnName(q.name);
     if (!typed) {
-      if (lazy) {
-        return `export const ${functionName} = (params, options) => useWPContent('${q.name}', [${formatNodes(q.nodes)}], false, params, { ...options, lazy: true })`;
-      }
       return `export const ${functionName} = (params, options) => useWPContent('${q.name}', [${formatNodes(q.nodes)}], false, params, options)`;
     }
     return `  export const ${functionName}: (params?: ${q.name}QueryVariables, options?: WPContentOptions) => WPContentResult<${getFragmentType(q)}>`;
@@ -131,8 +130,7 @@ async function prepareContext(ctx) {
   ctx.generateImports = () => {
     const imports = [];
     queries.forEach((f) => {
-      imports.push(queryFnExp(f, false, false));
-      imports.push(queryFnExp(f, false, true));
+      imports.push(queryFnExp(f, false));
     });
     mutations.forEach((m) => {
       imports.push(mutationFnExp(m, false));
@@ -192,8 +190,7 @@ async function prepareContext(ctx) {
       "declare module '#wpnuxt' {"
     ];
     queries.forEach((f) => {
-      declarations.push(queryFnExp(f, true, false));
-      declarations.push(queryFnExp(f, true, true));
+      declarations.push(queryFnExp(f, true));
     });
     mutations.forEach((m) => {
       declarations.push(mutationFnExp(m, true));
@@ -202,18 +199,14 @@ async function prepareContext(ctx) {
     return declarations.join("\n");
   };
   ctx.fnImports = [
-    // Auto-import query composables (regular and lazy variants)
-    ...queries.flatMap((fn) => [
-      { from: "#wpnuxt", name: fnName(fn.name) },
-      { from: "#wpnuxt", name: `useLazy${fn.name}` }
-    ]),
+    // Auto-import query composables
+    ...queries.map((fn) => ({ from: "#wpnuxt", name: fnName(fn.name) })),
     // Auto-import mutation composables
     ...mutations.map((m) => ({ from: "#wpnuxt", name: mutationFnName(m.name) }))
   ];
   logger.debug("generated WPNuxt composables: ");
   queries.forEach((f) => {
     logger.debug(` ${fnName(f.name)}()`);
-    logger.debug(` useLazy${f.name}()`);
   });
   mutations.forEach((m) => {
     logger.debug(` ${mutationFnName(m.name)}()`);
@@ -409,8 +402,8 @@ const module$1 = defineNuxtModule({
     addPlugin(resolver.resolve("./runtime/plugins/graphqlConfig"));
     addPlugin(resolver.resolve("./runtime/plugins/graphqlErrors"));
     const mergedQueriesFolder = await mergeQueries(nuxt, wpNuxtConfig, resolver);
-    setupServerOptions(nuxt, resolver, logger);
-    setupClientOptions(nuxt, resolver, logger);
+    await setupServerOptions(nuxt, resolver, logger);
+    await setupClientOptions(nuxt, resolver, logger);
     if (wpNuxtConfig.downloadSchema) {
       const schemaPath = join(nuxt.options.rootDir, "schema.graphql");
       logger.debug(`Validating WordPress endpoint: ${wpNuxtConfig.wordpressUrl}${wpNuxtConfig.graphqlEndpoint}`);
@@ -443,7 +436,9 @@ const module$1 = defineNuxtModule({
     configureVercelSettings(nuxt, logger);
     addImports([
       { name: "useWPContent", as: "useWPContent", from: resolver.resolve("./runtime/composables/useWPContent") },
-      { name: "useAsyncWPContent", as: "useAsyncWPContent", from: resolver.resolve("./runtime/composables/useWPContent") }
+      { name: "useAsyncWPContent", as: "useAsyncWPContent", from: resolver.resolve("./runtime/composables/useWPContent") },
+      { name: "getRelativeImagePath", as: "getRelativeImagePath", from: resolver.resolve("./runtime/util/images") },
+      { name: "usePrevNextPost", as: "usePrevNextPost", from: resolver.resolve("./runtime/composables/usePrevNextPost") }
       // Note: useGraphqlMutation is auto-imported via nuxt-graphql-middleware with includeComposables: true
     ]);
     addComponentsDir({
@@ -558,7 +553,7 @@ export default defineGraphqlServerOptions({
   }
 })
 `;
-function setupServerOptions(nuxt, _resolver, logger) {
+async function setupServerOptions(nuxt, _resolver, logger) {
   const serverDir = nuxt.options.serverDir;
   const targetPath = join(serverDir, "graphqlMiddleware.serverOptions.ts");
   if (existsSync(targetPath)) {
@@ -566,9 +561,9 @@ function setupServerOptions(nuxt, _resolver, logger) {
     return;
   }
   if (!existsSync(serverDir)) {
-    mkdirSync(serverDir, { recursive: true });
+    await mkdir(serverDir, { recursive: true });
   }
-  writeFileSync(targetPath, SERVER_OPTIONS_TEMPLATE);
+  await writeFile(targetPath, SERVER_OPTIONS_TEMPLATE);
   logger.debug("Created graphqlMiddleware.serverOptions.ts with WPNuxt defaults (cookie/auth forwarding)");
 }
 const CLIENT_OPTIONS_TEMPLATE = `import { defineGraphqlClientOptions } from '@wpnuxt/core/client-options'
@@ -600,7 +595,7 @@ export default defineGraphqlClientOptions<{
   }
 })
 `;
-function setupClientOptions(nuxt, _resolver, logger) {
+async function setupClientOptions(nuxt, _resolver, logger) {
   const appDir = nuxt.options.dir.app;
   const targetPath = join(appDir, "graphqlMiddleware.clientOptions.ts");
   if (existsSync(targetPath)) {
@@ -608,9 +603,9 @@ function setupClientOptions(nuxt, _resolver, logger) {
     return;
   }
   if (!existsSync(appDir)) {
-    mkdirSync(appDir, { recursive: true });
+    await mkdir(appDir, { recursive: true });
   }
-  writeFileSync(targetPath, CLIENT_OPTIONS_TEMPLATE);
+  await writeFile(targetPath, CLIENT_OPTIONS_TEMPLATE);
   logger.debug("Created graphqlMiddleware.clientOptions.ts with WPNuxt defaults (preview mode support)");
 }
 function configureVercelSettings(nuxt, logger) {

package/dist/runtime/composables/usePrevNextPost.js

@@ -0,0 +1,22 @@
+import { useWPContent } from "./useWPContent.js";
+export async function usePrevNextPost(currentSlug) {
+  const { data, execute } = useWPContent("Posts", ["posts", "nodes"], false, { limit: 100 });
+  await execute();
+  const allPosts = data.value || [];
+  if (!allPosts.length) {
+    return { prev: null, next: null };
+  }
+  const cleanSlug = currentSlug.replace(/^\/|\/$/g, "");
+  const currentIndex = allPosts.findIndex(
+    (post) => post.slug === cleanSlug
+  );
+  if (currentIndex === -1) {
+    return { prev: null, next: null };
+  }
+  const prevPost = currentIndex < allPosts.length - 1 ? allPosts[currentIndex + 1] : null;
+  const nextPost = currentIndex > 0 ? allPosts[currentIndex - 1] : null;
+  return {
+    prev: prevPost ?? null,
+    next: nextPost ?? null
+  };
+}

package/dist/runtime/composables/useWPContent.js

@@ -1,10 +1,32 @@
 import { getRelativeImagePath } from "../util/images.js";
 import { computed, useAsyncGraphqlQuery } from "#imports";
+function defaultGetCachedData(key, nuxtApp, ctx) {
+  if (nuxtApp.isHydrating) {
+    return nuxtApp.payload.data[key];
+  }
+  if (ctx.cause === "refresh:manual" || ctx.cause === "refresh:hook") {
+    return void 0;
+  }
+  return nuxtApp.payload.data[key] ?? nuxtApp.static.data[key];
+}
 export const useWPContent = (queryName, nodes, fixImagePaths, params, options) => {
+  const { clientCache, cacheKey, getCachedData: userGetCachedData, ...restOptions } = options ?? {};
+  const graphqlCaching = clientCache === false ? { client: false } : restOptions.graphqlCaching ?? { client: true };
+  const paramsKey = params ? JSON.stringify(params) : "{}";
+  const baseKey = `wpnuxt-${String(queryName)}-${paramsKey}`;
+  const finalKey = cacheKey ? `${baseKey}-${cacheKey}` : baseKey;
+  const effectiveGetCachedData = userGetCachedData ?? (clientCache === false ? () => void 0 : defaultGetCachedData);
+  const mergedOptions = {
+    ...restOptions,
+    graphqlCaching,
+    // Explicit key ensures consistent cache lookups
+    key: finalKey,
+    getCachedData: effectiveGetCachedData
+  };
   const { data, pending, refresh, execute, clear, error, status } = useAsyncGraphqlQuery(
     queryName,
     params ?? {},
-    options
+    mergedOptions
   );
   const transformedData = computed(() => {
     const queryResult = data.value && typeof data.value === "object" && data.value !== null && "data" in data.value ? data.value.data : void 0;

package/dist/runtime/plugins/graphqlConfig.js

@@ -1,6 +1,5 @@
-import { defineNuxtPlugin } from "nuxt/app";
-import { useGraphqlState, useRuntimeConfig } from "#imports";
-export default defineNuxtPlugin((_NuxtApp) => {
+import { defineNuxtPlugin, useGraphqlState, useRuntimeConfig } from "#imports";
+export default defineNuxtPlugin(() => {
   const state = useGraphqlState();
   if (!state) {
     return;

package/dist/runtime/plugins/graphqlErrors.js

@@ -1,4 +1,4 @@
-import { defineNuxtPlugin, useNuxtApp } from "nuxt/app";
+import { defineNuxtPlugin, useNuxtApp } from "#imports";
 export default defineNuxtPlugin(() => {
   const nuxtApp = useNuxtApp();
   nuxtApp.hook("nuxt-graphql-middleware:errors", (errors) => {

package/dist/runtime/types/stub.d.ts

@@ -8,8 +8,10 @@
 
 // Stub for #imports
 export const computed: any
+export const defineNuxtPlugin: any
 export const useAsyncGraphqlQuery: any
 export const useGraphqlState: any
+export const useNuxtApp: any
 export const useRuntimeConfig: any
 export const useRoute: any
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "description": "Nuxt module for WordPress integration via GraphQL (WPGraphQL)",
   "keywords": [
     "nuxt",