@financial-times/cp-content-pipeline-schema 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.3.2](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.3.1...cp-content-pipeline-schema-v0.3.2) (2022-10-18)
+
+
+### Features
+
+* add simple html formatting tags ([7f5b229](https://github.com/Financial-Times/cp-content-pipeline/commit/7f5b229162d92f687ea16e1b4a34883179e337da))
+* add tag class for Tweets and basic blockquote ([e5f525a](https://github.com/Financial-Times/cp-content-pipeline/commit/e5f525ac3c89128332852a79e1a580505f1741d0))
+
+
+### Bug Fixes
+
+* handle bylines without any author data ([5458a1a](https://github.com/Financial-Times/cp-content-pipeline/commit/5458a1ac35749c1503d19ab8773ded9791fd214f))
+* handle errors from twitter api gracefully ([2d285b3](https://github.com/Financial-Times/cp-content-pipeline/commit/2d285b30b1e8a0c7c3c344c97b5a7cbe10a3d304))
+
 ## [0.3.1](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v0.3.0...cp-content-pipeline-schema-v0.3.1) (2022-10-11)
 
 

package/lib/datasources/index.d.ts

@@ -1,9 +1,11 @@
 import { CapiDataSource } from './capi.js';
 import { OrigamiImageDataSource } from './origami-image.js';
+import { TwitterDataSource } from './twitter.js';
 import { URLManagementDataSource } from './url-management.js';
 export declare const dataSources: () => {
     capi: CapiDataSource;
     origami: OrigamiImageDataSource;
     vanityUrls: URLManagementDataSource;
+    twitter: TwitterDataSource;
 };
 export declare type DataSources = ReturnType<typeof dataSources>;

package/lib/datasources/index.js

@@ -1,9 +1,11 @@
 import { CapiDataSource } from './capi.js';
 import { OrigamiImageDataSource } from './origami-image.js';
+import { TwitterDataSource } from './twitter.js';
 import { URLManagementDataSource } from './url-management.js';
 export const dataSources = () => ({
     capi: new CapiDataSource(),
     origami: new OrigamiImageDataSource(),
     vanityUrls: new URLManagementDataSource(),
+    twitter: new TwitterDataSource(),
 });
 //# sourceMappingURL=index.js.map

package/lib/datasources/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasources/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC;IAChC,IAAI,EAAE,IAAI,cAAc,EAAE;IAC1B,OAAO,EAAE,IAAI,sBAAsB,EAAE;IACrC,UAAU,EAAE,IAAI,uBAAuB,EAAE;CAC1C,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/datasources/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAE7D,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,CAAC;IAChC,IAAI,EAAE,IAAI,cAAc,EAAE;IAC1B,OAAO,EAAE,IAAI,sBAAsB,EAAE;IACrC,UAAU,EAAE,IAAI,uBAAuB,EAAE;IACzC,OAAO,EAAE,IAAI,iBAAiB,EAAE;CACjC,CAAC,CAAA"}

package/lib/datasources/twitter.d.ts

@@ -0,0 +1,5 @@
+import { InstrumentedRESTDataSource } from './instrumented.js';
+export declare class TwitterDataSource extends InstrumentedRESTDataSource {
+    baseURL: string;
+    getTweet(tweetUrl: string): Promise<any>;
+}

package/lib/datasources/twitter.js

@@ -0,0 +1,11 @@
+import { InstrumentedRESTDataSource } from './instrumented.js';
+export class TwitterDataSource extends InstrumentedRESTDataSource {
+    constructor() {
+        super(...arguments);
+        this.baseURL = 'https://publish.twitter.com';
+    }
+    async getTweet(tweetUrl) {
+        return this.get(`/oembed?url=${tweetUrl}&omit_script=true`);
+    }
+}
+//# sourceMappingURL=twitter.js.map

package/lib/datasources/twitter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"twitter.js","sourceRoot":"","sources":["../../src/datasources/twitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAE9D,MAAM,OAAO,iBAAkB,SAAQ,0BAA0B;IAAjE;;QACE,YAAO,GAAG,6BAA6B,CAAA;IAKzC,CAAC;IAHC,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,eAAe,QAAQ,mBAAmB,CAAC,CAAA;IAC7D,CAAC;CACF"}

package/lib/index.js

@@ -9,7 +9,7 @@ import { typeDef as RichText, resolvers as richTextResolvers, } from './richText
 import { typeDef as Recommended, resolvers as recommendedResolvers, } from './teaser.js';
 import tags from './tags/index.js';
 const tagEntries = Object.entries(tags);
-const tagsWithReferences = tagEntries.filter(([_key, tag]) => tag.typeDef);
+const tagsWithReferences = tagEntries.filter(([, tag]) => tag.typeDef);
 const tagTypeDefs = tagsWithReferences.flatMap(([_key, tag]) => tag.typeDef);
 const Reference = gql `union Reference = ${tagsWithReferences
     .flatMap(([key]) => key)

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAE,WAAW,EAAe,MAAM,wBAAwB,CAAA;AAEjE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7E,OAAO,EACL,OAAO,IAAI,QAAQ,EACnB,SAAS,IAAI,iBAAiB,GAC/B,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,SAAS,IAAI,oBAAoB,GAClC,MAAM,aAAa,CAAA;AACpB,OAAO,IAAI,MAAM,iBAAiB,CAAA;AAGlC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACvC,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAC1E,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAC5C,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAuB,CAC7C,CAAA;AACD,MAAM,SAAS,GAAG,GAAG,CAAA,qBAAqB,kBAAkB;KACzD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;KACvB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;AAEhB,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAC9E,CAAA;AAED,MAAM,YAAY,GAAG,GAAG,CAAA;;;;;;;CAOvB,CAAA;AAQD,MAAM,CAAC,MAAM,SAAS,GAGlB;IACF,KAAK,EAAE;QACL,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,SAAS,EAAE;QACT,aAAa,CAAC,GAAsC;YAClD,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAA;QAC7B,CAAC;KACF;IAED,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,cAAc;IACjB,GAAG,YAAY;IACf,GAAG,eAAe;IAClB,GAAG,iBAAiB;IACpB,GAAG,oBAAoB;CACxB,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,OAAO;IACP,OAAO;IACP,OAAO;IACP,KAAK;IACL,MAAM;IACN,QAAQ;IACR,WAAW;IACX,SAAS;IACT,WAAW;IACX,YAAY;CACb,CAAA;AAED,OAAO,EAAE,WAAW,EAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAE,WAAW,EAAe,MAAM,wBAAwB,CAAA;AAEjE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7E,OAAO,EACL,OAAO,IAAI,QAAQ,EACnB,SAAS,IAAI,iBAAiB,GAC/B,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,SAAS,IAAI,oBAAoB,GAClC,MAAM,aAAa,CAAA;AACpB,OAAO,IAAI,MAAM,iBAAiB,CAAA;AAGlC,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACvC,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AACtE,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAC5C,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAuB,CAC7C,CAAA;AACD,MAAM,SAAS,GAAG,GAAG,CAAA,qBAAqB,kBAAkB;KACzD,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;KACvB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAA;AAEhB,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAC9E,CAAA;AAED,MAAM,YAAY,GAAG,GAAG,CAAA;;;;;;;CAOvB,CAAA;AAQD,MAAM,CAAC,MAAM,SAAS,GAGlB;IACF,KAAK,EAAE;QACL,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,SAAS,EAAE;QACT,aAAa,CAAC,GAAsC;YAClD,OAAO,GAAG,CAAC,WAAW,CAAC,IAAI,CAAA;QAC7B,CAAC;KACF;IAED,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,gBAAgB;IACnB,GAAG,cAAc;IACjB,GAAG,YAAY;IACf,GAAG,eAAe;IAClB,GAAG,iBAAiB;IACpB,GAAG,oBAAoB;CACxB,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,OAAO;IACP,OAAO;IACP,OAAO;IACP,KAAK;IACL,MAAM;IACN,QAAQ;IACR,WAAW;IACX,SAAS;IACT,WAAW;IACX,YAAY;CACb,CAAA;AAED,OAAO,EAAE,WAAW,EAAe,CAAA"}

package/lib/model/Byline.js

@@ -18,6 +18,8 @@ export class Byline {
     }
 }
 _Byline_instances = new WeakSet(), _Byline_splitBylineByName = function _Byline_splitBylineByName(byline, names) {
+    if (!names.length)
+        return [byline];
     const regex = new RegExp(`(${names.join('|')})`, 'ig');
     return byline.split(regex).filter((string) => string !== '');
 }, _Byline_buildUrlTree = function _Byline_buildUrlTree(urlMapping, parts) {

package/lib/model/Byline.js.map

@@ -1 +1 @@
-{"version":3,"file":"Byline.js","sourceRoot":"","sources":["../../src/model/Byline.ts"],"names":[],"mappings":";;;;;;AAAA,MAAM,OAAO,MAAM;IACjB,YAAoB,MAAc,EAAU,gBAAqB;QAA7C,WAAM,GAAN,MAAM,CAAQ;QAAU,qBAAgB,GAAhB,gBAAgB,CAAK;;IAAG,CAAC;IAErE,eAAe;QACb,MAAM,KAAK,GAAG,uBAAA,IAAI,oDAAmB,MAAvB,IAAI,EAAoB,IAAI,CAAC,MAAM,EAAE;YACjD,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;SAChC,CAAC,CAAA;QACF,OAAO,uBAAA,IAAI,+CAAc,MAAlB,IAAI,EAAe,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;IACzD,CAAC;CA8BF;kGA5BoB,MAAc,EAAE,KAAe;IAChD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AAC9D,CAAC,uDAEa,UAA+B,EAAE,KAAe;IAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEhC,IAAI,GAAG,EAAE;YACP,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,YAAY;gBACrB,UAAU,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;gBACzB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aAC1C,CAAA;SACF;aAAM;YACL,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI;aACZ,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE;KACjC,CAAA;AACH,CAAC"}
+{"version":3,"file":"Byline.js","sourceRoot":"","sources":["../../src/model/Byline.ts"],"names":[],"mappings":";;;;;;AAAA,MAAM,OAAO,MAAM;IACjB,YAAoB,MAAc,EAAU,gBAAqB;QAA7C,WAAM,GAAN,MAAM,CAAQ;QAAU,qBAAgB,GAAhB,gBAAgB,CAAK;;IAAG,CAAC;IAErE,eAAe;QACb,MAAM,KAAK,GAAG,uBAAA,IAAI,oDAAmB,MAAvB,IAAI,EAAoB,IAAI,CAAC,MAAM,EAAE;YACjD,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;SAChC,CAAC,CAAA;QACF,OAAO,uBAAA,IAAI,+CAAc,MAAlB,IAAI,EAAe,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;IACzD,CAAC;CA+BF;kGA7BoB,MAAc,EAAE,KAAe;IAChD,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,MAAM,CAAC,CAAA;IAClC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IACtD,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AAC9D,CAAC,uDAEa,UAA+B,EAAE,KAAe;IAC5D,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEhC,IAAI,GAAG,EAAE;YACP,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,YAAY;gBACrB,UAAU,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;gBACzB,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aAC1C,CAAA;SACF;aAAM;YACL,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,IAAI;aACZ,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE;KACjC,CAAA;AACH,CAAC"}

package/lib/model/Byline.test.js

@@ -56,5 +56,12 @@ describe('byline transformation', () => {
         const result = byline.buildBylineTree();
         expect(result).toMatchSnapshot();
     });
+    test('handles bylines without any matching authors', async () => {
+        const bylineText = 'Chris Giles and Nick Ramsbottom in London';
+        const authorUrlMapping = new Map([]);
+        const byline = new Byline(bylineText, authorUrlMapping);
+        const result = byline.buildBylineTree();
+        expect(result).toMatchSnapshot();
+    });
 });
 //# sourceMappingURL=Byline.test.js.map

package/lib/model/Byline.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"Byline.test.js","sourceRoot":"","sources":["../../src/model/Byline.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,UAAU,GAAG,uBAAuB,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,UAAU,GAAG,uCAAuC,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;YACD;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,UAAU,GAAG,2CAA2C,CAAA;QAC9D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,UAAU,GAAG,uBAAuB,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;YACD;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Byline.test.js","sourceRoot":"","sources":["../../src/model/Byline.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,UAAU,GAAG,uBAAuB,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,UAAU,GAAG,uCAAuC,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;YACD;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,UAAU,GAAG,2CAA2C,CAAA;QAC9D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,UAAU,GAAG,uBAAuB,CAAA;QAC1C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC/B;gBACE,aAAa;gBACb,qEAAqE;aACtE;YACD;gBACE,aAAa;gBACb,qEAAqE;aACtE;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,UAAU,GAAG,2CAA2C,CAAA;QAC9D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,CAAA;QAEpC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;QACvD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/lib/richText.d.ts

@@ -1,5 +1,5 @@
 import { CapiResponse } from './model/CapiResponse.js';
-declare type RichTextResolverData = {
+export declare type RichTextResolverData = {
     source: string;
     value: string;
     contentApiData?: CapiResponse;
@@ -11,4 +11,3 @@ export declare const resolvers: {
         structured(parent: RichTextResolverData): Promise<unknown>;
     };
 };
-export {};

package/lib/tags/Link.js

@@ -11,7 +11,7 @@ export const Link = (_a = class Link {
             }
         }
     },
-    _a.selector = 'a',
+    _a.selector = 'a:not([dataAssetType])',
     _a.typeDef = gql `
     type Link {
       href: String

package/lib/tags/Link.js.map

@@ -1 +1 @@
-{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../src/tags/Link.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,MAAM,CAAC,MAAM,IAAI,SAAmB,MAAM,IAAI;QAK5C,YAAY,IAAkB;;YAC5B,IAAI,OAAO,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,0CAAE,IAAI,CAAA,KAAK,QAAQ,EAAE;gBAC9C,IAAI,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,mCAAI,EAAE,CAAA;aACvC;iBAAM;gBACL,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;aACf;QACH,CAAC;KAOF;IAfQ,WAAQ,GAAG,GAAG;IAUd,UAAO,GAAG,GAAG,CAAA;;;;GAInB;OACF,CAAA"}
+{"version":3,"file":"Link.js","sourceRoot":"","sources":["../../src/tags/Link.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAIjC,MAAM,CAAC,MAAM,IAAI,SAAmB,MAAM,IAAI;QAK5C,YAAY,IAAkB;;YAC5B,IAAI,OAAO,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,0CAAE,IAAI,CAAA,KAAK,QAAQ,EAAE;gBAC9C,IAAI,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,mCAAI,EAAE,CAAA;aACvC;iBAAM;gBACL,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;aACf;QACH,CAAC;KAOF;IAfQ,WAAQ,GAAG,wBAAwB;IAUnC,UAAO,GAAG,GAAG,CAAA;;;;GAInB;OACF,CAAA"}

package/lib/tags/Tweet.d.ts

@@ -0,0 +1,17 @@
+import type { TagConstructor } from './index.js';
+import type * as hast from 'hast';
+import { QueryContext } from '../index.js';
+import type { RichTextResolverData } from '../richText.js';
+declare class Tweet {
+    tweetUrl: string;
+    static selector: string;
+    constructor(node: hast.Element);
+    embed(context: QueryContext): Promise<RichTextResolverData | null>;
+    static resolve: {
+        embed: (parent: Tweet, _args: any, context: QueryContext) => Promise<RichTextResolverData | null>;
+        tweetUrl: (parent: Tweet) => string;
+    };
+    static typeDef: import("graphql").DocumentNode;
+}
+declare const TweetClass: TagConstructor<Tweet>;
+export { TweetClass as Tweet };

package/lib/tags/Tweet.js

@@ -0,0 +1,40 @@
+var _a;
+import { gql } from 'graphql-tag';
+class Tweet {
+    constructor(node) {
+        var _b;
+        if (((_b = node.properties) === null || _b === void 0 ? void 0 : _b.href) && typeof node.properties.href === 'string') {
+            this.tweetUrl = node.properties.href;
+        }
+        else {
+            throw new Error('Embedded tweet is missing a href');
+        }
+    }
+    async embed(context) {
+        try {
+            const tweet = await context.dataSources.twitter.getTweet(this.tweetUrl);
+            return {
+                source: 'twitter',
+                value: tweet.html,
+            };
+        }
+        catch (err) {
+            return null;
+        }
+    }
+}
+_a = Tweet;
+Tweet.selector = 'a[dataAssetType="tweet"]';
+Tweet.resolve = {
+    embed: async (parent, _args, context) => parent.embed(context),
+    tweetUrl: (parent) => parent.tweetUrl,
+};
+Tweet.typeDef = gql `
+    type Tweet {
+      tweetUrl: String
+      embed: RichText
+    }
+  `;
+const TweetClass = Tweet;
+export { TweetClass as Tweet };
+//# sourceMappingURL=Tweet.js.map

package/lib/tags/Tweet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Tweet.js","sourceRoot":"","sources":["../../src/tags/Tweet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAMjC,MAAM,KAAK;IAKT,YAAY,IAAkB;;QAC5B,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,IAAI,KAAI,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;YACrE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAA;SACrC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;SACpD;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAqB;QAC/B,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACvE,OAAO;gBACL,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,KAAK,CAAC,IAAI;aAClB,CAAA;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,IAAI,CAAA;SACZ;IACH,CAAC;;;AApBM,cAAQ,GAAG,0BAA0B,CAAA;AAsBrC,aAAO,GAAG;IACf,KAAK,EAAE,KAAK,EAAE,MAAa,EAAE,KAAU,EAAE,OAAqB,EAAE,EAAE,CAChE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;IACvB,QAAQ,EAAE,CAAC,MAAa,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ;CAC7C,CAAA;AAEM,aAAO,GAAG,GAAG,CAAA;;;;;GAKnB,CAAA;AAGH,MAAM,UAAU,GAA0B,KAAK,CAAA;AAE/C,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,CAAA"}

package/lib/tags/Tweet.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tags/Tweet.test.js

@@ -0,0 +1,71 @@
+import { Tweet } from './Tweet.js';
+import { select } from 'hast-util-select';
+import { unified } from 'unified';
+import rehypeParse from 'rehype-parse';
+import { jest } from '@jest/globals';
+async function createAST(input) {
+    const formatOutput = function formatOutput() {
+        this.Compiler = (tree) => tree;
+    };
+    const body = await unified()
+        .use(rehypeParse, { fragment: true })
+        .use([formatOutput])
+        .process(input);
+    return body.result;
+}
+describe('Embedded Tweets', () => {
+    let body;
+    const getTweetMock = jest.fn();
+    const context = {
+        dataSources: {
+            twitter: {
+                getTweet: getTweetMock,
+            },
+        },
+    };
+    beforeAll(async () => {
+        const input = `<body><a href="https://www.twitter.com/blah" data-asset-type="tweet">Tweet</a></body>`;
+        body = await createAST(input);
+    });
+    afterEach(() => {
+        jest.resetAllMocks();
+    });
+    it('correctly matches the content API tag', () => {
+        const match = select(Tweet.selector, body);
+        expect(match).toBeTruthy();
+    });
+    it('provides the tweetUrl', () => {
+        const node = select(Tweet.selector, body);
+        if (!node) {
+            throw new Error('Expected a tweet node to be found');
+        }
+        const tweet = new Tweet(node);
+        expect(tweet).toEqual({
+            tweetUrl: 'https://www.twitter.com/blah',
+        });
+    });
+    it('provides the twitter embed code', async () => {
+        const node = select(Tweet.selector, body);
+        if (!node) {
+            throw new Error('Expected a tweet node to be found');
+        }
+        const tweet = new Tweet(node);
+        getTweetMock.mockReturnValue({
+            html: '<blockquote>this is an embed</blockquote>',
+        });
+        expect(await tweet.embed(context)).toEqual({
+            source: 'twitter',
+            value: '<blockquote>this is an embed</blockquote>',
+        });
+    });
+    it('handles errors fetching the tweet embed', async () => {
+        const node = select(Tweet.selector, body);
+        if (!node) {
+            throw new Error('Expected a tweet node to be found');
+        }
+        const tweet = new Tweet(node);
+        getTweetMock.mockRejectedValue(new Error('404'));
+        expect(await tweet.embed(context)).toEqual(null);
+    });
+});
+//# sourceMappingURL=Tweet.test.js.map

package/lib/tags/Tweet.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Tweet.test.js","sourceRoot":"","sources":["../../src/tags/Tweet.test.ts"],"names":[],"mappings":"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"}

package/lib/tags/index.d.ts

@@ -3,8 +3,8 @@ import type { IObjectTypeResolver } from '@graphql-tools/utils';
 import type { DocumentNode } from 'graphql';
 import type { CapiResponse } from '../model/CapiResponse.js';
 export declare type Tag = object;
-export interface TagConstructor {
-    new (node: hast.Element, contentApiData?: CapiResponse): Tag;
+export interface TagConstructor<T = Tag> {
+    new (node: hast.Element, contentApiData?: CapiResponse): T;
     selector: string;
     typeDef?: DocumentNode;
     resolve?: IObjectTypeResolver;

package/lib/tags/index.js

@@ -3,6 +3,7 @@ import { LayoutImage } from './LayoutImage.js';
 import { ImageSet } from './ImageSet.js';
 import { PullQuote } from './PullQuote.js';
 import { Recommended } from './Recommended.js';
+import { Tweet } from './Tweet.js';
 function createTagWithoutReference(name, selector) {
     var _a;
     const tag = (_a = class {
@@ -20,6 +21,7 @@ const mapping = {
     RecommendedTitle: createTagWithoutReference('RecommendedTitle', 'recommended-title'),
     Paragraph: createTagWithoutReference('Paragraph', 'p'),
     UnorderedList: createTagWithoutReference('UnorderedList', 'ul'),
+    OrderedList: createTagWithoutReference('OrderedList', 'ol'),
     ListItem: createTagWithoutReference('ListItem', 'li'),
     Layout: createTagWithoutReference('Layout', '.n-content-layout, .layout'),
     LayoutContainer: createTagWithoutReference('LayoutContainer', '.n-content-layout__container, .layout-container'),
@@ -28,6 +30,13 @@ const mapping = {
     PullQuote,
     PullQuoteText: createTagWithoutReference('PullQuoteText', 'pull-quote-text'),
     PullQuoteSource: createTagWithoutReference('PullQuoteText', 'pull-quote-source'),
+    Blockquote: createTagWithoutReference('Blockquote', 'blockquote'),
+    Tweet,
+    LineBreak: createTagWithoutReference('LineBreak', 'br'),
+    HorizontalRule: createTagWithoutReference('HorizontalRule', 'hr'),
+    Emphasis: createTagWithoutReference('Emphasis', 'em'),
+    Strong: createTagWithoutReference('Strong', 'strong'),
+    Strikethrough: createTagWithoutReference('Strikethrough', 's'),
 };
 export default mapping;
 //# sourceMappingURL=index.js.map

package/lib/tags/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tags/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAW9C,SAAS,yBAAyB,CAChC,IAAY,EACZ,QAAgB;;IAEhB,MAAM,GAAG,SAAG;SAEX;QADQ,WAAQ,GAAG,QAAQ;WAC3B,CAAA;IAED,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAEnD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,OAAO,GAAmC;IAC9C,IAAI;IACJ,YAAY,EAAE,yBAAyB,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,QAAQ;IACR,WAAW;IACX,gBAAgB,EAAE,yBAAyB,CACzC,kBAAkB,EAClB,mBAAmB,CACpB;IACD,SAAS,EAAE,yBAAyB,CAAC,WAAW,EAAE,GAAG,CAAC;IACtD,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,IAAI,CAAC;IAC/D,QAAQ,EAAE,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC;IACrD,MAAM,EAAE,yBAAyB,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACzE,eAAe,EAAE,yBAAyB,CACxC,iBAAiB,EACjB,iDAAiD,CAClD;IACD,UAAU,EAAE,yBAAyB,CACnC,YAAY,EACZ,uCAAuC,CACxC;IACD,WAAW;IACX,SAAS;IACT,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAC5E,eAAe,EAAE,yBAAyB,CACxC,eAAe,EACf,mBAAmB,CACpB;CACF,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tags/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAWlC,SAAS,yBAAyB,CAChC,IAAY,EACZ,QAAgB;;IAEhB,MAAM,GAAG,SAAG;SAEX;QADQ,WAAQ,GAAG,QAAQ;WAC3B,CAAA;IAED,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAEnD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,OAAO,GAAmC;IAC9C,IAAI;IACJ,YAAY,EAAE,yBAAyB,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,QAAQ;IACR,WAAW;IACX,gBAAgB,EAAE,yBAAyB,CACzC,kBAAkB,EAClB,mBAAmB,CACpB;IACD,SAAS,EAAE,yBAAyB,CAAC,WAAW,EAAE,GAAG,CAAC;IACtD,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,IAAI,CAAC;IAC/D,WAAW,EAAE,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC;IAC3D,QAAQ,EAAE,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC;IACrD,MAAM,EAAE,yBAAyB,CAAC,QAAQ,EAAE,4BAA4B,CAAC;IACzE,eAAe,EAAE,yBAAyB,CACxC,iBAAiB,EACjB,iDAAiD,CAClD;IACD,UAAU,EAAE,yBAAyB,CACnC,YAAY,EACZ,uCAAuC,CACxC;IACD,WAAW;IACX,SAAS;IACT,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAC5E,eAAe,EAAE,yBAAyB,CACxC,eAAe,EACf,mBAAmB,CACpB;IACD,UAAU,EAAE,yBAAyB,CAAC,YAAY,EAAE,YAAY,CAAC;IACjE,KAAK;IACL,SAAS,EAAE,yBAAyB,CAAC,WAAW,EAAE,IAAI,CAAC;IACvD,cAAc,EAAE,yBAAyB,CAAC,gBAAgB,EAAE,IAAI,CAAC;IACjE,QAAQ,EAAE,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC;IACrD,MAAM,EAAE,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACrD,aAAa,EAAE,yBAAyB,CAAC,eAAe,EAAE,GAAG,CAAC;CAC/D,CAAA;AAED,eAAe,OAAO,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "",
   "main": "lib/index.js",
   "type": "module",

package/src/datasources/index.ts

@@ -1,11 +1,13 @@
 import { CapiDataSource } from './capi.js'
 import { OrigamiImageDataSource } from './origami-image.js'
+import { TwitterDataSource } from './twitter.js'
 import { URLManagementDataSource } from './url-management.js'
 
 export const dataSources = () => ({
   capi: new CapiDataSource(),
   origami: new OrigamiImageDataSource(),
   vanityUrls: new URLManagementDataSource(),
+  twitter: new TwitterDataSource(),
 })
 
 export type DataSources = ReturnType<typeof dataSources>

package/src/datasources/twitter.ts

@@ -0,0 +1,9 @@
+import { InstrumentedRESTDataSource } from './instrumented.js'
+
+export class TwitterDataSource extends InstrumentedRESTDataSource {
+  baseURL = 'https://publish.twitter.com'
+
+  async getTweet(tweetUrl: string) {
+    return this.get(`/oembed?url=${tweetUrl}&omit_script=true`)
+  }
+}

package/src/index.ts

@@ -21,7 +21,7 @@ import tags from './tags/index.js'
 import type { Metrics } from 'next-metrics'
 
 const tagEntries = Object.entries(tags)
-const tagsWithReferences = tagEntries.filter(([_key, tag]) => tag.typeDef)
+const tagsWithReferences = tagEntries.filter(([, tag]) => tag.typeDef)
 const tagTypeDefs = tagsWithReferences.flatMap(
   ([_key, tag]) => tag.typeDef as DocumentNode
 )

package/src/model/Byline.test.ts

@@ -64,4 +64,13 @@ describe('byline transformation', () => {
     const result = byline.buildBylineTree()
     expect(result).toMatchSnapshot()
   })
+
+  test('handles bylines without any matching authors', async () => {
+    const bylineText = 'Chris Giles and Nick Ramsbottom in London'
+    const authorUrlMapping = new Map([])
+
+    const byline = new Byline(bylineText, authorUrlMapping)
+    const result = byline.buildBylineTree()
+    expect(result).toMatchSnapshot()
+  })
 })

package/src/model/Byline.ts

@@ -9,6 +9,7 @@ export class Byline {
   }
 
   #splitBylineByName(byline: string, names: string[]) {
+    if (!names.length) return [byline]
     const regex = new RegExp(`(${names.join('|')})`, 'ig')
     return byline.split(regex).filter((string) => string !== '')
   }

package/src/model/__snapshots__/Byline.test.ts.snap

@@ -71,6 +71,20 @@ Object {
 }
 `;
 
+exports[`byline transformation handles bylines without any matching authors 1`] = `
+Object {
+  "tree": Object {
+    "children": Array [
+      Object {
+        "type": "text",
+        "value": "Chris Giles and Nick Ramsbottom in London",
+      },
+    ],
+    "type": "root",
+  },
+}
+`;
+
 exports[`byline transformation ignores extra authors in annotations array 1`] = `
 Object {
   "tree": Object {

package/src/richText.ts

@@ -6,7 +6,7 @@ import { CapiResponse } from './model/CapiResponse.js'
 import extractReferences from './unified-plugins/extract-references.js'
 import mapToAbstractTypes from './unified-plugins/map-to-abstract-types.js'
 
-type RichTextResolverData = {
+export type RichTextResolverData = {
   source: string
   value: string
   contentApiData?: CapiResponse

package/src/tags/Link.ts

@@ -5,7 +5,7 @@ import type * as hast from 'hast'
 export const Link: TagConstructor = class Link implements Tag {
   href: string
 
-  static selector = 'a'
+  static selector = 'a:not([dataAssetType])'
 
   constructor(node: hast.Element) {
     if (typeof node?.properties?.href === 'string') {

package/src/tags/Tweet.test.ts

@@ -0,0 +1,82 @@
+import { Tweet } from './Tweet.js'
+import { HastNode, select } from 'hast-util-select'
+import { unified, Plugin } from 'unified'
+import rehypeParse from 'rehype-parse'
+import { QueryContext } from '../index.js'
+import { jest } from '@jest/globals'
+
+async function createAST(input: string) {
+  const formatOutput: Plugin<[], Element, Element> = function formatOutput() {
+    this.Compiler = (tree) => tree
+  }
+  const body = await unified()
+    .use(rehypeParse, { fragment: true })
+    .use([formatOutput])
+    .process(input)
+  return body.result as HastNode
+}
+
+describe('Embedded Tweets', () => {
+  let body: HastNode
+
+  const getTweetMock = jest.fn()
+  const context = {
+    dataSources: {
+      twitter: {
+        getTweet: getTweetMock,
+      },
+    },
+  } as unknown as QueryContext
+
+  beforeAll(async () => {
+    const input = `<body><a href="https://www.twitter.com/blah" data-asset-type="tweet">Tweet</a></body>`
+    body = await createAST(input)
+  })
+
+  afterEach(() => {
+    jest.resetAllMocks()
+  })
+
+  it('correctly matches the content API tag', () => {
+    const match = select(Tweet.selector, body)
+    expect(match).toBeTruthy()
+  })
+
+  it('provides the tweetUrl', () => {
+    const node = select(Tweet.selector, body)
+    if (!node) {
+      throw new Error('Expected a tweet node to be found')
+    }
+    const tweet = new Tweet(node)
+    expect(tweet).toEqual({
+      tweetUrl: 'https://www.twitter.com/blah',
+    })
+  })
+
+  it('provides the twitter embed code', async () => {
+    const node = select(Tweet.selector, body)
+    if (!node) {
+      throw new Error('Expected a tweet node to be found')
+    }
+    const tweet = new Tweet(node)
+    getTweetMock.mockReturnValue({
+      html: '<blockquote>this is an embed</blockquote>',
+    })
+
+    expect(await tweet.embed(context)).toEqual({
+      source: 'twitter',
+      value: '<blockquote>this is an embed</blockquote>',
+    })
+  })
+
+  it('handles errors fetching the tweet embed', async () => {
+    const node = select(Tweet.selector, body)
+    if (!node) {
+      throw new Error('Expected a tweet node to be found')
+    }
+    const tweet = new Tweet(node)
+    getTweetMock.mockRejectedValue(new Error('404'))
+
+    expect(await tweet.embed(context)).toEqual(null)
+  })
+})

package/src/tags/Tweet.ts

@@ -0,0 +1,48 @@
+import { gql } from 'graphql-tag'
+import type { TagConstructor } from './index.js'
+import type * as hast from 'hast'
+import { QueryContext } from '../index.js'
+import type { RichTextResolverData } from '../richText.js'
+
+class Tweet {
+  tweetUrl: string
+
+  static selector = 'a[dataAssetType="tweet"]'
+
+  constructor(node: hast.Element) {
+    if (node.properties?.href && typeof node.properties.href === 'string') {
+      this.tweetUrl = node.properties.href
+    } else {
+      throw new Error('Embedded tweet is missing a href')
+    }
+  }
+
+  async embed(context: QueryContext): Promise<RichTextResolverData | null> {
+    try {
+      const tweet = await context.dataSources.twitter.getTweet(this.tweetUrl)
+      return {
+        source: 'twitter',
+        value: tweet.html,
+      }
+    } catch (err) {
+      return null
+    }
+  }
+
+  static resolve = {
+    embed: async (parent: Tweet, _args: any, context: QueryContext) =>
+      parent.embed(context),
+    tweetUrl: (parent: Tweet) => parent.tweetUrl,
+  }
+
+  static typeDef = gql`
+    type Tweet {
+      tweetUrl: String
+      embed: RichText
+    }
+  `
+}
+
+const TweetClass: TagConstructor<Tweet> = Tweet
+
+export { TweetClass as Tweet }