@ethlete/contentful 3.2.0 → 3.3.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 +14 -0
- package/esm2022/lib/components/audio/contentful-audio.component.mjs +25 -8
- package/esm2022/lib/components/file/contentful-file.component.mjs +29 -8
- package/esm2022/lib/components/image/contentful-image.component.mjs +29 -9
- package/esm2022/lib/components/image/contentful-image.component.utils.mjs +11 -5
- package/esm2022/lib/components/rich-text-renderer/rich-text-renderer.component.mjs +1 -1
- package/esm2022/lib/components/video/contentful-video.component.mjs +23 -6
- package/esm2022/lib/gql/asset.fragments.mjs +5 -1
- package/esm2022/lib/types/contentful.types.mjs +1 -1
- package/fesm2022/ethlete-contentful.mjs +126 -46
- package/fesm2022/ethlete-contentful.mjs.map +1 -1
- package/lib/components/audio/contentful-audio.component.d.ts +7 -2
- package/lib/components/file/contentful-file.component.d.ts +9 -2
- package/lib/components/image/contentful-image.component.d.ts +9 -2
- package/lib/components/image/contentful-image.component.utils.d.ts +4 -3
- package/lib/components/rich-text-renderer/rich-text-renderer.component.d.ts +3 -3
- package/lib/components/video/contentful-video.component.d.ts +7 -2
- package/lib/gql/asset.fragments.d.ts +13 -0
- package/lib/types/contentful.types.d.ts +4 -3
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @ethlete/contentful
|
|
2
2
|
|
|
3
|
+
## 3.3.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`7c71af5`](https://github.com/ethlete-io/ethdk/commit/7c71af5fd7544395577a30b4ff541f26debc575f) Thanks [@TomTomB](https://github.com/TomTomB)! - Support the `ContentfulGqlImage` type inside the `ContentfulImageComponent`
|
|
8
|
+
|
|
9
|
+
- [`7c71af5`](https://github.com/ethlete-io/ethdk/commit/7c71af5fd7544395577a30b4ff541f26debc575f) Thanks [@TomTomB](https://github.com/TomTomB)! - Rename `ContentfulAsset` to `ContentfulRestAsset` to make it clear that it's a asset that is fetched from the REST API.
|
|
10
|
+
|
|
11
|
+
## 3.2.1
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- [`6695e2b`](https://github.com/ethlete-io/ethdk/commit/6695e2b8f006d81b000cb93fbadaeed051760725) Thanks [@TomTomB](https://github.com/TomTomB)! - Add back missing contentful graph ql asset type
|
|
16
|
+
|
|
3
17
|
## 3.2.0
|
|
4
18
|
|
|
5
19
|
### Minor Changes
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { NgClass } from '@angular/common';
|
|
2
|
-
import { ChangeDetectionStrategy, Component, ViewEncapsulation, input } from '@angular/core';
|
|
2
|
+
import { ChangeDetectionStrategy, Component, ViewEncapsulation, computed, input } from '@angular/core';
|
|
3
|
+
import { isContentfulGqlAsset } from '../../gql';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
5
|
export class ContentfulAudioComponent {
|
|
5
6
|
constructor() {
|
|
@@ -7,13 +8,29 @@ export class ContentfulAudioComponent {
|
|
|
7
8
|
this.audioClass = input(null);
|
|
8
9
|
this.figureClass = input(null);
|
|
9
10
|
this.figcaptionClass = input(null);
|
|
11
|
+
this.data = computed(() => {
|
|
12
|
+
const asset = this.asset();
|
|
13
|
+
if (!asset) {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
if (isContentfulGqlAsset(asset)) {
|
|
17
|
+
return {
|
|
18
|
+
url: asset.url,
|
|
19
|
+
title: asset.title,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
return {
|
|
23
|
+
url: asset.fields.file.url,
|
|
24
|
+
title: asset.fields.title,
|
|
25
|
+
};
|
|
26
|
+
});
|
|
10
27
|
}
|
|
11
28
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ContentfulAudioComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
12
29
|
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.3", type: ContentfulAudioComponent, isStandalone: true, selector: "et-contentful-audio", inputs: { asset: { classPropertyName: "asset", publicName: "asset", isSignal: true, isRequired: true, transformFunction: null }, audioClass: { classPropertyName: "audioClass", publicName: "audioClass", isSignal: true, isRequired: false, transformFunction: null }, figureClass: { classPropertyName: "figureClass", publicName: "figureClass", isSignal: true, isRequired: false, transformFunction: null }, figcaptionClass: { classPropertyName: "figcaptionClass", publicName: "figcaptionClass", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: `
|
|
13
|
-
@if (
|
|
30
|
+
@if (data(); as data) {
|
|
14
31
|
<figure [ngClass]="figureClass()">
|
|
15
|
-
<figcaption [ngClass]="figcaptionClass()">{{ data.
|
|
16
|
-
<audio [ngClass]="audioClass()" controls src="{{ data.
|
|
32
|
+
<figcaption [ngClass]="figcaptionClass()">{{ data.title }}</figcaption>
|
|
33
|
+
<audio [ngClass]="audioClass()" controls src="{{ data.url }}"></audio>
|
|
17
34
|
</figure>
|
|
18
35
|
}
|
|
19
36
|
`, isInline: true, dependencies: [{ kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
|
|
@@ -23,10 +40,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
23
40
|
args: [{
|
|
24
41
|
selector: 'et-contentful-audio',
|
|
25
42
|
template: `
|
|
26
|
-
@if (
|
|
43
|
+
@if (data(); as data) {
|
|
27
44
|
<figure [ngClass]="figureClass()">
|
|
28
|
-
<figcaption [ngClass]="figcaptionClass()">{{ data.
|
|
29
|
-
<audio [ngClass]="audioClass()" controls src="{{ data.
|
|
45
|
+
<figcaption [ngClass]="figcaptionClass()">{{ data.title }}</figcaption>
|
|
46
|
+
<audio [ngClass]="audioClass()" controls src="{{ data.url }}"></audio>
|
|
30
47
|
</figure>
|
|
31
48
|
}
|
|
32
49
|
`,
|
|
@@ -36,4 +53,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
36
53
|
imports: [NgClass],
|
|
37
54
|
}]
|
|
38
55
|
}] });
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudGZ1bC1hdWRpby5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL2NvbnRlbnRmdWwvc3JjL2xpYi9jb21wb25lbnRzL2F1ZGlvL2NvbnRlbnRmdWwtYXVkaW8uY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkcsT0FBTyxFQUFzQixvQkFBb0IsRUFBRSxNQUFNLFdBQVcsQ0FBQzs7QUFrQnJFLE1BQU0sT0FBTyx3QkFBd0I7SUFmckM7UUFnQkUsVUFBSyxHQUFHLEtBQUssQ0FBQyxRQUFRLEVBQStELENBQUM7UUFDdEYsZUFBVSxHQUFHLEtBQUssQ0FBYyxJQUFJLENBQUMsQ0FBQztRQUN0QyxnQkFBVyxHQUFHLEtBQUssQ0FBYyxJQUFJLENBQUMsQ0FBQztRQUN2QyxvQkFBZSxHQUFHLEtBQUssQ0FBYyxJQUFJLENBQUMsQ0FBQztRQUUzQyxTQUFJLEdBQUcsUUFBUSxDQUFDLEdBQUcsRUFBRTtZQUNuQixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7WUFFM0IsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO2dCQUNYLE9BQU8sSUFBSSxDQUFDO1lBQ2QsQ0FBQztZQUVELElBQUksb0JBQW9CLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDaEMsT0FBTztvQkFDTCxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUc7b0JBQ2QsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLO2lCQUNuQixDQUFDO1lBQ0osQ0FBQztZQUVELE9BQU87Z0JBQ0wsR0FBRyxFQUFFLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUc7Z0JBQzFCLEtBQUssRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUs7YUFDMUIsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0tBQ0o7OEdBekJZLHdCQUF3QjtrR0FBeEIsd0JBQXdCLHluQkFiekI7Ozs7Ozs7R0FPVCw0REFJUyxPQUFPOzsyRkFFTix3QkFBd0I7a0JBZnBDLFNBQVM7bUJBQUM7b0JBQ1QsUUFBUSxFQUFFLHFCQUFxQjtvQkFDL0IsUUFBUSxFQUFFOzs7Ozs7O0dBT1Q7b0JBQ0QsZUFBZSxFQUFFLHVCQUF1QixDQUFDLE1BQU07b0JBQy9DLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxJQUFJO29CQUNyQyxVQUFVLEVBQUUsSUFBSTtvQkFDaEIsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5nQ2xhc3MgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgVmlld0VuY2Fwc3VsYXRpb24sIGNvbXB1dGVkLCBpbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTmdDbGFzc1R5cGUgfSBmcm9tICdAZXRobGV0ZS9jb3JlJztcbmltcG9ydCB7IENvbnRlbnRmdWxHcWxBc3NldCwgaXNDb250ZW50ZnVsR3FsQXNzZXQgfSBmcm9tICcuLi8uLi9ncWwnO1xuaW1wb3J0IHsgQ29udGVudGZ1bFJlc3RBc3NldCB9IGZyb20gJy4uLy4uL3R5cGVzJztcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnZXQtY29udGVudGZ1bC1hdWRpbycsXG4gIHRlbXBsYXRlOiBgXG4gICAgQGlmIChkYXRhKCk7IGFzIGRhdGEpIHtcbiAgICAgIDxmaWd1cmUgW25nQ2xhc3NdPVwiZmlndXJlQ2xhc3MoKVwiPlxuICAgICAgICA8ZmlnY2FwdGlvbiBbbmdDbGFzc109XCJmaWdjYXB0aW9uQ2xhc3MoKVwiPnt7IGRhdGEudGl0bGUgfX08L2ZpZ2NhcHRpb24+XG4gICAgICAgIDxhdWRpbyBbbmdDbGFzc109XCJhdWRpb0NsYXNzKClcIiBjb250cm9scyBzcmM9XCJ7eyBkYXRhLnVybCB9fVwiPjwvYXVkaW8+XG4gICAgICA8L2ZpZ3VyZT5cbiAgICB9XG4gIGAsXG4gIGNoYW5nZURldGVjdGlvbjogQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3kuT25QdXNoLFxuICBlbmNhcHN1bGF0aW9uOiBWaWV3RW5jYXBzdWxhdGlvbi5Ob25lLFxuICBzdGFuZGFsb25lOiB0cnVlLFxuICBpbXBvcnRzOiBbTmdDbGFzc10sXG59KVxuZXhwb3J0IGNsYXNzIENvbnRlbnRmdWxBdWRpb0NvbXBvbmVudCB7XG4gIGFzc2V0ID0gaW5wdXQucmVxdWlyZWQ8Q29udGVudGZ1bFJlc3RBc3NldCB8IENvbnRlbnRmdWxHcWxBc3NldCB8IG51bGwgfCB1bmRlZmluZWQ+KCk7XG4gIGF1ZGlvQ2xhc3MgPSBpbnB1dDxOZ0NsYXNzVHlwZT4obnVsbCk7XG4gIGZpZ3VyZUNsYXNzID0gaW5wdXQ8TmdDbGFzc1R5cGU+KG51bGwpO1xuICBmaWdjYXB0aW9uQ2xhc3MgPSBpbnB1dDxOZ0NsYXNzVHlwZT4obnVsbCk7XG5cbiAgZGF0YSA9IGNvbXB1dGVkKCgpID0+IHtcbiAgICBjb25zdCBhc3NldCA9IHRoaXMuYXNzZXQoKTtcblxuICAgIGlmICghYXNzZXQpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cblxuICAgIGlmIChpc0NvbnRlbnRmdWxHcWxBc3NldChhc3NldCkpIHtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIHVybDogYXNzZXQudXJsLFxuICAgICAgICB0aXRsZTogYXNzZXQudGl0bGUsXG4gICAgICB9O1xuICAgIH1cblxuICAgIHJldHVybiB7XG4gICAgICB1cmw6IGFzc2V0LmZpZWxkcy5maWxlLnVybCxcbiAgICAgIHRpdGxlOiBhc3NldC5maWVsZHMudGl0bGUsXG4gICAgfTtcbiAgfSk7XG59XG4iXX0=
|
|
@@ -1,16 +1,37 @@
|
|
|
1
1
|
import { NgClass } from '@angular/common';
|
|
2
|
-
import { ChangeDetectionStrategy, Component, ViewEncapsulation, input } from '@angular/core';
|
|
2
|
+
import { ChangeDetectionStrategy, Component, ViewEncapsulation, computed, input } from '@angular/core';
|
|
3
|
+
import { isContentfulGqlAsset } from '../../gql';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
5
|
export class ContentfulFileComponent {
|
|
5
6
|
constructor() {
|
|
6
7
|
this.asset = input.required();
|
|
7
8
|
this.fileClass = input(null);
|
|
9
|
+
this.data = computed(() => {
|
|
10
|
+
const asset = this.asset();
|
|
11
|
+
if (!asset) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
if (isContentfulGqlAsset(asset)) {
|
|
15
|
+
return {
|
|
16
|
+
url: asset.url,
|
|
17
|
+
contentType: asset.contentType,
|
|
18
|
+
size: asset.size,
|
|
19
|
+
title: asset.title,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
return {
|
|
23
|
+
url: asset.fields.file.url,
|
|
24
|
+
contentType: asset.fields.file.contentType,
|
|
25
|
+
size: asset.fields.file.details.size,
|
|
26
|
+
title: asset.fields.title,
|
|
27
|
+
};
|
|
28
|
+
});
|
|
8
29
|
}
|
|
9
30
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ContentfulFileComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
10
31
|
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "17.3.3", type: ContentfulFileComponent, isStandalone: true, selector: "et-contentful-file", inputs: { asset: { classPropertyName: "asset", publicName: "asset", isSignal: true, isRequired: true, transformFunction: null }, fileClass: { classPropertyName: "fileClass", publicName: "fileClass", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: `
|
|
11
|
-
@if (
|
|
12
|
-
<a [href]="data.
|
|
13
|
-
{{ data.
|
|
32
|
+
@if (data(); as data) {
|
|
33
|
+
<a [href]="data.url" [ngClass]="fileClass()" class="underline" target="_blank">
|
|
34
|
+
{{ data.title }} ({{ data.size }} Bytes)
|
|
14
35
|
</a>
|
|
15
36
|
}
|
|
16
37
|
`, isInline: true, dependencies: [{ kind: "directive", type: NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
|
|
@@ -20,9 +41,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
20
41
|
args: [{
|
|
21
42
|
selector: 'et-contentful-file',
|
|
22
43
|
template: `
|
|
23
|
-
@if (
|
|
24
|
-
<a [href]="data.
|
|
25
|
-
{{ data.
|
|
44
|
+
@if (data(); as data) {
|
|
45
|
+
<a [href]="data.url" [ngClass]="fileClass()" class="underline" target="_blank">
|
|
46
|
+
{{ data.title }} ({{ data.size }} Bytes)
|
|
26
47
|
</a>
|
|
27
48
|
}
|
|
28
49
|
`,
|
|
@@ -32,4 +53,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
32
53
|
imports: [NgClass],
|
|
33
54
|
}]
|
|
34
55
|
}] });
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGVudGZ1bC1maWxlLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvY29udGVudGZ1bC9zcmMvbGliL2NvbXBvbmVudHMvZmlsZS9jb250ZW50ZnVsLWZpbGUuY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFdkcsT0FBTyxFQUFzQixvQkFBb0IsRUFBRSxNQUFNLFdBQVcsQ0FBQzs7QUFpQnJFLE1BQU0sT0FBTyx1QkFBdUI7SUFkcEM7UUFlRSxVQUFLLEdBQUcsS0FBSyxDQUFDLFFBQVEsRUFBK0QsQ0FBQztRQUN0RixjQUFTLEdBQUcsS0FBSyxDQUFjLElBQUksQ0FBQyxDQUFDO1FBRXJDLFNBQUksR0FBRyxRQUFRLENBQUMsR0FBRyxFQUFFO1lBQ25CLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUUzQixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ1gsT0FBTyxJQUFJLENBQUM7WUFDZCxDQUFDO1lBRUQsSUFBSSxvQkFBb0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO2dCQUNoQyxPQUFPO29CQUNMLEdBQUcsRUFBRSxLQUFLLENBQUMsR0FBRztvQkFDZCxXQUFXLEVBQUUsS0FBSyxDQUFDLFdBQVc7b0JBQzlCLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSTtvQkFDaEIsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLO2lCQUNuQixDQUFDO1lBQ0osQ0FBQztZQUVELE9BQU87Z0JBQ0wsR0FBRyxFQUFFLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUc7Z0JBQzFCLFdBQVcsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXO2dCQUMxQyxJQUFJLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUk7Z0JBQ3BDLEtBQUssRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUs7YUFDMUIsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0tBQ0o7OEdBM0JZLHVCQUF1QjtrR0FBdkIsdUJBQXVCLHFWQVp4Qjs7Ozs7O0dBTVQsNERBSVMsT0FBTzs7MkZBRU4sdUJBQXVCO2tCQWRuQyxTQUFTO21CQUFDO29CQUNULFFBQVEsRUFBRSxvQkFBb0I7b0JBQzlCLFFBQVEsRUFBRTs7Ozs7O0dBTVQ7b0JBQ0QsZUFBZSxFQUFFLHVCQUF1QixDQUFDLE1BQU07b0JBQy9DLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxJQUFJO29CQUNyQyxVQUFVLEVBQUUsSUFBSTtvQkFDaEIsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5nQ2xhc3MgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3ksIENvbXBvbmVudCwgVmlld0VuY2Fwc3VsYXRpb24sIGNvbXB1dGVkLCBpbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTmdDbGFzc1R5cGUgfSBmcm9tICdAZXRobGV0ZS9jb3JlJztcbmltcG9ydCB7IENvbnRlbnRmdWxHcWxBc3NldCwgaXNDb250ZW50ZnVsR3FsQXNzZXQgfSBmcm9tICcuLi8uLi9ncWwnO1xuaW1wb3J0IHsgQ29udGVudGZ1bFJlc3RBc3NldCB9IGZyb20gJy4uLy4uL3R5cGVzJztcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAnZXQtY29udGVudGZ1bC1maWxlJyxcbiAgdGVtcGxhdGU6IGBcbiAgICBAaWYgKGRhdGEoKTsgYXMgZGF0YSkge1xuICAgICAgPGEgW2hyZWZdPVwiZGF0YS51cmxcIiBbbmdDbGFzc109XCJmaWxlQ2xhc3MoKVwiIGNsYXNzPVwidW5kZXJsaW5lXCIgdGFyZ2V0PVwiX2JsYW5rXCI+XG4gICAgICAgIHt7IGRhdGEudGl0bGUgfX0gKHt7IGRhdGEuc2l6ZSB9fSBCeXRlcylcbiAgICAgIDwvYT5cbiAgICB9XG4gIGAsXG4gIGNoYW5nZURldGVjdGlvbjogQ2hhbmdlRGV0ZWN0aW9uU3RyYXRlZ3kuT25QdXNoLFxuICBlbmNhcHN1bGF0aW9uOiBWaWV3RW5jYXBzdWxhdGlvbi5Ob25lLFxuICBzdGFuZGFsb25lOiB0cnVlLFxuICBpbXBvcnRzOiBbTmdDbGFzc10sXG59KVxuZXhwb3J0IGNsYXNzIENvbnRlbnRmdWxGaWxlQ29tcG9uZW50IHtcbiAgYXNzZXQgPSBpbnB1dC5yZXF1aXJlZDxDb250ZW50ZnVsUmVzdEFzc2V0IHwgQ29udGVudGZ1bEdxbEFzc2V0IHwgbnVsbCB8IHVuZGVmaW5lZD4oKTtcbiAgZmlsZUNsYXNzID0gaW5wdXQ8TmdDbGFzc1R5cGU+KG51bGwpO1xuXG4gIGRhdGEgPSBjb21wdXRlZCgoKSA9PiB7XG4gICAgY29uc3QgYXNzZXQgPSB0aGlzLmFzc2V0KCk7XG5cbiAgICBpZiAoIWFzc2V0KSB7XG4gICAgICByZXR1cm4gbnVsbDtcbiAgICB9XG5cbiAgICBpZiAoaXNDb250ZW50ZnVsR3FsQXNzZXQoYXNzZXQpKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICB1cmw6IGFzc2V0LnVybCxcbiAgICAgICAgY29udGVudFR5cGU6IGFzc2V0LmNvbnRlbnRUeXBlLFxuICAgICAgICBzaXplOiBhc3NldC5zaXplLFxuICAgICAgICB0aXRsZTogYXNzZXQudGl0bGUsXG4gICAgICB9O1xuICAgIH1cblxuICAgIHJldHVybiB7XG4gICAgICB1cmw6IGFzc2V0LmZpZWxkcy5maWxlLnVybCxcbiAgICAgIGNvbnRlbnRUeXBlOiBhc3NldC5maWVsZHMuZmlsZS5jb250ZW50VHlwZSxcbiAgICAgIHNpemU6IGFzc2V0LmZpZWxkcy5maWxlLmRldGFpbHMuc2l6ZSxcbiAgICAgIHRpdGxlOiBhc3NldC5maWVsZHMudGl0bGUsXG4gICAgfTtcbiAgfSk7XG59XG4iXX0=
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ChangeDetectionStrategy, Component, ViewEncapsulation, booleanAttribute, computed, inject, input, numberAttribute, } from '@angular/core';
|
|
2
2
|
import { PictureComponent, normalizePictureSizes } from '@ethlete/cdk';
|
|
3
3
|
import { CONTENTFUL_CONFIG } from '../../constants';
|
|
4
|
+
import { isContentfulGqlAsset } from '../../gql';
|
|
4
5
|
import { generateContentfulImageSources, generateDefaultContentfulImageSource, } from './contentful-image.component.utils';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
export class ContentfulImageComponent {
|
|
@@ -20,6 +21,25 @@ export class ContentfulImageComponent {
|
|
|
20
21
|
this.sizes = input(normalizePictureSizes(this._contentfulConfig.imageOptions.sizes), {
|
|
21
22
|
transform: (v) => normalizePictureSizes(v),
|
|
22
23
|
});
|
|
24
|
+
this.normalizedAsset = computed(() => {
|
|
25
|
+
const asset = this.asset();
|
|
26
|
+
if (isContentfulGqlAsset(asset)) {
|
|
27
|
+
return {
|
|
28
|
+
alt: asset.title || null,
|
|
29
|
+
figcaption: asset.description || null,
|
|
30
|
+
width: asset.width,
|
|
31
|
+
height: asset.height,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
return {
|
|
36
|
+
alt: asset?.fields?.title || null,
|
|
37
|
+
figcaption: asset?.fields?.description || null,
|
|
38
|
+
width: asset?.fields?.file?.details?.image?.width ?? null,
|
|
39
|
+
height: asset?.fields?.file?.details?.image?.height ?? null,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
});
|
|
23
43
|
this._sources = computed(() => {
|
|
24
44
|
const asset = this.asset();
|
|
25
45
|
const backgroundColor = this.backgroundColor();
|
|
@@ -46,10 +66,10 @@ export class ContentfulImageComponent {
|
|
|
46
66
|
[pictureClass]="pictureClass()"
|
|
47
67
|
[figcaptionClass]="figcaptionClass()"
|
|
48
68
|
[defaultSrc]="_defaultSrc()"
|
|
49
|
-
[alt]="
|
|
50
|
-
[figcaption]="
|
|
51
|
-
[width]="
|
|
52
|
-
[height]="
|
|
69
|
+
[alt]="normalizedAsset().alt ?? null"
|
|
70
|
+
[figcaption]="normalizedAsset().figcaption ?? null"
|
|
71
|
+
[width]="normalizedAsset().width ?? null"
|
|
72
|
+
[height]="normalizedAsset().height ?? null"
|
|
53
73
|
[sizes]="sizes()"
|
|
54
74
|
[sources]="_sources()"
|
|
55
75
|
/>
|
|
@@ -67,10 +87,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
67
87
|
[pictureClass]="pictureClass()"
|
|
68
88
|
[figcaptionClass]="figcaptionClass()"
|
|
69
89
|
[defaultSrc]="_defaultSrc()"
|
|
70
|
-
[alt]="
|
|
71
|
-
[figcaption]="
|
|
72
|
-
[width]="
|
|
73
|
-
[height]="
|
|
90
|
+
[alt]="normalizedAsset().alt ?? null"
|
|
91
|
+
[figcaption]="normalizedAsset().figcaption ?? null"
|
|
92
|
+
[width]="normalizedAsset().width ?? null"
|
|
93
|
+
[height]="normalizedAsset().height ?? null"
|
|
74
94
|
[sizes]="sizes()"
|
|
75
95
|
[sources]="_sources()"
|
|
76
96
|
/>
|
|
@@ -84,4 +104,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
84
104
|
},
|
|
85
105
|
}]
|
|
86
106
|
}] });
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"contentful-image.component.js","sourceRoot":"","sources":["../../../../../../../libs/contentful/src/lib/components/image/contentful-image.component.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,QAAQ,EACR,MAAM,EACN,KAAK,EACL,eAAe,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAsB,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAErE,OAAO,EACL,8BAA8B,EAC9B,oCAAoC,GACrC,MAAM,oCAAoC,CAAC;;AA4B5C,MAAM,OAAO,wBAAwB;IA1BrC;QA2BE,sBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAE9C,UAAK,GAAG,KAAK,CAAC,QAAQ,EAA+D,CAAC;QACtF,oBAAe,GAAG,KAAK,CAAgB,IAAI,CAAC,CAAC;QAC7C,gBAAW,GAAG,KAAK,CAAW,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE/E,YAAO,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC;QACtD,cAAS,GAAG,KAAK,CAAkC,IAAI,CAAC,CAAC;QACzD,mBAAc,GAAG,KAAK,CAAuC,IAAI,CAAC,CAAC;QACnE,gBAAW,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC5D,aAAQ,GAAG,KAAK,CAAc,IAAI,CAAC,CAAC;QACpC,gBAAW,GAAG,KAAK,CAAc,IAAI,CAAC,CAAC;QACvC,oBAAe,GAAG,KAAK,CAAc,IAAI,CAAC,CAAC;QAC3C,iBAAY,GAAG,KAAK,CAAc,IAAI,CAAC,CAAC;QACxC,UAAK,GAAG,KAAK,CACX,qBAAqB,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,EAChE;YACE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;SAC3C,CACF,CAAC;QAEF,oBAAe,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAE3B,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChC,OAAO;oBACL,GAAG,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI;oBACxB,UAAU,EAAE,KAAK,CAAC,WAAW,IAAI,IAAI;oBACrC,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,IAAI;oBACjC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,IAAI,IAAI;oBAC9C,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,IAAI,IAAI;oBACzD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI;iBAC5D,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,aAAQ,GAAG,QAAQ,CAAC,GAAG,EAAE;YACvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACnC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;YAE7C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,OAAO,8BAA8B,CAAC,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACjH,CAAC,CAAC,CAAC;QAEH,gBAAW,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAE3B,OAAO,KAAK,CAAC,CAAC,CAAC,oCAAoC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpE,CAAC,CAAC,CAAC;KACJ;8GA9DY,wBAAwB;kGAAxB,wBAAwB,wuDAxBzB;;;;;;;;;;;;;;;GAeT,4DAIS,gBAAgB;;2FAKf,wBAAwB;kBA1BpC,SAAS;mBAAC;oBACT,QAAQ,EAAE,qBAAqB;oBAC/B,QAAQ,EAAE;;;;;;;;;;;;;;;GAeT;oBACD,eAAe,EAAE,uBAAuB,CAAC,MAAM;oBAC/C,aAAa,EAAE,iBAAiB,CAAC,IAAI;oBACrC,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE,CAAC,gBAAgB,CAAC;oBAC3B,IAAI,EAAE;wBACJ,KAAK,EAAE,qBAAqB;qBAC7B;iBACF","sourcesContent":["import {\n  ChangeDetectionStrategy,\n  Component,\n  ViewEncapsulation,\n  booleanAttribute,\n  computed,\n  inject,\n  input,\n  numberAttribute,\n} from '@angular/core';\nimport { PictureComponent, normalizePictureSizes } from '@ethlete/cdk';\nimport { NgClassType } from '@ethlete/core';\nimport { CONTENTFUL_CONFIG } from '../../constants';\nimport { ContentfulGqlAsset, isContentfulGqlAsset } from '../../gql';\nimport { ContentfulImageFocusArea, ContentfulImageResizeBehavior, ContentfulRestAsset } from '../../types';\nimport {\n  generateContentfulImageSources,\n  generateDefaultContentfulImageSource,\n} from './contentful-image.component.utils';\n\n@Component({\n  selector: 'et-contentful-image',\n  template: `\n    <et-picture\n      [imgClass]=\"imgClass()\"\n      [hasPriority]=\"hasPriority()\"\n      [figureClass]=\"figureClass()\"\n      [pictureClass]=\"pictureClass()\"\n      [figcaptionClass]=\"figcaptionClass()\"\n      [defaultSrc]=\"_defaultSrc()\"\n      [alt]=\"normalizedAsset().alt ?? null\"\n      [figcaption]=\"normalizedAsset().figcaption ?? null\"\n      [width]=\"normalizedAsset().width ?? null\"\n      [height]=\"normalizedAsset().height ?? null\"\n      [sizes]=\"sizes()\"\n      [sources]=\"_sources()\"\n    />\n  `,\n  changeDetection: ChangeDetectionStrategy.OnPush,\n  encapsulation: ViewEncapsulation.None,\n  standalone: true,\n  imports: [PictureComponent],\n  host: {\n    class: 'et-contentful-image',\n  },\n})\nexport class ContentfulImageComponent {\n  _contentfulConfig = inject(CONTENTFUL_CONFIG);\n\n  asset = input.required<ContentfulRestAsset | ContentfulGqlAsset | null | undefined>();\n  backgroundColor = input<string | null>(null);\n  srcsetSizes = input<string[]>(this._contentfulConfig.imageOptions.srcsetSizes);\n\n  quality = input(null, { transform: numberAttribute });\n  focusArea = input<ContentfulImageFocusArea | null>(null);\n  resizeBehavior = input<ContentfulImageResizeBehavior | null>(null);\n  hasPriority = input(false, { transform: booleanAttribute });\n  imgClass = input<NgClassType>(null);\n  figureClass = input<NgClassType>(null);\n  figcaptionClass = input<NgClassType>(null);\n  pictureClass = input<NgClassType>(null);\n  sizes = input<string | null, string[] | string | null>(\n    normalizePictureSizes(this._contentfulConfig.imageOptions.sizes),\n    {\n      transform: (v) => normalizePictureSizes(v),\n    },\n  );\n\n  normalizedAsset = computed(() => {\n    const asset = this.asset();\n\n    if (isContentfulGqlAsset(asset)) {\n      return {\n        alt: asset.title || null,\n        figcaption: asset.description || null,\n        width: asset.width,\n        height: asset.height,\n      };\n    } else {\n      return {\n        alt: asset?.fields?.title || null,\n        figcaption: asset?.fields?.description || null,\n        width: asset?.fields?.file?.details?.image?.width ?? null,\n        height: asset?.fields?.file?.details?.image?.height ?? null,\n      };\n    }\n  });\n\n  _sources = computed(() => {\n    const asset = this.asset();\n    const backgroundColor = this.backgroundColor();\n    const srcsetSizes = this.srcsetSizes();\n    const quality = this.quality();\n    const focusArea = this.focusArea();\n    const resizeBehavior = this.resizeBehavior();\n\n    if (!asset) {\n      return [];\n    }\n\n    return generateContentfulImageSources(asset, srcsetSizes, backgroundColor, quality, focusArea, resizeBehavior);\n  });\n\n  _defaultSrc = computed(() => {\n    const asset = this.asset();\n\n    return asset ? generateDefaultContentfulImageSource(asset) : null;\n  });\n}\n"]}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
+
import { isContentfulGqlAsset } from '../../gql';
|
|
1
2
|
export const generateDefaultContentfulImageSource = (data) => {
|
|
2
|
-
|
|
3
|
+
if (isContentfulGqlAsset(data)) {
|
|
4
|
+
return {
|
|
5
|
+
type: data.contentType,
|
|
6
|
+
srcset: data.url,
|
|
7
|
+
};
|
|
8
|
+
}
|
|
3
9
|
return {
|
|
4
|
-
type: file.contentType,
|
|
5
|
-
srcset: file.url,
|
|
10
|
+
type: data.fields.file.contentType,
|
|
11
|
+
srcset: data.fields.file.url,
|
|
6
12
|
};
|
|
7
13
|
};
|
|
8
14
|
/**
|
|
@@ -40,7 +46,7 @@ export const generateContentfulImageSources = (data, srcsetSizes, backgroundColo
|
|
|
40
46
|
const sources = [];
|
|
41
47
|
const SOURCE_TYPES = ['image/avif', 'image/webp', 'image/png', 'image/jpg'];
|
|
42
48
|
for (const type of SOURCE_TYPES) {
|
|
43
|
-
const baseUrl = assetData.fields.file.url;
|
|
49
|
+
const baseUrl = isContentfulGqlAsset(assetData) ? assetData.url : assetData.fields.file.url;
|
|
44
50
|
const sourceSets = [];
|
|
45
51
|
const queryParams = [];
|
|
46
52
|
// Set the format (e.g. 'fm=webp')
|
|
@@ -79,4 +85,4 @@ export const generateContentfulImageSources = (data, srcsetSizes, backgroundColo
|
|
|
79
85
|
}
|
|
80
86
|
return sources;
|
|
81
87
|
};
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"contentful-image.component.utils.js","sourceRoot":"","sources":["../../../../../../../libs/contentful/src/lib/components/image/contentful-image.component.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { PictureSource } from '@ethlete/cdk';\nimport { ContentfulGqlAsset, isContentfulGqlAsset } from '../../gql';\nimport { ContentfulImageFocusArea, ContentfulImageResizeBehavior, ContentfulRestAsset } from '../../types';\n\nexport const generateDefaultContentfulImageSource = (data: ContentfulRestAsset | ContentfulGqlAsset): PictureSource => {\n  if (isContentfulGqlAsset(data)) {\n    return {\n      type: data.contentType,\n      srcset: data.url,\n    };\n  }\n\n  return {\n    type: data.fields.file.contentType,\n    srcset: data.fields.file.url,\n  };\n};\n\n/**\n * Parses source set sizes into an object containing with and height. Eg.\n * - `\"400\"` - 400px width\n * - `\"400x300\"` - 400px width and 300px height\n * - `\"400w\"` - 400px width\n * - `\"400h\"` - 400px height\n * - `\"400wx300h\"` - 400px width and 300px height\n **/\nexport const parseContentfulImageSize = (size: string): { width: number | null; height: number | null } => {\n  let width: string | null | undefined = null;\n  let height: string | null | undefined = null;\n\n  if (size.includes('x')) {\n    const [w, h] = size.split('x');\n\n    width = w;\n    height = h;\n  } else if (size.includes('h')) {\n    height = size;\n  } else {\n    width = size;\n  }\n\n  return {\n    width: width ? parseInt(width, 10) : null,\n    height: height ? parseInt(height, 10) : null,\n  };\n};\n\nexport const generateContentfulImageSources = (\n  data: ContentfulRestAsset | ContentfulGqlAsset,\n  srcsetSizes: string[],\n  backgroundColor: string | null,\n  quality: number | null,\n  focusArea: ContentfulImageFocusArea | null,\n  resizeBehavior: ContentfulImageResizeBehavior | null,\n): PictureSource[] => {\n  const assetData = data;\n\n  if (!assetData) {\n    return [];\n  }\n\n  const sources: PictureSource[] = [];\n\n  const SOURCE_TYPES = ['image/avif', 'image/webp', 'image/png', 'image/jpg'];\n\n  for (const type of SOURCE_TYPES) {\n    const baseUrl = isContentfulGqlAsset(assetData) ? assetData.url : assetData.fields.file.url;\n    const sourceSets: string[] = [];\n    const queryParams: string[] = [];\n\n    // Set the format (e.g. 'fm=webp')\n    queryParams.push(`fm=${type.split('/')[1]}`);\n\n    if (backgroundColor) {\n      queryParams.push(`bg=rgb:${backgroundColor}`);\n    }\n\n    if (quality !== null) {\n      queryParams.push(`q=${quality}`);\n    }\n\n    if (focusArea) {\n      queryParams.push(`f=${focusArea}`);\n    }\n\n    if (resizeBehavior) {\n      queryParams.push(`fit=${resizeBehavior}`);\n    }\n    if (srcsetSizes?.length) {\n      const urlWithParams = `${baseUrl}?${queryParams.join('&')}`;\n\n      for (const size of srcsetSizes) {\n        const { width, height } = parseContentfulImageSize(size);\n\n        if (width && height) {\n          sourceSets.push(`${urlWithParams}&w=${width}&h=${height} ${width}w`);\n        } else if (width) {\n          sourceSets.push(`${urlWithParams}&w=${width} ${width}w`);\n        } else if (height) {\n          sourceSets.push(`${urlWithParams}&h=${height} ${height}h`);\n        }\n      }\n    }\n\n    sources.push({\n      type,\n      srcset: sourceSets.length ? sourceSets.join(', ') : `${baseUrl}?${queryParams.join('&')}`,\n    });\n  }\n\n  return sources;\n};\n"]}
|