@lde/pipeline 0.11.0 → 0.13.0

package/dist/distribution/importResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importResolver.d.ts","sourceRoot":"","sources":["../../src/distribution/importResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,KAAK,oBAAoB,EACzB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,oBAAoB;IAEvD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBADP,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,qBAAqB;IAG3C,OAAO,CACX,GAAG,IAAI,EAAE,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,GACnD,OAAO,CAAC,oBAAoB,GAAG,uBAAuB,CAAC;IA2BpD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}
+{"version":3,"file":"importResolver.d.ts","sourceRoot":"","sources":["../../src/distribution/importResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,KAAK,oBAAoB,EACzB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,oBAAoB;IAEvD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBADP,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,qBAAqB;IAG3C,OAAO,CACX,GAAG,IAAI,EAAE,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,GACnD,OAAO,CAAC,oBAAoB,GAAG,uBAAuB,CAAC;IAiCpD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B"}

package/dist/distribution/importResolver.js

@@ -20,12 +20,13 @@ export class ImportResolver {
         if (result instanceof ResolvedDistribution)
             return result;
         const [dataset] = args;
+        const importStart = Date.now();
         const importResult = await this.options.importer.import(dataset);
         if (importResult instanceof ImportSuccessful) {
             await this.options.server.start();
             const distribution = Distribution.sparql(this.options.server.queryEndpoint, importResult.identifier);
             distribution.subjectFilter = importResult.distribution.subjectFilter;
-            return new ResolvedDistribution(distribution, result.probeResults);
+            return new ResolvedDistribution(distribution, result.probeResults, importResult.distribution, Date.now() - importStart);
         }
         return new NoDistributionAvailable(dataset, 'No SPARQL endpoint or importable data dump available', result.probeResults, importResult instanceof ImportFailed ? importResult : undefined);
     }

package/dist/distribution/resolver.d.ts

@@ -4,7 +4,9 @@ import { type ProbeResultType } from './probe.js';
 export declare class ResolvedDistribution {
     readonly distribution: Distribution;
     readonly probeResults: ProbeResultType[];
-    constructor(distribution: Distribution, probeResults: ProbeResultType[]);
+    readonly importedFrom?: Distribution | undefined;
+    readonly importDuration?: number | undefined;
+    constructor(distribution: Distribution, probeResults: ProbeResultType[], importedFrom?: Distribution | undefined, importDuration?: number | undefined);
 }
 export declare class NoDistributionAvailable {
     readonly dataset: Dataset;

package/dist/distribution/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/distribution/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAA4B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAE5E,qBAAa,oBAAoB;IAE7B,QAAQ,CAAC,YAAY,EAAE,YAAY;IACnC,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;gBAD/B,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,eAAe,EAAE;CAE3C;AAED,qBAAa,uBAAuB;IAEhC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;IACxC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY;gBAH3B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,CAAC,EAAE,YAAY,YAAA;CAEvC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CACL,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,CAAC;IAC3D,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,iCAAiC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,qBAAa,0BAA2B,YAAW,oBAAoB;IACrE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,CAAC,EAAE,iCAAiC;IAIjD,OAAO,CACX,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,oBAAoB,GAAG,uBAAuB,CAAC;CA2B3D"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/distribution/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAA4B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAE5E,qBAAa,oBAAoB;IAE7B,QAAQ,CAAC,YAAY,EAAE,YAAY;IACnC,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;IACxC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY;IACpC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM;gBAHvB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,CAAC,EAAE,YAAY,YAAA,EAC3B,cAAc,CAAC,EAAE,MAAM,YAAA;CAEnC;AAED,qBAAa,uBAAuB;IAEhC,QAAQ,CAAC,OAAO,EAAE,OAAO;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE;IACxC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY;gBAH3B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,CAAC,EAAE,YAAY,YAAA;CAEvC;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CACL,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,CAAC;IAC3D,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,iCAAiC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,qBAAa,0BAA2B,YAAW,oBAAoB;IACrE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,CAAC,EAAE,iCAAiC;IAIjD,OAAO,CACX,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,oBAAoB,GAAG,uBAAuB,CAAC;CA2B3D"}

package/dist/distribution/resolver.js

@@ -2,9 +2,13 @@ import { probe, SparqlProbeResult } from './probe.js';
 export class ResolvedDistribution {
     distribution;
     probeResults;
-    constructor(distribution, probeResults) {
+    importedFrom;
+    importDuration;
+    constructor(distribution, probeResults, importedFrom, importDuration) {
         this.distribution = distribution;
         this.probeResults = probeResults;
+        this.importedFrom = importedFrom;
+        this.importDuration = importDuration;
     }
 }
 export class NoDistributionAvailable {

package/dist/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,aAAa,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,EAAE;QACT,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AA8BD,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA8B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAmB;gBAEjC,OAAO,EAAE,eAAe;IAgC9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAaZ,cAAc;YAiCd,QAAQ;YA8BR,QAAQ;YAmDR,eAAe;YAkCd,SAAS;CAUzB"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../src/pipeline.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,wDAAwD;AACxD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,aAAa,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,QAAQ,CAAC,EAAE;QACT,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B;AA8BD,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAA8B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAmB;gBAEjC,OAAO,EAAE,eAAe;IAgC9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YAaZ,cAAc;YA4Cd,QAAQ;YA8BR,QAAQ;YAmDR,eAAe;YAkCd,SAAS;CAUzB"}

package/dist/pipeline.js

@@ -3,6 +3,7 @@ import { StreamParser } from 'n3';
 import { FileWriter } from './writer/fileWriter.js';
 import { NoDistributionAvailable, } from './distribution/resolver.js';
 import { SparqlDistributionResolver } from './distribution/index.js';
+import { NetworkError, SparqlProbeResult, } from './distribution/probe.js';
 import { NotSupported } from './sparql/executor.js';
 class FanOutWriter {
     writers;
@@ -65,21 +66,22 @@ export class Pipeline {
     }
     async run() {
         const start = Date.now();
-        this.reporter?.pipelineStart(this.name);
+        this.reporter?.pipelineStart?.(this.name);
         const datasets = await this.datasetSelector.select();
         for await (const dataset of datasets) {
             await this.processDataset(dataset);
         }
-        this.reporter?.pipelineComplete({ duration: Date.now() - start });
+        this.reporter?.pipelineComplete?.({ duration: Date.now() - start });
     }
     async processDataset(dataset) {
-        const datasetIri = dataset.iri.toString();
-        this.reporter?.datasetStart(datasetIri);
+        this.reporter?.datasetStart?.(dataset);
         const resolved = await this.distributionResolver.resolve(dataset);
+        this.reporter?.distributionsAnalyzed?.(dataset, mapProbeResults(dataset, resolved.probeResults));
         if (resolved instanceof NoDistributionAvailable) {
-            this.reporter?.datasetSkipped(datasetIri, resolved.message);
+            this.reporter?.datasetSkipped?.(dataset, resolved.message);
             return;
         }
+        this.reporter?.distributionSelected?.(dataset, resolved.distribution, resolved.importedFrom, resolved.importDuration);
         try {
             for (const stage of this.stages) {
                 try {
@@ -91,17 +93,17 @@ export class Pipeline {
                     }
                 }
                 catch (error) {
-                    this.reporter?.stageFailed(stage.name, error instanceof Error ? error : new Error(String(error)));
+                    this.reporter?.stageFailed?.(stage.name, error instanceof Error ? error : new Error(String(error)));
                 }
             }
         }
         finally {
             await this.distributionResolver.cleanup?.();
         }
-        this.reporter?.datasetComplete(datasetIri);
+        this.reporter?.datasetComplete?.(dataset);
     }
     async runStage(dataset, distribution, stage) {
-        this.reporter?.stageStart(stage.name);
+        this.reporter?.stageStart?.(stage.name);
         const stageStart = Date.now();
         let elementsProcessed = 0;
         let quadsGenerated = 0;
@@ -109,14 +111,14 @@ export class Pipeline {
             onProgress: (elements, quads) => {
                 elementsProcessed = elements;
                 quadsGenerated = quads;
-                this.reporter?.stageProgress({ elementsProcessed, quadsGenerated });
+                this.reporter?.stageProgress?.({ elementsProcessed, quadsGenerated });
             },
         });
         if (result instanceof NotSupported) {
-            this.reporter?.stageSkipped(stage.name, result.message);
+            this.reporter?.stageSkipped?.(stage.name, result.message);
         }
         else {
-            this.reporter?.stageComplete(stage.name, {
+            this.reporter?.stageComplete?.(stage.name, {
                 elementsProcessed,
                 quadsGenerated,
                 duration: Date.now() - stageStart,
@@ -156,7 +158,7 @@ export class Pipeline {
         }
     }
     async runChainedStage(dataset, distribution, stage, stageWriter) {
-        this.reporter?.stageStart(stage.name);
+        this.reporter?.stageStart?.(stage.name);
         const stageStart = Date.now();
         let elementsProcessed = 0;
         let quadsGenerated = 0;
@@ -164,14 +166,14 @@ export class Pipeline {
             onProgress: (elements, quads) => {
                 elementsProcessed = elements;
                 quadsGenerated = quads;
-                this.reporter?.stageProgress({ elementsProcessed, quadsGenerated });
+                this.reporter?.stageProgress?.({ elementsProcessed, quadsGenerated });
             },
         });
         if (result instanceof NotSupported) {
-            this.reporter?.stageSkipped(stage.name, result.message);
+            this.reporter?.stageSkipped?.(stage.name, result.message);
             throw new Error(`Stage '${stage.name}' returned NotSupported in chained mode`);
         }
-        this.reporter?.stageComplete(stage.name, {
+        this.reporter?.stageComplete?.(stage.name, {
             elementsProcessed,
             quadsGenerated,
             duration: Date.now() - stageStart,
@@ -188,3 +190,23 @@ export class Pipeline {
         }
     }
 }
+function mapProbeResults(dataset, probeResults) {
+    return probeResults.map((result, index) => {
+        if (result instanceof NetworkError) {
+            return {
+                distribution: dataset.distributions[index],
+                type: 'network-error',
+                available: false,
+                error: result.message,
+            };
+        }
+        return {
+            distribution: dataset.distributions[index],
+            type: result instanceof SparqlProbeResult
+                ? 'sparql'
+                : 'data-dump',
+            available: result.isSuccess(),
+            statusCode: result.statusCode,
+        };
+    });
+}

package/dist/progressReporter.d.ts

@@ -1,21 +1,32 @@
+import type { Dataset, Distribution } from '@lde/dataset';
+export interface DistributionAnalysisResult {
+    distribution: Distribution;
+    type: 'sparql' | 'data-dump' | 'network-error';
+    available: boolean;
+    statusCode?: number;
+    error?: string;
+}
 export interface ProgressReporter {
-    pipelineStart(name: string): void;
-    datasetStart(dataset: string): void;
-    stageStart(stage: string): void;
-    stageProgress(update: {
+    pipelineStart?(name: string): void;
+    datasetsSelected?(count: number): void;
+    datasetStart?(dataset: Dataset): void;
+    distributionsAnalyzed?(dataset: Dataset, results: DistributionAnalysisResult[]): void;
+    distributionSelected?(dataset: Dataset, distribution: Distribution, importedFrom?: Distribution, importDuration?: number): void;
+    stageStart?(stage: string): void;
+    stageProgress?(update: {
         elementsProcessed: number;
         quadsGenerated: number;
     }): void;
-    stageComplete(stage: string, result: {
+    stageComplete?(stage: string, result: {
         elementsProcessed: number;
         quadsGenerated: number;
         duration: number;
     }): void;
-    stageFailed(stage: string, error: Error): void;
-    stageSkipped(stage: string, reason: string): void;
-    datasetComplete(dataset: string): void;
-    datasetSkipped(dataset: string, reason: string): void;
-    pipelineComplete(result: {
+    stageFailed?(stage: string, error: Error): void;
+    stageSkipped?(stage: string, reason: string): void;
+    datasetComplete?(dataset: Dataset): void;
+    datasetSkipped?(dataset: Dataset, reason: string): void;
+    pipelineComplete?(result: {
         duration: number;
     }): void;
 }

package/dist/progressReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"progressReporter.d.ts","sourceRoot":"","sources":["../src/progressReporter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,CAAC,MAAM,EAAE;QACpB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,cAAc,EAAE,MAAM,CAAC;KACxB,GAAG,IAAI,CAAC;IACT,aAAa,CACX,KAAK,EAAE,MAAM,EACb,MAAM,EAAE;QACN,iBAAiB,EAAE,MAAM,CAAC;QAC1B,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,GACA,IAAI,CAAC;IACR,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/C,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAClD,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,gBAAgB,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACtD"}
+{"version":3,"file":"progressReporter.d.ts","sourceRoot":"","sources":["../src/progressReporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,WAAW,0BAA0B;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,eAAe,CAAC;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,aAAa,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gBAAgB,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACtC,qBAAqB,CAAC,CACpB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,0BAA0B,EAAE,GACpC,IAAI,CAAC;IACR,oBAAoB,CAAC,CACnB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,YAAY,CAAC,EAAE,YAAY,EAC3B,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CAAC;IACR,UAAU,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,aAAa,CAAC,CAAC,MAAM,EAAE;QACrB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,cAAc,EAAE,MAAM,CAAC;KACxB,GAAG,IAAI,CAAC;IACT,aAAa,CAAC,CACZ,KAAK,EAAE,MAAM,EACb,MAAM,EAAE;QACN,iBAAiB,EAAE,MAAM,CAAC;QAC1B,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,GACA,IAAI,CAAC;IACR,WAAW,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IAChD,YAAY,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACnD,eAAe,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACxD,gBAAgB,CAAC,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACvD"}

package/dist/sparql/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/sparql/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAOpD;;GAEG;AACH,qBAAa,YAAY;aACK,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;CAC5C;AAED,qEAAqE;AACrE,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEzD,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CACL,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,uBAAwB,YAAW,QAAQ;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;gBAEjC,OAAO,EAAE,8BAA8B;IAkBnD;;;;;;;OAOG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAiC/B;;;;;OAKG;WACiB,QAAQ,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,IAAI,CAAC,8BAA8B,EAAE,OAAO,CAAC,GACtD,OAAO,CAAC,uBAAuB,CAAC;CAIpC;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAErE"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/sparql/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AASpD;;GAEG;AACH,qBAAa,YAAY;aACK,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;CAC5C;AAED,qEAAqE;AACrE,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAEzD,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CACL,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,uBAAwB,YAAW,QAAQ;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;gBAEjC,OAAO,EAAE,8BAA8B;IAkBnD;;;;;;;OAOG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAiC/B;;;;;OAKG;WACiB,QAAQ,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,IAAI,CAAC,8BAA8B,EAAE,OAAO,CAAC,GACtD,OAAO,CAAC,uBAAuB,CAAC;CAIpC;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAErE"}

package/dist/sparql/executor.js

@@ -1,7 +1,8 @@
 import { SparqlEndpointFetcher } from 'fetch-sparql-endpoint';
 import { readFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
-import { Generator, Parser } from 'sparqljs';
+import { Parser } from '@traqula/parser-sparql-1-1';
+import { Generator } from '@traqula/generator-sparql-1-1';
 import { withDefaultGraph } from './graph.js';
 import { injectValues } from './values.js';
 /**
@@ -49,7 +50,7 @@ export class SparqlConstructExecutor {
         this.rawQuery = options.query;
         if (!options.query.includes('#subjectFilter#')) {
             const parsed = new Parser().parse(options.query);
-            if (parsed.type !== 'query' || parsed.queryType !== 'CONSTRUCT') {
+            if (parsed.type !== 'query' || parsed.subType !== 'construct') {
                 throw new Error('Query must be a CONSTRUCT query');
             }
             this.preParsed = parsed;
@@ -77,7 +78,7 @@ export class SparqlConstructExecutor {
         else {
             const substituted = this.rawQuery.replace('#subjectFilter#', distribution.subjectFilter ?? '');
             const parsed = new Parser().parse(substituted);
-            if (parsed.type !== 'query' || parsed.queryType !== 'CONSTRUCT') {
+            if (parsed.type !== 'query' || parsed.subType !== 'construct') {
                 throw new Error('Query must be a CONSTRUCT query');
             }
             ast = parsed;
@@ -89,7 +90,7 @@ export class SparqlConstructExecutor {
         if (bindings !== undefined && bindings.length > 0) {
             ast = injectValues(ast, bindings);
         }
-        let query = this.generator.stringify(ast);
+        let query = this.generator.generate(ast);
         query = query.replaceAll('?dataset', `<${dataset.iri}>`);
         return await this.fetcher.fetchTriples(endpoint.toString(), query);
     }

package/dist/sparql/graph.d.ts

@@ -1,8 +1,8 @@
-import type { ConstructQuery } from 'sparqljs';
+import { type QueryConstruct } from '@traqula/rules-sparql-1-1';
 /**
  * Set the default graph (FROM clause) on a parsed CONSTRUCT query.
  *
  * Mutates the query in place, replacing any existing FROM clause.
  */
-export declare function withDefaultGraph(query: ConstructQuery, graphIri: string): void;
+export declare function withDefaultGraph(query: QueryConstruct, graphIri: string): void;
 //# sourceMappingURL=graph.d.ts.map

package/dist/sparql/graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/sparql/graph.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/C;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,MAAM,GACf,IAAI,CAEN"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/sparql/graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI5E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,MAAM,GACf,IAAI,CAKN"}

package/dist/sparql/graph.js

@@ -1,9 +1,10 @@
-import { DataFactory } from 'n3';
+import { AstFactory } from '@traqula/rules-sparql-1-1';
+const F = new AstFactory();
 /**
  * Set the default graph (FROM clause) on a parsed CONSTRUCT query.
  *
  * Mutates the query in place, replacing any existing FROM clause.
  */
 export function withDefaultGraph(query, graphIri) {
-    query.from = { default: [DataFactory.namedNode(graphIri)], named: [] };
+    query.datasets = F.datasetClauses([{ clauseType: 'default', value: F.termNamed(F.gen(), graphIri) }], F.gen());
 }

package/dist/sparql/selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../../src/sparql/selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAQ9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAKtD,MAAM,WAAW,yBAAyB;IACxC,4GAA4G;IAC5G,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;gBAEpC,OAAO,EAAE,yBAAyB;IAkBvC,MAAM,CACX,YAAY,EAAE,YAAY,GACzB,qBAAqB,CAAC,gBAAgB,CAAC;CAmC3C"}
+{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../../src/sparql/selector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAQ9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtD,MAAM,WAAW,yBAAyB;IACxC,4GAA4G;IAC5G,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,OAAO,CAAC,EAAE,qBAAqB,CAAC;CACjC;AAED;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;gBAEpC,OAAO,EAAE,yBAAyB;IAqBvC,MAAM,CACX,YAAY,EAAE,YAAY,GACzB,qBAAqB,CAAC,gBAAgB,CAAC;CAsC3C"}

package/dist/sparql/selector.js

@@ -1,7 +1,10 @@
 import { SparqlEndpointFetcher } from 'fetch-sparql-endpoint';
-import { Generator, Parser, } from 'sparqljs';
+import { Parser } from '@traqula/parser-sparql-1-1';
+import { Generator } from '@traqula/generator-sparql-1-1';
+import { AstFactory, } from '@traqula/rules-sparql-1-1';
 const parser = new Parser();
 const generator = new Generator();
+const F = new AstFactory();
 /**
  * {@link ItemSelector} that pages through SPARQL SELECT results,
  * yielding all projected variable bindings (NamedNode values only) per row.
@@ -18,7 +21,7 @@ export class SparqlItemSelector {
     fetcher;
     constructor(options) {
         const parsed = parser.parse(options.query);
-        if (parsed.type !== 'query' || parsed.queryType !== 'SELECT') {
+        if (parsed.type !== 'query' || parsed.subType !== 'select') {
             throw new Error('Query must be a SELECT query');
         }
         const variables = parsed.variables.filter(isVariableTerm);
@@ -26,16 +29,18 @@ export class SparqlItemSelector {
             throw new Error('Query must project at least one named variable (SELECT * is not supported)');
         }
         this.parsed = parsed;
-        this.pageSize = options.pageSize ?? parsed.limit ?? 10;
+        this.pageSize =
+            options.pageSize ??
+                this.parsed.solutionModifiers.limitOffset?.limit ??
+                10;
         this.fetcher = options.fetcher ?? new SparqlEndpointFetcher();
     }
     async *select(distribution) {
         const endpoint = distribution.accessUrl;
         let offset = 0;
         while (true) {
-            this.parsed.limit = this.pageSize;
-            this.parsed.offset = offset;
-            const paginatedQuery = generator.stringify(this.parsed);
+            this.parsed.solutionModifiers.limitOffset = F.solutionModifierLimitOffset(this.pageSize, offset, F.gen());
+            const paginatedQuery = generator.generate(this.parsed);
             const stream = (await this.fetcher.fetchBindings(endpoint.toString(), paginatedQuery));
             let pageSize = 0;
             for await (const record of stream) {
@@ -53,5 +58,8 @@ export class SparqlItemSelector {
     }
 }
 function isVariableTerm(v) {
-    return 'termType' in v && v.termType === 'Variable';
+    return ('type' in v &&
+        v.type === 'term' &&
+        'subType' in v &&
+        v.subType === 'variable');
 }

package/dist/sparql/values.d.ts

@@ -1,13 +1,12 @@
-import type { ConstructQuery } from 'sparqljs';
+import { type QueryConstruct } from '@traqula/rules-sparql-1-1';
 import type { VariableBindings } from './executor.js';
 /**
  * Inject a VALUES clause into a parsed CONSTRUCT query for the given binding rows.
  *
- * Each row's keys become `?`-prefixed SPARQL variables; NamedNode values
- * become IRIs in the VALUES block. The VALUES clause is prepended to the
- * query's WHERE patterns.
+ * Each row's keys become SPARQL variables; NamedNode values become IRIs in the
+ * VALUES block. The VALUES clause is prepended to the query's WHERE patterns.
  *
  * The caller owns parsing and stringifying; this function operates on the AST.
  */
-export declare function injectValues(query: ConstructQuery, bindings: VariableBindings[]): ConstructQuery;
+export declare function injectValues(query: QueryConstruct, bindings: VariableBindings[]): QueryConstruct;
 //# sourceMappingURL=values.d.ts.map

package/dist/sparql/values.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"values.d.ts","sourceRoot":"","sources":["../../src/sparql/values.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,UAAU,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEtD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,cAAc,CAchB"}
+{"version":3,"file":"values.d.ts","sourceRoot":"","sources":["../../src/sparql/values.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAEpB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAItD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,cAAc,CAoBhB"}

package/dist/sparql/values.js

@@ -1,19 +1,23 @@
+import { AstFactory, } from '@traqula/rules-sparql-1-1';
+const F = new AstFactory();
 /**
  * Inject a VALUES clause into a parsed CONSTRUCT query for the given binding rows.
  *
- * Each row's keys become `?`-prefixed SPARQL variables; NamedNode values
- * become IRIs in the VALUES block. The VALUES clause is prepended to the
- * query's WHERE patterns.
+ * Each row's keys become SPARQL variables; NamedNode values become IRIs in the
+ * VALUES block. The VALUES clause is prepended to the query's WHERE patterns.
  *
  * The caller owns parsing and stringifying; this function operates on the AST.
  */
 export function injectValues(query, bindings) {
-    const valuesPattern = {
-        type: 'values',
-        values: bindings.map((row) => Object.fromEntries(Object.entries(row).map(([name, node]) => [`?${name}`, node]))),
-    };
+    const variableNames = bindings.length > 0 ? Object.keys(bindings[0]) : [];
+    const variables = variableNames.map((name) => F.termVariable(name, F.gen()));
+    const values = bindings.map((row) => Object.fromEntries(Object.entries(row).map(([name, node]) => [
+        name,
+        F.termNamed(F.gen(), node.value),
+    ])));
+    const valuesPattern = F.patternValues(variables, values, F.gen());
     return {
         ...query,
-        where: [valuesPattern, ...(query.where ?? [])],
+        where: F.patternGroup([valuesPattern, ...query.where.patterns], F.gen()),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/pipeline",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "repository": {
     "url": "https://github.com/ldengine/lde",
     "directory": "packages/pipeline"
@@ -28,13 +28,12 @@
     "@lde/sparql-importer": "0.3.0",
     "@lde/sparql-server": "0.4.10",
     "@rdfjs/types": "^2.0.1",
+    "@traqula/generator-sparql-1-1": "^1.0.3",
+    "@traqula/parser-sparql-1-1": "^1.0.3",
+    "@traqula/rules-sparql-1-1": "^1.0.3",
     "fetch-sparql-endpoint": "^7.1.0",
     "filenamify-url": "^4.0.0",
     "n3": "^2.0.1",
-    "sparqljs": "^3.7.4",
     "tslib": "^2.3.0"
-  },
-  "devDependencies": {
-    "@types/sparqljs": "^3.1.12"
   }
 }