refactor(contentful-schema): prefix generated types with contentfulCo…

…ntentType
gatsbyjs · May 12, 2021 · e05204f · e05204f
1 parent 3e64579
commit e05204f
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 87 deletions.
diff --git a/e2e-tests/contentful/src/components/references/content-reference.js b/e2e-tests/contentful/src/components/references/content-reference.js
@@ -1,6 +1,6 @@
 import React from "react"
 
-export const ContentfulContentReference = ({ one, many, title }) => {
+export const ContentfulContentTypeContentReference = ({ one, many, title }) => {
   const references = [one, ...(many || [])].filter(Boolean)
   return (
     <p data-cy-id="reference">

diff --git a/e2e-tests/contentful/src/components/references/index.js b/e2e-tests/contentful/src/components/references/index.js
@@ -1,4 +1,4 @@
-export { ContentfulContentReference } from "./content-reference"
-export { ContentfulLocation } from "./location"
-export { ContentfulNumber } from "./number"
-export { ContentfulText } from "./text"
+export { ContentfulContentTypeContentReference } from "./content-reference"
+export { ContentfulContentTypeLocation } from "./location"
+export { ContentfulContentTypeNumber } from "./number"
+export { ContentfulContentTypeText } from "./text"
diff --git a/e2e-tests/contentful/src/components/references/location.js b/e2e-tests/contentful/src/components/references/location.js
@@ -1,6 +1,6 @@
 import React from "react"
 
-export const ContentfulLocation = ({ location }) => (
+export const ContentfulContentTypeLocation = ({ location }) => (
   <p data-cy-id="location">
     [ContentfulLocation] Lat: {location.lat}, Long: {location.lon}
   </p>

diff --git a/e2e-tests/contentful/src/components/references/number.js b/e2e-tests/contentful/src/components/references/number.js
@@ -1,5 +1,5 @@
 import React from "react"
 
-export const ContentfulNumber = ({ integer }) => (
+export const ContentfulContentTypeNumber = ({ integer }) => (
   <p data-cy-id="integer">[ContentfulInteger] {integer}</p>
 )
diff --git a/e2e-tests/contentful/src/components/references/text.js b/e2e-tests/contentful/src/components/references/text.js
@@ -1,5 +1,5 @@
 import React from "react"
 
-export const ContentfulText = ({ short }) => (
+export const ContentfulContentTypeText = ({ short }) => (
   <p data-cy-id="text">[ContentfulText] {short}</p>
 )
diff --git a/e2e-tests/contentful/src/pages/boolean.js b/e2e-tests/contentful/src/pages/boolean.js
@@ -5,7 +5,7 @@ import slugify from "slugify"
 import Layout from "../components/layout"
 
 const BooleanPage = ({ data }) => {
-  const entries = data.allContentfulBoolean.nodes
+  const entries = data.allContentfulContentTypeBoolean.nodes
   return (
     <Layout>
       {entries.map(({ title, boolean }) => {
@@ -25,7 +25,7 @@ export default BooleanPage
 
 export const pageQuery = graphql`
   query BooleanQuery {
-    allContentfulBoolean(sort: { fields: sys___id }) {
+    allContentfulContentTypeBoolean(sort: { fields: sys___id }) {
       nodes {
         title
         boolean

diff --git a/e2e-tests/contentful/src/pages/content-reference.js b/e2e-tests/contentful/src/pages/content-reference.js
@@ -17,7 +17,7 @@ function renderReferencedComponent(ref) {
 }
 
 const ContentReferencePage = ({ data }) => {
-  const entries = data.allContentfulContentReference.nodes
+  const entries = data.allContentfulContentTypeContentReference.nodes
   return (
     <Layout>
       {entries.map(({ sys: { id }, title, one, many }) => {
@@ -47,7 +47,7 @@ export default ContentReferencePage
 
 export const pageQuery = graphql`
   query ContentReferenceQuery {
-    allContentfulContentReference(sort: { fields: title }) {
+    allContentfulContentTypeContentReference(sort: { fields: title }) {
       nodes {
         title
         sys {
@@ -58,39 +58,39 @@ export const pageQuery = graphql`
           sys {
             id
           }
-          ... on ContentfulText {
+          ... on ContentfulContentTypeText {
             title
             short
           }
-          ... on ContentfulNumber {
+          ... on ContentfulContentTypeNumber {
             title
             integer
           }
-          ... on ContentfulContentReference {
+          ... on ContentfulContentTypeContentReference {
             title
             one {
-              ... on ContentfulText {
+              ... on ContentfulContentTypeText {
                 title
                 short
               }
-              ... on ContentfulNumber {
+              ... on ContentfulContentTypeNumber {
                 title
                 integer
               }
-              ... on ContentfulContentReference {
+              ... on ContentfulContentTypeContentReference {
                 title
               }
             }
             many {
-              ... on ContentfulText {
+              ... on ContentfulContentTypeText {
                 title
                 short
               }
-              ... on ContentfulNumber {
+              ... on ContentfulContentTypeNumber {
                 title
                 integer
               }
-              ... on ContentfulContentReference {
+              ... on ContentfulContentTypeContentReference {
                 title
               }
             }
@@ -101,39 +101,39 @@ export const pageQuery = graphql`
           sys {
             id
           }
-          ... on ContentfulText {
+          ... on ContentfulContentTypeText {
             title
             short
           }
-          ... on ContentfulNumber {
+          ... on ContentfulContentTypeNumber {
             title
             integer
           }
-          ... on ContentfulContentReference {
+          ... on ContentfulContentTypeContentReference {
             title
             one {
-              ... on ContentfulText {
+              ... on ContentfulContentTypeText {
                 title
                 short
               }
-              ... on ContentfulNumber {
+              ... on ContentfulContentTypeNumber {
                 title
                 integer
               }
-              ... on ContentfulContentReference {
+              ... on ContentfulContentTypeContentReference {
                 title
               }
             }
             many {
-              ... on ContentfulText {
+              ... on ContentfulContentTypeText {
                 title
                 short
               }
-              ... on ContentfulNumber {
+              ... on ContentfulContentTypeNumber {
                 title
                 integer
               }
-              ... on ContentfulContentReference {
+              ... on ContentfulContentTypeContentReference {
                 title
               }
             }

diff --git a/e2e-tests/contentful/src/pages/date.js b/e2e-tests/contentful/src/pages/date.js
@@ -26,19 +26,23 @@ export default DatePage
 
 export const pageQuery = graphql`
   query DateQuery {
-    dateTime: contentfulDate(sys: { id: { eq: "38akBjGb3T1t4AjB87wQjo" } }) {
+    dateTime: contentfulContentTypeDate(
+      sys: { id: { eq: "38akBjGb3T1t4AjB87wQjo" } }
+    ) {
       title
       date: dateTime
       formatted: dateTime(formatString: "D.M.YYYY - hh:mm")
     }
-    dateTimeTimezone: contentfulDate(
+    dateTimeTimezone: contentfulContentTypeDate(
       sys: { id: { eq: "6dZ8pK4tFWZDZPHgSC0tNS" } }
     ) {
       title
       date: dateTimeTimezone
       formatted: dateTimeTimezone(formatString: "D.M.YYYY - hh:mm (z)")
     }
-    date: contentfulDate(sys: { id: { eq: "5FuULz0jl0rKoKUKp2rshf" } }) {
+    date: contentfulContentTypeDate(
+      sys: { id: { eq: "5FuULz0jl0rKoKUKp2rshf" } }
+    ) {
       title
       date
       formatted: date(formatString: "D.M.YYYY")

diff --git a/e2e-tests/contentful/src/pages/json.js b/e2e-tests/contentful/src/pages/json.js
@@ -52,10 +52,14 @@ export default JSONPage
 
 export const pageQuery = graphql`
   query JSONQuery {
-    simple: contentfulJson(sys: { id: { eq: "2r6tNjP8brkyy5yLR39hhh" } }) {
+    simple: contentfulContentTypeJson(
+      sys: { id: { eq: "2r6tNjP8brkyy5yLR39hhh" } }
+    ) {
       json
     }
-    complex: contentfulJson(sys: { id: { eq: "2y71nV0cpW9vzTmJybq571" } }) {
+    complex: contentfulContentTypeJson(
+      sys: { id: { eq: "2y71nV0cpW9vzTmJybq571" } }
+    ) {
       json
     }
   }

diff --git a/e2e-tests/contentful/src/pages/location.js b/e2e-tests/contentful/src/pages/location.js
@@ -5,7 +5,7 @@ import slugify from "slugify"
 import Layout from "../components/layout"
 
 const LocationPage = ({ data }) => {
-  const entries = data.allContentfulLocation.nodes
+  const entries = data.allContentfulContentTypeLocation.nodes
   return (
     <Layout>
       {entries.map(({ title, location }) => {
@@ -28,7 +28,7 @@ export default LocationPage
 
 export const pageQuery = graphql`
   query LocationQuery {
-    allContentfulLocation(sort: { fields: sys___id }) {
+    allContentfulContentTypeLocation(sort: { fields: sys___id }) {
       nodes {
         title
         location {

diff --git a/e2e-tests/contentful/src/pages/media-reference.js b/e2e-tests/contentful/src/pages/media-reference.js
@@ -6,7 +6,7 @@ import slugify from "slugify"
 import Layout from "../components/layout"
 
 const MediaReferencePage = ({ data }) => {
-  const entries = data.allContentfulMediaReference.nodes
+  const entries = data.allContentfulContentTypeMediaReference.nodes
   return (
     <Layout>
       {entries.map(({ sys: { id }, title, one, many }) => {
@@ -38,7 +38,7 @@ export default MediaReferencePage
 
 export const pageQuery = graphql`
   query MediaReferenceQuery {
-    allContentfulMediaReference(sort: { fields: title }) {
+    allContentfulContentTypeMediaReference(sort: { fields: title }) {
       nodes {
         title
         sys {

diff --git a/e2e-tests/contentful/src/pages/number.js b/e2e-tests/contentful/src/pages/number.js
@@ -5,7 +5,7 @@ import slugify from "slugify"
 import Layout from "../components/layout"
 
 const NumberPage = ({ data }) => {
-  const entries = data.allContentfulNumber.nodes
+  const entries = data.allContentfulContentTypeNumber.nodes
   return (
     <Layout>
       {entries.map(({ title, integer, decimal }) => {
@@ -25,7 +25,7 @@ export default NumberPage
 
 export const pageQuery = graphql`
   query NumberQuery {
-    allContentfulNumber(sort: { fields: sys___id }) {
+    allContentfulContentTypeNumber(sort: { fields: sys___id }) {
       nodes {
         title
         integer

diff --git a/e2e-tests/contentful/src/pages/rich-text.js b/e2e-tests/contentful/src/pages/rich-text.js
@@ -67,7 +67,7 @@ const makeOptions = ({ assetBlockMap, entryBlockMap, entryInlineMap }) => ({
 })
 
 const RichTextPage = ({ data }) => {
-  const entries = data.allContentfulRichText.nodes
+  const entries = data.allContentfulContentTypeRichText.nodes
   return (
     <Layout>
       {entries.map(({ id, title, richText }) => {
@@ -88,7 +88,7 @@ export default RichTextPage
 
 export const pageQuery = graphql`
   query RichTextQuery {
-    allContentfulRichText(sort: { fields: title }) {
+    allContentfulContentTypeRichText(sort: { fields: title }) {
       nodes {
         id
         title
@@ -112,36 +112,36 @@ export const pageQuery = graphql`
                   id
                   type
                 }
-                ... on ContentfulText {
+                ... on ContentfulContentTypeText {
                   title
                   short
                 }
-                ... on ContentfulLocation {
+                ... on ContentfulContentTypeLocation {
                   location {
                     lat
                     lon
                   }
                 }
-                ... on ContentfulContentReference {
+                ... on ContentfulContentTypeContentReference {
                   title
                   one {
                     __typename
                     sys {
                       id
                     }
-                    ... on ContentfulText {
+                    ... on ContentfulContentTypeText {
                       title
                       short
                     }
-                    ... on ContentfulContentReference {
+                    ... on ContentfulContentTypeContentReference {
                       title
                       one {
-                        ... on ContentfulContentReference {
+                        ... on ContentfulContentTypeContentReference {
                           title
                         }
                       }
                       many {
-                        ... on ContentfulContentReference {
+                        ... on ContentfulContentTypeContentReference {
                           title
                         }
                       }
@@ -152,23 +152,23 @@ export const pageQuery = graphql`
                     sys {
                       id
                     }
-                    ... on ContentfulText {
+                    ... on ContentfulContentTypeText {
                       title
                       short
                     }
-                    ... on ContentfulNumber {
+                    ... on ContentfulContentTypeNumber {
                       title
                       integer
                     }
-                    ... on ContentfulContentReference {
+                    ... on ContentfulContentTypeContentReference {
                       title
                       one {
-                        ... on ContentfulContentReference {
+                        ... on ContentfulContentTypeContentReference {
                           title
                         }
                       }
                       many {
-                        ... on ContentfulContentReference {
+                        ... on ContentfulContentTypeContentReference {
                           title
                         }
                       }

diff --git a/e2e-tests/contentful/src/pages/text.js b/e2e-tests/contentful/src/pages/text.js
@@ -53,18 +53,24 @@ export default TextPage
 
 export const pageQuery = graphql`
   query TextQuery {
-    short: contentfulText(sys: { id: { eq: "5ZtcN1o7KpN7J7xgiTyaXo" } }) {
+    short: contentfulContentTypeText(
+      sys: { id: { eq: "5ZtcN1o7KpN7J7xgiTyaXo" } }
+    ) {
       short
     }
-    shortList: contentfulText(sys: { id: { eq: "7b5U927WTFcQXO2Gewwa2k" } }) {
+    shortList: contentfulContentTypeText(
+      sys: { id: { eq: "7b5U927WTFcQXO2Gewwa2k" } }
+    ) {
       shortList
     }
-    longPlain: contentfulText(sys: { id: { eq: "6ru8cSC9hZi3Ekvtw7P77S" } }) {
+    longPlain: contentfulContentTypeText(
+      sys: { id: { eq: "6ru8cSC9hZi3Ekvtw7P77S" } }
+    ) {
       longPlain {
         raw
       }
     }
-    longMarkdownSimple: contentfulText(
+    longMarkdownSimple: contentfulContentTypeText(
       sys: { id: { eq: "NyPJw0mcSuCwY2gV0zYny" } }
     ) {
       longMarkdown {
@@ -73,7 +79,7 @@ export const pageQuery = graphql`
         }
       }
     }
-    longMarkdownComplex: contentfulText(
+    longMarkdownComplex: contentfulContentTypeText(
       sys: { id: { eq: "3pwKS9UWsYmOguo4UdE1EB" } }
     ) {
       longMarkdown {