@netwerk-digitaal-erfgoed/network-of-terms-query 6.2.11 → 6.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-query",
-  "version": "6.2.11",
+  "version": "6.2.13",
   "description": "Engine for querying sources in the Network of Terms",
   "keywords": [],
   "homepage": "https://github.com/netwerk-digitaal-erfgoed/network-of-terms#readme",

package/src/query.ts

@@ -91,6 +91,53 @@ export class TimeoutError extends Error {
 
 export class ServerError extends Error {}
 
+export interface BuildSearchQueryOptions {
+  /** The SPARQL query template with placeholders. */
+  template: string;
+  /** The search term to bind. */
+  searchTerm: string;
+  /** Query mode for search term processing. */
+  queryMode: QueryMode;
+  /** Dataset IRI to bind to ?datasetUri. */
+  datasetIri: string;
+  /** Limit for results. */
+  limit: number;
+}
+
+export interface BuildSearchQueryResult {
+  /** The query with #LIMIT# replaced. */
+  query: string;
+  /** Bindings for SPARQL variables (?query, ?virtuosoQuery, ?datasetUri, ?limit). */
+  bindings: Record<string, RDF.Term>;
+}
+
+/**
+ * Build a SPARQL query and bindings from a template.
+ * Returns the query with #LIMIT# replaced and a set of bindings for variables.
+ * The bindings can be used with Comunica's initialBindings or serialized into the query.
+ */
+export function buildSearchQuery(
+  options: BuildSearchQueryOptions,
+): BuildSearchQueryResult {
+  const variants = queryVariants(options.searchTerm, options.queryMode);
+
+  // Replace #LIMIT# placeholder
+  const query = options.template.replace('#LIMIT#', `LIMIT ${options.limit}`);
+
+  // Build bindings record
+  const bindings: Record<string, RDF.Term> = {};
+  for (const [varName, value] of variants) {
+    bindings[varName] = dataFactory.literal(value);
+  }
+  bindings['datasetUri'] = dataFactory.namedNode(options.datasetIri);
+  bindings['limit'] = dataFactory.literal(
+    options.limit.toString(),
+    dataFactory.namedNode('http://www.w3.org/2001/XMLSchema#integer'),
+  );
+
+  return { query, bindings };
+}
+
 export class QueryTermsService {
   private readonly logger: Pino.Logger;
   private readonly engine: QueryEngine;

package/test/query.test.ts

@@ -1,5 +1,9 @@
 import { testCatalog } from '../src/test-utils.js';
-import { QueryMode, QueryTermsService } from '../src/index.js';
+import {
+  buildSearchQuery,
+  QueryMode,
+  QueryTermsService,
+} from '../src/index.js';
 import { QueryEngine } from '@comunica/query-sparql';
 import { ArrayIterator } from 'asynciterator';
 import type { Term } from '@rdfjs/types';
@@ -66,3 +70,35 @@ const query = async (iri: string) => {
     initialBindings: Map<string, Term>;
   };
 };
+
+describe('buildSearchQuery', () => {
+  it('returns query and bindings', () => {
+    const result = buildSearchQuery({
+      template: 'SELECT * WHERE { ?s ?p ?o } #LIMIT#',
+      searchTerm: 'test',
+      queryMode: QueryMode.OPTIMIZED,
+      datasetIri: 'https://example.org/dataset',
+      limit: 10,
+    });
+
+    expect(result.query).toBe('SELECT * WHERE { ?s ?p ?o } LIMIT 10');
+    expect(result.bindings['datasetUri'].value).toBe(
+      'https://example.org/dataset',
+    );
+    expect(result.bindings['limit'].value).toBe('10');
+    expect(result.bindings['query'].value).toBe('test');
+  });
+
+  it('creates Virtuoso-specific query variant', () => {
+    const result = buildSearchQuery({
+      template: 'SELECT * WHERE { ?s ?p ?o }',
+      searchTerm: 'van gogh',
+      queryMode: QueryMode.OPTIMIZED,
+      datasetIri: 'https://example.org/dataset',
+      limit: 100,
+    });
+
+    // Virtuoso format: 'word1' AND 'word2' for multi-word queries
+    expect(result.bindings['virtuosoQuery'].value).toBe("'van' AND 'gogh'");
+  });
+});

package/vite.config.ts

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