@datocms/cma-client 5.1.14 → 5.1.16

package/dist/types/utilities/normalizedFieldValues.d.ts

@@ -14,8 +14,8 @@ export type LocalizedFieldValue<T = unknown, L extends string = string> = Partia
  * This function handles both full Schema field objects and simplified Schema field objects
  * by checking the appropriate property based on the object structure.
  *
- * @param field - The DatoCMS field definition (either full or simple schema)
  * @returns true if the field is localized, false otherwise
+ * @param field - The DatoCMS field definition (either full or simple schema)
  */
 export declare function isLocalized(field: RawApiTypes.Field | ApiTypes.Field): boolean;
 export declare function isLocalizedFieldValue<T = unknown, L extends string = string>(value: unknown): value is LocalizedFieldValue<T, L>;
@@ -37,11 +37,11 @@ export type NormalizedFieldValueEntry<T = unknown, L extends string = string> =
  * This function normalizes the handling of field values by converting them into a consistent
  * array format, regardless of whether the field is localized or not.
  *
- * @param field - The DatoCMS field definition that determines localization behavior
  * @param value - The field value to convert (either a localized object or direct value)
+ * @param field - The DatoCMS field definition that determines localization behavior
  * @returns Array of entries where each entry contains a locale (string for localized, undefined for non-localized) and the corresponding value
  */
-export declare function toNormalizedFieldValueEntries<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>): NormalizedFieldValueEntry<T, L>[];
+export declare function toNormalizedFieldValueEntries<T = unknown, L extends string = string>(value: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field): NormalizedFieldValueEntry<T, L>[];
 /**
  * Converts an array of possibly localized entries back into the appropriate field value format.
  *
@@ -49,118 +49,118 @@ export declare function toNormalizedFieldValueEntries<T = unknown, L extends str
  * array of entries and converts them back to either a localized object or a direct value,
  * depending on the field's localization setting.
  *
- * @param field - The DatoCMS field definition that determines the output format
  * @param entries - Array of entries to convert back to field value format
+ * @param field - The DatoCMS field definition that determines the output format
  * @returns Either a localized object (for localized fields) or the direct value (for non-localized fields)
  */
-export declare function fromNormalizedFieldValueEntries<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, entries: NormalizedFieldValueEntry<T, L>[]): T | LocalizedFieldValue<T, L>;
+export declare function fromNormalizedFieldValueEntries<T = unknown, L extends string = string>(entries: NormalizedFieldValueEntry<T, L>[], field: RawApiTypes.Field | ApiTypes.Field): T | LocalizedFieldValue<T, L>;
 /**
  * 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 value.
  *
  * @template T - The type that the mapping function returns
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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 declare function mapNormalizedFieldValues<TInput = unknown, TOutput = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: TInput | LocalizedFieldValue<TInput, L>, mapFn: (locale: L | undefined, localeValue: TInput) => TOutput): TOutput | LocalizedFieldValue<TOutput, L>;
+export declare function mapNormalizedFieldValues<TInput = unknown, TOutput = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: TInput | LocalizedFieldValue<TInput, L>, field: RawApiTypes.Field | ApiTypes.Field, mapFn: (locale: L | undefined, localeValue: TInput) => TOutput): TOutput | LocalizedFieldValue<TOutput, L>;
 /**
  * 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 value.
  *
  * @template T - The type that the mapping function returns
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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 declare function mapNormalizedFieldValuesAsync<TInput = unknown, TOutput = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: TInput | LocalizedFieldValue<TInput, L>, mapFn: (locale: L | undefined, localeValue: TInput) => Promise<TOutput>): Promise<TOutput | LocalizedFieldValue<TOutput, L>>;
+export declare function mapNormalizedFieldValuesAsync<TInput = unknown, TOutput = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: TInput | LocalizedFieldValue<TInput, L>, field: RawApiTypes.Field | ApiTypes.Field, mapFn: (locale: L | undefined, localeValue: TInput) => Promise<TOutput>): Promise<TOutput | LocalizedFieldValue<TOutput, L>>;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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 declare function filterNormalizedFieldValues<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, filterFn: (locale: L | undefined, localeValue: T) => boolean): T | LocalizedFieldValue<T, L> | undefined;
+export declare function filterNormalizedFieldValues<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, filterFn: (locale: L | undefined, localeValue: T) => boolean): T | LocalizedFieldValue<T, L> | undefined;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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 declare function filterNormalizedFieldValuesAsync<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, filterFn: (locale: L | undefined, localeValue: T) => Promise<boolean>): Promise<T | LocalizedFieldValue<T, L> | undefined>;
+export declare function filterNormalizedFieldValuesAsync<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, filterFn: (locale: L | undefined, localeValue: T) => Promise<boolean>): Promise<T | LocalizedFieldValue<T, L> | undefined>;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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 declare function someNormalizedFieldValues<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, testFn: (locale: L | undefined, localeValue: T) => boolean): boolean;
+export declare function someNormalizedFieldValues<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, testFn: (locale: L | undefined, localeValue: T) => boolean): boolean;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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 declare function someNormalizedFieldValuesAsync<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, testFn: (locale: L | undefined, localeValue: T) => Promise<boolean>): Promise<boolean>;
+export declare function someNormalizedFieldValuesAsync<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, testFn: (locale: L | undefined, localeValue: T) => Promise<boolean>): Promise<boolean>;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if all values pass the test, false otherwise
  */
