Corrected imports and SetIterator

packages/jsonld-dataset-proxy/src/ProxyContext.ts

@@ -2,7 +2,7 @@ import type { GraphNode, QuadMatch, SubjectNode } from "@ldo/rdf-utils";
 import type { BlankNode, Dataset, NamedNode } from "@rdfjs/types";
 import { createSubjectHandler } from "./subjectProxy/createSubjectHandler";
 import type { SubjectProxy } from "./subjectProxy/SubjectProxy";
-import type { SetProxy } from "./setProxy/setProxy";
+import type { SetProxy } from "./setProxy/SetProxy";
 import type { ContextUtil } from "./ContextUtil";
 import type { LanguageOrdering } from "./language/languageTypes";
 import { namedNode } from "@rdfjs/data-model";

packages/jsonld-dataset-proxy/src/index.ts

@@ -18,7 +18,7 @@ export * from "./language/languageTypes";
 export * from "./language/languageUtils";
 
 export * from "./setProxy/isSetProxy";
-export * from "./setProxy/setProxy";
+export * from "./setProxy/SetProxy";
 export * from "./setProxy/ldSet/LdSet";
 export * from "./setProxy/ldSet/BasicLdSet";
 

packages/jsonld-dataset-proxy/src/setProxy/SetProxy.ts

@@ -85,7 +85,7 @@ export abstract class SetProxy<
     return dataset.match(subject, predicate, object).size;
   }
 
-  entries(): SetIterator<[T, T]> {
+  entries(): IterableIterator<[T, T]> {
     const iteratorSet = new Set<[T, T]>();
     for (const value of this) {
       iteratorSet.add([value, value]);
@@ -93,15 +93,15 @@ export abstract class SetProxy<
     return iteratorSet[Symbol.iterator]();
   }
 
-  keys(): SetIterator<T> {
+  keys(): IterableIterator<T> {
     return this.values();
   }
 
-  values(): SetIterator<T> {
+  values(): IterableIterator<T> {
     return this[Symbol.iterator]();
   }
 
-  [Symbol.iterator](): SetIterator<T> {
+  [Symbol.iterator](): IterableIterator<T> {
     const { dataset } = this.context;
     const { subject, predicate, object } = this.getSPO();
     const quads = dataset.match(subject, predicate, object);

packages/jsonld-dataset-proxy/src/setProxy/WildcardObjectSetProxy.ts

@@ -6,7 +6,7 @@ import type {
 } from "@ldo/rdf-utils";
 import type { Dataset, Quad } from "@rdfjs/types";
 import type { RawValue } from "../util/RawObject";
-import { SetProxy } from "./setProxy";
+import { SetProxy } from "./SetProxy";
 import type { ProxyContext } from "../ProxyContext";
 import { getNodeFromRawValue } from "../util/getNodeFromRaw";
 

packages/jsonld-dataset-proxy/src/setProxy/WildcardSubjectSetProxy.ts

@@ -6,7 +6,7 @@ import type {
 } from "@ldo/rdf-utils";
 import type { Quad } from "@rdfjs/types";
 import type { RawObject } from "../util/RawObject";
-import { SetProxy } from "./setProxy";
+import { SetProxy } from "./SetProxy";
 import type { ProxyContext } from "../ProxyContext";
 import { getNodeFromRawObject } from "../util/getNodeFromRaw";
 

packages/jsonld-dataset-proxy/src/setProxy/createNewSetProxy.ts

@@ -9,28 +9,8 @@ import type { WildcardObjectSetProxyQuadMatch } from "./WildcardObjectSetProxy";
 import { WildcardObjectSetProxy } from "./WildcardObjectSetProxy";
 import type { WildcardSubjectSetProxyQuadMatch } from "./WildcardSubjectSetProxy";
 import { WildcardSubjectSetProxy } from "./WildcardSubjectSetProxy";
-import type { SetProxy } from "./setProxy";
+import type { SetProxy } from "./SetProxy";
 
-// export function createNewSetProxy<T extends NonNullable<RawValue>>(
-//   quadMatch: ObjectSetProxyQuadMatch,
-//   isSubjectOriented: false,
-//   proxyContext: ProxyContext,
-// ): ObjectSetProxy<T>;
-// export function createNewSetProxy<T extends RawObject>(
-//   quadMatch: SubjectSetProxyQuadMatch,
-//   isSubjectOriented: true,
-//   proxyContext: ProxyContext,
-// ): SubjectSetProxy<T>;
-// export function createNewSetProxy<T extends NonNullable<RawValue>>(
-//   quadMatch: WildcardObjectSetProxyQuadMatch,
-//   isSubjectOriented: false,
-//   proxyContext: ProxyContext,
-// ): WildcardObjectSetProxy<T>;
-// export function createNewSetProxy<T extends RawObject>(
-//   quadMatch: WildcardSubjectSetProxyQuadMatch,
-//   isSubjectOriented: true,
-//   proxyContext: ProxyContext,
-// ): WildcardSubjectSetProxy<T>;
 export function createNewSetProxy<T extends NonNullable<RawValue>>(
   quadMatch: QuadMatch,
   isSubjectOriented: boolean,

packages/jsonld-dataset-proxy/src/setProxy/isSetProxy.ts

@@ -1,4 +1,4 @@
-import { SetProxy } from "./setProxy";
+import { SetProxy } from "./SetProxy";
 
 export function isSetProxy(someObject?: unknown): someObject is SetProxy {
   if (!someObject) return false;

packages/jsonld-dataset-proxy/src/setProxy/ldSet/LdSet.ts

@@ -30,19 +30,19 @@ export interface LdSet<T> extends Set<T> {
    */
   readonly size: number;
   /** Iterates over values in the set. */
-  [Symbol.iterator](): SetIterator<T>;
+  [Symbol.iterator](): IterableIterator<T>;
   /**
    * Returns an iterable of [v,v] pairs for every value `v` in the set.
    */
-  entries(): SetIterator<[T, T]>;
+  entries(): IterableIterator<[T, T]>;
   /**
    * Despite its name, returns an iterable of the values in the set.
    */
-  keys(): SetIterator<T>;
+  keys(): IterableIterator<T>;
   /**
    * Returns an iterable of values in the set.
    */
-  values(): SetIterator<T>;
+  values(): IterableIterator<T>;
   /**
    * ===========================================================================
    * ITERATOR METHODS

packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts

@@ -2,7 +2,7 @@ import type { SubjectProxyTarget } from "./createSubjectHandler";
 import { namedNode } from "@rdfjs/data-model";
 import { nodeToJsonldRepresentation } from "../util/nodeToJsonldRepresentation";
 import type { SubjectProxy } from "./SubjectProxy";
-import type { SetProxy } from "../setProxy/setProxy";
+import type { SetProxy } from "../setProxy/SetProxy";
 import type { ProxyContext } from "../ProxyContext";
 import { filterQuadsByLanguageOrdering } from "../language/languageUtils";