@hydrofoil/talos 0.3.9 → 0.4.0

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.
Files changed (3) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/lib/fileStream.js +29 -5
  3. package/package.json +9 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,43 @@
1
1
  # @hydrofoil/talos
2
2
 
3
+ ## 0.4.0
4
+
5
+ ### Minor Changes
6
+
7
+ - c226b3b: Update @hydrofoil/vocabularies
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [c226b3b]
12
+ - @hydrofoil/knossos@0.5.0
13
+
14
+ ## 0.3.12
15
+
16
+ ### Patch Changes
17
+
18
+ - 9905aae: Update `@tpluscode/rdf-string`
19
+ - Updated dependencies [be2ad8d]
20
+ - Updated dependencies [c95cfeb]
21
+ - Updated dependencies [9905aae]
22
+ - Updated dependencies [30417b2]
23
+ - @hydrofoil/knossos@0.4.6
24
+
25
+ ## 0.3.11
26
+
27
+ ### Patch Changes
28
+
29
+ - 3f2d7e3: build(deps): bump rdf-ext from 1.3.1 to 1.3.5
30
+ - Updated dependencies [3f2d7e3]
31
+ - Updated dependencies [f1860ff]
32
+ - Updated dependencies [4e070c4]
33
+ - @hydrofoil/knossos@0.4.3
34
+
35
+ ## 0.3.10
36
+
37
+ ### Patch Changes
38
+
39
+ - b51f8bf: Improvements in resolving relative paths in resources
40
+
3
41
  ## 0.3.9
4
42
 
5
43
  ### Patch Changes
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
- const angleBracketTransform = (basePath) => (0, replacestream_1.default)(/<\/([^>]+)>/g, `<${basePath}/$1>`);
33
- const jsonTransform = (basePath) => (0, replacestream_1.default)(/"\/([^"]+)"/g, `"${basePath}/$1"`);
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 (basePath !== '/' && filePatchTransforms.has(mediaType)) {
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZVN0cmVhbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImZpbGVTdHJlYW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDRDQUFtQjtBQUVuQixnREFBdUI7QUFDdkIsaURBQWtDO0FBQ2xDLGtFQUF5QztBQUN6QywwREFBK0M7QUFDL0MsK0JBQTJCO0FBRTNCLE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxRQUFnQixFQUFFLEVBQUUsQ0FBQyxJQUFBLHVCQUFhLEVBQUMsY0FBYyxFQUFFLElBQUksUUFBUSxNQUFNLENBQUMsQ0FBQTtBQUNyRyxNQUFNLGFBQWEsR0FBRyxDQUFDLFFBQWdCLEVBQUUsRUFBRSxDQUFDLElBQUEsdUJBQWEsRUFBQyxjQUFjLEVBQUUsSUFBSSxRQUFRLE1BQU0sQ0FBQyxDQUFBO0FBRTdGLE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDbEMsQ0FBQyxhQUFhLEVBQUUscUJBQXFCLENBQUM7SUFDdEMsQ0FBQyx1QkFBdUIsRUFBRSxxQkFBcUIsQ0FBQztJQUNoRCxDQUFDLHFCQUFxQixFQUFFLHFCQUFxQixDQUFDO0lBQzlDLENBQUMsa0JBQWtCLEVBQUUscUJBQXFCLENBQUM7SUFDM0MsQ0FBQyxxQkFBcUIsRUFBRSxhQUFhLENBQUM7Q0FDdkMsQ0FBQyxDQUFBO0FBRUYsU0FBZ0IsZ0JBQWdCLENBQUMsSUFBWSxFQUFFLEdBQVcsRUFBRSxHQUFXLEVBQUUsV0FBbUI7SUFDMUYsTUFBTSxRQUFRLEdBQUcsY0FBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUE7SUFDekMsTUFBTSxRQUFRLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFBO0lBQ3RDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbkMsSUFBSSxDQUFDLFNBQVMsRUFBRTtRQUNkLElBQUEsU0FBRyxFQUFDLDRDQUE0QyxFQUFFLFFBQVEsQ0FBQyxDQUFBO1FBQzNELE9BQU8sSUFBSSxDQUFBO0tBQ1o7SUFFRCxJQUFJLFVBQVUsR0FBRyxZQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDMUMsSUFBSSxRQUFRLEtBQUssR0FBRyxJQUFJLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsRUFBRTtRQUMxRCxVQUFVLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQTtLQUM1RTtJQUNELE1BQU0sWUFBWSxHQUFvQix3QkFBTyxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsVUFBVSxFQUFFO1FBQzFFLE9BQU8sRUFBRSxXQUFXO0tBQ3JCLENBQVEsQ0FBQTtJQUVULElBQUksQ0FBQyxZQUFZLEVBQUU7UUFDakIsSUFBQSxTQUFHLEVBQUMsbUNBQW1DLEVBQUUsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFBO0tBQzlEO0lBRUQsT0FBTyxZQUFZLENBQUE7QUFDckIsQ0FBQztBQXRCRCw0Q0FzQkMifQ==
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.9",
3
+ "version": "0.4.0",
4
4
  "main": "index.js",
5
5
  "bin": {
6
6
  "talos": "bin/talos.js"
@@ -15,30 +15,31 @@
15
15
  ],
16
16
  "dependencies": {
17
17
  "@fcostarodrigo/walk": "^5.0.1",
18
- "@hydrofoil/knossos": "^0.4.0",
19
- "@hydrofoil/vocabularies": "^0.2.0",
18
+ "@hydrofoil/knossos": "^0.5.0",
19
+ "@hydrofoil/vocabularies": "^0.3",
20
20
  "@rdfjs/formats-common": "^2.2.0",
21
21
  "@tpluscode/rdf-ns-builders": "^1.0.0",
22
- "@tpluscode/rdf-string": "^0.2.24",
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.1",
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.0",
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.1",
41
- "rdf-ext": "^1.3.1",
41
+ "mocha": "^9.1.3",
42
+ "rdf-ext": "^1.3.5",
42
43
  "sinon": "^11"
43
44
  }
44
45
  }