From 9cb72e2e42437d10b1c3bbec1fd6329ca3f9e5c6 Mon Sep 17 00:00:00 2001
From: Tomasz Pluskiewicz <tpluscode@users.noreply.github.com>
Date: Tue, 22 Sep 2020 20:48:14 +0200
Subject: [PATCH] fix(clownface): add missing overloads (#46950)

---
 types/clownface/clownface-tests.ts | 16 +++++++++++++++-
 types/clownface/index.d.ts         | 15 ++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/types/clownface/clownface-tests.ts b/types/clownface/clownface-tests.ts
index 4e72dc5976..0a3a9d9e83 100644
--- a/types/clownface/clownface-tests.ts
+++ b/types/clownface/clownface-tests.ts
@@ -116,6 +116,9 @@ function testBlankNode() {
     let singleBlank: clownface.AnyPointer<BlankNode, Dataset> = cf.blankNode();
     singleBlank = cf.blankNode('label');
     const multiBlankContext: clownface.AnyPointer<BlankNode[], Dataset> = cf.blankNode([ 'b1', 'b2' ]);
+
+    const fromOther: clownface.AnyPointer<BlankNode, Dataset> = cf.blankNode(singleBlank);
+    const fromMultipleOther: clownface.MultiPointer<BlankNode, Dataset> = cf.blankNode(multiBlankContext);
 }
 
 function testDeleteIn() {
@@ -244,9 +247,12 @@ function testList() {
 function testLiteral() {
     const cf: clownface.AnyPointer<undefined, Dataset> = <any> {};
     let cfOneLit: clownface.AnyPointer<Literal, Dataset> = cf.literal('foo');
-    const cfLiterasl: clownface.AnyPointer<Literal[], Dataset> = cf.literal(['foo', 'bar']);
+    const cfLiterals: clownface.AnyPointer<Literal[], Dataset> = cf.literal(['foo', 'bar']);
     cfOneLit = cf.literal('foo', node);
     cfOneLit = cf.literal('foo', 'en');
+
+    const fromOther: clownface.AnyPointer<Literal, Dataset> = cf.literal(cfOneLit);
+    const fromMultipleOther: clownface.MultiPointer<Literal, Dataset> = cf.literal(cfLiterals);
 }
 
 function testMap() {
@@ -264,6 +270,9 @@ function testNamedNode() {
     let cfSingleNamed: clownface.AnyPointer<NamedNode, Dataset> = cf.namedNode(node);
     cfSingleNamed = cf.namedNode('http://example.com/');
     const cfNamedMany: clownface.AnyPointer<NamedNode[], Dataset> = cf.namedNode(['http://example.com/', 'http://example.org/']);
+
+    const fromOther: clownface.AnyPointer<NamedNode, Dataset> = cf.namedNode(cfSingleNamed);
+    const fromMultipleOther: clownface.MultiPointer<NamedNode, Dataset> = cf.namedNode(cfNamedMany);
 }
 
 function testNode() {
@@ -276,6 +285,11 @@ function testNode() {
     const cfBlank: clownface.AnyPointer<BlankNode, Dataset> = cf.node(null, { type: 'BlankNode' });
     cfLit = cf.node('example', { datatype: node.value });
     cfLit = cf.node('example', { datatype: node });
+
+    const fromOtherNode: clownface.MultiPointer<Term, Dataset> = cf.node(singleTerm);
+    const literalFromOther: clownface.MultiPointer<Literal, Dataset> = cf.node(cfLit);
+
+    const literalFromMultipleOther: clownface.MultiPointer<Literal, Dataset> = cf.node(cfLitMany);
 }
 
 function testOut() {
diff --git a/types/clownface/index.d.ts b/types/clownface/index.d.ts
index c708d5293c..2fdc3de20f 100644
--- a/types/clownface/index.d.ts
+++ b/types/clownface/index.d.ts
@@ -57,7 +57,8 @@ declare namespace clownface {
     node(value: SingleOrOneElementArray<boolean | string | number>, options?: NodeOptions): AnyPointer<Literal, D>;
     node(values: Array<boolean | string | number>, options?: NodeOptions): AnyPointer<Literal[], D>;
 
-    node<X extends Term>(value: SingleOrOneElementArray<X>, options?: NodeOptions): AnyPointer<X, D>;
+    node<X extends Term>(value: SingleOrOneElementArray<X> | AnyPointer<X, D>, options?: NodeOptions): AnyPointer<X, D>;
+    node<X extends Term>(value: MultiPointer<X, D>, options?: NodeOptions): AnyPointer<X[], D>;
     node<X extends Term[]>(values: X, options?: NodeOptions): AnyPointer<X, D>;
 
     node(value: null, options?: NodeOptions): AnyPointer<BlankNode, D>;
@@ -65,14 +66,14 @@ declare namespace clownface {
 
     node(values: Array<boolean | string | number | Term | null>, options?: NodeOptions): AnyPointer<Term[], D>;
 
-    blankNode(value?: SingleOrOneElementArray<string>): AnyPointer<BlankNode, D>;
-    blankNode(values: string[]): AnyPointer<BlankNode[], D>;
+    blankNode(value?: SingleOrOneElementArray<string> | AnyPointer<BlankNode, D>): AnyPointer<BlankNode, D>;
+    blankNode(values: string[] | MultiPointer<BlankNode, D>): AnyPointer<BlankNode[], D>;
 
-    literal(value: SingleOrOneElementArray<boolean | string | number | Term | null>, languageOrDatatype?: string | NamedNode): AnyPointer<Literal, D>;
-    literal(values: Array<boolean | string | number | Term | null>, languageOrDatatype?: string | NamedNode): AnyPointer<Literal[], D>;
+    literal(value: SingleOrOneElementArray<boolean | string | number | Term | null> | AnyPointer<Literal, D>, languageOrDatatype?: string | NamedNode): AnyPointer<Literal, D>;
+    literal(values: Array<boolean | string | number | Term | null> | MultiPointer<Literal, D>, languageOrDatatype?: string | NamedNode): AnyPointer<Literal[], D>;
 
-    namedNode(value: SingleOrOneElementArray<string | NamedNode>): AnyPointer<NamedNode, D>;
-    namedNode(values: Array<string | NamedNode>): AnyPointer<NamedNode[], D>;
+    namedNode(value: SingleOrOneElementArray<string | NamedNode> | AnyPointer<NamedNode, D>): AnyPointer<NamedNode, D>;
+    namedNode(values: Array<string | NamedNode> | MultiPointer<NamedNode, D>): AnyPointer<NamedNode[], D>;
 
     in(predicates?: SingleOrArrayOfTerms<Term>): MultiPointer<T extends undefined ? never : NamedNode | BlankNode, D>;
     out(predicates?: SingleOrArrayOfTerms<Term>): MultiPointer<T extends undefined ? never : Term, D>;