@netwerk-digitaal-erfgoed/network-of-terms-query 6.2.14 → 6.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-query",
-  "version": "6.2.14",
+  "version": "6.2.15",
   "description": "Engine for querying sources in the Network of Terms",
   "keywords": [],
   "homepage": "https://github.com/netwerk-digitaal-erfgoed/network-of-terms#readme",
@@ -30,9 +30,9 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@comunica/query-sparql": "^5.1.2",
-    "@comunica/types": "^5.1.0",
-    "@comunica/utils-bindings-factory": "^5.1.0",
+    "@comunica/query-sparql": "^5.1.3",
+    "@comunica/types": "^5.1.3",
+    "@comunica/utils-bindings-factory": "^5.1.3",
     "@hapi/hoek": "^11.0.7",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-metrics-otlp-proto": "0.208.0",
@@ -51,7 +51,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@comunica/query-sparql-file": "^5.1.2",
+    "@comunica/query-sparql-file": "^5.1.3",
     "asynciterator": "^3.9.0"
   }
 }

package/src/query.ts

@@ -13,50 +13,6 @@ import { DataFactory } from 'rdf-data-factory';
 import { sourceQueriesHistogram } from './instrumentation.js';
 import { config } from './config.js';
 
-/**
- * Check if a query requires string substitution instead of initialBindings.
- * Workaround for Comunica v5 traqula bug that crashes with:
- * - SERVICE clauses
- * - VALUES combination
- */
-function requiresStringSubstitution(query: string): boolean {
-  const hasService = /\bSERVICE\b/i.test(query);
-  const hasValues = /\bVALUES\b/i.test(query);
-  return hasService || hasValues;
-}
-
-/**
- * Substitute bindings directly into a SPARQL query string.
- * This is a workaround for Comunica v5's initialBindings bug with SERVICE clauses.
- */
-function substituteBindings(
-  query: string,
-  bindings: Record<string, RDF.Term>,
-): string {
-  let result = query;
-  for (const [name, term] of Object.entries(bindings)) {
-    const pattern = new RegExp(`\\?${name}\\b`, 'g');
-    if (term.termType === 'NamedNode') {
-      result = result.replace(pattern, `<${term.value}>`);
-    } else if (term.termType === 'Literal') {
-      const literal = term as RDF.Literal;
-      const datatype = literal.datatype?.value;
-      if (
-        datatype &&
-        datatype !== 'http://www.w3.org/2001/XMLSchema#string' &&
-        datatype !== 'http://www.w3.org/1999/02/22-rdf-syntax-ns#langString'
-      ) {
-        result = result.replace(pattern, `"${term.value}"^^<${datatype}>`);
-      } else if (literal.language) {
-        result = result.replace(pattern, `"${term.value}"@${literal.language}`);
-      } else {
-        result = result.replace(pattern, `"${term.value}"`);
-      }
-    }
-  }
-  return result;
-}
-
 export type TermsResult = Terms | TimeoutError | ServerError;
 
 export class TermsResponse {
@@ -231,18 +187,8 @@ export class QueryTermsService {
     const logger = new LoggerPino({ logger: this.logger });
     // Extract HTTP credentials if the distribution URL contains any.
     const url = new URL(distribution.endpoint.toString());
-
-    // Workaround for https://github.com/comunica/comunica/issues/1655, so use
-    // string substitution instead of initialBindings for:
-    // - SERVICE clauses crash with initialBindings
-    // - VALUES crashes in some combinations
-    const useStringSubstitution = requiresStringSubstitution(query);
-    const finalQuery = useStringSubstitution
-      ? substituteBindings(query, bindings)
-      : query;
-
-    this.logger.info(`Querying "${url}" with "${finalQuery}"...`);
-    const quadStream = await this.engine.queryQuads(finalQuery, {
+    this.logger.info(`Querying "${url}" with "${query}"...`);
+    const quadStream = await this.engine.queryQuads(query, {
       log: logger,
       httpAuth:
         url.username === '' ? undefined : url.username + ':' + url.password,
@@ -254,10 +200,7 @@ export class QueryTermsService {
           value: url.origin + url.pathname,
         },
       ],
-      // Only pass initialBindings when NOT using string substitution
-      ...(useStringSubstitution
-        ? {}
-        : { initialBindings: bindingsFactory.fromRecord(bindings) }),
+      initialBindings: bindingsFactory.fromRecord(bindings),
     });
 
     return new Promise((resolve) => {

package/vite.config.ts

@@ -16,11 +16,11 @@ export default defineConfig(() => ({
       provider: 'v8' as const,
       thresholds: {
         autoUpdate: true,
-        lines: 57.57,
-        functions: 41.02,
-        branches: 91.52,
-        statements: 57.57,
+        lines: 58.88,
+        functions: 40.78,
+        branches: 94.64,
+        statements: 58.88,
       },
     },
   },
-}));
+}));