@wpnuxt/core 2.0.0-beta.6 → 2.0.0

package/dist/module.json

@@ -1,9 +1,9 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0",
   "configKey": "wpNuxt",
   "compatibility": {
-    "nuxt": ">=3.17.0"
+    "nuxt": ">=4.0.0"
   },
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -8,7 +8,7 @@ import { parse, GraphQLError, visit, print } from 'graphql';
 import { execSync } from 'node:child_process';
 import { consola } from 'consola';
 
-const version = "2.0.0-beta.6";
+const version = "2.0.0";
 
 function createModuleError(module, message) {
   return new Error(formatErrorMessage(module, message));
@@ -71,9 +71,42 @@ async function mergeQueries(nuxt, wpNuxtConfig, resolver) {
     logger.debug("Extending queries:", userQueryPath);
     copyGraphqlFiles(userQueryPath, queryOutputPath);
   }
+  await addCustomFragmentsToNodeQuery(queryOutputPath, userQueryPath, logger);
   logger.debug("Merged queries folder:", queryOutputPath);
   return queryOutputPath;
 }
+const FRAGMENT_DEF_PATTERN = /fragment\s+(\w+)\s+on\s+(\w+)/;
+async function addCustomFragmentsToNodeQuery(queryOutputPath, userQueryPath, logger) {
+  const userFragmentsDir = join(userQueryPath, "fragments");
+  if (!existsSync(userFragmentsDir)) return;
+  const customFragments = [];
+  for (const file of readdirSync(userFragmentsDir)) {
+    if (!file.endsWith(".gql") && !file.endsWith(".graphql")) continue;
+    const content = await promises.readFile(join(userFragmentsDir, file), "utf-8");
+    const match = content.match(FRAGMENT_DEF_PATTERN);
+    if (!match) continue;
+    const name = match[1];
+    const type = match[2];
+    if (name && type && name === type) {
+      customFragments.push({ name, type });
+    }
+  }
+  if (customFragments.length === 0) return;
+  const nodeGqlPath = join(queryOutputPath, "Node.gql");
+  if (!existsSync(nodeGqlPath)) return;
+  let nodeGql = await promises.readFile(nodeGqlPath, "utf-8");
+  const spreads = customFragments.map((f) => `    ... on ${f.type} { ...${f.name} }`).join("\n");
+  nodeGql = nodeGql.replace(
+    /(\s+\.\.\.Post)\n(\s+\}\n\})/,
+    `$1
+${spreads}
+$2`
+  );
+  await promises.writeFile(nodeGqlPath, nodeGql, "utf-8");
+  logger.debug(
+    `Added custom content type fragments to NodeByUri: ${customFragments.map((f) => f.name).join(", ")}`
+  );
+}
 function findConflicts(userQueryPath, outputPath) {
   const conflicts = [];
   function walk(dir) {
@@ -771,7 +804,7 @@ const module$1 = defineNuxtModule({
     version,
     configKey: "wpNuxt",
     compatibility: {
-      nuxt: ">=3.17.0"
+      nuxt: ">=4.0.0"
     }
   },
   defaults: {

package/dist/runtime/composables/useWPContent.js

@@ -53,11 +53,12 @@ export const useWPContent = (queryName, nodes, fixImagePaths, params, options) =
       }
     }
   };
-  const { data, pending, refresh, execute, clear, error, status } = useAsyncGraphqlQuery(
+  const asyncResult = useAsyncGraphqlQuery(
     String(queryName),
     normalizedParams ?? {},
     asyncDataOptions
   );
+  const { data, pending, refresh, execute, clear, error, status } = asyncResult;
   const transformError = ref(null);
   if (timeoutId !== void 0) {
     vueWatch(pending, (isPending) => {
@@ -118,7 +119,7 @@ See: https://wpnuxt.com/guide/menus`
       return void 0;
     }
   });
-  return {
+  const returnValue = {
     data: transformedData,
     pending,
     refresh,
@@ -133,4 +134,9 @@ See: https://wpnuxt.com/guide/menus`
     /** Whether a retry is currently in progress */
     isRetrying
   };
+  const thenable = asyncResult;
+  return Object.assign(
+    thenable.then(() => returnValue),
+    returnValue
+  );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpnuxt/core",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0",
   "description": "Nuxt module for WordPress integration via GraphQL (WPGraphQL)",
   "keywords": [
     "nuxt",
@@ -65,7 +65,7 @@
     "vue-tsc": "^3.2.5"
   },
   "peerDependencies": {
-    "nuxt": ">=3.17.0"
+    "nuxt": ">=4.0.0"
   },
   "scripts": {
     "build": "nuxt-module-build build",