@datocms/cma-client 5.1.1 → 5.1.3

package/src/fieldTypes/structured_text.ts

@@ -2,19 +2,25 @@ import {
   type Block,
   type Document,
   type InlineBlock,
-  type Root,
+  type Node,
+  everyNode,
   isBlock,
+  isDocument,
   isInlineBlock,
-  isNode,
 } from 'datocms-structured-text-utils';
-import type * as SchemaTypes from '../generated/SchemaTypes';
-import { everyNode } from '../utilities/structuredText';
+import type * as RawApiTypes from '../generated/RawApiTypes';
+import type { LocalizedFieldValue } from '../utilities/fieldValue';
+import type { StructuredTextEditorConfiguration } from './appearance/structured_text';
 import {
   type BlockItemInARequest,
-  isBlockObject,
-  isBlockObjectWithId,
-  isBlockStringId,
+  isItemId,
+  isItemWithOptionalIdAndMeta,
+  isItemWithOptionalMeta,
 } from './single_block';
+import type { LengthValidator } from './validators/length';
+import type { StructuredTextBlocksValidator } from './validators/structured_text_blocks';
+import type { StructuredTextInlineBlocksValidator } from './validators/structured_text_inline_blocks';
+import type { StructuredTextLinksValidator } from './validators/structured_text_links';
 
 /**
  * STRUCTURED TEXT TYPE SYSTEM FOR DATOCMS
@@ -25,10 +31,10 @@ import {
  * The challenge we're solving:
  * - DatoCMS structured text can contain "blocks" (embedded content items) in bloth 'block'
  *   and 'inlineBlock' nodes
- * - By default, API responses contain blocks as string IDs (lightweight references)
+ * - By default, CMA responses contain blocks as string IDs (lightweight references)
  * - With ?nested=true parameter though, API responses contain blocks as full item objects
  *   (which in turn can contain other blocks)
- * - For API requests, blocks can be represented as:
+ * - For CMA requests, blocks can be represented as:
  *   1. String IDs (referencing existing items)
  *   2. Full item objects with IDs (for updates)
  *   3. Item objects without IDs (for creation)
@@ -50,80 +56,42 @@ import {
 /**
  * Variant of 'block' structured text node for API requests
  */
-export type BlockAsRequest = Omit<Block, 'item'> & {
-  item: BlockItemInARequest;
-};
+export type BlockAsRequest = Block<BlockItemInARequest>;
 
 /**
  * Variant of 'inlineBlock' structured text node for API requests
  */
-export type InlineBlockAsRequest = Omit<InlineBlock, 'item'> & {
-  item: BlockItemInARequest;
-};
-
-/**
- * Generic type to transform a node that might be containing a 'block' or 'inlineBlock' as a (deeply nested) children to its variant for API requests
- */
-export type NodeAsRequest<T> = WithMappedChildren<
-  T,
-  DeepMapVariants<
-    T extends { children: infer C } ? C : never,
-    BlockAsRequest,
-    InlineBlockAsRequest
-  >
->;
+export type InlineBlockAsRequest = InlineBlock<BlockItemInARequest>;
 
 /**
  * Variant of Structured Text document for API requests
  */
-export type DocumentAsRequest = {
-  schema: 'dast';
-  document: NodeAsRequest<Root>;
-};
+export type DocumentAsRequest = Document<BlockItemInARequest>;
 
 /**
  * =============================================================================
  * NESTED VARIANTS - Types for API responses with ?nested=true parameter
  * =============================================================================
  *
- * When using the GET /items?nested=true, the API returns Structured Text documents
- * with embedded blocks fully populated as complete SchemaTypes.Item objects instead
+ * When using the GET /items?nested=true, the CMA returns Structured Text documents
+ * with embedded blocks fully populated as complete RawApiTypes.Item objects instead
  * of just string IDs.
  */
 
 /**
  * Variant of 'block' structured text node for ?nested=true API responses
  */
