chore: remove dep on store at query time

Author: ascorbic

integration-tests/gatsby-source-wordpress/package.json

@@ -12,12 +12,12 @@
   "author": "Tyler Barnes <tylerdbarnes@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "gatsby": "next",
-    "gatsby-plugin-image": "next",
-    "gatsby-plugin-sharp": "next",
-    "gatsby-source-filesystem": "next",
-    "gatsby-source-wordpress": "next",
-    "gatsby-transformer-sharp": "next",
+    "gatsby": "5.11.0-next.1-dev-1686142068291",
+    "gatsby-plugin-image": "3.11.0-next.1-dev-1686142068291",
+    "gatsby-plugin-sharp": "5.11.0-next.1-dev-1686142068291",
+    "gatsby-source-filesystem": "5.11.0-next.1-dev-1686142068291",
+    "gatsby-source-wordpress": "7.11.0-next.1-dev-1686142068291",
+    "gatsby-transformer-sharp": "5.11.0-next.1-dev-1686142068291",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

packages/gatsby-source-wordpress/src/steps/create-schema-customization/build-types.js

@@ -9,6 +9,7 @@ import {
 
 const unionType = typeBuilderApi => {
   const { schema, type, pluginOptions } = typeBuilderApi
+  const prefix = pluginOptions.schema.typePrefix
 
   const types = type.possibleTypes
     .filter(
@@ -18,18 +19,18 @@ const unionType = typeBuilderApi => {
           typeName: possibleType.name,
         })
     )
-    .map(possibleType => buildTypeName(possibleType.name))
+    .map(possibleType => buildTypeName(possibleType.name, prefix))
 
   if (!types || !types.length) {
     return false
   }
 
   let unionType = {
-    name: buildTypeName(type.name),
+    name: buildTypeName(type.name, prefix),
     types,
     resolveType: node => {
       if (node.__typename) {
-        return buildTypeName(node.__typename)
+        return buildTypeName(node.__typename, prefix)
       }
 
       return null
@@ -46,7 +47,8 @@ const unionType = typeBuilderApi => {
 }
 
 const interfaceType = typeBuilderApi => {
-  const { type, schema } = typeBuilderApi
+  const { type, schema, pluginOptions } = typeBuilderApi
+  const prefix = pluginOptions.schema.typePrefix
 
   const state = getStore().getState()
   const { ingestibles } = state.remoteSchema
@@ -65,15 +67,15 @@ const interfaceType = typeBuilderApi => {
   }
 
   let typeDef = {
-    name: buildTypeName(type.name),
+    name: buildTypeName(type.name, prefix),
     fields: transformedFields,
     extensions: { infer: false },
   }
 
   // this is a regular interface type, not a node interface type so we need to resolve the type name
   if (!nodeInterfaceTypes.includes(type.name)) {
     typeDef.resolveType = node =>
-      node?.__typename ? buildTypeName(node.__typename) : null
+      node?.__typename ? buildTypeName(node.__typename, prefix) : null
   }
 
   typeDef = filterTypeDefinition(typeDef, typeBuilderApi, `INTERFACE`)
@@ -82,8 +84,16 @@ const interfaceType = typeBuilderApi => {
 }
 
 const objectType = typeBuilderApi => {
-  const { type, gatsbyNodeTypes, fieldAliases, fieldBlacklist, schema } =
-    typeBuilderApi
+  const {
+    type,
+    gatsbyNodeTypes,
+    fieldAliases,
+    fieldBlacklist,
+    schema,
+    pluginOptions,
+  } = typeBuilderApi
+
+  const prefix = pluginOptions.schema.typePrefix
 
   const transformedFields = transformFields({
     fields: type.fields,
@@ -102,7 +112,7 @@ const objectType = typeBuilderApi => {
   }
 
   let objectType = {
-    name: buildTypeName(type.name),
+    name: buildTypeName(type.name, prefix),
     fields: transformedFields,
     description: type.description,
     extensions: {
@@ -120,9 +130,9 @@ const objectType = typeBuilderApi => {
   return schema.buildObjectType(objectType)
 }
 
-const enumType = ({ schema, type }) =>
+const enumType = ({ schema, type, pluginOptions }) =>
   schema.buildEnumType({
-    name: buildTypeName(type.name),
+    name: buildTypeName(type.name, pluginOptions.schema.typePrefix),
     values: type.enumValues.reduce((accumulator, { name }) => {
       accumulator[name] = { name }
 

packages/gatsby-source-wordpress/src/steps/create-schema-customization/helpers.js

@@ -52,14 +52,14 @@ const isWpgqlOneThirteenZeroPlus = () => {
 /**
  * This function namespaces typenames with a prefix
  */
-export const buildTypeName = name => {
+export const buildTypeName = (name, prefix) => {
   if (!name || typeof name !== `string`) {
     return null
   }
 
-  const {
-    schema: { typePrefix: prefix },
-  } = getPluginOptions()
+  if (!prefix) {
+    prefix = getPluginOptions().schema.typePrefix
+  }
 
   // this is for our namespace type on the root { wp { ...fields } }
   if (name === prefix) {

packages/gatsby-source-wordpress/src/steps/create-schema-customization/transform-fields/transform-union.js

@@ -1,5 +1,5 @@
 import { buildTypeName } from "~/steps/create-schema-customization/helpers"
-import { findNamedTypeName, introspectionFieldTypeToSDL } from "../helpers"
+import { introspectionFieldTypeToSDL } from "../helpers"
 
 export const transformUnion = ({ field, fieldName }) => {
   return {