@datocms/cma-client 5.1.1 → 5.1.3

package/src/utilities/blocks.ts

@@ -22,6 +22,15 @@
  * particularly useful when block transformations require async operations like API calls.
  */
 
+import {
+  type TreePath,
+  collectNodes,
+  collectNodesAsync,
+  filterNodes,
+  filterNodesAsync,
+  mapNodes,
+  mapNodesAsync,
+} from 'datocms-structured-text-utils';
 import type {
   BlockItemInARequest,
   RichTextFieldValue,
@@ -34,17 +43,8 @@ import type {
   StructuredTextFieldValueAsRequest,
   StructuredTextFieldValueWithNestedBlocks,
 } from '../fieldTypes';
-import type * as SchemaTypes from '../generated/SchemaTypes';
-import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
-import {
-  type TreePath,
-  filterNodes,
-  filterNodesAsync,
-  findAllNodes,
-  findAllNodesAsync,
-  mapNodes,
-  mapNodesAsync,
-} from './structuredText';
+import type * as ApiTypes from '../generated/ApiTypes';
+import type * as RawApiTypes from '../generated/RawApiTypes';
 
 type PossibleRichTextValue =
   | RichTextFieldValue
@@ -59,12 +59,12 @@ type PossibleStructuredTextValue =
   | StructuredTextFieldValueAsRequest
   | StructuredTextFieldValueWithNestedBlocks;
 
-function getFieldType(field: SchemaTypes.Field | SimpleSchemaTypes.Field) {
+function getFieldType(field: RawApiTypes.Field | ApiTypes.Field) {
   return 'attributes' in field ? field.attributes.field_type : field.field_type;
 }
 
 function* iterateBlocks(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
 ): Generator<{ item: BlockItemInARequest; path: TreePath }> {
   const fieldType = getFieldType(field);
@@ -91,7 +91,7 @@ function* iterateBlocks(
   if (fieldType === 'structured_text') {
     const structuredTextValue = value as PossibleStructuredTextValue;
     if (structuredTextValue) {
-      const foundNodes = findAllNodes(
+      const foundNodes = collectNodes(
         structuredTextValue.document,
         (node) => node.type === 'block' || node.type === 'inlineBlock',
       );
@@ -107,7 +107,7 @@ function* iterateBlocks(
 }
 
 async function* iterateBlocksAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
 ): AsyncGenerator<{ item: BlockItemInARequest; path: TreePath }> {
   const fieldType = getFieldType(field);
@@ -134,7 +134,7 @@ async function* iterateBlocksAsync(
   if (fieldType === 'structured_text') {
     const structuredTextValue = value as PossibleStructuredTextValue;
     if (structuredTextValue) {
-      const foundNodes = await findAllNodesAsync(
+      const foundNodes = await collectNodesAsync(
         structuredTextValue.document,
         async (node) => node.type === 'block' || node.type === 'inlineBlock',
       );
@@ -158,7 +158,7 @@ async function* iterateBlocksAsync(
  * @param visitor - Synchronous function called for each block. Receives the block item and its path
  */
 export function nonRecursiveVisitBlocksInFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   visitor: (item: BlockItemInARequest, path: TreePath) => void,
 ): void {
@@ -177,7 +177,7 @@ export function nonRecursiveVisitBlocksInFieldValue(
  * @returns Promise that resolves when all blocks have been visited
  */
 export async function nonRecursiveVisitBlocksInFieldValueAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   visitor: (item: BlockItemInARequest, path: TreePath) => Promise<void>,
 ): Promise<void> {
@@ -197,7 +197,7 @@ export async function nonRecursiveVisitBlocksInFieldValueAsync(
  * @returns The new field value with transformed blocks
  */
 export function nonRecursiveMapBlocksInFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   mapper: (item: BlockItemInARequest, path: TreePath) => BlockItemInARequest,
 ): unknown {
@@ -251,7 +251,7 @@ export function nonRecursiveMapBlocksInFieldValue(
  * @returns Promise that resolves to the new field value with transformed blocks
  */
 export async function nonRecursiveMapBlocksInFieldValueAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   mapper: (
     item: BlockItemInARequest,
@@ -309,7 +309,7 @@ export async function nonRecursiveMapBlocksInFieldValueAsync(
  * @returns Array of objects, each containing a matching block and its path
  */
 export function nonRecursiveFindAllBlocksInFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => boolean,
 ): Array<{ item: BlockItemInARequest; path: TreePath }> {
@@ -334,7 +334,7 @@ export function nonRecursiveFindAllBlocksInFieldValue(
  * @returns Promise that resolves to an array of objects, each containing a matching block and its path
  */
 export async function nonRecursiveFindAllBlocksInFieldValueAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => Promise<boolean>,
 ): Promise<Array<{ item: BlockItemInARequest; path: TreePath }>> {
@@ -360,7 +360,7 @@ export async function nonRecursiveFindAllBlocksInFieldValueAsync(
  * @returns The new field value with filtered blocks
  */
 export function nonRecursiveFilterBlocksInFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => boolean,
 ): unknown {
@@ -426,7 +426,7 @@ export function nonRecursiveFilterBlocksInFieldValue(
  * @returns Promise that resolves to the new field value with filtered blocks
  */
 export async function nonRecursiveFilterBlocksInFieldValueAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => Promise<boolean>,
 ): Promise<unknown> {
@@ -493,7 +493,7 @@ export async function nonRecursiveFilterBlocksInFieldValueAsync(
  * @returns The final accumulated value
  */
 export function nonRecursiveReduceBlocksInFieldValue<R>(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   reducer: (accumulator: R, item: BlockItemInARequest, path: TreePath) => R,
   initialValue: R,
@@ -519,7 +519,7 @@ export function nonRecursiveReduceBlocksInFieldValue<R>(
  * @returns Promise that resolves to the final accumulated value
  */
 export async function nonRecursiveReduceBlocksInFieldValueAsync<R>(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   reducer: (
     accumulator: R,
@@ -547,7 +547,7 @@ export async function nonRecursiveReduceBlocksInFieldValueAsync<R>(
  * @returns True if any block matches, false otherwise
  */
 export function nonRecursiveSomeBlocksInFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => boolean,
 ): boolean {
@@ -570,7 +570,7 @@ export function nonRecursiveSomeBlocksInFieldValue(
  * @returns Promise that resolves to true if any block matches, false otherwise
  */
 export async function nonRecursiveSomeBlocksInFieldValueAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => Promise<boolean>,
 ): Promise<boolean> {
@@ -593,7 +593,7 @@ export async function nonRecursiveSomeBlocksInFieldValueAsync(
  * @returns True if all blocks match, false otherwise
  */
 export function nonRecursiveEveryBlockInFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => boolean,
 ): boolean {
@@ -612,7 +612,7 @@ export function nonRecursiveEveryBlockInFieldValue(
  * @returns Promise that resolves to true if all blocks match, false otherwise
  */
 export async function nonRecursiveEveryBlockInFieldValueAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   predicate: (item: BlockItemInARequest, path: TreePath) => Promise<boolean>,
 ): Promise<boolean> {

package/src/utilities/buildBlockRecord.ts

@@ -1,10 +1,10 @@
 import * as Utils from '@datocms/rest-client-utils';
-import type * as SchemaTypes from '../generated/SchemaTypes';
-import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
+import type * as ApiTypes from '../generated/ApiTypes';
+import type * as RawApiTypes from '../generated/RawApiTypes';
 import { Item } from '../generated/resources';
 
-export function buildBlockRecord(body: SimpleSchemaTypes.ItemUpdateSchema) {
-  return Utils.serializeRequestBody<SchemaTypes.ItemUpdateSchema>(body, {
+export function buildBlockRecord(body: ApiTypes.ItemUpdateSchema) {
+  return Utils.serializeRequestBody<RawApiTypes.ItemUpdateSchema>(body, {
     type: Item.TYPE,
     attributes: '*',
     relationships: ['item_type'],

package/src/utilities/{fieldValueLocalization.ts → fieldValue.ts}

@@ -1,5 +1,5 @@
-import type * as SchemaTypes from '../generated/SchemaTypes';
-import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
+import type * as ApiTypes from '../generated/ApiTypes';
+import type * as RawApiTypes from '../generated/RawApiTypes';
 
 /*
  * Localized Field Value Operations Utilities
@@ -18,23 +18,6 @@ import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
  * - Reduces code duplication and potential bugs from inconsistent handling
  * - Supports both synchronous and asynchronous operations
  * - Maintains the original data structure (localized fields remain localized, non-localized remain direct)
- *
- * Example usage:
- * ```typescript
- * // Instead of manually checking localization:
- * if (isLocalized(field)) {
- *   const result = {};
- *   for (const [locale, value] of Object.entries(fieldValue)) {
- *     result[locale] = processValue(value);
- *   }
- *   return result;
- * } else {
- *   return processValue(fieldValue);
- * }
- *
- * // Use the utility:
- * return mapLocalizedFieldValues(field, fieldValue, (locale, value) => processValue(value));
- * ```
  */
 
 /**
@@ -44,7 +27,7 @@ import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
  * for various locales structured as an object, such as
  * `{ "en": "Hello", "it": "Ciao" }`
  */
-export type LocalizedFieldValue = Record<string, unknown>;
+export type LocalizedFieldValue<T = unknown> = Record<string, T>;
 
 /**
  * Determines whether a DatoCMS field is localized or not.
@@ -56,7 +39,7 @@ export type LocalizedFieldValue = Record<string, unknown>;
  * @returns true if the field is localized, false otherwise
  */
 export function isLocalized(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
 ): boolean {
   return 'attributes' in field ? field.attributes.localized : field.localized;
 }
@@ -69,11 +52,13 @@ export function isLocalized(
  *
  * This uniform structure allows the same processing logic to work with both field types.
  */
-export type PossiblyLocalizedEntry = {
+export type FieldValueEntry = {
   locale: string | undefined;
   value: unknown;
 };
 
+export type PossiblyLocalizedEntry = FieldValueEntry;
+
 /**
  * Converts a field value (localized or non-localized) into a uniform array of entries.
  *
@@ -84,14 +69,14 @@ export type PossiblyLocalizedEntry = {
  * @param value - The field value to convert (either a localized object or direct value)
  * @returns Array of entries where each entry contains a locale (string for localized, undefined for non-localized) and the corresponding value
  */
-export function fieldValueToPossiblyLocalizedEntries(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export function fieldValueToEntries(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
 ) {
   if (isLocalized(field)) {
     const localizedValue = value as LocalizedFieldValue;
 
-    return Object.entries(localizedValue).map<PossiblyLocalizedEntry>(
+    return Object.entries(localizedValue).map<FieldValueEntry>(
       ([locale, value]) => ({ locale, value }),
     );
   }
@@ -110,9 +95,9 @@ export function fieldValueToPossiblyLocalizedEntries(
  * @param possiblyLocalizedEntries - Array of entries to convert back to field value format
  * @returns Either a localized object (for localized fields) or the direct value (for non-localized fields)
  */
-export function possiblyLocalizedEntriesToFieldValue(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
-  possiblyLocalizedEntries: PossiblyLocalizedEntry[],
+export function entriesToFieldValue(
+  field: RawApiTypes.Field | ApiTypes.Field,
+  possiblyLocalizedEntries: FieldValueEntry[],
 ) {
   if (isLocalized(field)) {
     return Object.fromEntries(
@@ -124,9 +109,9 @@ export function possiblyLocalizedEntriesToFieldValue(
 }
 
 /**
- * Maps localized field values using a provided mapping function.
+ * Maps field values using a provided mapping function.
  * For localized fields, applies the mapping function to each locale value.
- * For non-localized fields, applies the mapping function directly to the only non-localizeed value.
+ * For non-localized fields, applies the mapping function directly to the value.
  *
  * @template T - The type that the mapping function returns
  * @param field - The DatoCMS field definition
@@ -134,23 +119,23 @@ export function possiblyLocalizedEntriesToFieldValue(
  * @param mapFn - The function to apply to each locale value or the direct value
  * @returns The mapped value with the same structure as the input
  */
-export function mapLocalizedFieldValues<T>(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export function mapFieldValue<T>(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   mapFn: (locale: string | undefined, localeValue: unknown) => T,
 ) {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   const mappedEntries = entries.map(({ locale, value }) => ({
     locale,
     value: mapFn(locale, value),
   }));
-  return possiblyLocalizedEntriesToFieldValue(field, mappedEntries);
+  return entriesToFieldValue(field, mappedEntries);
 }
 
 /**
- * Maps localized field values using a provided mapping function (async version).
+ * Maps field values using a provided mapping function (async version).
  * For localized fields, applies the mapping function to each locale value.
- * For non-localized fields, applies the mapping function directly to the only non-localizeed value.
+ * For non-localized fields, applies the mapping function directly to the value.
  *
  * @template T - The type that the mapping function returns
  * @param field - The DatoCMS field definition
@@ -158,23 +143,23 @@ export function mapLocalizedFieldValues<T>(
  * @param mapFn - The function to apply to each locale value or the direct value
  * @returns The mapped value with the same structure as the input
  */
-export async function mapLocalizedFieldValuesAsync<T>(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export async function mapFieldValueAsync<T>(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   mapFn: (locale: string | undefined, localeValue: unknown) => Promise<T>,
 ) {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   const mappedEntries = await Promise.all(
     entries.map(async ({ locale, value }) => ({
       locale,
       value: await mapFn(locale, value),
     })),
   );
-  return possiblyLocalizedEntriesToFieldValue(field, mappedEntries);
+  return entriesToFieldValue(field, mappedEntries);
 }
 
 /**
- * Filters localized field values using a provided filter function.
+ * Filters field values using a provided filter function.
  * For localized fields, filters each locale value.
  * For non-localized fields, returns the value if the filter passes, otherwise undefined.
  *
@@ -183,25 +168,25 @@ export async function mapLocalizedFieldValuesAsync<T>(
  * @param filterFn - The function to test each locale value or the direct value
  * @returns The filtered value with the same structure as the input
  */
-export function filterLocalizedFieldValues(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export function filterFieldValue(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   filterFn: (locale: string | undefined, localeValue: unknown) => boolean,
 ) {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   const filteredEntries = entries.filter(({ locale, value }) =>
     filterFn(locale, value),
   );
 
   if (isLocalized(field)) {
-    return possiblyLocalizedEntriesToFieldValue(field, filteredEntries);
+    return entriesToFieldValue(field, filteredEntries);
   }
 
   return filteredEntries.length > 0 ? filteredEntries[0]?.value : undefined;
 }
 
 /**
- * Filters localized field values using a provided filter function (async version).
+ * Filters field values using a provided filter function (async version).
  * For localized fields, filters each locale value.
  * For non-localized fields, returns the value if the filter passes, otherwise undefined.
  *
@@ -210,15 +195,15 @@ export function filterLocalizedFieldValues(
  * @param filterFn - The function to test each locale value or the direct value
  * @returns The filtered value with the same structure as the input
  */
-export async function filterLocalizedFieldValuesAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export async function filterFieldValueAsync(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   filterFn: (
     locale: string | undefined,
     localeValue: unknown,
   ) => Promise<boolean>,
 ) {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   const results = await Promise.all(
     entries.map(async ({ locale, value }) => ({
       locale,
@@ -232,14 +217,14 @@ export async function filterLocalizedFieldValuesAsync(
     .map(({ locale, value }) => ({ locale, value }));
 
   if (isLocalized(field)) {
-    return possiblyLocalizedEntriesToFieldValue(field, filteredEntries);
+    return entriesToFieldValue(field, filteredEntries);
   }
 
   return filteredEntries.length > 0 ? filteredEntries[0]?.value : undefined;
 }
 
 /**
- * Tests whether at least one localized field value passes the test implemented by the provided function.
+ * Tests whether at least one field value passes the test implemented by the provided function.
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
@@ -248,17 +233,17 @@ export async function filterLocalizedFieldValuesAsync(
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if at least one value passes the test, false otherwise
  */
-export function someLocalizedFieldValues(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export function someFieldValue(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   testFn: (locale: string | undefined, localeValue: unknown) => boolean,
 ): boolean {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   return entries.some(({ locale, value }) => testFn(locale, value));
 }
 
 /**
- * Tests whether at least one localized field value passes the test implemented by the provided function (async version).
+ * Tests whether at least one field value passes the test implemented by the provided function (async version).
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
@@ -267,15 +252,15 @@ export function someLocalizedFieldValues(
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if at least one value passes the test, false otherwise
  */
-export async function someLocalizedFieldValuesAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export async function someFieldValueAsync(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   testFn: (
     locale: string | undefined,
     localeValue: unknown,
   ) => Promise<boolean>,
 ): Promise<boolean> {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   const results = await Promise.all(
     entries.map(({ locale, value }) => testFn(locale, value)),
   );
@@ -283,7 +268,7 @@ export async function someLocalizedFieldValuesAsync(
 }
 
 /**
- * Tests whether all localized field values pass the test implemented by the provided function.
+ * Tests whether all field values pass the test implemented by the provided function.
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
@@ -292,12 +277,12 @@ export async function someLocalizedFieldValuesAsync(
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if all values pass the test, false otherwise
  */
-export function everyLocalizedFieldValues(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export function everyFieldValue(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   testFn: (locale: string | undefined, localeValue: unknown) => boolean,
 ): boolean {
-  return !someLocalizedFieldValues(
+  return !someFieldValue(
     field,
     value,
     (locale, localeValue) => !testFn(locale, localeValue),
@@ -305,7 +290,7 @@ export function everyLocalizedFieldValues(
 }
 
 /**
- * Tests whether all localized field values pass the test implemented by the provided function (async version).
+ * Tests whether all field values pass the test implemented by the provided function (async version).
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
@@ -314,15 +299,15 @@ export function everyLocalizedFieldValues(
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if all values pass the test, false otherwise
  */
-export async function everyLocalizedFieldValuesAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export async function everyFieldValueAsync(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   testFn: (
     locale: string | undefined,
     localeValue: unknown,
   ) => Promise<boolean>,
 ): Promise<boolean> {
-  return !(await someLocalizedFieldValuesAsync(
+  return !(await someFieldValueAsync(
     field,
     value,
     async (locale, localeValue) => !(await testFn(locale, localeValue)),
@@ -330,7 +315,7 @@ export async function everyLocalizedFieldValuesAsync(
 }
 
 /**
- * Visits each localized field value with the provided function.
+ * Visits each field value with the provided function.
  * For localized fields, visits each locale value.
  * For non-localized fields, visits the direct value.
  *
@@ -338,19 +323,19 @@ export async function everyLocalizedFieldValuesAsync(
  * @param value - The field value (either localized object or direct value)
  * @param visitFn - The function to call for each locale value or the direct value
  */
-export function visitLocalizedFieldValues(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export function visitFieldValue(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   visitFn: (locale: string | undefined, localeValue: unknown) => void,
 ): void {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   for (const { locale, value } of entries) {
     visitFn(locale, value);
   }
 }
 
 /**
- * Visits each localized field value with the provided function (async version).
+ * Visits each field value with the provided function (async version).
  * For localized fields, visits each locale value.
  * For non-localized fields, visits the direct value.
  *
@@ -358,11 +343,11 @@ export function visitLocalizedFieldValues(
  * @param value - The field value (either localized object or direct value)
  * @param visitFn - The function to call for each locale value or the direct value
  */
-export async function visitLocalizedFieldValuesAsync(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+export async function visitFieldValueAsync(
+  field: RawApiTypes.Field | ApiTypes.Field,
   value: unknown,
   visitFn: (locale: string | undefined, localeValue: unknown) => Promise<void>,
 ): Promise<void> {
-  const entries = fieldValueToPossiblyLocalizedEntries(field, value);
+  const entries = fieldValueToEntries(field, value);
   await Promise.all(entries.map(({ locale, value }) => visitFn(locale, value)));
 }

package/src/utilities/fieldsContainingReferences.ts

@@ -1,8 +1,8 @@
-import type * as SchemaTypes from '../generated/SchemaTypes';
-import type * as SimpleSchemaTypes from '../generated/SimpleSchemaTypes';
+import type * as ApiTypes from '../generated/ApiTypes';
+import type * as RawApiTypes from '../generated/RawApiTypes';
 
 export function modelIdsReferencedInField(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
 ) {
   const attributes = 'attributes' in field ? field.attributes : field;
 
@@ -23,7 +23,7 @@ export function modelIdsReferencedInField(
 }
 
 export function blockModelIdsReferencedInField(
-  field: SchemaTypes.Field | SimpleSchemaTypes.Field,
+  field: RawApiTypes.Field | ApiTypes.Field,
 ) {
   const attributes = 'attributes' in field ? field.attributes : field;