Skip to content

Commit e90db5c

Browse files
rubensworksrubensworks
committed
Update to Components.js 4
1 parent 51704dd commit e90db5c

File tree

48 files changed

+715
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+715
-342
lines changed

‎packages/core/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Example:
111111

112112
"datasources": [
113113
{
114-
"@id": "ex:myDatasourceVersion1",
114+
"@id": "urn:ldf-server:myDatasourceVersion1",
115115
"@type": "SparqlDatasource",
116116
"datasourceTitle": "My SPARQL source",
117117
"description": "My datasource with a SPARQL-endpoint back-end",
@@ -125,7 +125,7 @@ Example:
125125
"homepage": "http://example.org/alice"
126126
},
127127
{
128-
"@id": "ex:myDatasourceVersion2",
128+
"@id": "urn:ldf-server:myDatasourceVersion2",
129129
"@type": "TurtleDatasource",
130130
"datasourceTitle": "My Turtle file",
131131
"description": "My dataset with a Turtle back-end",
@@ -157,7 +157,7 @@ Example:
157157

158158
"dereference": [
159159
{
160-
"dereferenceDatasource": "ex:myDatasourceVersion2",
160+
"dereferenceDatasource": "urn:ldf-server:myDatasourceVersion2",
161161
"dereferencePath": "/resource/"
162162
}
163163
],
@@ -199,22 +199,22 @@ For example:
199199
200200
"controllers": [
201201
{
202-
"@id": "ex:myAssetsController",
202+
"@id": "urn:ldf-server:myAssetsController",
203203
"@type": "AssetsController"
204204
},
205205
{
206-
"@id": "ex:myDereferenceController",
206+
"@id": "urn:ldf-server:myDereferenceController",
207207
"@type": "DereferenceController"
208208
},
209209
{
210-
"@id": "ex:myNotFoundController",
210+
"@id": "urn:ldf-server:myNotFoundController",
211211
"@type": "NotFoundController"
212212
}
213213
],
214214
215215
"datasources": [
216216
{
217-
"@id": "ex:myIndexDatasource",
217+
"@id": "urn:ldf-server:myIndexDatasource",
218218
"@type": "IndexDatasource",
219219
"datasourceTitle": "dataset index",
220220
"datasourcePath": "/",
@@ -233,34 +233,34 @@ For example:
233233
234234
"routers": [
235235
{
236-
"@id": "ex:myDatasourceRouter",
236+
"@id": "urn:ldf-server:myDatasourceRouter",
237237
"@type": "DatasourceRouter"
238238
},
239239
{
240-
"@id": "ex:myPageRouter",
240+
"@id": "urn:ldf-server:myPageRouter",
241241
"@type": "PageRouter"
242242
}
243243
],
244244
245245
"views": [
246246
{
247-
"@id": "ex:myErrorHtmlView",
247+
"@id": "urn:ldf-server:myErrorHtmlView",
248248
"@type": "ErrorHtmlView"
249249
},
250250
{
251-
"@id": "ex:myErrorRdfView",
251+
"@id": "urn:ldf-server:myErrorRdfView",
252252
"@type": "ErrorRdfView"
253253
},
254254
{
255-
"@id": "ex:myForbiddenHtmlView",
255+
"@id": "urn:ldf-server:myForbiddenHtmlView",
256256
"@type": "ForbiddenHtmlView"
257257
},
258258
{
259-
"@id": "ex:myNotFoundHtmlView",
259+
"@id": "urn:ldf-server:myNotFoundHtmlView",
260260
"@type": "NotFoundHtmlView"
261261
},
262262
{
263-
"@id": "ex:myNotFoundRdfView",
263+
"@id": "urn:ldf-server:myNotFoundRdfView",
264264
"@type": "NotFoundRdfView"
265265
}
266266
]

‎packages/core/components/context.jsonld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^3.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^4.0.0/components/context.jsonld",
44
{
55
"npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
66
"ldfc": "npmd:@ldf/core/",
@@ -72,7 +72,7 @@
7272
"protocol": "ldfc:Server#protocol",
7373
"datasource": "ldfc:Server#datasource",
7474
"datasources": "ldfc:Server#datasource",
75-
"prefixes": "ldfc:Server#prefixes",
75+
"prefixes": "ldfc:Server#prefix",
7676
"prefix": "rdfa:prefix",
7777
"uri": "rdfa:uri",
7878
"router": "ldfc:Server#router",

‎packages/core/config/config-example.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
"datasources": [
1313
{
14-
"@id": "ex:myDatasourceVersion1",
14+
"@id": "urn:ldf-server:myDatasourceVersion1",
1515
"@type": "SparqlDatasource",
1616
"datasourceTitle": "My SPARQL source",
1717
"description": "My datasource with a SPARQL-endpoint back-end",
@@ -25,7 +25,7 @@
2525
"homepage": "http://example.org/alice"
2626
},
2727
{
28-
"@id": "ex:myDatasourceVersion2",
28+
"@id": "urn:ldf-server:myDatasourceVersion2",
2929
"@type": "TurtleDatasource",
3030
"datasourceTitle": "My Turtle file",
3131
"description": "My dataset with a Turtle back-end",
@@ -57,7 +57,7 @@
5757

5858
"dereference": [
5959
{
60-
"dereferenceDatasource": "ex:myDatasourceVersion2",
60+
"dereferenceDatasource": "urn:ldf-server:myDatasourceVersion2",
6161
"dereferencePath": "/resource/"
6262
}
6363
],

‎packages/core/lib/CliRunner.js

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* Logic for starting an LDF server with a given config from the command line. */
33

44
let cluster = require('cluster'),
5-
ComponentsLoader = require('componentsjs').Loader;
5+
ComponentsManager = require('componentsjs').ComponentsManager;
66

77
// Run function for starting the server from the command line
88
function runCli(moduleRootPath) {
@@ -21,38 +21,27 @@ function runCustom(args, stdin, stdout, stderr, componentConfigUri, properties)
2121
cliWorkers = parseInt(args[2], 10),
2222
configUri = args[3] || componentConfigUri || 'urn:ldf-server:my';
2323

24-
let loader = new ComponentsLoader(properties);
25-
loader.registerAvailableModuleResources()
26-
.then(() => {
27-
// Start up a cluster master
28-
if (cluster.isMaster) {
29-
return loader.getConfigConstructorFromUrl(configUri, args[0])
30-
.then((constructor) => {
31-
return constructor.makeArguments(true).then((args) => {
32-
startClusterMaster(args[0]);
33-
});
34-
})
35-
.catch((e) => {
36-
stderr.write('Config error:\n');
37-
stderr.write(e + '\n');
38-
process.exit(1);
39-
});
40-
}
41-
else {
42-
return loader.instantiateFromUrl(configUri, args[0])
43-
.then((worker) => {
24+
ComponentsManager.build({
25+
...properties,
26+
configLoader: (registry) => registry.register(args[0]),
27+
})
28+
.then((manager) => {
29+
return manager.instantiate(configUri)
30+
.then((worker) => {
31+
if (cluster.isMaster)
32+
startClusterMaster(worker._config);
33+
else
4434
worker.run(cliPort);
45-
})
46-
.catch((e) => {
47-
stderr.write('Instantiation error:\n');
48-
stderr.write(e + '\n');
49-
process.exit(1);
50-
});
51-
}
35+
})
36+
.catch((e) => {
37+
stderr.write('Instantiation error:\n');
38+
stderr.write(e.stack + '\n');
39+
process.exit(1);
40+
});
5241
})
5342
.catch((e) => {
5443
stderr.write('Component definition error:\n');
55-
stderr.write(e + '\n');
44+
stderr.write(e.stack + '\n');
5645
process.exit(1);
5746
});
5847

‎packages/core/lib/datasources/IndexDatasource.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class IndexDatasource extends MemoryDatasource {
1414
super(options);
1515
this._datasources = options ? options.datasources : {};
1616
this.role = 'index';
17+
delete this._datasources['/'];
1718
}
1819

1920
// Creates quads for each data source

‎packages/core/package.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
"name": "@ldf/core",
33
"description": "Linked Data Fragments Server - Core",
44
"version": "3.1.0",
5-
"lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@ldf/core",
6-
"lsd:components": "components/components.jsonld",
7-
"lsd:contexts": {
8-
"https://linkedsoftwaredependencies.org/bundles/npm/@ldf/core/^3.0.0/components/context.jsonld": "components/context.jsonld"
9-
},
10-
"lsd:importPaths": {
11-
"https://linkedsoftwaredependencies.org/bundles/npm/@ldf/core/^3.0.0/components/": "components/"
12-
},
5+
"lsd:module": true,
136
"license": "MIT",
147
"main": "index.js",
158
"publishConfig": {
@@ -36,7 +29,7 @@
3629
},
3730
"dependencies": {
3831
"asynciterator": "^3.0.0",
39-
"componentsjs": "^3.4.0",
32+
"componentsjs": "^4.0.4",
4033
"forwarded-parse": "^2.1.0",
4134
"jsonld-streaming-serializer": "^1.1.0",
4235
"lodash": "^4.0.0",

‎packages/datasource-composite/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ Example:
2323

2424
"datasources": [
2525
{
26-
"@id": "ex:myCompositeDatasource",
26+
"@id": "urn:ldf-server:myCompositeDatasource",
2727
"@type": "CompositeDatasource",
2828
"datasourceTitle": "Composite",
2929
"description": "An example composite datasource",
3030
"datasourcePath": "composite",
31-
"compose": [ "ex:myHdtDatasource", "ex:mySparqlDatasource" ]
31+
"compose": [ "urn:ldf-server:myHdtDatasource", "urn:ldf-server:mySparqlDatasource" ]
3232
},
3333
{
34-
"@id": "ex:myHdtDatasource",
34+
"@id": "urn:ldf-server:myHdtDatasource",
3535
"@type": "HdtDatasource",
3636
"datasourceTitle": "DBpedia 2014",
3737
"description": "DBpedia 2014 with an HDT back-end",
3838
"datasourcePath": "dbpedia",
3939
"hdtFile": "data/dbpedia2014.hdt"
4040
},
4141
{
42-
"@id": "ex:mySparqlDatasource",
42+
"@id": "urn:ldf-server:mySparqlDatasource",
4343
"@type": "SparqlDatasource",
4444
"datasourceTitle": "DBpedia (Virtuoso)",
4545
"description": "DBpedia with a Virtuoso back-end",

‎packages/datasource-composite/components/context.jsonld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@context": [
3-
"https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^3.0.0/components/context.jsonld",
3+
"https://linkedsoftwaredependencies.org/bundles/npm/componentsjs/^4.0.0/components/context.jsonld",
44
{
55
"npmd": "https://linkedsoftwaredependencies.org/bundles/npm/",
66
"ldfdc": "npmd:@ldf/datasource-composite/",

‎packages/datasource-composite/config/config-example.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55

66
"datasources": [
77
{
8-
"@id": "ex:myCompositeDatasource",
8+
"@id": "urn:ldf-server:myCompositeDatasource",
99
"@type": "CompositeDatasource",
1010
"datasourceTitle": "Composite",
1111
"description": "An example composite datasource",
1212
"datasourcePath": "composite",
13-
"compose": [ "ex:myHdtDatasource", "ex:mySparqlDatasource" ]
13+
"compose": [ "urn:ldf-server:myHdtDatasource", "urn:ldf-server:mySparqlDatasource" ]
1414
},
1515
{
16-
"@id": "ex:myHdtDatasource",
16+
"@id": "urn:ldf-server:myHdtDatasource",
1717
"@type": "HdtDatasource",
1818
"datasourceTitle": "DBpedia 2014",
1919
"description": "DBpedia 2014 with an HDT back-end",
2020
"datasourcePath": "dbpedia",
2121
"hdtFile": "data/dbpedia2014.hdt"
2222
},
2323
{
24-
"@id": "ex:mySparqlDatasource",
24+
"@id": "urn:ldf-server:mySparqlDatasource",
2525
"@type": "SparqlDatasource",
2626
"datasourceTitle": "DBpedia (Virtuoso)",
2727
"description": "DBpedia with a Virtuoso back-end",

‎packages/datasource-composite/package.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
"name": "@ldf/datasource-composite",
33
"description": "Linked Data Fragments Server - Composite Datasource",
44
"version": "3.1.0",
5-
"lsd:module": "https://linkedsoftwaredependencies.org/bundles/npm/@ldf/datasource-composite",
6-
"lsd:components": "components/components.jsonld",
7-
"lsd:contexts": {
8-
"https://linkedsoftwaredependencies.org/bundles/npm/@ldf/datasource-composite/^3.0.0/components/context.jsonld": "components/context.jsonld"
9-
},
10-
"lsd:importPaths": {
11-
"https://linkedsoftwaredependencies.org/bundles/npm/@ldf/datasource-composite/^3.0.0/components/": "components/"
12-
},
5+
"lsd:module": true,
136
"license": "MIT",
147
"main": "index.js",
158
"publishConfig": {

0 commit comments

Comments
 (0)