Skip to content

Commit a640da2

Browse files
rubensworksrubensworks
committedOct 11, 2024·
Bump to Comunica v4 prerelease
·
v4.0.0
1 parent b37046c commit a640da2

File tree

9 files changed

+793
-290
lines changed

9 files changed

+793
-290
lines changed
 

‎.github/workflows/ci.yml

+26-7
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ jobs:
1212
key: ${{ runner.os }}-lint-modules-${{ hashFiles('**/yarn.lock') }}
1313
- uses: actions/setup-node@v2
1414
with:
15-
node-version: 14.x
15+
node-version: 18.x
1616
- run: yarn install
1717
- run: yarn run lint
1818

1919
test:
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
matrix:
23-
os: [ubuntu-latest]
23+
os:
24+
- macos-latest
25+
- ubuntu-latest
26+
- windows-latest
2427
node-version:
25-
- 14.x
26-
- 16.x
2728
- 18.x
2829
- 20.x
2930
- 22.x
@@ -66,10 +67,14 @@ jobs:
6667
runs-on: ${{ matrix.os }}
6768
strategy:
6869
matrix:
69-
os: [ubuntu-latest]
70+
os:
71+
- macos-latest
72+
- ubuntu-latest
73+
- windows-latest
7074
node-version:
71-
- 14.x
72-
- 16.x
75+
- 18.x
76+
- 20.x
77+
- 22.x
7378
steps:
7479
- name: Use Node.js ${{ matrix.node-version }}
7580
uses: actions/setup-node@v2
@@ -88,3 +93,17 @@ jobs:
8893
- name: Build project
8994
run: yarn run build
9095
- run: yarn run spec
96+
97+
webpack:
98+
runs-on: ubuntu-latest
99+
steps:
100+
- uses: actions/checkout@v3
101+
- uses: actions/cache@v3
102+
with:
103+
path: '**/node_modules'
104+
key: ${{ runner.os }}-webpack-modules-${{ hashFiles('**/yarn.lock') }}
105+
- uses: actions/setup-node@v3
106+
with:
107+
node-version: 18.x
108+
- run: yarn install
109+
- run: yarn run browser

‎config/config-default.json

+24-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql/^2.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql/^4.0.0/components/context.jsonld",
44
"https://linkedsoftwaredependencies.org/bundles/npm/rdf-parse/^3.0.0/components/context.jsonld",
55

6-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^2.0.0/components/context.jsonld",
7-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^2.0.0/components/context.jsonld",
6+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-http/^4.0.0/components/context.jsonld",
7+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/mediator-number/^4.0.0/components/context.jsonld",
8+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-fetch/^4.0.0/components/context.jsonld",
9+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-http-proxy/^4.0.0/components/context.jsonld",
810

9-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-n3/^2.0.0/components/context.jsonld",
10-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-jsonld/^2.0.0/components/context.jsonld",
11-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-rdfxml/^2.0.0/components/context.jsonld",
12-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html/^2.0.0/components/context.jsonld",
13-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-xml-rdfa/^2.0.0/components/context.jsonld",
14-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-shaclc/^2.0.0/components/context.jsonld",
11+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-n3/^4.0.0/components/context.jsonld",
12+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-jsonld/^4.0.0/components/context.jsonld",
13+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-rdfxml/^4.0.0/components/context.jsonld",
14+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html/^4.0.0/components/context.jsonld",
15+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-xml-rdfa/^4.0.0/components/context.jsonld",
16+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-shaclc/^4.0.0/components/context.jsonld",
1517

16-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-microdata/^2.0.0/components/context.jsonld",
17-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-rdfa/^2.0.0/components/context.jsonld",
18-
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-script/^2.0.0/components/context.jsonld"
18+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-microdata/^4.0.0/components/context.jsonld",
19+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-rdfa/^4.0.0/components/context.jsonld",
20+
"https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-parse-html-script/^4.0.0/components/context.jsonld"
1921
],
2022
"import": [
21-
"ccqs:config/http/mediators.json",
2223
"ccqs:config/rdf-parse/mediators.json"
2324
],
25+
"@graph": [
26+
{
27+
"@id": "urn:comunica:default:http/mediators#main",
28+
"@type": "MediatorNumber",
29+
"type": "min",
30+
"field": "time",
31+
"ignoreFailures": true,
32+
"bus": { "@id": "ActorHttp:_default_bus" }
33+
}
34+
],
2435
"@id": "urn:comunica:default:Runner",
2536
"@type": "RdfParser",
2637
"mediatorRdfParseMediatypes": { "@id": "urn:comunica:default:rdf-parse/mediators#mediaType" },

