@financial-times/cp-content-pipeline-schema 1.6.0 → 1.6.2

package/lib/model/schemas/capi/placeholder.d.ts

@@ -49,10 +49,10 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         scoop: boolean;
     }>>;
     firstPublishedDate: import("zod").ZodString;
-    editorialDesk: import("zod").ZodString;
+    editorialDesk: import("zod").ZodOptional<import("zod").ZodString>;
     accessLevel: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"premium">, import("zod").ZodLiteral<"subscribed">, import("zod").ZodLiteral<"registered">, import("zod").ZodLiteral<"free">]>>;
     canBeSyndicated: import("zod").ZodUnion<[import("zod").ZodLiteral<"yes">, import("zod").ZodLiteral<"no">, import("zod").ZodLiteral<"verify">, import("zod").ZodLiteral<"withContributorPayment">, import("zod").ZodLiteral<"unknown">]>;
-    canBeDistributed: import("zod").ZodUnion<[import("zod").ZodLiteral<"yes">, import("zod").ZodLiteral<"no">, import("zod").ZodLiteral<"verify">]>;
+    canBeDistributed: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"yes">, import("zod").ZodLiteral<"no">, import("zod").ZodLiteral<"verify">]>>;
     topper: import("zod").ZodOptional<import("zod").ZodObject<{
         headline: import("zod").ZodOptional<import("zod").ZodString>;
         standfirst: import("zod").ZodOptional<import("zod").ZodString>;
@@ -1069,31 +1069,31 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         source: import("zod").ZodOptional<import("zod").ZodString>;
         subtitle: import("zod").ZodOptional<import("zod").ZodString>;
         publishedDate: import("zod").ZodOptional<import("zod").ZodString>;
-        accessibility: import("zod").ZodObject<{
-            captions: import("zod").ZodArray<import("zod").ZodObject<{
-                mediaType: import("zod").ZodString;
-                url: import("zod").ZodString;
+        accessibility: import("zod").ZodOptional<import("zod").ZodObject<{
+            captions: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+                mediaType: import("zod").ZodOptional<import("zod").ZodString>;
+                url: import("zod").ZodOptional<import("zod").ZodString>;
             }, "strip", import("zod").ZodTypeAny, {
-                mediaType: string;
-                url: string;
+                mediaType?: string | undefined;
+                url?: string | undefined;
             }, {
-                mediaType: string;
-                url: string;
-            }>, "many">;
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }>, "many">>;
             transcript: import("zod").ZodOptional<import("zod").ZodString>;
         }, "strip", import("zod").ZodTypeAny, {
-            captions: {
-                mediaType: string;
-                url: string;
-            }[];
+            captions?: {
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }[] | undefined;
             transcript?: string | undefined;
         }, {
-            captions: {
-                mediaType: string;
-                url: string;
-            }[];
+            captions?: {
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }[] | undefined;
             transcript?: string | undefined;
-        }>;
+        }>>;
     }, "strip", import("zod").ZodTypeAny, {
         id: string;
         type: "http://www.ft.com/ontology/content/ClipSet";
@@ -1145,13 +1145,6 @@ export declare const placeholderSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
-        accessibility: {
-            captions: {
-                mediaType: string;
-                url: string;
-            }[];
-            transcript?: string | undefined;
-        };
         caption?: string | undefined;
         dataCopyright?: string | undefined;
         description?: string | undefined;
@@ -1161,6 +1154,13 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         source?: string | undefined;
         subtitle?: string | undefined;
         publishedDate?: string | undefined;
+        accessibility?: {
+            captions?: {
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }[] | undefined;
+            transcript?: string | undefined;
+        } | undefined;
     }, {
         id: string;
         type: "http://www.ft.com/ontology/content/ClipSet";
@@ -1212,13 +1212,6 @@ export declare const placeholderSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
-        accessibility: {
-            captions: {
-                mediaType: string;
-                url: string;
-            }[];
-            transcript?: string | undefined;
-        };
         caption?: string | undefined;
         dataCopyright?: string | undefined;
         description?: string | undefined;
@@ -1228,6 +1221,13 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         source?: string | undefined;
         subtitle?: string | undefined;
         publishedDate?: string | undefined;
+        accessibility?: {
+            captions?: {
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }[] | undefined;
+            transcript?: string | undefined;
+        } | undefined;
     }>]>, "many">>;
 }, "strip", import("zod").ZodTypeAny, {
     id: string;
@@ -1245,9 +1245,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         headshot?: string | undefined;
     }[];
     firstPublishedDate: string;