-export type BlockWithNestedBlocks = Omit<Block, 'item'> & {
-  item: SchemaTypes.Item;
-};
+export type BlockWithNestedBlocks = Block<RawApiTypes.Item>;
 
 /**
  * Variant of 'inlineBlock' structured text node for ?nested=true API responses
  */
-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 NodeWithNestedBlocks<T> = WithMappedChildren<
-  T,
-  DeepMapVariants<
-    T extends { children: infer C } ? C : never,
-    BlockWithNestedBlocks,
-    InlineBlockWithNestedBlocks
-  >
->;
+export type InlineBlockWithNestedBlocks = InlineBlock<RawApiTypes.Item>;
 
 /**
  * Variant of Structured Text document for ?nested=true API responses
  */
-export type DocumentWithNestedBlocks = {
-  schema: 'dast';
-  document: NodeWithNestedBlocks<Root>;
-};
+export type DocumentWithNestedBlocks = Document<RawApiTypes.Item>;
 
 /**
  * =============================================================================
@@ -140,43 +108,17 @@ export type StructuredTextFieldValueAsRequest = DocumentAsRequest | null;
 export type StructuredTextFieldValueWithNestedBlocks =
   DocumentWithNestedBlocks | null;
 
-/**
- * Helper function to validate if a value has the expected structured text document structure.
- * Checks for the presence of 'schema' and 'document' properties on a non-null object.
- */
-function isValidDocumentStructure(
-  value: unknown,
-): value is { schema: unknown; document: unknown } {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    'schema' in value &&
-    'document' in value
-  );
-}
-
 /**
  * Utility function to validate all block/inlineBlock nodes in a structured text document tree.
  * Calls the provided callback for each block/inlineBlock node found and returns true only if all pass.
  */
