@comunica/actor-query-source-identify-hypermedia 4.5.0 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/actor-query-source-identify-hypermedia",
-  "version": "4.5.0",
+  "version": "5.0.0",
   "description": "A hypermedia query-source-identify actor",
   "lsd:module": true,
   "license": "MIT",
@@ -41,28 +41,21 @@
     "build:components": "componentsjs-generator"
   },
   "dependencies": {
-    "@comunica/actor-query-source-identify-rdfjs": "^4.5.0",
-    "@comunica/bus-dereference-rdf": "^4.5.0",
-    "@comunica/bus-merge-bindings-context": "^4.5.0",
-    "@comunica/bus-query-source-identify": "^4.5.0",
-    "@comunica/bus-query-source-identify-hypermedia": "^4.5.0",
-    "@comunica/bus-rdf-metadata": "^4.5.0",
-    "@comunica/bus-rdf-metadata-accumulate": "^4.5.0",
-    "@comunica/bus-rdf-metadata-extract": "^4.5.0",
-    "@comunica/bus-rdf-resolve-hypermedia-links": "^4.5.0",
-    "@comunica/bus-rdf-resolve-hypermedia-links-queue": "^4.5.0",
-    "@comunica/context-entries": "^4.5.0",
-    "@comunica/core": "^4.5.0",
-    "@comunica/types": "^4.5.0",
-    "@comunica/utils-bindings-factory": "^4.5.0",
-    "@comunica/utils-iterator": "^4.5.0",
-    "@comunica/utils-metadata": "^4.5.0",
+    "@comunica/bus-merge-bindings-context": "^5.0.0",
+    "@comunica/bus-query-source-dereference-link": "^5.0.0",
+    "@comunica/bus-query-source-identify": "^5.0.0",
+    "@comunica/bus-rdf-metadata-accumulate": "^5.0.0",
+    "@comunica/bus-rdf-resolve-hypermedia-links": "^5.0.0",
+    "@comunica/bus-rdf-resolve-hypermedia-links-queue": "^5.0.0",
+    "@comunica/context-entries": "^5.0.0",
+    "@comunica/core": "^5.0.0",
+    "@comunica/types": "^5.0.0",
+    "@comunica/utils-algebra": "^5.0.0",
+    "@comunica/utils-bindings-factory": "^5.0.0",
+    "@comunica/utils-metadata": "^5.0.0",
     "@rdfjs/types": "*",
-    "asynciterator": "^3.9.0",
-    "lru-cache": "^10.0.0",
-    "rdf-streaming-store": "^2.1.1",
-    "readable-stream": "^4.5.2",
-    "sparqlalgebrajs": "^5.0.2"
+    "asynciterator": "^3.10.0",
+    "lru-cache": "^11.2.2"
   },
-  "gitHead": "2bcd98c387a021fc5c08d375793c205ca3d1bf0d"
+  "gitHead": "0b1756fdb9bef014133432489627c1bd71779bd0"
 }

package/lib/StreamingStoreMetadata.d.ts

@@ -1,31 +0,0 @@
-/// <reference types="node" />
-import type { EventEmitter } from 'node:events';
-import type { IAggregatedStore, MetadataBindings } from '@comunica/types';
-import type * as RDF from '@rdfjs/types';
-import type { AsyncIterator } from 'asynciterator';
-import { StreamingStore } from 'rdf-streaming-store';
-/**
- * A StreamingStore that returns an AsyncIterator with a valid MetadataQuads property.
- */
-export declare class StreamingStoreMetadata extends StreamingStore implements IAggregatedStore {
-    started: boolean;
-    containedSources: Set<string>;
-    readonly runningIterators: Set<AsyncIterator<RDF.Quad>>;
-    protected readonly iteratorCreatedListeners: Set<() => void>;
-    protected readonly metadataAccumulator: (accumulatedMetadata: MetadataBindings, appendingMetadata: MetadataBindings) => Promise<MetadataBindings>;
-    /**
-     * Whether the StreamingStoreMetadata should emit updated partial cardinalities
-     * for each matching quad. Enabling this option may impact performance due to
-     * frequent {@link MetadataValidationState} invalidations and updates
-     */
-    private readonly emitPartialCardinalities;
-    protected baseMetadata: MetadataBindings;
-    constructor(store: RDF.Store | undefined, metadataAccumulator: (accumulatedMetadata: MetadataBindings, appendingMetadata: MetadataBindings) => Promise<MetadataBindings>, emitPartialCardinalities: boolean);
-    import(stream: RDF.Stream): EventEmitter;
-    hasRunningIterators(): boolean;
-    match(subject?: RDF.Term | null, predicate?: RDF.Term | null, object?: RDF.Term | null, graph?: RDF.Term | null): AsyncIterator<RDF.Quad>;
-    setBaseMetadata(metadata: MetadataBindings, updateStates: boolean): void;
-    protected updateMetadataState(iterator: AsyncIterator<RDF.Quad>, count: number): void;
-    addIteratorCreatedListener(listener: () => void): void;
-    removeIteratorCreatedListener(listener: () => void): void;
-}

