shorten union names

gatsbyjs · May 20, 2021 · 5f18b1d · 5f18b1d
1 parent 629640a
commit 5f18b1d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/gatsby-source-contentful/src/generate-schema.js b/packages/gatsby-source-contentful/src/generate-schema.js
@@ -84,15 +84,19 @@ const getLinkFieldType = (linkType, field, schema, createTypes) => {
     // { validations: [ { linkContentType: [Array] } ] }
     if (linkContentTypeValidation) {
       const { linkContentType } = linkContentTypeValidation
-      const translatedTypeNames = linkContentType.map(makeTypeName)
+
+      // Full type names for union members, shorter variant for the union type name
+      const translatedTypeNames = linkContentType.map(typeName =>
+        makeTypeName(typeName)
+      )
+      const shortTypeNames = linkContentType.map(typeName =>
+        makeTypeName(typeName, ``)
+      )
 
       // @todo Single content type
 
       // Multiple content types
-      const unionName = [
-        `UnionContentfulContentTypes`,
-        ...translatedTypeNames,
-      ].join(``)
+      const unionName = [`UnionContentful`, ...shortTypeNames].join(``)
 
       if (!unionsNameSet.has(unionName)) {
         unionsNameSet.add(unionName)

diff --git a/packages/gatsby-source-contentful/src/normalize.js b/packages/gatsby-source-contentful/src/normalize.js
@@ -1,7 +1,6 @@
 const _ = require(`lodash`)
 
-const typePrefix = `Contentful`
-export const makeTypeName = type =>
+export const makeTypeName = (type, typePrefix = `Contentful`) =>
   _.upperFirst(_.camelCase(`${typePrefix} ${type}`))
 
 const getLocalizedField = ({ field, locale, localesFallback }) => {