-    editorialDesk: string;
     canBeSyndicated: "unknown" | "yes" | "no" | "verify" | "withContributorPayment";
-    canBeDistributed: "yes" | "no" | "verify";
     bodyXML: string;
     type?: string | undefined;
     standfirst?: string | undefined;
@@ -1258,7 +1256,9 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         exclusive: boolean;
         scoop: boolean;
     } | undefined;
+    editorialDesk?: string | undefined;
     accessLevel?: "premium" | "subscribed" | "registered" | "free" | undefined;
+    canBeDistributed?: "yes" | "no" | "verify" | undefined;
     topper?: {
         backgroundColour: string;
         layout: string;
@@ -1477,13 +1477,6 @@ export declare const placeholderSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
-        accessibility: {
-            captions: {
-                mediaType: string;
-                url: string;
-            }[];
-            transcript?: string | undefined;
-        };
         caption?: string | undefined;
         dataCopyright?: string | undefined;
         description?: string | undefined;
@@ -1493,6 +1486,13 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         source?: string | undefined;
         subtitle?: string | undefined;
         publishedDate?: string | undefined;
+        accessibility?: {
+            captions?: {
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }[] | undefined;
+            transcript?: string | undefined;
+        } | undefined;
     })[] | undefined;
 }, {
     id: string;
@@ -1510,9 +1510,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         headshot?: string | undefined;
     }[];
     firstPublishedDate: string;
-    editorialDesk: string;
     canBeSyndicated: "unknown" | "yes" | "no" | "verify" | "withContributorPayment";
-    canBeDistributed: "yes" | "no" | "verify";
     bodyXML: string;
     type?: string | undefined;
     standfirst?: string | undefined;
@@ -1523,7 +1521,9 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         exclusive: boolean;
         scoop: boolean;
     } | undefined;
+    editorialDesk?: string | undefined;
     accessLevel?: "premium" | "subscribed" | "registered" | "free" | undefined;
+    canBeDistributed?: "yes" | "no" | "verify" | undefined;
     topper?: {
         backgroundColour: string;
         layout: string;
@@ -1742,13 +1742,6 @@ export declare const placeholderSchema: import("zod").ZodObject<{
                 description?: string | undefined;
             } | undefined;
         }[];
-        accessibility: {
-            captions: {
-                mediaType: string;
-                url: string;
-            }[];
-            transcript?: string | undefined;
-        };
         caption?: string | undefined;
         dataCopyright?: string | undefined;
         description?: string | undefined;
@@ -1758,5 +1751,12 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         source?: string | undefined;
         subtitle?: string | undefined;
         publishedDate?: string | undefined;
+        accessibility?: {
+            captions?: {
+                mediaType?: string | undefined;
+                url?: string | undefined;
+            }[] | undefined;
+            transcript?: string | undefined;
+        } | undefined;
     })[] | undefined;
 }>;

package/lib/resolvers/content-tree/references/ClipSet.d.ts

@@ -10,12 +10,12 @@ export declare const ClipSet: {
     dataLayout: (parent: ReferenceWithCAPIData<OldClipContentTree | ClipSetWorkaroundContentTree>) => string;
     caption: (parent: ReferenceWithCAPIData<OldClipContentTree | ClipSetWorkaroundContentTree>) => string;
     accessibility: (parent: ReferenceWithCAPIData<OldClipContentTree | ClipSetWorkaroundContentTree>) => {
-        captions: {
-            mediaType: string;
-            url: string;
-        }[];
+        captions?: {
+            mediaType?: string | undefined;
+            url?: string | undefined;
+        }[] | undefined;
         transcript?: string | undefined;
-    };
+    } | null;
     description: (parent: ReferenceWithCAPIData<OldClipContentTree | ClipSetWorkaroundContentTree>) => string;
     credits: (parent: ReferenceWithCAPIData<OldClipContentTree | ClipSetWorkaroundContentTree>) => string;
     displayTitle: (parent: ReferenceWithCAPIData<OldClipContentTree | ClipSetWorkaroundContentTree>) => string | null;

