@se-studio/contentful-rest-api 1.5.4 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/dist/api/article-type.d.ts.map +1 -1
- package/dist/api/article-type.js +11 -13
- package/dist/api/article-type.js.map +1 -1
- package/dist/api/article.js +1 -1
- package/dist/api/article.js.map +1 -1
- package/dist/api/banner.js +2 -9
- package/dist/api/banner.js.map +1 -1
- package/dist/api/custom-type.js +1 -1
- package/dist/api/custom-type.js.map +1 -1
- package/dist/api/helpers.d.ts +5 -10
- package/dist/api/helpers.d.ts.map +1 -1
- package/dist/api/helpers.js +29 -29
- package/dist/api/helpers.js.map +1 -1
- package/dist/api/index.d.ts +5 -2
- package/dist/api/index.d.ts.map +1 -1
- package/dist/api/index.js +3 -2
- package/dist/api/index.js.map +1 -1
- package/dist/api/links.d.ts +8 -0
- package/dist/api/links.d.ts.map +1 -1
- package/dist/api/links.js +62 -7
- package/dist/api/links.js.map +1 -1
- package/dist/api/listing-fetch-params.d.ts +43 -0
- package/dist/api/listing-fetch-params.d.ts.map +1 -0
- package/dist/api/listing-fetch-params.js +107 -0
- package/dist/api/listing-fetch-params.js.map +1 -0
- package/dist/api/page.js +2 -2
- package/dist/api/page.js.map +1 -1
- package/dist/api/person.d.ts.map +1 -1
- package/dist/api/person.js +12 -13
- package/dist/api/person.js.map +1 -1
- package/dist/api/redirects.d.ts.map +1 -1
- package/dist/api/redirects.js +1 -0
- package/dist/api/redirects.js.map +1 -1
- package/dist/api/tag-type.d.ts.map +1 -1
- package/dist/api/tag-type.js +12 -13
- package/dist/api/tag-type.js.map +1 -1
- package/dist/api/tag.d.ts.map +1 -1
- package/dist/api/tag.js +12 -13
- package/dist/api/tag.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +6 -0
- package/dist/client.js.map +1 -1
- package/dist/converters/article.d.ts.map +1 -1
- package/dist/converters/article.js +73 -29
- package/dist/converters/article.js.map +1 -1
- package/dist/converters/customType.d.ts.map +1 -1
- package/dist/converters/customType.js +44 -19
- package/dist/converters/customType.js.map +1 -1
- package/dist/converters/helpers.d.ts +6 -0
- package/dist/converters/helpers.d.ts.map +1 -1
- package/dist/converters/helpers.js +10 -0
- package/dist/converters/helpers.js.map +1 -1
- package/dist/converters/page.d.ts.map +1 -1
- package/dist/converters/page.js +21 -2
- package/dist/converters/page.js.map +1 -1
- package/dist/converters/person.d.ts.map +1 -1
- package/dist/converters/person.js +18 -2
- package/dist/converters/person.js.map +1 -1
- package/dist/converters/tag.d.ts.map +1 -1
- package/dist/converters/tag.js +79 -51
- package/dist/converters/tag.js.map +1 -1
- package/dist/converters/tagType.d.ts.map +1 -1
- package/dist/converters/tagType.js +9 -2
- package/dist/converters/tagType.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +9 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +2 -2
package/dist/api/links.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { getContentfulClient } from '../client';
|
|
2
2
|
import { baseArticleLinkConverter, baseArticleTypeLinkConverter, } from '../converters/article';
|
|
3
|
+
import { baseCustomTypeLinkConverter } from '../converters/customType';
|
|
3
4
|
import { basePageLinkConverter, basePageVariantLinkConverter } from '../converters/page';
|
|
4
5
|
import { basePersonLinkConverter } from '../converters/person';
|
|
5
6
|
import { baseTagLinkConverter } from '../converters/tag';
|
|
7
|
+
import { baseTagTypeLinkConverter } from '../converters/tagType';
|
|
6
8
|
import { getCacheTags } from '../revalidation/utils';
|
|
7
9
|
import { withRetry } from '../utils';
|
|
8
|
-
import {
|
|
10
|
+
import { fetchAllLinks, getListingLinkFetchParams } from './helpers';
|
|
9
11
|
/**
|
|
10
12
|
* Fetches all page links from Contentful for static params generation.
|
|
11
13
|
* Includes lastModified metadata from sys.updatedAt for sitemap generation.
|
|
@@ -38,10 +40,13 @@ export async function contentfulAllPageLinks(context, config, options) {
|
|
|
38
40
|
tags: cacheTags,
|
|
39
41
|
},
|
|
40
42
|
};
|
|
43
|
+
const { select, include } = getListingLinkFetchParams('page');
|
|
44
|
+
const pageSize = options.pageSize ?? 100;
|
|
45
|
+
const listingOptions = { ...requestOptions, fetchProfile: 'listing' };
|
|
41
46
|
const fetchFn = async () => {
|
|
42
47
|
const [pageRes, variantRes] = await Promise.all([
|
|
43
|
-
fetchAllLinks('page', client,
|
|
44
|
-
fetchAllLinks('pageVariant', client,
|
|
48
|
+
fetchAllLinks('page', client, listingOptions, basePageLinkConverter, context, pageSize, select, include),
|
|
49
|
+
fetchAllLinks('pageVariant', client, listingOptions, basePageVariantLinkConverter, context, pageSize, select, include),
|
|
45
50
|
]);
|
|
46
51
|
const pageSlugs = new Set(pageRes.data.map((l) => l.slug));
|
|
47
52
|
const variantLinks = variantRes.data.filter((link) => !pageSlugs.has(link.slug));
|
|
@@ -87,7 +92,9 @@ export async function contentfulAllArticleLinks(context, config, options) {
|
|
|
87
92
|
tags: cacheTags,
|
|
88
93
|
},
|
|
89
94
|
};
|
|
90
|
-
const
|
|
95
|
+
const { select, include } = getListingLinkFetchParams('article');
|
|
96
|
+
const pageSize = options.pageSize ?? 100;
|
|
97
|
+
const fetchFn = () => fetchAllLinks('article', client, { ...requestOptions, fetchProfile: 'listing' }, baseArticleLinkConverter, context, pageSize, select, include);
|
|
91
98
|
// Apply retry logic if configured
|
|
92
99
|
if (options?.retry) {
|
|
93
100
|
return await withRetry(fetchFn, options.retry);
|
|
@@ -125,7 +132,9 @@ export async function contentfulAllTagLinks(context, config, options) {
|
|
|
125
132
|
tags: cacheTags,
|
|
126
133
|
},
|
|
127
134
|
};
|
|
128
|
-
const
|
|
135
|
+
const { select, include } = getListingLinkFetchParams('tag');
|
|
136
|
+
const pageSize = options.pageSize ?? 100;
|
|
137
|
+
const fetchFn = () => fetchAllLinks('tag', client, { ...requestOptions, fetchProfile: 'listing' }, baseTagLinkConverter, context, pageSize, select, include);
|
|
129
138
|
// Apply retry logic if configured
|
|
130
139
|
if (options?.retry) {
|
|
131
140
|
return await withRetry(fetchFn, options.retry);
|
|
@@ -163,7 +172,9 @@ export async function contentfulAllPersonLinks(context, config, options) {
|
|
|
163
172
|
tags: cacheTags,
|
|
164
173
|
},
|
|
165
174
|
};
|
|
166
|
-
const
|
|
175
|
+
const { select, include } = getListingLinkFetchParams('person');
|
|
176
|
+
const pageSize = options.pageSize ?? 100;
|
|
177
|
+
const fetchFn = () => fetchAllLinks('person', client, { ...requestOptions, fetchProfile: 'listing' }, basePersonLinkConverter, context, pageSize, select, include);
|
|
167
178
|
// Apply retry logic if configured
|
|
168
179
|
if (options?.retry) {
|
|
169
180
|
return await withRetry(fetchFn, options.retry);
|
|
@@ -201,11 +212,55 @@ export async function contentfulAllArticleTypeLinks(context, config, options) {
|
|
|
201
212
|
tags: cacheTags,
|
|
202
213
|
},
|
|
203
214
|
};
|
|
204
|
-
const
|
|
215
|
+
const { select, include } = getListingLinkFetchParams('articleType');
|
|
216
|
+
const pageSize = options.pageSize ?? 100;
|
|
217
|
+
const fetchFn = () => fetchAllLinks('articleType', client, { ...requestOptions, fetchProfile: 'listing' }, baseArticleTypeLinkConverter, context, pageSize, select, include);
|
|
205
218
|
// Apply retry logic if configured
|
|
206
219
|
if (options?.retry) {
|
|
207
220
|
return await withRetry(fetchFn, options.retry);
|
|
208
221
|
}
|
|
209
222
|
return await fetchFn();
|
|
210
223
|
}
|
|
224
|
+
/**
|
|
225
|
+
* Fetches all custom type links from Contentful for static params generation.
|
|
226
|
+
*/
|
|
227
|
+
export async function contentfulAllCustomTypeLinks(context, config, options) {
|
|
228
|
+
const client = getContentfulClient(config, options.preview);
|
|
229
|
+
const cacheTags = getCacheTags('customType', undefined, options?.preview);
|
|
230
|
+
const requestOptions = {
|
|
231
|
+
...options,
|
|
232
|
+
next: {
|
|
233
|
+
...options?.next,
|
|
234
|
+
tags: cacheTags,
|
|
235
|
+
},
|
|
236
|
+
};
|
|
237
|
+
const { select, include } = getListingLinkFetchParams('customType');
|
|
238
|
+
const pageSize = options.pageSize ?? 100;
|
|
239
|
+
const fetchFn = () => fetchAllLinks('customType', client, { ...requestOptions, fetchProfile: 'listing' }, baseCustomTypeLinkConverter, context, pageSize, select, include);
|
|
240
|
+
if (options?.retry) {
|
|
241
|
+
return await withRetry(fetchFn, options.retry);
|
|
242
|
+
}
|
|
243
|
+
return await fetchFn();
|
|
244
|
+
}
|
|
245
|
+
/**
|
|
246
|
+
* Fetches all tag type links from Contentful for static params generation.
|
|
247
|
+
*/
|
|
248
|
+
export async function contentfulAllTagTypeLinks(context, config, options) {
|
|
249
|
+
const client = getContentfulClient(config, options.preview);
|
|
250
|
+
const cacheTags = getCacheTags('tagType', undefined, options?.preview);
|
|
251
|
+
const requestOptions = {
|
|
252
|
+
...options,
|
|
253
|
+
next: {
|
|
254
|
+
...options?.next,
|
|
255
|
+
tags: cacheTags,
|
|
256
|
+
},
|
|
257
|
+
};
|
|
258
|
+
const { select, include } = getListingLinkFetchParams('tagType');
|
|
259
|
+
const pageSize = options.pageSize ?? 100;
|
|
260
|
+
const fetchFn = () => fetchAllLinks('tagType', client, { ...requestOptions, fetchProfile: 'listing' }, baseTagTypeLinkConverter, context, pageSize, select, include);
|
|
261
|
+
if (options?.retry) {
|
|
262
|
+
return await withRetry(fetchFn, options.retry);
|
|
263
|
+
}
|
|
264
|
+
return await fetchFn();
|
|
265
|
+
}
|
|
211
266
|
//# sourceMappingURL=links.js.map
|
package/dist/api/links.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"links.js","sourceRoot":"","sources":["../../src/api/links.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EACL,wBAAwB,EACxB,4BAA4B,GAE7B,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"links.js","sourceRoot":"","sources":["../../src/api/links.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { CmsFetchProfile } from '../types';
|
|
2
|
+
/** Contentful content types used for include-depth defaults and field selects. */
|
|
3
|
+
export type CmsContentType = 'page' | 'article' | 'articleType' | 'tag' | 'tagType' | 'person' | 'customType';
|
|
4
|
+
export interface ConverterResolutionScope {
|
|
5
|
+
resolveNavigation: boolean;
|
|
6
|
+
resolveContents: boolean;
|
|
7
|
+
}
|
|
8
|
+
export declare const PAGE_RESOLUTION_SCOPE: ConverterResolutionScope;
|
|
9
|
+
export declare const LISTING_RESOLUTION_SCOPE: ConverterResolutionScope;
|
|
10
|
+
export declare function getResolutionScope(profile?: CmsFetchProfile): ConverterResolutionScope;
|
|
11
|
+
/** Bundled customType parallel fetch uses a lower include when page profile (template inheritance). */
|
|
12
|
+
export declare const PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE = 5;
|
|
13
|
+
/**
|
|
14
|
+
* Resolve include depth: explicit options.include wins, then project override (caller), then profile default.
|
|
15
|
+
*/
|
|
16
|
+
export declare function getDefaultInclude(contentType: CmsContentType, profile?: CmsFetchProfile): number;
|
|
17
|
+
export declare function resolveIncludeDepth(contentType: CmsContentType, options: {
|
|
18
|
+
include?: number;
|
|
19
|
+
fetchProfile?: CmsFetchProfile;
|
|
20
|
+
}, projectOverride?: number): number;
|
|
21
|
+
export declare const PAGE_LINK_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags";
|
|
22
|
+
export declare const ARTICLE_LISTING_FIELDS = "sys,fields.cmsLabel,fields.title,fields.subtitle,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags,fields.articleType,fields.date,fields.author,fields.authors,fields.externalLink,fields.download,fields.visuals,fields.description,fields.summary";
|
|
23
|
+
/** @deprecated Full article link fields including body content trees. Bulk fetches use ARTICLE_LISTING_FIELDS. */
|
|
24
|
+
export declare const ARTICLE_LINK_FIELDS = "sys,fields.cmsLabel,fields.title,fields.subtitle,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags,fields.articleType,fields.date,fields.author,fields.authors,fields.externalLink,fields.download,fields.visuals,fields.description,fields.summary,fields.topContent,fields.content,fields.bottomContent";
|
|
25
|
+
export declare const ARTICLE_TYPE_LINK_FIELDS = "sys,fields.name,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
|
|
26
|
+
export declare const TAG_LINK_FIELDS = "sys,fields.cmsLabel,fields.name,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.show,fields.tagType";
|
|
27
|
+
export declare const PERSON_LINK_FIELDS = "sys,fields.name,fields.slug,fields.media,fields.bio,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
|
|
28
|
+
export declare const CUSTOM_TYPE_LINK_FIELDS = "sys,fields.name,fields.slug,fields.cmsLabel,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.indexPageTitle";
|
|
29
|
+
export declare const TAG_TYPE_LINK_FIELDS = "sys,fields.name,fields.slug,fields.breadcrumbTitle,fields.indexed,fields.hidden,fields.show";
|
|
30
|
+
/** Scalar fields for listing-profile single-entity fetches (metadata / composite routes). */
|
|
31
|
+
export declare const TAG_LISTING_FIELDS = "sys,fields.cmsLabel,fields.name,fields.slug,fields.title,fields.description,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.show,fields.tagType";
|
|
32
|
+
export declare const ARTICLE_TYPE_LISTING_FIELDS = "sys,fields.name,fields.slug,fields.indexPageTitle,fields.indexPageDescription,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
|
|
33
|
+
export declare const CUSTOM_TYPE_LISTING_FIELDS = "sys,fields.name,fields.slug,fields.cmsLabel,fields.indexPageTitle,fields.indexPageDescription,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
|
|
34
|
+
export declare const TAG_TYPE_LISTING_FIELDS = "sys,fields.name,fields.slug,fields.show,fields.indexed,fields.hidden";
|
|
35
|
+
export declare const PAGE_LISTING_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.description,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
|
|
36
|
+
export declare const ARTICLE_LISTING_SINGLE_FIELDS = "sys,fields.cmsLabel,fields.title,fields.subtitle,fields.slug,fields.description,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.articleType,fields.date";
|
|
37
|
+
export declare const PERSON_LISTING_FIELDS = "sys,fields.name,fields.slug,fields.description,fields.jobTitle,fields.media,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
|
|
38
|
+
export declare function getListingLinkFetchParams(contentType: CmsContentType): {
|
|
39
|
+
select: string;
|
|
40
|
+
include: number;
|
|
41
|
+
};
|
|
42
|
+
export declare function getSingleEntityListingSelect(contentType: CmsContentType): string | undefined;
|
|
43
|
+
//# sourceMappingURL=listing-fetch-params.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"listing-fetch-params.d.ts","sourceRoot":"","sources":["../../src/api/listing-fetch-params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,kFAAkF;AAClF,MAAM,MAAM,cAAc,GACtB,MAAM,GACN,SAAS,GACT,aAAa,GACb,KAAK,GACL,SAAS,GACT,QAAQ,GACR,YAAY,CAAC;AAEjB,MAAM,WAAW,wBAAwB;IACvC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,qBAAqB,EAAE,wBAGnC,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,wBAGtC,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,eAAwB,GAAG,wBAAwB,CAE9F;AAsBD,uGAAuG;AACvG,eAAO,MAAM,gCAAgC,IAAI,CAAC;AAElD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,cAAc,EAC3B,OAAO,GAAE,eAAwB,GAChC,MAAM,CAGR;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,cAAc,EAC3B,OAAO,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,eAAe,CAAA;CAAE,EAC7D,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAQR;AAED,eAAO,MAAM,gBAAgB,gLACkJ,CAAC;AAEhL,eAAO,MAAM,sBAAsB,iVAC6S,CAAC;AAEjV,kHAAkH;AAClH,eAAO,MAAM,mBAAmB,uYAAoF,CAAC;AAErH,eAAO,MAAM,wBAAwB,mJAC6G,CAAC;AAEnJ,eAAO,MAAM,eAAe,8LACiK,CAAC;AAE9L,eAAO,MAAM,kBAAkB,+HAC+F,CAAC;AAE/H,eAAO,MAAM,uBAAuB,yLACoJ,CAAC;AAEzL,eAAO,MAAM,oBAAoB,gGAC8D,CAAC;AAEhG,6FAA6F;AAC7F,eAAO,MAAM,kBAAkB,uMACuK,CAAC;AAEvM,eAAO,MAAM,2BAA2B,8KACqI,CAAC;AAE9K,eAAO,MAAM,0BAA0B,8LACsJ,CAAC;AAE9L,eAAO,MAAM,uBAAuB,yEACoC,CAAC;AAEzE,eAAO,MAAM,mBAAmB,gKAC+H,CAAC;AAEhK,eAAO,MAAM,6BAA6B,+MACoK,CAAC;AAE/M,eAAO,MAAM,qBAAqB,uJACoH,CAAC;AAEvJ,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,cAAc,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAqBA;AAED,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAmB5F"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
export const PAGE_RESOLUTION_SCOPE = {
|
|
2
|
+
resolveNavigation: true,
|
|
3
|
+
resolveContents: true,
|
|
4
|
+
};
|
|
5
|
+
export const LISTING_RESOLUTION_SCOPE = {
|
|
6
|
+
resolveNavigation: false,
|
|
7
|
+
resolveContents: false,
|
|
8
|
+
};
|
|
9
|
+
export function getResolutionScope(profile = 'page') {
|
|
10
|
+
return profile === 'listing' ? LISTING_RESOLUTION_SCOPE : PAGE_RESOLUTION_SCOPE;
|
|
11
|
+
}
|
|
12
|
+
const PAGE_DEFAULT_INCLUDES = {
|
|
13
|
+
page: 7,
|
|
14
|
+
article: 8,
|
|
15
|
+
articleType: 7,
|
|
16
|
+
tag: 3,
|
|
17
|
+
tagType: 5,
|
|
18
|
+
person: 6,
|
|
19
|
+
customType: 6,
|
|
20
|
+
};
|
|
21
|
+
const LISTING_DEFAULT_INCLUDES = {
|
|
22
|
+
page: 1,
|
|
23
|
+
article: 2,
|
|
24
|
+
articleType: 1,
|
|
25
|
+
tag: 2,
|
|
26
|
+
tagType: 1,
|
|
27
|
+
person: 2,
|
|
28
|
+
customType: 1,
|
|
29
|
+
};
|
|
30
|
+
/** Bundled customType parallel fetch uses a lower include when page profile (template inheritance). */
|
|
31
|
+
export const PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE = 5;
|
|
32
|
+
/**
|
|
33
|
+
* Resolve include depth: explicit options.include wins, then project override (caller), then profile default.
|
|
34
|
+
*/
|
|
35
|
+
export function getDefaultInclude(contentType, profile = 'page') {
|
|
36
|
+
const table = profile === 'listing' ? LISTING_DEFAULT_INCLUDES : PAGE_DEFAULT_INCLUDES;
|
|
37
|
+
return table[contentType];
|
|
38
|
+
}
|
|
39
|
+
export function resolveIncludeDepth(contentType, options, projectOverride) {
|
|
40
|
+
if (options.include !== undefined) {
|
|
41
|
+
return options.include;
|
|
42
|
+
}
|
|
43
|
+
if (projectOverride !== undefined) {
|
|
44
|
+
return projectOverride;
|
|
45
|
+
}
|
|
46
|
+
return getDefaultInclude(contentType, options.fetchProfile ?? 'page');
|
|
47
|
+
}
|
|
48
|
+
export const PAGE_LINK_FIELDS = 'sys,fields.cmsLabel,fields.title,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags';
|
|
49
|
+
export const ARTICLE_LISTING_FIELDS = 'sys,fields.cmsLabel,fields.title,fields.subtitle,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags,fields.articleType,fields.date,fields.author,fields.authors,fields.externalLink,fields.download,fields.visuals,fields.description,fields.summary';
|
|
50
|
+
/** @deprecated Full article link fields including body content trees. Bulk fetches use ARTICLE_LISTING_FIELDS. */
|
|
51
|
+
export const ARTICLE_LINK_FIELDS = `${ARTICLE_LISTING_FIELDS},fields.topContent,fields.content,fields.bottomContent`;
|
|
52
|
+
export const ARTICLE_TYPE_LINK_FIELDS = 'sys,fields.name,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden';
|
|
53
|
+
export const TAG_LINK_FIELDS = 'sys,fields.cmsLabel,fields.name,fields.slug,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.show,fields.tagType';
|
|
54
|
+
export const PERSON_LINK_FIELDS = 'sys,fields.name,fields.slug,fields.media,fields.bio,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden';
|
|
55
|
+
export const CUSTOM_TYPE_LINK_FIELDS = 'sys,fields.name,fields.slug,fields.cmsLabel,fields.breadcrumbTitle,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.indexPageTitle';
|
|
56
|
+
export const TAG_TYPE_LINK_FIELDS = 'sys,fields.name,fields.slug,fields.breadcrumbTitle,fields.indexed,fields.hidden,fields.show';
|
|
57
|
+
/** Scalar fields for listing-profile single-entity fetches (metadata / composite routes). */
|
|
58
|
+
export const TAG_LISTING_FIELDS = 'sys,fields.cmsLabel,fields.name,fields.slug,fields.title,fields.description,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.show,fields.tagType';
|
|
59
|
+
export const ARTICLE_TYPE_LISTING_FIELDS = 'sys,fields.name,fields.slug,fields.indexPageTitle,fields.indexPageDescription,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden';
|
|
60
|
+
export const CUSTOM_TYPE_LISTING_FIELDS = 'sys,fields.name,fields.slug,fields.cmsLabel,fields.indexPageTitle,fields.indexPageDescription,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden';
|
|
61
|
+
export const TAG_TYPE_LISTING_FIELDS = 'sys,fields.name,fields.slug,fields.show,fields.indexed,fields.hidden';
|
|
62
|
+
export const PAGE_LISTING_FIELDS = 'sys,fields.cmsLabel,fields.title,fields.slug,fields.description,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden';
|
|
63
|
+
export const ARTICLE_LISTING_SINGLE_FIELDS = 'sys,fields.cmsLabel,fields.title,fields.subtitle,fields.slug,fields.description,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.articleType,fields.date';
|
|
64
|
+
export const PERSON_LISTING_FIELDS = 'sys,fields.name,fields.slug,fields.description,fields.jobTitle,fields.media,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden';
|
|
65
|
+
export function getListingLinkFetchParams(contentType) {
|
|
66
|
+
switch (contentType) {
|
|
67
|
+
case 'page':
|
|
68
|
+
return { select: PAGE_LINK_FIELDS, include: LISTING_DEFAULT_INCLUDES.page };
|
|
69
|
+
case 'article':
|
|
70
|
+
return { select: ARTICLE_LISTING_FIELDS, include: LISTING_DEFAULT_INCLUDES.article };
|
|
71
|
+
case 'articleType':
|
|
72
|
+
return { select: ARTICLE_TYPE_LINK_FIELDS, include: LISTING_DEFAULT_INCLUDES.articleType };
|
|
73
|
+
case 'tag':
|
|
74
|
+
return { select: TAG_LINK_FIELDS, include: LISTING_DEFAULT_INCLUDES.tag };
|
|
75
|
+
case 'person':
|
|
76
|
+
return { select: PERSON_LINK_FIELDS, include: LISTING_DEFAULT_INCLUDES.person };
|
|
77
|
+
case 'customType':
|
|
78
|
+
return { select: CUSTOM_TYPE_LINK_FIELDS, include: LISTING_DEFAULT_INCLUDES.customType };
|
|
79
|
+
case 'tagType':
|
|
80
|
+
return { select: TAG_TYPE_LINK_FIELDS, include: LISTING_DEFAULT_INCLUDES.tagType };
|
|
81
|
+
default: {
|
|
82
|
+
const _exhaustive = contentType;
|
|
83
|
+
return _exhaustive;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
export function getSingleEntityListingSelect(contentType) {
|
|
88
|
+
switch (contentType) {
|
|
89
|
+
case 'tag':
|
|
90
|
+
return TAG_LISTING_FIELDS;
|
|
91
|
+
case 'articleType':
|
|
92
|
+
return ARTICLE_TYPE_LISTING_FIELDS;
|
|
93
|
+
case 'customType':
|
|
94
|
+
return CUSTOM_TYPE_LISTING_FIELDS;
|
|
95
|
+
case 'tagType':
|
|
96
|
+
return TAG_TYPE_LISTING_FIELDS;
|
|
97
|
+
case 'page':
|
|
98
|
+
return PAGE_LISTING_FIELDS;
|
|
99
|
+
case 'article':
|
|
100
|
+
return ARTICLE_LISTING_SINGLE_FIELDS;
|
|
101
|
+
case 'person':
|
|
102
|
+
return PERSON_LISTING_FIELDS;
|
|
103
|
+
default:
|
|
104
|
+
return undefined;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=listing-fetch-params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"listing-fetch-params.js","sourceRoot":"","sources":["../../src/api/listing-fetch-params.ts"],"names":[],"mappings":"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"}
|
package/dist/api/page.js
CHANGED
|
@@ -18,7 +18,7 @@ export async function contentfulPageRest(context, config, slug, options) {
|
|
|
18
18
|
query: { 'fields.slug': slug },
|
|
19
19
|
resolver: (ctx, entry) => ctx.pageResolver(ctx, entry),
|
|
20
20
|
errorLogContext: { slug },
|
|
21
|
-
},
|
|
21
|
+
}, options);
|
|
22
22
|
if (pageResponse.data) {
|
|
23
23
|
return pageResponse;
|
|
24
24
|
}
|
|
@@ -29,7 +29,7 @@ export async function contentfulPageRest(context, config, slug, options) {
|
|
|
29
29
|
query: { 'fields.slug': slug },
|
|
30
30
|
resolver: (ctx, entry) => buildMergedPageFromVariantEntry(ctx, entry),
|
|
31
31
|
errorLogContext: { slug, contentType: 'pageVariant' },
|
|
32
|
-
}, { include: 8
|
|
32
|
+
}, { ...options, include: options.include ?? 8 });
|
|
33
33
|
return {
|
|
34
34
|
data: variantResponse.data,
|
|
35
35
|
errors: [...pageResponse.errors, ...variantResponse.errors],
|
package/dist/api/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/api/page.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAA6B,EAC7B,MAAwB,EACxB,IAAY,EACZ,OAAqB;IAErB,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAC1C,OAAO,EACP,MAAM,EACN;QACE,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;QAC9B,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC;QACtD,eAAe,EAAE,EAAE,IAAI,EAAE;KAC1B,EACD,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/api/page.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAA6B,EAC7B,MAAwB,EACxB,IAAY,EACZ,OAAqB;IAErB,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAC1C,OAAO,EACP,MAAM,EACN;QACE,WAAW,EAAE,MAAM;QACnB,YAAY,EAAE,MAAM;QACpB,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;QAC9B,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC;QACtD,eAAe,EAAE,EAAE,IAAI,EAAE;KAC1B,EACD,OAAO,CACR,CAAC;IAEF,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC;QACtB,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAC7C,OAAO,EACP,MAAM,EACN;QACE,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE,aAAa;QAC3B,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE;QAC9B,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,+BAA+B,CAAC,GAAG,EAAE,KAAK,CAAC;QACrE,eAAe,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE;KACtD,EACD,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,CAAC,EAAE,CAC9C,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,MAAM,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,CAAC;KAC5D,CAAC;AACJ,CAAC"}
|
package/dist/api/person.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"person.d.ts","sourceRoot":"","sources":["../../src/api/person.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"person.d.ts","sourceRoot":"","sources":["../../src/api/person.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAatF,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,WAAW,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC,CA2IhD"}
|
package/dist/api/person.js
CHANGED
|
@@ -3,7 +3,8 @@ import { enrichAllAssets } from '../converters/enrichAssets';
|
|
|
3
3
|
import { processIconsForSprite } from '../converters/iconCollector';
|
|
4
4
|
import { getCacheTags } from '../revalidation/utils';
|
|
5
5
|
import { withRetry } from '../utils';
|
|
6
|
-
import { convertAllAssets, convertAllIncludes, convertAllRawAssets } from './helpers';
|
|
6
|
+
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers';
|
|
7
|
+
import { getSingleEntityListingSelect } from './listing-fetch-params';
|
|
7
8
|
/**
|
|
8
9
|
* Fetches a person from Contentful by slug
|
|
9
10
|
*
|
|
@@ -48,18 +49,23 @@ export async function contentfulPersonRest(context, config, slug, options) {
|
|
|
48
49
|
},
|
|
49
50
|
};
|
|
50
51
|
const fetchFn = async () => {
|
|
52
|
+
const fetchProfile = options.fetchProfile ?? 'page';
|
|
53
|
+
const bundleCustomType = fetchProfile === 'page' && !!options?.customType;
|
|
54
|
+
const personInclude = resolveIncludeDepth('person', options);
|
|
55
|
+
const listingSelect = fetchProfile === 'listing' ? getSingleEntityListingSelect('person') : undefined;
|
|
51
56
|
const personPromise = client.getEntries({
|
|
52
57
|
content_type: 'person',
|
|
53
58
|
'fields.slug': slug,
|
|
54
|
-
include:
|
|
59
|
+
include: personInclude,
|
|
55
60
|
locale: options?.locale,
|
|
56
61
|
limit: 1,
|
|
62
|
+
...(listingSelect && { select: listingSelect }),
|
|
57
63
|
}, requestOptions);
|
|
58
|
-
const customTypePromise =
|
|
64
|
+
const customTypePromise = bundleCustomType
|
|
59
65
|
? client.getEntries({
|
|
60
66
|
content_type: 'customType',
|
|
61
67
|
'fields.slug': options.customType,
|
|
62
|
-
include: options
|
|
68
|
+
include: options.include ?? PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE,
|
|
63
69
|
locale: options?.locale,
|
|
64
70
|
limit: 1,
|
|
65
71
|
}, requestOptions)
|
|
@@ -89,15 +95,8 @@ export async function contentfulPersonRest(context, config, slug, options) {
|
|
|
89
95
|
includes.set(key, value);
|
|
90
96
|
}
|
|
91
97
|
const externalVideoEmbeds = await enrichAllAssets(assets, includes, options);
|
|
92
|
-
const fullContext =
|
|
93
|
-
|
|
94
|
-
includes,
|
|
95
|
-
assets,
|
|
96
|
-
rawAssets,
|
|
97
|
-
errors: [],
|
|
98
|
-
externalVideoEmbeds,
|
|
99
|
-
};
|
|
100
|
-
const converted = context.personResolver(fullContext, personEntry, customTypeEntry);
|
|
98
|
+
const fullContext = createFullConverterContext(context, includes, assets, rawAssets, externalVideoEmbeds, options);
|
|
99
|
+
const converted = context.personResolver(fullContext, personEntry, bundleCustomType ? customTypeEntry : undefined);
|
|
101
100
|
// Process icons if the result has an icons field (e.g., IBasePage)
|
|
102
101
|
if (converted?.icons && converted.icons.length > 0) {
|
|
103
102
|
const processedIcons = await processIconsForSprite(converted.icons);
|
package/dist/api/person.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"person.js","sourceRoot":"","sources":["../../src/api/person.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"person.js","sourceRoot":"","sources":["../../src/api/person.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirects.d.ts","sourceRoot":"","sources":["../../src/api/redirects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAWtF,OAAO,EAAE,gBAAgB,EAAE,KAAK,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEjG;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"redirects.d.ts","sourceRoot":"","sources":["../../src/api/redirects.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAWtF,OAAO,EAAE,gBAAgB,EAAE,KAAK,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEjG;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAsG1C"}
|
package/dist/api/redirects.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirects.js","sourceRoot":"","sources":["../../src/api/redirects.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"redirects.js","sourceRoot":"","sources":["../../src/api/redirects.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAEL,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,WAAW,CAAC;AAEnB,uFAAuF;AACvF,8FAA8F;AAC9F,OAAO,EAAE,gBAAgB,EAA2C,MAAM,sBAAsB,CAAC;AAEjG;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,OAA6B,EAC7B,MAAwB,EACxB,OAAqB;IAErB,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,MAAM,iBAAiB,GAAG,YAAY,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE/E,MAAM,cAAc,GAAG;QACrB,GAAG,OAAO;QACV,IAAI,EAAE;YACJ,GAAG,OAAO,EAAE,IAAI;YAChB,IAAI,EAAE,iBAAiB;SACxB;KACF,CAAC;IAEF,MAAM,YAAY,GAAgB,EAAE,CAAC;IACrC,MAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC;IACrB,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,OAAO,GAAG,IAAI,CAAC;IAEnB,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,OAAO,OAAO,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,UAAU,CAC9C;oBACE,YAAY,EAAE,UAAU;oBACxB,OAAO,EAAE,CAAC,EAAE,6DAA6D;oBACzE,MAAM,EAAE,OAAO,EAAE,MAAM;oBACvB,KAAK,EAAE,QAAQ;oBACf,IAAI;iBACL,EACD,cAAc,CACf,CAAC;gBAEF,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBACnC,OAAO,GAAG,KAAK,CAAC;oBAChB,MAAM;gBACR,CAAC;gBAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;gBACtD,MAAM,MAAM,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;gBAC3D,MAAM,SAAS,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;gBACxD,MAAM,WAAW,GAAqB;oBACpC,GAAG,OAAO;oBACV,QAAQ;oBACR,MAAM;oBACN,SAAS;oBACT,MAAM,EAAE,EAAE;oBACV,mBAAmB,EAAE,IAAI,GAAG,EAAE;iBAC/B,CAAC;gBAEF,KAAK,MAAM,aAAa,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;oBACnD,IAAI,CAAC,aAAa,CAAC,MAAM;wBAAE,SAAS;oBACpC,IAAI,CAAC;wBACH,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;wBACvE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC/B,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;wBACrC,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC;wBACzD,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC;wBACtE,MAAM,CAAC,IAAI,CAAC;4BACV,OAAO;4BACP,SAAS;4BACT,OAAO,EAAE,YAAY;4BACrB,KAAK;yBACN,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBAED,IACE,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;oBAC7B,OAAO,OAAO,KAAK,WAAW;oBAC9B,OAAO,CAAC,GAAG,EAAE,QAAQ,KAAK,YAAY,EACtC,CAAC;oBACD,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAE;wBACnD,MAAM,EAAE,WAAW,CAAC,MAAM;qBAC3B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,SAAS,CAAC;gBAC1B,MAAM,SAAS,GAAG,UAAU,CAAC;gBAC7B,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC;gBAEzF,MAAM,QAAQ,GAAa;oBACzB,OAAO;oBACP,SAAS;oBACT,OAAO,EAAE,YAAY;oBACrB,KAAK;iBACN,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACtB,OAAO,GAAG,KAAK,CAAC;YAClB,CAAC;YACD,IAAI,IAAI,QAAQ,CAAC;QACnB,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;IACxC,CAAC,CAAC;IAEF,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,MAAM,OAAO,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag-type.d.ts","sourceRoot":"","sources":["../../src/api/tag-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,KAAK,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"tag-type.d.ts","sourceRoot":"","sources":["../../src/api/tag-type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAatF,MAAM,WAAW,mBAAoB,SAAQ,YAAY;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,WAAW,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,CAkI3C"}
|
package/dist/api/tag-type.js
CHANGED
|
@@ -2,7 +2,8 @@ import { getContentfulClient } from '../client';
|
|
|
2
2
|
import { enrichAllAssets } from '../converters/enrichAssets';
|
|
3
3
|
import { getCacheTags } from '../revalidation/utils';
|
|
4
4
|
import { withRetry } from '../utils';
|
|
5
|
-
import { convertAllAssets, convertAllIncludes, convertAllRawAssets } from './helpers';
|
|
5
|
+
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers';
|
|
6
|
+
import { getSingleEntityListingSelect } from './listing-fetch-params';
|
|
6
7
|
/**
|
|
7
8
|
* Fetches a tag type from Contentful by slug
|
|
8
9
|
*
|
|
@@ -41,18 +42,23 @@ export async function contentfulTagTypeRest(context, config, slug, options) {
|
|
|
41
42
|
},
|
|
42
43
|
};
|
|
43
44
|
const fetchFn = async () => {
|
|
45
|
+
const fetchProfile = options.fetchProfile ?? 'page';
|
|
46
|
+
const bundleCustomType = fetchProfile === 'page' && !!options?.customType;
|
|
47
|
+
const tagTypeInclude = resolveIncludeDepth('tagType', options);
|
|
48
|
+
const listingSelect = fetchProfile === 'listing' ? getSingleEntityListingSelect('tagType') : undefined;
|
|
44
49
|
const tagTypePromise = client.getEntries({
|
|
45
50
|
content_type: 'tagType',
|
|
46
51
|
'fields.slug': slug,
|
|
47
|
-
include:
|
|
52
|
+
include: tagTypeInclude,
|
|
48
53
|
locale: options?.locale,
|
|
49
54
|
limit: 1,
|
|
55
|
+
...(listingSelect && { select: listingSelect }),
|
|
50
56
|
}, requestOptions);
|
|
51
|
-
const customTypePromise =
|
|
57
|
+
const customTypePromise = bundleCustomType
|
|
52
58
|
? client.getEntries({
|
|
53
59
|
content_type: 'customType',
|
|
54
60
|
'fields.slug': options.customType,
|
|
55
|
-
include: options
|
|
61
|
+
include: options.include ?? PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE,
|
|
56
62
|
locale: options?.locale,
|
|
57
63
|
limit: 1,
|
|
58
64
|
}, requestOptions)
|
|
@@ -82,15 +88,8 @@ export async function contentfulTagTypeRest(context, config, slug, options) {
|
|
|
82
88
|
includes.set(key, value);
|
|
83
89
|
}
|
|
84
90
|
const externalVideoEmbeds = await enrichAllAssets(assets, includes, options);
|
|
85
|
-
const fullContext =
|
|
86
|
-
|
|
87
|
-
includes,
|
|
88
|
-
assets,
|
|
89
|
-
rawAssets,
|
|
90
|
-
errors: [],
|
|
91
|
-
externalVideoEmbeds,
|
|
92
|
-
};
|
|
93
|
-
const converted = context.tagTypeResolver(fullContext, tagTypeEntry, customTypeEntry);
|
|
91
|
+
const fullContext = createFullConverterContext(context, includes, assets, rawAssets, externalVideoEmbeds, options);
|
|
92
|
+
const converted = context.tagTypeResolver(fullContext, tagTypeEntry, bundleCustomType ? customTypeEntry : undefined);
|
|
94
93
|
if (fullContext.errors.length > 0 &&
|
|
95
94
|
typeof process !== 'undefined' &&
|
|
96
95
|
process.env?.NODE_ENV === 'production') {
|
package/dist/api/tag-type.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag-type.js","sourceRoot":"","sources":["../../src/api/tag-type.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"tag-type.js","sourceRoot":"","sources":["../../src/api/tag-type.ts"],"names":[],"mappings":"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"}
|
package/dist/api/tag.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../src/api/tag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAM3D,OAAO,KAAK,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../src/api/tag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAM3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAGlE,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAatF,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAwIvC"}
|
package/dist/api/tag.js
CHANGED
|
@@ -3,7 +3,8 @@ import { enrichAllAssets } from '../converters/enrichAssets';
|
|
|
3
3
|
import { processIconsForSprite } from '../converters/iconCollector';
|
|
4
4
|
import { getCacheTags } from '../revalidation/utils';
|
|
5
5
|
import { withRetry } from '../utils';
|
|
6
|
-
import { convertAllAssets, convertAllIncludes, convertAllRawAssets } from './helpers';
|
|
6
|
+
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers';
|
|
7
|
+
import { getSingleEntityListingSelect } from './listing-fetch-params';
|
|
7
8
|
/**
|
|
8
9
|
* Fetches a tag from Contentful by slug
|
|
9
10
|
*
|
|
@@ -48,18 +49,23 @@ export async function contentfulTagRest(context, config, slug, options) {
|
|
|
48
49
|
},
|
|
49
50
|
};
|
|
50
51
|
const fetchFn = async () => {
|
|
52
|
+
const fetchProfile = options.fetchProfile ?? 'page';
|
|
53
|
+
const bundleCustomType = fetchProfile === 'page' && !!options?.customType;
|
|
54
|
+
const tagInclude = resolveIncludeDepth('tag', options);
|
|
55
|
+
const listingSelect = fetchProfile === 'listing' ? getSingleEntityListingSelect('tag') : undefined;
|
|
51
56
|
const tagPromise = client.getEntries({
|
|
52
57
|
content_type: 'tag',
|
|
53
58
|
'fields.slug': slug,
|
|
54
|
-
include:
|
|
59
|
+
include: tagInclude,
|
|
55
60
|
locale: options?.locale,
|
|
56
61
|
limit: 1,
|
|
62
|
+
...(listingSelect && { select: listingSelect }),
|
|
57
63
|
}, requestOptions);
|
|
58
|
-
const customTypePromise =
|
|
64
|
+
const customTypePromise = bundleCustomType
|
|
59
65
|
? client.getEntries({
|
|
60
66
|
content_type: 'customType',
|
|
61
67
|
'fields.slug': options.customType,
|
|
62
|
-
include: options
|
|
68
|
+
include: options.include ?? PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE,
|
|
63
69
|
locale: options?.locale,
|
|
64
70
|
limit: 1,
|
|
65
71
|
}, requestOptions)
|
|
@@ -86,15 +92,8 @@ export async function contentfulTagRest(context, config, slug, options) {
|
|
|
86
92
|
includes.set(key, value);
|
|
87
93
|
}
|
|
88
94
|
const externalVideoEmbeds = await enrichAllAssets(assets, includes, options);
|
|
89
|
-
const fullContext =
|
|
90
|
-
|
|
91
|
-
includes,
|
|
92
|
-
assets,
|
|
93
|
-
rawAssets,
|
|
94
|
-
errors: [],
|
|
95
|
-
externalVideoEmbeds,
|
|
96
|
-
};
|
|
97
|
-
const converted = context.tagResolver(fullContext, tagEntry, customTypeEntry);
|
|
95
|
+
const fullContext = createFullConverterContext(context, includes, assets, rawAssets, externalVideoEmbeds, options);
|
|
96
|
+
const converted = context.tagResolver(fullContext, tagEntry, bundleCustomType ? customTypeEntry : undefined);
|
|
98
97
|
// Process icons if the result has an icons field
|
|
99
98
|
if (converted?.icons && converted.icons.length > 0) {
|
|
100
99
|
const processedIcons = await processIconsForSprite(converted.icons);
|