-function validateAllBlockNodes(
-  node: unknown,
-  callback: (
-    node:
-      | Block
-      | BlockAsRequest
-      | BlockWithNestedBlocks
-      | InlineBlock
-      | InlineBlockAsRequest
-      | InlineBlockWithNestedBlocks,
-  ) => boolean,
+function validateAllBlockNodes<T>(
+  node: Node<T>,
+  callback: (node: Block<T> | InlineBlock<T>) => boolean,
 ): boolean {
   return everyNode(node, (currentNode) => {
     // If this is a block or inlineBlock node, validate it with the callback
-    if (
-      isNode(currentNode) &&
-      (isBlock(currentNode) || isInlineBlock(currentNode))
-    ) {
+    if (isBlock<T>(currentNode) || isInlineBlock<T>(currentNode)) {
       return callback(currentNode);
     }
     // For all other node types, they're valid by default
@@ -193,7 +135,7 @@ export function isStructuredTextFieldValue(
 ): value is StructuredTextFieldValue {
   if (value === null) return true;
 
-  if (!isValidDocumentStructure(value)) {
+  if (!isDocument<unknown>(value)) {
     return false;
   }
 
@@ -203,6 +145,16 @@ export function isStructuredTextFieldValue(
   });
 }
 
+export function isLocalizedStructuredTextFieldValue(
+  value: unknown,
+): value is LocalizedFieldValue<StructuredTextFieldValue> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    Object.values(value).every(isStructuredTextFieldValue)
+  );
+}
+
 /**
  * Type guard for structured text field values in API request format.
  * Allows blocks as string IDs, full objects with IDs, or objects without IDs.
@@ -212,7 +164,7 @@ export function isStructuredTextFieldValueAsRequest(
 ): value is StructuredTextFieldValueAsRequest {
   if (value === null) return true;
 
-  if (!isValidDocumentStructure(value)) {
+  if (!isDocument<unknown>(value)) {
     return false;
   }
 
@@ -221,23 +173,33 @@ export function isStructuredTextFieldValueAsRequest(
     const item = node.item;
 
     // String ID
-    if (isBlockStringId(item)) return true;
+    if (isItemId(item)) return true;
 
     // Object (either with or without ID)
-    return isBlockObject(item);
+    return isItemWithOptionalIdAndMeta(item);
   });
 }
 
+export function isLocalizedStructuredTextFieldValueAsRequest(
+  value: unknown,
+): value is LocalizedFieldValue<StructuredTextFieldValueAsRequest> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    Object.values(value).every(isStructuredTextFieldValueAsRequest)
+  );
+}
+
 /**
  * Type guard for structured text field values with nested blocks (?nested=true format).
- * Ensures all block/inlineBlock nodes have full SchemaTypes.Item objects.
+ * Ensures all block/inlineBlock nodes have full RawApiTypes.Item objects.
  */
 export function isStructuredTextFieldValueWithNestedBlocks(
   value: unknown,
 ): value is StructuredTextFieldValueWithNestedBlocks {
   if (value === null) return true;
 
-  if (!isValidDocumentStructure(value)) {
+  if (!isDocument<unknown>(value)) {
     return false;
   }
 
@@ -246,66 +208,19 @@ export function isStructuredTextFieldValueWithNestedBlocks(
     const item = node.item;
 
     // Must be a full object with ID (nested format always includes full items)
-    return isBlockObjectWithId(item);
+    return isItemWithOptionalMeta(item);
   });
 }
 
-/**
- * =============================================================================
- * SHARED TRANSFORMATION UTILITIES
- * =============================================================================
- *
- * These utility types provide the machinery for automatically transforming
- * structured text types between their different variants. The goal is to
- * recursively walk through complex nested structures and apply the appropriate
- * transformations to Block and InlineBlock nodes while preserving all other types.
- */
-
-/**
- * Utility type that preserves the structure of T but replaces its children with ChildrenType.
- * If T doesn't have children, it returns T unchanged.
- */
-type WithMappedChildren<T, ChildrenType> = T extends { children: any }
-  ? Omit<T, 'children'> & { children: ChildrenType }
-  : T;
-
-/**
- * Generic transformation type that replace 'block' and 'inlineBlock' node types to their variants.
- */
-type MapVariants<T, BlockVariant, InlineBlockVariant> = T extends Block
-  ? BlockVariant
-  : T extends InlineBlock
-    ? InlineBlockVariant
-    : T;
-
-/**
- * Recursively transform a Structured Text node type using the provided variants for 'block' and 'inlineBlock' nodes.
- *
- * This handles three cases:
- * _ Arrays: Transform each array element recursively
- * _ Objects with children: Transform the object itself AND recursively transform its children
- * _ Leaf nodes: Apply the variant mapping
- */
-type DeepMapVariants<T, BlockVariant, InlineBlockVariant> =
-  T extends (infer U)[]
-    ? DeepMapVariants<U, BlockVariant, InlineBlockVariant>[]
-    : T extends { children: infer Children }
-      ? T extends { children: any }
-        ? Omit<T, 'children'> & {
-            children: DeepMapVariants<
-              Children,
-              BlockVariant,
-              InlineBlockVariant
-            >;
-          }
-        : MapVariants<T, BlockVariant, InlineBlockVariant>
-      : MapVariants<T, BlockVariant, InlineBlockVariant>;
-
-import type { StructuredTextEditorConfiguration } from './appearance/structured_text';
-import type { LengthValidator } from './validators/length';
-import type { StructuredTextBlocksValidator } from './validators/structured_text_blocks';
-import type { StructuredTextInlineBlocksValidator } from './validators/structured_text_inline_blocks';
-import type { StructuredTextLinksValidator } from './validators/structured_text_links';
+export function isLocalizedStructuredTextFieldValueWithNestedBlocks(
+  value: unknown,
+): value is LocalizedFieldValue<StructuredTextFieldValueWithNestedBlocks> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    Object.values(value).every(isStructuredTextFieldValueWithNestedBlocks)
+  );
+}
 
 export type StructuredTextFieldValidators = {
   /** Only accept references to block records of the specified block models */

package/src/fieldTypes/text.ts

@@ -1,3 +1,4 @@
+import type { LocalizedFieldValue } from '../utilities/fieldValue';
 import type { MarkdownEditorConfiguration } from './appearance/markdown';
 import type { TextareaEditorConfiguration } from './appearance/textarea';
 import type { WysiwygEditorConfiguration } from './appearance/wysiwyg';
@@ -12,6 +13,16 @@ export function isTextFieldValue(value: unknown): value is TextFieldValue {
   return typeof value === 'string' || value === null;
 }
 
+export function isLocalizedTextFieldValue(
+  value: unknown,
+): value is LocalizedFieldValue<TextFieldValue> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    Object.values(value).every(isTextFieldValue)
+  );
+}
+
 export type TextFieldValidators = {
   /** Value must be specified or it won't be valid */
   required?: RequiredValidator;

package/src/fieldTypes/video.ts

@@ -1,3 +1,4 @@
+import type { LocalizedFieldValue } from '../utilities/fieldValue';
 import type { VideoEditorConfiguration } from './appearance/video';
 import type { RequiredValidator } from './validators/required';
 
@@ -22,6 +23,16 @@ export function isVideoFieldValue(value: unknown): value is VideoFieldValue {
   );
 }
 
