rdflib 2.2.13 → 2.2.15-ce17c86d
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/dist/rdflib.min.js +1 -1
- package/dist/rdflib.min.js.map +1 -1
- package/esm/fetcher.js +9 -3
- package/esm/utils-js.js +2 -2
- package/lib/fetcher.js +9 -3
- package/lib/utils-js.d.ts +2 -2
- package/lib/utils-js.js +2 -2
- package/package.json +4 -4
- package/src/fetcher.ts +9 -2
- package/src/utils-js.js +2 -2
package/esm/fetcher.js
CHANGED
|
@@ -287,10 +287,11 @@ var XMLHandler = /*#__PURE__*/function (_Handler3) {
|
|
|
287
287
|
// figure out the root element
|
|
288
288
|
|
|
289
289
|
for (var c = 0; c < dom.childNodes.length; c++) {
|
|
290
|
-
// is this node an element?
|
|
291
|
-
|
|
290
|
+
var node = dom.childNodes[c]; // is this node an element?
|
|
291
|
+
|
|
292
|
+
if (XMLHandler.isElement(node)) {
|
|
292
293
|
// We've found the first element, it's the root
|
|
293
|
-
var _ns =
|
|
294
|
+
var _ns = node.namespaceURI; // Is it RDF/XML?
|
|
294
295
|
|
|
295
296
|
if (_ns && _ns === _ns['rdf']) {
|
|
296
297
|
fetcher.addStatus(options.req, 'Has XML root element in the RDF namespace, so assume RDF/XML.');
|
|
@@ -350,6 +351,11 @@ var XMLHandler = /*#__PURE__*/function (_Handler3) {
|
|
|
350
351
|
'q': 0.5
|
|
351
352
|
};
|
|
352
353
|
}
|
|
354
|
+
}, {
|
|
355
|
+
key: "isElement",
|
|
356
|
+
value: function isElement(node) {
|
|
357
|
+
return node.nodeType === Node.ELEMENT_NODE;
|
|
358
|
+
}
|
|
353
359
|
}]);
|
|
354
360
|
|
|
355
361
|
return XMLHandler;
|
package/esm/utils-js.js
CHANGED
|
@@ -253,9 +253,9 @@ export function output(o) {
|
|
|
253
253
|
k.textContent = o;
|
|
254
254
|
document.body.appendChild(k);
|
|
255
255
|
}
|
|
256
|
-
import { DOMParser } from 'xmldom';
|
|
256
|
+
import { DOMParser } from '@xmldom/xmldom';
|
|
257
257
|
/**
|
|
258
|
-
* Returns a DOM from
|
|
258
|
+
* Returns a DOM from parsed XML.
|
|
259
259
|
*/
|
|
260
260
|
|
|
261
261
|
export function parseXML(str, options) {
|
package/lib/fetcher.js
CHANGED
|
@@ -289,10 +289,11 @@ var XMLHandler = /*#__PURE__*/function (_Handler3) {
|
|
|
289
289
|
// figure out the root element
|
|
290
290
|
|
|
291
291
|
for (var c = 0; c < dom.childNodes.length; c++) {
|
|
292
|
-
// is this node an element?
|
|
293
|
-
|
|
292
|
+
var node = dom.childNodes[c]; // is this node an element?
|
|
293
|
+
|
|
294
|
+
if (XMLHandler.isElement(node)) {
|
|
294
295
|
// We've found the first element, it's the root
|
|
295
|
-
var _ns =
|
|
296
|
+
var _ns = node.namespaceURI; // Is it RDF/XML?
|
|
296
297
|
|
|
297
298
|
if (_ns && _ns === _ns['rdf']) {
|
|
298
299
|
fetcher.addStatus(options.req, 'Has XML root element in the RDF namespace, so assume RDF/XML.');
|
|
@@ -352,6 +353,11 @@ var XMLHandler = /*#__PURE__*/function (_Handler3) {
|
|
|
352
353
|
'q': 0.5
|
|
353
354
|
};
|
|
354
355
|
}
|
|
356
|
+
}, {
|
|
357
|
+
key: "isElement",
|
|
358
|
+
value: function isElement(node) {
|
|
359
|
+
return node.nodeType === Node.ELEMENT_NODE;
|
|
360
|
+
}
|
|
355
361
|
}]);
|
|
356
362
|
return XMLHandler;
|
|
357
363
|
}(Handler);
|
package/lib/utils-js.d.ts
CHANGED
|
@@ -28,9 +28,9 @@ export function heavyCompareSPO(x: any, y: any, g: any, uriMap: any): any;
|
|
|
28
28
|
*/
|
|
29
29
|
export function output(o: string): void;
|
|
30
30
|
/**
|
|
31
|
-
* Returns a DOM from
|
|
31
|
+
* Returns a DOM from parsed XML.
|
|
32
32
|
*/
|
|
33
|
-
export function parseXML(str: any, options: any):
|
|
33
|
+
export function parseXML(str: any, options: any): Document;
|
|
34
34
|
/**
|
|
35
35
|
* Removes all statements equal to x from a
|
|
36
36
|
*/
|
package/lib/utils-js.js
CHANGED
|
@@ -38,7 +38,7 @@ var _log = _interopRequireDefault(require("./log"));
|
|
|
38
38
|
|
|
39
39
|
var _namedNode = _interopRequireDefault(require("./named-node"));
|
|
40
40
|
|
|
41
|
-
var _xmldom = require("xmldom");
|
|
41
|
+
var _xmldom = require("@xmldom/xmldom");
|
|
42
42
|
|
|
43
43
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
44
44
|
|
|
@@ -307,7 +307,7 @@ function output(o) {
|
|
|
307
307
|
}
|
|
308
308
|
|
|
309
309
|
/**
|
|
310
|
-
* Returns a DOM from
|
|
310
|
+
* Returns a DOM from parsed XML.
|
|
311
311
|
*/
|
|
312
312
|
function parseXML(str, options) {
|
|
313
313
|
var dparser;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rdflib",
|
|
3
3
|
"description": "an RDF library for node.js. Suitable for client and server side.",
|
|
4
|
-
"version": "2.2.
|
|
4
|
+
"version": "2.2.15-ce17c86d",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=6.0"
|
|
7
7
|
},
|
|
@@ -45,12 +45,12 @@
|
|
|
45
45
|
"bugs": "http://github.com/linkeddata/rdflib.js/issues",
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@babel/runtime": "^7.16.0",
|
|
48
|
+
"@xmldom/xmldom": "^0.8.0",
|
|
48
49
|
"async": "^3.2.2",
|
|
49
50
|
"cross-fetch": "^3.1.4",
|
|
50
51
|
"jsonld": "^5.2.0",
|
|
51
52
|
"n3": "^1.12.2",
|
|
52
|
-
"solid-namespace": "^0.5.2"
|
|
53
|
-
"xmldom": "^0.6.0"
|
|
53
|
+
"solid-namespace": "^0.5.2"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
56
|
"@babel/cli": "^7.16.0",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"sinon": "^12.0.1",
|
|
82
82
|
"sinon-chai": "^3.7.0",
|
|
83
83
|
"source-map-loader": "^1.1.3",
|
|
84
|
-
"typedoc": "^0.22.
|
|
84
|
+
"typedoc": "^0.22.10",
|
|
85
85
|
"typescript": "^4.4.4",
|
|
86
86
|
"webpack": "^4.46.0",
|
|
87
87
|
"webpack-cli": "^4.9.1",
|
package/src/fetcher.ts
CHANGED
|
@@ -343,6 +343,11 @@ class XMLHandler extends Handler {
|
|
|
343
343
|
fetcher.mediatypes['application/xml'] = { 'q': 0.5 }
|
|
344
344
|
}
|
|
345
345
|
|
|
346
|
+
static isElement(node: Node): node is Element {
|
|
347
|
+
return node.nodeType === Node.ELEMENT_NODE;
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
|
|
346
351
|
parse (
|
|
347
352
|
fetcher: Fetcher,
|
|
348
353
|
responseText: string,
|
|
@@ -357,10 +362,12 @@ class XMLHandler extends Handler {
|
|
|
357
362
|
// XML Semantics defined by root element namespace
|
|
358
363
|
// figure out the root element
|
|
359
364
|
for (let c = 0; c < dom.childNodes.length; c++) {
|
|
365
|
+
const node = dom.childNodes[c]
|
|
360
366
|
// is this node an element?
|
|
361
|
-
if (
|
|
367
|
+
if (XMLHandler.isElement(node)) {
|
|
368
|
+
|
|
362
369
|
// We've found the first element, it's the root
|
|
363
|
-
let ns =
|
|
370
|
+
let ns = node.namespaceURI
|
|
364
371
|
|
|
365
372
|
// Is it RDF/XML?
|
|
366
373
|
if (ns && ns === ns['rdf']) {
|
package/src/utils-js.js
CHANGED
|
@@ -245,10 +245,10 @@ export function output (o) {
|
|
|
245
245
|
document.body.appendChild(k)
|
|
246
246
|
}
|
|
247
247
|
|
|
248
|
-
import { DOMParser } from 'xmldom'
|
|
248
|
+
import { DOMParser } from '@xmldom/xmldom'
|
|
249
249
|
|
|
250
250
|
/**
|
|
251
|
-
* Returns a DOM from
|
|
251
|
+
* Returns a DOM from parsed XML.
|
|
252
252
|
*/
|
|
253
253
|
export function parseXML (str, options) {
|
|
254
254
|
var dparser
|