@lde/sparql-qlever 0.18.1 → 0.18.3

package/dist/createQlever.d.ts

@@ -1,5 +1,5 @@
 import { Downloader } from '@lde/distribution-downloader';
-import { Importer, QleverIndexOptions } from './importer.js';
+import { Importer, QleverImporterOptions, QleverIndexOptions } from './importer.js';
 import { QleverServerOptions, Server } from './server.js';
 export type QleverOptions = {
     /** Directory where downloaded data files are stored. */
@@ -12,6 +12,8 @@ export type QleverOptions = {
     cacheIndex?: boolean;
     /** Options for `qlever-index` (index building). */
     indexOptions?: QleverIndexOptions;
+    /** See {@link QleverImporterOptions.replaceJsonLdContext}. */
+    replaceJsonLdContext?: QleverImporterOptions['replaceJsonLdContext'];
     /** Options for `qlever-server` (query processing). */
     serverOptions?: QleverServerOptions;
 } & ({

package/dist/createQlever.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createQlever.d.ts","sourceRoot":"","sources":["../src/createQlever.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EAEX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,MAAM,aAAa,GAAG;IAC1B,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,6FAA6F;IAC7F,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mDAAmD;IACnD,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,sDAAsD;IACtD,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACrC,GAAG,CACA;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;;OAQG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IACE;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC;CACjB,CACJ,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa;;;EAsClD"}
+{"version":3,"file":"createQlever.d.ts","sourceRoot":"","sources":["../src/createQlever.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EAEX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,MAAM,aAAa,GAAG;IAC1B,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oBAAoB;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,6FAA6F;IAC7F,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,mDAAmD;IACnD,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,8DAA8D;IAC9D,oBAAoB,CAAC,EAAE,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;IACrE,sDAAsD;IACtD,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACrC,GAAG,CACA;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC;CACjB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;;OAQG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;CACvB,GACD;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IACE;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC;CACjB,CACJ,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,aAAa;;;EAuClD"}

package/dist/createQlever.js

@@ -2,7 +2,7 @@ import { DockerTaskRunner } from '@lde/task-runner-docker';
 import { HttpTaskRunner } from '@lde/task-runner-http';
 import { NativeTaskRunner } from '@lde/task-runner-native';
 import { LastModifiedDownloader, } from '@lde/distribution-downloader';
-import { Importer } from './importer.js';
+import { Importer, } from './importer.js';
 import { Server } from './server.js';
 /**
  * Create a paired QLever {@link Importer} and {@link Server} that share a
@@ -35,6 +35,7 @@ export function createQlever(options) {
             downloader: options.downloader ?? new LastModifiedDownloader(options.dataDir),
             cacheIndex: options.cacheIndex,
             qleverOptions: options.indexOptions,
+            replaceJsonLdContext: options.replaceJsonLdContext,
         }),
         server: new Server({
             taskRunner,

package/dist/importer.d.ts

@@ -16,6 +16,15 @@ export interface QleverImporterOptions extends ImporterOptions {
     /** @default 'data' */
     indexName?: string;
     qleverOptions?: QleverIndexOptions;
+    /**
+     * Replace remote JSON-LD contexts when converting a JSON-LD distribution.
+     * Called with the URL of each remote `@context`; return the parsed document
+     * to use instead (shaped like what the URL serves, so
+     * `{ '@context': { … } }`), or `undefined` to fetch it as usual. A matching
+     * function rather than a fixed list, because one context is often served
+     * from several URLs.
+     */
+    replaceJsonLdContext?: (url: string) => object | undefined;
 }
 export declare class Importer implements ImporterInterface {
     private readonly options;

package/dist/importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,IAAI,iBAAiB,EAC7B,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAyB,YAAY,EAAE,MAAM,cAAc,CAAC;AAOnE,MAAM,WAAW,kBAAkB;IACjC,oBAAoB;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,yBAAyB;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,yJAAyJ;IACzJ,+BAA+B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACpC;AAWD,qBAAa,QAAS,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAE9B,OAAO,EAAE,qBAAqB;IAa7B,MAAM,CACjB,aAAa,EAAE,YAAY,EAAE,GAC5B,OAAO,CAAC,YAAY,GAAG,gBAAgB,GAAG,YAAY,CAAC;YAqC5C,QAAQ;IA0EtB,OAAO,CAAC,gBAAgB;IAQxB;gEAC4D;IAC5D,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,aAAa;IAIrB;;OAEG;YACW,eAAe;IA0B7B,0EAA0E;YAC5D,YAAY;YAYZ,cAAc;YAKd,KAAK;CA8CpB"}
+{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,IAAI,iBAAiB,EAC7B,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAyB,YAAY,EAAE,MAAM,cAAc,CAAC;AAOnE,MAAM,WAAW,kBAAkB;IACjC,oBAAoB;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,yBAAyB;IACzB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,yJAAyJ;IACzJ,+BAA+B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,eAAe;IAC5D,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC5D;AAcD,qBAAa,QAAS,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;gBAE9B,OAAO,EAAE,qBAAqB;IAa7B,MAAM,CACjB,aAAa,EAAE,YAAY,EAAE,GAC5B,OAAO,CAAC,YAAY,GAAG,gBAAgB,GAAG,YAAY,CAAC;YAqC5C,QAAQ;IA8EtB,OAAO,CAAC,gBAAgB;IAQxB;gEAC4D;IAC5D,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,aAAa;IAIrB;;OAEG;YACW,eAAe;IA0B7B,0EAA0E;YAC5D,YAAY;YAYZ,cAAc;YAKd,KAAK;CA8CpB"}

package/dist/importer.js

@@ -63,7 +63,7 @@ export class Importer {
         let format;
         const warnings = [];
         if (needsPreprocessing(distribution)) {
-            const result = await preprocess(localFile, distribution);
+            const result = await preprocess(localFile, distribution, this.options.replaceJsonLdContext);
             indexFile = result.path;
             format = result.format;
             warnings.push(...result.warnings);

package/dist/preprocess.d.ts

@@ -5,6 +5,11 @@ export interface PreprocessResult {
     format: 'nq';
     warnings: string[];
 }
+/**
+ * Called with the URL of each remote JSON-LD `@context`; returns the document
+ * to use instead, or `undefined` to fetch it.
+ */
+type ReplaceJsonLdContext = (url: string) => object | undefined;
 /**
  * Whether a distribution needs Node-side preprocessing before `qlever-index`
  * can read it.
@@ -28,7 +33,12 @@ export declare function needsPreprocessing(distribution: Distribution): boolean;
  * (detected from the file’s magic bytes, not from declared metadata) and zip
  * containers (folds every parseable entry into the output stream in order).
  *
- * Cached: if the output is newer than the input, it is reused as-is.
+ * `replaceJsonLdContext` answers remote JSON-LD contexts locally; see
+ * {@link ReplaceJsonLdContext}.
+ *
+ * Cached: if the output is newer than the input, it is reused as-is – also
+ * when it was converted without the current `replaceJsonLdContext`.
  */
-export declare function preprocess(localFile: string, distribution: Distribution): Promise<PreprocessResult>;
+export declare function preprocess(localFile: string, distribution: Distribution, replaceJsonLdContext?: ReplaceJsonLdContext): Promise<PreprocessResult>;
+export {};
 //# sourceMappingURL=preprocess.d.ts.map

package/dist/preprocess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preprocess.d.ts","sourceRoot":"","sources":["../src/preprocess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA2B5C,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,IAAI,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAKtE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAyB3B"}
+{"version":3,"file":"preprocess.d.ts","sourceRoot":"","sources":["../src/preprocess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AA+B5C,MAAM,WAAW,gBAAgB;IAC/B,iEAAiE;IACjE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,IAAI,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;GAGG;AACH,KAAK,oBAAoB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;AAEhE;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAKtE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAC9B,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,YAAY,EAC1B,oBAAoB,CAAC,EAAE,oBAAoB,GAC1C,OAAO,CAAC,gBAAgB,CAAC,CAqC3B"}

package/dist/preprocess.js

@@ -1,4 +1,5 @@
 import { rdfParser } from 'rdf-parse';
+import { FetchDocumentLoader, } from 'jsonld-context-parser';
 import { rdfSerializer } from 'rdf-serialize';
 import { createGunzip } from 'node:zlib';
 import { createReadStream, createWriteStream } from 'node:fs';
@@ -46,9 +47,13 @@ export function needsPreprocessing(distribution) {
  * (detected from the file’s magic bytes, not from declared metadata) and zip
  * containers (folds every parseable entry into the output stream in order).
  *
- * Cached: if the output is newer than the input, it is reused as-is.
+ * `replaceJsonLdContext` answers remote JSON-LD contexts locally; see
+ * {@link ReplaceJsonLdContext}.
+ *
+ * Cached: if the output is newer than the input, it is reused as-is – also
+ * when it was converted without the current `replaceJsonLdContext`.
  */
-export async function preprocess(localFile, distribution) {
+export async function preprocess(localFile, distribution, replaceJsonLdContext) {
     const contentType = distribution.mimeType;
     const label = contentType === undefined ? undefined : preprocessFormats.get(contentType);
     if (contentType === undefined || label === undefined) {
@@ -61,10 +66,10 @@ export async function preprocess(localFile, distribution) {
     await rm(outputFile, { force: true });
     const warnings = [];
     if (distribution.compressMimeType === ZIP_MIME) {
-        await streamRdfZip(localFile, outputFile, contentType, label, warnings);
+        await streamRdfZip(localFile, outputFile, contentType, label, warnings, replaceJsonLdContext);
     }
     else {
-        await streamRdfFile(localFile, outputFile, contentType);
+        await streamRdfFile(localFile, outputFile, contentType, replaceJsonLdContext);
     }
     return { path: outputFile, format: 'nq', warnings };
 }
@@ -85,14 +90,34 @@ async function outputIsUpToDate(inputFile, outputFile) {
  * open writable, without closing it. Back-pressure is handled by Node's
  * built-in `.pipe()`; the caller manages `output`'s lifecycle.
  */
-async function pipeRdfToWritable(input, output, contentType) {
-    const quads = rdfParser.parse(input, { contentType });
+async function pipeRdfToWritable(input, output, contentType, replaceJsonLdContext) {
+    const quads = rdfParser.parse(input, {
+        contentType,
+        ...jsonLdParseContext(replaceJsonLdContext),
+    });
     const bytes = rdfSerializer.serialize(quads, {
         contentType: 'application/n-quads',
     });
     bytes.pipe(output, { end: false });
     await finished(bytes);
 }
+/**
+ * `rdf-parse` context that answers replaced JSON-LD contexts locally and
+ * fetches the rest. rdf-parse only routes context requests through a document
+ * loader set under this Comunica context key. Empty without a replacement, so
+ * the parser keeps its own loader.
+ */
+function jsonLdParseContext(replaceJsonLdContext) {
+    if (replaceJsonLdContext === undefined)
+        return {};
+    const fetchLoader = new FetchDocumentLoader(fetch);
+    return {
+        '@comunica/actor-rdf-parse-jsonld:documentLoader': {
+            load: async (url) => replaceJsonLdContext(url) ??
+                fetchLoader.load(url),
+        },
+    };
+}
 async function closeWritable(output) {
     await new Promise((resolve, reject) => {
         output.once('close', resolve);
@@ -100,14 +125,14 @@ async function closeWritable(output) {
         output.end();
     });
 }
-async function streamRdfFile(localFile, outputFile, contentType) {
+async function streamRdfFile(localFile, outputFile, contentType, replaceJsonLdContext) {
     const source = createReadStream(localFile);
     const input = (await isGzipFile(localFile))
         ? source.pipe(createGunzip())
         : source;
     const output = createWriteStream(outputFile);
     try {
-        await pipeRdfToWritable(input, output, contentType);
+        await pipeRdfToWritable(input, output, contentType, replaceJsonLdContext);
     }
     finally {
         await closeWritable(output);
@@ -138,7 +163,7 @@ const openZip = promisify(yauzl.open);
  * declared `contentType` drives the parser; an entry that fails to parse (a
  * sidecar, OS metadata) is skipped with a warning. Throws if nothing parses.
  */
-async function streamRdfZip(zipFile, outputFile, contentType, label, warnings) {
+async function streamRdfZip(zipFile, outputFile, contentType, label, warnings, replaceJsonLdContext) {
     const zip = await openZip(zipFile, { lazyEntries: true });
     const output = createWriteStream(outputFile);
     let entriesProcessed = 0;
@@ -155,7 +180,7 @@ async function streamRdfZip(zipFile, outputFile, contentType, label, warnings) {
                     try {
                         const stream = await openZipEntry(zip, entry);
                         try {
-                            await pipeRdfToWritable(stream, output, contentType);
+                            await pipeRdfToWritable(stream, output, contentType, replaceJsonLdContext);
                             entriesProcessed++;
                         }
                         finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/sparql-qlever",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
     "directory": "packages/sparql-qlever"
@@ -32,7 +32,8 @@
     "@lde/task-runner-docker": "^0.4.0",
     "@lde/task-runner-http": "^0.1.0",
     "@lde/task-runner-native": "^0.3.0",
-    "@lde/wait-for-sparql": "^0.3.0",
+    "@lde/wait-for-sparql": "^0.3.1",
+    "jsonld-context-parser": "^3.1.0",
     "rdf-parse": "^5.0.0",
     "rdf-serialize": "^5.1.0",
     "tslib": "^2.3.0",