@financial-times/cp-content-pipeline-schema 2.14.2 → 2.15.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 +16 -0
- package/lib/datasources/capi.d.ts +2 -0
- package/lib/datasources/capi.js +17 -1
- package/lib/datasources/capi.js.map +1 -1
- package/lib/datasources/capi.test.js +6 -1
- package/lib/datasources/capi.test.js.map +1 -1
- package/lib/datasources/instrumented.js.map +1 -1
- package/lib/datasources/origami-image.js.map +1 -1
- package/lib/datasources/twitter.js.map +1 -1
- package/lib/datasources/url-management.js.map +1 -1
- package/lib/fixtures/dummyContext.js.map +1 -1
- package/lib/generated/index.d.ts +78 -16
- package/lib/helpers/decorateHeadshotUrl.js +1 -1
- package/lib/helpers/decorateHeadshotUrl.js.map +1 -1
- package/lib/helpers/flatten-formatted-zod-errors.d.ts +6 -0
- package/lib/helpers/flatten-formatted-zod-errors.js +39 -0
- package/lib/helpers/flatten-formatted-zod-errors.js.map +1 -0
- package/lib/helpers/imageService.js +1 -1
- package/lib/helpers/imageService.js.map +1 -1
- package/lib/helpers/isError.js +1 -1
- package/lib/helpers/isError.js.map +1 -1
- package/lib/helpers/metadata.js +1 -2
- package/lib/helpers/metadata.js.map +1 -1
- package/lib/index.d.ts +5 -1
- package/lib/index.js.map +1 -1
- package/lib/model/Byline.js +1 -1
- package/lib/model/Byline.js.map +1 -1
- package/lib/model/CapiList.d.ts +17 -0
- package/lib/model/CapiList.js +87 -0
- package/lib/model/CapiList.js.map +1 -0
- package/lib/model/CapiResponse.d.ts +1 -1
- package/lib/model/CapiResponse.js +8 -39
- package/lib/model/CapiResponse.js.map +1 -1
- package/lib/model/Clip.js.map +1 -1
- package/lib/model/Concept.js.map +1 -1
- package/lib/model/FlourishSource.js.map +1 -1
- package/lib/model/Image.d.ts +2 -34
- package/lib/model/Image.js +1 -1
- package/lib/model/Image.js.map +1 -1
- package/lib/model/Person.js.map +1 -1
- package/lib/model/Picture.js.map +1 -1
- package/lib/model/RichText.d.ts +1 -1
- package/lib/model/RichText.js.map +1 -1
- package/lib/model/Topper.d.ts +2 -2
- 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 +3 -3
- package/lib/model/schemas/capi/base-schema.d.ts +3 -3
- 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/index.d.ts +15 -15
- package/lib/model/schemas/capi/index.js.map +1 -1
- package/lib/model/schemas/capi/list.d.ts +48 -0
- package/lib/model/schemas/capi/list.js +35 -0
- package/lib/model/schemas/capi/list.js.map +1 -0
- 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/clip.d.ts +5 -5
- package/lib/resolvers/content-tree/bodyXMLToTree.js +1 -1
- package/lib/resolvers/content-tree/bodyXMLToTree.js.map +1 -1
- package/lib/resolvers/content-tree/extractText.js +1 -1
- package/lib/resolvers/content-tree/extractText.js.map +1 -1
- package/lib/resolvers/content-tree/nodePredicates.d.ts +3 -3
- package/lib/resolvers/content-tree/nodePredicates.js.map +1 -1
- package/lib/resolvers/content-tree/references/ClipSet.d.ts +2 -2
- package/lib/resolvers/content-tree/references/ClipSet.js.map +1 -1
- package/lib/resolvers/content-tree/references/Flourish.js.map +1 -1
- package/lib/resolvers/content-tree/references/RawImage.js.map +1 -1
- package/lib/resolvers/content-tree/references/Recommended.js.map +1 -1
- package/lib/resolvers/content-tree/references/Reference.d.ts +2 -2
- package/lib/resolvers/content-tree/references/Reference.js.map +1 -1
- package/lib/resolvers/content-tree/references/Tweet.js.map +1 -1
- package/lib/resolvers/content-tree/references/Video.js.map +1 -1
- package/lib/resolvers/content-tree/tagMappings.js +5 -5
- package/lib/resolvers/content-tree/tagMappings.js.map +1 -1
- package/lib/resolvers/content-tree/updateTreeWithReferenceIds.js +1 -1
- package/lib/resolvers/content-tree/updateTreeWithReferenceIds.js.map +1 -1
- package/lib/resolvers/content.d.ts +16 -16
- package/lib/resolvers/content.js.map +1 -1
- package/lib/resolvers/core.d.ts +1 -0
- package/lib/resolvers/core.js +27 -21
- package/lib/resolvers/core.js.map +1 -1
- package/lib/resolvers/image.js.map +1 -1
- package/lib/resolvers/index.d.ts +56 -44
- package/lib/resolvers/index.js +2 -0
- package/lib/resolvers/index.js.map +1 -1
- package/lib/resolvers/list.d.ts +14 -0
- package/lib/resolvers/list.js +16 -0
- package/lib/resolvers/list.js.map +1 -0
- package/lib/resolvers/literal-union.js.map +1 -1
- package/lib/resolvers/meta-link.js.map +1 -1
- package/lib/resolvers/richText.d.ts +5 -5
- package/lib/resolvers/scalars.d.ts +4 -0
- package/lib/resolvers/scalars.js +18 -1
- package/lib/resolvers/scalars.js.map +1 -1
- package/lib/types/cache.js +1 -2
- package/lib/types/cache.js.map +1 -1
- package/package.json +1 -1
- package/src/datasources/capi.test.ts +6 -1
- package/src/datasources/capi.ts +19 -1
- package/src/fixtures/dummyContext.ts +1 -1
- package/src/generated/index.ts +78 -16
- package/src/helpers/flatten-formatted-zod-errors.ts +67 -0
- package/src/index.ts +3 -1
- package/src/model/CapiList.ts +103 -0
- package/src/model/CapiResponse.ts +8 -70
- package/src/model/schemas/capi/base-schema.ts +1 -1
- package/src/model/schemas/capi/list.ts +36 -0
- package/src/resolvers/core.ts +29 -22
- package/src/resolvers/index.ts +2 -0
- package/src/resolvers/list.ts +15 -0
- package/src/resolvers/scalars.ts +30 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/typedefs/content.graphql +8 -8
- package/typedefs/core.graphql +3 -0
- package/typedefs/list.graphql +20 -0
- package/typedefs/scalars.graphql +2 -0
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { z } from 'zod'
|
|
2
|
+
|
|
3
|
+
export const listSchema = z.object({
|
|
4
|
+
id: z.string(),
|
|
5
|
+
apiUrl: z.string(),
|
|
6
|
+
title: z.string(),
|
|
7
|
+
items: z
|
|
8
|
+
.array(
|
|
9
|
+
z.object({
|
|
10
|
+
id: z.string(),
|
|
11
|
+
apiUrl: z.string(),
|
|
12
|
+
})
|
|
13
|
+
)
|
|
14
|
+
.optional(),
|
|
15
|
+
listType: z.union([
|
|
16
|
+
z.literal('OpinionAnalysis'),
|
|
17
|
+
z.literal('Promotional'),
|
|
18
|
+
z.literal('Recommended'),
|
|
19
|
+
z.literal('TopStories'),
|
|
20
|
+
z.literal('TopStoriesBeta'),
|
|
21
|
+
z.literal('KeyDevelopments'),
|
|
22
|
+
]),
|
|
23
|
+
publishedDate: z.string(),
|
|
24
|
+
layoutHint: z
|
|
25
|
+
.union([
|
|
26
|
+
z.literal('standaloneimage'),
|
|
27
|
+
z.literal('landscape'),
|
|
28
|
+
z.literal('bigstory'),
|
|
29
|
+
z.literal('assassination'),
|
|
30
|
+
])
|
|
31
|
+
.optional(),
|
|
32
|
+
publication: z.array(z.string()).optional(),
|
|
33
|
+
publishReference: z.string().optional(),
|
|
34
|
+
})
|
|
35
|
+
|
|
36
|
+
export type List = z.input<typeof listSchema>
|
package/src/resolvers/core.ts
CHANGED
|
@@ -10,6 +10,31 @@ const packageJson = JSON.parse(
|
|
|
10
10
|
|
|
11
11
|
export const version = packageJson.version
|
|
12
12
|
|
|
13
|
+
function handleContentError(error: unknown, uuid: string): Error | unknown {
|
|
14
|
+
if (error instanceof BaseError) {
|
|
15
|
+
if (error.data.upstreamStatusCode === 404) {
|
|
16
|
+
return new HttpError({
|
|
17
|
+
code: 'CONTENT_NOT_FOUND',
|
|
18
|
+
message: 'Content not found in Content API',
|
|
19
|
+
cause: error,
|
|
20
|
+
uuid,
|
|
21
|
+
statusCode: 404,
|
|
22
|
+
relatesToSystems: ['up-ica'],
|
|
23
|
+
})
|
|
24
|
+
}
|
|
25
|
+
if (error.code === 'UNEXPECTED_CONTENT_TYPE') {
|
|
26
|
+
throw new HttpError({
|
|
27
|
+
code: error.code,
|
|
28
|
+
cause: error,
|
|
29
|
+
message: `Requested a content type we don't handle`,
|
|
30
|
+
statusCode: 404,
|
|
31
|
+
})
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
return error
|
|
36
|
+
}
|
|
37
|
+
|
|
13
38
|
const resolvers = {
|
|
14
39
|
Query: {
|
|
15
40
|
version: () => version,
|
|
@@ -17,30 +42,12 @@ const resolvers = {
|
|
|
17
42
|
try {
|
|
18
43
|
return await context.dataSources.capi.getContent(args.uuid)
|
|
19
44
|
} catch (error) {
|
|
20
|
-
|
|
21
|
-
if (error.data.upstreamStatusCode === 404) {
|
|
22
|
-
throw new HttpError({
|
|
23
|
-
code: 'CONTENT_NOT_FOUND',
|
|
24
|
-
message: 'Content not found in Content API',
|
|
25
|
-
cause: error,
|
|
26
|
-
uuid: args.uuid,
|
|
27
|
-
statusCode: 404,
|
|
28
|
-
relatesToSystems: ['up-ica'],
|
|
29
|
-
})
|
|
30
|
-
}
|
|
31
|
-
if (error.code === 'UNEXPECTED_CONTENT_TYPE') {
|
|
32
|
-
throw new HttpError({
|
|
33
|
-
code: error.code,
|
|
34
|
-
cause: error,
|
|
35
|
-
message: `Requested a content type we don't handle`,
|
|
36
|
-
statusCode: 404,
|
|
37
|
-
})
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
throw error
|
|
45
|
+
throw handleContentError(error, args.uuid)
|
|
42
46
|
}
|
|
43
47
|
},
|
|
48
|
+
list(_, args, context) {
|
|
49
|
+
return context.dataSources.capi.getList(args.uuid)
|
|
50
|
+
},
|
|
44
51
|
contentFromJSON(_, { content }, context) {
|
|
45
52
|
return CapiResponse.fromJSON(content, context)
|
|
46
53
|
},
|
package/src/resolvers/index.ts
CHANGED
|
@@ -11,6 +11,7 @@ import { default as teaser } from './teaser'
|
|
|
11
11
|
import { default as topper } from './topper'
|
|
12
12
|
import { default as person } from './person'
|
|
13
13
|
import { default as leadFlourish } from './leadFlourish'
|
|
14
|
+
import { default as list } from './list'
|
|
14
15
|
import { resolvers as references } from './content-tree/references'
|
|
15
16
|
import { Resolvers } from '../generated'
|
|
16
17
|
|
|
@@ -29,6 +30,7 @@ const resolvers = {
|
|
|
29
30
|
...topper,
|
|
30
31
|
...person,
|
|
31
32
|
...leadFlourish,
|
|
33
|
+
...list,
|
|
32
34
|
} satisfies Resolvers
|
|
33
35
|
|
|
34
36
|
export default resolvers
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ListResolvers } from '../generated'
|
|
2
|
+
|
|
3
|
+
export default {
|
|
4
|
+
List: {
|
|
5
|
+
id: (parent) => parent.id(),
|
|
6
|
+
apiUrl: (parent) => parent.apiUrl(),
|
|
7
|
+
title: (parent) => parent.title(),
|
|
8
|
+
items: (parent) => parent.items(),
|
|
9
|
+
listType: (parent) => parent.listType(),
|
|
10
|
+
publishedDate: (parent) => parent.publishedDate(),
|
|
11
|
+
layoutHint: (parent) => parent.layoutHint(),
|
|
12
|
+
publication: (parent) => parent.publication(),
|
|
13
|
+
publishReference: (parent) => parent.publishReference(),
|
|
14
|
+
},
|
|
15
|
+
} satisfies { List: ListResolvers }
|
package/src/resolvers/scalars.ts
CHANGED
|
@@ -145,6 +145,34 @@ export const ContentType = new LiteralUnionScalar<
|
|
|
145
145
|
],
|
|
146
146
|
})
|
|
147
147
|
|
|
148
|
+
export const ListType = new LiteralUnionScalar<
|
|
149
|
+
[
|
|
150
|
+
'OpinionAnalysis',
|
|
151
|
+
'Promotional',
|
|
152
|
+
'Recommended',
|
|
153
|
+
'TopStories',
|
|
154
|
+
'TopStoriesBeta',
|
|
155
|
+
'KeyDevelopments'
|
|
156
|
+
]
|
|
157
|
+
>({
|
|
158
|
+
name: 'ListType',
|
|
159
|
+
values: [
|
|
160
|
+
'OpinionAnalysis',
|
|
161
|
+
'Promotional',
|
|
162
|
+
'Recommended',
|
|
163
|
+
'TopStories',
|
|
164
|
+
'TopStoriesBeta',
|
|
165
|
+
'KeyDevelopments',
|
|
166
|
+
],
|
|
167
|
+
})
|
|
168
|
+
|
|
169
|
+
export const LayoutHint = new LiteralUnionScalar<
|
|
170
|
+
['standaloneimage', 'landscape', 'bigstory', 'assassination']
|
|
171
|
+
>({
|
|
172
|
+
name: 'LayoutHint',
|
|
173
|
+
values: ['standaloneimage', 'landscape', 'bigstory', 'assassination'],
|
|
174
|
+
})
|
|
175
|
+
|
|
148
176
|
const resolvers = {
|
|
149
177
|
ClipFormat,
|
|
150
178
|
ImageFormat,
|
|
@@ -156,6 +184,8 @@ const resolvers = {
|
|
|
156
184
|
ImageType,
|
|
157
185
|
RichTextSource,
|
|
158
186
|
ContentType,
|
|
187
|
+
ListType,
|
|
188
|
+
LayoutHint,
|
|
159
189
|
JSON: new GraphQLScalarType({ name: 'JSON' }),
|
|
160
190
|
}
|
|
161
191
|
|