Add all fields for links

Author: exacs

packages/optimizely-cms-sdk/src/graph/__test__/createQuery.test.ts

@@ -77,7 +77,7 @@ describe('createFragment() simple cases', () => {
         "fragment ContentUrl on ContentUrl { type default hierarchical internal graph base }",
         "fragment IContentMetadata on IContentMetadata {key locale fallbackForLocale version displayName url {...ContentUrl} types published status created lastModified sortOrder variation ...MediaMetadata }",
         "fragment _IContent on _IContent { _deleted _fulltext _modified _score _id _track _metadata {...IContentMetadata} }",
-        "fragment ct1 on ct1 { __typename lin { url { type, default }} ric { html, json } lin2 { url { type, default }} ric2 { html, json } ..._IContent }",
+        "fragment ct1 on ct1 { __typename lin { url { ...ContentUrl }} ric { html, json } lin2 { url { ...ContentUrl }} ric2 { html, json } ..._IContent }",
       ]
     `);
   });

packages/optimizely-cms-sdk/src/graph/createQuery.ts

@@ -16,6 +16,7 @@ import {
   buildBaseTypeFragments,
   isBaseType,
   toBaseTypeFragmentKey,
+  CONTENT_URL_FRAGMENT,
 } from '../util/baseTypeUtil.js';
 import { checkTypeConstraintIssues } from '../util/fragmentConstraintChecks.js';
 import { GraphMissingContentTypeError } from './error.js';
@@ -135,11 +136,14 @@ function convertPropertyField(
   } else if (property.type === 'richText') {
     fields.push(`${name} { html, json }`);
   } else if (property.type === 'url') {
-    fields.push(`${name} { type, default }`);
+    extraFragments.push(CONTENT_URL_FRAGMENT);
+    fields.push(`${name} { ...ContentUrl }`);
   } else if (property.type === 'link') {
-    fields.push(`${name} { url { type, default }}`);
+    extraFragments.push(CONTENT_URL_FRAGMENT);
+    fields.push(`${name} { url { ...ContentUrl }}`);
   } else if (property.type === 'contentReference') {
-    fields.push(`${name} { url { type default }}`);
+    extraFragments.push(CONTENT_URL_FRAGMENT);
+    fields.push(`${name} { key url { ...ContentUrl }}`);
   } else if (property.type === 'array') {
     const f = convertProperty(name, property.items, rootName, visited);
     fields.push(...f.fields);

packages/optimizely-cms-sdk/src/util/baseTypeUtil.ts

@@ -46,9 +46,12 @@ export function isBaseMediaType(key: string): key is MediaStringTypes {
   return (MEDIA_BASE_TYPES as readonly string[]).includes(key);
 }
 
+export const CONTENT_URL_FRAGMENT =
+  'fragment ContentUrl on ContentUrl { type default hierarchical internal graph base }';
+
 const COMMON_FRAGMENTS = [
   'fragment MediaMetadata on MediaMetadata { mimeType thumbnail content }',
-  'fragment ContentUrl on ContentUrl { type default hierarchical internal graph base }',
+  CONTENT_URL_FRAGMENT,
   'fragment IContentMetadata on IContentMetadata {key locale fallbackForLocale version displayName url {...ContentUrl} types published status created lastModified sortOrder variation ...MediaMetadata }',
   'fragment _IContent on _IContent { _deleted _fulltext _modified _score _id _track _metadata {...IContentMetadata} }',
 ];