contentful 11.12.4 → 11.12.5

package/dist/types/types/entry.d.ts

@@ -121,6 +121,17 @@ export type BaseEntry = {
  * @category Entry
  */
 export type BaseFieldMap<Field extends EntryFieldType<EntrySkeletonType>> = Field extends EntryFieldTypes.Symbol<infer Values> ? EntryFields.Symbol<Values> : Field extends EntryFieldTypes.Text<infer Values> ? EntryFields.Text<Values> : Field extends EntryFieldTypes.Integer<infer Values> ? EntryFields.Integer<Values> : Field extends EntryFieldTypes.Number<infer Values> ? EntryFields.Number<Values> : Field extends EntryFieldTypes.Date ? EntryFields.Date : Field extends EntryFieldTypes.Boolean ? EntryFields.Boolean : Field extends EntryFieldTypes.Location ? EntryFields.Location : Field extends EntryFieldTypes.RichText ? EntryFields.RichText : Field extends EntryFieldTypes.Object<infer Data> ? EntryFields.Object<Data> : never;
+/**
+ * Resolves a (possibly union) linked-entry skeleton into the corresponding
+ * `Entry` type, distributing over the union so that `EntryLink<A | B>` becomes
+ * `Entry<A> | Entry<B>` instead of collapsing `fields` to the keys common to
+ * every member. `Entry` itself is intentionally non-distributive to remain
+ * inferrable in `getEntry`/`getEntries`, so distribution is applied here at the
+ * link-resolution boundary where the linked skeleton is already known.
+ * @category Entry
+ * @internal
+ */
+export type DistributiveEntry<EntrySkeleton extends EntrySkeletonType, Modifiers extends ChainModifiers, Locales extends LocaleCode> = EntrySkeleton extends EntrySkeletonType ? Entry<EntrySkeleton, Modifiers, Locales> : never;
 /**
  * A single resolved link to another entry in the same space
  * If the current client configuration includes `withoutLinkResolution` chain option,
@@ -133,7 +144,7 @@ export type BaseFieldMap<Field extends EntryFieldType<EntrySkeletonType>> = Fiel
  * @typeParam LinkedEntry - Shape of the linked entry used to calculate dynamic keys
  * @internal
  */
-export type ResolvedEntryLink<Modifiers extends ChainModifiers, Locales extends LocaleCode, LinkedEntry extends EntrySkeletonType> = ChainModifiers extends Modifiers ? Entry<LinkedEntry, Modifiers, Locales> | UnresolvedLink<'Entry'> | undefined : 'WITHOUT_LINK_RESOLUTION' extends Modifiers ? UnresolvedLink<'Entry'> : 'WITHOUT_UNRESOLVABLE_LINKS' extends Modifiers ? Entry<LinkedEntry, Modifiers, Locales> | undefined : Entry<LinkedEntry, Modifiers, Locales> | UnresolvedLink<'Entry'>;
+export type ResolvedEntryLink<Modifiers extends ChainModifiers, Locales extends LocaleCode, LinkedEntry extends EntrySkeletonType> = ChainModifiers extends Modifiers ? DistributiveEntry<LinkedEntry, Modifiers, Locales> | UnresolvedLink<'Entry'> | undefined : 'WITHOUT_LINK_RESOLUTION' extends Modifiers ? UnresolvedLink<'Entry'> : 'WITHOUT_UNRESOLVABLE_LINKS' extends Modifiers ? DistributiveEntry<LinkedEntry, Modifiers, Locales> | undefined : DistributiveEntry<LinkedEntry, Modifiers, Locales> | UnresolvedLink<'Entry'>;
 /**
  * A single resolved reference link to another entry in a different space
  * If the current client configuration includes `withoutLinkResolution` chain option,
@@ -146,11 +157,11 @@ export type ResolvedEntryLink<Modifiers extends ChainModifiers, Locales extends
  * @typeParam LinkedEntry - Shape of the linked entry used to calculate dynamic keys
  * @internal
  */
-export type ResolvedEntryResourceLink<Modifiers extends ChainModifiers, Locales extends LocaleCode, LinkedEntry extends EntrySkeletonType> = ChainModifiers extends Modifiers ? Entry<LinkedEntry, Modifiers, Locales> | {
+export type ResolvedEntryResourceLink<Modifiers extends ChainModifiers, Locales extends LocaleCode, LinkedEntry extends EntrySkeletonType> = ChainModifiers extends Modifiers ? DistributiveEntry<LinkedEntry, Modifiers, Locales> | {
     sys: ResourceLink;
 } | undefined : 'WITHOUT_LINK_RESOLUTION' extends Modifiers ? {
     sys: ResourceLink;
-} : 'WITHOUT_UNRESOLVABLE_LINKS' extends Modifiers ? Entry<LinkedEntry, Modifiers, Locales> | undefined : Entry<LinkedEntry, Modifiers, Locales> | {
+} : 'WITHOUT_UNRESOLVABLE_LINKS' extends Modifiers ? DistributiveEntry<LinkedEntry, Modifiers, Locales> | undefined : DistributiveEntry<LinkedEntry, Modifiers, Locales> | {
     sys: ResourceLink;
 };
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "contentful",
   "description": "Client for Contentful's Content Delivery API",
-  "version": "11.12.4",
+  "version": "11.12.5",
   "homepage": "https://www.contentful.com/developers/documentation/content-delivery-api/",
   "type": "module",
   "exports": {