rdflib 2.3.0 → 2.3.1-0007ffed

package/esm/n3parser.js

@@ -183,9 +183,19 @@ var ws = new RegExp("^[ \\t]*", 'g');
 var signed_integer = new RegExp("^[-+]?[0-9]+", 'g');
 var number_syntax = new RegExp("^([-+]?[0-9]+)(\\.[0-9]+)?([eE][-+]?[0-9]+)?", 'g');
 var datetime_syntax = new RegExp('^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9](T[0-9][0-9]:[0-9][0-9](:[0-9][0-9](\\.[0-9]*)?)?)?Z?');
+
+// Reused in tight loops to detect whitespace or comment after a dot
+var wsOrHash = new RegExp("[\\s#]");
 var digitstring = new RegExp("^[0-9]+", 'g');
 var interesting = new RegExp("[\\\\\\r\\n\\\"]", 'g');
 var langcode = new RegExp("^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*", 'g');
+
+// Returns true when a dot at position i should terminate a name,
+// i.e., when the next character is whitespace, a comment start, or EOF
+function dotTerminatesName(str, i) {
+  var next = str.charAt(i + 1);
+  return next === '' || wsOrHash.test(next);
+}
 function createSinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
   return new SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why);
 }
@@ -674,6 +684,16 @@ export class SinkParser {
       if (j < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when ']' expected after [ <propertyList>");
       }
+      if (str.slice(j, j + 1) == ".") {
+        // If a dot is found after a blank node, treat it as a statement terminator.
+        // Do NOT consume the '.' here: statement terminators are handled centrally by
+        // checkDot() (called by directiveOrStatement after statement()). Consuming the dot
+        // locally would bypass that unified logic and could cause inconsistencies.
+        // We do consume ']' below because it is a structural closer of the blank node,
+        // not a statement terminator.
+        res.push(subj);
+        return j; // leave '.' for checkDot()
+      }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
       }
@@ -1122,7 +1142,17 @@ export class SinkParser {
       return -1;
     }
     var i = j;
-    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
+    while (i < pyjslib_len(str)) {
+      var c = str.charAt(i);
+      if (c === '.') {
+        if (dotTerminatesName(str, i)) {
+          break; // treat as statement terminator, not part of name
+        }
+        // else: accept '.' as part of name
+      } else if (_notNameChars.indexOf(c) >= 0) {
+        // Other invalid characters terminate the name
+        break;
+      }
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1148,12 +1178,15 @@ export class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1164,12 +1197,15 @@ export class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

package/esm/serialize.js

@@ -40,7 +40,8 @@ contentType, callback, options) {
         return executeCallback(null, documentString);
       case TurtleContentType:
       case TurtleLegacyContentType:
-        sz.setFlags('si'); // Suppress = for sameAs and => for implies
+        // Suppress = for sameAs and => for implies; preserve any user-specified flags (e.g., 'o')
+        sz.setFlags('si' + (opts.flags ? ' ' + opts.flags : ''));
         documentString = sz.statementsToN3(newSts);
         return executeCallback(null, documentString);
       case NTriplesContentType:
@@ -48,7 +49,8 @@ contentType, callback, options) {
         documentString = sz.statementsToNTriples(newSts);
         return executeCallback(null, documentString);
       case JSONLDContentType:
-        sz.setFlags('si dr'); // turtle + dr (means no default, no relative prefix)
+        // turtle + dr (means no default, no relative prefix); preserve user flags
+        sz.setFlags('si dr' + (opts.flags ? ' ' + opts.flags : ''));
         documentString = sz.statementsToJsonld(newSts); // convert via turtle
         return executeCallback(null, documentString);
       case NQuadsContentType:

package/esm/serializer.js

@@ -6,21 +6,20 @@ 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
     _defineProperty(this, "validPrefix", new RegExp(/^[a-zA-Z][a-zA-Z0-9]*$/));
@@ -53,6 +52,13 @@ export class Serializer {
     this.base = base;
     return this;
   }
+
+  /**
+   * Set serializer behavior flags. Letters can be combined with spaces.
+   * Examples: 'si', 'deinprstux', 'si dr', 'o'.
+   * Notable flags:
+   *  - 'o': do not abbreviate to a prefixed name when the local part contains a dot
+   */
   setFlags(flags) {
     this.flags = flags || '';
     return this;
@@ -243,6 +249,28 @@ export class Serializer {
   toN3(f) {
     return this.statementsToN3(f.statements);
   }
+  // Validate if a string is a valid PN_LOCAL per Turtle 1.1 spec
+  // Allows dots inside the local name but not as trailing character
+  // Also allows empty local names (for URIs ending in / or #)
+  isValidPNLocal(local) {
+    // Empty local name is valid (e.g., ex: for http://example.com/)
+    if (local.length === 0) return true;
+
+    // Cannot end with a dot
+    if (local[local.length - 1] === '.') return false;
+
+    // Check each character (allow dots mid-string)
+    for (var i = 0; i < local.length; i++) {
+      var ch = local[i];
+      // Dot is allowed unless it's the last character (checked above)
+      if (ch === '.') continue;
+      // Other characters must not be in the blacklist
+      if (this._notNameChars.indexOf(ch) >= 0) {
+        return false;
+      }
+    }
+    return true;
+  }
   explicitURI(uri) {
     if (this.flags.indexOf('r') < 0 && this.base) {
       uri = Uri.refTo(this.base, uri);
@@ -605,13 +633,17 @@ export class Serializer {
     if (j >= 0 && this.flags.indexOf('p') < 0 && (
     // Can split at namespace but only if http[s]: URI or file: or ws[s] (why not others?)
     uri.indexOf('http') === 0 || uri.indexOf('ws') === 0 || uri.indexOf('file') === 0)) {
-      var canSplit = true;
-      for (var k = j + 1; k < uri.length; k++) {
-        if (this._notNameChars.indexOf(uri[k]) >= 0) {
-          canSplit = false;
-          break;
-        }
-      }
+      var localid = uri.slice(j + 1);
+      var namesp = uri.slice(0, j + 1);
+      // Don't split if namespace is just the protocol (e.g., https://)
+      // A valid namespace should have content after the protocol
+      var minNamespaceLength = uri.indexOf('://') + 4; // e.g., "http://x" minimum
+      // Also don't split if namespace is the base directory (would serialize as relative URI)
+      var baseDir = this.base ? this.base.slice(0, Math.max(this.base.lastIndexOf('/'), this.base.lastIndexOf('#')) + 1) : null;
+      var namespaceIsBaseDir = baseDir && namesp === baseDir;
+      // If flag 'o' is present, forbid dots in local part when abbreviating
+      var forbidDotLocal = this.flags.indexOf('o') >= 0 && localid.indexOf('.') >= 0;
+      var canSplit = !namespaceIsBaseDir && !forbidDotLocal && namesp.length > minNamespaceLength && this.isValidPNLocal(localid);
       /*
             if (uri.slice(0, j + 1) === this.base + '#') { // base-relative
               if (canSplit) {
@@ -622,8 +654,6 @@ export class Serializer {
             }
       */
       if (canSplit) {
-        var localid = uri.slice(j + 1);
-        var namesp = uri.slice(0, j + 1);
         if (this.defaultNamespace && this.defaultNamespace === namesp && this.flags.indexOf('d') < 0) {
           // d -> suppress default
           if (this.flags.indexOf('k') >= 0 && this.keyords.indexOf(localid) < 0) {
@@ -844,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 + '>']);
@@ -895,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/n3parser.js

@@ -191,9 +191,19 @@ var ws = new RegExp("^[ \\t]*", 'g');
 var signed_integer = new RegExp("^[-+]?[0-9]+", 'g');
 var number_syntax = new RegExp("^([-+]?[0-9]+)(\\.[0-9]+)?([eE][-+]?[0-9]+)?", 'g');
 var datetime_syntax = new RegExp('^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9](T[0-9][0-9]:[0-9][0-9](:[0-9][0-9](\\.[0-9]*)?)?)?Z?');
+
+// Reused in tight loops to detect whitespace or comment after a dot
+var wsOrHash = new RegExp("[\\s#]");
 var digitstring = new RegExp("^[0-9]+", 'g');
 var interesting = new RegExp("[\\\\\\r\\n\\\"]", 'g');
 var langcode = new RegExp("^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*", 'g');
+
+// Returns true when a dot at position i should terminate a name,
+// i.e., when the next character is whitespace, a comment start, or EOF
+function dotTerminatesName(str, i) {
+  var next = str.charAt(i + 1);
+  return next === '' || wsOrHash.test(next);
+}
 function createSinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
   return new SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why);
 }
@@ -682,6 +692,16 @@ class SinkParser {
       if (j < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when ']' expected after [ <propertyList>");
       }
+      if (str.slice(j, j + 1) == ".") {
+        // If a dot is found after a blank node, treat it as a statement terminator.
+        // Do NOT consume the '.' here: statement terminators are handled centrally by
+        // checkDot() (called by directiveOrStatement after statement()). Consuming the dot
+        // locally would bypass that unified logic and could cause inconsistencies.
+        // We do consume ']' below because it is a structural closer of the blank node,
+        // not a statement terminator.
+        res.push(subj);
+        return j; // leave '.' for checkDot()
+      }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
       }
@@ -1130,7 +1150,17 @@ class SinkParser {
       return -1;
     }
     var i = j;
-    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
+    while (i < pyjslib_len(str)) {
+      var c = str.charAt(i);
+      if (c === '.') {
+        if (dotTerminatesName(str, i)) {
+          break; // treat as statement terminator, not part of name
+        }
+        // else: accept '.' as part of name
+      } else if (_notNameChars.indexOf(c) >= 0) {
+        // Other invalid characters terminate the name
+        break;
+      }
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1156,12 +1186,15 @@ class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1172,12 +1205,15 @@ class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

package/lib/serialize.js

@@ -47,7 +47,8 @@ contentType, callback, options) {
         return executeCallback(null, documentString);
       case _types.TurtleContentType:
       case _types.TurtleLegacyContentType:
-        sz.setFlags('si'); // Suppress = for sameAs and => for implies
+        // Suppress = for sameAs and => for implies; preserve any user-specified flags (e.g., 'o')
+        sz.setFlags('si' + (opts.flags ? ' ' + opts.flags : ''));
         documentString = sz.statementsToN3(newSts);
         return executeCallback(null, documentString);
       case _types.NTriplesContentType:
@@ -55,7 +56,8 @@ contentType, callback, options) {
         documentString = sz.statementsToNTriples(newSts);
         return executeCallback(null, documentString);
       case _types.JSONLDContentType:
-        sz.setFlags('si dr'); // turtle + dr (means no default, no relative prefix)
+        // turtle + dr (means no default, no relative prefix); preserve user flags
+        sz.setFlags('si dr' + (opts.flags ? ' ' + opts.flags : ''));
         documentString = sz.statementsToJsonld(newSts); // convert via turtle
         return executeCallback(null, documentString);
       case _types.NQuadsContentType:

package/lib/serializer.d.ts

@@ -13,15 +13,21 @@ 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;
+    /**
+     * Set serializer behavior flags. Letters can be combined with spaces.
+     * Examples: 'si', 'deinprstux', 'si dr', 'o'.
+     * Notable flags:
+     *  - 'o': do not abbreviate to a prefixed name when the local part contains a dot
+     */
     setFlags(flags: any): Serializer;
     toStr(x: any): any;
     fromStr(s: any): any;
@@ -51,6 +57,7 @@ export class Serializer {
     toN3(f: any): string;
     _notQNameChars: string;
     _notNameChars: string;
+    isValidPNLocal(local: any): boolean;
     explicitURI(uri: any): string;
     statementsToNTriples(sts: any): string;
     statementsToN3(sts: any): string;
@@ -65,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,8 @@ 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
     (0, _defineProperty2.default)(this, "validPrefix", new RegExp(/^[a-zA-Z][a-zA-Z0-9]*$/));
@@ -63,6 +62,13 @@ class Serializer {
     this.base = base;
     return this;
   }
+
+  /**
+   * Set serializer behavior flags. Letters can be combined with spaces.
+   * Examples: 'si', 'deinprstux', 'si dr', 'o'.
+   * Notable flags:
+   *  - 'o': do not abbreviate to a prefixed name when the local part contains a dot
+   */
   setFlags(flags) {
     this.flags = flags || '';
     return this;
@@ -253,6 +259,28 @@ class Serializer {
   toN3(f) {
     return this.statementsToN3(f.statements);
   }
+  // Validate if a string is a valid PN_LOCAL per Turtle 1.1 spec
+  // Allows dots inside the local name but not as trailing character
+  // Also allows empty local names (for URIs ending in / or #)
+  isValidPNLocal(local) {
+    // Empty local name is valid (e.g., ex: for http://example.com/)
+    if (local.length === 0) return true;
+
+    // Cannot end with a dot
+    if (local[local.length - 1] === '.') return false;
+
+    // Check each character (allow dots mid-string)
+    for (var i = 0; i < local.length; i++) {
+      var ch = local[i];
+      // Dot is allowed unless it's the last character (checked above)
+      if (ch === '.') continue;
+      // Other characters must not be in the blacklist
+      if (this._notNameChars.indexOf(ch) >= 0) {
+        return false;
+      }
+    }
+    return true;
+  }
   explicitURI(uri) {
     if (this.flags.indexOf('r') < 0 && this.base) {
       uri = Uri.refTo(this.base, uri);
@@ -615,13 +643,17 @@ class Serializer {
     if (j >= 0 && this.flags.indexOf('p') < 0 && (
     // Can split at namespace but only if http[s]: URI or file: or ws[s] (why not others?)
     uri.indexOf('http') === 0 || uri.indexOf('ws') === 0 || uri.indexOf('file') === 0)) {
-      var canSplit = true;
-      for (var k = j + 1; k < uri.length; k++) {
-        if (this._notNameChars.indexOf(uri[k]) >= 0) {
-          canSplit = false;
-          break;
-        }
-      }
+      var localid = uri.slice(j + 1);
+      var namesp = uri.slice(0, j + 1);
+      // Don't split if namespace is just the protocol (e.g., https://)
+      // A valid namespace should have content after the protocol
+      var minNamespaceLength = uri.indexOf('://') + 4; // e.g., "http://x" minimum
+      // Also don't split if namespace is the base directory (would serialize as relative URI)
+      var baseDir = this.base ? this.base.slice(0, Math.max(this.base.lastIndexOf('/'), this.base.lastIndexOf('#')) + 1) : null;
+      var namespaceIsBaseDir = baseDir && namesp === baseDir;
+      // If flag 'o' is present, forbid dots in local part when abbreviating
+      var forbidDotLocal = this.flags.indexOf('o') >= 0 && localid.indexOf('.') >= 0;
+      var canSplit = !namespaceIsBaseDir && !forbidDotLocal && namesp.length > minNamespaceLength && this.isValidPNLocal(localid);
       /*
             if (uri.slice(0, j + 1) === this.base + '#') { // base-relative
               if (canSplit) {
@@ -632,8 +664,6 @@ class Serializer {
             }
       */
       if (canSplit) {
-        var localid = uri.slice(j + 1);
-        var namesp = uri.slice(0, j + 1);
         if (this.defaultNamespace && this.defaultNamespace === namesp && this.flags.indexOf('d') < 0) {
           // d -> suppress default
           if (this.flags.indexOf('k') >= 0 && this.keyords.indexOf(localid) < 0) {
@@ -854,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 + '>']);
@@ -905,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",
+  "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",