@financial-times/cp-content-pipeline-schema 3.4.0 → 3.5.1
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/lib/datasources/capi.d.ts +0 -2
- package/lib/datasources/capi.js +10 -23
- package/lib/datasources/capi.js.map +1 -1
- package/lib/datasources/instrumented.js +4 -1
- package/lib/datasources/instrumented.js.map +1 -1
- package/lib/datasources/origami-image.d.ts +0 -2
- package/lib/datasources/origami-image.js +5 -19
- package/lib/datasources/origami-image.js.map +1 -1
- package/lib/datasources/twitter.d.ts +0 -2
- package/lib/datasources/twitter.js +2 -16
- package/lib/datasources/twitter.js.map +1 -1
- package/lib/datasources/url-management.js +5 -3
- package/lib/datasources/url-management.js.map +1 -1
- package/lib/fixtures/dummyContext.js +1 -1
- package/lib/generated/index.d.ts +73 -22
- package/lib/index.d.ts +1 -0
- package/lib/index.js.map +1 -1
- package/lib/model/Byline.js +11 -14
- package/lib/model/Byline.js.map +1 -1
- package/lib/model/CapiList.js +2 -0
- package/lib/model/CapiList.js.map +1 -1
- package/lib/model/CapiResponse.d.ts +7 -3
- package/lib/model/CapiResponse.js +125 -57
- package/lib/model/CapiResponse.js.map +1 -1
- package/lib/model/CapiResponse.test.js +92 -7
- package/lib/model/CapiResponse.test.js.map +1 -1
- package/lib/model/Clip.js +2 -0
- package/lib/model/Clip.js.map +1 -1
- package/lib/model/Concept.js +4 -10
- package/lib/model/Concept.js.map +1 -1
- package/lib/model/FlourishSource.d.ts +12 -5
- package/lib/model/FlourishSource.js +37 -38
- package/lib/model/FlourishSource.js.map +1 -1
- package/lib/model/FlourishSource.test.js +5 -5
- package/lib/model/FlourishSource.test.js.map +1 -1
- package/lib/model/Image.js +22 -20
- package/lib/model/Image.js.map +1 -1
- package/lib/model/LeadFlourish.d.ts +1 -1
- package/lib/model/LeadFlourish.js +8 -11
- package/lib/model/LeadFlourish.js.map +1 -1
- package/lib/model/LeadFlourish.test.js +5 -7
- package/lib/model/LeadFlourish.test.js.map +1 -1
- package/lib/model/Person.js +5 -16
- package/lib/model/Person.js.map +1 -1
- package/lib/model/Picture.js +3 -0
- package/lib/model/Picture.js.map +1 -1
- package/lib/model/RichText.js +3 -0
- package/lib/model/RichText.js.map +1 -1
- package/lib/model/Topper.js +5 -16
- package/lib/model/Topper.js.map +1 -1
- package/lib/model/schemas/capi/article.d.ts +3 -3
- package/lib/model/schemas/capi/audio.d.ts +5 -5
- package/lib/model/schemas/capi/base-schema.d.ts +5 -5
- package/lib/model/schemas/capi/base-schema.js +1 -1
- package/lib/model/schemas/capi/base-schema.js.map +1 -1
- package/lib/model/schemas/capi/content-package.d.ts +3 -3
- package/lib/model/schemas/capi/custom-code-component.d.ts +3 -3
- package/lib/model/schemas/capi/index.d.ts +20 -20
- package/lib/model/schemas/capi/internal-content.d.ts +1 -1
- package/lib/model/schemas/capi/live-blog-package.d.ts +3 -3
- package/lib/model/schemas/capi/placeholder.d.ts +3 -3
- package/lib/model/schemas/capi/video.d.ts +3 -3
- package/lib/resolvers/content-tree/references/Flourish.d.ts +9 -19
- package/lib/resolvers/content-tree/references/Flourish.js +10 -32
- package/lib/resolvers/content-tree/references/Flourish.js.map +1 -1
- package/lib/resolvers/content-tree/references/Flourish.test.js +3 -3
- package/lib/resolvers/content-tree/references/Flourish.test.js.map +1 -1
- package/lib/resolvers/content-tree/references/RawImage.js +2 -0
- package/lib/resolvers/content-tree/references/RawImage.js.map +1 -1
- package/lib/resolvers/content-tree/references/index.d.ts +2 -2
- package/lib/resolvers/content-tree/references/index.js +1 -1
- package/lib/resolvers/content-tree/references/index.js.map +1 -1
- package/lib/resolvers/content.d.ts +26 -1
- package/lib/resolvers/content.js +21 -1
- package/lib/resolvers/content.js.map +1 -1
- package/lib/resolvers/index.d.ts +27 -3
- package/lib/resolvers/leadFlourish.d.ts +1 -1
- package/lib/resolvers/literal-union.js +1 -0
- package/lib/resolvers/literal-union.js.map +1 -1
- package/lib/types/connection.d.ts +21 -0
- package/lib/types/connection.js +5 -0
- package/lib/types/connection.js.map +1 -0
- package/package.json +1 -1
- package/queries/article.graphql +8 -2
- package/src/datasources/capi.ts +1 -14
- package/src/datasources/origami-image.ts +1 -13
- package/src/datasources/twitter.ts +1 -14
- package/src/fixtures/dummyContext.ts +1 -1
- package/src/generated/index.ts +75 -24
- package/src/index.ts +1 -0
- package/src/model/CapiResponse.test.ts +137 -7
- package/src/model/CapiResponse.ts +129 -37
- package/src/model/FlourishSource.test.ts +5 -5
- package/src/model/FlourishSource.ts +57 -39
- package/src/model/Image.ts +16 -0
- package/src/model/LeadFlourish.test.ts +6 -9
- package/src/model/LeadFlourish.ts +5 -1
- package/src/model/schemas/capi/base-schema.ts +1 -1
- package/src/model/schemas/capi/internal-content.ts +1 -1
- package/src/resolvers/content-tree/references/Flourish.test.ts +4 -3
- package/src/resolvers/content-tree/references/Flourish.ts +16 -32
- package/src/resolvers/content-tree/references/index.ts +4 -4
- package/src/resolvers/content.ts +31 -1
- package/src/types/connection.ts +28 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/typedefs/content.graphql +40 -2
- package/typedefs/leadFlourish.graphql +1 -1
- package/typedefs/references/flourish.graphql +1 -11
- package/lib/helpers/timeout-error.d.ts +0 -6
- package/lib/helpers/timeout-error.js +0 -15
- package/lib/helpers/timeout-error.js.map +0 -1
- package/src/helpers/timeout-error.ts +0 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapiResponse.test.js","sourceRoot":"","sources":["../../src/model/CapiResponse.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA6C;AAC7C,uDAAuD;AACvD,4DAAkC;AAClC,4EAA8C;
|
|
1
|
+
{"version":3,"file":"CapiResponse.test.js","sourceRoot":"","sources":["../../src/model/CapiResponse.test.ts"],"names":[],"mappings":"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"}
|
package/lib/model/Clip.js
CHANGED
|
@@ -9,6 +9,8 @@ const literal_union_1 = require("../resolvers/literal-union");
|
|
|
9
9
|
const scalars_1 = require("../resolvers/scalars");
|
|
10
10
|
const imageService_1 = __importDefault(require("../helpers/imageService"));
|
|
11
11
|
class Clip {
|
|
12
|
+
clip;
|
|
13
|
+
layout;
|
|
12
14
|
constructor(clip, layout) {
|
|
13
15
|
this.clip = clip;
|
|
14
16
|
this.layout = layout;
|
package/lib/model/Clip.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Clip.js","sourceRoot":"","sources":["../../src/model/Clip.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiD;AAEjD,8DAGmC;AACnC,kDAAiD;AACjD,2EAAqD;AAoBrD,MAAa,IAAI;
|
|
1
|
+
{"version":3,"file":"Clip.js","sourceRoot":"","sources":["../../src/model/Clip.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiD;AAEjD,8DAGmC;AACnC,kDAAiD;AACjD,2EAAqD;AAoBrD,MAAa,IAAI;IACK;IAA4B;IAAhD,YAAoB,IAAkB,EAAU,MAAe;QAA3C,SAAI,GAAJ,IAAI,CAAc;QAAU,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEnE,IAAI;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,EAAE;QACA,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACtC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,qCAAqC,CAAC,CAAA;QACvE,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;YAEnC,IAAI,UAAU,KAAK,gBAAgB,EAAE,CAAC;gBACpC,OAAO,iBAAiB,CAAA;YAC1B,CAAC;YAED,IAAI,IAAA,sCAAsB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,oBAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChE,OAAO,UAAU,CAAA;YACnB,CAAC;QACH,CAAC;QAED,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IAED,UAAU;QACR,kKAAkK;QAClK,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC5D,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;gBAC/D,OAAO,CAAC,CAAC,CAAA;YACX,CAAC;YACD,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,KAAK,WAAW,EAAE,CAAC;gBAC/D,OAAO,CAAC,CAAA;YACV,CAAC;YACD,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;QACF,OAAO,UAA0B,CAAA;IACnC,CAAC;IAED,MAAM;QACJ,MAAM,QAAQ,GAEV;YACF,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,GAAG;YACf,WAAW,EAAE,IAAI;SAClB,CAAA;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,CAAA;QACnD,OAAO,GAAG;YACR,CAAC,CAAC,IAAA,sBAAe,EAAC;gBACd,GAAG;gBACH,UAAU,EAAE,qBAAqB;gBACjC,KAAK,EACH,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG;aACrE,CAAC;YACJ,CAAC,CAAC,EAAE,CAAA;IACR,CAAC;CACF;AAhED,oBAgEC"}
|
package/lib/model/Concept.js
CHANGED
|
@@ -1,14 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
-
};
|
|
8
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
4
|
};
|
|
11
|
-
var _Concept_systemCode;
|
|
12
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
6
|
exports.Concept = exports.predicates = void 0;
|
|
14
7
|
const metadata_1 = require("../helpers/metadata");
|
|
@@ -38,11 +31,13 @@ const packageBrands = [
|
|
|
38
31
|
'ftBestOf',
|
|
39
32
|
].map((packageBrand) => n_concept_ids_1.default.brand[packageBrand]);
|
|
40
33
|
class Concept {
|
|
34
|
+
capiConcept;
|
|
35
|
+
context;
|
|
36
|
+
#systemCode;
|
|
41
37
|
constructor(capiConcept, context) {
|
|
42
38
|
this.capiConcept = capiConcept;
|
|
43
39
|
this.context = context;
|
|
44
|
-
|
|
45
|
-
__classPrivateFieldSet(this, _Concept_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
40
|
+
this.#systemCode = context.systemCode ?? 'cp-content-pipeline';
|
|
46
41
|
}
|
|
47
42
|
apiUrl() {
|
|
48
43
|
return this.capiConcept.apiUrl;
|
|
@@ -131,5 +126,4 @@ class Concept {
|
|
|
131
126
|
}
|
|
132
127
|
}
|
|
133
128
|
exports.Concept = Concept;
|
|
134
|
-
_Concept_systemCode = new WeakMap();
|
|
135
129
|
//# sourceMappingURL=Concept.js.map
|
package/lib/model/Concept.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Concept.js","sourceRoot":"","sources":["../../src/model/Concept.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Concept.js","sourceRoot":"","sources":["../../src/model/Concept.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,20 +3,27 @@ type FlourishData = {
|
|
|
3
3
|
id: string;
|
|
4
4
|
type?: string;
|
|
5
5
|
description?: string;
|
|
6
|
-
|
|
6
|
+
width?: number;
|
|
7
|
+
height?: number;
|
|
8
|
+
};
|
|
7
9
|
export declare class FlourishSource {
|
|
8
10
|
#private;
|
|
9
11
|
private flourishData;
|
|
10
12
|
private context;
|
|
11
13
|
private imageMetadata?;
|
|
14
|
+
static createWithMetadata(data: FlourishData, context: QueryContext): Promise<FlourishSource>;
|
|
12
15
|
constructor(flourishData: FlourishData, context: QueryContext);
|
|
13
16
|
id(): string;
|
|
14
17
|
type(): string;
|
|
15
18
|
format(): "standard";
|
|
16
19
|
flourishUrl(): string;
|
|
17
|
-
private
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
private static fallbackUrl;
|
|
21
|
+
static getImageMetadata(data: FlourishData, context: QueryContext): Promise<{
|
|
22
|
+
width: number;
|
|
23
|
+
height: number;
|
|
24
|
+
}>;
|
|
25
|
+
width(): number;
|
|
26
|
+
height(): number;
|
|
27
|
+
url(): string;
|
|
21
28
|
}
|
|
22
29
|
export {};
|
|
@@ -1,89 +1,88 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
-
};
|
|
8
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
4
|
};
|
|
11
|
-
var _FlourishSource_systemCode;
|
|
12
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
6
|
exports.FlourishSource = void 0;
|
|
14
7
|
const imageService_1 = __importDefault(require("../helpers/imageService"));
|
|
15
8
|
const isError_1 = __importDefault(require("../helpers/isError"));
|
|
16
9
|
const errors_1 = require("@dotcom-reliability-kit/errors");
|
|
10
|
+
const DEFAULT_WIDTH = 2626;
|
|
11
|
+
const DEFAULT_HEIGHT = 1459;
|
|
17
12
|
class FlourishSource {
|
|
13
|
+
flourishData;
|
|
14
|
+
context;
|
|
15
|
+
#systemCode;
|
|
16
|
+
imageMetadata;
|
|
17
|
+
static async createWithMetadata(data, context) {
|
|
18
|
+
const { width, height } = await FlourishSource.getImageMetadata(data, context);
|
|
19
|
+
return new FlourishSource({
|
|
20
|
+
...data,
|
|
21
|
+
width,
|
|
22
|
+
height,
|
|
23
|
+
}, context);
|
|
24
|
+
}
|
|
18
25
|
constructor(flourishData, context) {
|
|
19
26
|
this.flourishData = flourishData;
|
|
20
27
|
this.context = context;
|
|
21
|
-
|
|
22
|
-
__classPrivateFieldSet(this, _FlourishSource_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
28
|
+
this.#systemCode = context.systemCode ?? 'cp-content-pipeline';
|
|
23
29
|
}
|
|
24
30
|
id() {
|
|
25
|
-
return this.flourishData
|
|
31
|
+
return this.flourishData.id;
|
|
26
32
|
}
|
|
27
33
|
type() {
|
|
28
|
-
return this.flourishData
|
|
34
|
+
return this.flourishData.type ?? 'flourish';
|
|
29
35
|
}
|
|
30
36
|
format() {
|
|
31
37
|
return 'standard';
|
|
32
38
|
}
|
|
33
39
|
flourishUrl() {
|
|
34
|
-
|
|
35
|
-
const cacheBusterTimestamp = Math.floor(Date.now() / (5 * 60 * 1000));
|
|
36
|
-
return `https://public.flourish.studio/${this.type()}/${this.id()}/thumbnail?cacheBuster=${cacheBusterTimestamp}`;
|
|
40
|
+
return FlourishSource.fallbackUrl(this.flourishData);
|
|
37
41
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
static fallbackUrl(data) {
|
|
43
|
+
// Timestamp rounded to the nearest 30 minutes to bust the cache every half an hour
|
|
44
|
+
const cacheBusterTimestamp = Math.floor(Date.now() / (30 * 60 * 1000));
|
|
45
|
+
return `https://public.flourish.studio/${data.type ?? 'flourish'}/${data.id}/thumbnail?cacheBuster=${cacheBusterTimestamp}`;
|
|
46
|
+
}
|
|
47
|
+
static async getImageMetadata(data, context) {
|
|
48
|
+
const url = FlourishSource.fallbackUrl(data);
|
|
44
49
|
try {
|
|
45
|
-
const metadata = await
|
|
46
|
-
|
|
50
|
+
const metadata = await context.dataSources.origami.getImageMetadata(url);
|
|
51
|
+
return {
|
|
47
52
|
width: metadata?.width || DEFAULT_WIDTH,
|
|
48
53
|
height: metadata?.height || DEFAULT_HEIGHT,
|
|
49
54
|
};
|
|
50
55
|
}
|
|
51
56
|
catch (error) {
|
|
52
57
|
if ((0, isError_1.default)(error)) {
|
|
53
|
-
|
|
58
|
+
context.logger.warn({
|
|
54
59
|
event: 'RECOVERABLE_ERROR',
|
|
55
60
|
error: new errors_1.OperationalError({
|
|
56
61
|
code: 'FLOURISH_IMAGE_METADATA_ERROR',
|
|
57
|
-
message: `Error getting image dimensions for Flourish fallback image ${
|
|
62
|
+
message: `Error getting image dimensions for Flourish fallback image ${url}`,
|
|
58
63
|
cause: error,
|
|
59
64
|
}),
|
|
60
65
|
});
|
|
61
66
|
}
|
|
62
|
-
|
|
67
|
+
return {
|
|
63
68
|
width: DEFAULT_WIDTH,
|
|
64
69
|
height: DEFAULT_HEIGHT,
|
|
65
70
|
};
|
|
66
71
|
}
|
|
67
|
-
return this.imageMetadata;
|
|
68
72
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
return imageMetadata.width;
|
|
73
|
+
width() {
|
|
74
|
+
return this.flourishData.width ?? DEFAULT_WIDTH;
|
|
72
75
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
return imageMetadata.height;
|
|
76
|
+
height() {
|
|
77
|
+
return this.flourishData.height ?? DEFAULT_HEIGHT;
|
|
76
78
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
const imageServiceWrappedUrl = (0, imageService_1.default)({
|
|
79
|
+
url() {
|
|
80
|
+
return (0, imageService_1.default)({
|
|
80
81
|
url: this.flourishUrl(),
|
|
81
82
|
systemCode: 'cp-content-pipeline',
|
|
82
|
-
width,
|
|
83
|
+
width: this.width(),
|
|
83
84
|
});
|
|
84
|
-
return imageServiceWrappedUrl;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
exports.FlourishSource = FlourishSource;
|
|
88
|
-
_FlourishSource_systemCode = new WeakMap();
|
|
89
88
|
//# sourceMappingURL=FlourishSource.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FlourishSource.js","sourceRoot":"","sources":["../../src/model/FlourishSource.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FlourishSource.js","sourceRoot":"","sources":["../../src/model/FlourishSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ describe('FlourishSource', () => {
|
|
|
35
35
|
expect(flourishSource.format()).toBe('standard');
|
|
36
36
|
});
|
|
37
37
|
it('should return the correct flourishUrl', () => {
|
|
38
|
-
expect(flourishSource.flourishUrl()).toBe('https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=
|
|
38
|
+
expect(flourishSource.flourishUrl()).toBe('https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=952866');
|
|
39
39
|
});
|
|
40
40
|
it('should return the correct width', async () => {
|
|
41
41
|
const width = await flourishSource.width();
|
|
@@ -52,15 +52,15 @@ describe('FlourishSource', () => {
|
|
|
52
52
|
const flourishImageUrlRegex = new RegExp(/https:\/\/public.flourish.studio\/.*\/.*\/thumbnail/);
|
|
53
53
|
expect(decodeURIComponent(url)).toMatch(flourishImageUrlRegex);
|
|
54
54
|
});
|
|
55
|
-
it('should bust the cache of the fallback image every
|
|
56
|
-
const oldCacheBuster = '
|
|
57
|
-
const newCacheBuster = '
|
|
55
|
+
it('should bust the cache of the fallback image every thirty minutes', async () => {
|
|
56
|
+
const oldCacheBuster = '952866';
|
|
57
|
+
const newCacheBuster = '952867';
|
|
58
58
|
expect(flourishSource.flourishUrl()).toBe(`https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=${oldCacheBuster}`);
|
|
59
59
|
let newFlourishSource = new FlourishSource_1.FlourishSource(mockFlourishData, context);
|
|
60
60
|
jest.spyOn(Date, 'now').mockImplementation(() => 1715159040000); // 8 May 2024 09:04:00
|
|
61
61
|
expect(newFlourishSource.flourishUrl()).toBe(`https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=${oldCacheBuster}`);
|
|
62
62
|
newFlourishSource = new FlourishSource_1.FlourishSource(mockFlourishData, context);
|
|
63
|
-
jest.spyOn(Date, 'now').mockImplementation(() =>
|
|
63
|
+
jest.spyOn(Date, 'now').mockImplementation(() => 1715160840000); // 8 May 2024 09:34:00
|
|
64
64
|
expect(newFlourishSource.flourishUrl()).toBe(`https://public.flourish.studio/test-type/1234/thumbnail?cacheBuster=${newCacheBuster}`);
|
|
65
65
|
});
|
|
66
66
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FlourishSource.test.js","sourceRoot":"","sources":["../../src/model/FlourishSource.test.ts"],"names":[],"mappings":";;AAAA,qDAAiD;AAGjD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,MAAM,gBAAgB,GAAG;QACvB,EAAE,EAAE,MAAM;QACV,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,cAAc;KAC5B,CAAA;IAED,MAAM,2BAA2B,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;IAC7C,MAAM,OAAO,GAAG;QACd,UAAU,EAAE,gBAAgB;QAC5B,WAAW,EAAE;YACX,OAAO,EAAE;gBACP,gBAAgB,EAAE,2BAA2B;aAC9C;SACF;KACyB,CAAA;IAE5B,IAAI,cAA8B,CAAA;IAElC,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,mBAAmB,GAAG,aAAa,CAAA,CAAC,sBAAsB;QAChE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAA;QAErE,cAAc,GAAG,IAAI,+BAAc,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACjD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CACvC,
|
|
1
|
+
{"version":3,"file":"FlourishSource.test.js","sourceRoot":"","sources":["../../src/model/FlourishSource.test.ts"],"names":[],"mappings":"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"}
|
package/lib/model/Image.js
CHANGED
|
@@ -1,19 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
-
};
|
|
8
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
9
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
10
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
|
-
};
|
|
13
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
4
|
};
|
|
16
|
-
var _CAPIImage_systemCode, _CAPIImage_dataSources;
|
|
17
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
6
|
exports.CAPIImage = void 0;
|
|
19
7
|
const metadata_1 = require("../helpers/metadata");
|
|
@@ -23,14 +11,17 @@ const scalars_1 = require("../resolvers/scalars");
|
|
|
23
11
|
const isError_1 = __importDefault(require("../helpers/isError"));
|
|
24
12
|
const errors_1 = require("@dotcom-reliability-kit/errors");
|
|
25
13
|
class CAPIImage {
|
|
14
|
+
capiImage;
|
|
15
|
+
context;
|
|
16
|
+
leadImage;
|
|
17
|
+
#systemCode;
|
|
18
|
+
#dataSources;
|
|
26
19
|
constructor(capiImage, context, leadImage) {
|
|
27
20
|
this.capiImage = capiImage;
|
|
28
21
|
this.context = context;
|
|
29
22
|
this.leadImage = leadImage;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
__classPrivateFieldSet(this, _CAPIImage_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
33
|
-
__classPrivateFieldSet(this, _CAPIImage_dataSources, context.dataSources, "f");
|
|
23
|
+
this.#systemCode = context.systemCode ?? 'cp-content-pipeline';
|
|
24
|
+
this.#dataSources = context.dataSources;
|
|
34
25
|
}
|
|
35
26
|
type() {
|
|
36
27
|
switch (this.capiImage.type) {
|
|
@@ -99,7 +90,7 @@ class CAPIImage {
|
|
|
99
90
|
url: (0, imageService_1.default)({
|
|
100
91
|
id,
|
|
101
92
|
url: this.capiImage.binaryUrl,
|
|
102
|
-
systemCode:
|
|
93
|
+
systemCode: this.#systemCode,
|
|
103
94
|
width: maxAllowedWidth,
|
|
104
95
|
dpr,
|
|
105
96
|
}),
|
|
@@ -110,7 +101,7 @@ class CAPIImage {
|
|
|
110
101
|
url() {
|
|
111
102
|
return (0, imageService_1.default)({
|
|
112
103
|
url: this.capiImage.binaryUrl,
|
|
113
|
-
systemCode:
|
|
104
|
+
systemCode: this.#systemCode,
|
|
114
105
|
});
|
|
115
106
|
}
|
|
116
107
|
async dimensions() {
|
|
@@ -120,8 +111,20 @@ class CAPIImage {
|
|
|
120
111
|
height: this.capiImage.pixelHeight,
|
|
121
112
|
};
|
|
122
113
|
}
|
|
114
|
+
// HACK:KB:20241029 graphics don't publish pixelWidth/pixelHeight due to a
|
|
115
|
+
// known issue in Spark. we want to avoid calling Image Service to improve
|
|
116
|
+
// performance. skip calling Image Service for graphics for the time being
|
|
117
|
+
// https://financialtimes.slack.com/archives/C02NXHEEN7J/p1729770129991129
|
|
118
|
+
if (this.type() === 'graphic') {
|
|
119
|
+
this.context.logger.warn({
|
|
120
|
+
event: 'SKIPPING_GRAPHICS_DIMENSIONS',
|
|
121
|
+
message: 'Not calling Image Service to get graphics dimensions',
|
|
122
|
+
url: this.capiImage.binaryUrl
|
|
123
|
+
});
|
|
124
|
+
return null;
|
|
125
|
+
}
|
|
123
126
|
try {
|
|
124
|
-
const imageMetadata = await
|
|
127
|
+
const imageMetadata = await this.#dataSources.origami.getImageMetadata(this.capiImage.binaryUrl);
|
|
125
128
|
return imageMetadata;
|
|
126
129
|
}
|
|
127
130
|
catch (error) {
|
|
@@ -151,5 +154,4 @@ class CAPIImage {
|
|
|
151
154
|
}
|
|
152
155
|
}
|
|
153
156
|
exports.CAPIImage = CAPIImage;
|
|
154
|
-
_CAPIImage_systemCode = new WeakMap(), _CAPIImage_dataSources = new WeakMap();
|
|
155
157
|
//# sourceMappingURL=Image.js.map
|
package/lib/model/Image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../src/model/Image.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../src/model/Image.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiD;AACjD,2EAAqD;AAOrD,8DAGmC;AACnC,kDAA6D;AAC7D,iEAAwC;AACxC,2DAA4E;AAoB5E,MAAa,SAAS;IAKV;IACA;IACA;IANV,WAAW,CAAQ;IACnB,YAAY,CAAa;IAEzB,YACU,SAA+B,EAC/B,OAAqB,EACrB,SAAqB;QAFrB,cAAS,GAAT,SAAS,CAAsB;QAC/B,YAAO,GAAP,OAAO,CAAc;QACrB,cAAS,GAAT,SAAS,CAAY;QAE7B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,IAAI,qBAAqB,CAAA;QAC9D,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,CAAA;IACzC,CAAC;IAED,IAAI;QACF,QAAQ,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAC5B,KAAK,4CAA4C;gBAC/C,OAAO,SAAS,CAAA;YAClB,KAAK,0CAA0C;gBAC7C,OAAO,OAAO,CAAA;QAClB,CAAC;QAED,0CAA0C;QAC1C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YACvB,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE,IAAI,kBAAS,CAAC;gBACnB,IAAI,EAAE,oBAAoB;gBAC1B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,2FAA2F;gBACzH,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC5B,CAAC;SACH,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,EAAE;QACA,MAAM,IAAI,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CACb,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,sCAAsC,CAC3D,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM;QACJ,IACE,IAAI,CAAC,SAAS;YACd,IAAA,sCAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAW,CAAC,MAAM,CAAC,EAC/D,CAAC;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAA;QAC5B,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAA;YAExC,IAAI,UAAU,KAAK,gBAAgB,EAAE,CAAC;gBACpC,OAAO,iBAAiB,CAAA;YAC1B,CAAC;YAED,IAAI,UAAU,KAAK,cAAc,EAAE,CAAC;gBAClC,OAAO,eAAe,CAAA;YACxB,CAAC;YAED,IAAI,IAAA,sCAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAW,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtE,OAAO,UAAU,CAAA;YACnB,CAAC;QACH,CAAC;QAED,6DAA6D;QAC7D,gEAAgE;QAChE,IAAI,IAAI,CAAC,SAAS,CAAC,eAAe,KAAK,OAAO,EAAE,CAAC;YAC/C,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,eAAe,KAAK,OAAO,EAAE,CAAC;YAC/C,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAqB;QACnC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,IAAI,GAAG,CAAA;QACxC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;QACpB,IAAI,eAAe,GAAG,cAAc,CAAA;QACpC,IAAI,MAAM,GAAG,CAAC,CAAA;QAEd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QAC1C,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,EAAE,KAAK,IAAI,QAAQ,CAAC,CAAA;QACzE,MAAM,GAAG,UAAU;YACjB,CAAC,CAAC,IAAI,CAAC,GAAG,CACN,IAAI,CAAC,MAAM,IAAI,QAAQ,EACvB,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,eAAe,CAAC,CAC/C;YACH,CAAC,CAAC,CAAC,CAAA;QAEL,MAAM,WAAW,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAE1D,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC/B,GAAG,EAAE,IAAA,sBAAe,EAAC;gBACnB,EAAE;gBACF,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;gBAC7B,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,KAAK,EAAE,eAAe;gBACtB,GAAG;aACJ,CAAC;YACF,KAAK,EAAE,eAAe;YACtB,GAAG;SACJ,CAAC,CAAC,CAAA;IACL,CAAC;IAED,GAAG;QACD,OAAO,IAAA,sBAAe,EAAC;YACrB,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;YAC7B,UAAU,EAAE,IAAI,CAAC,WAAW;SAC7B,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC5D,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU;gBAChC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW;aACnC,CAAA;QACH,CAAC;QAED,0EAA0E;QAC1E,0EAA0E;QAC1E,0EAA0E;QAC1E,0EAA0E;QAC1E,IAAG,IAAI,CAAC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBACvB,KAAK,EAAE,8BAA8B;gBACrC,OAAO,EAAE,sDAAsD;gBAC/D,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;aAC9B,CAAC,CAAA;YAEF,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CACpE,IAAI,CAAC,SAAS,CAAC,SAAS,CACzB,CAAA;YACD,OAAO,aAAa,CAAA;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;oBACvB,KAAK,EAAE,mBAAmB;oBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;wBAC1B,IAAI,EAAE,wBAAwB;wBAC9B,OAAO,EAAE,gCAAgC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;wBACnE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;wBAC7B,KAAK,EAAE,KAAK;qBACb,CAAC;iBACH,CAAC,CAAA;YACJ,CAAC;YAED,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,IAAI,IAAI,CAAA;IACjD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAA;IACrC,CAAC;IAED,GAAG;QACD,MAAM,QAAQ,GACZ,IAAI,CAAC,IAAI,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE,CAAA;QAClE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IACzE,CAAC;CACF;AA/KD,8BA+KC"}
|
|
@@ -6,7 +6,7 @@ export declare class LeadFlourish {
|
|
|
6
6
|
private capiResponse;
|
|
7
7
|
private context;
|
|
8
8
|
constructor(capiResponse: CapiResponse, context: QueryContext);
|
|
9
|
-
fallbackImage(): Promise<FlourishSource>;
|
|
9
|
+
fallbackImage(): Promise<FlourishSource | null>;
|
|
10
10
|
id(): string | null;
|
|
11
11
|
type(): string;
|
|
12
12
|
description(): string;
|
|
@@ -1,24 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
-
};
|
|
8
|
-
var _LeadFlourish_systemCode;
|
|
9
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
3
|
exports.LeadFlourish = void 0;
|
|
11
4
|
const FlourishSource_1 = require("./FlourishSource");
|
|
12
5
|
class LeadFlourish {
|
|
6
|
+
capiResponse;
|
|
7
|
+
context;
|
|
8
|
+
#systemCode;
|
|
13
9
|
constructor(capiResponse, context) {
|
|
14
10
|
this.capiResponse = capiResponse;
|
|
15
11
|
this.context = context;
|
|
16
|
-
|
|
17
|
-
__classPrivateFieldSet(this, _LeadFlourish_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
12
|
+
this.#systemCode = context.systemCode ?? 'cp-content-pipeline';
|
|
18
13
|
}
|
|
19
14
|
async fallbackImage() {
|
|
20
15
|
const flourishData = this.capiResponse.leadFlourish();
|
|
21
|
-
|
|
16
|
+
if (!flourishData) {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
return FlourishSource_1.FlourishSource.createWithMetadata(flourishData, this.context);
|
|
22
20
|
}
|
|
23
21
|
id() {
|
|
24
22
|
return this.capiResponse.leadFlourish()?.id || null;
|
|
@@ -31,5 +29,4 @@ class LeadFlourish {
|
|
|
31
29
|
}
|
|
32
30
|
}
|
|
33
31
|
exports.LeadFlourish = LeadFlourish;
|
|
34
|
-
_LeadFlourish_systemCode = new WeakMap();
|
|
35
32
|
//# sourceMappingURL=LeadFlourish.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeadFlourish.js","sourceRoot":"","sources":["../../src/model/LeadFlourish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LeadFlourish.js","sourceRoot":"","sources":["../../src/model/LeadFlourish.ts"],"names":[],"mappings":";;;AAEA,qDAAiD;AAEjD,MAAa,YAAY;IAGb;IACA;IAHV,WAAW,CAAQ;IACnB,YACU,YAA0B,EAC1B,OAAqB;QADrB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAAc;QAE7B,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,IAAI,qBAAqB,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAA;QACrD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,+BAAc,CAAC,kBAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;IACtE,CAAC;IAED,EAAE;QACA,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,EAAE,IAAI,IAAI,CAAA;IACrD,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,IAAI,IAAI,eAAe,CAAA;IAClE,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,WAAW,IAAI,EAAE,CAAA;IAC5D,CAAC;CACF;AA7BD,oCA6BC"}
|
|
@@ -9,11 +9,6 @@ const CapiResponse_1 = require("./CapiResponse");
|
|
|
9
9
|
const capiObject_1 = require("../fixtures/capiObject");
|
|
10
10
|
const clone_deep_1 = __importDefault(require("clone-deep"));
|
|
11
11
|
const context = {};
|
|
12
|
-
jest.mock('./FlourishSource', () => {
|
|
13
|
-
return {
|
|
14
|
-
FlourishSource: jest.fn().mockImplementation(() => ({})),
|
|
15
|
-
};
|
|
16
|
-
});
|
|
17
12
|
const leadFlourishData = {
|
|
18
13
|
id: 'test-id',
|
|
19
14
|
description: 'test-description',
|
|
@@ -29,13 +24,16 @@ describe('LeadFlourish', () => {
|
|
|
29
24
|
layoutWidth: 'full-width',
|
|
30
25
|
backgroundColour: 'paper',
|
|
31
26
|
};
|
|
27
|
+
jest.spyOn(FlourishSource_1.FlourishSource, 'getImageMetadata').mockResolvedValue({
|
|
28
|
+
width: 800,
|
|
29
|
+
height: 600
|
|
30
|
+
});
|
|
32
31
|
const capiResponse = new CapiResponse_1.CapiResponse(clonedBase, context);
|
|
33
32
|
leadFlourish = new LeadFlourish_1.LeadFlourish(capiResponse, context);
|
|
34
33
|
});
|
|
35
34
|
describe('fallbackImage', () => {
|
|
36
35
|
it('should instantiate a new FlourishSource', async () => {
|
|
37
|
-
await leadFlourish.fallbackImage();
|
|
38
|
-
expect(FlourishSource_1.FlourishSource).toHaveBeenCalledWith(leadFlourishData, context);
|
|
36
|
+
await expect(leadFlourish.fallbackImage()).resolves.toBeInstanceOf(FlourishSource_1.FlourishSource);
|
|
39
37
|
});
|
|
40
38
|
});
|
|
41
39
|
describe('id', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeadFlourish.test.js","sourceRoot":"","sources":["../../src/model/LeadFlourish.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA6C;AAC7C,qDAAiD;AACjD,iDAA6C;AAC7C,uDAAuD;AAEvD,4DAAkC;AAElC,MAAM,OAAO,GAAG,EAA6B,CAAA;AAE7C,
|
|
1
|
+
{"version":3,"file":"LeadFlourish.test.js","sourceRoot":"","sources":["../../src/model/LeadFlourish.test.ts"],"names":[],"mappings":";;;;;AAAA,iDAA6C;AAC7C,qDAAiD;AACjD,iDAA6C;AAC7C,uDAAuD;AAEvD,4DAAkC;AAElC,MAAM,OAAO,GAAG,EAA6B,CAAA;AAE7C,MAAM,gBAAgB,GAAG;IACvB,EAAE,EAAE,SAAS;IACb,WAAW,EAAE,kBAAkB;IAC/B,IAAI,EAAE,WAAW;CAClB,CAAA;AAGD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,YAA0B,CAAA;IAE9B,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,UAAU,GAAG,IAAA,oBAAS,EAAC,2BAAc,CAAC,CAAA;QAC5C,UAAU,CAAC,YAAY,GAAG,gBAAgB,CAAA;QAC1C,UAAU,CAAC,MAAM,GAAG;YAClB,MAAM,EAAE,UAAU;YAClB,WAAW,EAAE,YAAY;YACzB,gBAAgB,EAAE,OAAO;SAC1B,CAAA;QACD,IAAI,CAAC,KAAK,CAAC,+BAAc,EAAE,kBAAkB,CAAC,CAAC,iBAAiB,CAAC;YAC/D,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,GAAG;SACZ,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAC1D,YAAY,GAAG,IAAI,2BAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,+BAAc,CAAC,CAAA;QACpF,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QAClB,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;YAC9B,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,EAAE,CAAA;YAEhC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAChC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAA;YAElC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACvC,MAAM,eAAe,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAA;YACzE,YAAY,CAAC,WAAW,GAAG,eAAe,CAAA;YAE1C,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAA;YAEzC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;YAC3C,MAAM,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC5C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|
package/lib/model/Person.js
CHANGED
|
@@ -1,19 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
3
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
5
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
6
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
7
|
-
};
|
|
8
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
9
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
10
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
|
-
};
|
|
13
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
4
|
};
|
|
16
|
-
var _Person_systemCode;
|
|
17
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
6
|
exports.Person = void 0;
|
|
19
7
|
const imageService_1 = __importDefault(require("../helpers/imageService"));
|
|
@@ -23,6 +11,9 @@ const base_schema_1 = require("./schemas/capi/base-schema");
|
|
|
23
11
|
const flatten_formatted_zod_errors_1 = __importDefault(require("../helpers/flatten-formatted-zod-errors"));
|
|
24
12
|
const metadata_1 = require("../helpers/metadata");
|
|
25
13
|
class Person {
|
|
14
|
+
person;
|
|
15
|
+
context;
|
|
16
|
+
#systemCode;
|
|
26
17
|
static fromJson(data, context) {
|
|
27
18
|
const result = base_schema_1.CapiPerson.safeParse(data);
|
|
28
19
|
if (!result.success) {
|
|
@@ -62,8 +53,7 @@ class Person {
|
|
|
62
53
|
constructor(person, context) {
|
|
63
54
|
this.person = person;
|
|
64
55
|
this.context = context;
|
|
65
|
-
|
|
66
|
-
__classPrivateFieldSet(this, _Person_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
56
|
+
this.#systemCode = context.systemCode ?? 'cp-content-pipeline';
|
|
67
57
|
}
|
|
68
58
|
prefLabel() {
|
|
69
59
|
return this.person.prefLabel;
|
|
@@ -83,7 +73,7 @@ class Person {
|
|
|
83
73
|
return url
|
|
84
74
|
? (0, imageService_1.default)({
|
|
85
75
|
url,
|
|
86
|
-
systemCode:
|
|
76
|
+
systemCode: this.#systemCode,
|
|
87
77
|
width: args.width || 150,
|
|
88
78
|
dpr: args.dpr ?? undefined,
|
|
89
79
|
})
|
|
@@ -91,5 +81,4 @@ class Person {
|
|
|
91
81
|
}
|
|
92
82
|
}
|
|
93
83
|
exports.Person = Person;
|
|
94
|
-
_Person_systemCode = new WeakMap();
|
|
95
84
|
//# sourceMappingURL=Person.js.map
|
package/lib/model/Person.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Person.js","sourceRoot":"","sources":["../../src/model/Person.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Person.js","sourceRoot":"","sources":["../../src/model/Person.ts"],"names":[],"mappings":";;;;;;AACA,2EAAqD;AACrD,yFAAgE;AAChE,2DAAiE;AACjE,4DAA2E;AAE3E,2GAA+E;AAE/E,kDAAiD;AAGjD,MAAa,MAAM;IAiDG;IAA4B;IAhDhD,WAAW,CAAQ;IAEnB,MAAM,CAAC,QAAQ,CAAC,IAAa,EAAE,OAAqB;QAClD,MAAM,MAAM,GAAG,wBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,mBAAmB;gBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;oBAC1B,OAAO,EACL,mLAAmL;oBACrL,IAAI,EAAE,gCAAgC;oBACtC,WAAW,EAAE,IAAA,sCAAyB,EAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC;oBACnE,SAAS,EAAG,IAAwB,CAAC,EAAE;oBACvC,WAAW,EAAE,QAAQ;iBACtB,CAAC;aACH,CAAC,CAAA;YACF,OAAO,CAAC,OAAO,EAAE,KAAK,CACpB,mEAAmE,EACnE,CAAC,CACF,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,OAAO,EAAE,KAAK,CACpB,mEAAmE,EACnE,CAAC,CACF,CAAA;QACH,CAAC;QAED,OAAO,IAAI,MAAM,CAAC,IAAkB,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,wEAAwE;IACxE,0EAA0E;IAC1E,gDAAgD;IAChD,MAAM,CAAC,WAAW,CAAC,OAAgB,EAAE,OAAqB;QACxD,MAAM,UAAU,GAAe;YAC7B,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE;YAC9B,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;YAChC,sEAAsE;YACtE,SAAS;YACT,MAAM,EAAE,EAAE;SACX,CAAA;QAED,OAAO,IAAI,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACxC,CAAC;IAED,YAAoB,MAAkB,EAAU,OAAqB;QAAjD,WAAM,GAAN,MAAM,CAAY;QAAU,YAAO,GAAP,OAAO,CAAc;QACnE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,IAAI,qBAAqB,CAAA;IAChE,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,IAAI;QACF,OAAO,IAAA,sBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC;IAED,UAAU;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;QACxB,OAAO,6BAA6B,IAAI,EAAE,CAAA;IAC5C,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAC3B,CAAC;IAED,QAAQ,CAAC,IAAwB;QAC/B,MAAM,GAAG,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAE5C,OAAO,GAAG;YACR,CAAC,CAAC,IAAA,sBAAe,EAAC;gBACd,GAAG;gBACH,UAAU,EAAE,IAAI,CAAC,WAAW;gBAC5B,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,GAAG;gBACxB,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,SAAS;aAC3B,CAAC;YACJ,CAAC,CAAC,IAAI,CAAA;IACV,CAAC;CACF;AAlFD,wBAkFC"}
|
package/lib/model/Picture.js
CHANGED
|
@@ -11,6 +11,9 @@ function assertDefined(value, message) {
|
|
|
11
11
|
assert_1.default.notEqual(value, undefined, message);
|
|
12
12
|
}
|
|
13
13
|
class Picture {
|
|
14
|
+
imageSet;
|
|
15
|
+
isLiveBlog;
|
|
16
|
+
context;
|
|
14
17
|
constructor(imageSet, isLiveBlog, context) {
|
|
15
18
|
this.imageSet = imageSet;
|
|
16
19
|
this.isLiveBlog = isLiveBlog;
|