rdflib 2.3.0-d60f1a34 → 2.3.1-0007ffed

package/esm/serializer.js

@@ -6,21 +6,19 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 ** This is or was https://github.com/linkeddata/rdflib.js/blob/main/src/serializer.js
 ** Licence: MIT
 */
-import NamedNode from './named-node';
-import BlankNode from './blank-node';
+import * as ttl2jsonld from '@frogcat/ttl2jsonld';
+import solidNs from 'solid-namespace';
+import CanonicalDataFactory from './factories/canonical-data-factory';
 import * as Uri from './uri';
 import * as Util from './utils-js';
-import CanonicalDataFactory from './factories/canonical-data-factory';
 import { createXSD } from './xsd';
-import solidNs from 'solid-namespace';
-import * as ttl2jsonld from '@frogcat/ttl2jsonld';
 export default function createSerializer(store) {
   return new Serializer(store);
 }
 ;
 export class Serializer {
   constructor(store) {
-    _defineProperty(this, "_notQNameChars", '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~');
+    _defineProperty(this, "_notQNameChars", '\t\r\n !"#$%&\'()*,+/;<=>?@[\\]^`{|}~');
     // issue#228
     _defineProperty(this, "_notNameChars", this._notQNameChars + ':');
     //  stringToN3:  String escaping for N3
@@ -876,7 +874,7 @@ export class Serializer {
             results = results.concat(['<' + t + ' rdf:resource="' + relURI(st.object) + '"/>']);
             break;
           case 'Literal':
-            results = results.concat(['<' + t + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
+            results = results.concat(['<' + t + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
             break;
           case 'Collection':
             results = results.concat(['<' + t + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + t + '>']);
@@ -927,7 +925,7 @@ export class Serializer {
             results = results.concat(['<' + qname(st.predicate) + ' rdf:resource="' + relURI(st.object) + '"/>']);
             break;
           case 'Literal':
-            results = results.concat(['<' + qname(st.predicate) + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
+            results = results.concat(['<' + qname(st.predicate) + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
             break;
           case 'Collection':
             results = results.concat(['<' + qname(st.predicate) + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + qname(st.predicate) + '>']);

package/lib/serializer.d.ts

@@ -13,13 +13,13 @@ export class Serializer {
     store: any;
     rdfFactory: any;
     xsd: {
-        boolean: NamedNode;
-        dateTime: NamedNode;
-        decimal: NamedNode;
-        double: NamedNode;
-        integer: NamedNode;
-        langString: NamedNode;
-        string: NamedNode;
+        boolean: import("./named-node").default;
+        dateTime: import("./named-node").default;
+        decimal: import("./named-node").default;
+        double: import("./named-node").default;
+        integer: import("./named-node").default;
+        langString: import("./named-node").default;
+        string: import("./named-node").default;
     };
     setBase(base: any): Serializer;
     /**
@@ -72,4 +72,3 @@ export class Serializer {
     statementsToXML(sts: any): string;
     statementsToJsonld(sts: any): string;
 }
-import NamedNode from './named-node';

package/lib/serializer.js

@@ -7,14 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.Serializer = void 0;
 exports.default = createSerializer;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _namedNode = _interopRequireDefault(require("./named-node"));
-var _blankNode = _interopRequireDefault(require("./blank-node"));
+var ttl2jsonld = _interopRequireWildcard(require("@frogcat/ttl2jsonld"));
+var _solidNamespace = _interopRequireDefault(require("solid-namespace"));
+var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
 var Uri = _interopRequireWildcard(require("./uri"));
 var Util = _interopRequireWildcard(require("./utils-js"));
-var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
 var _xsd = require("./xsd");
-var _solidNamespace = _interopRequireDefault(require("solid-namespace"));
-var ttl2jsonld = _interopRequireWildcard(require("@frogcat/ttl2jsonld"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /*      Serialization of RDF Graphs
 **
@@ -30,7 +28,7 @@ function createSerializer(store) {
 ;
 class Serializer {
   constructor(store) {
-    (0, _defineProperty2.default)(this, "_notQNameChars", '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~');
+    (0, _defineProperty2.default)(this, "_notQNameChars", '\t\r\n !"#$%&\'()*,+/;<=>?@[\\]^`{|}~');
     // issue#228
     (0, _defineProperty2.default)(this, "_notNameChars", this._notQNameChars + ':');
     //  stringToN3:  String escaping for N3
@@ -886,7 +884,7 @@ class Serializer {
             results = results.concat(['<' + t + ' rdf:resource="' + relURI(st.object) + '"/>']);
             break;
           case 'Literal':
-            results = results.concat(['<' + t + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
+            results = results.concat(['<' + t + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') + '>' + escapeForXML(st.object.value) + '</' + t + '>']);
             break;
           case 'Collection':
             results = results.concat(['<' + t + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + t + '>']);
@@ -937,7 +935,7 @@ class Serializer {
             results = results.concat(['<' + qname(st.predicate) + ' rdf:resource="' + relURI(st.object) + '"/>']);
             break;
           case 'Literal':
-            results = results.concat(['<' + qname(st.predicate) + (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
+            results = results.concat(['<' + qname(st.predicate) + (st.object.language ? ' xml:lang="' + st.object.language + '"' : st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') + '>' + escapeForXML(st.object.value) + '</' + qname(st.predicate) + '>']);
             break;
           case 'Collection':
             results = results.concat(['<' + qname(st.predicate) + ' rdf:parseType="Collection">', collectionXMLTree(st.object, stats), '</' + qname(st.predicate) + '>']);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.3.0-d60f1a34",
+  "version": "2.3.1-0007ffed",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -101,7 +101,7 @@
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",
     "test:clean": "rimraf tests/serialize/,*",
     "test:serialize": "npm run build && npm run test:serialize:all && npm run test:clean",
-    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14  && npm run test:serialize:15",
+    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14  && npm run test:serialize:15 && npm run test:serialize:16 && npm run test:serialize:17 && npm run test:serialize:18",
     "test:serialize:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && fs-grep http://www.w3.org/2001/XMLSchema#integer ,t1.xml",
     "test:serialize:2": "cd ./tests/serialize && node ./data.js -in=t2.ttl -format=application/rdf+xml  -out=,t2.xml && node diff ,t2.xml t2-ref.xml",
     "test:serialize:3": "cd ./tests/serialize && node ./data.js -in=t3.ttl -format=application/rdf+xml  -out=,t3.xml && node diff ,t3.xml t3-ref.xml",
@@ -117,6 +117,8 @@
     "test:serialize:14": "cd ./tests/serialize && node ./data.js -in=t14.html -format=text/turtle -out=,t14.ttl && node diff ,t14.ttl t14-ref.ttl",
     "test:serialize:15": "cd ./tests/serialize && node ./data.js -in=t15.html -format=text/turtle -out=,t15.ttl && node diff ,t15.ttl t15-ref.ttl",
     "test:serialize:16": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/ld+json -out=,t1.jsonld && node diff ,t1.jsonld t16-ref.jsonld",
+    "test:serialize:17": "cd ./tests/serialize && node ./data.js -in=t17.ttl -format=application/rdf+xml -out=,t17.xml && node diff ,t17.xml t17-ref.xml",
+    "test:serialize:18": "cd ./tests/serialize && node ./data.js -in=t18.ttl -format=application/rdf+xml -out=,t18.xml && node diff ,t18.xml t18-ref.xml",
     "test:types": "tsc --noEmit --target es2019 --moduleResolution node tests/types/*.ts",
     "test:unit": "mocha --growl --require  ./tests/babel-register.js tests/unit/**-test.*",
     "test:unit:egp": "mocha --require ./tests/babel-register.js tests/unit/fetcher-egp-test.js",

package/src/serializer.js

@@ -5,14 +5,12 @@
 ** This is or was https://github.com/linkeddata/rdflib.js/blob/main/src/serializer.js
 ** Licence: MIT
 */
-import NamedNode from './named-node'
-import BlankNode from './blank-node'
+import * as ttl2jsonld from '@frogcat/ttl2jsonld'
+import solidNs from 'solid-namespace'
+import CanonicalDataFactory from './factories/canonical-data-factory'
 import * as Uri from './uri'
 import * as Util from './utils-js'
-import CanonicalDataFactory from './factories/canonical-data-factory'
 import { createXSD } from './xsd'
-import solidNs from 'solid-namespace'
-import * as ttl2jsonld from '@frogcat/ttl2jsonld'
 
 
 export default function createSerializer(store) {
@@ -257,7 +255,7 @@ export class Serializer {
     return this.statementsToN3(f.statements)
   }
 
-  _notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~' // issue#228
+  _notQNameChars = '\t\r\n !"#$%&\'()*,+/;<=>?@[\\]^`{|}~' // issue#228
   _notNameChars =
     (this._notQNameChars + ':')
 
@@ -914,10 +912,10 @@ export class Serializer {
             break
           case 'Literal':
             results = results.concat(['<' + t +
-            (st.object.datatype.equals(this.xsd.string)
-              ? ''
-              : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"') +
-            (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') +
+            (st.object.language ? ' xml:lang="' + st.object.language + '"' :
+              (st.object.datatype.equals(this.xsd.string)
+                ? ''
+                : ' rdf:datatype="' + escapeForXML(st.object.datatype.uri) + '"')) +
             '>' + escapeForXML(st.object.value) +
             '</' + t + '>'])
             break
@@ -980,9 +978,10 @@ export class Serializer {
             break
           case 'Literal':
             results = results.concat(['<' + qname(st.predicate) +
-              (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"') +
-              (st.object.language ? ' xml:lang="' + st.object.language + '"' : '') +
-              '>' + escapeForXML(st.object.value) +
+              (st.object.language ? 
+                ' xml:lang="' + st.object.language + '"' :
+                (st.object.datatype.equals(this.xsd.string) ? '' : ' rdf:datatype="' + escapeForXML(st.object.datatype.value) + '"')) 
+              + '>' + escapeForXML(st.object.value) +
               '</' + qname(st.predicate) + '>'])
             break
           case 'Collection':