-export declare function everyNormalizedFieldValue<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, testFn: (locale: L | undefined, localeValue: T) => boolean): boolean;
+export declare function everyNormalizedFieldValue<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, testFn: (locale: L | undefined, localeValue: T) => boolean): boolean;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if all values pass the test, false otherwise
  */
-export declare function everyNormalizedFieldValueAsync<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, testFn: (locale: L | undefined, localeValue: T) => Promise<boolean>): Promise<boolean>;
+export declare function everyNormalizedFieldValueAsync<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, testFn: (locale: L | undefined, localeValue: T) => Promise<boolean>): Promise<boolean>;
 /**
  * Visits each field value with the provided function.
  * For localized fields, visits each locale value.
  * For non-localized fields, visits the direct value.
  *
- * @param field - The DatoCMS field definition
  * @param value - The field value (either localized object or direct value)
+ * @param field - The DatoCMS field definition
  * @param visitFn - The function to call for each locale value or the direct value
  */
-export declare function visitNormalizedFieldValues<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, visitFn: (locale: L | undefined, localeValue: T) => void): void;
+export declare function visitNormalizedFieldValues<T = unknown, L extends string = string>(value: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, visitFn: (locale: L | undefined, localeValue: T) => void): void;
 /**
  * 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.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @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 declare function visitNormalizedFieldValuesAsync<T = unknown, L extends string = string>(field: RawApiTypes.Field | ApiTypes.Field, value: T | LocalizedFieldValue<T, L>, visitFn: (locale: L | undefined, localeValue: T) => Promise<void>): Promise<void>;
+export declare function visitNormalizedFieldValuesAsync<T = unknown, L extends string = string>(localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>, field: RawApiTypes.Field | ApiTypes.Field, visitFn: (locale: L | undefined, localeValue: T) => Promise<void>): Promise<void>;

package/dist/types/utilities/schemaRepository.d.ts

@@ -111,6 +111,7 @@ export declare class SchemaRepository {
     private pluginsPromise;
     private pluginsById;
     private pluginsByPackageName;
+    private prefetchPromise;
     /**
      * Creates a new SchemaRepository instance.
      * @param client - The DatoCMS client instance

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datocms/cma-client",
-  "version": "5.1.14",
+  "version": "5.1.16",
   "description": "JS client for DatoCMS REST Content Management API",
   "keywords": [
     "datocms",
@@ -45,5 +45,5 @@
     "@datocms/dashboard-client": "^5.1.13",
     "@types/uuid": "^9.0.7"
   },
-  "gitHead": "267e2d5a5dbab1bf3cec144445724bcec49ae7e3"
+  "gitHead": "f11b6b358c281fb2efff2e337be07f6c4ba30e77"
 }

package/src/generated/Client.ts

@@ -147,7 +147,7 @@ export class Client {
       ...this.config,
       ...options,
       logFn: this.config.logFn || console.log,
-      userAgent: '@datocms/cma-client v5.1.14',
+      userAgent: '@datocms/cma-client v5.1.16',
       baseUrl: this.baseUrl,
       preCallStack: new Error().stack,
       extraHeaders: {

package/src/utilities/normalizedFieldValues.ts

@@ -38,8 +38,8 @@ export type LocalizedFieldValue<
  * This function handles both full Schema field objects and simplified Schema field objects
  * by checking the appropriate property based on the object structure.
  *
- * @param field - The DatoCMS field definition (either full or simple schema)
  * @returns true if the field is localized, false otherwise
+ * @param field - The DatoCMS field definition (either full or simple schema)
  */
 export function isLocalized(
   field: RawApiTypes.Field | ApiTypes.Field,
@@ -88,16 +88,16 @@ export type NormalizedFieldValueEntry<
  * This function normalizes the handling of field values by converting them into a consistent
  * array format, regardless of whether the field is localized or not.
  *
- * @param field - The DatoCMS field definition that determines localization behavior
  * @param value - The field value to convert (either a localized object or direct value)
+ * @param field - The DatoCMS field definition that determines localization behavior
  * @returns Array of entries where each entry contains a locale (string for localized, undefined for non-localized) and the corresponding value
  */
 export function toNormalizedFieldValueEntries<
   T = unknown,
   L extends string = string,
 >(
-  field: RawApiTypes.Field | ApiTypes.Field,
   value: T | LocalizedFieldValue<T, L>,
+  field: RawApiTypes.Field | ApiTypes.Field,
 ): NormalizedFieldValueEntry<T, L>[] {
   if (isLocalized(field)) {
     const localizedValue = value as LocalizedFieldValue<T, L>;
@@ -118,16 +118,16 @@ export function toNormalizedFieldValueEntries<
  * array of entries and converts them back to either a localized object or a direct value,
  * depending on the field's localization setting.
  *
- * @param field - The DatoCMS field definition that determines the output format
  * @param entries - Array of entries to convert back to field value format
+ * @param field - The DatoCMS field definition that determines the output format
  * @returns Either a localized object (for localized fields) or the direct value (for non-localized fields)
  */
 export function fromNormalizedFieldValueEntries<
   T = unknown,
   L extends string = string,
 >(
-  field: RawApiTypes.Field | ApiTypes.Field,
   entries: NormalizedFieldValueEntry<T, L>[],
+  field: RawApiTypes.Field | ApiTypes.Field,
 ): T | LocalizedFieldValue<T, L> {
   if (isLocalized(field)) {
     return Object.fromEntries(
@@ -148,8 +148,8 @@ export function fromNormalizedFieldValueEntries<
  * For non-localized fields, applies the mapping function directly to the value.
  *
  * @template T - The type that the mapping function returns
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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
  */
@@ -158,16 +158,19 @@ export function mapNormalizedFieldValues<
   TOutput = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: TInput | LocalizedFieldValue<TInput, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: TInput | LocalizedFieldValue<TInput, L>,
   mapFn: (locale: L | undefined, localeValue: TInput) => TOutput,
 ): TOutput | LocalizedFieldValue<TOutput, L> {
-  const entries = toNormalizedFieldValueEntries<TInput, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<TInput, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   const mappedEntries = entries.map(({ locale, value }) => ({
     locale,
     value: mapFn(locale, value),
   }));
-  return fromNormalizedFieldValueEntries<TOutput, L>(field, mappedEntries);
+  return fromNormalizedFieldValueEntries<TOutput, L>(mappedEntries, field);
 }
 
 /**
@@ -176,8 +179,8 @@ export function mapNormalizedFieldValues<
  * For non-localized fields, applies the mapping function directly to the value.
  *
  * @template T - The type that the mapping function returns
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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
  */
@@ -186,18 +189,21 @@ export async function mapNormalizedFieldValuesAsync<
   TOutput = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: TInput | LocalizedFieldValue<TInput, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: TInput | LocalizedFieldValue<TInput, L>,
   mapFn: (locale: L | undefined, localeValue: TInput) => Promise<TOutput>,
 ): Promise<TOutput | LocalizedFieldValue<TOutput, L>> {
-  const entries = toNormalizedFieldValueEntries<TInput, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<TInput, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   const mappedEntries = await Promise.all(
     entries.map(async ({ locale, value }) => ({
       locale,
       value: await mapFn(locale, value),
     })),
   );
-  return fromNormalizedFieldValueEntries<TOutput, L>(field, mappedEntries);
+  return fromNormalizedFieldValueEntries<TOutput, L>(mappedEntries, field);
 }
 
 /**
@@ -205,8 +211,8 @@ export async function mapNormalizedFieldValuesAsync<
  * For localized fields, filters each locale value.
  * For non-localized fields, returns the value if the filter passes, otherwise undefined.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @param filterFn - The function to test each locale value or the direct value
  * @returns The filtered value with the same structure as the input
  */
@@ -214,17 +220,20 @@ export function filterNormalizedFieldValues<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   filterFn: (locale: L | undefined, localeValue: T) => boolean,
 ): T | LocalizedFieldValue<T, L> | undefined {
-  const entries = toNormalizedFieldValueEntries<T, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<T, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   const filteredEntries = entries.filter((entry) =>
     filterFn(entry.locale, entry.value),
   );
 
   if (isLocalized(field)) {
-    return fromNormalizedFieldValueEntries<T, L>(field, filteredEntries);
+    return fromNormalizedFieldValueEntries<T, L>(filteredEntries, field);
   }
 
   return filteredEntries.length > 0 ? filteredEntries[0]?.value : undefined;
@@ -235,8 +244,8 @@ export function filterNormalizedFieldValues<
  * For localized fields, filters each locale value.
  * For non-localized fields, returns the value if the filter passes, otherwise undefined.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @param filterFn - The function to test each locale value or the direct value
  * @returns The filtered value with the same structure as the input
  */
@@ -244,11 +253,14 @@ export async function filterNormalizedFieldValuesAsync<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   filterFn: (locale: L | undefined, localeValue: T) => Promise<boolean>,
 ): Promise<T | LocalizedFieldValue<T, L> | undefined> {
-  const entries = toNormalizedFieldValueEntries<T, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<T, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   const results = await Promise.all(
     entries.map(async ({ locale, value }) => ({
       locale,
@@ -262,7 +274,7 @@ export async function filterNormalizedFieldValuesAsync<
     .map(({ locale, value }) => ({ locale, value }));
 
   if (isLocalized(field)) {
-    return fromNormalizedFieldValueEntries<T, L>(field, filteredEntries);
+    return fromNormalizedFieldValueEntries<T, L>(filteredEntries, field);
   }
 
   return filteredEntries.length > 0 ? filteredEntries[0]?.value : undefined;
@@ -273,8 +285,8 @@ export async function filterNormalizedFieldValuesAsync<
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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
  */
@@ -282,11 +294,14 @@ export function someNormalizedFieldValues<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   testFn: (locale: L | undefined, localeValue: T) => boolean,
 ): boolean {
-  const entries = toNormalizedFieldValueEntries<T, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<T, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   return entries.some(({ locale, value }) => testFn(locale, value));
 }
 
@@ -295,8 +310,8 @@ export function someNormalizedFieldValues<
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @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
  */
@@ -304,11 +319,14 @@ export async function someNormalizedFieldValuesAsync<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   testFn: (locale: L | undefined, localeValue: T) => Promise<boolean>,
 ): Promise<boolean> {
-  const entries = toNormalizedFieldValueEntries<T, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<T, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   const results = await Promise.all(
     entries.map(({ locale, value }) => testFn(locale, value)),
   );
@@ -320,8 +338,8 @@ export async function someNormalizedFieldValuesAsync<
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if all values pass the test, false otherwise
  */
@@ -329,13 +347,13 @@ export function everyNormalizedFieldValue<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   testFn: (locale: L | undefined, localeValue: T) => boolean,
 ): boolean {
   return !someNormalizedFieldValues(
+    localizedOrNonLocalizedFieldValue,
     field,
-    value,
     (locale, localeValue) => !testFn(locale, localeValue),
   );
 }
@@ -345,8 +363,8 @@ export function everyNormalizedFieldValue<
  * For localized fields, tests each locale value.
  * For non-localized fields, tests the direct value.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @param value - The field value (either localized object or direct value)
  * @param testFn - The function to test each locale value or the direct value
  * @returns true if all values pass the test, false otherwise
  */
@@ -354,13 +372,13 @@ export async function everyNormalizedFieldValueAsync<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   testFn: (locale: L | undefined, localeValue: T) => Promise<boolean>,
 ): Promise<boolean> {
   return !(await someNormalizedFieldValuesAsync(
+    localizedOrNonLocalizedFieldValue,
     field,
-    value,
     async (locale, localeValue) => !(await testFn(locale, localeValue)),
   ));
 }
@@ -370,19 +388,19 @@ export async function everyNormalizedFieldValueAsync<
  * For localized fields, visits each locale value.
  * For non-localized fields, visits the direct value.
  *
- * @param field - The DatoCMS field definition
  * @param value - The field value (either localized object or direct value)
+ * @param field - The DatoCMS field definition
  * @param visitFn - The function to call for each locale value or the direct value
  */
 export function visitNormalizedFieldValues<
   T = unknown,
   L extends string = string,
 >(
-  field: RawApiTypes.Field | ApiTypes.Field,
   value: T | LocalizedFieldValue<T, L>,
+  field: RawApiTypes.Field | ApiTypes.Field,
   visitFn: (locale: L | undefined, localeValue: T) => void,
 ): void {
-  const entries = toNormalizedFieldValueEntries<T, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<T, L>(value, field);
   for (const { locale, value } of entries) {
     visitFn(locale, value);
   }
@@ -393,18 +411,21 @@ export function visitNormalizedFieldValues<
  * For localized fields, visits each locale value.
  * For non-localized fields, visits the direct value.
  *
+ * @param localizedOrNonLocalizedFieldValue - The field value (either localized object or direct value)
  * @param field - The DatoCMS field definition
- * @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 visitNormalizedFieldValuesAsync<
   T = unknown,
   L extends string = string,
 >(
+  localizedOrNonLocalizedFieldValue: T | LocalizedFieldValue<T, L>,
   field: RawApiTypes.Field | ApiTypes.Field,
-  value: T | LocalizedFieldValue<T, L>,
   visitFn: (locale: L | undefined, localeValue: T) => Promise<void>,
 ): Promise<void> {
-  const entries = toNormalizedFieldValueEntries<T, L>(field, value);
+  const entries = toNormalizedFieldValueEntries<T, L>(
+    localizedOrNonLocalizedFieldValue,
+    field,
+  );
   await Promise.all(entries.map(({ locale, value }) => visitFn(locale, value)));
 }

package/src/utilities/schemaRepository.ts

@@ -103,6 +103,7 @@ export class SchemaRepository {
   private pluginsPromise: Promise<RawApiTypes.Plugin[]> | null = null;
   private pluginsById: Map<string, RawApiTypes.Plugin> = new Map();
   private pluginsByPackageName: Map<string, RawApiTypes.Plugin> = new Map();
+  private prefetchPromise: Promise<void> | null = null;
 
   /**
    * Creates a new SchemaRepository instance.
@@ -457,42 +458,52 @@ export class SchemaRepository {
    * @returns Promise that resolves when all data has been fetched and cached
    */
   async prefetchAllModelsAndFields(): Promise<void> {
-    const { included } = await this.client.site.rawFind({
-      include: 'item_types,item_types.fields',
-    });
-
-    if (!included) {
-      throw new Error('This should not happen');
+    if (this.prefetchPromise) {
+      return this.prefetchPromise;
     }
 
-    const allItemTypes = included.filter(
-      (item): item is RawApiTypes.ItemType => item.type === 'item_type',
-    );
-    const allFields = included.filter(
-      (item): item is RawApiTypes.Field => item.type === 'field',
-    );
+    const prefetch = async () => {
+      const { included } = await this.client.site.rawFind({
+        include: 'item_types,item_types.fields',
+      });
 
-    // Populate item types caches
-    this.itemTypesPromise = Promise.resolve(allItemTypes);
-    for (const itemType of allItemTypes) {
-      this.itemTypesByApiKey.set(itemType.attributes.api_key, itemType);
-      this.itemTypesById.set(itemType.id, itemType);
-    }
+      if (!included) {
+        throw new Error('This should not happen');
+      }
 
-    // Group fields by item type and populate fields cache
-    const fieldsByItemTypeId = new Map<string, RawApiTypes.Field[]>();
-    for (const field of allFields) {
-      const itemTypeId = field.relationships.item_type.data.id;
-      if (!fieldsByItemTypeId.has(itemTypeId)) {
-        fieldsByItemTypeId.set(itemTypeId, []);
+      const allItemTypes = included.filter(
+        (item): item is RawApiTypes.ItemType => item.type === 'item_type',
+      );
+      const allFields = included.filter(
+        (item): item is RawApiTypes.Field => item.type === 'field',
+      );
+
+      // Populate item types caches
+      this.itemTypesPromise = Promise.resolve(allItemTypes);
+      for (const itemType of allItemTypes) {
+        this.itemTypesByApiKey.set(itemType.attributes.api_key, itemType);
+        this.itemTypesById.set(itemType.id, itemType);
       }
-      fieldsByItemTypeId.get(itemTypeId)!.push(field);
-    }
 
-    // Populate the fields cache
-    for (const [itemTypeId, fields] of fieldsByItemTypeId) {
-      this.fieldsByItemType.set(itemTypeId, fields);
-    }
+      // Group fields by item type and populate fields cache
+      const fieldsByItemTypeId = new Map<string, RawApiTypes.Field[]>();
+      for (const field of allFields) {
+        const itemTypeId = field.relationships.item_type.data.id;
+        if (!fieldsByItemTypeId.has(itemTypeId)) {
+          fieldsByItemTypeId.set(itemTypeId, []);
+        }
+        fieldsByItemTypeId.get(itemTypeId)!.push(field);
+      }
+
+      // Populate the fields cache
+      for (const [itemTypeId, fields] of fieldsByItemTypeId) {
+        this.fieldsByItemType.set(itemTypeId, fields);
+      }
+    };
+
+    this.prefetchPromise = prefetch();
+
+    return this.prefetchPromise;
   }
 
   /**