From 2e7fff55c7cdccef553f2e254268006bc8711724 Mon Sep 17 00:00:00 2001
From: Chris Wilkinson <c.wilkinson@elifesciences.org>
Date: Mon, 27 Jan 2020 18:38:34 +0000
Subject: [PATCH] Fix data factory type (#41884)

---
 types/rdf-dataset-indexed/index.d.ts          |  4 ++--
 .../rdf-dataset-indexed-tests.ts              | 21 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/types/rdf-dataset-indexed/index.d.ts b/types/rdf-dataset-indexed/index.d.ts
index b73d812b9a..6f913e4a94 100644
--- a/types/rdf-dataset-indexed/index.d.ts
+++ b/types/rdf-dataset-indexed/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Chris Wilkinson <https://github.com/thewilkybarkid>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import { BaseQuad, DataFactory, DatasetCore, Quad } from 'rdf-js';
+import { BaseQuad, DataFactory, DatasetCore, DatasetCoreFactory, Quad } from 'rdf-js';
 
-declare function datasetFactory<Q extends BaseQuad = Quad>(quads?: Q[], dataFactory?: DataFactory<Q>): DatasetCore<Q>;
+declare function datasetFactory<Q extends BaseQuad = Quad>(quads?: Q[], dataFactory?: DataFactory<Q> & DatasetCoreFactory<Q>): DatasetCore<Q>;
 
 export = datasetFactory;
diff --git a/types/rdf-dataset-indexed/rdf-dataset-indexed-tests.ts b/types/rdf-dataset-indexed/rdf-dataset-indexed-tests.ts
index 06e9e4194c..e603f8ff01 100644
--- a/types/rdf-dataset-indexed/rdf-dataset-indexed-tests.ts
+++ b/types/rdf-dataset-indexed/rdf-dataset-indexed-tests.ts
@@ -1,12 +1,21 @@
 import datasetFactory = require('rdf-dataset-indexed');
-import { BaseQuad, DataFactory, DatasetCore, Quad } from 'rdf-js';
+import { BaseQuad, DataFactory, DatasetCore, DatasetCoreFactory, Quad, Term } from 'rdf-js';
 
-const dataFactory: DataFactory = {} as any;
+interface QuadBnode extends BaseQuad {
+    subject: Term;
+    predicate: Term;
+    object: Term;
+    graph: Term;
+}
+
+const dataFactory1: DataFactory & DatasetCoreFactory = {} as any;
+const dataFactory2: DataFactory<QuadBnode> & DatasetCoreFactory<QuadBnode> = {} as any;
 const quads1: Quad[] = [] as any;
-const quads2: BaseQuad[] = [] as any;
+const quads2: QuadBnode[] = [] as any;
 
 const test1: DatasetCore = datasetFactory();
 const test2: DatasetCore = datasetFactory(quads1);
-const test3: DatasetCore = datasetFactory(quads1, dataFactory);
-const test4: DatasetCore<BaseQuad> = datasetFactory(quads2);
-const test5: DatasetCore<BaseQuad> = datasetFactory<BaseQuad>(quads2);
+const test3: DatasetCore = datasetFactory(quads1, dataFactory1);
+const test4: DatasetCore<QuadBnode> = datasetFactory(quads2);
+const test5: DatasetCore<QuadBnode> = datasetFactory<QuadBnode>(quads2);
+const test6: DatasetCore<QuadBnode> = datasetFactory<QuadBnode>(quads2, dataFactory2);