@financial-times/cp-content-pipeline-schema 1.3.7 → 1.3.9

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.
Files changed (41) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/lib/model/CapiResponse.js +8 -7
  3. package/lib/model/CapiResponse.js.map +1 -1
  4. package/lib/model/Concept.js +4 -5
  5. package/lib/model/Concept.js.map +1 -1
  6. package/lib/model/Concept.test.js +2 -0
  7. package/lib/model/Concept.test.js.map +1 -1
  8. package/lib/model/Image.js +4 -4
  9. package/lib/model/Image.js.map +1 -1
  10. package/lib/model/schemas/capi/article.d.ts +3 -3
  11. package/lib/model/schemas/capi/base-schema.d.ts +3 -3
  12. package/lib/model/schemas/capi/base-schema.js +1 -1
  13. package/lib/model/schemas/capi/base-schema.js.map +1 -1
  14. package/lib/model/schemas/capi/content-package.d.ts +3 -3
  15. package/lib/model/schemas/capi/live-blog-package.d.ts +3 -3
  16. package/lib/model/schemas/capi/placeholder.d.ts +3 -3
  17. package/lib/resolvers/content-tree/bodyXMLToTree.test.js +20 -42
  18. package/lib/resolvers/content-tree/bodyXMLToTree.test.js.map +1 -1
  19. package/lib/resolvers/content-tree/nodePredicates.js +8 -9
  20. package/lib/resolvers/content-tree/nodePredicates.js.map +1 -1
  21. package/lib/resolvers/content-tree/references/Flourish.js +2 -3
  22. package/lib/resolvers/content-tree/references/Flourish.js.map +1 -1
  23. package/lib/resolvers/content-tree/references/RawImage.js +2 -3
  24. package/lib/resolvers/content-tree/references/RawImage.js.map +1 -1
  25. package/lib/resolvers/content-tree/references/Recommended.js +2 -3
  26. package/lib/resolvers/content-tree/references/Recommended.js.map +1 -1
  27. package/lib/resolvers/content-tree/references/Tweet.js +2 -3
  28. package/lib/resolvers/content-tree/references/Tweet.js.map +1 -1
  29. package/package.json +1 -1
  30. package/src/model/CapiResponse.ts +8 -7
  31. package/src/model/Concept.test.ts +2 -0
  32. package/src/model/Concept.ts +4 -5
  33. package/src/model/Image.ts +4 -4
  34. package/src/model/schemas/capi/base-schema.ts +1 -1
  35. package/src/resolvers/content-tree/bodyXMLToTree.test.ts +22 -20
  36. package/src/resolvers/content-tree/nodePredicates.ts +8 -9
  37. package/src/resolvers/content-tree/references/Flourish.ts +2 -3
  38. package/src/resolvers/content-tree/references/RawImage.ts +2 -3
  39. package/src/resolvers/content-tree/references/Recommended.ts +2 -3
  40. package/src/resolvers/content-tree/references/Tweet.ts +2 -3
  41. package/tsconfig.tsbuildinfo +1 -1
package/src/resolvers/content-tree/nodePredicates.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { logRecoverableError } from '@dotcom-reliability-kit/log-error'
2
1
  import { OperationalError } from '@dotcom-reliability-kit/errors'
3
2
  import { AnyNode } from './Workarounds'
4
3
  import { QueryContext } from '../..'