+export function isLocalizedVideoFieldValue(
+  value: unknown,
+): value is LocalizedFieldValue<VideoFieldValue> {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    Object.values(value).every(isVideoFieldValue)
+  );
+}
+
 export type VideoFieldValidators = {
   /** Value must be specified or it won't be valid */
   required?: RequiredValidator;

package/src/generated/{SimpleSchemaTypes.ts → ApiTypes.ts}

@@ -58,7 +58,7 @@ type FieldAppearanceConfig<TAppearance> = TAppearance &
   Omit<RawFieldAttributes['appearance'], keyof TAppearance>;
 
 /**
- * Base field configuration for attributes (non-localized), extending the original SchemaTypes
+ * Base field configuration for attributes (non-localized), extending the original RawApiTypes
  */
 type NonLocalizedFieldAttributesForFieldType<
   SourceType,
@@ -78,7 +78,7 @@ type NonLocalizedFieldAttributesForFieldType<
 };
 
 /**
- * Base field configuration for attributes (localized), extending the original SchemaTypes
+ * Base field configuration for attributes (localized), extending the original RawApiTypes
  */
 type LocalizedFieldAttributesForFieldType<
   SourceType,

package/src/generated/Client.ts

@@ -3,7 +3,7 @@ import {
   pollJobResult,
   request,
 } from '@datocms/rest-client-utils';
