rdflib 2.3.0-3d052249 → 2.3.0

package/esm/n3parser.js

@@ -183,19 +183,9 @@ 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);
 }
@@ -684,16 +674,6 @@ 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");
       }
@@ -1142,17 +1122,7 @@ export class SinkParser {
       return -1;
     }
     var i = j;
-    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;
-      }
+    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1178,15 +1148,12 @@ export class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (c === '.') {
-          if (dotTerminatesName(str, i)) {
-            break; // dot ends the name here
-          }
-        } else if (_notNameChars.indexOf(c) >= 0) {
+        if (_notNameChars.indexOf(c) < 0) {
+          var ln = ln + c;
+          var i = i + 1;
+        } else {
           break;
         }
-        var ln = ln + c;
-        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1197,15 +1164,12 @@ export class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (c === '.') {
-          if (dotTerminatesName(str, i)) {
-            break; // dot ends the name here
-          }
-        } else if (_notNameChars.indexOf(c) >= 0) {
+        if (_notNameChars.indexOf(c) < 0) {
+          var ln = ln + c;
+          var i = i + 1;
+        } else {
           break;
         }
-        var ln = ln + c;
-        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

package/esm/serializer.js

@@ -21,7 +21,6 @@ export default function createSerializer(store) {
 export class Serializer {
   constructor(store) {
     _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]*$/));

package/lib/n3parser.js

@@ -191,19 +191,9 @@ 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);
 }
@@ -692,16 +682,6 @@ 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");
       }
@@ -1150,17 +1130,7 @@ class SinkParser {
       return -1;
     }
     var i = j;
-    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;
-      }
+    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1186,15 +1156,12 @@ class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (c === '.') {
-          if (dotTerminatesName(str, i)) {
-            break; // dot ends the name here
-          }
-        } else if (_notNameChars.indexOf(c) >= 0) {
+        if (_notNameChars.indexOf(c) < 0) {
+          var ln = ln + c;
+          var i = i + 1;
+        } else {
           break;
         }
-        var ln = ln + c;
-        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1205,15 +1172,12 @@ class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (c === '.') {
-          if (dotTerminatesName(str, i)) {
-            break; // dot ends the name here
-          }
-        } else if (_notNameChars.indexOf(c) >= 0) {
+        if (_notNameChars.indexOf(c) < 0) {
+          var ln = ln + c;
+          var i = i + 1;
+        } else {
           break;
         }
-        var ln = ln + c;
-        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

package/lib/serializer.js

@@ -31,7 +31,6 @@ function createSerializer(store) {
 class Serializer {
   constructor(store) {
     (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]*$/));

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-3d052249",
+  "version": "2.3.0",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/n3parser.js

@@ -212,20 +212,10 @@ 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);
 }
@@ -564,7 +554,7 @@ export class SinkParser {
         <- prop -<
         _operator_*/
 
-    var j = this.skipSpace(str, i);
+        var j = this.skipSpace(str, i);
         if ((j < 0)) {
             return j;
         }
@@ -713,17 +703,22 @@ export class SinkParser {
                 if ((j >= 0)) {
                     var subj = objs[0];
                     if ((pyjslib_len(objs) > 1)) {
+
                         var __obj = new pyjslib_Iterator(objs);
                         try {
                             while (true) {
                                 var obj = __obj.next();
+
+
                                 this.makeStatement(new pyjslib_Tuple([this._context, this._store.sym(DAML_sameAs_URI), subj, obj]));
+
                             }
                         } catch (e) {
                             if (e != StopIteration) {
                                 throw e;
                             }
                         }
+
                     }
                     var j = this.skipSpace(str, j);
                     if ((j < 0)) {
@@ -748,16 +743,6 @@ 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");
             }
@@ -1223,17 +1208,7 @@ export class SinkParser {
             return -1;
         }
         var i = j;
-        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;
-            }
+        while ((i < pyjslib_len(str)) && (_notNameChars.indexOf(str.charAt(i)) < 0)) {
             var i =  ( i + 1 ) ;
         }
         res.push(str.slice( j, i));
@@ -1260,15 +1235,13 @@ export class SinkParser {
             var i =  ( i + 1 ) ;
             while ((i < pyjslib_len(str))) {
                 var c = str.charAt(i);
-                if (c === '.') {
-                    if (dotTerminatesName(str, i)) {
-                        break; // dot ends the name here
-                    }
-                } else if (_notNameChars.indexOf(c) >= 0) {
+                if ((_notNameChars.indexOf(c) < 0)) {
+                    var ln =  ( ln + c ) ;
+                    var i =  ( i + 1 ) ;
+                }
+                else {
                     break;
                 }
-                var ln =  ( ln + c ) ;
-                var i =  ( i + 1 ) ;
             }
         }
         else {
@@ -1280,15 +1253,13 @@ export class SinkParser {
             var ln = "";
             while ((i < pyjslib_len(str))) {
                 var c = str.charAt(i);
-                if (c === '.') {
-                    if (dotTerminatesName(str, i)) {
-                        break; // dot ends the name here
-                    }
-                } else if (_notNameChars.indexOf(c) >= 0) {
+                if ((_notNameChars.indexOf(c) < 0)) {
+                    var ln =  ( ln + c ) ;
+                    var i =  ( i + 1 ) ;
+                }
+                else {
                     break;
                 }
-                var ln =  ( ln + c ) ;
-                var i =  ( i + 1 ) ;
             }
             res.push(new pyjslib_Tuple([pfx, ln]));
             return i;

package/src/serializer.js

@@ -251,7 +251,7 @@ export class Serializer {
     return this.statementsToN3(f.statements)
   }
 
-  _notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~' // issue#228
+  _notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~'
   _notNameChars =
     (this._notQNameChars + ':')