package/lib/StreamingStoreMetadata.js

@@ -1,110 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamingStoreMetadata = void 0;
-const utils_iterator_1 = require("@comunica/utils-iterator");
-const utils_metadata_1 = require("@comunica/utils-metadata");
-const rdf_streaming_store_1 = require("rdf-streaming-store");
-/**
- * A StreamingStore that returns an AsyncIterator with a valid MetadataQuads property.
- */
-class StreamingStoreMetadata extends rdf_streaming_store_1.StreamingStore {
-    constructor(store, metadataAccumulator, emitPartialCardinalities) {
-        super(store);
-        this.started = false;
-        this.containedSources = new Set();
-        this.runningIterators = new Set();
-        this.iteratorCreatedListeners = new Set();
-        this.baseMetadata = {
-            state: new utils_metadata_1.MetadataValidationState(),
-            cardinality: { type: 'exact', value: 0 },
-            variables: [],
-        };
-        this.metadataAccumulator = metadataAccumulator;
-        this.emitPartialCardinalities = emitPartialCardinalities;
-    }
-    import(stream) {
-        if (!this.ended) {
-            super.import(stream);
-        }
-        return stream;
-    }
-    hasRunningIterators() {
-        return this.runningIterators.size > 0;
-    }
-    match(subject, predicate, object, graph) {
-        // Wrap the raw stream in an AsyncIterator
-        const rawStream = super.match(subject, predicate, object, graph);
-        const iterator = new utils_iterator_1.ClosableTransformIterator(rawStream, {
-            autoStart: false,
-            onClose: () => {
-                // Running iterators are deleted once closed or destroyed
-                this.runningIterators.delete(iterator);
-            },
-        });
-        // Expose the metadata property containing the cardinality
-        let count = this.getStore().countQuads(subject, predicate, object, graph);
-        const metadata = {
-            state: new utils_metadata_1.MetadataValidationState(),
-            cardinality: {
-                type: 'estimate',
-                value: count,
-            },
-        };
-        iterator.setProperty('metadata', metadata);
-        iterator.setProperty('lastCount', count);
-        if (this.emitPartialCardinalities) {
-            // Every time a new quad is pushed into the iterator, update the metadata
-            rawStream.on('quad', () => {
-                iterator.setProperty('lastCount', ++count);
-                this.updateMetadataState(iterator, count);
-            });
-        }
-        // Store all running iterators until they close or are destroyed
-        this.runningIterators.add(iterator);
-        // Invoke creation listeners
-        for (const listener of this.iteratorCreatedListeners) {
-            listener();
-        }
-        return iterator;
-    }
-    setBaseMetadata(metadata, updateStates) {
-        this.baseMetadata = { ...metadata };
-        this.baseMetadata.cardinality = { type: 'exact', value: 0 };
-        if (updateStates) {
-            for (const iterator of this.runningIterators) {
-                const count = iterator.getProperty('lastCount');
-                this.updateMetadataState(iterator, count);
-            }
-        }
-    }
-    updateMetadataState(iterator, count) {
-        // Append the given cardinality to the base metadata
-        const metadataNew = {
-            state: new utils_metadata_1.MetadataValidationState(),
-            cardinality: {
-                type: 'estimate',
-                value: count,
-            },
-            variables: [],
-        };
-        this.metadataAccumulator(this.baseMetadata, metadataNew)
-            .then((accumulatedMetadata) => {
-            accumulatedMetadata.state = new utils_metadata_1.MetadataValidationState();
-            // Set the new metadata, and invalidate the previous state
-            const metadataToInvalidate = iterator.getProperty('metadata');
-            iterator.setProperty('metadata', accumulatedMetadata);
-            metadataToInvalidate?.state.invalidate();
-        })
-            .catch(() => {
-            // Void errors
-        });
-    }
-    addIteratorCreatedListener(listener) {
-        this.iteratorCreatedListeners.add(listener);
-    }
-    removeIteratorCreatedListener(listener) {
-        this.iteratorCreatedListeners.delete(listener);
-    }
-}
-exports.StreamingStoreMetadata = StreamingStoreMetadata;
-//# sourceMappingURL=StreamingStoreMetadata.js.map

