@financial-times/cp-content-pipeline-schema 0.7.1 → 0.7.3
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 +31 -0
- package/README.md +1 -2
- package/lib/content-tree/references/Flourish.js +1 -1
- package/lib/content-tree/references/Flourish.js.map +1 -1
- package/lib/content-tree/references/RawImage.js +5 -3
- package/lib/content-tree/references/RawImage.js.map +1 -1
- package/lib/datasources/capi.d.ts +6 -1
- package/lib/datasources/capi.js +11 -1
- package/lib/datasources/capi.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.js +13 -8
- package/lib/index.js.map +1 -1
- package/lib/model/CapiResponse.d.ts +4 -2
- package/lib/model/CapiResponse.js.map +1 -1
- package/lib/model/Concept.js +1 -1
- package/lib/model/Concept.js.map +1 -1
- package/lib/model/Image.d.ts +6 -8
- package/lib/model/Image.js +10 -10
- package/lib/model/Image.js.map +1 -1
- package/lib/model/Image.test.js +3 -3
- package/lib/model/Image.test.js.map +1 -1
- package/lib/model/Topper.d.ts +3 -1
- package/lib/model/Topper.js +6 -1
- package/lib/model/Topper.js.map +1 -1
- package/lib/model/schemas/capi/base-schema.d.ts +95 -0
- package/lib/model/schemas/capi/base-schema.js +21 -1
- package/lib/model/schemas/capi/base-schema.js.map +1 -1
- package/lib/{concept.d.ts → typedefs/concept.d.ts} +2 -2
- package/lib/typedefs/concept.js.map +1 -0
- package/lib/{content.d.ts → typedefs/content.d.ts} +1 -1
- package/lib/{content.js → typedefs/content.js} +3 -3
- package/lib/typedefs/content.js.map +1 -0
- package/lib/{image.d.ts → typedefs/image.d.ts} +1 -1
- package/lib/{image.js → typedefs/image.js} +16 -37
- package/lib/typedefs/image.js.map +1 -0
- package/lib/typedefs/literal-union.d.ts +14 -0
- package/lib/typedefs/literal-union.js +31 -0
- package/lib/typedefs/literal-union.js.map +1 -0
- package/lib/typedefs/picture.d.ts +14 -0
- package/lib/{picture.js → typedefs/picture.js} +1 -10
- package/lib/typedefs/picture.js.map +1 -0
- package/lib/{richText.d.ts → typedefs/richText.d.ts} +2 -2
- package/lib/{richText.js → typedefs/richText.js} +4 -9
- package/lib/typedefs/richText.js.map +1 -0
- package/lib/{richText.test.js → typedefs/richText.test.js} +1 -1
- package/lib/typedefs/richText.test.js.map +1 -0
- package/lib/typedefs/scalars.d.ts +16 -0
- package/lib/typedefs/scalars.js +64 -0
- package/lib/typedefs/scalars.js.map +1 -0
- package/lib/{teaser.d.ts → typedefs/teaser.d.ts} +1 -1
- package/lib/{teaser.js → typedefs/teaser.js} +0 -6
- package/lib/typedefs/teaser.js.map +1 -0
- package/lib/{topper.d.ts → typedefs/topper.d.ts} +1 -1
- package/lib/{topper.js → typedefs/topper.js} +0 -12
- package/lib/{topper.js.map → typedefs/topper.js.map} +1 -1
- package/package.json +2 -2
- package/src/content-tree/references/Flourish.ts +1 -1
- package/src/content-tree/references/RawImage.ts +7 -3
- package/src/datasources/capi.ts +25 -2
- package/src/index.ts +34 -9
- package/src/model/CapiResponse.ts +4 -2
- package/src/model/Concept.ts +1 -1
- package/src/model/Image.test.ts +4 -4
- package/src/model/Image.ts +14 -14
- package/src/model/Topper.ts +13 -2
- package/src/model/schemas/capi/base-schema.ts +23 -0
- package/src/{concept.ts → typedefs/concept.ts} +2 -2
- package/src/{content.ts → typedefs/content.ts} +5 -5
- package/src/{image.ts → typedefs/image.ts} +28 -48
- package/src/typedefs/literal-union.ts +57 -0
- package/src/{picture.ts → typedefs/picture.ts} +1 -11
- package/src/{richText.test.ts → typedefs/richText.test.ts} +2 -2
- package/src/{richText.ts → typedefs/richText.ts} +5 -10
- package/src/typedefs/scalars.ts +93 -0
- package/src/{teaser.ts → typedefs/teaser.ts} +2 -8
- package/src/{topper.ts → typedefs/topper.ts} +2 -14
- package/src/types/internal-content.d.ts +4 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/lib/concept.js.map +0 -1
- package/lib/content.js.map +0 -1
- package/lib/image.js.map +0 -1
- package/lib/picture.d.ts +0 -18
- package/lib/picture.js.map +0 -1
- package/lib/richText.js.map +0 -1
- package/lib/richText.test.js.map +0 -1
- package/lib/teaser.js.map +0 -1
- /package/lib/{concept.js → typedefs/concept.js} +0 -0
- /package/lib/{richText.test.d.ts → typedefs/richText.test.d.ts} +0 -0
- /package/src/{__snapshots__ → typedefs/__snapshots__}/richText.test.ts.snap +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.7.3](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.7.2...cp-content-pipeline-schema-v0.7.3) (2023-03-30)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* add a capi datasource method for querying the notifications api ([dd256cb](https://github.com/Financial-Times/cp-content-pipeline/commit/dd256cbe89c08216ca701f9874ec11185bd7f059))
|
|
9
|
+
* add a CAPI-notification-polling worker ([dd256cb](https://github.com/Financial-Times/cp-content-pipeline/commit/dd256cbe89c08216ca701f9874ec11185bd7f059))
|
|
10
|
+
* increase article TTL to four weeks ([dd256cb](https://github.com/Financial-Times/cp-content-pipeline/commit/dd256cbe89c08216ca701f9874ec11185bd7f059))
|
|
11
|
+
|
|
12
|
+
## [0.7.2](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.7.1...cp-content-pipeline-schema-v0.7.2) (2023-03-16)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
* add a class for literal union scalar graphql types ([01a0f27](https://github.com/Financial-Times/cp-content-pipeline/commit/01a0f27f2d07749c84c5c779b427a2f69702fd04))
|
|
18
|
+
* add an image format scalar ([4a5357d](https://github.com/Financial-Times/cp-content-pipeline/commit/4a5357d11119af9b33cc6683304f2427bd384e1d))
|
|
19
|
+
* generate types for scalars ([0ce155e](https://github.com/Financial-Times/cp-content-pipeline/commit/0ce155e64ce9691dde2b123963d5159d89f5b18d))
|
|
20
|
+
* include id property in image responses ([de16578](https://github.com/Financial-Times/cp-content-pipeline/commit/de165784f7a26a3173f9e9b5a95b89e21c1e30ef))
|
|
21
|
+
* remove unused alt field from image fragment (it's on the imageset) ([9c6d58f](https://github.com/Financial-Times/cp-content-pipeline/commit/9c6d58f9a90b307cb96c7a21551d6227d92aaafb))
|
|
22
|
+
* ue a scalar for package design ([363b430](https://github.com/Financial-Times/cp-content-pipeline/commit/363b430a121c02970bdd29749d7e77a969c8f612))
|
|
23
|
+
* use a scalar for access level ([10345dd](https://github.com/Financial-Times/cp-content-pipeline/commit/10345dd884ed0b97eb93c7f203441fe45cf520e8))
|
|
24
|
+
* use a scalar for image types ([dc11dcf](https://github.com/Financial-Times/cp-content-pipeline/commit/dc11dcfaa5323e64debf5e4c04dfb359d4558f58))
|
|
25
|
+
* use a scalar for rich text source ([2b30a5e](https://github.com/Financial-Times/cp-content-pipeline/commit/2b30a5e86be4a3575b0fc500b17522f24a96cdd0))
|
|
26
|
+
* use a scalar for topper background colour ([530d0f3](https://github.com/Financial-Times/cp-content-pipeline/commit/530d0f3f7691f8ece617f7629f2bcc132ba027a5))
|
|
27
|
+
* use new scalar type for image format in resolvers and model ([e753aba](https://github.com/Financial-Times/cp-content-pipeline/commit/e753aba5a0ca78d980d61178c3ad07809e8b07d2))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
### Bug Fixes
|
|
31
|
+
|
|
32
|
+
* return correct format for ftEditSquare image ([e5e46c0](https://github.com/Financial-Times/cp-content-pipeline/commit/e5e46c0d42f9afea23e71cb968e230b22a1b68f2))
|
|
33
|
+
|
|
3
34
|
## [0.7.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.7.0...cp-content-pipeline-schema-v0.7.1) (2023-03-14)
|
|
4
35
|
|
|
5
36
|
|
package/README.md
CHANGED
|
@@ -38,8 +38,7 @@ import {
|
|
|
38
38
|
} from '@financial-times/cp-content-pipeline-schema'
|
|
39
39
|
```
|
|
40
40
|
|
|
41
|
-
The schema is a collection of type definitions that is exported as `typeDefs`. It defines the 'shape' of queries that
|
|
42
|
-
are executed against our data.
|
|
41
|
+
The schema is a collection of type definitions that is exported as `typeDefs`. It defines the 'shape' of queries that are executed against our data.
|
|
43
42
|
|
|
44
43
|
The schema is split into files at the root of the `src` directory and brought together in `src/index.ts` for export.
|
|
45
44
|
|
|
@@ -20,7 +20,7 @@ class FlourishResolver {
|
|
|
20
20
|
const imageMetadata = await context.dataSources.origami.getImageMetadata(flourishUrl);
|
|
21
21
|
const imageServiceWrappedUrl = (0, imageService_js_1.default)({
|
|
22
22
|
url: flourishUrl,
|
|
23
|
-
systemCode: context.systemCode,
|
|
23
|
+
systemCode: context.systemCode ?? 'cp-content-pipeline',
|
|
24
24
|
width: imageMetadata?.width || DEFAULT_WIDTH,
|
|
25
25
|
});
|
|
26
26
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Flourish.js","sourceRoot":"","sources":["../../../src/content-tree/references/Flourish.ts"],"names":[],"mappings":";;;;;;AACA,6CAAiC;AAGjC,oFAA2D;AAC3D,iDAAgD;AAEhD,MAAa,gBAAgB;IAA7B;QACE,kBAAa,GAAG,KAAK,EACnB,MAAmD,EACnD,KAAc,EACd,OAAqB,EACrB,EAAE;YACF,MAAM,aAAa,GAAG,IAAI,CAAA;YAC1B,MAAM,cAAc,GAAG,IAAI,CAAA;YAE3B,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAA;YAC1C,MAAM,SAAS,GACb,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,KAAK,QAAQ;gBAC5C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS;gBAC5B,CAAC,CAAC,KAAK,CAAA;YAEX,MAAM,WAAW,GAAG,kCAAkC,IAAI,IACxD,MAAM,CAAC,SAAS,CAAC,EACnB,aAAa,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;YAC3D,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CACtE,WAAW,CACZ,CAAA;YAED,MAAM,sBAAsB,GAAG,IAAA,yBAAe,EAAC;gBAC7C,GAAG,EAAE,WAAW;gBAChB,UAAU,EAAE,OAAO,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"Flourish.js","sourceRoot":"","sources":["../../../src/content-tree/references/Flourish.ts"],"names":[],"mappings":";;;;;;AACA,6CAAiC;AAGjC,oFAA2D;AAC3D,iDAAgD;AAEhD,MAAa,gBAAgB;IAA7B;QACE,kBAAa,GAAG,KAAK,EACnB,MAAmD,EACnD,KAAc,EACd,OAAqB,EACrB,EAAE;YACF,MAAM,aAAa,GAAG,IAAI,CAAA;YAC1B,MAAM,cAAc,GAAG,IAAI,CAAA;YAE3B,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAA;YAC1C,MAAM,SAAS,GACb,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,KAAK,QAAQ;gBAC5C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS;gBAC5B,CAAC,CAAC,KAAK,CAAA;YAEX,MAAM,WAAW,GAAG,kCAAkC,IAAI,IACxD,MAAM,CAAC,SAAS,CAAC,EACnB,aAAa,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;YAC3D,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CACtE,WAAW,CACZ,CAAA;YAED,MAAM,sBAAsB,GAAG,IAAA,yBAAe,EAAC;gBAC7C,GAAG,EAAE,WAAW;gBAChB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,qBAAqB;gBACvD,KAAK,EAAE,aAAa,EAAE,KAAK,IAAI,aAAa;aAC7C,CAAC,CAAA;YAEF,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,sBAAsB;gBAC3B,SAAS,EAAE,EAAE;gBACb,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,aAAa;gBAClE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc;aACvE,CAAA;QACH,CAAC,CAAA;IACH,CAAC;CAAA;AArCD,4CAqCC;AAED,MAAM,QAAQ,GAAqB;IACjC,OAAO,EAAE,IAAA,iBAAG,EAAA;;;;;;;QAON,8BAAe;;MAEjB;IACJ,OAAO,EAAE,IAAI,gBAAgB,EAAE;CAChC,CAAA;AAED,kBAAe,QAAQ,CAAA"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const graphql_tag_1 = require("graphql-tag");
|
|
7
|
-
const Image_js_1 = require("../../model/Image.js");
|
|
8
7
|
const index_js_1 = require("@dotcom-reliability-kit/log-error/lib/index.js");
|
|
9
8
|
const Reference_js_1 = require("./Reference.js");
|
|
10
9
|
const imageService_js_1 = __importDefault(require("../../helpers/imageService.js"));
|
|
@@ -17,7 +16,7 @@ class RawImageModel {
|
|
|
17
16
|
this.context = context;
|
|
18
17
|
}
|
|
19
18
|
type() {
|
|
20
|
-
return
|
|
19
|
+
return 'image';
|
|
21
20
|
}
|
|
22
21
|
caption() {
|
|
23
22
|
return this.rawImage.caption;
|
|
@@ -31,6 +30,9 @@ class RawImageModel {
|
|
|
31
30
|
url() {
|
|
32
31
|
return this.rawImage.url;
|
|
33
32
|
}
|
|
33
|
+
id() {
|
|
34
|
+
return this.url();
|
|
35
|
+
}
|
|
34
36
|
async dimensions() {
|
|
35
37
|
if (this.rawImage.height && this.rawImage.width) {
|
|
36
38
|
return {
|
|
@@ -65,7 +67,7 @@ class RawImageModel {
|
|
|
65
67
|
return resolutions.map((dpr) => ({
|
|
66
68
|
url: (0, imageService_js_1.default)({
|
|
67
69
|
url: this.url(),
|
|
68
|
-
systemCode: this.context.systemCode,
|
|
70
|
+
systemCode: this.context.systemCode ?? 'cp-content-pipeline',
|
|
69
71
|
width: maxAllowedWidth,
|
|
70
72
|
dpr,
|
|
71
73
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RawImage.js","sourceRoot":"","sources":["../../../src/content-tree/references/RawImage.ts"],"names":[],"mappings":";;;;;AAAA,6CAAiC;
|
|
1
|
+
{"version":3,"file":"RawImage.js","sourceRoot":"","sources":["../../../src/content-tree/references/RawImage.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { WillSendRequestOptions } from '@apollo/datasource-rest';
|
|
4
4
|
import { CapiResponse } from '../model/CapiResponse.js';
|
|
5
5
|
import { InstrumentedRESTDataSource } from './instrumented.js';
|
|
6
|
-
import { CapiPerson } from '../types/internal-content.js';
|
|
6
|
+
import { CapiNotificationResponse, CapiPerson } from '../types/internal-content.js';
|
|
7
7
|
import { CacheOptions } from '@apollo/datasource-rest/dist/RESTDataSource.js';
|
|
8
8
|
export declare class CapiDataSource extends InstrumentedRESTDataSource {
|
|
9
9
|
baseURL: string;
|
|
@@ -13,8 +13,13 @@ export declare class CapiDataSource extends InstrumentedRESTDataSource {
|
|
|
13
13
|
backendSystemCodes: string[];
|
|
14
14
|
abortController: AbortController;
|
|
15
15
|
timeout: ReturnType<typeof setTimeout> | undefined;
|
|
16
|
+
nextNotificationLink?: string;
|
|
16
17
|
willSendRequest(request: WillSendRequestOptions): void;
|
|
17
18
|
protected cacheOptionsFor(url: string): CacheOptions | undefined;
|
|
18
19
|
getContent(uuid: string): Promise<CapiResponse>;
|
|
19
20
|
getPerson(uuid: string): Promise<CapiPerson>;
|
|
21
|
+
getNotifications({ since, page, }: {
|
|
22
|
+
since: Date;
|
|
23
|
+
page?: string;
|
|
24
|
+
}): Promise<CapiNotificationResponse>;
|
|
20
25
|
}
|
package/lib/datasources/capi.js
CHANGED
|
@@ -5,6 +5,7 @@ const CapiResponse_js_1 = require("../model/CapiResponse.js");
|
|
|
5
5
|
const instrumented_js_1 = require("./instrumented.js");
|
|
6
6
|
const errors_1 = require("@dotcom-reliability-kit/errors");
|
|
7
7
|
const log_error_1 = require("@dotcom-reliability-kit/log-error");
|
|
8
|
+
const base_schema_js_1 = require("../model/schemas/capi/base-schema.js");
|
|
8
9
|
function flattenFormattedZodIssues(issues, path = [], flattened = []) {
|
|
9
10
|
if (issues._errors.length > 0) {
|
|
10
11
|
flattened.push(...issues._errors.map((error) => `${path.join('.')}: ${error}`));
|
|
@@ -25,7 +26,7 @@ class CapiDataSource extends instrumented_js_1.InstrumentedRESTDataSource {
|
|
|
25
26
|
this.capiKey = process.env.CAPI_API_KEY || '';
|
|
26
27
|
this.articleCacheTTL = process.env.ARTICLE_CACHE_TTL
|
|
27
28
|
? parseInt(process.env.ARTICLE_CACHE_TTL)
|
|
28
|
-
: 60; //
|
|
29
|
+
: 60 * 60 * 24 * 7 * 4; // 4 weeks
|
|
29
30
|
this.peopleCacheTTL = process.env.PEOPLE_CACHE_TTL
|
|
30
31
|
? parseInt(process.env.PEOPLE_CACHE_TTL)
|
|
31
32
|
: 600; // 10 minutes
|
|
@@ -99,6 +100,15 @@ class CapiDataSource extends instrumented_js_1.InstrumentedRESTDataSource {
|
|
|
99
100
|
async getPerson(uuid) {
|
|
100
101
|
return this.get(`people/${uuid}`);
|
|
101
102
|
}
|
|
103
|
+
async getNotifications({ since, page, }) {
|
|
104
|
+
const response = await this.get('content/notifications', {
|
|
105
|
+
params: {
|
|
106
|
+
since: since.toISOString(),
|
|
107
|
+
...(page ? { page } : {}),
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
return base_schema_js_1.capiNotificationResponse.parse(response);
|
|
111
|
+
}
|
|
102
112
|
}
|
|
103
113
|
exports.CapiDataSource = CapiDataSource;
|
|
104
114
|
//# sourceMappingURL=capi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":";;;AACA,8DAAuD;AACvD,uDAA8D;
|
|
1
|
+
{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -8,10 +8,11 @@ interface Metrics {
|
|
|
8
8
|
export interface QueryContext {
|
|
9
9
|
metrics: Metrics;
|
|
10
10
|
dataSources: DataSources;
|
|
11
|
-
systemCode
|
|
11
|
+
systemCode?: string;
|
|
12
12
|
requestId?: string;
|
|
13
13
|
logger: Logger;
|
|
14
14
|
}
|
|
15
15
|
export declare const resolvers: IResolvers<unknown, Pick<QueryContext, 'dataSources'>>;
|
|
16
16
|
export declare const typeDefs: (import("graphql").DocumentNode | import("graphql").DocumentNode[])[];
|
|
17
17
|
export { initDataSources, DataSources };
|
|
18
|
+
export { resolvers as scalars } from './typedefs/scalars.js';
|
package/lib/index.js
CHANGED
|
@@ -3,18 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.initDataSources = exports.typeDefs = exports.resolvers = exports.version = void 0;
|
|
6
|
+
exports.scalars = exports.initDataSources = exports.typeDefs = exports.resolvers = exports.version = void 0;
|
|
7
7
|
const graphql_tag_1 = require("graphql-tag");
|
|
8
8
|
const index_js_1 = require("./datasources/index.js");
|
|
9
9
|
Object.defineProperty(exports, "initDataSources", { enumerable: true, get: function () { return index_js_1.initDataSources; } });
|
|
10
|
-
const content_js_1 = require("./content.js");
|
|
11
|
-
const concept_js_1 = require("./concept.js");
|
|
12
|
-
const picture_js_1 = require("./picture.js");
|
|
13
|
-
const image_js_1 = require("./image.js");
|
|
14
|
-
const topper_js_1 = require("./topper.js");
|
|
15
|
-
const richText_js_1 = require("./richText.js");
|
|
16
|
-
const teaser_js_1 = require("./teaser.js");
|
|
10
|
+
const content_js_1 = require("./typedefs/content.js");
|
|
11
|
+
const concept_js_1 = require("./typedefs/concept.js");
|
|
12
|
+
const picture_js_1 = require("./typedefs/picture.js");
|
|
13
|
+
const image_js_1 = require("./typedefs/image.js");
|
|
14
|
+
const topper_js_1 = require("./typedefs/topper.js");
|
|
15
|
+
const richText_js_1 = require("./typedefs/richText.js");
|
|
16
|
+
const teaser_js_1 = require("./typedefs/teaser.js");
|
|
17
17
|
const index_js_2 = require("./content-tree/references/index.js");
|
|
18
|
+
const scalars_js_1 = require("./typedefs/scalars.js");
|
|
18
19
|
const fs_1 = __importDefault(require("fs"));
|
|
19
20
|
const path_1 = __importDefault(require("path"));
|
|
20
21
|
const packageJson = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../package.json'), 'utf-8'));
|
|
@@ -38,6 +39,7 @@ exports.resolvers = {
|
|
|
38
39
|
return content;
|
|
39
40
|
},
|
|
40
41
|
},
|
|
42
|
+
...scalars_js_1.resolvers,
|
|
41
43
|
...concept_js_1.resolvers,
|
|
42
44
|
...content_js_1.resolvers,
|
|
43
45
|
...picture_js_1.resolvers,
|
|
@@ -48,6 +50,7 @@ exports.resolvers = {
|
|
|
48
50
|
...teaser_js_1.resolvers,
|
|
49
51
|
};
|
|
50
52
|
exports.typeDefs = [
|
|
53
|
+
scalars_js_1.typeDef,
|
|
51
54
|
content_js_1.typeDef,
|
|
52
55
|
concept_js_1.typeDef,
|
|
53
56
|
picture_js_1.typeDef,
|
|
@@ -58,4 +61,6 @@ exports.typeDefs = [
|
|
|
58
61
|
...index_js_2.typeDef,
|
|
59
62
|
coreTypeDefs,
|
|
60
63
|
];
|
|
64
|
+
var scalars_js_2 = require("./typedefs/scalars.js");
|
|
65
|
+
Object.defineProperty(exports, "scalars", { enumerable: true, get: function () { return scalars_js_2.resolvers; } });
|
|
61
66
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,6CAAiC;AAEjC,qDAAqE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,6CAAiC;AAEjC,qDAAqE;AA4G5D,gGA5GA,0BAAe,OA4GA;AA1GxB,sDAG8B;AAC9B,sDAG8B;AAC9B,sDAG8B;AAC9B,kDAG4B;AAC5B,oDAG6B;AAC7B,wDAG+B;AAC/B,oDAG6B;AAC7B,iEAG2C;AAC3C,sDAG8B;AAG9B,4CAAmB;AACnB,gDAAuB;AAEvB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,CACrE,CAAA;AACY,QAAA,OAAO,GAAG,WAAW,CAAC,OAAO,CAAA;AAE1C,MAAM,YAAY,GAAG,IAAA,iBAAG,EAAA;;;;;;;;CAQvB,CAAA;AAcY,QAAA,SAAS,GAGlB;IACF,KAAK,EAAE;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,eAAO;QACtB,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO;YACjC,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvD,CAAC;QACD,eAAe,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE;YAC5B,OAAO,OAAO,CAAA;QAChB,CAAC;KACF;IAED,GAAG,sBAAe;IAClB,GAAG,sBAAgB;IACnB,GAAG,sBAAgB;IACnB,GAAG,sBAAgB;IACnB,GAAG,oBAAc;IACjB,GAAG,oBAAkB;IACrB,GAAG,qBAAe;IAClB,GAAG,uBAAiB;IACpB,GAAG,qBAAoB;CACxB,CAAA;AAEY,QAAA,QAAQ,GAAG;IACtB,oBAAO;IACP,oBAAO;IACP,oBAAO;IACP,oBAAO;IACP,kBAAK;IACL,mBAAM;IACN,qBAAQ;IACR,mBAAW;IACX,GAAG,kBAAU;IACb,YAAY;CACb,CAAA;AAGD,oDAA4D;AAAnD,qGAAA,SAAS,OAAW"}
|
|
@@ -2,10 +2,12 @@ import type { Article, LiveBlogPackage, ContentPackage, ImageSet, Audio } from '
|
|
|
2
2
|
import { CAPIImage } from './Image.js';
|
|
3
3
|
import { Concept } from './Concept.js';
|
|
4
4
|
import type { QueryContext } from '../index.js';
|
|
5
|
+
import { LiteralUnionScalarValues } from '../typedefs/literal-union.js';
|
|
6
|
+
import { AccessLevel, PackageDesign } from '../typedefs/scalars.js';
|
|
5
7
|
declare type ContentTypeSchemas = Article | LiveBlogPackage | ContentPackage | Audio;
|
|
6
8
|
declare type MetaFields = 'link' | 'altLink' | 'prefixText' | 'suffixText';
|
|
7
9
|
declare type Design = {
|
|
8
|
-
theme:
|
|
10
|
+
theme: LiteralUnionScalarValues<typeof PackageDesign>;
|
|
9
11
|
layout?: 'default' | 'wide';
|
|
10
12
|
};
|
|
11
13
|
export declare class CapiResponse {
|
|
@@ -1915,7 +1917,7 @@ export declare class CapiResponse {
|
|
|
1915
1917
|
backgroundColour: string;
|
|
1916
1918
|
layout: string;
|
|
1917
1919
|
} | null | undefined;
|
|
1918
|
-
accessLevel():
|
|
1920
|
+
accessLevel(): LiteralUnionScalarValues<typeof AccessLevel>;
|
|
1919
1921
|
summary(): {
|
|
1920
1922
|
bodyXML: string;
|
|
1921
1923
|
} | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapiResponse.js","sourceRoot":"","sources":["../../src/model/CapiResponse.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,6FAA0D;AAC1D,4DAAkC;AAClC,yCAAsC;AACtC,6CAAsC;AAGtC,wDAAoD;AAEpD,sDAAiD;
|
|
1
|
+
{"version":3,"file":"CapiResponse.js","sourceRoot":"","sources":["../../src/model/CapiResponse.ts"],"names":[],"mappings":"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"}
|
package/lib/model/Concept.js
CHANGED
|
@@ -33,7 +33,7 @@ class Concept {
|
|
|
33
33
|
_Concept_dataSources.set(this, void 0);
|
|
34
34
|
_Concept_systemCode.set(this, void 0);
|
|
35
35
|
__classPrivateFieldSet(this, _Concept_dataSources, context.dataSources, "f");
|
|
36
|
-
__classPrivateFieldSet(this, _Concept_systemCode, context.systemCode, "f");
|
|
36
|
+
__classPrivateFieldSet(this, _Concept_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
37
37
|
}
|
|
38
38
|
apiUrl() {
|
|
39
39
|
return this.capiConcept.apiUrl;
|
package/lib/model/Concept.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Concept.js","sourceRoot":"","sources":["../../src/model/Concept.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAGA,wDAAoD;AACpD,iFAAwD;AACxD,mFAAuD;AAEvD,MAAM,cAAc,GAAG,6CAA6C,CAAA;AACpE,MAAM,QAAQ,GAAG,4BAA4B,CAAA;AAC7C,MAAM,MAAM,GAAG,oBAAoB,CAAA;AAYtB,QAAA,UAAU,GAAG;IACxB,SAAS,EAAE,iDAAiD;IAC5D,cAAc,EAAE,0DAA0D;IAC1E,aAAa,EAAE,0CAA0C;CACjD,CAAA;AAcV,MAAa,OAAO;IAIlB,YAAoB,WAAuB,EAAE,OAAqB;QAA9C,gBAAW,GAAX,WAAW,CAAY;QAH3C,uCAAyB;QACzB,sCAAmB;QAGjB,uBAAA,IAAI,wBAAgB,OAAO,CAAC,WAAW,MAAA,CAAA;QACvC,uBAAA,IAAI,uBAAe,OAAO,CAAC,UAAU,MAAA,CAAA;
|
|
1
|
+
{"version":3,"file":"Concept.js","sourceRoot":"","sources":["../../src/model/Concept.ts"],"names":[],"mappings":"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"}
|
package/lib/model/Image.d.ts
CHANGED
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import type { Image as InternalContentImage } from '../types/internal-content.js';
|
|
2
2
|
import type { QueryContext } from '../index.js';
|
|
3
3
|
import { ContentTree } from '@financial-times/content-tree';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
readonly Graphic: "http://www.ft.com/ontology/content/Graphic";
|
|
7
|
-
};
|
|
8
|
-
export declare type ImageTypes = typeof ImageType[keyof typeof ImageType];
|
|
4
|
+
import { LiteralUnionScalarValues } from '../typedefs/literal-union.js';
|
|
5
|
+
import { ImageFormat, ImageType } from '../typedefs/scalars.js';
|
|
9
6
|
export declare type ImageSource = {
|
|
10
7
|
url: string;
|
|
11
8
|
width?: number;
|
|
@@ -16,7 +13,7 @@ export declare type ImageSourceArgs = {
|
|
|
16
13
|
maxDpr?: number;
|
|
17
14
|
};
|
|
18
15
|
export interface Image {
|
|
19
|
-
type():
|
|
16
|
+
type(): LiteralUnionScalarValues<typeof ImageType>;
|
|
20
17
|
caption(): string | null;
|
|
21
18
|
credit(): string | null;
|
|
22
19
|
alt(): string;
|
|
@@ -27,6 +24,7 @@ export interface Image {
|
|
|
27
24
|
sourceSet(args: ImageSourceArgs): Promise<ImageSource[]>;
|
|
28
25
|
format(): ContentTree.Image['format'];
|
|
29
26
|
url(): string;
|
|
27
|
+
id(): string;
|
|
30
28
|
}
|
|
31
29
|
export declare class CAPIImage implements Image {
|
|
32
30
|
#private;
|
|
@@ -66,9 +64,9 @@ export declare class CAPIImage implements Image {
|
|
|
66
64
|
binaryUrl: string;
|
|
67
65
|
};
|
|
68
66
|
} | undefined);
|
|
69
|
-
type(): "
|
|
67
|
+
type(): "image" | "graphic";
|
|
70
68
|
id(): string;
|
|
71
|
-
format():
|
|
69
|
+
format(): LiteralUnionScalarValues<typeof ImageFormat>;
|
|
72
70
|
sourceSet(args: ImageSourceArgs): Promise<{
|
|
73
71
|
url: string;
|
|
74
72
|
width: number;
|
package/lib/model/Image.js
CHANGED
|
@@ -15,14 +15,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
15
15
|
};
|
|
16
16
|
var _CAPIImage_systemCode, _CAPIImage_dataSources;
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.CAPIImage =
|
|
18
|
+
exports.CAPIImage = void 0;
|
|
19
19
|
const metadata_js_1 = require("../helpers/metadata.js");
|
|
20
20
|
const imageService_js_1 = __importDefault(require("../helpers/imageService.js"));
|
|
21
21
|
const index_js_1 = require("@dotcom-reliability-kit/log-error/lib/index.js");
|
|
22
|
-
exports.ImageType = {
|
|
23
|
-
Image: 'http://www.ft.com/ontology/content/Image',
|
|
24
|
-
Graphic: 'http://www.ft.com/ontology/content/Graphic',
|
|
25
|
-
};
|
|
26
22
|
function isError(error) {
|
|
27
23
|
return error instanceof Error;
|
|
28
24
|
}
|
|
@@ -33,11 +29,16 @@ class CAPIImage {
|
|
|
33
29
|
this.leadImage = leadImage;
|
|
34
30
|
_CAPIImage_systemCode.set(this, void 0);
|
|
35
31
|
_CAPIImage_dataSources.set(this, void 0);
|
|
36
|
-
__classPrivateFieldSet(this, _CAPIImage_systemCode, context.systemCode, "f");
|
|
32
|
+
__classPrivateFieldSet(this, _CAPIImage_systemCode, context.systemCode ?? 'cp-content-pipeline', "f");
|
|
37
33
|
__classPrivateFieldSet(this, _CAPIImage_dataSources, context.dataSources, "f");
|
|
38
34
|
}
|
|
39
35
|
type() {
|
|
40
|
-
|
|
36
|
+
switch (this.capiImage.type) {
|
|
37
|
+
case 'http://www.ft.com/ontology/content/Graphic':
|
|
38
|
+
return 'graphic';
|
|
39
|
+
case 'http://www.ft.com/ontology/content/Image':
|
|
40
|
+
return 'image';
|
|
41
|
+
}
|
|
41
42
|
}
|
|
42
43
|
id() {
|
|
43
44
|
const uuid = (0, metadata_js_1.uuidFromUrl)(this.capiImage.id);
|
|
@@ -55,9 +56,8 @@ class CAPIImage {
|
|
|
55
56
|
if (capiFormat === 'standardInline') {
|
|
56
57
|
return 'standard-inline';
|
|
57
58
|
}
|
|
58
|
-
// TODO:20230228:KB is this okay?
|
|
59
59
|
if (capiFormat === 'ftEditSquare') {
|
|
60
|
-
return 'square';
|
|
60
|
+
return 'square-ftedit';
|
|
61
61
|
}
|
|
62
62
|
return capiFormat;
|
|
63
63
|
}
|
|
@@ -125,7 +125,7 @@ class CAPIImage {
|
|
|
125
125
|
return this.capiImage.title ?? null;
|
|
126
126
|
}
|
|
127
127
|
alt() {
|
|
128
|
-
const fallback = this.type() ===
|
|
128
|
+
const fallback = this.type() === 'graphic' ? 'A graphic with no description' : '';
|
|
129
129
|
return (this.capiImage.description || fallback).replace(/"/g, '"');
|
|
130
130
|
}
|
|
131
131
|
}
|
package/lib/model/Image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../src/model/Image.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,wDAAoD;AACpD,iFAAwD;AAOxD,6EAAoF;
|
|
1
|
+
{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../src/model/Image.ts"],"names":[],"mappings":"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"}
|
package/lib/model/Image.test.js
CHANGED
|
@@ -5,14 +5,14 @@ const globals_1 = require("@jest/globals");
|
|
|
5
5
|
describe('Image', () => {
|
|
6
6
|
const mockImage = {
|
|
7
7
|
id: 'https://api.ft.com/content/00000000-0000-0000-0000-000000000001',
|
|
8
|
-
type:
|
|
8
|
+
type: 'http://www.ft.com/ontology/content/Image',
|
|
9
9
|
title: 'title',
|
|
10
10
|
description: 'description',
|
|
11
11
|
binaryUrl: 'cloudfront.com/image',
|
|
12
12
|
};
|
|
13
13
|
const graphic = {
|
|
14
14
|
...mockImage,
|
|
15
|
-
type:
|
|
15
|
+
type: 'http://www.ft.com/ontology/content/Graphic',
|
|
16
16
|
};
|
|
17
17
|
const getImageMetadata = globals_1.jest.fn();
|
|
18
18
|
const context = {
|
|
@@ -89,7 +89,7 @@ describe('Image', () => {
|
|
|
89
89
|
describe('An invalid image object', () => {
|
|
90
90
|
it('throws an error', async () => {
|
|
91
91
|
const invalidImage = {
|
|
92
|
-
type:
|
|
92
|
+
type: 'http://www.ft.com/ontology/content/Image',
|
|
93
93
|
id: 'not-a-uuid',
|
|
94
94
|
title: '',
|
|
95
95
|
description: '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Image.test.js","sourceRoot":"","sources":["../../src/model/Image.test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"Image.test.js","sourceRoot":"","sources":["../../src/model/Image.test.ts"],"names":[],"mappings":"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"}
|
package/lib/model/Topper.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { CapiResponse } from './CapiResponse.js';
|
|
2
2
|
import { CAPIImage } from './Image.js';
|
|
3
3
|
import type { QueryContext } from '../index.js';
|
|
4
|
+
import { LiteralUnionScalarValues } from '../typedefs/literal-union.js';
|
|
5
|
+
import { TopperBackgroundColour } from '../typedefs/scalars.js';
|
|
4
6
|
declare type TopperType = 'SplitTextTopper' | 'FullBleedTopper' | 'OpinionTopper' | 'BrandedTopper' | 'BasicTopper';
|
|
5
7
|
declare type TopperIntro = {
|
|
6
8
|
value: string | null;
|
|
@@ -17,7 +19,7 @@ export declare class Topper {
|
|
|
17
19
|
fallbackImage(): CAPIImage | null;
|
|
18
20
|
isLargeHeadline(): boolean;
|
|
19
21
|
layout(): string;
|
|
20
|
-
backgroundColour():
|
|
22
|
+
backgroundColour(): LiteralUnionScalarValues<typeof TopperBackgroundColour>;
|
|
21
23
|
displayConcept(): import("./Concept.js").Concept | undefined;
|
|
22
24
|
columnist(): import("./Concept.js").Concept | undefined;
|
|
23
25
|
brandConcept(): import("./Concept.js").Concept | undefined;
|
package/lib/model/Topper.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Topper = void 0;
|
|
4
4
|
const Image_js_1 = require("./Image.js");
|
|
5
|
+
const literal_union_js_1 = require("../typedefs/literal-union.js");
|
|
6
|
+
const scalars_js_1 = require("../typedefs/scalars.js");
|
|
5
7
|
class Topper {
|
|
6
8
|
constructor(capiResponse, context) {
|
|
7
9
|
this.capiResponse = capiResponse;
|
|
@@ -87,7 +89,10 @@ class Topper {
|
|
|
87
89
|
else if (backgroundColour === 'blue') {
|
|
88
90
|
return 'oxford';
|
|
89
91
|
}
|
|
90
|
-
|
|
92
|
+
if ((0, literal_union_js_1.validLiteralUnionValue)(backgroundColour, scalars_js_1.TopperBackgroundColour.values)) {
|
|
93
|
+
return backgroundColour;
|
|
94
|
+
}
|
|
95
|
+
return 'paper';
|
|
91
96
|
}
|
|
92
97
|
displayConcept() {
|
|
93
98
|
const brandConcept = this.brandConcept();
|
package/lib/model/Topper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Topper.js","sourceRoot":"","sources":["../../src/model/Topper.ts"],"names":[],"mappings":";;;AACA,yCAAsC;
|
|
1
|
+
{"version":3,"file":"Topper.js","sourceRoot":"","sources":["../../src/model/Topper.ts"],"names":[],"mappings":"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"}
|