diff --git a/.componentsjs-generator-config.json b/.componentsjs-generator-config.json index 6a96a56f..caf0a858 100644 --- a/.componentsjs-generator-config.json +++ b/.componentsjs-generator-config.json @@ -8,7 +8,7 @@ "packages/context-entries", "packages/data-factory", "packages/jest", - "packages/incremental-jest", + "packages/jest", "packages/dev-tools", "packages/inner-join", "packages/packager", diff --git a/engines/config-query-sparql-incremental/README.md b/engines/config-query-sparql-incremental/README.md index acab59d7..4822981f 100644 --- a/engines/config-query-sparql-incremental/README.md +++ b/engines/config-query-sparql-incremental/README.md @@ -1,8 +1,8 @@ -# Comunica SPARQL Config +# Incremunica incremental SPARQL Config [![npm version](https://badge.fury.io/js/%40comunica%2Fconfig-query-sparql.svg)](https://www.npmjs.com/package/@comunica/config-query-sparql-incremental) -The default configuration files for [Comunica SPARQL Incremental](https://github.com/maartyman/incremental/tree/master/packages/incremental#readme). +The default configuration files for [Incremunica SPARQL Incremental](https://github.com/maartyman/incremental/tree/master/packages/incremental#readme). ## Installation diff --git a/engines/query-sparql-incremental/README.md b/engines/query-sparql-incremental/README.md index 28c08e7e..61978c6c 100644 --- a/engines/query-sparql-incremental/README.md +++ b/engines/query-sparql-incremental/README.md @@ -68,7 +68,7 @@ async function main() { main(); ``` -You can also use an [incremental triple store](https://www.npmjs.com/package/@incremunica/incremental-rdf-streaming-store). +You can also use an [incremental triple store](https://www.npmjs.com/package/@incremunica/streaming-store). This store allows you to change the dataset (additions and deletions) and show you the changes in the query results. ```javascript const QueryEngine = require('@incremunica/query-sparql-incremental').QueryEngine; diff --git a/engines/query-sparql-incremental/test-browser/QuerySparql-test.ts b/engines/query-sparql-incremental/test-browser/QuerySparql-test.ts index 00a12213..cbe7e9d7 100644 --- a/engines/query-sparql-incremental/test-browser/QuerySparql-test.ts +++ b/engines/query-sparql-incremental/test-browser/QuerySparql-test.ts @@ -2,7 +2,7 @@ // Needed to undo automock from actor-http-native, cleaner workarounds do not appear to be working. import 'jest-rdf'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import type { EventEmitter } from 'events'; import type { BindingsStream, QueryStringContext } from '@comunica/types'; import type { BindingsFactory } from '@comunica/utils-bindings-factory'; diff --git a/engines/query-sparql-incremental/test/QuerySparql-test.ts b/engines/query-sparql-incremental/test/QuerySparql-test.ts index e4343584..126befff 100644 --- a/engines/query-sparql-incremental/test/QuerySparql-test.ts +++ b/engines/query-sparql-incremental/test/QuerySparql-test.ts @@ -2,7 +2,7 @@ // Needed to undo automock from actor-http-native, cleaner workarounds do not appear to be working. import 'jest-rdf'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import { EventEmitter } from 'events'; import * as http from 'node:http'; import type { Bindings, BindingsStream, QueryStringContext } from '@comunica/types'; diff --git a/packages/actor-merge-bindings-context-is-addition/test/ActorMergeBindingsContextIsAddition-test.ts b/packages/actor-merge-bindings-context-is-addition/test/ActorMergeBindingsContextIsAddition-test.ts index d533925b..1bb60da8 100644 --- a/packages/actor-merge-bindings-context-is-addition/test/ActorMergeBindingsContextIsAddition-test.ts +++ b/packages/actor-merge-bindings-context-is-addition/test/ActorMergeBindingsContextIsAddition-test.ts @@ -5,7 +5,7 @@ import { KeysBindings } from '@incremunica/context-entries'; import { createTestBindingsFactory } from '@incremunica/dev-tools'; import { DataFactory } from 'rdf-data-factory'; import { ActorMergeBindingsContextIsAddition } from '../lib'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; const DF = new DataFactory(); diff --git a/packages/actor-query-source-identify-hypermedia-none/test/ActorQuerySourceIdentifyHypermediaNone-test.ts b/packages/actor-query-source-identify-hypermedia-none/test/ActorQuerySourceIdentifyHypermediaNone-test.ts index 159e3b3d..244248d8 100644 --- a/packages/actor-query-source-identify-hypermedia-none/test/ActorQuerySourceIdentifyHypermediaNone-test.ts +++ b/packages/actor-query-source-identify-hypermedia-none/test/ActorQuerySourceIdentifyHypermediaNone-test.ts @@ -1,5 +1,5 @@ import 'jest-rdf'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import { EventEmitter } from 'node:events'; import { ActionContext, Bus } from '@comunica/core'; import type { IActionContext, IActionContextKey } from '@comunica/types'; diff --git a/packages/actor-query-source-identify-streaming-rdfjs/test/StreamingQuerySourceRdfJs-test.ts b/packages/actor-query-source-identify-streaming-rdfjs/test/StreamingQuerySourceRdfJs-test.ts index 5c5b851a..c64be54a 100644 --- a/packages/actor-query-source-identify-streaming-rdfjs/test/StreamingQuerySourceRdfJs-test.ts +++ b/packages/actor-query-source-identify-streaming-rdfjs/test/StreamingQuerySourceRdfJs-test.ts @@ -14,7 +14,7 @@ import { DataFactory } from 'rdf-data-factory'; import { PassThrough } from 'readable-stream'; import { Factory } from 'sparqlalgebrajs'; import { StreamingQuerySourceRdfJs } from '../lib'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import '@comunica/utils-jest'; import 'jest-rdf'; diff --git a/packages/actor-rdf-join-inner-computational-bind/test/ActorRdfJoinInnerComputationalBindJoin-test.ts b/packages/actor-rdf-join-inner-computational-bind/test/ActorRdfJoinInnerComputationalBindJoin-test.ts index 3a23069e..2f2b1a8a 100644 --- a/packages/actor-rdf-join-inner-computational-bind/test/ActorRdfJoinInnerComputationalBindJoin-test.ts +++ b/packages/actor-rdf-join-inner-computational-bind/test/ActorRdfJoinInnerComputationalBindJoin-test.ts @@ -30,7 +30,7 @@ import { ActorRdfJoinInnerComputationalBind, } from '../lib'; import '@comunica/utils-jest'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; const streamifyArray = require('streamify-array'); diff --git a/packages/actor-rdf-join-inner-delete-hash/test/ActorRdfJoinInnerDeleteHash-test.ts b/packages/actor-rdf-join-inner-delete-hash/test/ActorRdfJoinInnerDeleteHash-test.ts index 6c48ca10..046d304b 100644 --- a/packages/actor-rdf-join-inner-delete-hash/test/ActorRdfJoinInnerDeleteHash-test.ts +++ b/packages/actor-rdf-join-inner-delete-hash/test/ActorRdfJoinInnerDeleteHash-test.ts @@ -18,7 +18,7 @@ import { arrayifyStream } from 'arrayify-stream'; import { ArrayIterator } from 'asynciterator'; import { DataFactory } from 'rdf-data-factory'; import { ActorRdfJoinInnerDeleteHash } from '../lib/ActorRdfJoinInnerDeleteHash'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import '@comunica/utils-jest'; const DF = new DataFactory(); diff --git a/packages/actor-rdf-join-inner-full-hash/test/ActorRdfJoinInnerFullHash-test.ts b/packages/actor-rdf-join-inner-full-hash/test/ActorRdfJoinInnerFullHash-test.ts index 3a1a7c66..31f27d2a 100644 --- a/packages/actor-rdf-join-inner-full-hash/test/ActorRdfJoinInnerFullHash-test.ts +++ b/packages/actor-rdf-join-inner-full-hash/test/ActorRdfJoinInnerFullHash-test.ts @@ -18,7 +18,7 @@ import { arrayifyStream } from 'arrayify-stream'; import { ArrayIterator } from 'asynciterator'; import { DataFactory } from 'rdf-data-factory'; import { ActorRdfJoinInnerFullHash } from '../lib'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import '@comunica/utils-jest'; const DF = new DataFactory(); diff --git a/packages/actor-rdf-join-inner-full-hash/test/DualKeyHashMap-test.ts b/packages/actor-rdf-join-inner-full-hash/test/DualKeyHashMap-test.ts index 9d7c696f..84bb8214 100644 --- a/packages/actor-rdf-join-inner-full-hash/test/DualKeyHashMap-test.ts +++ b/packages/actor-rdf-join-inner-full-hash/test/DualKeyHashMap-test.ts @@ -1,4 +1,4 @@ -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import { DualKeyHashMap } from '../lib/DualKeyHashMap'; class TestObject { diff --git a/packages/actor-rdf-join-inner-match-hash/test/ActorRdfJoinInnerMatchHash-test.ts b/packages/actor-rdf-join-inner-match-hash/test/ActorRdfJoinInnerMatchHash-test.ts index d5d3a5be..d205d071 100644 --- a/packages/actor-rdf-join-inner-match-hash/test/ActorRdfJoinInnerMatchHash-test.ts +++ b/packages/actor-rdf-join-inner-match-hash/test/ActorRdfJoinInnerMatchHash-test.ts @@ -18,7 +18,7 @@ import { arrayifyStream } from 'arrayify-stream'; import { ArrayIterator } from 'asynciterator'; import { DataFactory } from 'rdf-data-factory'; import { ActorRdfJoinInnerMatchHash } from '../lib'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import '@comunica/utils-jest'; const DF = new DataFactory(); diff --git a/packages/actor-rdf-join-inner-memory-bind/test/ActorRdfJoinInnerMemoryBindJoin-test.ts b/packages/actor-rdf-join-inner-memory-bind/test/ActorRdfJoinInnerMemoryBindJoin-test.ts index 3dba6ab1..64b4a4c5 100644 --- a/packages/actor-rdf-join-inner-memory-bind/test/ActorRdfJoinInnerMemoryBindJoin-test.ts +++ b/packages/actor-rdf-join-inner-memory-bind/test/ActorRdfJoinInnerMemoryBindJoin-test.ts @@ -24,7 +24,7 @@ import { DataFactory } from 'rdf-data-factory'; import { Factory } from 'sparqlalgebrajs'; import { ActorRdfJoinInnerMemoryBind } from '../lib'; import '@comunica/utils-jest'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; const DF = new DataFactory(); const FACTORY = new Factory(DF); diff --git a/packages/actor-rdf-join-inner-nestedloop/README.md b/packages/actor-rdf-join-inner-nestedloop/README.md index 8e812442..5231c579 100644 --- a/packages/actor-rdf-join-inner-nestedloop/README.md +++ b/packages/actor-rdf-join-inner-nestedloop/README.md @@ -1,13 +1,13 @@ -# Incremunica Inner Incremental Nestedloop RDF Join Actor +# Incremunica Inner Nestedloop RDF Join Actor -[![npm version](https://badge.fury.io/js/@incremunica%2Factor-rdf-join-inner-incremental-nestedloop.svg)](https://badge.fury.io/js/@incremunica%2Factor-rdf-join-inner-incremental-nestedloop) +[![npm version](https://badge.fury.io/js/@incremunica%2Factor-rdf-join-inner-nestedloop.svg)](https://badge.fury.io/js/@incremunica%2Factor-rdf-join-inner-nestedloop) -A comunica Inner Incremental Nestedloop RDF Join Actor. +A comunica Inner Nestedloop RDF Join Actor. ## Install ```bash -$ yarn add @comunica/actor-rdf-join-inner-incremental-nestedloop +$ yarn add @comunica/actor-rdf-join-inner-nestedloop ``` ## Configure @@ -17,13 +17,13 @@ After installing, this package can be added to your engine's configuration as fo { "@context": [ ... - "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-join-inner-incremental-nestedloop/^1.0.0/components/context.jsonld" + "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-join-inner-nestedloop/^1.0.0/components/context.jsonld" ], "actors": [ ... { - "@id": "urn:comunica:default:rdf-join/actors#inner-incremental-nestedloop", - "@type": "ActorRdfJoinInnerIncrementalNestedloop", + "@id": "urn:comunica:default:rdf-join/actors#inner-nestedloop", + "@type": "ActorRdfJoinInnerNestedloop", "mediatorJoinSelectivity": { "@id": "urn:comunica:default:rdf-join-selectivity/mediators#main" } } ] diff --git a/packages/actor-rdf-join-inner-nestedloop/package.json b/packages/actor-rdf-join-inner-nestedloop/package.json index 16a33952..f5e4b0b3 100644 --- a/packages/actor-rdf-join-inner-nestedloop/package.json +++ b/packages/actor-rdf-join-inner-nestedloop/package.json @@ -1,14 +1,14 @@ { - "name": "@incremunica/actor-rdf-join-inner-incremental-nestedloop", + "name": "@incremunica/actor-rdf-join-inner-nestedloop", "version": "1.3.0", - "description": "A inner-incremental-nestedloop rdf-join actor", + "description": "A inner-nestedloop rdf-join actor", "lsd:module": true, "license": "MIT", "homepage": "https://maartyman.github.io/incremunica/", "repository": { "type": "git", "url": "https://github.com/maartyman/incremunica.git", - "directory": "packages/actor-rdf-join-inner-incremental-nestedloop" + "directory": "packages/actor-rdf-join-inner-nestedloop" }, "bugs": { "url": "https://github.com/maartyman/incremunica/issues" @@ -17,7 +17,7 @@ "comunica", "actor", "rdf-join", - "inner-incremental-nestedloop" + "inner-nestedloop" ], "sideEffects": false, "main": "lib/index.js", diff --git a/packages/actor-rdf-join-inner-nestedloop/test/ActorRdfJoinInnerNestedloop-test.ts b/packages/actor-rdf-join-inner-nestedloop/test/ActorRdfJoinInnerNestedloop-test.ts index 0ea0eb5d..e14c11d6 100644 --- a/packages/actor-rdf-join-inner-nestedloop/test/ActorRdfJoinInnerNestedloop-test.ts +++ b/packages/actor-rdf-join-inner-nestedloop/test/ActorRdfJoinInnerNestedloop-test.ts @@ -13,7 +13,7 @@ import { arrayifyStream } from 'arrayify-stream'; import { ArrayIterator } from 'asynciterator'; import { DataFactory } from 'rdf-data-factory'; import { ActorRdfJoinInnerNestedloop } from '../lib/ActorRdfJoinInnerNestedloop'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import '@comunica/utils-jest'; const DF = new DataFactory(); diff --git a/packages/actor-rdf-join-minus-hash/README.md b/packages/actor-rdf-join-minus-hash/README.md index efbc296b..807366b9 100644 --- a/packages/actor-rdf-join-minus-hash/README.md +++ b/packages/actor-rdf-join-minus-hash/README.md @@ -23,7 +23,7 @@ After installing, this package can be added to your engine's configuration as fo ... { "@id": "urn:comunica:default:rdf-join/actors#minus-hash", - "@type": "ActorRdfJoinIncrementalMinusHash", + "@type": "ActorRdfJoinMinusHash", "mediatorJoinSelectivity": { "@id": "urn:comunica:default:rdf-join-selectivity/mediators#main" } } ] diff --git a/packages/actor-rdf-join-optional-hash/test/ActorRdfJoinOptionalHash-test.ts b/packages/actor-rdf-join-optional-hash/test/ActorRdfJoinOptionalHash-test.ts index 93b010d6..1fc9c9e5 100644 --- a/packages/actor-rdf-join-optional-hash/test/ActorRdfJoinOptionalHash-test.ts +++ b/packages/actor-rdf-join-optional-hash/test/ActorRdfJoinOptionalHash-test.ts @@ -18,7 +18,7 @@ import type * as RDF from '@rdfjs/types'; import { arrayifyStream } from 'arrayify-stream'; import { ArrayIterator } from 'asynciterator'; import { DataFactory } from 'rdf-data-factory'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import { ActorRdfJoinOptionalHash } from '../lib'; const DF = new DataFactory(); diff --git a/packages/inner-join/test/InnerJoin-test.ts b/packages/inner-join/test/InnerJoin-test.ts index 73b5ddf5..bd6ed262 100644 --- a/packages/inner-join/test/InnerJoin-test.ts +++ b/packages/inner-join/test/InnerJoin-test.ts @@ -1,7 +1,7 @@ import type { Bindings } from '@comunica/utils-bindings-factory'; import type { AsyncIterator } from 'asynciterator'; import { ArrayIterator } from 'asynciterator'; -import '@incremunica/incremental-jest'; +import '@incremunica/jest'; import { InnerJoin } from '../lib'; const cleanupMock = jest.fn(); diff --git a/packages/incremental-jest/README.md b/packages/jest/README.md similarity index 88% rename from packages/incremental-jest/README.md rename to packages/jest/README.md index a3d98548..a0836fb4 100644 --- a/packages/incremental-jest/README.md +++ b/packages/jest/README.md @@ -1,6 +1,6 @@ # Incremunica Jest helpers -[![npm version](https://badge.fury.io/js/@incremunica%2Fincremental-jest.svg)](https://badge.fury.io/js/@incremunica%2Fincremental-jest) +[![npm version](https://badge.fury.io/js/@incremunica%2Fjest.svg)](https://badge.fury.io/js/@incremunica%2Fjest) Jest test helpers for Comunica. This package is similar to the original one, @@ -20,7 +20,7 @@ This can be done by adding the following entry to your Jest configuration: ```json { "jest": { - "setupFilesAfterEnv": ["@comunica/incremental-jest"] + "setupFilesAfterEnv": ["@incremunica/jest"] } } ``` @@ -28,7 +28,7 @@ This can be done by adding the following entry to your Jest configuration: If you are already using an existing test framework script file, make sure to add @comunica/jest as follows to your file: ```javascript -require('@comunica/incremental-jest'); +require('@incremunica/jest'); ``` ## _Optional: Typescript typings configuration_ @@ -38,7 +38,7 @@ you will need to import the typings of this package to make the TS compiler reco For this, include the following import at the top of each applicable test file: ``` -import "@comunica/incremental-jest"; +import "@incremunica/jest"; ``` ## API @@ -46,7 +46,7 @@ import "@comunica/incremental-jest"; All examples below make use of these helpers: ```js -import { BindingsFactory } from '@comunica/incremental-bindings-factory'; +import { BindingsFactory } from '@comunica/utils-bindings-factory'; import { DataFactory } from 'rdf-data-factory'; const BF = new BindingsFactory(); diff --git a/packages/incremental-jest/lib/index.ts b/packages/jest/lib/index.ts similarity index 100% rename from packages/incremental-jest/lib/index.ts rename to packages/jest/lib/index.ts diff --git a/packages/incremental-jest/lib/matchers/index.ts b/packages/jest/lib/matchers/index.ts similarity index 100% rename from packages/incremental-jest/lib/matchers/index.ts rename to packages/jest/lib/matchers/index.ts diff --git a/packages/incremental-jest/lib/matchers/toBeIsomorphicBindingsArray.ts b/packages/jest/lib/matchers/toBeIsomorphicBindingsArray.ts similarity index 100% rename from packages/incremental-jest/lib/matchers/toBeIsomorphicBindingsArray.ts rename to packages/jest/lib/matchers/toBeIsomorphicBindingsArray.ts diff --git a/packages/incremental-jest/lib/matchers/toEqualBindings.ts b/packages/jest/lib/matchers/toEqualBindings.ts similarity index 100% rename from packages/incremental-jest/lib/matchers/toEqualBindings.ts rename to packages/jest/lib/matchers/toEqualBindings.ts diff --git a/packages/incremental-jest/lib/matchers/toEqualBindingsArray.ts b/packages/jest/lib/matchers/toEqualBindingsArray.ts similarity index 100% rename from packages/incremental-jest/lib/matchers/toEqualBindingsArray.ts rename to packages/jest/lib/matchers/toEqualBindingsArray.ts diff --git a/packages/incremental-jest/lib/matchers/toEqualBindingsStream.ts b/packages/jest/lib/matchers/toEqualBindingsStream.ts similarity index 100% rename from packages/incremental-jest/lib/matchers/toEqualBindingsStream.ts rename to packages/jest/lib/matchers/toEqualBindingsStream.ts diff --git a/packages/incremental-jest/package.json b/packages/jest/package.json similarity index 91% rename from packages/incremental-jest/package.json rename to packages/jest/package.json index 1f106b8a..28e3f6e2 100644 --- a/packages/incremental-jest/package.json +++ b/packages/jest/package.json @@ -1,5 +1,5 @@ { - "name": "@incremunica/incremental-jest", + "name": "@incremunica/jest", "version": "1.3.0", "description": "Jest utilities for incremunica", "license": "MIT", @@ -7,7 +7,7 @@ "repository": { "type": "git", "url": "https://github.com/maartyman/incremunica.git", - "directory": "packages/incremental-jest" + "directory": "packages/jest" }, "bugs": { "url": "https://github.com/maartyman/incremunica/issues" diff --git a/packages/incremental-jest/test/matchers/toBeIsomorphicBindingsArray-test.ts b/packages/jest/test/matchers/toBeIsomorphicBindingsArray-test.ts similarity index 100% rename from packages/incremental-jest/test/matchers/toBeIsomorphicBindingsArray-test.ts rename to packages/jest/test/matchers/toBeIsomorphicBindingsArray-test.ts diff --git a/packages/incremental-jest/test/matchers/toEqualBindings-test.ts b/packages/jest/test/matchers/toEqualBindings-test.ts similarity index 100% rename from packages/incremental-jest/test/matchers/toEqualBindings-test.ts rename to packages/jest/test/matchers/toEqualBindings-test.ts diff --git a/packages/incremental-jest/test/matchers/toEqualBindingsArray-test.ts b/packages/jest/test/matchers/toEqualBindingsArray-test.ts similarity index 100% rename from packages/incremental-jest/test/matchers/toEqualBindingsArray-test.ts rename to packages/jest/test/matchers/toEqualBindingsArray-test.ts diff --git a/packages/incremental-jest/test/matchers/toEqualBindingsStream-test.ts b/packages/jest/test/matchers/toEqualBindingsStream-test.ts similarity index 100% rename from packages/incremental-jest/test/matchers/toEqualBindingsStream-test.ts rename to packages/jest/test/matchers/toEqualBindingsStream-test.ts diff --git a/setup-jest.js b/setup-jest.js index 12fa7d50..65009275 100644 --- a/setup-jest.js +++ b/setup-jest.js @@ -1,4 +1,4 @@ jest.setTimeout(20000); require('jest-rdf'); require('@comunica/utils-jest'); -require('@incremunica/incremental-jest'); +require('@incremunica/jest');