Michiel-VandeVelde · Aug 31, 2026 · Aug 31, 2026 · Aug 31, 2026 · Aug 31, 2026 · Aug 31, 2026
diff --git a/.eslintrc b/.eslintrc
@@ -193,7 +193,7 @@
   overrides: [
     {
       // Specific rules for test files
-      files: [ "packages/**/test/**/*-test.js" ],
+      files: [ "packages/**/test/**/*-test.ts" ],
       plugins: [ "eslint-plugin-promise" ],
       rules: {
         "import/no-extraneous-dependencies": "off",
@@ -203,13 +203,13 @@
     },
     {
       // TypeScript source files
-      files: [ "packages/**/*.ts" ],
+      files: [ "packages/**/*.ts", "test/**/*.ts" ],
       parser: "@typescript-eslint/parser",
       extends: [ "plugin:@typescript-eslint/recommended-requiring-type-checking" ],
       parserOptions: {
         ecmaVersion: 9,
         sourceType: "module",
-        project: "./tsconfig.json"
+        project: "./tsconfig.eslint.json"
       },
       plugins: [ "@typescript-eslint" ],
       rules: {

diff --git a/package.json b/package.json
@@ -4,13 +4,18 @@
   "workspaces": [
     "packages/*"
   ],
+  "resolutions": {
+    "immutable": "^5.1.3"
+  },
   "devDependencies": {
     "@types/lodash": "^4.17.24",
     "@types/lru-cache": "^5.1.1",
     "@types/mime": "^2.0.3",
+    "@types/n3": "^1.26.3",
     "@types/node": "^24.0.0",
     "@types/parse-cache-control": "^1.0.4",
     "@types/q": "^1.5.8",
+    "@types/rdf-js": "^4.0.2",
     "@types/request": "^2.48.13",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
@@ -20,12 +25,12 @@
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-promise": "^7.3.0",
     "lerna": "^4.0.0",
+    "light-my-request": "^6.6.0",
     "manual-git-changelog": "^1.0.1",
     "node-gyp": "^11.0.0",
     "pre-commit": "^2.0.0",
     "rdf-object": "^3.0.0",
-    "supertest": "^7.0.0",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.0",
     "vitest": "^4.1.10"
   },
   "pre-commit": [
@@ -37,8 +42,7 @@
     "lint-changed": "lerna run lint --since HEAD",
     "test": "vitest run --coverage",
     "test-ci": "vitest run --coverage",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "build": "tsc -p tsconfig.json",
+    "build": "tsc",
     "lint": "eslint packages/*/bin/* packages/*/lib packages/*/test test --ext .js,.ts",
     "clean": "rm -rf ./node_modules && rm -rf ./packages/*/node_modules",
     "dedupe": "npx yarn-deduplicate yarn.lock --scopes",

diff --git a/packages/core/lib/datasources/Datasource.ts b/packages/core/lib/datasources/Datasource.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import { EventEmitter } from 'events';
 import { AsyncIterator, BufferedIterator, empty } from 'asynciterator';
 import { stringToTerm } from 'rdf-string';
-import type { DataFactory, Quad, Quad_Graph } from 'rdf-js';
+import type { DataFactory, Quad, Quad_Graph } from '@rdfjs/types';
 import { UrlData } from '../UrlData';
 import type { DatasourceOptions, Query } from '../types';
 import type { CoreOptions, RequestAPI, RequiredUriUrl, Request as RequestT } from 'request';

diff --git a/packages/core/lib/datasources/EmptyDatasource.ts b/packages/core/lib/datasources/EmptyDatasource.ts
@@ -1,7 +1,7 @@
 /*! @license MIT ©2015-2016 Ruben Verborgh, Ghent University - imec */
 /* An empty data source doesn't contain any quads. */
 
-import type { Quad } from 'rdf-js';
+import type { Quad } from '@rdfjs/types';
 import { MemoryDatasource } from './MemoryDatasource';
 import type { DatasourceOptions } from '../types';
 

diff --git a/packages/core/lib/datasources/IndexDatasource.ts b/packages/core/lib/datasources/IndexDatasource.ts
@@ -1,7 +1,7 @@
 /*! @license MIT ©2014-2016 Ruben Verborgh, Ghent University - imec */
 /* An IndexDatasource is a datasource that lists other data sources. */
 
-import type { Quad } from 'rdf-js';
+import type { Quad } from '@rdfjs/types';
 import { MemoryDatasource } from './MemoryDatasource';
 import type { DatasourceOptions, DatasourceRegistry } from '../types';
 

diff --git a/packages/core/lib/datasources/MemoryDatasource.ts b/packages/core/lib/datasources/MemoryDatasource.ts
@@ -2,7 +2,7 @@
 /* A MemoryDatasource queries a set of in-memory quads. */
 
 import { Store as N3Store } from 'n3';
-import type { Quad } from 'rdf-js';
+import type { Quad } from '@rdfjs/types';
 import { Datasource } from './Datasource';
 import type { DatasourceOptions, Pushable, Query } from '../types';
 

diff --git a/packages/core/lib/routers/DatasourceRouter.ts b/packages/core/lib/routers/DatasourceRouter.ts
@@ -2,10 +2,10 @@
 /* A DatasourceRouter routes URLs to data sources. */
 
 import { UrlData } from '../UrlData';
-import type { Query, RouterRequest } from '../types';
+import type { Query, Router, RouterRequest } from '../types';
 
 // Creates a new DatasourceRouter
-export class DatasourceRouter {
+export class DatasourceRouter implements Router {
   protected _baseLength: number;
 
   constructor(options?: { urlData?: UrlData }) {

diff --git a/packages/core/lib/routers/PageRouter.ts b/packages/core/lib/routers/PageRouter.ts
@@ -1,10 +1,10 @@
 /*! @license MIT ©2014-2016 Ruben Verborgh, Ghent University - imec */
 /* A PageRouter routes page numbers to offsets */
 
-import type { Query, RouterRequest } from '../types';
+import type { Query, Router, RouterRequest } from '../types';
 
 // Creates a new PageRouter with the given page size, which defaults to 100.
-export class PageRouter {
+export class PageRouter implements Router {
   pageSize: number;
 
   constructor(config?: { pageSize?: number }) {

diff --git a/packages/core/lib/types.ts b/packages/core/lib/types.ts
@@ -1,7 +1,7 @@
 /*! @license MIT ©2026 Ghent University - imec */
 /* Shared type definitions for @ldf/core */
 
-import type { DataFactory, Term } from 'rdf-js';
+import type { DataFactory, Term } from '@rdfjs/types';
 import type { IncomingHttpHeaders, IncomingMessage, ServerResponse } from 'http';
 import type { ParsedUrlQuery } from 'querystring';
 import type { UrlObject } from 'url';
@@ -93,10 +93,15 @@ export interface LdfResponse extends ServerResponse {
 // The (already-parsed) request shape routers' extractQueryParams receives —
 // note this is distinct from LdfRequest: callers pass { url: request.parsedUrl, headers }.
 export interface RouterRequest {
-  url?: { pathname?: string; query?: ParsedUrlQuery };
+  url?: { pathname?: string | null; query?: ParsedUrlQuery };
   headers?: IncomingHttpHeaders;
 }
 
+// A router extracts query parameters from a (partial) request into a query object
+export interface Router {
+  extractQueryParams(request: RouterRequest, query: Query): void;
+}
+
 // Options accepted by the Controller base class (and its subclasses) constructor
 export interface ControllerOptions {
   urlData?: UrlData;

diff --git a/packages/core/lib/views/RdfView.ts b/packages/core/lib/views/RdfView.ts
@@ -5,7 +5,7 @@ import { View } from './View';
 import * as N3 from 'n3';
 import { JsonLdSerializer } from 'jsonld-streaming-serializer';
 import * as _ from 'lodash';
-import type { DataFactory, Quad } from 'rdf-js';
+import type { DataFactory, Quad } from '@rdfjs/types';
 import type { LdfRequest, LdfResponse, RdfViewSettings, RenderDone, ViewSettings } from '../types';
 
 let dcTerms = 'http://purl.org/dc/terms/',

diff --git a/packages/core/lib/views/View.ts b/packages/core/lib/views/View.ts
@@ -2,7 +2,7 @@
 /* View is a base class for objects that generate server responses. */
 
 import { join } from 'path';
-import type { DataFactory } from 'rdf-js';
+import type { DataFactory } from '@rdfjs/types';
 import { ViewCollection } from './ViewCollection';
 import type { LdfRequest, LdfResponse, RenderDone, ViewSettings } from '../types';
 

diff --git a/packages/core/lib/views/error/ErrorRdfView.ts b/packages/core/lib/views/error/ErrorRdfView.ts
@@ -2,7 +2,7 @@
 /* An ErrorRdfView represents a 500 response in RDF. */
 
 import { RdfView } from '../RdfView';
-import type { Quad } from 'rdf-js';
+import type { Quad } from '@rdfjs/types';
 import type { RdfViewSettings, RenderDone, ViewSettings } from '../../types';
 
 // Creates a new ErrorRdfView

diff --git a/packages/core/lib/views/notfound/NotFoundRdfView.ts b/packages/core/lib/views/notfound/NotFoundRdfView.ts
@@ -2,7 +2,7 @@
 /* A NotFoundRdfView represents a 404 response in RDF. */
 
 import { RdfView } from '../RdfView';
-import type { Quad } from 'rdf-js';
+import type { Quad } from '@rdfjs/types';
 import type { RdfViewSettings, RenderDone, ViewSettings } from '../../types';
 
 // Creates a new NotFoundRdfView

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -25,17 +25,18 @@
     "lint": "eslint bin/* lib test"
   },
   "dependencies": {
-    "asynciterator": "^3.0.0",
+    "@rdfjs/types": "^2.0.1",
+    "asynciterator": "^3.10.0",
     "componentsjs": "^4.0.4",
     "forwarded-parse": "^2.1.0",
-    "jsonld-streaming-serializer": "^3.0.0",
+    "jsonld-streaming-serializer": "^4.0.0",
     "lodash": "^4.0.0",
     "mime": "^2.4.4",
-    "n3": "^1.10.0",
+    "n3": "^1.26.0",
     "negotiate": "^1.0.1",
     "q": "^1.4.1",
     "qejs": "^3.0.5",
-    "rdf-string": "^1.3.1",
+    "rdf-string": "^1.6.3",
     "request": "^2.88.2",
     "uritemplate": "^0.3.4"
   },