@hydrofoil/talos 0.3.8 → 0.3.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/lib/bootstrap.js +4 -2
- package/lib/fileStream.js +29 -5
- package/package.json +8 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
# @hydrofoil/talos
|
|
2
2
|
|
|
3
|
+
## 0.3.12
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 9905aae: Update `@tpluscode/rdf-string`
|
|
8
|
+
- Updated dependencies [be2ad8d]
|
|
9
|
+
- Updated dependencies [c95cfeb]
|
|
10
|
+
- Updated dependencies [9905aae]
|
|
11
|
+
- Updated dependencies [30417b2]
|
|
12
|
+
- @hydrofoil/knossos@0.4.6
|
|
13
|
+
|
|
14
|
+
## 0.3.11
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- 3f2d7e3: build(deps): bump rdf-ext from 1.3.1 to 1.3.5
|
|
19
|
+
- Updated dependencies [3f2d7e3]
|
|
20
|
+
- Updated dependencies [f1860ff]
|
|
21
|
+
- Updated dependencies [4e070c4]
|
|
22
|
+
- @hydrofoil/knossos@0.4.3
|
|
23
|
+
|
|
24
|
+
## 0.3.10
|
|
25
|
+
|
|
26
|
+
### Patch Changes
|
|
27
|
+
|
|
28
|
+
- b51f8bf: Improvements in resolving relative paths in resources
|
|
29
|
+
|
|
30
|
+
## 0.3.9
|
|
31
|
+
|
|
32
|
+
### Patch Changes
|
|
33
|
+
|
|
34
|
+
- f83a915: `index.ttl` in root resource directory would add a trailing slash to resource URI
|
|
35
|
+
|
|
3
36
|
## 0.3.8
|
|
4
37
|
|
|
5
38
|
### Patch Changes
|
package/lib/bootstrap.js
CHANGED
|
@@ -20,7 +20,9 @@ async function bootstrap({ api, apiUri, cwd, ...options }) {
|
|
|
20
20
|
const resourcePath = path_1.default.relative(cwd, file)
|
|
21
21
|
.replace(/\.[^.]+$/, '')
|
|
22
22
|
.replace(/\/?index$/, '');
|
|
23
|
-
const url =
|
|
23
|
+
const url = resourcePath === ''
|
|
24
|
+
? encodeURI(api)
|
|
25
|
+
: encodeURI(`${api}/${resourcePath}`);
|
|
24
26
|
const parserStream = (0, fileStream_1.getPatchedStream)(file, cwd, api, url);
|
|
25
27
|
if (!parserStream) {
|
|
26
28
|
continue;
|
|
@@ -48,4 +50,4 @@ async function bootstrap({ api, apiUri, cwd, ...options }) {
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
exports.bootstrap = bootstrap;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9vdHN0cmFwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYm9vdHN0cmFwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLGdEQUF1QjtBQUV2QiwrREFBc0M7QUFDdEMsNEVBQXNFO0FBQ3RFLHNEQUEwQjtBQUMxQiwwREFBaUM7QUFDakMsd0RBQW9FO0FBQ3BFLDhEQUF5RDtBQUN6RCw2Q0FBK0M7QUFDL0MsK0JBQTJCO0FBUXBCLEtBQUssVUFBVSxTQUFTLENBQUMsRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sRUFBVztJQUN2RSxNQUFNLEtBQUssR0FBRyxJQUFJLDZCQUFxQixDQUFDLElBQUksNEJBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO0lBRWxFLElBQUksS0FBSyxFQUFFLE1BQU0sSUFBSSxJQUFJLElBQUEsY0FBSSxFQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQ2xDLE1BQU0sUUFBUSxHQUFHLGNBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sWUFBWSxHQUFHLGNBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQzthQUMxQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQzthQUN2QixPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBRTNCLE1BQU0sR0FBRyxHQUFHLFlBQVksS0FBSyxFQUFFO1lBQzdCLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDO1lBQ2hCLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxHQUFHLElBQUksWUFBWSxFQUFFLENBQUMsQ0FBQTtRQUV2QyxNQUFNLFlBQVksR0FBRyxJQUFBLDZCQUFnQixFQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQzFELElBQUksQ0FBQyxZQUFZLEVBQUU7WUFDakIsU0FBUTtTQUNUO1FBRUQsTUFBTSxPQUFPLEdBQWdCLGlCQUFJLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDM0MsSUFBSTtZQUNGLElBQUksS0FBSyxFQUFFLE1BQU0sSUFBSSxJQUFJLFlBQVksRUFBRTtnQkFDckMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTthQUNsQjtTQUNGO1FBQUMsT0FBTyxDQUFNLEVBQUU7WUFDZixJQUFBLFNBQUcsRUFBQyx3QkFBd0IsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1lBQ2xELFNBQVE7U0FDVDtRQUVELE1BQU0sT0FBTyxHQUFHLElBQUEsbUJBQVMsRUFBQyxFQUFFLE9BQU8sRUFBRSxDQUFDO2FBQ25DLFNBQVMsQ0FBQyxHQUFHLENBQUM7YUFDZCxNQUFNLENBQUMsY0FBSyxDQUFDLGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBRXpDLElBQUksTUFBTSxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUNwQyxJQUFBLFNBQUcsRUFBQyxzQkFBc0IsR0FBRyxFQUFFLENBQUMsQ0FBQTtTQUNqQzthQUFNO1lBQ0wsSUFBQSxTQUFHLEVBQUMscUJBQXFCLEdBQUcsRUFBRSxDQUFDLENBQUE7U0FDaEM7UUFFRCxNQUFNLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7S0FDMUI7QUFDSCxDQUFDO0FBeENELDhCQXdDQyJ9
|
package/lib/fileStream.js
CHANGED
|
@@ -28,9 +28,33 @@ const path_1 = __importDefault(require("path"));
|
|
|
28
28
|
const mime = __importStar(require("mime-types"));
|
|
29
29
|
const replacestream_1 = __importDefault(require("replacestream"));
|
|
30
30
|
const formats_common_1 = require("@rdfjs/formats-common");
|
|
31
|
+
const is_absolute_url_1 = __importDefault(require("is-absolute-url"));
|
|
31
32
|
const log_1 = require("./log");
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
function replacer(basePath, resourceUrl, s, e = s) {
|
|
34
|
+
return (_, match) => {
|
|
35
|
+
let absolute;
|
|
36
|
+
if ((0, is_absolute_url_1.default)(match)) {
|
|
37
|
+
return `${s}${match}${e}`;
|
|
38
|
+
}
|
|
39
|
+
if (match.startsWith('/') && basePath !== '/') {
|
|
40
|
+
absolute = basePath + match;
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
absolute = new URL(match, resourceUrl).toString();
|
|
44
|
+
if (!match.endsWith('/')) {
|
|
45
|
+
absolute = absolute.replace(/\/?$/, '');
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
const absoluteUrl = new URL(absolute, resourceUrl);
|
|
49
|
+
if (absoluteUrl.pathname === '/' && basePath !== '/') {
|
|
50
|
+
absoluteUrl.pathname = basePath;
|
|
51
|
+
absolute = absoluteUrl.toString();
|
|
52
|
+
}
|
|
53
|
+
return `${s}${absolute}${e}`;
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
const angleBracketTransform = (basePath, resourceUrl) => (0, replacestream_1.default)(/<([^>]+)>/g, replacer(basePath, resourceUrl, '<', '>'));
|
|
57
|
+
const jsonTransform = (basePath, resourceUrl) => (0, replacestream_1.default)(/"([./][^"]+)"/g, replacer(basePath, resourceUrl, '"'));
|
|
34
58
|
const filePatchTransforms = new Map([
|
|
35
59
|
['text/turtle', angleBracketTransform],
|
|
36
60
|
['application/n-triples', angleBracketTransform],
|
|
@@ -47,8 +71,8 @@ function getPatchedStream(file, cwd, api, resourceUrl) {
|
|
|
47
71
|
return null;
|
|
48
72
|
}
|
|
49
73
|
let fileStream = fs_1.default.createReadStream(file);
|
|
50
|
-
if (
|
|
51
|
-
fileStream = fileStream.pipe(filePatchTransforms.get(mediaType)(basePath));
|
|
74
|
+
if (filePatchTransforms.has(mediaType)) {
|
|
75
|
+
fileStream = fileStream.pipe(filePatchTransforms.get(mediaType)(basePath, resourceUrl));
|
|
52
76
|
}
|
|
53
77
|
const parserStream = formats_common_1.parsers.import(mediaType, fileStream, {
|
|
54
78
|
baseIRI: resourceUrl,
|
|
@@ -59,4 +83,4 @@ function getPatchedStream(file, cwd, api, resourceUrl) {
|
|
|
59
83
|
return parserStream;
|
|
60
84
|
}
|
|
61
85
|
exports.getPatchedStream = getPatchedStream;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZVN0cmVhbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImZpbGVTdHJlYW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRDQUFtQjtBQUVuQixnREFBdUI7QUFDdkIsaURBQWtDO0FBQ2xDLGtFQUF5QztBQUN6QywwREFBK0M7QUFDL0Msc0VBQTJDO0FBQzNDLCtCQUEyQjtBQUUzQixTQUFTLFFBQVEsQ0FBQyxRQUFnQixFQUFFLFdBQW1CLEVBQUUsQ0FBUyxFQUFFLENBQUMsR0FBRyxDQUFDO0lBQ3ZFLE9BQU8sQ0FBQyxDQUFVLEVBQUUsS0FBYSxFQUFFLEVBQUU7UUFDbkMsSUFBSSxRQUFnQixDQUFBO1FBQ3BCLElBQUksSUFBQSx5QkFBYSxFQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3hCLE9BQU8sR0FBRyxDQUFDLEdBQUcsS0FBSyxHQUFHLENBQUMsRUFBRSxDQUFBO1NBQzFCO1FBRUQsSUFBSSxLQUFLLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLFFBQVEsS0FBSyxHQUFHLEVBQUU7WUFDN0MsUUFBUSxHQUFHLFFBQVEsR0FBRyxLQUFLLENBQUE7U0FDNUI7YUFBTTtZQUNMLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxLQUFLLEVBQUUsV0FBVyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUE7WUFDakQsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ3hCLFFBQVEsR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQTthQUN4QztTQUNGO1FBRUQsTUFBTSxXQUFXLEdBQUcsSUFBSSxHQUFHLENBQUMsUUFBUSxFQUFFLFdBQVcsQ0FBQyxDQUFBO1FBQ2xELElBQUksV0FBVyxDQUFDLFFBQVEsS0FBSyxHQUFHLElBQUksUUFBUSxLQUFLLEdBQUcsRUFBRTtZQUNwRCxXQUFXLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQTtZQUMvQixRQUFRLEdBQUcsV0FBVyxDQUFDLFFBQVEsRUFBRSxDQUFBO1NBQ2xDO1FBRUQsT0FBTyxHQUFHLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxFQUFFLENBQUE7SUFDOUIsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxRQUFnQixFQUFFLFdBQW1CLEVBQUUsRUFBRSxDQUFDLElBQUEsdUJBQWEsRUFBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLFFBQVEsRUFBRSxXQUFXLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUE7QUFDL0ksTUFBTSxhQUFhLEdBQUcsQ0FBQyxRQUFnQixFQUFFLFdBQW1CLEVBQUUsRUFBRSxDQUFDLElBQUEsdUJBQWEsRUFBQyxnQkFBZ0IsRUFBRSxRQUFRLENBQUMsUUFBUSxFQUFFLFdBQVcsRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFBO0FBRXRJLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDbEMsQ0FBQyxhQUFhLEVBQUUscUJBQXFCLENBQUM7SUFDdEMsQ0FBQyx1QkFBdUIsRUFBRSxxQkFBcUIsQ0FBQztJQUNoRCxDQUFDLHFCQUFxQixFQUFFLHFCQUFxQixDQUFDO0lBQzlDLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUM7SUFDM0MsQ0FBQyxxQkFBcUIsRUFBRSxhQUFhLENBQUM7Q0FDdkMsQ0FBQyxDQUFBO0FBRUYsU0FBZ0IsZ0JBQWdCLENBQUMsSUFBWSxFQUFFLEdBQVcsRUFBRSxHQUFXLEVBQUUsV0FBbUI7SUFDMUYsTUFBTSxRQUFRLEdBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUE7SUFDekMsTUFBTSxRQUFRLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFBO0lBQ3RDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbkMsSUFBSSxDQUFDLFNBQVMsRUFBRTtRQUNkLElBQUEsU0FBRyxFQUFDLDRDQUE0QyxFQUFFLFFBQVEsQ0FBQyxDQUFBO1FBQzNELE9BQU8sSUFBSSxDQUFBO0tBQ1o7SUFFRCxJQUFJLFVBQVUsR0FBRyxZQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDMUMsSUFBSSxtQkFBbUIsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLEVBQUU7UUFDdEMsVUFBVSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBRSxDQUFDLFFBQVEsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUFBO0tBQ3pGO0lBQ0QsTUFBTSxZQUFZLEdBQW9CLHdCQUFPLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLEVBQUU7UUFDMUUsT0FBTyxFQUFFLFdBQVc7S0FDckIsQ0FBUSxDQUFBO0lBRVQsSUFBSSxDQUFDLFlBQVksRUFBRTtRQUNqQixJQUFBLFNBQUcsRUFBQyxtQ0FBbUMsRUFBRSxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUE7S0FDOUQ7SUFFRCxPQUFPLFlBQVksQ0FBQTtBQUNyQixDQUFDO0FBdEJELDRDQXNCQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hydrofoil/talos",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.12",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"bin": {
|
|
6
6
|
"talos": "bin/talos.js"
|
|
@@ -15,29 +15,31 @@
|
|
|
15
15
|
],
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@fcostarodrigo/walk": "^5.0.1",
|
|
18
|
-
"@hydrofoil/knossos": "^0.4.
|
|
18
|
+
"@hydrofoil/knossos": "^0.4.6",
|
|
19
19
|
"@hydrofoil/vocabularies": "^0.2.0",
|
|
20
20
|
"@rdfjs/formats-common": "^2.2.0",
|
|
21
21
|
"@tpluscode/rdf-ns-builders": "^1.0.0",
|
|
22
|
-
"@tpluscode/rdf-string": "^0.2.
|
|
22
|
+
"@tpluscode/rdf-string": "^0.2.25",
|
|
23
23
|
"@tpluscode/sparql-builder": "^0.3.12",
|
|
24
24
|
"@zazuko/rdf-vocabularies": "*",
|
|
25
25
|
"clownface": "^1.2.0",
|
|
26
26
|
"commander": "^6.1.0",
|
|
27
27
|
"debug": "^4.3.1",
|
|
28
|
+
"is-absolute-url": "^3",
|
|
28
29
|
"mime-types": "^2.1.33",
|
|
29
30
|
"node-fetch": "^2.6.1",
|
|
30
|
-
"rdf-ext": "^1.3.
|
|
31
|
+
"rdf-ext": "^1.3.5",
|
|
31
32
|
"replacestream": "^4.0.3",
|
|
32
33
|
"sparql-http-client": "^2.2.3"
|
|
33
34
|
},
|
|
34
35
|
"devDependencies": {
|
|
35
36
|
"@rdfjs/namespace": "^1.1.0",
|
|
36
|
-
"@types/mime-types": "^2.1.
|
|
37
|
+
"@types/mime-types": "^2.1.1",
|
|
37
38
|
"@types/replacestream": "^4.0.1",
|
|
38
39
|
"@wikibus/vocabularies": "^0.2.1",
|
|
39
40
|
"chai": "^4.3.4",
|
|
40
|
-
"mocha": "^9.1.
|
|
41
|
+
"mocha": "^9.1.3",
|
|
42
|
+
"rdf-ext": "^1.3.5",
|
|
41
43
|
"sinon": "^11"
|
|
42
44
|
}
|
|
43
45
|
}
|