🤖 Merge PR DefinitelyTyped#68117 fix: missing factory parameter by @t…

…pluscode * fix: missing factory parameter * style: pretty print * style: format
nossila · Jan 9, 2024 · fba2208 · fba2208
1 parent bf9914f
commit fba2208
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/types/clownface/clownface-tests.ts b/types/clownface/clownface-tests.ts
@@ -1,3 +1,4 @@
+import DataFactory from "@rdfjs/data-model/Factory.js";
 import DatasetFactory from "@rdfjs/dataset/Factory.js";
 import Environment from "@rdfjs/environment/Environment.js";
 import { BlankNode, Dataset, DatasetCore, Literal, NamedNode, Quad_Graph, Term, Variable } from "@rdfjs/types";
@@ -196,6 +197,18 @@ function testFactory() {
 
     const namedNodeContext: AnyPointer<NamedNode, Dataset> = <any> {};
     const deriveContextFromOtherNamedNodeContext: AnyPointer<NamedNode, Dataset> = clownface(namedNodeContext);
+
+    const factory = new Environment([
+        DatasetFactory,
+        DataFactory,
+    ]);
+    const withFactory = clownface({ dataset, factory });
+
+    const incompatibleFactory = new Environment([
+        DataFactory,
+    ]);
+    // @ts-expect-error
+    const withIncompatibleFactory = clownface({ dataset, factory: incompatibleFactory });
 }
 
 function testFilter() {

diff --git a/types/clownface/index.d.ts b/types/clownface/index.d.ts
@@ -1,4 +1,14 @@
-import { BlankNode, DatasetCore, DatasetCoreFactory, Literal, NamedNode, Quad_Graph, Term } from "@rdfjs/types";
+import { Environment } from "@rdfjs/environment/Environment.js";
+import {
+    BlankNode,
+    DataFactory,
+    DatasetCore,
+    DatasetCoreFactory,
+    Literal,
+    NamedNode,
+    Quad_Graph,
+    Term,
+} from "@rdfjs/types";
 import Context from "./lib/Context.js";
 
 export type AnyContext = Term | Term[] | undefined;
@@ -20,7 +30,10 @@ interface NodeOptions {
 }
 
 export type ClownfaceInit<D extends DatasetCore = DatasetCore> = Partial<
-    Pick<AnyPointer<AnyContext, D>, "dataset" | "_context"> & { graph: Quad_Graph }
+    Pick<AnyPointer<AnyContext, D>, "dataset" | "_context"> & {
+        graph: Quad_Graph;
+        factory: Environment<DatasetCoreFactory | DataFactory>;
+    }
 >;
 
 type Iteratee<T extends AnyContext = undefined, D extends DatasetCore = DatasetCore> = T extends undefined ? never

diff --git a/types/clownface/package.json b/types/clownface/package.json
@@ -7,12 +7,13 @@
     ],
     "type": "module",
     "dependencies": {
-        "@rdfjs/types": ">=1.0.0"
+        "@rdfjs/types": ">=1.0.0",
+        "@types/rdfjs__environment": "*"
     },
     "devDependencies": {
         "@types/clownface": "workspace:.",
         "@types/rdfjs__dataset": "*",
-        "@types/rdfjs__environment": "*"
+        "@types/rdfjs__data-model": "*"
     },
     "owners": [
         {