package/lib/resolvers/content.d.ts

@@ -24,7 +24,7 @@ declare const resolvers: {
         publishedDate: (parent: import("../model/CapiResponse").CapiResponse) => string;
         annotations: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Concept").Concept[];
         accessLevel: (parent: import("../model/CapiResponse").CapiResponse) => "premium" | "subscribed" | "registered" | "free";
-        editorialDesk: (parent: import("../model/CapiResponse").CapiResponse) => string;
+        editorialDesk: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
         canBeSyndicated: (parent: import("../model/CapiResponse").CapiResponse) => "unknown" | "yes" | "no" | "verify" | "withContributorPayment";
         originatingParty: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
         commentsEnabled: (parent: import("../model/CapiResponse").CapiResponse) => boolean;

package/lib/resolvers/index.d.ts

@@ -139,7 +139,7 @@ declare const resolvers: {
         publishedDate: (parent: import("../model/CapiResponse").CapiResponse) => string;
         annotations: (parent: import("../model/CapiResponse").CapiResponse) => import("../model/Concept").Concept[];
         accessLevel: (parent: import("../model/CapiResponse").CapiResponse) => "premium" | "subscribed" | "registered" | "free";
-        editorialDesk: (parent: import("../model/CapiResponse").CapiResponse) => string;
+        editorialDesk: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
         canBeSyndicated: (parent: import("../model/CapiResponse").CapiResponse) => "unknown" | "yes" | "no" | "verify" | "withContributorPayment";
         originatingParty: (parent: import("../model/CapiResponse").CapiResponse) => string | null;
         commentsEnabled: (parent: import("../model/CapiResponse").CapiResponse) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/model/CapiResponse.ts

@@ -238,7 +238,7 @@ export class CapiResponse {
     return this.capiData.accessLevel ?? 'subscribed'
   }
   editorialDesk() {
-    return this.capiData.editorialDesk
+    return this.capiData.editorialDesk ?? null
   }
   canBeSyndicated(): LiteralUnionScalarValues<typeof CanBeSyndicated> {
     return this.capiData.canBeSyndicated

package/src/model/Topper.ts

@@ -249,8 +249,12 @@ export class Topper {
       return 'inverse'
     }
 
-    if (this.capiResponse.isOpinion() && this.backgroundColour() === 'sky') {
-      return 'opinion'
+    if (this.capiResponse.isOpinion()) {
+      if (this.backgroundColour() === 'sky') {
+        return 'opinion'
+      } else {
+        return 'standard'
+      }
     }
 
     if (this.capiResponse.isAlphaville()) {

package/src/model/schemas/capi/base-schema.ts

@@ -124,12 +124,12 @@ export const ClipSet = z.object({
   accessibility: z.object({
     captions: z.array(
       z.object({
-        mediaType: z.string(),
-        url: z.string(),
+        mediaType: z.string().optional(),
+        url: z.string().optional(),
       })
-    ),
+    ).optional(),
     transcript: z.string().optional(),
-  }),
+  }).optional(),
 })
 
 export const DataSource = z.object({
@@ -183,7 +183,7 @@ export const baseMetadataSchema = z.object({
   publishedDate: z.string(),
   firstPublishedDate: z.string(),
   realtime: z.boolean(),
-  editorialDesk: z.string(),
+  editorialDesk: z.string().optional(),
   accessLevel: z
     .union([
       z.literal('premium'),
@@ -199,11 +199,9 @@ export const baseMetadataSchema = z.object({
     z.literal('withContributorPayment'),
     z.literal('unknown'),
   ]),
-  canBeDistributed: z.union([
-    z.literal('yes'),
-    z.literal('no'),
-    z.literal('verify'),
-  ]),
+  canBeDistributed: z
+    .union([z.literal('yes'), z.literal('no'), z.literal('verify')])
+    .optional(),
   topper: Topper.optional(),
   comments: z
     .object({