‎lib/RdfParser.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import * as RDF from "@rdfjs/types";
33
import { Readable, PassThrough } from "readable-stream";
44
import { MediatorRdfParseHandle, MediatorRdfParseMediaTypes } from '@comunica/bus-rdf-parse';
55
import {mediaMappings} from "./mediaMappings";
6+
import { DataFactory } from 'rdf-data-factory';
7+
import { KeysInitQuery } from '@comunica/context-entries';
68

79
/**
810
* 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> {
5860
const readable = new PassThrough({ objectMode: true });
5961

6062
// Delegate parsing to the mediator
61-
const context = new ActionContext(options);
63+
const context = new ActionContext(options)
64+
.setDefault(KeysInitQuery.dataFactory, options.dataFactory || new DataFactory());
6265
this.mediatorRdfParseHandle.mediate({
6366
context,
6467
handle: { data: stream, metadata: { baseIRI: <string> options.baseIRI }, context },
@@ -109,6 +112,10 @@ export type ParseOptions = {
109112
* An optional base IRI of stream's document.
110113
*/
111114
baseIRI?: string;
115+
/**
116+
* An optional data factory to pass to parsers.
117+
*/
118+
dataFactory?: RDF.DataFactory;
112119
} | {
113120
/**
114121
* The file name or URL that is being parsed.
@@ -118,4 +125,8 @@ export type ParseOptions = {
118125
* An optional base IRI of stream's document.
119126
*/
120127
baseIRI?: string;
128+
/**
129+
* An optional data factory to pass to parsers.
130+
*/
131+
dataFactory?: RDF.DataFactory;
121132
};

‎lib/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ import {RdfParser} from './RdfParser';
22

33
export * from "./RdfParser";
44
// tslint:disable:no-var-requires
5-
const rdfParser = <RdfParser>require('../engine-default');
5+
const rdfParserFactory = require('../engine-default');
6+
const rdfParser = <RdfParser>(typeof rdfParserFactory === 'function' ? rdfParserFactory() : undefined);
67
export {rdfParser};

‎package.json

