Merge branch 'main' into feature/CMS-45548-npm

Author: exacs

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

@@ -17,10 +17,10 @@ describe('createFragment()', () => {
       [
         "fragment _IExperience on _IExperience { composition {...ICompositionNode }}",
         "fragment ICompositionNode on ICompositionNode { __typename key type nodeType displayName displayTemplateKey displaySettings {key value} ...on CompositionStructureNode { nodes @recursive } ...on CompositionComponentNode { nodeType component { ..._IComponent } } }",
-        "fragment CallToAction on CallToAction { label link }",
-        "fragment ExpSection on ExpSection { heading }",
+        "fragment CallToAction on CallToAction { __typename label link }",
+        "fragment ExpSection on ExpSection { __typename heading }",
         "fragment _IComponent on _IComponent { __typename ...CallToAction ...ExpSection }",
-        "fragment MyExperience on MyExperience { ..._IExperience }",
+        "fragment MyExperience on MyExperience { __typename ..._IExperience }",
       ]
     `);
   });

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

@@ -134,7 +134,7 @@ function convertPropertyField(
     }
 
     const uniqueSubfields = [...new Set(subfields)].join(' '); // remove duplicates
-    fields.push(`${name} { __typename ${uniqueSubfields} }`);
+    fields.push(`${name} { ${uniqueSubfields} }`);
   } else if (property.type === 'richText') {
     fields.push(`${name} { html, json }`);
   } else if (property.type === 'url') {
@@ -209,7 +209,7 @@ export function createFragment(
   if (visited.size === 0) refreshCache();
   visited.add(fragmentName);
 
-  const fields: string[] = [];
+  const fields: string[] = ['__typename'];
   const extraFragments: string[] = [];
 
   // Built‑in CMS baseTypes  ("_image", "_video", "_media" etc.)
@@ -255,12 +255,6 @@ export function createFragment(
     }
   }
 
-  // If there are no fields (e.g., empty properties or all properties have indexingType "disabled"),
-  // We return an empty array to avoid creating empty fragments.
-  if (!fields.length) {
-    return [];
-  }
-
   // Convert base type key to GraphQL fragment format
   // eg: "_image" -> "_Image"
   const parsedFragmentName = toBaseTypeFragmentKey(fragmentName);
@@ -281,14 +275,15 @@ export function createFragment(
  */
 export function createSingleContentQuery(contentType: string) {
   const fragment = createFragment(contentType);
+  const fragmentName = fragment.length > 0 ? '...' + contentType : '';
 
   return `
 ${fragment.join('\n')}
 query GetContent($where: _ContentWhereInput, $variation: VariationInput) {
   _Content(where: $where, variation: $variation) {
     item {
       __typename
-      ...${contentType}
+      ${fragmentName}
       _metadata {
         variation
       }
@@ -307,14 +302,15 @@ query GetContent($where: _ContentWhereInput, $variation: VariationInput) {
  */
 export function createMultipleContentQuery(contentType: string) {
   const fragment = createFragment(contentType);
+  const fragmentName = fragment.length > 0 ? '...' + contentType : '';
 
   return `
 ${fragment.join('\n')}
 query ListContent($where: _ContentWhereInput, $variation: VariationInput) {
   _Content(where: $where, variation: $variation) {
     items {
-      __typename
-      ...${contentType}
+
+      ${fragmentName}
       _metadata {
         variation
       }

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

@@ -152,12 +152,7 @@ export class GraphClient {
     const type = data._Content?.item?._metadata?.types?.[0];
 
     if (!type) {
-      throw new GraphResponseError('No content found', {
-        request: {
-          query: GET_CONTENT_METADATA_QUERY,
-          variables: input,
-        },
-      });
+      return null;
     }
 
     if (typeof type !== 'string') {
@@ -187,7 +182,7 @@ export class GraphClient {
    * @param contentType - A string representing the content type. If omitted, the method
    *   will try to get the content type name from the CMS.
    *
-   * @returns An iterator that traverses all found items
+   * @returns An array of all items matching the path and options. Returns an empty array if no content is found.
    */
   async getContentByPath<T = any>(
     path: string,
@@ -198,6 +193,11 @@ export class GraphClient {
       variation: options?.variation,
     };
     const contentTypeName = await this.getContentType(input);
+
+    if (!contentTypeName) {
+      return [];
+    }
+
     const query = createMultipleContentQuery(contentTypeName);
     const response = (await this.request(query, input)) as ItemsResponse<T>;