-import type { JobResult } from './SimpleSchemaTypes';
+import type { JobResult } from './ApiTypes';
 import * as Resources from './resources';
 
 export type RequestOptions = {
@@ -147,7 +147,7 @@ export class Client {
       ...this.config,
       ...options,
       logFn: this.config.logFn || console.log,
-      userAgent: '@datocms/cma-client v5.1.1',
+      userAgent: '@datocms/cma-client v5.1.3',
       baseUrl: this.baseUrl,
       preCallStack: new Error().stack,
       extraHeaders: {

package/src/generated/{SchemaTypes.ts → RawApiTypes.ts}

@@ -58,7 +58,7 @@ type FieldAppearanceConfig<TAppearance> = TAppearance &
   Omit<RawFieldAttributes['appearance'], keyof TAppearance>;
 
 /**
- * Base field configuration for attributes (non-localized), extending the original SchemaTypes
+ * Base field configuration for attributes (non-localized), extending the original RawApiTypes
  */
 type NonLocalizedFieldAttributesForFieldType<
   SourceType,
@@ -78,7 +78,7 @@ type NonLocalizedFieldAttributesForFieldType<
 };
 
 /**
- * Base field configuration for attributes (localized), extending the original SchemaTypes
+ * Base field configuration for attributes (localized), extending the original RawApiTypes
  */
 type LocalizedFieldAttributesForFieldType<
   SourceType,

package/src/generated/resources/AccessToken.ts

@@ -1,7 +1,7 @@
 import * as Utils from '@datocms/rest-client-utils';
 import BaseResource from '../../BaseResource';
-import type * as SchemaTypes from '../SchemaTypes';
-import type * as SimpleSchemaTypes from '../SimpleSchemaTypes';
+import type * as ApiTypes from '../ApiTypes';
+import type * as RawApiTypes from '../RawApiTypes';
 
 export default class AccessToken extends BaseResource {
   static readonly TYPE = 'access_token' as const;
@@ -14,9 +14,9 @@ export default class AccessToken extends BaseResource {
    * @throws {ApiError}
    * @throws {TimeoutError}
    */
-  create(body: SimpleSchemaTypes.AccessTokenCreateSchema) {
+  create(body: ApiTypes.AccessTokenCreateSchema) {
     return this.rawCreate(
-      Utils.serializeRequestBody<SchemaTypes.AccessTokenCreateSchema>(body, {
+      Utils.serializeRequestBody<RawApiTypes.AccessTokenCreateSchema>(body, {
         type: 'access_token',
         attributes: [
           'name',
@@ -27,7 +27,7 @@ export default class AccessToken extends BaseResource {
         relationships: ['role'],
       }),
     ).then((body) =>
-      Utils.deserializeResponseBody<SimpleSchemaTypes.AccessTokenCreateTargetSchema>(
+      Utils.deserializeResponseBody<ApiTypes.AccessTokenCreateTargetSchema>(
         body,
       ),
     );
@@ -42,9 +42,9 @@ export default class AccessToken extends BaseResource {
    * @throws {TimeoutError}
    */
   rawCreate(
-    body: SchemaTypes.AccessTokenCreateSchema,
-  ): Promise<SchemaTypes.AccessTokenCreateTargetSchema> {
-    return this.client.request<SchemaTypes.AccessTokenCreateTargetSchema>({
+    body: RawApiTypes.AccessTokenCreateSchema,
+  ): Promise<RawApiTypes.AccessTokenCreateTargetSchema> {
+    return this.client.request<RawApiTypes.AccessTokenCreateTargetSchema>({
       method: 'POST',
       url: '/access_tokens',
       body,
@@ -60,12 +60,12 @@ export default class AccessToken extends BaseResource {
    * @throws {TimeoutError}
    */
   update(
-    accessTokenId: string | SimpleSchemaTypes.AccessTokenData,
-    body: SimpleSchemaTypes.AccessTokenUpdateSchema,
+    accessTokenId: string | ApiTypes.AccessTokenData,
+    body: ApiTypes.AccessTokenUpdateSchema,
   ) {
     return this.rawUpdate(
       Utils.toId(accessTokenId),
-      Utils.serializeRequestBody<SchemaTypes.AccessTokenUpdateSchema>(body, {
+      Utils.serializeRequestBody<RawApiTypes.AccessTokenUpdateSchema>(body, {
         id: Utils.toId(accessTokenId),
         type: 'access_token',
         attributes: [
@@ -77,7 +77,7 @@ export default class AccessToken extends BaseResource {
         relationships: ['role'],
       }),
     ).then((body) =>
-      Utils.deserializeResponseBody<SimpleSchemaTypes.AccessTokenUpdateTargetSchema>(
+      Utils.deserializeResponseBody<ApiTypes.AccessTokenUpdateTargetSchema>(
         body,
       ),
     );
@@ -93,9 +93,9 @@ export default class AccessToken extends BaseResource {
    */
   rawUpdate(
     accessTokenId: string,
-    body: SchemaTypes.AccessTokenUpdateSchema,
-  ): Promise<SchemaTypes.AccessTokenUpdateTargetSchema> {
-    return this.client.request<SchemaTypes.AccessTokenUpdateTargetSchema>({
+    body: RawApiTypes.AccessTokenUpdateSchema,
+  ): Promise<RawApiTypes.AccessTokenUpdateTargetSchema> {
+    return this.client.request<RawApiTypes.AccessTokenUpdateTargetSchema>({
       method: 'PUT',
       url: `/access_tokens/${accessTokenId}`,
       body,
@@ -112,7 +112,7 @@ export default class AccessToken extends BaseResource {
    */
   list() {
     return this.rawList().then((body) =>
-      Utils.deserializeResponseBody<SimpleSchemaTypes.AccessTokenInstancesTargetSchema>(
+      Utils.deserializeResponseBody<ApiTypes.AccessTokenInstancesTargetSchema>(
         body,
       ),
     );
@@ -126,8 +126,8 @@ export default class AccessToken extends BaseResource {
    * @throws {ApiError}
    * @throws {TimeoutError}
    */
-  rawList(): Promise<SchemaTypes.AccessTokenInstancesTargetSchema> {
-    return this.client.request<SchemaTypes.AccessTokenInstancesTargetSchema>({
+  rawList(): Promise<RawApiTypes.AccessTokenInstancesTargetSchema> {
+    return this.client.request<RawApiTypes.AccessTokenInstancesTargetSchema>({
       method: 'GET',
       url: '/access_tokens',
     });
@@ -141,11 +141,9 @@ export default class AccessToken extends BaseResource {
    * @throws {ApiError}
    * @throws {TimeoutError}
    */
-  find(accessTokenId: string | SimpleSchemaTypes.AccessTokenData) {
+  find(accessTokenId: string | ApiTypes.AccessTokenData) {
     return this.rawFind(Utils.toId(accessTokenId)).then((body) =>
-      Utils.deserializeResponseBody<SimpleSchemaTypes.AccessTokenSelfTargetSchema>(
-        body,
-      ),
+      Utils.deserializeResponseBody<ApiTypes.AccessTokenSelfTargetSchema>(body),
     );
   }
 
@@ -159,8 +157,8 @@ export default class AccessToken extends BaseResource {
    */
   rawFind(
     accessTokenId: string,
-  ): Promise<SchemaTypes.AccessTokenSelfTargetSchema> {
-    return this.client.request<SchemaTypes.AccessTokenSelfTargetSchema>({
+  ): Promise<RawApiTypes.AccessTokenSelfTargetSchema> {
+    return this.client.request<RawApiTypes.AccessTokenSelfTargetSchema>({
       method: 'GET',
       url: `/access_tokens/${accessTokenId}`,
     });
@@ -174,9 +172,9 @@ export default class AccessToken extends BaseResource {
    * @throws {ApiError}
    * @throws {TimeoutError}
    */
-  regenerateToken(accessTokenId: string | SimpleSchemaTypes.AccessTokenData) {
+  regenerateToken(accessTokenId: string | ApiTypes.AccessTokenData) {
     return this.rawRegenerateToken(Utils.toId(accessTokenId)).then((body) =>
-      Utils.deserializeResponseBody<SimpleSchemaTypes.AccessTokenRegenerateTokenTargetSchema>(
+      Utils.deserializeResponseBody<ApiTypes.AccessTokenRegenerateTokenTargetSchema>(
         body,
       ),
     );
@@ -192,8 +190,8 @@ export default class AccessToken extends BaseResource {
    */
   rawRegenerateToken(
     accessTokenId: string,
-  ): Promise<SchemaTypes.AccessTokenRegenerateTokenTargetSchema> {
-    return this.client.request<SchemaTypes.AccessTokenRegenerateTokenTargetSchema>(
+  ): Promise<RawApiTypes.AccessTokenRegenerateTokenTargetSchema> {
+    return this.client.request<RawApiTypes.AccessTokenRegenerateTokenTargetSchema>(
       {
         method: 'POST',
         url: `/access_tokens/${accessTokenId}/regenerate_token`,
@@ -210,12 +208,12 @@ export default class AccessToken extends BaseResource {
    * @throws {TimeoutError}
    */
   destroy(
-    accessTokenId: string | SimpleSchemaTypes.AccessTokenData,
-    queryParams?: SimpleSchemaTypes.AccessTokenDestroyHrefSchema,
+    accessTokenId: string | ApiTypes.AccessTokenData,
+    queryParams?: ApiTypes.AccessTokenDestroyHrefSchema,
   ) {
     return this.rawDestroy(Utils.toId(accessTokenId), queryParams).then(
       (body) =>
-        Utils.deserializeResponseBody<SimpleSchemaTypes.AccessTokenDestroyTargetSchema>(
+        Utils.deserializeResponseBody<ApiTypes.AccessTokenDestroyTargetSchema>(
           body,
         ),
     );
@@ -231,9 +229,9 @@ export default class AccessToken extends BaseResource {
    */
   rawDestroy(
     accessTokenId: string,
-    queryParams?: SchemaTypes.AccessTokenDestroyHrefSchema,
-  ): Promise<SchemaTypes.AccessTokenDestroyTargetSchema> {
-    return this.client.request<SchemaTypes.AccessTokenDestroyTargetSchema>({
+    queryParams?: RawApiTypes.AccessTokenDestroyHrefSchema,
+  ): Promise<RawApiTypes.AccessTokenDestroyTargetSchema> {
+    return this.client.request<RawApiTypes.AccessTokenDestroyTargetSchema>({
       method: 'DELETE',
       url: `/access_tokens/${accessTokenId}`,
       queryParams,

package/src/generated/resources/AuditLogEvent.ts

@@ -1,7 +1,7 @@
 import * as Utils from '@datocms/rest-client-utils';
 import BaseResource from '../../BaseResource';
-import type * as SchemaTypes from '../SchemaTypes';
-import type * as SimpleSchemaTypes from '../SimpleSchemaTypes';
+import type * as ApiTypes from '../ApiTypes';
+import type * as RawApiTypes from '../RawApiTypes';
 
 export default class AuditLogEvent extends BaseResource {
   static readonly TYPE = 'audit_log_event' as const;
@@ -14,15 +14,15 @@ export default class AuditLogEvent extends BaseResource {
    * @throws {ApiError}
    * @throws {TimeoutError}
    */
-  query(body: SimpleSchemaTypes.AuditLogEventQuerySchema) {
+  query(body: ApiTypes.AuditLogEventQuerySchema) {
     return this.rawQuery(
-      Utils.serializeRequestBody<SchemaTypes.AuditLogEventQuerySchema>(body, {
+      Utils.serializeRequestBody<RawApiTypes.AuditLogEventQuerySchema>(body, {
         type: 'audit_log_query',
         attributes: ['filter', 'next_token', 'detailed_log'],
         relationships: [],
       }),
     ).then((body) =>
-      Utils.deserializeResponseBody<SimpleSchemaTypes.AuditLogEventQueryTargetSchema>(
+      Utils.deserializeResponseBody<ApiTypes.AuditLogEventQueryTargetSchema>(
         body,
       ),
     );
@@ -37,9 +37,9 @@ export default class AuditLogEvent extends BaseResource {
    * @throws {TimeoutError}
    */
   rawQuery(
-    body: SchemaTypes.AuditLogEventQuerySchema,
-  ): Promise<SchemaTypes.AuditLogEventQueryTargetSchema> {
-    return this.client.request<SchemaTypes.AuditLogEventQueryTargetSchema>({
+    body: RawApiTypes.AuditLogEventQuerySchema,
+  ): Promise<RawApiTypes.AuditLogEventQueryTargetSchema> {
+    return this.client.request<RawApiTypes.AuditLogEventQueryTargetSchema>({
       method: 'POST',
       url: '/audit-log-events/query',
       body,