Revert to previously approved

Author: matthieubosquet

data-model.d.ts

@@ -289,17 +289,16 @@ export interface DataFactory<OutQuad extends BaseQuad = Quad, InQuad extends Bas
     quad(subject: InQuad['subject'], predicate: InQuad['predicate'], object: InQuad['object'], graph?: InQuad['graph']): OutQuad;
 
     /**
-     * @param original The original term.
-     * @return A new instance of the term such that newTermInstance.equals(original) returns true.
-     * @see Term
-     */
-    fromTerm(original: InQuad): OutQuad;
-    fromTerm<T extends Term>(original: T): T;
+      * @param original The original term.
+      * @return A new instance of the term such that newTermInstance.equals(original) returns true.
+      * @see Term
+      */
+    fromTerm(original: Term): Term;
 
     /**
-     * @param original The original quad.
-     * @return A new instance of the quad such that newQuadInstance.equals(original) returns true.
-     * @see Quad
-     */
+      * @param original The original quad.
+      * @return A new instance of the quad such that newQuadInstance.equals(original) returns true.
+      * @see Quad
+      */
     fromQuad(original: InQuad): OutQuad;
 }

rdf-js-tests.ts

@@ -86,24 +86,11 @@ function test_datafactory() {
 
     const defaultGraph: DefaultGraph = dataFactory.defaultGraph();
 
-    type NamedNodeExt = NamedNode & { someProp: string };
-    const term1: NamedNode = dataFactory.fromTerm(<NamedNodeExt>{});
-    const term1ext: NamedNodeExt = dataFactory.fromTerm(<NamedNodeExt>{});
-    type BlankNodeExt = BlankNode & { someProp: string };
-    const term2: BlankNode = dataFactory.fromTerm(<BlankNodeExt>{});
-    const term2ext: BlankNodeExt = dataFactory.fromTerm(<BlankNodeExt>{});
-    type LiteralExt = Literal & { someProp: string };
-    const term3: Literal = dataFactory.fromTerm(<LiteralExt>{});
-    const term3ext: LiteralExt = dataFactory.fromTerm(<LiteralExt>{});
-    type VariableExt = Variable & { someProp: string };
-    const term4: Variable = dataFactory.fromTerm(<VariableExt> {});
-    const term4ext: VariableExt = dataFactory.fromTerm(<VariableExt> {});
-    type DefaultGraphExt = DefaultGraph & { someProp: string };
-    const term5: DefaultGraph = dataFactory.fromTerm(<DefaultGraphExt>{});
-    const term5ext: DefaultGraphExt = dataFactory.fromTerm(<DefaultGraphExt>{});
-    type OutQuadExt = Quad & { someProp: string };
-    const term6: Quad = dataFactory.fromTerm(<OutQuadExt>{});
-    const term6ext: OutQuadExt = dataFactory.fromTerm<OutQuadExt>(<OutQuadExt>{});
+     const term1: Term = dataFactory.fromTerm(dataFactory.namedNode(""));
+     const term2: Term = dataFactory.fromTerm(dataFactory.blankNode());
+     const term3: Term = dataFactory.fromTerm(dataFactory.literal(""));
+     const term4: Term = dataFactory.fromTerm(dataFactory.variable ? dataFactory.variable("v1") : <any> {});
+     const term5: Term = dataFactory.fromTerm(dataFactory.defaultGraph());
 
     const quadFromQuad: Term = dataFactory.fromQuad(dataFactory.quad(
         dataFactory.namedNode("x"),
@@ -148,7 +135,7 @@ function test_datafactory_star() {
         const notEqualToOtherType: boolean = quadBobAge2.equals(dataFactory.namedNode('ex:something:else'));
     }
 
-    const quadTerm: Quad = dataFactory.fromTerm(quadBobAge);
+    const quadTerm: Term = dataFactory.fromTerm(quadBobAge);
 }
 
 function test_datafactory_star_basequad() {
@@ -176,9 +163,7 @@ function test_datafactory_star_basequad() {
 
     const datafactoryBaseQuadToQuad: DataFactory<BaseQuad, Quad> = <any> {};
 
-    const quadToBaseQuad1: BaseQuad = datafactoryBaseQuadToQuad.fromTerm(quadBobAge);
-
-    const baseQuadTerm: BaseQuad = dataFactory.fromTerm(quadBobAge);
+    const baseQuadTerm: Term = dataFactory.fromTerm(quadBobAge);
 
     const baseQuad: BaseQuad = dataFactory.fromQuad(quadBobAge);
 
@@ -191,8 +176,7 @@ function test_datafactory_star_basequad() {
         dataFactory.literal('23'),
     );
 
-    const quadTerm: Quad = quadDataFactory.fromTerm(regularQuadBobAge);
-    const quadTerm2: Quad = datafactoryBaseQuadToQuad.fromTerm<Quad>(regularQuadBobAge);
+    const quadTerm: Term = quadDataFactory.fromTerm(regularQuadBobAge);
 }
 
 function test_stream() {