package/lib/StreamingStoreMetadata.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"StreamingStoreMetadata.js","sourceRoot":"","sources":["StreamingStoreMetadata.ts"],"names":[],"mappings":"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","sourcesContent":["// eslint-disable-next-line import/no-nodejs-modules\nimport type { EventEmitter } from 'node:events';\nimport type { MetadataQuads, IAggregatedStore, MetadataBindings } from '@comunica/types';\nimport { ClosableTransformIterator } from '@comunica/utils-iterator';\nimport { MetadataValidationState } from '@comunica/utils-metadata';\nimport type * as RDF from '@rdfjs/types';\nimport type { AsyncIterator } from 'asynciterator';\nimport { StreamingStore } from 'rdf-streaming-store';\n\n/**\n * A StreamingStore that returns an AsyncIterator with a valid MetadataQuads property.\n */\nexport class StreamingStoreMetadata extends StreamingStore implements IAggregatedStore {\n  public started = false;\n  public containedSources = new Set<string>();\n  public readonly runningIterators: Set<AsyncIterator<RDF.Quad>> = new Set<AsyncIterator<RDF.Quad>>();\n  protected readonly iteratorCreatedListeners: Set<() => void> = new Set();\n  protected readonly metadataAccumulator:\n  (accumulatedMetadata: MetadataBindings, appendingMetadata: MetadataBindings) => Promise<MetadataBindings>;\n\n  /**\n   * Whether the StreamingStoreMetadata should emit updated partial cardinalities\n   * for each matching quad. Enabling this option may impact performance due to\n   * frequent {@link MetadataValidationState} invalidations and updates\n   */\n  private readonly emitPartialCardinalities: boolean;\n\n  protected baseMetadata: MetadataBindings = {\n    state: new MetadataValidationState(),\n    cardinality: { type: 'exact', value: 0 },\n    variables: [],\n  };\n\n  public constructor(\n    store: RDF.Store | undefined,\n    metadataAccumulator:\n    (accumulatedMetadata: MetadataBindings, appendingMetadata: MetadataBindings) => Promise<MetadataBindings>,\n    emitPartialCardinalities: boolean,\n  ) {\n    super(store);\n    this.metadataAccumulator = metadataAccumulator;\n    this.emitPartialCardinalities = emitPartialCardinalities;\n  }\n\n  public override import(stream: RDF.Stream): EventEmitter {\n    if (!this.ended) {\n      super.import(stream);\n    }\n    return stream;\n  }\n\n  public hasRunningIterators(): boolean {\n    return this.runningIterators.size > 0;\n  }\n\n  public override match(\n    subject?: RDF.Term | null,\n    predicate?: RDF.Term | null,\n    object?: RDF.Term | null,\n    graph?: RDF.Term | null,\n  ): AsyncIterator<RDF.Quad> {\n    // Wrap the raw stream in an AsyncIterator\n    const rawStream = super.match(subject, predicate, object, graph);\n    const iterator = new ClosableTransformIterator<RDF.Quad, RDF.Quad>(\n      <any> rawStream,\n      {\n        autoStart: false,\n        onClose: () => {\n          // Running iterators are deleted once closed or destroyed\n          this.runningIterators.delete(iterator);\n        },\n      },\n    );\n\n    // Expose the metadata property containing the cardinality\n    let count = this.getStore().countQuads(subject!, predicate!, object!, graph!);\n    const metadata: MetadataQuads = {\n      state: new MetadataValidationState(),\n      cardinality: {\n        type: 'estimate',\n        value: count,\n      },\n    };\n    iterator.setProperty('metadata', metadata);\n    iterator.setProperty('lastCount', count);\n\n    if (this.emitPartialCardinalities) {\n      // Every time a new quad is pushed into the iterator, update the metadata\n      rawStream.on('quad', () => {\n        iterator.setProperty('lastCount', ++count);\n        this.updateMetadataState(iterator, count);\n      });\n    }\n\n    // Store all running iterators until they close or are destroyed\n    this.runningIterators.add(iterator);\n\n    // Invoke creation listeners\n    for (const listener of this.iteratorCreatedListeners) {\n      listener();\n    }\n\n    return iterator;\n  }\n\n  public setBaseMetadata(metadata: MetadataBindings, updateStates: boolean): void {\n    this.baseMetadata = { ...metadata };\n    this.baseMetadata.cardinality = { type: 'exact', value: 0 };\n\n    if (updateStates) {\n      for (const iterator of this.runningIterators) {\n        const count: number = iterator.getProperty('lastCount')!;\n        this.updateMetadataState(iterator, count);\n      }\n    }\n  }\n\n  protected updateMetadataState(iterator: AsyncIterator<RDF.Quad>, count: number): void {\n    // Append the given cardinality to the base metadata\n    const metadataNew: MetadataBindings = {\n      state: new MetadataValidationState(),\n      cardinality: {\n        type: 'estimate',\n        value: count,\n      },\n      variables: [],\n    };\n\n    this.metadataAccumulator(this.baseMetadata, metadataNew)\n      .then((accumulatedMetadata) => {\n        accumulatedMetadata.state = new MetadataValidationState();\n\n        // Set the new metadata, and invalidate the previous state\n        const metadataToInvalidate = iterator.getProperty<MetadataQuads>('metadata');\n        iterator.setProperty('metadata', accumulatedMetadata);\n        metadataToInvalidate?.state.invalidate();\n      })\n      .catch(() => {\n        // Void errors\n      });\n  }\n\n  public addIteratorCreatedListener(listener: () => void): void {\n    this.iteratorCreatedListeners.add(listener);\n  }\n\n  public removeIteratorCreatedListener(listener: () => void): void {\n    this.iteratorCreatedListeners.delete(listener);\n  }\n}\n"]}