@tomosull/gridsome-source-wordpress 1.4.13 → 1.5.0

package/README.md

@@ -2,6 +2,40 @@
 
 > WordPress source for Gridsome with support for downloading images.
 
+Fixes false 404 issue which was showing on fonts and missing image alt issues by changing
+
+          if ([401, 403].includes(status)) {
+            console.warn(`Error: Status ${status} - ${url}`)
+            return { ...response, data: fallbackData }
+          } else {
+            throw new Error(`${status} - ${url}`)
+          }
+
+to
+
+          if ([401, 403, 404].includes(status)) {
+            console.warn(`Error: Status ${status} - ${url}`)
+            return { ...response, data: fallbackData }
+          } else {
+            throw new Error(`${status} - ${url}`)
+          }
+
+Also update
+
+        return {
+          src: path.resolve(DOWNLOAD_DIR, filename),
+          title: value.title,
+          alt: value.description
+        }
+
+to
+
+        return {
+          src: path.resolve(DOWNLOAD_DIR, filename),
+          title: value.title,
+          alt: value.alt
+        }
+
 ## Install
 - `yarn add gridsome-source-wordpress`
 - `npm install gridsome-source-wordpress`

package/index.js

@@ -57,9 +57,21 @@ class WordPressSource {
 
     const baseUrl = trimEnd(opts.baseUrl, '/')
 
-    this.client = axios.create({
-      baseURL: `${baseUrl}/${opts.apiBase}`
-    })
+this.client = axios.create({
+  baseURL: `${baseUrl}/${opts.apiBase}`,
+  responseType: 'json',
+  transformResponse: [function (data) {
+    if (typeof data === 'string') {
+      try {
+        return JSON.parse(data)
+      } catch (err) {
+        return data
+      }
+    }
+
+    return data
+  }]
+})
 
     this.routes = this.options.routes || {}
 
@@ -82,21 +94,65 @@ class WordPressSource {
     })
   }
 
