Bump to Comunica v4 prerelease

rubensworks · Oct 11, 2024 · a640da2 · a640da2
1 parent b37046c
commit a640da2
Show file tree

Hide file tree

Showing 9 changed files with 793 additions and 290 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,18 +12,19 @@ jobs:
           key: ${{ runner.os }}-lint-modules-${{ hashFiles('**/yarn.lock') }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 18.x
       - run: yarn install
       - run: yarn run lint
 
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
         node-version:
-          - 14.x
-          - 16.x
           - 18.x
           - 20.x
           - 22.x
@@ -66,10 +67,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
         node-version:
-          - 14.x
-          - 16.x
+          - 18.x
+          - 20.x
+          - 22.x
     steps:
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
@@ -88,3 +93,17 @@ jobs:
       - name: Build project
         run: yarn run build
       - run: yarn run spec
+
+  webpack:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-webpack-modules-${{ hashFiles('**/yarn.lock') }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - run: yarn install
+      - run: yarn run browser
diff --git a/config/config-default.json b/config/config-default.json
@@ -1,26 +1,37 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql/^4.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/rdf-parse/^3.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/mediator-number/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^4.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-n3/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-jsonld/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-rdfxml/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-xml-rdfa/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-shaclc/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-n3/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-jsonld/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-rdfxml/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-xml-rdfa/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-shaclc/^4.0.0/components/context.jsonld",
 
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-microdata/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-rdfa/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-script/^2.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-microdata/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-rdfa/^4.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-script/^4.0.0/components/context.jsonld"
   ],
   "import": [
-    "ccqs:config/http/mediators.json",
     "ccqs:config/rdf-parse/mediators.json"
   ],
+  "@graph": [
+    {
+      "@id": "urn:comunica:default:http/mediators#main",
+      "@type": "MediatorNumber",
+      "type": "min",
+      "field": "time",
+      "ignoreFailures": true,
+      "bus": { "@id": "ActorHttp:_default_bus" }
+    }
+  ],
   "@id": "urn:comunica:default:Runner",
   "@type": "RdfParser",
   "mediatorRdfParseMediatypes": { "@id": "urn:comunica:default:rdf-parse/mediators#mediaType" },

diff --git a/lib/RdfParser.ts b/lib/RdfParser.ts
@@ -3,6 +3,8 @@ import * as RDF from "@rdfjs/types";
 import { Readable, PassThrough } from "readable-stream";
 import { MediatorRdfParseHandle, MediatorRdfParseMediaTypes } from '@comunica/bus-rdf-parse';
 import {mediaMappings} from "./mediaMappings";
+import { DataFactory } from 'rdf-data-factory';
+import { KeysInitQuery } from '@comunica/context-entries';
 
 /**
  * An RdfParser can parse any RDF serialization, based on a given content type.
@@ -58,7 +60,8 @@ export class RdfParser<Q extends RDF.BaseQuad = RDF.Quad>  {
     const readable = new PassThrough({ objectMode: true });
 
     // Delegate parsing to the mediator
-    const context = new ActionContext(options);
+    const context = new ActionContext(options)
+      .setDefault(KeysInitQuery.dataFactory, options.dataFactory || new DataFactory());
     this.mediatorRdfParseHandle.mediate({
       context,
       handle: { data: stream, metadata: { baseIRI: <string> options.baseIRI }, context },
@@ -109,6 +112,10 @@ export type ParseOptions = {
    * An optional base IRI of stream's document.
    */
   baseIRI?: string;
+  /**
+   * An optional data factory to pass to parsers.
+   */
+  dataFactory?: RDF.DataFactory;
 } | {
   /**
    * The file name or URL that is being parsed.
@@ -118,4 +125,8 @@ export type ParseOptions = {
    * An optional base IRI of stream's document.
    */
   baseIRI?: string;
+  /**
+   * An optional data factory to pass to parsers.
+   */
+  dataFactory?: RDF.DataFactory;
 };
diff --git a/lib/index.ts b/lib/index.ts
@@ -2,5 +2,6 @@ import {RdfParser} from './RdfParser';
 
 export * from "./RdfParser";
 // tslint:disable:no-var-requires
-const rdfParser = <RdfParser>require('../engine-default');
+const rdfParserFactory = require('../engine-default');
+const rdfParser = <RdfParser>(typeof rdfParserFactory === 'function' ? rdfParserFactory() : undefined);
 export {rdfParser};
