n3 2.10.1 → 2.10.3

package/lib/N3Parser.js

@@ -60,6 +60,8 @@ class N3Parser {
     });
     // Disable explicit quantifiers by default
     this._explicitQuantifiers = !!options.explicitQuantifiers;
+    // Disable formula-only blank node scoping by default
+    this._formulaScopedBlankNodes = !!options.formulaScopedBlankNodes;
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;
@@ -128,11 +130,15 @@ class N3Parser {
     // Every new scope resets the predicate direction
     this._inversePredicate = false;
     this._expectOf = false;
-    // In N3, blank nodes are scoped to a formula
-    // (using a dot as separator, as a blank node label cannot start with it)
-    this._prefixes._ = this._graph ? `${this._graph.value}.` : '.';
-    // Quantifiers are scoped to a formula
-    this._quantified = Object.create(this._quantified);
+    // In N3, blank nodes and quantifiers are scoped to a formula;
+    // with `formulaScopedBlankNodes`, lists and blank node property lists
+    // share the enclosing scope instead of rescoping
+    if (!this._formulaScopedBlankNodes || type === 'formula') {
+      // Label the scope with the enclosing formula's blank node
+      // (using a dot as separator, as a blank node label cannot start with it)
+      this._prefixes._ = this._graph ? `${this._graph.value}.` : '.';
+      this._quantified = Object.create(this._quantified);
+    }
     // A formula starts empty and must not inherit its parent's subject
     if (type === 'formula') {
       this._subject = null;

package/lib/N3Writer.js

@@ -135,7 +135,7 @@ class N3Writer {
 
   // ### `quadToString` serializes a quad as a string
   quadToString(subject, predicate, object, graph) {
-    return `${this._encodeSubject(subject)} ${this._encodeIriOrBlank(predicate)} ${this._encodeObject(object)}${graph && !(0, _N3Util.isDefaultGraph)(graph) ? ` ${this._encodeIriOrBlank(graph)} .\n` : ' .\n'}`;
+    return `${this._encodeSubject(subject)} ${predicate.termType === 'Literal' ? this._encodeLiteral(predicate) : this._encodeIriOrBlank(predicate)} ${this._encodeObject(object)}${graph && !(0, _N3Util.isDefaultGraph)(graph) ? ` ${this._encodeIriOrBlank(graph)} .\n` : ' .\n'}`;
   }
 
   // ### `quadsToString` serializes an array of quads as a string
@@ -147,7 +147,15 @@ class N3Writer {
 
   // ### `_encodeSubject` represents a subject
   _encodeSubject(entity) {
-    return entity.termType === 'Quad' ? this._encodeQuad(entity) : this._encodeIriOrBlank(entity);
+    switch (entity.termType) {
+      case 'Quad':
+        return this._encodeQuad(entity);
+      // Literal subjects are only valid in N3
+      case 'Literal':
+        return this._encodeLiteral(entity);
+      default:
+        return this._encodeIriOrBlank(entity);
+    }
   }
 
   // ### `_encodeIriOrBlank` represents an IRI or blank node
@@ -214,7 +222,15 @@ class N3Writer {
 
   // ### `_encodePredicate` represents a predicate
   _encodePredicate(predicate) {
-    return predicate.value === rdf.type ? 'a' : this._encodeIriOrBlank(predicate);
+    switch (predicate.termType) {
+      case 'NamedNode':
+        return predicate.value === rdf.type ? 'a' : this._encodeIriOrBlank(predicate);
+      // Literal predicates are only valid in N3
+      case 'Literal':
+        return this._encodeLiteral(predicate);
+      default:
+        return this._encodeIriOrBlank(predicate);
+    }
   }
 
   // ### `_encodeObject` represents an object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3",
-  "version": "2.10.1",
+  "version": "2.10.3",
   "description": "Lightning fast, asynchronous, streaming Turtle / N3 / RDF library.",
   "author": "Ruben Verborgh <ruben.verborgh@gmail.com>",
   "keywords": [

package/src/N3Parser.js

@@ -49,6 +49,8 @@ export default class N3Parser {
     this._lexer = options.lexer || new N3Lexer({ lineMode: isLineMode, n3: isN3, isImpliedBy: this._isImpliedBy });
     // Disable explicit quantifiers by default
     this._explicitQuantifiers = !!options.explicitQuantifiers;
+    // Disable formula-only blank node scoping by default
+    this._formulaScopedBlankNodes = !!options.formulaScopedBlankNodes;
     // Disable parsing of unsupported versions by default
     this._parseUnsupportedVersions = !!options.parseUnsupportedVersions;
     this._version = options.version;
@@ -111,11 +113,15 @@ export default class N3Parser {
     // Every new scope resets the predicate direction
     this._inversePredicate = false;
     this._expectOf = false;
-    // In N3, blank nodes are scoped to a formula
-    // (using a dot as separator, as a blank node label cannot start with it)
-    this._prefixes._ = (this._graph ? `${this._graph.value}.` : '.');
-    // Quantifiers are scoped to a formula
-    this._quantified = Object.create(this._quantified);
+    // In N3, blank nodes and quantifiers are scoped to a formula;
+    // with `formulaScopedBlankNodes`, lists and blank node property lists
+    // share the enclosing scope instead of rescoping
+    if (!this._formulaScopedBlankNodes || type === 'formula') {
+      // Label the scope with the enclosing formula's blank node
+      // (using a dot as separator, as a blank node label cannot start with it)
+      this._prefixes._ = (this._graph ? `${this._graph.value}.` : '.');
+      this._quantified = Object.create(this._quantified);
+    }
     // A formula starts empty and must not inherit its parent's subject
     if (type === 'formula') {
       this._subject = null;

package/src/N3Writer.js

@@ -129,7 +129,8 @@ export default class N3Writer {
   // ### `quadToString` serializes a quad as a string
   quadToString(subject, predicate, object, graph) {
     return  `${this._encodeSubject(subject)} ${
-            this._encodeIriOrBlank(predicate)} ${
+            predicate.termType === 'Literal' ?
+              this._encodeLiteral(predicate) : this._encodeIriOrBlank(predicate)} ${
             this._encodeObject(object)
             }${graph && !isDefaultGraph(graph) ? ` ${this._encodeIriOrBlank(graph)} .\n` : ' .\n'}`;
   }
@@ -144,8 +145,15 @@ export default class N3Writer {
 
   // ### `_encodeSubject` represents a subject
   _encodeSubject(entity) {
-    return entity.termType === 'Quad' ?
-      this._encodeQuad(entity) : this._encodeIriOrBlank(entity);
+    switch (entity.termType) {
+    case 'Quad':
+      return this._encodeQuad(entity);
+    // Literal subjects are only valid in N3
+    case 'Literal':
+      return this._encodeLiteral(entity);
+    default:
+      return this._encodeIriOrBlank(entity);
+    }
   }
 
   // ### `_encodeIriOrBlank` represents an IRI or blank node
@@ -223,7 +231,15 @@ export default class N3Writer {
 
   // ### `_encodePredicate` represents a predicate
   _encodePredicate(predicate) {
-    return predicate.value === rdf.type ? 'a' : this._encodeIriOrBlank(predicate);
+    switch (predicate.termType) {
+    case 'NamedNode':
+      return predicate.value === rdf.type ? 'a' : this._encodeIriOrBlank(predicate);
+    // Literal predicates are only valid in N3
+    case 'Literal':
+      return this._encodeLiteral(predicate);
+    default:
+      return this._encodeIriOrBlank(predicate);
+    }
   }
 
   // ### `_encodeObject` represents an object