-  async getPostTypes (actions) {
-    const { data } = await this.fetch('wp/v2/types', {}, {})
-    const addCollection = actions.addCollection || actions.addContentType
+async getPostTypes (actions) {
+  const addCollection = actions.addCollection || actions.addContentType
+
+  const postTypes = {
+    post: {
+      restBase: 'posts',
+      route: this.routes.post || '/blog/:slug'
+    },
+    page: {
+      restBase: 'pages',
+      route: this.routes.page || '/:slug'
+    },
+    attachment: {
+      restBase: 'media',
+      route: null
+    },
+    projects: {
+      restBase: 'projects',
+      route: this.routes.projects || '/projects/:slug'
+    },
+    products: {
+      restBase: 'products',
+      route: this.routes.products || '/products/:slug'
+    },
+    solutions: {
+      restBase: 'solutions',
+      route: this.routes.solutions || '/:slug'
+    },
+    cpd: {
+      restBase: 'cpd',
+      route: this.routes.cpd || '/cpds/:slug'
+    },
+    team: {
+      restBase: 'team',
+      route: this.routes.team || '/team/:slug'
+    },
+    locations: {
+      restBase: 'locations',
+      route: this.routes.locations || '/locations/:slug'
+    },
+    samples: {
+      restBase: 'samples',
+      route: this.routes.samples || '/samples/:slug'
+    }
+  }
 
-    for (const type in data) {
-      const options = data[type]
+  for (const type in postTypes) {
+    const { restBase, route } = postTypes[type]
 
-      this.restBases.posts[type] = options.rest_base
+    this.restBases.posts[type] = restBase
 
-      addCollection({
-        typeName: this.createTypeName(type),
-        route: this.routes[type] || `/${type}/:slug`
-      })
-    }
+    addCollection({
+      typeName: this.createTypeName(type),
+      route
+    })
+
+    console.log(`Added post type: ${type} -> wp/v2/${restBase}`)
   }
+}
 
   async getUsers (actions) {
     const { data } = await this.fetch('wp/v2/users')
@@ -107,45 +163,66 @@ class WordPressSource {
       route: this.routes.author
     })
 
-    for (const author of data) {
-      const fields = this.normalizeFields(author)
-      const avatars = mapKeys(author.avatar_urls, (v, key) => `avatar${key}`)
+    // for (const author of data) {
+    //   const fields = this.normalizeFields(author)
+    //   const avatars = mapKeys(author.avatar_urls, (v, key) => `avatar${key}`)
+
+    //   authors.addNode({
+    //     ...fields,
+    //     id: author.id,
+    //     title: author.name,
+    //     avatars
+    //   })
+    // }
+  }
 
-      authors.addNode({
-        ...fields,
-        id: author.id,
-        title: author.name,
-        avatars
-      })
+async getTaxonomies (actions) {
+  const addCollection = actions.addCollection || actions.addContentType
+
+  const taxonomies = {
+    category: {
+      restBase: 'categories',
+      route: this.routes.category || '/category/:slug'
+    },
+    post_tag: {
+      restBase: 'tags',
+      route: this.routes.post_tag || '/tag/:slug'
+    },
+    product_category: {
+      restBase: 'product_category',
+      route: this.routes.product_category || '/products/:slug'
+    },
+    finish: {
+      restBase: 'finish',
+      route: this.routes.finishes || '/finishes/:slug'
     }
   }
 
-  async getTaxonomies (actions) {
-    const { data } = await this.fetch('wp/v2/taxonomies', {}, {})
-    const addCollection = actions.addCollection || actions.addContentType
+  for (const type in taxonomies) {
+    const { restBase, route } = taxonomies[type]
 
-    for (const type in data) {
-      const options = data[type]
-      const taxonomy = addCollection({
-        typeName: this.createTypeName(type),
-        route: this.routes[type]
-      })
+    const taxonomy = addCollection({
+      typeName: this.createTypeName(type),
+      route
+    })
 
-      this.restBases.taxonomies[type] = options.rest_base
+    this.restBases.taxonomies[type] = restBase
 
-      const terms = await this.fetchPaged(`wp/v2/${options.rest_base}`)
+    console.log(`Added taxonomy: ${type} -> wp/v2/${restBase}`)
 
-      for (const term of terms) {
-        taxonomy.addNode({
-          id: term.id,
-          title: term.name,
-          slug: term.slug,
-          content: term.description,
-          count: term.count
-        })
-      }
+    const terms = await this.fetchPaged(`wp/v2/${restBase}`)
+
+    for (const term of terms) {
+      taxonomy.addNode({
+        id: term.id,
+        title: term.name,
+        slug: term.slug,
+        content: term.description,
+        count: term.count
+      })
     }
   }
+}
 
   extractImagesFromPostHtml (string) {
     const regex = /<img[^>]* src=\"([^\"]*)\" alt=\"([^\"]*)\"[^>]*>/gm
@@ -244,6 +321,12 @@ class WordPressSource {
 
     for (const type in this.restBases.posts) {
       const restBase = this.restBases.posts[type]
+
+      if (!restBase) {
+        console.warn(`Skipping post type with invalid rest_base: ${type}`)
+        continue
+      }
+
       const typeName = this.createTypeName(type)
       const posts = getCollection(typeName)
 
@@ -306,8 +389,10 @@ class WordPressSource {
         throw new Error(`${code} - ${config.url}`)
       }
 
+
       const { url } = response.config
-      const { status } = response.data.data
+      const { status } = response.data
+
 
       if ([401, 403, 404].includes(status)) {
         console.warn(`Error: Status ${status} - ${url}`)
@@ -433,18 +518,61 @@ class WordPressSource {
 }
 
 function ensureArrayData (url, data) {
-  if (!Array.isArray(data)) {
+  if (Array.isArray(data)) {
+    return data
+  }
+
+  if (typeof data === 'string') {
+    const trimmed = data.trim()
+
     try {
-      data = JSON.parse(data)
+      const parsed = JSON.parse(trimmed)
+
+      if (Array.isArray(parsed)) {
+        return parsed
+      }
+
+      throw new Error(
+        `Failed to fetch ${url}\n` +
+        `Expected JSON array but parsed ${typeof parsed}:\n` +
+        `${trimmed.substring(0, 300)}...\n`
+      )
     } catch (err) {
+      console.warn(`JSON.parse failed for ${url}: ${err.message}`)
+
+      // WordPress/plugin/theme may be appending warnings, notices, or markup.
+      // Try to extract just the JSON array.
+      const start = trimmed.indexOf('[')
+      const end = trimmed.lastIndexOf(']')
+
+      if (start !== -1 && end !== -1 && end > start) {
+        const possibleJson = trimmed.substring(start, end + 1)
+
+        try {
+          const parsed = JSON.parse(possibleJson)
+
+          if (Array.isArray(parsed)) {
+            console.warn(`Recovered JSON array from noisy response: ${url}`)
+            return parsed
+          }
+        } catch (innerErr) {
+          console.warn(`Recovery parse failed for ${url}: ${innerErr.message}`)
+        }
+      }
+
       throw new Error(
         `Failed to fetch ${url}\n` +
-        `Expected JSON response but received:\n` +
-        `${data.trim().substring(0, 150)}...\n`
+        `Expected JSON array but received:\n` +
+        `${trimmed.substring(0, 1000)}...\n`
       )
     }
   }
-  return data
+
+  throw new Error(
+    `Failed to fetch ${url}\n` +
+    `Expected JSON array but received ${typeof data}:\n` +
+    `${JSON.stringify(data).substring(0, 1000)}...\n`
+  )
 }
 
-module.exports = WordPressSource
+module.exports = WordPressSource

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.13",
+  "version": "1.5.0",
   "name": "@tomosull/gridsome-source-wordpress",
   "description": "Tomosull Fork of gridsome-source-wordpress 4.13 - WordPress source for Gridsome with image processing support. This fixes minor issues with the original plugin; namely 403 and image alt tags not loading.",
   "homepage": "https://github.com/gridsome/gridsome/tree/master/packages/source-wordpress#readme",