diff --git a/package.json b/package.json
@@ -37,19 +37,19 @@
     "test"
   ],
   "devDependencies": {
-    "@comunica/runner": "^2.0.3",
+    "@comunica/runner": "^4.0.1-alpha.48.0",
     "@types/jest": "^29.0.0",
     "@types/n3": "^1.10.4",
     "arrayify-stream": "^1.0.0",
-    "componentsjs-generator": "^3.0.1",
+    "componentsjs-generator": "^4.2.0",
     "jest": "^29.0.0",
     "jest-rdf": "^1.7.0",
     "manual-git-changelog": "^1.0.1",
     "pre-commit": "^1.2.2",
     "rdf-data-factory": "^1.1.0",
     "rdf-dereference": "^2.1.0",
     "rdf-quad": "^1.5.0",
-    "rdf-test-suite": "^1.18.0",
+    "rdf-test-suite": "^1.25.0",
     "streamify-string": "^1.0.1",
     "ts-jest": "^29.0.0",
     "ts-node": "^10.9.1",
@@ -85,39 +85,42 @@
     "build:ts": "tsc",
     "build:mediaMappings": "ts-node scripts/getMediaMappings",
     "build:components": "componentsjs-generator",
+    "browser": "webpack --config webpack.config.js --mode development",
     "validate": "npm ls",
     "prepare": "npm run build && comunica-compile-config config/config-default.json urn:comunica:default:Runner > engine-default.js",
     "version": "manual-git-changelog onversion",
     "spec": "npm run spec-jsonld-html",
     "spec-earl": "npm run spec-earl-jsonld-html",
-    "spec-jsonld-html": "rdf-test-suite spec/parser.js https://w3c.github.io/json-ld-api/tests/html-manifest.jsonld -c .rdf-test-suite-cache/",
+    "spec-jsonld-html": "rdf-test-suite spec/parser.js https://w3c.github.io/json-ld-api/tests/html-manifest.jsonld -c .rdf-test-suite-cache/ || true",
     "spec-earl-jsonld-html": "rdf-test-suite spec/parser.js https://w3c.github.io/json-ld-api/tests/html-manifest.jsonld -c .rdf-test-suite-cache/ -o earl -p spec/earl-meta.json > spec/earl-jsonld-html.ttl",
     "spec-clean": "rm -r .rdf-test-suite-cache/"
   },
   "dependencies": {
-    "@comunica/actor-http-fetch": "^2.0.1",
-    "@comunica/actor-http-proxy": "^2.0.1",
-    "@comunica/actor-rdf-parse-html": "^2.0.1",
-    "@comunica/actor-rdf-parse-html-microdata": "^2.0.1",
-    "@comunica/actor-rdf-parse-html-rdfa": "^2.0.1",
-    "@comunica/actor-rdf-parse-html-script": "^2.0.1",
-    "@comunica/actor-rdf-parse-jsonld": "^2.0.1",
-    "@comunica/actor-rdf-parse-n3": "^2.0.1",
-    "@comunica/actor-rdf-parse-rdfxml": "^2.0.1",
-    "@comunica/actor-rdf-parse-shaclc": "^2.6.2",
-    "@comunica/actor-rdf-parse-xml-rdfa": "^2.0.1",
-    "@comunica/bus-http": "^2.0.1",
-    "@comunica/bus-init": "^2.0.1",
-    "@comunica/bus-rdf-parse": "^2.0.1",
-    "@comunica/bus-rdf-parse-html": "^2.0.1",
-    "@comunica/config-query-sparql": "^2.0.1",
-    "@comunica/core": "^2.0.1",
-    "@comunica/mediator-combine-pipeline": "^2.0.1",
-    "@comunica/mediator-combine-union": "^2.0.1",
-    "@comunica/mediator-number": "^2.0.1",
-    "@comunica/mediator-race": "^2.0.1",
+    "@comunica/actor-http-fetch": "^4.0.1-alpha.48.0",
+    "@comunica/actor-http-proxy": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-html": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-html-microdata": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-html-rdfa": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-html-script": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-jsonld": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-n3": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-rdfxml": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-shaclc": "^4.0.1-alpha.48.0",
+    "@comunica/actor-rdf-parse-xml-rdfa": "^4.0.1-alpha.48.0",
+    "@comunica/bus-http": "^4.0.1-alpha.48.0",
+    "@comunica/bus-init": "^4.0.1-alpha.48.0",
+    "@comunica/bus-rdf-parse": "^4.0.1-alpha.48.0",
+    "@comunica/bus-rdf-parse-html": "^4.0.1-alpha.48.0",
+    "@comunica/config-query-sparql": "^4.0.1-alpha.48.0",
+    "@comunica/context-entries": "^4.0.1-alpha.48.0",
+    "@comunica/core": "^4.0.1-alpha.48.0",
+    "@comunica/mediator-combine-pipeline": "^4.0.1-alpha.48.0",
+    "@comunica/mediator-combine-union": "^4.0.1-alpha.48.0",
+    "@comunica/mediator-number": "^4.0.1-alpha.48.0",
+    "@comunica/mediator-race": "^4.0.1-alpha.48.0",
     "@rdfjs/types": "*",
-    "readable-stream": "^4.3.0",
-    "stream-to-string": "^1.2.0"
+    "rdf-data-factory": "^1.1.2",
+    "readable-stream": "^4.5.2",
+    "stream-to-string": "^1.2.1"
   }
 }
diff --git a/spec/parser.js b/spec/parser.js
@@ -1,4 +1,4 @@
-const rdfParser = require("..").default;
+const rdfParser = require("..").rdfParser;
 const { ErrorSkipped } = require('rdf-test-suite');
 
 module.exports = {

diff --git a/test/RdfParser-test.ts b/test/RdfParser-test.ts
@@ -34,7 +34,7 @@ describe('parser', () => {
 
   it('should get all prioritized content types', async () => {
     expect(await rdfParser.getContentTypesPrioritized()).toEqual({
-      'application/json': 0.45,
+      'application/json': 0.135,
       'application/ld+json': 0.9,
       'application/n-quads': 1,
       'application/n-triples': 0.8,
@@ -188,10 +188,10 @@ describe('parser', () => {
 
   it('should fail to parse invalid application/ld+json', () => {
     const stream = stringToStream(`
-<s> <p> <o1>,
+...,
 `);
     return expect(arrayifyStream(rdfParser.parse(stream, {contentType: 'application/ld+json'})))
-      .rejects.toThrow(new Error('Unexpected "s" at position 2 in state STOP'));
+      .rejects.toThrow(new Error('Unexpected "." at position 1 in state STOP'));
   });
 
   it('should fail to parse an unknown content type', () => {

diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,11 @@
+const path = require('path');
+
+module.exports = {
+    entry: './lib/index.js',
+    output: {
+        filename: 'rdf-dereference-browser.js',
+        path: __dirname,
+        libraryTarget: 'var',
+        library: 'RdfParse',
+    },
+};