+30-27
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
"test"
3838
],
3939
"devDependencies": {
40-
"@comunica/runner": "^2.0.3",
40+
"@comunica/runner": "^4.0.1-alpha.48.0",
4141
"@types/jest": "^29.0.0",
4242
"@types/n3": "^1.10.4",
4343
"arrayify-stream": "^1.0.0",
44-
"componentsjs-generator": "^3.0.1",
44+
"componentsjs-generator": "^4.2.0",
4545
"jest": "^29.0.0",
4646
"jest-rdf": "^1.7.0",
4747
"manual-git-changelog": "^1.0.1",
4848
"pre-commit": "^1.2.2",
4949
"rdf-data-factory": "^1.1.0",
5050
"rdf-dereference": "^2.1.0",
5151
"rdf-quad": "^1.5.0",
52-
"rdf-test-suite": "^1.18.0",
52+
"rdf-test-suite": "^1.25.0",
5353
"streamify-string": "^1.0.1",
5454
"ts-jest": "^29.0.0",
5555
"ts-node": "^10.9.1",
@@ -85,39 +85,42 @@
8585
"build:ts": "tsc",
8686
"build:mediaMappings": "ts-node scripts/getMediaMappings",
8787
"build:components": "componentsjs-generator",
88+
"browser": "webpack --config webpack.config.js --mode development",
8889
"validate": "npm ls",
8990
"prepare": "npm run build && comunica-compile-config config/config-default.json urn:comunica:default:Runner > engine-default.js",
9091
"version": "manual-git-changelog onversion",
9192
"spec": "npm run spec-jsonld-html",
9293
"spec-earl": "npm run spec-earl-jsonld-html",
93-
"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/",
94+
"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",
9495
"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",
9596
"spec-clean": "rm -r .rdf-test-suite-cache/"
9697
},
9798
"dependencies": {
98-
"@comunica/actor-http-fetch": "^2.0.1",
99-
"@comunica/actor-http-proxy": "^2.0.1",
100-
"@comunica/actor-rdf-parse-html": "^2.0.1",
101-
"@comunica/actor-rdf-parse-html-microdata": "^2.0.1",
102-
"@comunica/actor-rdf-parse-html-rdfa": "^2.0.1",
103-
"@comunica/actor-rdf-parse-html-script": "^2.0.1",
104-
"@comunica/actor-rdf-parse-jsonld": "^2.0.1",
105-
"@comunica/actor-rdf-parse-n3": "^2.0.1",
106-
"@comunica/actor-rdf-parse-rdfxml": "^2.0.1",
107-
"@comunica/actor-rdf-parse-shaclc": "^2.6.2",
108-
"@comunica/actor-rdf-parse-xml-rdfa": "^2.0.1",
109-
"@comunica/bus-http": "^2.0.1",
110-
"@comunica/bus-init": "^2.0.1",
111-
"@comunica/bus-rdf-parse": "^2.0.1",
112-
"@comunica/bus-rdf-parse-html": "^2.0.1",
113-
"@comunica/config-query-sparql": "^2.0.1",
114-
"@comunica/core": "^2.0.1",
115-
"@comunica/mediator-combine-pipeline": "^2.0.1",
116-
"@comunica/mediator-combine-union": "^2.0.1",
117-
"@comunica/mediator-number": "^2.0.1",
118-
"@comunica/mediator-race": "^2.0.1",
99+
"@comunica/actor-http-fetch": "^4.0.1-alpha.48.0",
100+
"@comunica/actor-http-proxy": "^4.0.1-alpha.48.0",
101+
"@comunica/actor-rdf-parse-html": "^4.0.1-alpha.48.0",
102+
"@comunica/actor-rdf-parse-html-microdata": "^4.0.1-alpha.48.0",
103+
"@comunica/actor-rdf-parse-html-rdfa": "^4.0.1-alpha.48.0",
104+
"@comunica/actor-rdf-parse-html-script": "^4.0.1-alpha.48.0",
105+
"@comunica/actor-rdf-parse-jsonld": "^4.0.1-alpha.48.0",
106+
"@comunica/actor-rdf-parse-n3": "^4.0.1-alpha.48.0",
107+
"@comunica/actor-rdf-parse-rdfxml": "^4.0.1-alpha.48.0",
108+
"@comunica/actor-rdf-parse-shaclc": "^4.0.1-alpha.48.0",
109+
"@comunica/actor-rdf-parse-xml-rdfa": "^4.0.1-alpha.48.0",
110+
"@comunica/bus-http": "^4.0.1-alpha.48.0",
111+
"@comunica/bus-init": "^4.0.1-alpha.48.0",
112+
"@comunica/bus-rdf-parse": "^4.0.1-alpha.48.0",
113+
"@comunica/bus-rdf-parse-html": "^4.0.1-alpha.48.0",
114+
"@comunica/config-query-sparql": "^4.0.1-alpha.48.0",
115+
"@comunica/context-entries": "^4.0.1-alpha.48.0",
116+
"@comunica/core": "^4.0.1-alpha.48.0",
117+
"@comunica/mediator-combine-pipeline": "^4.0.1-alpha.48.0",
118+
"@comunica/mediator-combine-union": "^4.0.1-alpha.48.0",
119+
"@comunica/mediator-number": "^4.0.1-alpha.48.0",
120+
"@comunica/mediator-race": "^4.0.1-alpha.48.0",
119121
"@rdfjs/types": "*",
120-
"readable-stream": "^4.3.0",
121-
"stream-to-string": "^1.2.0"
122+
"rdf-data-factory": "^1.1.2",
123+
"readable-stream": "^4.5.2",
124+
"stream-to-string": "^1.2.1"
122125
}
123126
}

‎spec/parser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const rdfParser = require("..").default;
1+
const rdfParser = require("..").rdfParser;
22
const { ErrorSkipped } = require('rdf-test-suite');
33

44
module.exports = {

‎test/RdfParser-test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('parser', () => {
3434

3535
it('should get all prioritized content types', async () => {
3636
expect(await rdfParser.getContentTypesPrioritized()).toEqual({
37-
'application/json': 0.45,
37+
'application/json': 0.135,
3838
'application/ld+json': 0.9,
3939
'application/n-quads': 1,
4040
'application/n-triples': 0.8,
@@ -188,10 +188,10 @@ describe('parser', () => {
188188

189189
it('should fail to parse invalid application/ld+json', () => {
190190
const stream = stringToStream(`
191-
<s> <p> <o1>,
191+
...,
192192
`);
193193
return expect(arrayifyStream(rdfParser.parse(stream, {contentType: 'application/ld+json'})))
194-
.rejects.toThrow(new Error('Unexpected "s" at position 2 in state STOP'));
194+
.rejects.toThrow(new Error('Unexpected "." at position 1 in state STOP'));
195195
});
196196

197197
it('should fail to parse an unknown content type', () => {

‎webpack.config.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const path = require('path');
2+
3+
module.exports = {
4+
entry: './lib/index.js',
5+
output: {
6+
filename: 'rdf-dereference-browser.js',
7+
path: __dirname,
8+
libraryTarget: 'var',
9+
library: 'RdfParse',
10+
},
11+
};

‎yarn.lock

+684-237
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.