n3 1.11.1 → 1.12.2

package/src/N3DataFactory.js

@@ -35,6 +35,12 @@ export class Term {
     return this.id;
   }
 
+  // ### Implement hashCode for Immutable.js, since we implement `equals`
+  // https://immutable-js.com/docs/v4.0.0/ValueObject/#hashCode()
+  get hashCode() {
+    return 0;
+  }
+
   // ### Returns whether this object represents the same term as the other
   equals(other) {
     // If both terms were created by this library,

package/src/N3Parser.js

@@ -272,6 +272,13 @@ export default class N3Parser {
       // Additional semicolons can be safely ignored
       return this._predicate !== null ? this._readPredicate :
              this._error('Expected predicate but got ;', token);
+    case '[':
+      if (this._n3Mode) {
+        // Start a new quad with a new blank node as subject
+        this._saveContext('blank', this._graph, this._subject,
+                          this._subject = this._blankNode(), null);
+        return this._readBlankNodeHead;
+      }
     case 'blank':
       if (!this._n3Mode)
         return this._error('Disallowed blank node as predicate', token);
@@ -368,13 +375,16 @@ export default class N3Parser {
     // Restore the parent context containing this blank node
     const empty = this._predicate === null;
     this._restoreContext();
+    // If the blank node was the object, restore previous context and read punctuation
+    if (this._object !== null)
+      return this._getContextEndReader();
+    // If the blank node was the predicate, continue reading the object
+    else if (this._predicate !== null)
+      return this._readObject;
     // If the blank node was the subject, continue reading the predicate
-    if (this._object === null)
+    else
       // If the blank node was empty, it could be a named graph label
       return empty ? this._readPredicateOrNamedGraph : this._readPredicateAfterBlank;
-    // If the blank node was the object, restore previous context and read punctuation
-    else
-      return this._getContextEndReader();
   }
 
   // ### `_readPredicateAfterBlank` reads a predicate after an anonymous blank node

package/src/N3Writer.js

@@ -55,9 +55,13 @@ export default class N3Writer {
     if (!(/triple|quad/i).test(options.format)) {
       this._lineMode = false;
       this._graph = DEFAULTGRAPH;
-      this._baseIRI = options.baseIRI;
       this._prefixIRIs = Object.create(null);
       options.prefixes && this.addPrefixes(options.prefixes);
+      if (options.baseIRI) {
+        this._baseMatcher = new RegExp(`^${escapeRegex(options.baseIRI)
+            }${options.baseIRI.endsWith('/') ? '' : '[#?]'}`);
+        this._baseLength = options.baseIRI.length;
+      }
     }
     else {
       this._lineMode = true;
@@ -148,8 +152,8 @@ export default class N3Writer {
     }
     let iri = entity.value;
     // Use relative IRIs if requested and possible
-    if (this._baseIRI && iri.startsWith(this._baseIRI))
-      iri = iri.substr(this._baseIRI.length);
+    if (this._baseMatcher && this._baseMatcher.test(iri))
+      iri = iri.substr(this._baseLength);
     // Escape special characters
     if (escape.test(iri))
       iri = iri.replace(escapeAll, characterReplacer);
@@ -290,7 +294,7 @@ export default class N3Writer {
         IRIlist += IRIlist ? `|${prefixIRI}` : prefixIRI;
         prefixList += (prefixList ? '|' : '') + this._prefixIRIs[prefixIRI];
       }
-      IRIlist = IRIlist.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+      IRIlist = escapeRegex(IRIlist, /[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
       this._prefixRegex = new RegExp(`^(?:${prefixList})[^\/]*$|` +
                                      `^(${IRIlist})([a-zA-Z][\\-_a-zA-Z0-9]*)$`);
     }
@@ -389,3 +393,7 @@ function characterReplacer(character) {
   }
   return result;
 }
+
+function escapeRegex(regex) {
+  return regex.replace(/[\]\/\(\)\*\+\?\.\\\$]/g, '\\$&');
+}