n3 2.2.15 → 2.3.0

package/lib/IRIs.js

@@ -11,6 +11,7 @@ var _default = exports.default = {
   xsd: {
     decimal: `${XSD}decimal`,
     boolean: `${XSD}boolean`,
+    dateTime: `${XSD}dateTime`,
     double: `${XSD}double`,
     integer: `${XSD}integer`,
     string: `${XSD}string`

package/lib/N3DataFactory.js

@@ -412,7 +412,7 @@ function literal(value, languageOrDataType) {
     return new Literal(`"${value}"@${languageOrDataType.language.toLowerCase()}${languageOrDataType.direction ? `--${languageOrDataType.direction.toLowerCase()}` : ''}`);
   }
 
-  // Automatically determine datatype for booleans and numbers
+  // Automatically determine datatype for booleans, numbers, and dates
   let datatype = languageOrDataType ? languageOrDataType.value : '';
   if (datatype === '') {
     // Convert a boolean
@@ -424,6 +424,11 @@ function literal(value, languageOrDataType) {
         if (!Number.isNaN(value)) value = value > 0 ? 'INF' : '-INF';
       }
     }
+    // Convert a valid date
+    else if (value instanceof Date && !Number.isNaN(value.getTime())) {
+      datatype = xsd.dateTime;
+      value = value.toISOString();
+    }
   }
 
   // Create a datatyped literal

package/lib/N3Parser.js

@@ -223,6 +223,19 @@ class N3Parser {
     return value;
   }
 
+  // ### `_readList` starts reading a list in the subject, predicate, or object position
+  _readList(token, subject, predicate, object) {
+    const stack = this._contextStack,
+      parent = stack.length && stack[stack.length - 1];
+    if (parent.type === '<<') {
+      return this._error('Unexpected list in reified triple', token);
+    }
+    // Start a new list
+    this._saveContext('list', this._graph, subject, predicate, object);
+    this._subject = null;
+    return this._readListItem;
+  }
+
   // ### `_readSubject` reads a quad's subject
   _readSubject(token) {
     this._predicate = null;
@@ -234,15 +247,7 @@ class N3Parser {
         this._saveContext('blank', this._graph, this._subject = this._factory.blankNode(), null, null);
         return this._readBlankNodeHead;
       case '(':
-        const stack = this._contextStack,
-          parent = stack.length && stack[stack.length - 1];
-        if (parent.type === '<<') {
-          return this._error('Unexpected list in reified triple', token);
-        }
-        // Start a new list
-        this._saveContext('list', this._graph, this.RDF_NIL, null, null);
-        this._subject = null;
-        return this._readListItem;
+        return this._readList(token, this.RDF_NIL, null, null);
       case '{':
         // Start a new formula
         if (!this._n3Mode) return this._error('Unexpected graph', token);
@@ -322,6 +327,9 @@ class N3Parser {
           return this._completePredicateLiteral;
         } else this._predicate = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
         break;
+      case '(':
+        // In N3, a list can be a predicate
+        return this._n3Mode ? this._readList(token, this._subject, this.RDF_NIL, null) : this._error(`Expected entity but got ${type}`, token);
       case '[':
         if (this._n3Mode) {
           // Start a new quad with a new blank node as subject
@@ -359,15 +367,7 @@ class N3Parser {
         this._saveContext('blank', this._graph, this._subject, this._predicate, this._subject = this._factory.blankNode());
         return this._readBlankNodeHead;
       case '(':
-        const stack = this._contextStack,
-          parent = stack.length && stack[stack.length - 1];
-        if (parent.type === '<<') {
-          return this._error('Unexpected list in reified triple', token);
-        }
-        // Start a new list
-        this._saveContext('list', this._graph, this._subject, this._predicate, this.RDF_NIL);
-        this._subject = null;
-        return this._readListItem;
+        return this._readList(token, this._subject, this._predicate, this.RDF_NIL);
       case '{':
         // Start a new formula
         if (!this._n3Mode) return this._error('Unexpected graph', token);
@@ -501,6 +501,13 @@ class N3Parser {
           // No list tail if this was an empty list
           if (this._subject === this.RDF_NIL) return next;
         }
+        // Was this list the parent's predicate?
+        else if (this._object === null) {
+          // The next token is the object
+          next = this._readObject;
+          // No list tail if this was an empty list
+          if (this._predicate === this.RDF_NIL) return next;
+        }
         // The list was in the parent context's object
         else {
           next = this._getContextEndReader();
@@ -567,8 +574,12 @@ class N3Parser {
 
     // Is this the first element of the list?
     if (previousList === null) {
-      // This list is either the subject or the object of its parent
-      if (parent.predicate === null) parent.subject = list;else parent.object = list;
+      // The list is the subject of the parent
+      if (parent.predicate === null) parent.subject = list;
+      // The list is the predicate of the parent
+      else if (parent.object === null) parent.predicate = list;
+      // The list is the object of the parent
+      else parent.object = list;
     } else {
       // Continue the previous list with the current list
       this._emit(previousList, this.RDF_REST, list, this._graph);

package/package.json

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

package/src/IRIs.js

@@ -6,6 +6,7 @@ export default {
   xsd: {
     decimal: `${XSD}decimal`,
     boolean: `${XSD}boolean`,
+    dateTime: `${XSD}dateTime`,
     double:  `${XSD}double`,
     integer: `${XSD}integer`,
     string:  `${XSD}string`,

package/src/N3DataFactory.js

@@ -424,7 +424,7 @@ function literal(value, languageOrDataType) {
     return new Literal(`"${value}"@${languageOrDataType.language.toLowerCase()}${languageOrDataType.direction ? `--${languageOrDataType.direction.toLowerCase()}` : ''}`);
   }
 
-  // Automatically determine datatype for booleans and numbers
+  // Automatically determine datatype for booleans, numbers, and dates
   let datatype = languageOrDataType ? languageOrDataType.value : '';
   if (datatype === '') {
     // Convert a boolean
@@ -440,6 +440,11 @@ function literal(value, languageOrDataType) {
           value = value > 0 ? 'INF' : '-INF';
       }
     }
+    // Convert a valid date
+    else if (value instanceof Date && !Number.isNaN(value.getTime())) {
+      datatype = xsd.dateTime;
+      value = value.toISOString();
+    }
   }
 
   // Create a datatyped literal

package/src/N3Parser.js

@@ -213,6 +213,18 @@ export default class N3Parser {
     return value;
   }
 
+  // ### `_readList` starts reading a list in the subject, predicate, or object position
+  _readList(token, subject, predicate, object) {
+    const stack = this._contextStack, parent = stack.length && stack[stack.length - 1];
+    if (parent.type === '<<') {
+      return this._error('Unexpected list in reified triple', token);
+    }
+    // Start a new list
+    this._saveContext('list', this._graph, subject, predicate, object);
+    this._subject = null;
+    return this._readListItem;
+  }
+
   // ### `_readSubject` reads a quad's subject
   _readSubject(token) {
     this._predicate = null;
@@ -226,14 +238,7 @@ export default class N3Parser {
                         this._subject = this._factory.blankNode(), null, null);
       return this._readBlankNodeHead;
     case '(':
-      const stack = this._contextStack, parent = stack.length && stack[stack.length - 1];
-      if (parent.type === '<<') {
-        return this._error('Unexpected list in reified triple', token);
-      }
-      // Start a new list
-      this._saveContext('list', this._graph, this.RDF_NIL, null, null);
-      this._subject = null;
-      return this._readListItem;
+      return this._readList(token, this.RDF_NIL, null, null);
     case '{':
       // Start a new formula
       if (!this._n3Mode)
@@ -330,6 +335,11 @@ export default class N3Parser {
         this._predicate = this._factory.literal(token.value, this._factory.namedNode(token.prefix));
 
       break;
+    case '(':
+      // In N3, a list can be a predicate
+      return this._n3Mode ?
+        this._readList(token, this._subject, this.RDF_NIL, null) :
+        this._error(`Expected entity but got ${type}`, token);
     case '[':
       if (this._n3Mode) {
         // Start a new quad with a new blank node as subject
@@ -372,14 +382,7 @@ export default class N3Parser {
                         this._subject = this._factory.blankNode());
       return this._readBlankNodeHead;
     case '(':
-      const stack = this._contextStack, parent = stack.length && stack[stack.length - 1];
-      if (parent.type === '<<') {
-        return this._error('Unexpected list in reified triple', token);
-      }
-      // Start a new list
-      this._saveContext('list', this._graph, this._subject, this._predicate, this.RDF_NIL);
-      this._subject = null;
-      return this._readListItem;
+      return this._readList(token, this._subject, this._predicate, this.RDF_NIL);
     case '{':
       // Start a new formula
       if (!this._n3Mode)
@@ -523,6 +526,14 @@ export default class N3Parser {
         if (this._subject === this.RDF_NIL)
           return next;
       }
+      // Was this list the parent's predicate?
+      else if (this._object === null) {
+        // The next token is the object
+        next = this._readObject;
+        // No list tail if this was an empty list
+        if (this._predicate === this.RDF_NIL)
+          return next;
+      }
       // The list was in the parent context's object
       else {
         next = this._getContextEndReader();
@@ -600,9 +611,13 @@ export default class N3Parser {
 
     // Is this the first element of the list?
     if (previousList === null) {
-      // This list is either the subject or the object of its parent
+      // The list is the subject of the parent
       if (parent.predicate === null)
         parent.subject = list;
+      // The list is the predicate of the parent
+      else if (parent.object === null)
+        parent.predicate = list;
+      // The list is the object of the parent
       else
         parent.object = list;
     }