Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/dataset-registry-client/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class Client {
distributions: dataset.distribution.map((d) => {
const distribution = new Distribution(
new URL(d.accessURL),
d.mediaType,
d.mediaType ?? undefined,
d.conformsTo ? new URL(d.conformsTo) : undefined
);
distribution.byteSize = d.byteSize ?? undefined;
Expand Down
5 changes: 4 additions & 1 deletion packages/dataset-registry-client/src/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ export const DatasetSchema = {
'@schema': {
'@type': dcat.Distribution,
accessURL: dcat.accessURL,
mediaType: dcat.mediaType,
mediaType: {
'@id': dcat.mediaType,
'@optional': true,
},
byteSize: {
'@id': dcat.byteSize,
'@type': xsd.nonNegativeInteger,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
dcat:distribution [
a dcat:Distribution ;
dcat:accessURL <http://bar.org/sparql2> ;
dcat:mediaType "application/sparql-query" ;
dct:modified "2022-12-03T10:26"^^xsd:dateTime ;
] , [
a dcat:Distribution ;
Expand Down
2 changes: 1 addition & 1 deletion packages/dataset/src/distribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export class Distribution {

constructor(
public readonly accessUrl: URL,
public readonly mimeType: string,
public readonly mimeType?: string,
public readonly conformsTo?: URL
) {}

Expand Down
9 changes: 7 additions & 2 deletions packages/sparql-qlever/src/importer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@ export class Importer implements ImporterInterface {
public async import(
dataset: Dataset
): Promise<NotSupported | ImportSuccessful | ImportFailed> {
const downloadDistributions = dataset.getDownloadDistributions();
const downloadDistributions = dataset
.getDownloadDistributions()
.filter(
(distribution): distribution is Distribution & { mimeType: string } =>
distribution.mimeType !== undefined
);
if (downloadDistributions.length === 0) {
return new NotSupported();
}
Expand All @@ -75,7 +80,7 @@ export class Importer implements ImporterInterface {
}

private async doImport(
distribution: Distribution
distribution: Distribution & { mimeType: string }
): Promise<ImportSuccessful | ImportFailed> {
const localFile = await this.downloader.download(distribution);
await this.index(
Expand Down
8 changes: 4 additions & 4 deletions packages/sparql-qlever/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"path": "../task-runner-docker"
},
{
"path": "../sparql-server"
"path": "../dataset"
},
{
"path": "../task-runner"
},
{
"path": "../distribution-downloader"
"path": "../sparql-server"
},
{
"path": "../dataset"
"path": "../sparql-importer"
},
{
"path": "../sparql-importer"
"path": "../distribution-downloader"
},
{
"path": "./tsconfig.lib.json"
Expand Down
8 changes: 4 additions & 4 deletions packages/sparql-qlever/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
"path": "../task-runner-docker/tsconfig.lib.json"
},
{
"path": "../sparql-server/tsconfig.lib.json"
"path": "../dataset/tsconfig.lib.json"
},
{
"path": "../task-runner/tsconfig.lib.json"
},
{
"path": "../distribution-downloader/tsconfig.lib.json"
"path": "../sparql-server/tsconfig.lib.json"
},
{
"path": "../dataset/tsconfig.lib.json"
"path": "../sparql-importer/tsconfig.lib.json"
},
{
"path": "../sparql-importer/tsconfig.lib.json"
"path": "../distribution-downloader/tsconfig.lib.json"
}
],
"exclude": [
Expand Down
6 changes: 3 additions & 3 deletions packages/sparql-qlever/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export default mergeConfig(
},
coverage: {
thresholds: {
lines: 87.38,
lines: 87.93,
functions: 100,
branches: 50,
statements: 87.38,
branches: 52.17,
statements: 87.93,
},
},
},
Expand Down