@@ -30,8 +29,8 @@ export const findChildOftype = <NodeType extends AnyNode>(
30
29
  const child = nodes.find(predicate)
31
30
 
32
31
  if (!child) {
33
- logRecoverableError({
34
- logger: context?.logger,
32
+ context?.logger.error({
33
+ event: 'RECOVERABLE_ERROR',
35
34
  error: new OperationalError({
36
35
  code: 'BODY_XML_UNEXPECTED_STRUCTURE',
37
36
  message: `Didn't find expected child type in ${parentType}`,
@@ -54,8 +53,8 @@ export const everyChildIsType = <NodeType extends AnyNode>(
54
53
  const allChildrenAreType = nodes.every(predicate)
55
54
 
56
55
  if (!allChildrenAreType) {
57
- logRecoverableError({
58
- logger: context?.logger,
56
+ context?.logger.error({
57
+ event: 'RECOVERABLE_ERROR',
59
58
  error: new OperationalError({
60
59
  code: 'BODY_XML_UNEXPECTED_STRUCTURE',
61
60
  message: `Unexpected children types for ${parentType}`,
@@ -79,8 +78,8 @@ export const childrenOfTypes = <Types extends readonly AnyNode['type'][]>(
79
78
  const allChildrenAreType = nodes.every(predicate)
80
79
 
81
80
  if (!allChildrenAreType) {
82
- logRecoverableError({
83
- logger: context?.logger,
81
+ context?.logger.error({
82
+ event: 'RECOVERABLE_ERROR',
84
83
  error: new OperationalError({
85
84
  code: 'BODY_XML_UNEXPECTED_STRUCTURE',
86
85
  message: `Unexpected ordered children types for ${parentType}`,
@@ -118,8 +117,8 @@ export const childrenOfOrderedTypes = <
118
117
  return nodes
119
118
  }
120
119
 
121
- logRecoverableError({
122
- logger: context?.logger,
120
+ context?.logger.error({
121
+ event: 'RECOVERABLE_ERROR',
123
122
  error: new OperationalError({
124
123
  code: 'BODY_XML_UNEXPECTED_STRUCTURE',
125
124
  message: `Unexpected children types for ${parentType}`,
package/src/resolvers/content-tree/references/Flourish.ts CHANGED
@@ -2,7 +2,6 @@ import imageServiceUrl from '../../../helpers/imageService'
2
2
  import { FlourishResolvers } from '../../../generated'
3
3
  import { QueryContext } from '../../..'
4
4
  import isError from '../../../helpers/isError'
5
- import { logRecoverableError } from '@dotcom-reliability-kit/log-error/lib'
6
5
 
7
6
  export const Flourish = {
8
7
  async fallbackImage(parent, _args, context) {
@@ -61,9 +60,9 @@ const getImageMetadata = async (
61
60
  }
62
61
  } catch (error) {
63
62
  if (isError(error)) {
64
- logRecoverableError({
63
+ context.logger.error({
64
+ event: 'RECOVERABLE_ERROR',
65
65
  error,
66
- logger: context.logger,
67
66
  })
68
67
  }
69
68
  return {
package/src/resolvers/content-tree/references/RawImage.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { Image, ImageSourceArgs } from '../../../model/Image'
2
2
  import type { QueryContext } from '../../..'
3
- import { logRecoverableError } from '@dotcom-reliability-kit/log-error/lib'
4
3
  import imageServiceUrl from '../../../helpers/imageService'
5
4
  import { RawImage as RawImageNode } from '../Workarounds'
6
5
  import { RawImageResolvers } from '../../../generated'
@@ -47,9 +46,9 @@ class RawImageModel implements Image {
47
46
  return imageMetadata
48
47
  } catch (error) {
49
48
  if (isError(error)) {
50
- logRecoverableError({
49
+ this.context.logger.error({
50
+ event: 'RECOVERABLE_ERROR',
51
51
  error,
52
- logger: this.context.logger,
53
52
  })
54
53
  }
55
54
  return null
package/src/resolvers/content-tree/references/Recommended.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  import { uuidFromUrl } from '../../../helpers/metadata'
2
2
  import { RecommendedResolvers } from '../../../generated'
3
- import { logRecoverableError } from '@dotcom-reliability-kit/log-error'
4
3
  import { OperationalError } from '@dotcom-reliability-kit/errors'
5
4
 
6
5
  export const Recommended = {
@@ -16,8 +15,8 @@ export const Recommended = {
16
15
  return content
17
16
  } catch (error) {
18
17
  if (error instanceof Error) {
19
- logRecoverableError({
20
- logger: context.logger,
18
+ context.logger.error({
19
+ event: 'RECOVERABLE_ERROR',
21
20
  error: new OperationalError({
22
21
  code: 'RECOMMENDED_TEASER_ERROR',
23
22
  message: `Couldn't load teaser for recommended article ${parent.reference.id}`,
package/src/resolvers/content-tree/references/Tweet.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { logRecoverableError } from '@dotcom-reliability-kit/log-error'
2
1
  import { TweetResolvers } from '../../../generated'
3
2
  import isError from '../../../helpers/isError'
4
3
 
@@ -11,9 +10,9 @@ export const Tweet = {
11
10
  return tweet.html
12
11
  } catch (error) {
13
12
  if (isError(error)) {
14
- logRecoverableError({
13
+ context.logger.error({
14
+ event: 'RECOVERABLE_ERROR',
15
15
  error,
16
- logger: context.logger,
17
16
  })
18
17
  }
19
18
  return null