Merge branch 'master' into pr/7512

packages/gatsby-transformer-remark/src/__tests__/extend-node.js

@@ -762,6 +762,80 @@ This is [a reference]
   )
 })
 
+describe(`Headings are generated correctly from schema`, () => {
+  bootstrapTest(
+    `returns value`,
+    `
+# first title
+
+## second title
+`,
+    `headings {
+      value
+      depth
+    }`,
+    node => {
+      expect(node).toMatchSnapshot()
+      expect(node.headings).toEqual([
+        {
+          value: `first title`,
+          depth: 1,
+        },
+        {
+          value: `second title`,
+          depth: 2,
+        },
+      ])
+    }
+  )
+
+  bootstrapTest(
+    `returns value with inlineCode`,
+    `
+# first title
+
+## \`second title\`
+`,
+    `headings {
+      value
+      depth
+    }`,
+    node => {
+      expect(node).toMatchSnapshot()
+      expect(node.headings).toEqual([
+        {
+          value: `first title`,
+          depth: 1,
+        },
+        {
+          value: `second title`,
+          depth: 2,
+        },
+      ])
+    }
+  )
+
+  bootstrapTest(
+    `returns value with mixed text`,
+    `
+# An **important** heading with \`inline code\` and text
+`,
+    `headings {
+      value
+      depth
+    }`,
+    node => {
+      expect(node).toMatchSnapshot()
+      expect(node.headings).toEqual([
+        {
+          value: `An important heading with inline code and text`,
+          depth: 1,
+        },
+      ])
+    }
+  )
+})
+
 describe(`Adding fields to the GraphQL schema`, () => {
   it(`only adds fields when the GraphQL type matches the provided type`, async () => {
     const getNode = jest.fn()

packages/gatsby-transformer-remark/src/__tests__/on-node-create.js

@@ -97,6 +97,28 @@ Sed bibendum sem iaculis, pellentesque leo sed, imperdiet ante. Sed consequat ma
         expect(actions.createParentChildLink).toHaveBeenCalledTimes(1)
       })
     })
+  })
+
+  describe(`date formatting`, () => {
+    const getContent = date => `---
+date: ${date}
+---
+
+yadda yadda
+      `
+
+    it(`coerces a date object into a date string`, async () => {
+      const date = `2019-01-01`
+      node.content = getContent(date)
+      const parsed = await onCreateNode({
+        node,
+        actions,
+        createNodeId,
+        loadNodeContent,
+      })
+
+      expect(parsed.frontmatter.date).toEqual(new Date(date).toJSON())
+    })
 
     it(`Filters nodes with the given filter function, if provided`, async () => {
       const content = ``
@@ -143,28 +165,6 @@ Sed bibendum sem iaculis, pellentesque leo sed, imperdiet ante. Sed consequat ma
     })
   })
 
