Proposed changes

Author: stefanoverna

packages/cma-client/src/fieldTypes/rich_text.ts

@@ -71,7 +71,7 @@ export type RichTextFieldValueAsRequest = BlockItemInARequest[] | null;
 /**
  * Modular Content field value with nested blocks - array of fully populated block objects
  */
-export type RichTextFieldValueWithResolvedBlocks = SchemaTypes.Item[] | null;
+export type RichTextFieldValueWithNestedBlocks = SchemaTypes.Item[] | null;
 
 /**
  * =============================================================================
@@ -117,9 +117,9 @@ export function isRichTextFieldValueAsRequest(
  * Type guard for Modular Content field values with nested blocks (?nested=true format).
  * Ensures all blocks are full SchemaTypes.Item objects with complete data.
  */
-export function isRichTextFieldValueWithResolvedBlocks(
+export function isRichTextFieldValueWithNestedBlocks(
   value: unknown,
-): value is RichTextFieldValueWithResolvedBlocks {
+): value is RichTextFieldValueWithNestedBlocks {
   if (value === null) return true;
 
   if (!Array.isArray(value)) return false;

packages/cma-client/src/fieldTypes/single_block.ts

@@ -77,7 +77,7 @@ export type SingleBlockFieldValueAsRequest = BlockItemInARequest | null;
 /**
  * Single Block field value with nested block - fully populated block object
  */
-export type SingleBlockFieldValueWithResolvedBlocks = SchemaTypes.Item | null;
+export type SingleBlockFieldValueWithNestedBlocks = SchemaTypes.Item | null;
 
 /**
  * =============================================================================
@@ -159,9 +159,9 @@ export function isSingleBlockFieldValueAsRequest(
  * Type guard for Single Block field values with nested blocks (?nested=true format).
  * Ensures block is a full SchemaTypes.Item object with complete data.
  */
-export function isSingleBlockFieldValueWithResolvedBlocks(
+export function isSingleBlockFieldValueWithNestedBlocks(
   value: unknown,
-): value is SingleBlockFieldValueWithResolvedBlocks {
+): value is SingleBlockFieldValueWithNestedBlocks {
   if (value === null) return true;
 
   // Must be a full object with ID (nested format always includes complete block objects)

packages/cma-client/src/fieldTypes/structured_text.ts

@@ -94,35 +94,35 @@ export type DocumentAsRequest = {
 /**
  * Variant of 'block' structured text node for ?nested=true API responses
  */
-export type BlockWithResolvedBlocks = Omit<Block, 'item'> & {
+export type BlockWithNestedBlocks = Omit<Block, 'item'> & {
   item: SchemaTypes.Item;
 };
 
 /**
  * Variant of 'inlineBlock' structured text node for ?nested=true API responses
  */
-export type InlineBlockWithResolvedBlocks = Omit<InlineBlock, 'item'> & {
+export type InlineBlockWithNestedBlocks = Omit<InlineBlock, 'item'> & {
   item: SchemaTypes.Item;
 };
 
 /**
  * Generic type to transform a node that might be containing a 'block' or 'inlineBlock' as a (deeply nested) children to it's variant for ?nested=true API responses
  */
-export type NodeWithResolvedBlocks<T> = WithMappedChildren<
+export type NodeWithNestedBlocks<T> = WithMappedChildren<
   T,
   DeepMapVariants<
     T extends { children: infer C } ? C : never,
-    BlockWithResolvedBlocks,
-    InlineBlockWithResolvedBlocks
+    BlockWithNestedBlocks,
+    InlineBlockWithNestedBlocks
   >
 >;
 
 /**
  * Variant of Structured Text document for ?nested=true API responses
  */
-export type DocumentWithResolvedBlocks = {
+export type DocumentWithNestedBlocks = {
   schema: 'dast';
-  document: NodeWithResolvedBlocks<Root>;
+  document: NodeWithNestedBlocks<Root>;
 };
 
 /**
@@ -137,8 +137,8 @@ export type DocumentWithResolvedBlocks = {
  */
 export type StructuredTextFieldValue = Document | null;
 export type StructuredTextFieldValueAsRequest = DocumentAsRequest | null;
-export type StructuredTextFieldValueWithResolvedBlocks =
-  DocumentWithResolvedBlocks | null;
+export type StructuredTextFieldValueWithNestedBlocks =
+  DocumentWithNestedBlocks | null;
 
 /**
  * Helper function to validate if a value has the expected structured text document structure.
@@ -165,10 +165,10 @@ function validateAllBlockNodes(
     node:
       | Block
       | BlockAsRequest
-      | BlockWithResolvedBlocks
+      | BlockWithNestedBlocks
       | InlineBlock
       | InlineBlockAsRequest
-      | InlineBlockWithResolvedBlocks,
+      | InlineBlockWithNestedBlocks,
   ) => boolean,
 ): boolean {
   return everyNode(node, (currentNode) => {
@@ -232,9 +232,9 @@ export function isStructuredTextFieldValueAsRequest(
  * Type guard for structured text field values with nested blocks (?nested=true format).
  * Ensures all block/inlineBlock nodes have full SchemaTypes.Item objects.
  */
-export function isStructuredTextFieldValueWithResolvedBlocks(
+export function isStructuredTextFieldValueWithNestedBlocks(
   value: unknown,
-): value is StructuredTextFieldValueWithResolvedBlocks {
+): value is StructuredTextFieldValueWithNestedBlocks {
   if (value === null) return true;
 
   if (!isValidDocumentStructure(value)) {

packages/cma-client/src/utilities/blocks.ts

@@ -26,13 +26,13 @@ import type {
   BlockItemInARequest,
   RichTextFieldValue,
   RichTextFieldValueAsRequest,
-  RichTextFieldValueWithResolvedBlocks,
+  RichTextFieldValueWithNestedBlocks,
   SingleBlockFieldValue,
   SingleBlockFieldValueAsRequest,
-  SingleBlockFieldValueWithResolvedBlocks,
+  SingleBlockFieldValueWithNestedBlocks,
   StructuredTextFieldValue,
   StructuredTextFieldValueAsRequest,
-  StructuredTextFieldValueWithResolvedBlocks,
+  StructuredTextFieldValueWithNestedBlocks,
 } from '../fieldTypes';
 import type * as SchemaTypes from '../generated/SchemaTypes';
 import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
@@ -49,15 +49,15 @@ import {
 type PossibleRichTextValue =
   | RichTextFieldValue
   | RichTextFieldValueAsRequest
-  | RichTextFieldValueWithResolvedBlocks;
+  | RichTextFieldValueWithNestedBlocks;
 type PossibleSingleBlockValue =
   | SingleBlockFieldValue
   | SingleBlockFieldValueAsRequest
-  | SingleBlockFieldValueWithResolvedBlocks;
+  | SingleBlockFieldValueWithNestedBlocks;
 type PossibleStructuredTextValue =
   | StructuredTextFieldValue
   | StructuredTextFieldValueAsRequest
-  | StructuredTextFieldValueWithResolvedBlocks;
+  | StructuredTextFieldValueWithNestedBlocks;
 
 function getFieldType(field: SchemaTypes.Field | SimpleSchemaTypes.Field) {
   return 'attributes' in field ? field.attributes.field_type : field.field_type;