Fix prepareLabels and unstable entity type order in SparqlDataProvider:

* Fix `prepareLabels` option for `SparqlDataProvider` to be applied for `knownElementTypes()`, `knownLinkTypes()`, `elementTypes()`, `linkTypes()`, `propertyTypes()` and `elements`.
* Always sort entity types returned from `SparqlDataProvider.elements()`.
* Add tests for basic `SparqlDataProvider` functionality and label/image options.
* Add `@comunica/query-sparql-rdfjs-lite` to `devDependencies` (for tests):
  - Enable `skipLibCheck` to avoid type errors in `node_modules/rdf-parse/node_modules/lru-cache/dist/esm/index.d.ts`.

Author: AlexeyMz

package-lock.json

@@ -51,6 +51,7 @@
     "react-dom": "^17.0.2 || ^18 || ^19"
   },
   "devDependencies": {
+    "@comunica/query-sparql-rdfjs-lite": "^5.1.3",
     "@eslint/js": "^9.39.1",
     "@rdfjs/types": "^2.0.1",
     "@types/d3-color": "^3.1.3",

package.json

@@ -9,9 +9,10 @@ export type BlankNode = RdfJs.BlankNode;
 export type Literal = RdfJs.Literal;
 export type Variable = RdfJs.Variable;
 export type DefaultGraph = RdfJs.DefaultGraph;
+export type BaseQuad = RdfJs.BaseQuad;
 export type Quad = RdfJs.Quad;
 
-export type Term = NamedNode | BlankNode | Literal | Variable | DefaultGraph | Quad;
+export type Term = NamedNode | BlankNode | Literal | Variable | DefaultGraph | BaseQuad;
 export type DataFactory = RdfJs.DataFactory;
 
 export const DefaultDataFactory: RdfJs.DataFactory = N3.DataFactory;

src/data/rdf/rdfModel.ts

@@ -250,6 +250,10 @@ export function getElementsInfo(
         }
     }
 
+    for (const instance of instances.values()) {
+        instance.types.sort();
+    }
+
     return instances;
 }
 

src/data/sparql/responseHandler.ts

@@ -317,7 +317,7 @@ export class SparqlDataProvider implements DataProvider {
         }
 
         if (this.options.prepareLabels) {
-            await attachLabels(properties.values(), this.options.prepareLabels, signal);
+            await attachLabels(Array.from(properties.values()), this.options.prepareLabels, signal);
         }
 
         return properties;
@@ -349,7 +349,7 @@ export class SparqlDataProvider implements DataProvider {
         }
 
         if (this.options.prepareLabels) {
-            await attachLabels(classes.values(), this.options.prepareLabels, signal);
+            await attachLabels(Array.from(classes.values()), this.options.prepareLabels, signal);
         }
 
         return classes;
@@ -381,7 +381,7 @@ export class SparqlDataProvider implements DataProvider {
         }
 
         if (this.options.prepareLabels) {
-            await attachLabels(linkTypes.values(), this.options.prepareLabels, signal);
+            await attachLabels(Array.from(linkTypes.values()), this.options.prepareLabels, signal);
         }
 
         return linkTypes;
@@ -407,7 +407,7 @@ export class SparqlDataProvider implements DataProvider {
         const linkTypes = getLinkTypes(result);
 
         if (this.options.prepareLabels) {
-            await attachLabels(linkTypes.values(), this.options.prepareLabels, signal);
+            await attachLabels(Array.from(linkTypes.values()), this.options.prepareLabels, signal);
         }
 
         return Array.from(linkTypes.values());
@@ -454,7 +454,7 @@ export class SparqlDataProvider implements DataProvider {
 
         if (this.options.prepareLabels) {
             await attachProperties(
-                elementModels.values(),
+                Array.from(elementModels.values()),
                 this.options.prepareLabels,
                 this.labelPredicate,
                 signal
@@ -1063,11 +1063,11 @@ interface LabeledItem {
 }
 
 async function attachLabels(
-    items: Iterable<LabeledItem>,
+    items: readonly LabeledItem[],
     fetchLabels: NonNullable<SparqlDataProviderOptions['prepareLabels']>,
     signal: AbortSignal | undefined
 ): Promise<void> {
-    const resources = new Set<string>(Array.from(items, item => item.id));
+    const resources = new Set(items.map(item => item.id));
     const labels = await fetchLabels(resources, signal);
     for (const item of items) {
         const itemLabels = labels.get(item.id);
@@ -1080,19 +1080,17 @@ async function attachLabels(
 type MutableProperties = Record<PropertyTypeIri, Array<Rdf.NamedNode | Rdf.Literal>>;
 
 async function attachProperties(
-    items: Iterable<ElementModel>,
+    items: readonly ElementModel[],
     fetchProperties: NonNullable<SparqlDataProviderOptions['prepareLabels']>,
     propertyIri: PropertyTypeIri,
     signal: AbortSignal | undefined
 ) {
-    const resources = new Set<string>(Array.from(items, item => item.id));
+    const resources = new Set(items.map(item => item.id));
     const properties = await fetchProperties(resources, signal);
     for (const item of items) {
         const itemValues = properties.get(item.id);
         if (itemValues) {
-            for (const value of itemValues) {
-                appendProperty(item.properties as MutableProperties, propertyIri, value);
-            }
+            (item.properties as MutableProperties)[propertyIri] = itemValues;
         }
     }
 }

src/data/sparql/sparqlDataProvider.ts

@@ -2,11 +2,12 @@ import { expect, describe, it, vi } from 'vitest';
 
 import { IndexedDbCachedProvider } from '../../src/data/indexedDb/indexedDbCachedProvider';
 import type {
-    ElementIri, ElementTypeIri, LinkModel, LinkTypeIri, PropertyTypeIri,
+    ElementIri, ElementTypeIri, LinkTypeIri, PropertyTypeIri,
 } from '../../src/data/model';
 import {
     MockDataProvider, element, elementType, linkType, propertyType, missing,
 } from '../mock/mockDataProvider';
+import { compareLinks } from '../utilities/dataCompare';
 
 describe('IndexedDbCachedProvider', () => {
     it('caches data once for known element/link types', async () => {
@@ -498,28 +499,3 @@ describe('IndexedDbCachedProvider', () => {
         }
     });
 });
-
-function compareLinks(a: LinkModel, b: LinkModel): number {
-    let result = (
-        a.sourceId < b.sourceId ? -1 :
-        a.sourceId > b.sourceId ? 1 :
-        0
-    );
-    if (result !== 0) {
-        return result;
-    }
-    result = (
-        a.targetId < b.targetId ? -1 :
-        a.targetId > b.targetId ? 1 :
-        0
-    );
-    if (result !== 0) {
-        return result;
-    }
-    result = (
-        a.linkTypeId < b.linkTypeId ? -1 :
-        a.linkTypeId > b.linkTypeId ? 1 :
-        0
-    );
-    return result;
-}