-  describe(`date formatting`, () => {
-    const getContent = date => `---
-date: ${date}
----
-
-yadda yadda
-      `
-
-    it(`coerces a date object into a date string`, async () => {
-      const date = `2019-01-01`
-      node.content = getContent(date)
-      const parsed = await onCreateNode({
-        node,
-        actions,
-        createNodeId,
-        loadNodeContent,
-      })
-
-      expect(parsed.frontmatter.date).toEqual(new Date(date).toJSON())
-    })
-  })
-
   describe(`process graphql correctly`, () => {
     // given a set of nodes and a query, return the result of the query
     async function queryResult(nodes, fragment, { types = [] } = {}) {

packages/gatsby-transformer-remark/src/extend-node-type.js

@@ -15,6 +15,7 @@ const visit = require(`unist-util-visit`)
 const toHAST = require(`mdast-util-to-hast`)
 const hastToHTML = require(`hast-util-to-html`)
 const mdastToToc = require(`mdast-util-toc`)
+const mdastToString = require(`mdast-util-to-string`)
 const unified = require(`unified`)
 const parse = require(`remark-parse`)
 const stringify = require(`remark-stringify`)
@@ -429,6 +430,91 @@ module.exports = (
       }
     }
 
+    async function getExcerptAst(
+      markdownNode,
+      { pruneLength, truncate, excerptSeparator }
+    ) {
+      const fullAST = await getHTMLAst(markdownNode)
+      if (excerptSeparator) {
+        return cloneTreeUntil(
+          fullAST,
+          ({ nextNode }) =>
+            nextNode.type === `raw` && nextNode.value === excerptSeparator
+        )
+      }
+      if (!fullAST.children.length) {
+        return fullAST
+      }
+
+      const excerptAST = cloneTreeUntil(fullAST, ({ root }) => {
+        const totalExcerptSoFar = getConcatenatedValue(root)
+        return totalExcerptSoFar && totalExcerptSoFar.length > pruneLength
+      })
+      const unprunedExcerpt = getConcatenatedValue(excerptAST)
+      if (
+        !unprunedExcerpt ||
+        (pruneLength && unprunedExcerpt.length < pruneLength)
+      ) {
+        return excerptAST
+      }
+
+      const lastTextNode = findLastTextNode(excerptAST)
+      const amountToPruneLastNode =
+        pruneLength - (unprunedExcerpt.length - lastTextNode.value.length)
+      if (!truncate) {
+        lastTextNode.value = prune(
+          lastTextNode.value,
+          amountToPruneLastNode,
+          `…`
+        )
+      } else {
+        lastTextNode.value = _.truncate(lastTextNode.value, {
+          length: pruneLength,
+          omission: `…`,
+        })
+      }
+      return excerptAST
+    }
+
+    async function getExcerpt(
+      markdownNode,
+      { format, pruneLength, truncate, excerptSeparator }
+    ) {
+      if (format === `html`) {
+        const excerptAST = await getExcerptAst(markdownNode, {
+          pruneLength,
+          truncate,
+          excerptSeparator,
+        })
+        const html = hastToHTML(excerptAST, {
+          allowDangerousHTML: true,
+        })
+        return html
+      }
+
+      if (markdownNode.excerpt) {
+        return markdownNode.excerpt
+      }
+
+      const text = await getAST(markdownNode).then(ast => {
+        const excerptNodes = []
+        visit(ast, node => {
+          if (node.type === `text` || node.type === `inlineCode`) {
+            excerptNodes.push(node.value)
+          }
+          return
+        })
+        if (!truncate) {
+          return prune(excerptNodes.join(` `), pruneLength, `…`)
+        }
+        return _.truncate(excerptNodes.join(` `), {
+          length: pruneLength,
+          omission: `…`,
+        })
+      })
+      return text
+    }
+
     return resolve({
       html: {
         type: GraphQLString,
@@ -461,77 +547,35 @@ module.exports = (
             defaultValue: `plain`,
           },
         },
-        async resolve(markdownNode, { format, pruneLength, truncate }) {
-          if (format === `html`) {
-            if (grayMatterOptions.excerpt_separator) {
-              const fullAST = await getHTMLAst(markdownNode)
-              const excerptAST = cloneTreeUntil(
-                fullAST,
-                ({ nextNode }) =>
-                  nextNode.type === `raw` &&
-                  nextNode.value === grayMatterOptions.excerpt_separator
-              )
-              return hastToHTML(excerptAST, {
-                allowDangerousHTML: true,
-              })
-            }
-            const fullAST = await getHTMLAst(markdownNode)
-            if (!fullAST.children.length) {
-              return ``
-            }
-
-            const excerptAST = cloneTreeUntil(fullAST, ({ root }) => {
-              const totalExcerptSoFar = getConcatenatedValue(root)
-              return totalExcerptSoFar && totalExcerptSoFar.length > pruneLength
-            })
-            const unprunedExcerpt = getConcatenatedValue(excerptAST)
-            if (!unprunedExcerpt) {
-              return ``
-            }
-
-            if (pruneLength && unprunedExcerpt.length < pruneLength) {
-              return hastToHTML(excerptAST, {
-                allowDangerousHTML: true,
-              })
-            }
-
-            const lastTextNode = findLastTextNode(excerptAST)
-            const amountToPruneLastNode =
-              pruneLength - (unprunedExcerpt.length - lastTextNode.value.length)
-            if (!truncate) {
-              lastTextNode.value = prune(
-                lastTextNode.value,
-                amountToPruneLastNode,
-                `…`
-              )
-            } else {
-              lastTextNode.value = _.truncate(lastTextNode.value, {
-                length: pruneLength,
-                omission: `…`,
-              })
-            }
-            return hastToHTML(excerptAST, {
-              allowDangerousHTML: true,
-            })
-          }
-          if (markdownNode.excerpt) {
-            return Promise.resolve(markdownNode.excerpt)
-          }
-          return getAST(markdownNode).then(ast => {
-            const excerptNodes = []
-            visit(ast, node => {
-              if (node.type === `text` || node.type === `inlineCode`) {
-                excerptNodes.push(node.value)
-              }
-              return
-            })
-            if (!truncate) {
-              return prune(excerptNodes.join(` `), pruneLength, `…`)
-            }
-            return _.truncate(excerptNodes.join(` `), {
-              length: pruneLength,
-              omission: `…`,
-            })
+        resolve(markdownNode, { format, pruneLength, truncate }) {
+          return getExcerpt(markdownNode, {
+            format,
+            pruneLength,
+            truncate,
+            excerptSeparator: grayMatterOptions.excerpt_separator,
+          })
+        },
+      },
+      excerptAst: {
+        type: GraphQLJSON,
+        args: {
+          pruneLength: {
+            type: GraphQLInt,
+            defaultValue: 140,
+          },
+          truncate: {
+            type: GraphQLBoolean,
+            defaultValue: false,
+          },
+        },
+        resolve(markdownNode, { pruneLength, truncate }) {
+          return getExcerptAst(markdownNode, {
+            pruneLength,
+            truncate,
+            excerptSeparator: grayMatterOptions.excerpt_separator,
+          }).then(ast => {
+            const strippedAst = stripPosition(_.clone(ast), true)
+            return hastReparseRaw(strippedAst)
           })
         },
       },

packages/gatsby-transformer-remark/src/on-node-create.js

@@ -25,9 +25,18 @@ module.exports = async function onCreateNode(
   const content = await loadNodeContent(node)
 
   try {
-    const data = grayMatter(content, grayMatterOptions)
+    let data = grayMatter(content, grayMatterOptions)
 
-    const markdownNode = {
+    if (data.data) {
+      data.data = _.mapValues(data.data, value => {
+        if (_.isDate(value)) {
+          return value.toJSON()
+        }
+        return value
+      })
+    }
+
+    let markdownNode = {
       id: createNodeId(`${node.id} >>> ${type}`),
       children: [],
       parent: node.id,