@datocms/cma-client 5.1.10 → 5.1.12

package/src/generated/resources/Upload.ts

@@ -1,11 +1,6 @@
 import * as Utils from '@datocms/rest-client-utils';
 import BaseResource from '../../BaseResource';
-import type {
-  ItemTypeDefinition,
-  ToItemDefinition,
-  ToItemDefinitionAsRequest,
-  ToItemDefinitionWithNestedBlocks,
-} from '../../utilities/itemDefinition';
+import type { ItemTypeDefinition } from '../../utilities/itemDefinition';
 import type * as ApiTypes from '../ApiTypes';
 import type * as RawApiTypes from '../RawApiTypes';
 
@@ -267,19 +262,13 @@ export default class Upload extends BaseResource {
   references<D extends ItemTypeDefinition = ItemTypeDefinition>(
     uploadId: string | ApiTypes.UploadData,
     queryParams: ApiTypes.UploadReferencesHrefSchema & { nested: true },
-  ): Promise<
-    ApiTypes.UploadReferencesTargetSchema<
-      ToItemDefinitionWithNestedBlocks<NoInfer<D>>
-    >
-  >;
+  ): Promise<ApiTypes.UploadReferencesTargetSchema<NoInfer<D>, true>>;
   references<D extends ItemTypeDefinition = ItemTypeDefinition>(
     uploadId: string | ApiTypes.UploadData,
     queryParams?: ApiTypes.UploadReferencesHrefSchema & {
       nested?: false | undefined;
     },
-  ): Promise<
-    ApiTypes.UploadReferencesTargetSchema<ToItemDefinition<NoInfer<D>>>
-  >;
+  ): Promise<ApiTypes.UploadReferencesTargetSchema<NoInfer<D>, false>>;
   /**
    * Referenced records
    *
@@ -308,27 +297,17 @@ export default class Upload extends BaseResource {
   rawReferences<D extends ItemTypeDefinition = ItemTypeDefinition>(
     uploadId: string,
     queryParams: RawApiTypes.UploadReferencesHrefSchema & { nested: true },
-  ): Promise<
-    RawApiTypes.UploadReferencesTargetSchema<
-      ToItemDefinitionWithNestedBlocks<NoInfer<D>>
-    >
-  >;
+  ): Promise<RawApiTypes.UploadReferencesTargetSchema<NoInfer<D>, true>>;
   rawReferences<D extends ItemTypeDefinition = ItemTypeDefinition>(
     uploadId: string,
     queryParams?: RawApiTypes.UploadReferencesHrefSchema & {
       nested?: false | undefined;
     },
-  ): Promise<
-    RawApiTypes.UploadReferencesTargetSchema<ToItemDefinition<NoInfer<D>>>
-  >;
+  ): Promise<RawApiTypes.UploadReferencesTargetSchema<NoInfer<D>, false>>;
   rawReferences<D extends ItemTypeDefinition = ItemTypeDefinition>(
     uploadId: string,
     queryParams?: RawApiTypes.UploadReferencesHrefSchema,
-  ): Promise<
-    RawApiTypes.UploadReferencesTargetSchema<
-      ToItemDefinitionWithNestedBlocks<NoInfer<D>>
-    >
-  >;
+  ): Promise<RawApiTypes.UploadReferencesTargetSchema<NoInfer<D>, true>>;
   /**
    * Referenced records
    *
@@ -347,11 +326,9 @@ export default class Upload extends BaseResource {
         url: `/uploads/${uploadId}/references`,
         queryParams,
       })
-      .then<
-        RawApiTypes.UploadReferencesTargetSchema<
-          ToItemDefinitionWithNestedBlocks<NoInfer<D>>
-        >
-      >(Utils.deserializeRawResponseBodyWithItems);
+      .then<RawApiTypes.UploadReferencesTargetSchema<NoInfer<D>, true>>(
+        Utils.deserializeRawResponseBodyWithItems,
+      );
   }
 
   /**

package/src/index.ts

@@ -1,17 +1,18 @@
 export { ApiError, LogLevel, TimeoutError } from '@datocms/rest-client-utils';
 export * from './buildClient';
+export * from './fieldTypes';
 export { Client } from './generated/Client';
 export type { ClientConfigOptions } from './generated/Client';
 export * as Resources from './generated/resources';
-export * from './utilities/blocks';
 export * from './utilities/buildBlockRecord';
+export * from './utilities/duplicateBlockRecord';
 export * from './utilities/fieldsContainingReferences';
-export * from './utilities/fieldValue';
 export * from './utilities/id';
+export * from './utilities/inspectItem';
+export * from './utilities/itemDefinition';
+export * from './utilities/normalizedFieldValues';
 export * from './utilities/recursiveBlocks';
 export * from './utilities/schemaRepository';
-export * from './utilities/itemDefinition';
-export * from './fieldTypes';
 export type { ApiTypes, RawApiTypes };
 // Legacy names
 export type { ApiTypes as SchemaTypes, RawApiTypes as SimpleSchemaTypes };

package/src/utilities/buildBlockRecord.ts

@@ -1,74 +1,19 @@
 import * as Utils from '@datocms/rest-client-utils';
-import type {
-  ItemWithOptionalIdAndMeta,
-  NewBlockInARequest,
-} from '../fieldTypes';
+import type { NewBlockInRequest } from '../fieldTypes';
 import type * as ApiTypes from '../generated/ApiTypes';
 import { Item } from '../generated/resources';
-import type {
-  ItemTypeDefinition,
-  ToItemDefinitionAsRequest,
-  ToItemDefinitionWithNestedBlocks,
-} from './itemDefinition';
-import { mapBlocksInFieldValues } from './recursiveBlocks';
-import type { SchemaRepository } from './schemaRepository';
+import type { ItemTypeDefinition } from './itemDefinition';
 
 type NoInfer<T> = [T][T extends any ? 0 : never];
 
 export function buildBlockRecord<
   D extends ItemTypeDefinition = ItemTypeDefinition,
->(
-  body: ApiTypes.ItemUpdateSchema<ToItemDefinitionAsRequest<NoInfer<D>>>,
-): NewBlockInARequest<ToItemDefinitionAsRequest<NoInfer<D>>> {
+>(body: ApiTypes.ItemUpdateSchema<NoInfer<D>>): NewBlockInRequest<NoInfer<D>> {
   return Utils.serializeRequestBody<{
-    data: NewBlockInARequest<ToItemDefinitionAsRequest<NoInfer<D>>>;
+    data: NewBlockInRequest<NoInfer<D>>;
   }>(body, {
     type: Item.TYPE,
     attributes: '*',
     relationships: ['item_type'],
   }).data;
 }
-
-export async function duplicateBlockRecord<
-  D extends ItemTypeDefinition = ItemTypeDefinition,
->(
-  existingBlock: ItemWithOptionalIdAndMeta<
-    ToItemDefinitionWithNestedBlocks<NoInfer<D>>
-  >,
-  schemaRepository: SchemaRepository,
-): Promise<NewBlockInARequest<ToItemDefinitionAsRequest<NoInfer<D>>>> {
-  const { type, attributes, relationships } = existingBlock;
-
-  const itemType = await schemaRepository.getRawItemTypeById(
-    existingBlock.relationships.item_type.data.id,
-  );
-
-  const newBlock = {
-    type,
-    relationships,
-    attributes,
-  } as NewBlockInARequest;
-
-  const fields = await schemaRepository.getRawItemTypeFields(itemType);
-
-  for (const field of fields) {
-    newBlock.attributes[field.attributes.api_key] = mapBlocksInFieldValues(
-      schemaRepository,
-      field,
-      newBlock.attributes[field.attributes.api_key],
-      (block, path) => {
-        if (typeof block === 'string') {
-          throw new Error(
-            `Block cannot be duplicated as it contains nested block at ${path.join('.')} that is expressed as ID (${block}) instead of full object!`,
-          );
-        }
-
-        const { id, meta, ...blockWithoutIdAndMeta } = block;
-
-        return blockWithoutIdAndMeta;
-      },
-    );
-  }
-
-  return newBlock as NewBlockInARequest<ToItemDefinitionAsRequest<NoInfer<D>>>;
-}

package/src/utilities/duplicateBlockRecord.ts

@@ -0,0 +1,52 @@
+import type {
+  ItemWithOptionalIdAndMeta,
+  NewBlockInRequest,
+} from '../fieldTypes';
+import type { ItemTypeDefinition } from './itemDefinition';
+import { mapBlocksInNonLocalizedFieldValue } from './recursiveBlocks';
+import type { SchemaRepository } from './schemaRepository';
+
+type NoInfer<T> = [T][T extends any ? 0 : never];
+
+export async function duplicateBlockRecord<
+  D extends ItemTypeDefinition = ItemTypeDefinition,
+>(
+  existingBlock: ItemWithOptionalIdAndMeta<NoInfer<D>>,
+  schemaRepository: SchemaRepository,
+): Promise<NewBlockInRequest<NoInfer<D>>> {
+  const { type, attributes, relationships } = existingBlock;
+
+  const itemType = await schemaRepository.getRawItemTypeById(
+    existingBlock.relationships.item_type.data.id,
+  );
+
+  const newBlock = {
+    type,
+    relationships,
+    attributes,
+  } as NewBlockInRequest;
+
+  const fields = await schemaRepository.getRawItemTypeFields(itemType);
+
+  for (const field of fields) {
+    newBlock.attributes[field.attributes.api_key] =
+      await mapBlocksInNonLocalizedFieldValue(
+        newBlock.attributes[field.attributes.api_key],
+        field.attributes.field_type,
+        schemaRepository,
+        (block, path) => {
+          if (typeof block === 'string') {
+            throw new Error(
+              `Block cannot be duplicated as it contains nested block at ${path.join('.')} that is expressed as ID (${block}) instead of full object!`,
+            );
+          }
+
+          const { id, meta, ...blockWithoutIdAndMeta } = block;
+
+          return blockWithoutIdAndMeta as NewBlockInRequest;
+        },
+      );
+  }
+
+  return newBlock as NewBlockInRequest<NoInfer<D>>;
+}