@financial-times/cp-content-pipeline-schema 2.9.1 → 2.10.0

package/lib/model/schemas/capi/base-schema.d.ts

@@ -701,6 +701,19 @@ export declare const LeadImage: z.ZodObject<{
         pixelHeight?: number | undefined;
     };
 }>;
+export declare const LeadFlourish: z.ZodObject<{
+    id: z.ZodString;
+    type: z.ZodString;
+    description: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    id: string;
+    type: string;
+    description: string;
+}, {
+    id: string;
+    type: string;
+    description: string;
+}>;
 export declare const Clip: z.ZodObject<{
     id: z.ZodString;
     type: z.ZodLiteral<"http://www.ft.com/ontology/content/Clip">;
@@ -1791,6 +1804,7 @@ export declare const baseMetadataSchema: z.ZodObject<{
         backgroundBox: z.ZodOptional<z.ZodBoolean>;
         textShadow: z.ZodOptional<z.ZodBoolean>;
         layout: z.ZodString;
+        layoutWidth: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         backgroundColour: string;
         layout: string;
@@ -1798,6 +1812,7 @@ export declare const baseMetadataSchema: z.ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }, {
         backgroundColour: string;
         layout: string;
@@ -1805,6 +1820,7 @@ export declare const baseMetadataSchema: z.ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }>>;
     comments: z.ZodOptional<z.ZodObject<{
         enabled: z.ZodBoolean;
@@ -1868,6 +1884,7 @@ export declare const baseMetadataSchema: z.ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;
@@ -1915,6 +1932,7 @@ export declare const baseMetadataSchema: z.ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;
@@ -2516,6 +2534,19 @@ export declare const baseMediaSchema: z.ZodObject<{
             pixelHeight?: number | undefined;
         };
     }>>;
+    leadFlourish: z.ZodOptional<z.ZodObject<{
+        id: z.ZodString;
+        type: z.ZodString;
+        description: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        id: string;
+        type: string;
+        description: string;
+    }, {
+        id: string;
+        type: string;
+        description: string;
+    }>>;
     embeds: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodObject<{
         id: z.ZodString;
         type: z.ZodLiteral<"http://www.ft.com/ontology/content/ImageSet">;
@@ -3268,6 +3299,11 @@ export declare const baseMediaSchema: z.ZodObject<{
             pixelHeight?: number | undefined;
         };
     } | undefined;
+    leadFlourish?: {
+        id: string;
+        type: string;
+        description: string;
+    } | undefined;
     embeds?: ({
         id: string;
         type: "http://www.ft.com/ontology/content/ImageSet";
@@ -3488,6 +3524,11 @@ export declare const baseMediaSchema: z.ZodObject<{
             pixelHeight?: number | undefined;
         };
     } | undefined;
+    leadFlourish?: {
+        id: string;
+        type: string;
+        description: string;
+    } | undefined;
     embeds?: ({
         id: string;
         type: "http://www.ft.com/ontology/content/ImageSet";

package/lib/model/schemas/capi/base-schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseMediaSchema = exports.baseContentSchema = exports.baseMetadataSchema = exports.CapiPerson = exports.CapiPersonMembership = exports.ClipSet = exports.Clip = exports.LeadImage = exports.MainImage = exports.ImageSet = exports.Image = exports.Annotation = void 0;
+exports.baseMediaSchema = exports.baseContentSchema = exports.baseMetadataSchema = exports.CapiPerson = exports.CapiPersonMembership = exports.ClipSet = exports.Clip = exports.LeadFlourish = exports.LeadImage = exports.MainImage = exports.ImageSet = exports.Image = exports.Annotation = void 0;
 const zod_1 = require("zod");
 const Concept = zod_1.z.object({
     id: zod_1.z.string(),
@@ -21,6 +21,7 @@ const Topper = zod_1.z.object({
     backgroundBox: zod_1.z.boolean().optional(),
     textShadow: zod_1.z.boolean().optional(),
     layout: zod_1.z.string(),
+    layoutWidth: zod_1.z.string().optional(),
 });
 const BaseImage = zod_1.z.object({
     id: zod_1.z.string(),
@@ -80,6 +81,11 @@ exports.LeadImage = zod_1.z.object({
 const AlternativeImage = zod_1.z.object({
     promotionalImage: BaseImage,
 });
+exports.LeadFlourish = zod_1.z.object({
+    id: zod_1.z.string(),
+    type: zod_1.z.string(),
+    description: zod_1.z.string(),
+});
 const ClipSource = zod_1.z.object({
     audioCodec: zod_1.z.string().optional(),
     binaryUrl: zod_1.z.string().optional(),
@@ -243,6 +249,7 @@ exports.baseMediaSchema = zod_1.z.object({
     mainImage: exports.MainImage.optional(),
     leadImages: exports.LeadImage.array().optional(),
     alternativeImages: AlternativeImage.optional(),
+    leadFlourish: exports.LeadFlourish.optional(),
     embeds: zod_1.z.array(zod_1.z.union([exports.ImageSet, exports.ClipSet])).optional(),
     dataSource: DataSource.array().optional(),
 });

package/lib/model/schemas/capi/base-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-schema.js","sourceRoot":"","sources":["../../../../src/model/schemas/capi/base-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-schema.js","sourceRoot":"","sources":["../../../../src/model/schemas/capi/base-schema.ts"],"names":[],"mappings":"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"}

package/lib/model/schemas/capi/content-package.d.ts

@@ -59,6 +59,7 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         backgroundBox: import("zod").ZodOptional<import("zod").ZodBoolean>;
         textShadow: import("zod").ZodOptional<import("zod").ZodBoolean>;
         layout: import("zod").ZodString;
+        layoutWidth: import("zod").ZodOptional<import("zod").ZodString>;
     }, "strip", import("zod").ZodTypeAny, {
         backgroundColour: string;
         layout: string;
@@ -66,6 +67,7 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }, {
         backgroundColour: string;
         layout: string;
@@ -73,6 +75,7 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }>>;
     comments: import("zod").ZodOptional<import("zod").ZodObject<{
         enabled: import("zod").ZodBoolean;
@@ -540,6 +543,19 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
             pixelHeight?: number | undefined;
         };
     }>, "many">>;
+    leadFlourish: import("zod").ZodOptional<import("zod").ZodObject<{
+        id: import("zod").ZodString;
+        type: import("zod").ZodString;
+        description: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        id: string;
+        type: string;
+        description: string;
+    }, {
+        id: string;
+        type: string;
+        description: string;
+    }>>;
 }, "strip", import("zod").ZodTypeAny, {
     id: string;
     types: string[];
@@ -583,6 +599,7 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;
@@ -692,6 +709,11 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
             pixelHeight?: number | undefined;
         };
     }[] | undefined;
+    leadFlourish?: {
+        id: string;
+        type: string;
+        description: string;
+    } | undefined;
 }, {
     id: string;
     types: string[];
@@ -735,6 +757,7 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;
@@ -844,4 +867,9 @@ export declare const contentPackageSchema: import("zod").ZodObject<{
             pixelHeight?: number | undefined;
         };
     }[] | undefined;
+    leadFlourish?: {
+        id: string;
+        type: string;
+        description: string;
+    } | undefined;
 }>;

package/lib/model/schemas/capi/content-package.js

@@ -38,6 +38,7 @@ const contentPackageMetadataSchema = base_schema_1.baseMetadataSchema.pick({
 const contentPackageMediaSchema = base_schema_1.baseMediaSchema.pick({
     mainImage: true,
     leadImages: true,
+    leadFlourish: true,
 });
 exports.contentPackageSchema = contentPackageContentSchema
     .merge(contentPackageMetadataSchema)

package/lib/model/schemas/capi/content-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-package.js","sourceRoot":"","sources":["../../../../src/model/schemas/capi/content-package.ts"],"names":[],"mappings":";;;AAAA,+CAIsB;AAEtB,MAAM,2BAA2B,GAAG,+BAAiB;KAClD,IAAI,CAAC;IACJ,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IACb,iBAAiB,EAAE,IAAI;IACvB,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;CACd,CAAC;KACD,KAAK,CACJ,+BAAiB;KACd,IAAI,CAAC;IACJ,OAAO,EAAE,IAAI;CACd,CAAC;KACD,OAAO,EAAE,CACb,CAAA;AAEH,MAAM,4BAA4B,GAAG,gCAAkB,CAAC,IAAI,CAAC;IAC3D,EAAE,EAAE,IAAI;IACR,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,IAAI;IACZ,eAAe,EAAE,IAAI;IACrB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,IAAI;IACnB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IACtB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;CACtB,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,6BAAe,CAAC,IAAI,CAAC;IACrD,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI;CACjB,CAAC,CAAA;AAEW,QAAA,oBAAoB,GAAG,2BAA2B;KAC5D,KAAK,CAAC,4BAA4B,CAAC;KACnC,KAAK,CAAC,yBAAyB,CAAC,CAAA"}
+{"version":3,"file":"content-package.js","sourceRoot":"","sources":["../../../../src/model/schemas/capi/content-package.ts"],"names":[],"mappings":";;;AAAA,+CAIsB;AAEtB,MAAM,2BAA2B,GAAG,+BAAiB;KAClD,IAAI,CAAC;IACJ,KAAK,EAAE,IAAI;IACX,OAAO,EAAE,IAAI;IACb,iBAAiB,EAAE,IAAI;IACvB,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;CACd,CAAC;KACD,KAAK,CACJ,+BAAiB;KACd,IAAI,CAAC;IACJ,OAAO,EAAE,IAAI;CACd,CAAC;KACD,OAAO,EAAE,CACb,CAAA;AAEH,MAAM,4BAA4B,GAAG,gCAAkB,CAAC,IAAI,CAAC;IAC3D,EAAE,EAAE,IAAI;IACR,WAAW,EAAE,IAAI;IACjB,MAAM,EAAE,IAAI;IACZ,eAAe,EAAE,IAAI;IACrB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,IAAI;IACnB,eAAe,EAAE,IAAI;IACrB,gBAAgB,EAAE,IAAI;IACtB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;IACd,eAAe,EAAE,IAAI;CACtB,CAAC,CAAA;AAEF,MAAM,yBAAyB,GAAG,6BAAe,CAAC,IAAI,CAAC;IACrD,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI;IAChB,YAAY,EAAE,IAAI;CACnB,CAAC,CAAA;AAEW,QAAA,oBAAoB,GAAG,2BAA2B;KAC5D,KAAK,CAAC,4BAA4B,CAAC;KACnC,KAAK,CAAC,yBAAyB,CAAC,CAAA"}

package/lib/model/schemas/capi/live-blog-package.d.ts

@@ -59,6 +59,7 @@ export declare const liveBlogPackageSchema: import("zod").ZodObject<{
         backgroundBox: import("zod").ZodOptional<import("zod").ZodBoolean>;
         textShadow: import("zod").ZodOptional<import("zod").ZodBoolean>;
         layout: import("zod").ZodString;
+        layoutWidth: import("zod").ZodOptional<import("zod").ZodString>;
     }, "strip", import("zod").ZodTypeAny, {
         backgroundColour: string;
         layout: string;
@@ -66,6 +67,7 @@ export declare const liveBlogPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }, {
         backgroundColour: string;
         layout: string;
@@ -73,6 +75,7 @@ export declare const liveBlogPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }>>;
     comments: import("zod").ZodOptional<import("zod").ZodObject<{
         enabled: import("zod").ZodBoolean;
@@ -1190,6 +1193,7 @@ export declare const liveBlogPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;
@@ -1437,6 +1441,7 @@ export declare const liveBlogPackageSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;

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

@@ -60,6 +60,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         backgroundBox: import("zod").ZodOptional<import("zod").ZodBoolean>;
         textShadow: import("zod").ZodOptional<import("zod").ZodBoolean>;
         layout: import("zod").ZodString;
+        layoutWidth: import("zod").ZodOptional<import("zod").ZodString>;
     }, "strip", import("zod").ZodTypeAny, {
         backgroundColour: string;
         layout: string;
@@ -67,6 +68,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }, {
         backgroundColour: string;
         layout: string;
@@ -74,6 +76,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     }>>;
     comments: import("zod").ZodOptional<import("zod").ZodObject<{
         enabled: import("zod").ZodBoolean;
@@ -1266,6 +1269,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;
@@ -1531,6 +1535,7 @@ export declare const placeholderSchema: import("zod").ZodObject<{
         standfirst?: string | undefined;
         backgroundBox?: boolean | undefined;
         textShadow?: boolean | undefined;
+        layoutWidth?: string | undefined;
     } | undefined;
     comments?: {
         enabled: boolean;

package/lib/resolvers/content-tree/bodyXMLToTree.js

@@ -47,13 +47,19 @@ function bodyXMLToTree(xml, tagMappings, context) {
             const matchedSelector = Object.keys(tagMappings).find((selector) => node.name === selector || $(node).is(selector));
             if (matchedSelector) {
                 const contentTreeTransform = tagMappings[matchedSelector];
-                return contentTreeTransform($(node), () => flattenAndTraverseChildren(node.children), context);
+                if (contentTreeTransform) {
+                    return contentTreeTransform($(node), () => flattenAndTraverseChildren(node.children), context);
+                }
             }
             return flattenAndTraverseChildren(node.children);
         }
         return [];
     }
-    const body = traverse($('body')[0]);
+    const cheerioBody = $('body');
+    if (!cheerioBody[0]) {
+        throw new Error('No body tag found in bodyXML');
+    }
+    const body = traverse(cheerioBody[0]);
     logErrors(context);
     if (Array.isArray(body) || !isNode(body)) {
         throw new Error(`Unexpected mapping result for body node, received ${JSON.stringify(body)}`);

package/lib/resolvers/content-tree/bodyXMLToTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"bodyXMLToTree.js","sourceRoot":"","sources":["../../../src/resolvers/content-tree/bodyXMLToTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAKlC,2CAA0C;AAC1C,2DAAiE;AAEjE,SAAS,MAAM,CAAC,IAAkC;IAChD,OAAO,OAAO,CAAC,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAA;AACxC,CAAC;AAUD;;;EAGE;AACF,SAAwB,aAAa,CACnC,GAAW,EACX,WAAwB,EACxB,OAAsB;IAEtB,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,0BAA0B,GAAG,CAAC,QAAwB,EAAa,EAAE,CACzE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5B,SAAS,QAAQ,CAAC,IAAkB;QAClC,IAAI,IAAA,mBAAM,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI,CAAC,IAAI;aACjB,CAAA;SACF;aAAM,IAAI,IAAA,kBAAK,EAAC,IAAI,CAAC,EAAE;YACtB,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACnD,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAC7D,CAAA;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,oBAAoB,GAAG,WAAW,CAAC,eAAe,CAAC,CAAA;gBACzD,OAAO,oBAAoB,CACzB,CAAC,CAAC,IAAI,CAAC,EACP,GAAG,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC/C,OAAO,CACR,CAAA;aACF;YAED,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SACjD;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEnC,SAAS,CAAC,OAAO,CAAC,CAAA;IAElB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,qDAAqD,IAAI,CAAC,SAAS,CACjE,IAAI,CACL,EAAE,CACJ,CAAA;KACF;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;KACzE;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AArDD,gCAqDC;AAED,SAAS,SAAS,CAAC,OAAsB;IACvC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,aAAa,CAAC,MAAM;QAAE,OAAM;IAE5D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAClB,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,uCAAuC;QAChD,KAAK,EAAE,IAAI,yBAAgB,CAAC;YAC1B,IAAI,EAAE,0CAA0C;YAChD,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,aAAa;SAChD,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,CAAC,gBAAgB,CAAC,aAAa,GAAG,EAAE,CAAA;AAC7C,CAAC"}
+{"version":3,"file":"bodyXMLToTree.js","sourceRoot":"","sources":["../../../src/resolvers/content-tree/bodyXMLToTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAkC;AAKlC,2CAA0C;AAC1C,2DAAiE;AAEjE,SAAS,MAAM,CAAC,IAAkC;IAChD,OAAO,OAAO,CAAC,IAAI,IAAI,MAAM,IAAI,IAAI,CAAC,CAAA;AACxC,CAAC;AAUD;;;EAGE;AACF,SAAwB,aAAa,CACnC,GAAW,EACX,WAAwB,EACxB,OAAsB;IAEtB,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3B,MAAM,0BAA0B,GAAG,CAAC,QAAwB,EAAa,EAAE,CACzE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE5B,SAAS,QAAQ,CAAC,IAAkB;QAClC,IAAI,IAAA,mBAAM,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI,CAAC,IAAI;aACjB,CAAA;SACF;aAAM,IAAI,IAAA,kBAAK,EAAC,IAAI,CAAC,EAAE;YACtB,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CACnD,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAC7D,CAAA;YAED,IAAI,eAAe,EAAE;gBACnB,MAAM,oBAAoB,GAAG,WAAW,CAAC,eAAe,CAAC,CAAA;gBACzD,IAAI,oBAAoB,EAAE;oBACxB,OAAO,oBAAoB,CACzB,CAAC,CAAC,IAAI,CAAC,EACP,GAAG,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC/C,OAAO,CACR,CAAA;iBACF;aACF;YAED,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;SACjD;QAED,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,CAAA;IAC7B,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;KAChD;IAED,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IAErC,SAAS,CAAC,OAAO,CAAC,CAAA;IAElB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACxC,MAAM,IAAI,KAAK,CACb,qDAAqD,IAAI,CAAC,SAAS,CACjE,IAAI,CACL,EAAE,CACJ,CAAA;KACF;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;KACzE;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AA5DD,gCA4DC;AAED,SAAS,SAAS,CAAC,OAAsB;IACvC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,aAAa,CAAC,MAAM;QAAE,OAAM;IAE5D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAClB,KAAK,EAAE,mBAAmB;QAC1B,OAAO,EAAE,uCAAuC;QAChD,KAAK,EAAE,IAAI,yBAAgB,CAAC;YAC1B,IAAI,EAAE,0CAA0C;YAChD,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,aAAa;SAChD,CAAC;KACH,CAAC,CAAA;IAEF,OAAO,CAAC,gBAAgB,CAAC,aAAa,GAAG,EAAE,CAAA;AAC7C,CAAC"}

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

@@ -1,6 +1,12 @@
-import { QueryContext } from '../../..';
 export declare const Flourish: {
-    fallbackImage(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Flourish>, _args: {}, context: QueryContext): Promise<{
+    fallbackImage(parent: import(".").ReferenceWithCAPIData<import("@financial-times/content-tree").ContentTree.Flourish>, _args: {}, context: import("../../..").QueryContext): Promise<{
+        url?: undefined;
+        type?: undefined;
+        format?: undefined;
+        sourceSet?: undefined;
+        width?: undefined;
+        height?: undefined;
+    } | {
         url: string;
         type: string;
         format: string;

package/lib/resolvers/content-tree/references/Flourish.js

@@ -5,27 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlourishFallback = exports.Flourish = void 0;
 const imageService_1 = __importDefault(require("../../../helpers/imageService"));
-const isError_1 = __importDefault(require("../../../helpers/isError"));
-const errors_1 = require("@dotcom-reliability-kit/errors");
+const FlourishSource_1 = require("../../../model/FlourishSource");
 exports.Flourish = {
     async fallbackImage(parent, _args, context) {
-        const type = parent.reference.flourishType;
-        const timestamp = typeof parent.reference.timestamp === 'string'
-            ? parent.reference.timestamp
-            : false;
-        const flourishUrl = `https://public.flourish.studio/${type}/${parent.reference.id}/thumbnail${timestamp ? '?cacheBuster=' + timestamp : ''}`;
-        const imageMetadata = await getImageMetadata(context, flourishUrl);
-        const width = imageMetadata.width;
-        const height = imageMetadata.height;
+        if (!parent.reference) {
+            return {};
+        }
+        const flourishData = {
+            id: parent.reference.id,
+            type: parent.reference.flourishType,
+            description: parent.reference.description,
+        };
+        const flourishSource = new FlourishSource_1.FlourishSource(flourishData, context);
+        const width = await flourishSource.width();
+        const height = await flourishSource.height();
         const imageServiceWrappedUrl = (0, imageService_1.default)({
-            url: flourishUrl,
+            url: flourishSource.flourishUrl(),
             systemCode: context.systemCode ?? 'cp-content-pipeline',
             width,
         });
         return {
             url: imageServiceWrappedUrl,
-            type: 'image',
-            format: 'standard',
+            type: flourishSource.type(),
+            format: flourishSource.format(),
             sourceSet: [],
             width,
             height,
@@ -46,31 +48,4 @@ exports.FlourishFallback = {
         return parent.url ?? null;
     },
 };
-const getImageMetadata = async (context, flourishUrl) => {
-    const DEFAULT_WIDTH = 2626;
-    const DEFAULT_HEIGHT = 1459;
-    try {
-        const imageMetadata = await context.dataSources.origami.getImageMetadata(flourishUrl);
-        return {
-            width: imageMetadata?.width || DEFAULT_WIDTH,
-            height: imageMetadata?.height || DEFAULT_HEIGHT,
-        };
-    }
-    catch (error) {
-        if ((0, isError_1.default)(error)) {
-            context.logger.warn({
-                event: 'RECOVERABLE_ERROR',
-                error: new errors_1.OperationalError({
-                    code: 'FLOURISH_IMAGE_METADATA_ERROR',
-                    message: `Error getting image dimensions for Flourish fallback image ${flourishUrl}`,
-                    cause: error,
-                }),
-            });
-        }
-        return {
-            width: DEFAULT_WIDTH,
-            height: DEFAULT_HEIGHT,
-        };
-    }
-};
 //# sourceMappingURL=Flourish.js.map

package/lib/resolvers/content-tree/references/Flourish.js.map

@@ -1 +1 @@
-{"version":3,"file":"Flourish.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.ts"],"names":[],"mappings":";;;;;;AAAA,iFAA2D;AAM3D,uEAA8C;AAC9C,2DAAiE;AAEpD,QAAA,QAAQ,GAAG;IACtB,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO;QACxC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAA;QAC1C,MAAM,SAAS,GACb,OAAO,MAAM,CAAC,SAAS,CAAC,SAAS,KAAK,QAAQ;YAC5C,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS;YAC5B,CAAC,CAAC,KAAK,CAAA;QAEX,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;QAE3D,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAElE,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAA;QACjC,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAA;QAEnC,MAAM,sBAAsB,GAAG,IAAA,sBAAe,EAAC;YAC7C,GAAG,EAAE,WAAW;YAChB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,qBAAqB;YACvD,KAAK;SACN,CAAC,CAAA;QAEF,OAAO;YACL,GAAG,EAAE,sBAAsB;YAC3B,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,UAAU;YAClB,SAAS,EAAE,EAAE;YACb,KAAK;YACL,MAAM;SACP,CAAA;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;CAC0B,CAAA;AAEhB,QAAA,gBAAgB,GAAG;IAC9B,KAAK,CAAC,MAAM,CAAC,MAAM;QACjB,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,CAAA;IAC9B,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,MAAM;QAChB,OAAO,MAAM,CAAC,KAAK,IAAI,IAAI,CAAA;IAC7B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,MAAM;QACd,OAAO,MAAM,CAAC,GAAG,IAAI,IAAI,CAAA;IAC3B,CAAC;CACkC,CAAA;AAOrC,MAAM,gBAAgB,GAAG,KAAK,EAC5B,OAAqB,EACrB,WAAmB,EACK,EAAE;IAC1B,MAAM,aAAa,GAAG,IAAI,CAAA;IAC1B,MAAM,cAAc,GAAG,IAAI,CAAA;IAE3B,IAAI;QACF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CACtE,WAAW,CACZ,CAAA;QAED,OAAO;YACL,KAAK,EAAE,aAAa,EAAE,KAAK,IAAI,aAAa;YAC5C,MAAM,EAAE,aAAa,EAAE,MAAM,IAAI,cAAc;SAChD,CAAA;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,EAAE;YAClB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,mBAAmB;gBAC1B,KAAK,EAAE,IAAI,yBAAgB,CAAC;oBAC1B,IAAI,EAAE,+BAA+B;oBACrC,OAAO,EAAE,8DAA8D,WAAW,EAAE;oBACpF,KAAK,EAAE,KAAK;iBACb,CAAC;aACH,CAAC,CAAA;SACH;QACD,OAAO;YACL,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc;SACvB,CAAA;KACF;AACH,CAAC,CAAA"}
+{"version":3,"file":"Flourish.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.ts"],"names":[],"mappings":";;;;;;AAAA,iFAA2D;AAK3D,kEAA8D;AAEjD,QAAA,QAAQ,GAAG;IACtB,KAAK,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO;QACxC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACrB,OAAO,EAAE,CAAA;SACV;QACD,MAAM,YAAY,GAAG;YACnB,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;YACvB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,YAAY;YACnC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW;SAC1C,CAAA;QACD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;QAChE,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,CAAA;QAC1C,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,CAAA;QAE5C,MAAM,sBAAsB,GAAG,IAAA,sBAAe,EAAC;YAC7C,GAAG,EAAE,cAAc,CAAC,WAAW,EAAE;YACjC,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,qBAAqB;YACvD,KAAK;SACN,CAAC,CAAA;QAEF,OAAO;YACL,GAAG,EAAE,sBAAsB;YAC3B,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE;YAC3B,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE;YAC/B,SAAS,EAAE,EAAE;YACb,KAAK;YACL,MAAM;SACP,CAAA;IACH,CAAC;IAED,IAAI,CAAC,MAAM;QACT,OAAO,MAAM,CAAC,SAAS,CAAC,IAAI,CAAA;IAC9B,CAAC;CAC0B,CAAA;AAEhB,QAAA,gBAAgB,GAAG;IAC9B,KAAK,CAAC,MAAM,CAAC,MAAM;QACjB,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,CAAA;IAC9B,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,MAAM;QAChB,OAAO,MAAM,CAAC,KAAK,IAAI,IAAI,CAAA;IAC7B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,MAAM;QACd,OAAO,MAAM,CAAC,GAAG,IAAI,IAAI,CAAA;IAC3B,CAAC;CACkC,CAAA"}

package/lib/resolvers/content-tree/references/Flourish.test.js

@@ -58,36 +58,6 @@ describe('Flourish Model', () => {
                 const flourishImageUrl = 'https://public.flourish.studio/example-type';
                 expect(fallbackResponse.url).toContain(encodeURIComponent(flourishImageUrl));
             });
-            describe('the flourish timestamp is present', () => {
-                it('The Flourish cache buster is appended to the flourish image url', async () => {
-                    const reference = {
-                        type: 'flourish',
-                        id: 'example-id',
-                        flourishType: 'example-type',
-                        layoutWidth: 'grid',
-                        timestamp: '2022-01-06T14:41:01.102Z',
-                        description: 'Example description',
-                    };
-                    const fallbackResponse = await Flourish_1.Flourish.fallbackImage({ reference }, {}, context);
-                    const flourishImageCacheBuster = '?cacheBuster=2022-01-06T14:41:01.102Z';
-                    expect(fallbackResponse.url).toContain(encodeURIComponent(flourishImageCacheBuster));
-                });
-            });
-            describe('the flourish timestamp is missing', () => {
-                it('The Flourish cache buster is not appended to the flourish image url', async () => {
-                    const reference = {
-                        type: 'flourish',
-                        id: 'example-id',
-                        flourishType: 'example-type',
-                        layoutWidth: 'grid',
-                        timestamp: '',
-                        description: 'Example description',
-                    };
-                    const fallbackResponse = await Flourish_1.Flourish.fallbackImage({ reference }, {}, context);
-                    const flourishImageCacheBuster = '?cacheBuster=';
-                    expect(fallbackResponse.url).not.toContain(encodeURIComponent(flourishImageCacheBuster));
-                });
-            });
         });
     });
 });

package/lib/resolvers/content-tree/references/Flourish.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Flourish.test.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Flourish.test.js","sourceRoot":"","sources":["../../../../src/resolvers/content-tree/references/Flourish.test.ts"],"names":[],"mappings":";;AAAA,2CAAoC;AAEpC,yCAAqC;AAIrC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,MAAM,2BAA2B,GAAG,cAAI,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,SAAS,CAAC,GAAG,EAAE;QACb,cAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE;YACnB,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;gBACnD,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,oEAAoE;gBACpE,uDAAuD;gBACvD,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACtC,qDAAqD,CACtD,CAAA;gBAED,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,GAAa,CAAC,CAAC,CAAC,OAAO,CAChE,qBAAqB,CACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;gBACrE,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,MAAM,qBAAqB,GAAG,IAAI,MAAM,CACtC,kDAAkD,CACnD,CAAA;gBAED,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,GAAa,CAAC,CAAC,CAAC,OAAO,CAChE,qBAAqB,CACtB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;gBAC/E,MAAM,SAAS,GAAyB;oBACtC,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,YAAY;oBAChB,YAAY,EAAE,cAAc;oBAC5B,WAAW,EAAE,MAAM;oBACnB,SAAS,EAAE,0BAA0B;oBACrC,WAAW,EAAE,qBAAqB;iBACnC,CAAA;gBACD,MAAM,gBAAgB,GAAG,MAAM,mBAAQ,CAAC,aAAa,CACnD,EAAE,SAAS,EAAE,EACb,EAAE,EACF,OAAO,CACR,CAAA;gBAED,MAAM,gBAAgB,GAAG,6CAA6C,CAAA;gBAEtE,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,SAAS,CACpC,kBAAkB,CAAC,gBAAgB,CAAC,CACrC,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/resolvers/content-tree/tagMappings.js

@@ -227,7 +227,7 @@ const commonTagMappings = {
         const layoutName = $el.attr('data-layout-name') || '';
         const getChildren = (children) => {
             const [firstChild, ...otherChildren] = children;
-            if (firstChild.type === 'heading') {
+            if (firstChild && firstChild.type === 'heading') {
                 return [
                     firstChild,
                     ...(0, nodePredicates_1.everyChildIsType)('layout-slot', otherChildren, 'layout', context),
@@ -260,20 +260,20 @@ const commonTagMappings = {
     }),
     table: ($el, traverse, context) => {
         const layoutSmallscreen = $el.attr('data-table-layout-smallscreen');
-        const responsiveStyle = layoutSmallscreen && layoutSmallscreen in tableResponsiveStyleMap
+        const responsiveStyle = (layoutSmallscreen
             ? tableResponsiveStyleMap[layoutSmallscreen]
-            : 'overflow';
+            : undefined) ?? 'overflow';
         const children = traverse();
         const bodies = children.filter((child) => child.type === 'table-body');
         const caption = (0, nodePredicates_1.findChildOftype)('table-caption', children, 'table', context);
         const footer = (0, nodePredicates_1.findChildOftype)('table-footer', children, 'table', context);
         // HACK:KB:20230523 transform single-cell tables into infoboxes, for legacy articles
         if (bodies.length === 1 &&
-            bodies[0].children.length === 1 &&
-            bodies[0].children[0].children.length === 1) {
+            bodies[0]?.children.length === 1 &&
+            bodies[0]?.children[0]?.children.length === 1) {
             const slot = {
                 type: 'layout-slot',
-                children: (0, nodePredicates_1.childrenOfTypes)(['paragraph', 'heading'], bodies[0].children[0].children[0].children, 'layout-slot', context),
+                children: (0, nodePredicates_1.childrenOfTypes)(['paragraph', 'heading'], bodies[0]?.children[0]?.children[0]?.children ?? [], 'layout-slot', context),
             };
             const layoutChildren = caption
                 ? [
@@ -423,7 +423,7 @@ const commonTagMappings = {
                 : undefined,
             noBox: validScrollytellingOption('noBox', noBox) ? true : undefined,
             children: [
-                ...(0, nodePredicates_1.everyChildIsType)('scrolly-image', [firstChild], 'scrolly-section', context),
+                ...(0, nodePredicates_1.everyChildIsType)('scrolly-image', firstChild ? [firstChild] : [], 'scrolly-section', context),
                 ...(0, nodePredicates_1.everyChildIsType)('scrolly-copy', restChildren, 'scrolly-section', context),
             ],
         };