eyeling 1.26.0 → 1.26.2

package/lib/multisource.js

@@ -32,20 +32,20 @@ function emptyParsedDocument() {
 }
 
 function lineStartsForText(text) {
-  const s = String(text);
   const starts = [0];
-  for (let i = 0; i < s.length; i++) {
-    const c = s.charCodeAt(i);
-    if (c === 10) starts.push(i + 1); // LF
-    else if (c === 13) { // CR or CRLF
-      if (i + 1 < s.length && s.charCodeAt(i + 1) === 10) i++;
-      starts.push(i + 1);
+  const str = String(text);
+  for (let i = 0; i < str.length; i++) {
+    const c = str[i];
+    if (c === '\n') starts.push(i + 1);
+    else if (c === '\r') {
+      starts.push(i + 1 < str.length && str[i + 1] === '\n' ? i + 2 : i + 1);
+      if (i + 1 < str.length && str[i + 1] === '\n') i++;
     }
   }
   return starts;
 }
 
-function offsetToLineFromStarts(offset, lineStarts) {
+function offsetToLine(lineStarts, offset) {
   if (typeof offset !== 'number') return null;
   let lo = 0;
   let hi = lineStarts.length;
@@ -57,9 +57,9 @@ function offsetToLineFromStarts(offset, lineStarts) {
   return lo + 1;
 }
 
-function annotateSourceLocation(obj, label, lineStarts) {
+function annotateSourceLocation(obj, lineStarts, label) {
   if (!obj || typeof obj.__sourceOffset !== 'number') return obj;
-  const line = offsetToLineFromStarts(obj.__sourceOffset, lineStarts);
+  const line = offsetToLine(lineStarts, obj.__sourceOffset);
   Object.defineProperty(obj, '__source', {
     value: { label, line },
     enumerable: false,
@@ -71,10 +71,10 @@ function annotateSourceLocation(obj, label, lineStarts) {
 
 function annotateParsedSourceLocations(doc, text, label) {
   const lineStarts = lineStartsForText(text);
-  for (const tr of doc.triples || []) annotateSourceLocation(tr, label, lineStarts);
-  for (const r of doc.frules || []) annotateSourceLocation(r, label, lineStarts);
-  for (const r of doc.brules || []) annotateSourceLocation(r, label, lineStarts);
-  for (const r of doc.logQueryRules || []) annotateSourceLocation(r, label, lineStarts);
+  for (const tr of doc.triples || []) annotateSourceLocation(tr, lineStarts, label);
+  for (const r of doc.frules || []) annotateSourceLocation(r, lineStarts, label);
+  for (const r of doc.brules || []) annotateSourceLocation(r, lineStarts, label);
+  for (const r of doc.logQueryRules || []) annotateSourceLocation(r, lineStarts, label);
 }
 
 function copySourceMetadata(from, to) {
@@ -169,7 +169,7 @@ function parseN3Text(text, opts = {}) {
     label = '<input>',
     keepSourceArtifacts = true,
     collectUsedPrefixes = false,
-    collectSourceLocations = true,
+    sourceLocations = false,
     rdf = false,
   } = opts || {};
   const tokens = lex(text, { rdf });
@@ -178,7 +178,7 @@ function parseN3Text(text, opts = {}) {
   const [prefixes, triples, frules, brules, logQueryRules] = parser.parseDocument();
 
   const doc = { prefixes, triples, frules, brules, logQueryRules, label };
-  if (collectSourceLocations) annotateParsedSourceLocations(doc, text, label);
+  if (sourceLocations) annotateParsedSourceLocations(doc, text, label);
 
   if (collectUsedPrefixes) {
     Object.defineProperty(doc, 'usedPrefixes', {
@@ -369,8 +369,8 @@ function parseN3SourceList(input, opts = {}) {
       label: source.label,
       baseIri: source.baseIri || (sources.length === 1 ? defaultBaseIri : ''),
       collectUsedPrefixes: true,
-      collectSourceLocations: !!opts.collectSourceLocations,
       keepSourceArtifacts: !!opts.keepSourceArtifacts,
+      sourceLocations: !!opts.sourceLocations,
       rdf: !!opts.rdf,
     }),
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.26.0",
+  "version": "1.26.2",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [