@se-studio/contentful-rest-api 1.12.0 → 1.13.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 +16 -0
- package/README.md +17 -0
- package/dist/api/article-type.d.ts.map +1 -1
- package/dist/api/article-type.js +6 -5
- package/dist/api/article-type.js.map +1 -1
- package/dist/api/banner.d.ts.map +1 -1
- package/dist/api/banner.js +5 -2
- package/dist/api/banner.js.map +1 -1
- package/dist/api/breadcrumb.d.ts.map +1 -1
- package/dist/api/breadcrumb.js +7 -21
- package/dist/api/breadcrumb.js.map +1 -1
- package/dist/api/helpers.d.ts +2 -0
- package/dist/api/helpers.d.ts.map +1 -1
- package/dist/api/helpers.js +13 -4
- package/dist/api/helpers.js.map +1 -1
- package/dist/api/index.d.ts +1 -1
- package/dist/api/index.d.ts.map +1 -1
- package/dist/api/index.js +1 -1
- package/dist/api/index.js.map +1 -1
- package/dist/api/links.d.ts.map +1 -1
- package/dist/api/links.js +87 -66
- package/dist/api/links.js.map +1 -1
- package/dist/api/navigation.d.ts +1 -0
- package/dist/api/navigation.d.ts.map +1 -1
- package/dist/api/navigation.js +1 -0
- package/dist/api/navigation.js.map +1 -1
- package/dist/api/page.d.ts.map +1 -1
- package/dist/api/page.js +1 -0
- package/dist/api/page.js.map +1 -1
- package/dist/api/person.d.ts.map +1 -1
- package/dist/api/person.js +6 -5
- package/dist/api/person.js.map +1 -1
- package/dist/api/redirects.d.ts.map +1 -1
- package/dist/api/redirects.js +5 -2
- package/dist/api/redirects.js.map +1 -1
- package/dist/api/tag-type.d.ts.map +1 -1
- package/dist/api/tag-type.js +6 -5
- package/dist/api/tag-type.js.map +1 -1
- package/dist/api/tag.d.ts.map +1 -1
- package/dist/api/tag.js +6 -5
- package/dist/api/tag.js.map +1 -1
- package/dist/api/types.d.ts +2 -0
- package/dist/api/types.d.ts.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +12 -2
- package/dist/client.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/navigation/cacheOptions.d.ts +2 -0
- package/dist/navigation/cacheOptions.d.ts.map +1 -1
- package/dist/navigation/cacheOptions.js +7 -0
- package/dist/navigation/cacheOptions.js.map +1 -1
- package/dist/navigation/enrichModelNavigation.d.ts.map +1 -1
- package/dist/navigation/enrichModelNavigation.js +10 -4
- package/dist/navigation/enrichModelNavigation.js.map +1 -1
- package/dist/navigation/linkIndex.d.ts +1 -0
- package/dist/navigation/linkIndex.d.ts.map +1 -1
- package/dist/navigation/linkIndex.js +22 -78
- package/dist/navigation/linkIndex.js.map +1 -1
- package/dist/navigation/listingLinkBundle.d.ts +22 -0
- package/dist/navigation/listingLinkBundle.d.ts.map +1 -0
- package/dist/navigation/listingLinkBundle.js +88 -0
- package/dist/navigation/listingLinkBundle.js.map +1 -0
- package/dist/navigation/registry.d.ts +1 -0
- package/dist/navigation/registry.d.ts.map +1 -1
- package/dist/navigation/registry.js +23 -6
- package/dist/navigation/registry.js.map +1 -1
- package/dist/navigation/requestCache.d.ts +18 -0
- package/dist/navigation/requestCache.d.ts.map +1 -0
- package/dist/navigation/requestCache.js +66 -0
- package/dist/navigation/requestCache.js.map +1 -0
- package/dist/revalidation/entry-handlers.d.ts +39 -0
- package/dist/revalidation/entry-handlers.d.ts.map +1 -0
- package/dist/revalidation/entry-handlers.js +103 -0
- package/dist/revalidation/entry-handlers.js.map +1 -0
- package/dist/revalidation/handlers.d.ts +4 -37
- package/dist/revalidation/handlers.d.ts.map +1 -1
- package/dist/revalidation/handlers.js +2 -100
- package/dist/revalidation/handlers.js.map +1 -1
- package/dist/telemetry/deriveOperation.d.ts +8 -0
- package/dist/telemetry/deriveOperation.d.ts.map +1 -0
- package/dist/telemetry/deriveOperation.js +59 -0
- package/dist/telemetry/deriveOperation.js.map +1 -0
- package/dist/telemetry/queryContext.d.ts +7 -0
- package/dist/telemetry/queryContext.d.ts.map +1 -0
- package/dist/telemetry/queryContext.js +9 -0
- package/dist/telemetry/queryContext.js.map +1 -0
- package/dist/telemetry/queryLog.d.ts +17 -0
- package/dist/telemetry/queryLog.d.ts.map +1 -0
- package/dist/telemetry/queryLog.js +54 -0
- package/dist/telemetry/queryLog.js.map +1 -0
- package/docs/llms.md +24 -0
- package/package.json +3 -2
package/dist/api/links.js
CHANGED
|
@@ -5,6 +5,8 @@ import { basePageLinkConverter, basePageVariantLinkConverter } from '../converte
|
|
|
5
5
|
import { basePersonLinkConverter } from '../converters/person.js';
|
|
6
6
|
import { baseTagLinkConverter } from '../converters/tag.js';
|
|
7
7
|
import { baseTagTypeLinkConverter } from '../converters/tagType.js';
|
|
8
|
+
import { buildListingLinkCacheOptions } from '../navigation/cacheOptions.js';
|
|
9
|
+
import { withListingLinkRequestMemo } from '../navigation/requestCache.js';
|
|
8
10
|
import { getCacheTags } from '../revalidation/utils.js';
|
|
9
11
|
import { withRetry } from '../utils/index.js';
|
|
10
12
|
import { ARTICLE_LINK_FIELDS, fetchAllLinks, getListingLinkFetchParams, mergeFetchCacheTags, } from './helpers.js';
|
|
@@ -38,17 +40,21 @@ function isContentfulMissingFieldError(error, fieldId) {
|
|
|
38
40
|
* ```
|
|
39
41
|
*/
|
|
40
42
|
export async function contentfulAllPageLinks(context, config, options) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
return withListingLinkRequestMemo('page', config, options, () => fetchAllPageLinksUncached(context, config, options));
|
|
44
|
+
}
|
|
45
|
+
async function fetchAllPageLinksUncached(context, config, options) {
|
|
46
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
47
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
48
|
+
const pageTags = getCacheTags('page', undefined, cacheOptions?.preview);
|
|
49
|
+
const variantTags = getCacheTags('pageVariant', undefined, cacheOptions?.preview);
|
|
44
50
|
const cacheTags = [...new Set([...pageTags, ...variantTags])];
|
|
45
51
|
const requestOptions = {
|
|
46
|
-
...
|
|
47
|
-
next: mergeFetchCacheTags(
|
|
52
|
+
...cacheOptions,
|
|
53
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
48
54
|
};
|
|
49
55
|
const { select, include } = getListingLinkFetchParams('page');
|
|
50
|
-
const pageSize =
|
|
51
|
-
const listingOptions =
|
|
56
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
57
|
+
const listingOptions = requestOptions;
|
|
52
58
|
const fetchFn = async () => {
|
|
53
59
|
const [pageRes, variantRes] = await Promise.all([
|
|
54
60
|
fetchAllLinks('page', client, listingOptions, basePageLinkConverter, context, pageSize, select, include),
|
|
@@ -61,9 +67,8 @@ export async function contentfulAllPageLinks(context, config, options) {
|
|
|
61
67
|
errors: [...pageRes.errors, ...variantRes.errors],
|
|
62
68
|
};
|
|
63
69
|
};
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return await withRetry(fetchFn, options.retry);
|
|
70
|
+
if (cacheOptions?.retry) {
|
|
71
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
67
72
|
}
|
|
68
73
|
return await fetchFn();
|
|
69
74
|
}
|
|
@@ -88,19 +93,21 @@ export async function contentfulAllPageLinks(context, config, options) {
|
|
|
88
93
|
* ```
|
|
89
94
|
*/
|
|
90
95
|
export async function contentfulAllArticleLinks(context, config, options) {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
96
|
+
return withListingLinkRequestMemo('article', config, options, () => fetchAllArticleLinksUncached(context, config, options));
|
|
97
|
+
}
|
|
98
|
+
async function fetchAllArticleLinksUncached(context, config, options) {
|
|
99
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
100
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
101
|
+
const cacheTags = getCacheTags('article', undefined, cacheOptions?.preview);
|
|
94
102
|
const requestOptions = {
|
|
95
|
-
...
|
|
96
|
-
next: mergeFetchCacheTags(
|
|
103
|
+
...cacheOptions,
|
|
104
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
97
105
|
};
|
|
98
106
|
const { select, include } = getListingLinkFetchParams('article');
|
|
99
|
-
const pageSize =
|
|
100
|
-
const fetchFn = () => fetchAllLinks('article', client,
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
return await withRetry(fetchFn, options.retry);
|
|
107
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
108
|
+
const fetchFn = () => fetchAllLinks('article', client, requestOptions, baseArticleLinkConverter, context, pageSize, select, include);
|
|
109
|
+
if (cacheOptions?.retry) {
|
|
110
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
104
111
|
}
|
|
105
112
|
return await fetchFn();
|
|
106
113
|
}
|
|
@@ -146,19 +153,21 @@ export async function contentfulAllArticleLinksForIntegrity(context, config, opt
|
|
|
146
153
|
* ```
|
|
147
154
|
*/
|
|
148
155
|
export async function contentfulAllTagLinks(context, config, options) {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
156
|
+
return withListingLinkRequestMemo('tag', config, options, () => fetchAllTagLinksUncached(context, config, options));
|
|
157
|
+
}
|
|
158
|
+
async function fetchAllTagLinksUncached(context, config, options) {
|
|
159
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
160
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
161
|
+
const cacheTags = getCacheTags('tag', undefined, cacheOptions?.preview);
|
|
152
162
|
const requestOptions = {
|
|
153
|
-
...
|
|
154
|
-
next: mergeFetchCacheTags(
|
|
163
|
+
...cacheOptions,
|
|
164
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
155
165
|
};
|
|
156
166
|
const { select, include } = getListingLinkFetchParams('tag');
|
|
157
|
-
const pageSize =
|
|
158
|
-
const fetchFn = () => fetchAllLinks('tag', client,
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
return await withRetry(fetchFn, options.retry);
|
|
167
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
168
|
+
const fetchFn = () => fetchAllLinks('tag', client, requestOptions, baseTagLinkConverter, context, pageSize, select, include);
|
|
169
|
+
if (cacheOptions?.retry) {
|
|
170
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
162
171
|
}
|
|
163
172
|
return await fetchFn();
|
|
164
173
|
}
|
|
@@ -183,19 +192,21 @@ export async function contentfulAllTagLinks(context, config, options) {
|
|
|
183
192
|
* ```
|
|
184
193
|
*/
|
|
185
194
|
export async function contentfulAllPersonLinks(context, config, options) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
195
|
+
return withListingLinkRequestMemo('person', config, options, () => fetchAllPersonLinksUncached(context, config, options));
|
|
196
|
+
}
|
|
197
|
+
async function fetchAllPersonLinksUncached(context, config, options) {
|
|
198
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
199
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
200
|
+
const cacheTags = getCacheTags('person', undefined, cacheOptions?.preview);
|
|
189
201
|
const requestOptions = {
|
|
190
|
-
...
|
|
191
|
-
next: mergeFetchCacheTags(
|
|
202
|
+
...cacheOptions,
|
|
203
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
192
204
|
};
|
|
193
205
|
const { select, include } = getListingLinkFetchParams('person');
|
|
194
|
-
const pageSize =
|
|
195
|
-
const fetchFn = () => fetchAllLinks('person', client,
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
return await withRetry(fetchFn, options.retry);
|
|
206
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
207
|
+
const fetchFn = () => fetchAllLinks('person', client, requestOptions, basePersonLinkConverter, context, pageSize, select, include);
|
|
208
|
+
if (cacheOptions?.retry) {
|
|
209
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
199
210
|
}
|
|
200
211
|
return await fetchFn();
|
|
201
212
|
}
|
|
@@ -220,19 +231,21 @@ export async function contentfulAllPersonLinks(context, config, options) {
|
|
|
220
231
|
* ```
|
|
221
232
|
*/
|
|
222
233
|
export async function contentfulAllArticleTypeLinks(context, config, options) {
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
234
|
+
return withListingLinkRequestMemo('articleType', config, options, () => fetchAllArticleTypeLinksUncached(context, config, options));
|
|
235
|
+
}
|
|
236
|
+
async function fetchAllArticleTypeLinksUncached(context, config, options) {
|
|
237
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
238
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
239
|
+
const cacheTags = getCacheTags('articleType', undefined, cacheOptions?.preview);
|
|
226
240
|
const requestOptions = {
|
|
227
|
-
...
|
|
228
|
-
next: mergeFetchCacheTags(
|
|
241
|
+
...cacheOptions,
|
|
242
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
229
243
|
};
|
|
230
244
|
const { select, include } = getListingLinkFetchParams('articleType');
|
|
231
|
-
const pageSize =
|
|
232
|
-
const fetchFn = () => fetchAllLinks('articleType', client,
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
return await withRetry(fetchFn, options.retry);
|
|
245
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
246
|
+
const fetchFn = () => fetchAllLinks('articleType', client, requestOptions, baseArticleTypeLinkConverter, context, pageSize, select, include);
|
|
247
|
+
if (cacheOptions?.retry) {
|
|
248
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
236
249
|
}
|
|
237
250
|
return await fetchFn();
|
|
238
251
|
}
|
|
@@ -240,17 +253,21 @@ export async function contentfulAllArticleTypeLinks(context, config, options) {
|
|
|
240
253
|
* Fetches all custom type links from Contentful for static params generation.
|
|
241
254
|
*/
|
|
242
255
|
export async function contentfulAllCustomTypeLinks(context, config, options) {
|
|
243
|
-
|
|
244
|
-
|
|
256
|
+
return withListingLinkRequestMemo('customType', config, options, () => fetchAllCustomTypeLinksUncached(context, config, options));
|
|
257
|
+
}
|
|
258
|
+
async function fetchAllCustomTypeLinksUncached(context, config, options) {
|
|
259
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
260
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
261
|
+
const cacheTags = getCacheTags('customType', undefined, cacheOptions?.preview);
|
|
245
262
|
const requestOptions = {
|
|
246
|
-
...
|
|
247
|
-
next: mergeFetchCacheTags(
|
|
263
|
+
...cacheOptions,
|
|
264
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
248
265
|
};
|
|
249
266
|
const { select, include } = getListingLinkFetchParams('customType');
|
|
250
|
-
const pageSize =
|
|
251
|
-
const fetchFn = () => fetchAllLinks('customType', client,
|
|
252
|
-
if (
|
|
253
|
-
return await withRetry(fetchFn,
|
|
267
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
268
|
+
const fetchFn = () => fetchAllLinks('customType', client, requestOptions, baseCustomTypeLinkConverter, context, pageSize, select, include);
|
|
269
|
+
if (cacheOptions?.retry) {
|
|
270
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
254
271
|
}
|
|
255
272
|
return await fetchFn();
|
|
256
273
|
}
|
|
@@ -258,15 +275,19 @@ export async function contentfulAllCustomTypeLinks(context, config, options) {
|
|
|
258
275
|
* Fetches all tag type links from Contentful for static params generation.
|
|
259
276
|
*/
|
|
260
277
|
export async function contentfulAllTagTypeLinks(context, config, options) {
|
|
261
|
-
|
|
262
|
-
|
|
278
|
+
return withListingLinkRequestMemo('tagType', config, options, () => fetchAllTagTypeLinksUncached(context, config, options));
|
|
279
|
+
}
|
|
280
|
+
async function fetchAllTagTypeLinksUncached(context, config, options) {
|
|
281
|
+
const cacheOptions = buildListingLinkCacheOptions(options);
|
|
282
|
+
const client = getContentfulClient(config, cacheOptions.preview);
|
|
283
|
+
const cacheTags = getCacheTags('tagType', undefined, cacheOptions?.preview);
|
|
263
284
|
const requestOptions = {
|
|
264
|
-
...
|
|
265
|
-
next: mergeFetchCacheTags(
|
|
285
|
+
...cacheOptions,
|
|
286
|
+
next: mergeFetchCacheTags(cacheOptions, cacheTags),
|
|
266
287
|
};
|
|
267
288
|
const { include } = getListingLinkFetchParams('tagType');
|
|
268
|
-
const pageSize =
|
|
269
|
-
const fetchWithSelect = (select) => fetchAllLinks('tagType', client,
|
|
289
|
+
const pageSize = cacheOptions.pageSize ?? 100;
|
|
290
|
+
const fetchWithSelect = (select) => fetchAllLinks('tagType', client, requestOptions, baseTagTypeLinkConverter, context, pageSize, select, include);
|
|
270
291
|
const fetchFn = async () => {
|
|
271
292
|
try {
|
|
272
293
|
return await fetchWithSelect(TAG_TYPE_LINK_FIELDS);
|
|
@@ -278,8 +299,8 @@ export async function contentfulAllTagTypeLinks(context, config, options) {
|
|
|
278
299
|
throw error;
|
|
279
300
|
}
|
|
280
301
|
};
|
|
281
|
-
if (
|
|
282
|
-
return await withRetry(fetchFn,
|
|
302
|
+
if (cacheOptions?.retry) {
|
|
303
|
+
return await withRetry(fetchFn, cacheOptions.retry);
|
|
283
304
|
}
|
|
284
305
|
return await fetchFn();
|
|
285
306
|
}
|
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;AAC/B,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEvF,SAAS,6BAA6B,CAAC,KAAc,EAAE,OAAe;IACpE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,KAAkD,CAAC;IACrE,OAAO,CACL,SAAS,CAAC,UAAU,KAAK,GAAG;QAC5B,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,qBAAqB,OAAO,GAAG,CAAC,IAAI,KAAK,CAAC,CACxE,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAA6B,EAC7B,MAAwB,EACxB,OAAqB;IAErB,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"links.js","sourceRoot":"","sources":["../../src/api/links.ts"],"names":[],"mappings":"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"}
|
package/dist/api/navigation.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { INavigation } from '@se-studio/core-data-types';
|
|
|
2
2
|
import type { BaseConverterContext } from '../converters/helpers';
|
|
3
3
|
import type { ContentfulConfig, FetchOptions } from '../types';
|
|
4
4
|
export { buildFlatNavigationCacheOptions, FLAT_NAV_CACHE_TAGS, FLAT_NAV_TIME_REVALIDATE_SECONDS, } from '../navigation/cacheOptions';
|
|
5
|
+
export { withFlatNavRequestCache } from '../navigation/requestCache';
|
|
5
6
|
/**
|
|
6
7
|
* Fetches flat navigation caches and assembles a navigation tree by root entry id.
|
|
7
8
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/api/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAKlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE/D,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,gCAAgC,GACjC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/api/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAKlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE/D,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,gCAAgC,GACjC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE;;GAEG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CASlC"}
|
package/dist/api/navigation.js
CHANGED
|
@@ -3,6 +3,7 @@ import { buildFlatNavigationCacheOptions } from '../navigation/cacheOptions.js';
|
|
|
3
3
|
import { getInternalLinkIndex } from '../navigation/linkIndex.js';
|
|
4
4
|
import { getNavigationRegistry } from '../navigation/registry.js';
|
|
5
5
|
export { buildFlatNavigationCacheOptions, FLAT_NAV_CACHE_TAGS, FLAT_NAV_TIME_REVALIDATE_SECONDS, } from '../navigation/cacheOptions.js';
|
|
6
|
+
export { withFlatNavRequestCache } from '../navigation/requestCache.js';
|
|
6
7
|
/**
|
|
7
8
|
* Fetches flat navigation caches and assembles a navigation tree by root entry id.
|
|
8
9
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../src/api/navigation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,gCAAgC,GACjC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../src/api/navigation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,gCAAgC,GACjC,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,YAAoB,EACpB,OAA6B,EAC7B,MAAwB,EACxB,OAAqB;IAErB,MAAM,YAAY,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAC;IAE9D,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC;QACpD,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC;KACpD,CAAC,CAAC;IAEH,OAAO,sBAAsB,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AACnE,CAAC"}
|
package/dist/api/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/api/page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG5E;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/api/page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAElE,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAG5E;;;;;;;;;GASG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,oBAAoB,EAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAsCxC"}
|
package/dist/api/page.js
CHANGED
|
@@ -29,6 +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
|
+
logOperation: 'Reading page variant',
|
|
32
33
|
}, { ...options, include: options.include ?? 8 });
|
|
33
34
|
return {
|
|
34
35
|
data: variantResponse.data,
|
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,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;
|
|
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;QACrD,YAAY,EAAE,sBAAsB;KACrC,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,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"person.d.ts","sourceRoot":"","sources":["../../src/api/person.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAI9D,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AActF,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,CAiJhD"}
|
package/dist/api/person.js
CHANGED
|
@@ -2,8 +2,9 @@ import { getContentfulClient } from '../client.js';
|
|
|
2
2
|
import { enrichAllAssets } from '../converters/enrichAssets.js';
|
|
3
3
|
import { finalizeModelIconsAndNavigation } from '../navigation/enrichModelNavigation.js';
|
|
4
4
|
import { getCacheTags } from '../revalidation/utils.js';
|
|
5
|
+
import { withCmsQueryContext } from '../telemetry/queryContext.js';
|
|
5
6
|
import { withRetry } from '../utils/index.js';
|
|
6
|
-
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers.js';
|
|
7
|
+
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, operationLabel, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers.js';
|
|
7
8
|
import { getSingleEntityListingSelect } from './listing-fetch-params.js';
|
|
8
9
|
/**
|
|
9
10
|
* Fetches a person from Contentful by slug
|
|
@@ -53,22 +54,22 @@ export async function contentfulPersonRest(context, config, slug, options) {
|
|
|
53
54
|
const bundleCustomType = fetchProfile === 'page' && !!options?.customType;
|
|
54
55
|
const personInclude = resolveIncludeDepth('person', options);
|
|
55
56
|
const listingSelect = fetchProfile === 'listing' ? getSingleEntityListingSelect('person') : undefined;
|
|
56
|
-
const personPromise = client.getEntries({
|
|
57
|
+
const personPromise = withCmsQueryContext({ operation: operationLabel('person'), identifier: slug }, () => client.getEntries({
|
|
57
58
|
content_type: 'person',
|
|
58
59
|
'fields.slug': slug,
|
|
59
60
|
include: personInclude,
|
|
60
61
|
locale: options?.locale,
|
|
61
62
|
limit: 1,
|
|
62
63
|
...(listingSelect && { select: listingSelect }),
|
|
63
|
-
}, requestOptions);
|
|
64
|
+
}, requestOptions));
|
|
64
65
|
const customTypePromise = bundleCustomType
|
|
65
|
-
? client.getEntries({
|
|
66
|
+
? withCmsQueryContext({ operation: operationLabel('customType'), identifier: options.customType }, () => client.getEntries({
|
|
66
67
|
content_type: 'customType',
|
|
67
68
|
'fields.slug': options.customType,
|
|
68
69
|
include: options.include ?? PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE,
|
|
69
70
|
locale: options?.locale,
|
|
70
71
|
limit: 1,
|
|
71
|
-
}, requestOptions)
|
|
72
|
+
}, requestOptions))
|
|
72
73
|
: Promise.resolve(null);
|
|
73
74
|
const [personResponse, customTypeResponse] = await Promise.all([
|
|
74
75
|
personPromise,
|
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;AAG7D,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;
|
|
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;
|
|
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;AAGlE,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,CA4G1C"}
|
package/dist/api/redirects.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getContentfulClient } from '../client.js';
|
|
2
2
|
import { getCacheTags } from '../revalidation/index.js';
|
|
3
|
+
import { withCmsQueryContext } from '../telemetry/queryContext.js';
|
|
3
4
|
import { withRetry } from '../utils/index.js';
|
|
4
5
|
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, } from './helpers.js';
|
|
5
6
|
// Re-export the pure map builder (implemented in utils so it has zero server-only deps
|
|
@@ -33,13 +34,15 @@ export async function contentfulRedirectsRest(context, config, options) {
|
|
|
33
34
|
const fetchFn = async () => {
|
|
34
35
|
while (hasMore) {
|
|
35
36
|
try {
|
|
36
|
-
const
|
|
37
|
+
const page = Math.floor(skip / pageSize) + 1;
|
|
38
|
+
const operation = page > 1 ? `Reading all redirects (page ${page})` : 'Reading all redirects';
|
|
39
|
+
const redirectResponse = await withCmsQueryContext({ operation }, () => client.getEntries({
|
|
37
40
|
content_type: 'redirect',
|
|
38
41
|
include: 2, // enough to resolve the link targets we care about for hrefs
|
|
39
42
|
locale: options?.locale,
|
|
40
43
|
limit: pageSize,
|
|
41
44
|
skip,
|
|
42
|
-
}, requestOptions);
|
|
45
|
+
}, requestOptions));
|
|
43
46
|
if (!redirectResponse.items.length) {
|
|
44
47
|
hasMore = false;
|
|
45
48
|
break;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"redirects.js","sourceRoot":"","sources":["../../src/api/redirects.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAAE,MAAM,uBAAuB,CAAC;
|
|
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;AAGlE,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AActF,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,CA0I3C"}
|
package/dist/api/tag-type.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { getContentfulClient } from '../client.js';
|
|
2
2
|
import { enrichAllAssets } from '../converters/enrichAssets.js';
|
|
3
3
|
import { getCacheTags } from '../revalidation/utils.js';
|
|
4
|
+
import { withCmsQueryContext } from '../telemetry/queryContext.js';
|
|
4
5
|
import { withRetry } from '../utils/index.js';
|
|
5
|
-
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers.js';
|
|
6
|
+
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, operationLabel, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers.js';
|
|
6
7
|
import { getSingleEntityListingSelect } from './listing-fetch-params.js';
|
|
7
8
|
/**
|
|
8
9
|
* Fetches a tag type from Contentful by slug
|
|
@@ -46,22 +47,22 @@ export async function contentfulTagTypeRest(context, config, slug, options) {
|
|
|
46
47
|
const bundleCustomType = fetchProfile === 'page' && !!options?.customType;
|
|
47
48
|
const tagTypeInclude = resolveIncludeDepth('tagType', options);
|
|
48
49
|
const listingSelect = fetchProfile === 'listing' ? getSingleEntityListingSelect('tagType') : undefined;
|
|
49
|
-
const tagTypePromise = client.getEntries({
|
|
50
|
+
const tagTypePromise = withCmsQueryContext({ operation: operationLabel('tagType'), identifier: slug }, () => client.getEntries({
|
|
50
51
|
content_type: 'tagType',
|
|
51
52
|
'fields.slug': slug,
|
|
52
53
|
include: tagTypeInclude,
|
|
53
54
|
locale: options?.locale,
|
|
54
55
|
limit: 1,
|
|
55
56
|
...(listingSelect && { select: listingSelect }),
|
|
56
|
-
}, requestOptions);
|
|
57
|
+
}, requestOptions));
|
|
57
58
|
const customTypePromise = bundleCustomType
|
|
58
|
-
? client.getEntries({
|
|
59
|
+
? withCmsQueryContext({ operation: operationLabel('customType'), identifier: options.customType }, () => client.getEntries({
|
|
59
60
|
content_type: 'customType',
|
|
60
61
|
'fields.slug': options.customType,
|
|
61
62
|
include: options.include ?? PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE,
|
|
62
63
|
locale: options?.locale,
|
|
63
64
|
limit: 1,
|
|
64
|
-
}, requestOptions)
|
|
65
|
+
}, requestOptions))
|
|
65
66
|
: Promise.resolve(null);
|
|
66
67
|
const [tagTypeResponse, customTypeResponse] = await Promise.all([
|
|
67
68
|
tagTypePromise,
|
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;
|
|
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,EAAE,MAAM,uBAAuB,CAAC;
|
|
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;AAIlE,OAAO,KAAK,EAAY,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AActF,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,CA8IvC"}
|
package/dist/api/tag.js
CHANGED
|
@@ -2,8 +2,9 @@ import { getContentfulClient } from '../client.js';
|
|
|
2
2
|
import { enrichAllAssets } from '../converters/enrichAssets.js';
|
|
3
3
|
import { finalizeModelIconsAndNavigation } from '../navigation/enrichModelNavigation.js';
|
|
4
4
|
import { getCacheTags } from '../revalidation/utils.js';
|
|
5
|
+
import { withCmsQueryContext } from '../telemetry/queryContext.js';
|
|
5
6
|
import { withRetry } from '../utils/index.js';
|
|
6
|
-
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers.js';
|
|
7
|
+
import { convertAllAssets, convertAllIncludes, convertAllRawAssets, createFullConverterContext, operationLabel, PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE, resolveIncludeDepth, } from './helpers.js';
|
|
7
8
|
import { getSingleEntityListingSelect } from './listing-fetch-params.js';
|
|
8
9
|
/**
|
|
9
10
|
* Fetches a tag from Contentful by slug
|
|
@@ -53,22 +54,22 @@ export async function contentfulTagRest(context, config, slug, options) {
|
|
|
53
54
|
const bundleCustomType = fetchProfile === 'page' && !!options?.customType;
|
|
54
55
|
const tagInclude = resolveIncludeDepth('tag', options);
|
|
55
56
|
const listingSelect = fetchProfile === 'listing' ? getSingleEntityListingSelect('tag') : undefined;
|
|
56
|
-
const tagPromise = client.getEntries({
|
|
57
|
+
const tagPromise = withCmsQueryContext({ operation: operationLabel('tag'), identifier: slug }, () => client.getEntries({
|
|
57
58
|
content_type: 'tag',
|
|
58
59
|
'fields.slug': slug,
|
|
59
60
|
include: tagInclude,
|
|
60
61
|
locale: options?.locale,
|
|
61
62
|
limit: 1,
|
|
62
63
|
...(listingSelect && { select: listingSelect }),
|
|
63
|
-
}, requestOptions);
|
|
64
|
+
}, requestOptions));
|
|
64
65
|
const customTypePromise = bundleCustomType
|
|
65
|
-
? client.getEntries({
|
|
66
|
+
? withCmsQueryContext({ operation: operationLabel('customType'), identifier: options.customType }, () => client.getEntries({
|
|
66
67
|
content_type: 'customType',
|
|
67
68
|
'fields.slug': options.customType,
|
|
68
69
|
include: options.include ?? PAGE_BUNDLED_CUSTOM_TYPE_INCLUDE,
|
|
69
70
|
locale: options?.locale,
|
|
70
71
|
limit: 1,
|
|
71
|
-
}, requestOptions)
|
|
72
|
+
}, requestOptions))
|
|
72
73
|
: Promise.resolve(null);
|
|
73
74
|
const [tagResponse, customTypeResponse] = await Promise.all([tagPromise, customTypePromise]);
|
|
74
75
|
const tagEntry = tagResponse.items[0];
|