rdflib 2.3.0-08f819ce → 2.3.0-ab7e9999

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);
 }
@@ -685,14 +675,9 @@ export class SinkParser {
         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.
+        // If a dot is found after a blank node, treat it as statement terminator
         res.push(subj);
-        return j; // leave '.' for checkDot()
+        return j;
       }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
@@ -1144,8 +1129,10 @@ export class SinkParser {
     var i = j;
     while (i < pyjslib_len(str)) {
       var c = str.charAt(i);
+      // Allow dot in names unless it is followed by whitespace/comment/EOF
       if (c === '.') {
-        if (dotTerminatesName(str, i)) {
+        var next = str.charAt(i + 1);
+        if (next === '' || /[\s#]/.test(next)) {
           break; // treat as statement terminator, not part of name
         }
         // else: accept '.' as part of name
@@ -1178,8 +1165,10 @@ export class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
+        // Allow dot unless followed by whitespace/comment/EOF; otherwise break on invalid chars
         if (c === '.') {
-          if (dotTerminatesName(str, i)) {
+          var next = str.charAt(i + 1);
+          if (next === '' || /[\s#]/.test(next)) {
             break; // dot ends the name here
           }
         } else if (_notNameChars.indexOf(c) >= 0) {
@@ -1197,8 +1186,10 @@ export class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
+        // Allow dot unless followed by whitespace/comment/EOF; otherwise break on invalid chars
         if (c === '.') {
-          if (dotTerminatesName(str, i)) {
+          var next = str.charAt(i + 1);
+          if (next === '' || /[\s#]/.test(next)) {
             break; // dot ends the name here
           }
         } else if (_notNameChars.indexOf(c) >= 0) {

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);
 }
@@ -693,14 +683,9 @@ class SinkParser {
         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.
+        // If a dot is found after a blank node, treat it as statement terminator
         res.push(subj);
-        return j; // leave '.' for checkDot()
+        return j;
       }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
@@ -1152,8 +1137,10 @@ class SinkParser {
     var i = j;
     while (i < pyjslib_len(str)) {
       var c = str.charAt(i);
+      // Allow dot in names unless it is followed by whitespace/comment/EOF
       if (c === '.') {
-        if (dotTerminatesName(str, i)) {
+        var next = str.charAt(i + 1);
+        if (next === '' || /[\s#]/.test(next)) {
           break; // treat as statement terminator, not part of name
         }
         // else: accept '.' as part of name
@@ -1186,8 +1173,10 @@ class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
+        // Allow dot unless followed by whitespace/comment/EOF; otherwise break on invalid chars
         if (c === '.') {
-          if (dotTerminatesName(str, i)) {
+          var next = str.charAt(i + 1);
+          if (next === '' || /[\s#]/.test(next)) {
             break; // dot ends the name here
           }
         } else if (_notNameChars.indexOf(c) >= 0) {
@@ -1205,8 +1194,10 @@ class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
+        // Allow dot unless followed by whitespace/comment/EOF; otherwise break on invalid chars
         if (c === '.') {
-          if (dotTerminatesName(str, i)) {
+          var next = str.charAt(i + 1);
+          if (next === '' || /[\s#]/.test(next)) {
             break; // dot ends the name here
           }
         } else if (_notNameChars.indexOf(c) >= 0) {

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-08f819ce",
+  "version": "2.3.0-ab7e9999",
   "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);
 }
@@ -749,14 +739,9 @@ export class SinkParser {
                 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.
+                // If a dot is found after a blank node, treat it as statement terminator
                 res.push(subj);
-                return j; // leave '.' for checkDot()
+                return j;
             }
             if ((str.slice( j,  ( j + 1 ) ) != "]")) {
                 throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
@@ -1225,8 +1210,10 @@ export class SinkParser {
         var i = j;
         while ((i < pyjslib_len(str))) {
             var c = str.charAt(i);
+            // Allow dot in names unless it is followed by whitespace/comment/EOF
             if (c === '.') {
-                if (dotTerminatesName(str, i)) {
+                var next = str.charAt(i + 1);
+                if (next === '' || /[\s#]/.test(next)) {
                     break; // treat as statement terminator, not part of name
                 }
                 // else: accept '.' as part of name
@@ -1260,8 +1247,10 @@ export class SinkParser {
             var i =  ( i + 1 ) ;
             while ((i < pyjslib_len(str))) {
                 var c = str.charAt(i);
+                // Allow dot unless followed by whitespace/comment/EOF; otherwise break on invalid chars
                 if (c === '.') {
-                    if (dotTerminatesName(str, i)) {
+                    var next = str.charAt(i + 1);
+                    if (next === '' || /[\s#]/.test(next)) {
                         break; // dot ends the name here
                     }
                 } else if (_notNameChars.indexOf(c) >= 0) {
@@ -1280,8 +1269,10 @@ export class SinkParser {
             var ln = "";
             while ((i < pyjslib_len(str))) {
                 var c = str.charAt(i);
+                // Allow dot unless followed by whitespace/comment/EOF; otherwise break on invalid chars
                 if (c === '.') {
-                    if (dotTerminatesName(str, i)) {
+                    var next = str.charAt(i + 1);
+                    if (next === '' || /[\s#]/.test(next)) {
                         break; // dot ends the name here
                     }
                 } else if (_notNameChars.indexOf(c) >= 0) {