eyeling 1.14.12 → 1.14.13

package/eyeling.js

@@ -8447,6 +8447,72 @@ class Parser {
     }
   }
 
+  peekAt(offset) {
+    return this.toks[this.pos + offset];
+  }
+
+  isIdentKeyword(tok, keyword) {
+    return tok && tok.typ === 'Ident' && typeof tok.value === 'string' && tok.value.toLowerCase() === keyword;
+  }
+
+  canStartSparqlPrefixDirective() {
+    const prefixNameTok = this.peekAt(1);
+    const iriTok = this.peekAt(2);
+    return (
+      this.isIdentKeyword(this.peek(), 'prefix') &&
+      prefixNameTok &&
+      prefixNameTok.typ === 'Ident' &&
+      typeof prefixNameTok.value === 'string' &&
+      prefixNameTok.value.endsWith(':') &&
+      iriTok &&
+      (iriTok.typ === 'IriRef' || iriTok.typ === 'Ident')
+    );
+  }
+
+  canStartSparqlBaseDirective(allowIdentIri = false) {
+    const iriTok = this.peekAt(1);
+    return (
+      this.isIdentKeyword(this.peek(), 'base') &&
+      iriTok &&
+      (iriTok.typ === 'IriRef' || (allowIdentIri && iriTok.typ === 'Ident'))
+    );
+  }
+
+  parseDirectiveIfPresent({ allowIdentBaseIri = false } = {}) {
+    if (this.peek().typ === 'AtPrefix') {
+      this.next();
+      this.parsePrefixDirective();
+      return true;
+    }
+    if (this.peek().typ === 'AtBase') {
+      this.next();
+      this.parseBaseDirective();
+      return true;
+    }
+    if (this.canStartSparqlPrefixDirective()) {
+      this.next();
+      this.parseSparqlPrefixDirective();
+      return true;
+    }
+    if (this.canStartSparqlBaseDirective(allowIdentBaseIri)) {
+      this.next();
+      this.parseSparqlBaseDirective();
+      return true;
+    }
+    return false;
+  }
+
+  flushPendingTriples(out, { includeBefore = true, includeAfter = true } = {}) {
+    if (includeBefore && this.pendingTriples.length > 0) {
+      out.push(...this.pendingTriples);
+      this.pendingTriples = [];
+    }
+    if (includeAfter && this.pendingTriplesAfter.length > 0) {
+      out.push(...this.pendingTriplesAfter);
+      this.pendingTriplesAfter = [];
+    }
+  }
+
   parseDocument() {
     const triples = [];
     const forwardRules = [];
@@ -8454,86 +8520,50 @@ class Parser {
     const logQueries = [];
 
     while (this.peek().typ !== 'EOF') {
-      if (this.peek().typ === 'AtPrefix') {
+      if (this.parseDirectiveIfPresent({ allowIdentBaseIri: true })) {
+        continue;
+      }
+
+      const first = this.parseTerm();
+      if (this.peek().typ === 'OpImplies') {
         this.next();
-        this.parsePrefixDirective();
-      } else if (this.peek().typ === 'AtBase') {
+        const second = this.parseTerm();
+        this.expectDot();
+        forwardRules.push(this.makeRule(first, second, true));
+      } else if (this.peek().typ === 'OpImpliedBy') {
         this.next();
-        this.parseBaseDirective();
-      } else if (
-        // SPARQL-style/Turtle-style directives (case-insensitive, no trailing '.')
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'prefix' &&
-        this.toks[this.pos + 1] &&
-        this.toks[this.pos + 1].typ === 'Ident' &&
-        typeof this.toks[this.pos + 1].value === 'string' &&
-        // Require PNAME_NS form (e.g., "ex:" or ":") to avoid clashing with a normal triple starting with IRI "prefix".
-        this.toks[this.pos + 1].value.endsWith(':') &&
-        this.toks[this.pos + 2] &&
-        (this.toks[this.pos + 2].typ === 'IriRef' || this.toks[this.pos + 2].typ === 'Ident')
-      ) {
-        this.next(); // consume PREFIX keyword
-        this.parseSparqlPrefixDirective();
-      } else if (
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'base' &&
-        this.toks[this.pos + 1] &&
-        // SPARQL BASE requires an IRIREF.
-        this.toks[this.pos + 1].typ === 'IriRef'
-      ) {
-        this.next(); // consume BASE keyword
-        this.parseSparqlBaseDirective();
+        const second = this.parseTerm();
+        this.expectDot();
+        backwardRules.push(this.makeRule(first, second, false));
       } else {
-        const first = this.parseTerm();
-        if (this.peek().typ === 'OpImplies') {
-          this.next();
-          const second = this.parseTerm();
-          this.expectDot();
-          forwardRules.push(this.makeRule(first, second, true));
-        } else if (this.peek().typ === 'OpImpliedBy') {
-          this.next();
-          const second = this.parseTerm();
-          this.expectDot();
-          backwardRules.push(this.makeRule(first, second, false));
+        let more;
+
+        if (this.peek().typ === 'Dot') {
+          // N3 grammar allows: triples ::= subject predicateObjectList?
+          // So a bare subject followed by '.' is syntactically valid.
+          // If the subject was a path / property-list that generated helper triples,
+          // we emit those; otherwise this statement contributes no triples.
+          more = [];
+          this.flushPendingTriples(more);
+          this.next(); // consume '.'
         } else {
-          let more;
-
-          if (this.peek().typ === 'Dot') {
-            // N3 grammar allows: triples ::= subject predicateObjectList?
-            // So a bare subject followed by '.' is syntactically valid.
-            // If the subject was a path / property-list that generated helper triples,
-            // we emit those; otherwise this statement contributes no triples.
-            more = [];
-            if (this.pendingTriples.length > 0) {
-              more.push(...this.pendingTriples);
-              this.pendingTriples = [];
-            }
-            if (this.pendingTriplesAfter.length > 0) {
-              more.push(...this.pendingTriplesAfter);
-              this.pendingTriplesAfter = [];
-            }
-            this.next(); // consume '.'
-          } else {
-            more = this.parsePredicateObjectList(first);
-            this.expectDot();
-          }
+          more = this.parsePredicateObjectList(first);
+          this.expectDot();
+        }
 
-          // normalize explicit log:implies / log:impliedBy at top-level
-          for (const tr of more) {
-            if (isLogImplies(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
-              forwardRules.push(this.makeRule(tr.s, tr.o, true));
-            } else if (isLogImpliedBy(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
-              backwardRules.push(this.makeRule(tr.s, tr.o, false));
-            } else if (isLogQuery(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
-              // Output-selection directive: { premise } log:query { conclusion }.
-              // When present at top-level, eyeling prints only the instantiated conclusion
-              // triples (unique) instead of all newly derived facts.
-              logQueries.push(this.makeRule(tr.s, tr.o, true));
-            } else {
-              triples.push(tr);
-            }
+        // normalize explicit log:implies / log:impliedBy at top-level
+        for (const tr of more) {
+          if (isLogImplies(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
+            forwardRules.push(this.makeRule(tr.s, tr.o, true));
+          } else if (isLogImpliedBy(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
+            backwardRules.push(this.makeRule(tr.s, tr.o, false));
+          } else if (isLogQuery(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
+            // Output-selection directive: { premise } log:query { conclusion }.
+            // When present at top-level, eyeling prints only the instantiated conclusion
+            // triples (unique) instead of all newly derived facts.
+            logQueries.push(this.makeRule(tr.s, tr.o, true));
+          } else {
+            triples.push(tr);
           }
         }
       }
@@ -8765,64 +8795,7 @@ class Parser {
         return iriTerm;
       }
 
-      const subj = iriTerm;
-      const localTriples = [];
-      while (true) {
-        let pred;
-        let invert = false;
-        if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
-          this.next();
-          pred = internIri(RDF_NS + 'type');
-        } else if (this.peek().typ === 'OpPredInvert') {
-          this.next(); // "<-"
-          pred = this.parseTerm();
-          invert = true;
-        } else {
-          pred = this.parseTerm();
-        }
-
-        // If a pathological predicate term produced post-triples, don't let them leak.
-        if (this.pendingTriplesAfter.length > 0) {
-          localTriples.push(...this.pendingTriplesAfter);
-          this.pendingTriplesAfter = [];
-        }
-
-        // Object list: o1, o2, ...  (capture post-triples per object)
-        const objs = [];
-        const readObj = () => {
-          const o = this.parseTerm();
-          const post = this.pendingTriplesAfter;
-          this.pendingTriplesAfter = [];
-          objs.push({ term: o, postTriples: post });
-        };
-        readObj();
-        while (this.peek().typ === 'Comma') {
-          this.next();
-          readObj();
-        }
-
-        for (const { term: o, postTriples } of objs) {
-          // Path helper triples must come before the triple that consumes the path result.
-          if (this.pendingTriples.length > 0) {
-            localTriples.push(...this.pendingTriples);
-            this.pendingTriples = [];
-          }
-          localTriples.push(invert ? new Triple(o, pred, subj) : new Triple(subj, pred, o));
-          if (postTriples && postTriples.length) localTriples.push(...postTriples);
-        }
-
-        if (this.peek().typ === 'Semicolon') {
-          this.next();
-          if (this.peek().typ === 'RBracket') break;
-          continue;
-        }
-        break;
-      }
-
-      if (this.peek().typ !== 'RBracket') {
-        this.fail(`Expected ']' at end of IRI property list, got ${this.peek().toString()}`);
-      }
-      this.next();
+      const localTriples = this.parsePropertyListTriples(iriTerm, 'RBracket', 'IRI property list');
 
       // Defer the embedded description until after the triple that references the IRI.
       if (localTriples.length) this.pendingTriplesAfter.push(...localTriples);
@@ -8833,38 +8806,48 @@ class Parser {
     this.blankCounter += 1;
     const id = `_:b${this.blankCounter}`;
     const subj = new Blank(id);
+    const localTriples = this.parsePropertyListTriples(subj, 'RBracket', 'blank node property list');
 
+    // Defer the blank-node description until after the triple that references it.
+    if (localTriples.length) this.pendingTriplesAfter.push(...localTriples);
+    return new Blank(id);
+  }
+
+  parsePropertyVerb() {
+    let pred;
+    let invert = false;
+
+    if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
+      this.next();
+      pred = internIri(RDF_NS + 'type');
+    } else if (this.peek().typ === 'OpPredInvert') {
+      this.next();
+      pred = this.parseTerm();
+      invert = true;
+    } else {
+      pred = this.parseTerm();
+    }
+
+    return { pred, invert };
+  }
+
+  parsePropertyListTriples(subject, closingTyp, contextLabel) {
     const localTriples = [];
 
     while (true) {
-      // Verb (can also be 'a')
-      let pred;
-      let invert = false;
-      if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
-        this.next();
-        pred = internIri(RDF_NS + 'type');
-      } else if (this.peek().typ === 'OpPredInvert') {
-        this.next(); // consume "<-"
-        pred = this.parseTerm();
-        invert = true;
-      } else {
-        pred = this.parseTerm();
-      }
+      const { pred, invert } = this.parsePropertyVerb();
 
       // If a pathological predicate term produced post-triples, don't let them leak.
-      if (this.pendingTriplesAfter.length > 0) {
-        localTriples.push(...this.pendingTriplesAfter);
-        this.pendingTriplesAfter = [];
-      }
+      this.flushPendingTriples(localTriples, { includeBefore: false, includeAfter: true });
 
-      // Object list: o1, o2, ...  (capture post-triples per object)
       const objs = [];
       const readObj = () => {
-        const o = this.parseTerm();
-        const post = this.pendingTriplesAfter;
+        const term = this.parseTerm();
+        const postTriples = this.pendingTriplesAfter;
         this.pendingTriplesAfter = [];
-        objs.push({ term: o, postTriples: post });
+        objs.push({ term, postTriples });
       };
+
       readObj();
       while (this.peek().typ === 'Comma') {
         this.next();
@@ -8873,31 +8856,25 @@ class Parser {
 
       for (const { term: o, postTriples } of objs) {
         // Path helper triples must come before the triple that consumes the path result.
-        if (this.pendingTriples.length > 0) {
-          localTriples.push(...this.pendingTriples);
-          this.pendingTriples = [];
-        }
-        localTriples.push(invert ? new Triple(o, pred, subj) : new Triple(subj, pred, o));
+        this.flushPendingTriples(localTriples, { includeBefore: true, includeAfter: false });
+        localTriples.push(invert ? new Triple(o, pred, subject) : new Triple(subject, pred, o));
         if (postTriples && postTriples.length) localTriples.push(...postTriples);
       }
 
       if (this.peek().typ === 'Semicolon') {
         this.next();
-        if (this.peek().typ === 'RBracket') break;
+        if (this.peek().typ === closingTyp) break;
         continue;
       }
       break;
     }
 
-    if (this.peek().typ === 'RBracket') {
-      this.next();
-    } else {
-      this.fail(`Expected ']' at end of blank node property list, got ${this.peek().toString()}`);
+    if (this.peek().typ !== closingTyp) {
+      this.fail(`Expected ']' at end of ${contextLabel}, got ${this.peek().toString()}`);
     }
+    this.next();
 
-    // Defer the blank-node description until after the triple that references it.
-    if (localTriples.length) this.pendingTriplesAfter.push(...localTriples);
-    return new Blank(id);
+    return localTriples;
   }
 
   parseGraph() {
@@ -8906,40 +8883,7 @@ class Parser {
       // N3 allows @prefix/@base and SPARQL-style PREFIX/BASE directives anywhere
       // outside of a triple. This includes inside quoted graph terms.
       // These directives affect parsing (prefix/base resolution) but do not emit triples.
-      if (this.peek().typ === 'AtPrefix') {
-        this.next();
-        this.parsePrefixDirective();
-        continue;
-      }
-      if (this.peek().typ === 'AtBase') {
-        this.next();
-        this.parseBaseDirective();
-        continue;
-      }
-      if (
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'prefix' &&
-        this.toks[this.pos + 1] &&
-        this.toks[this.pos + 1].typ === 'Ident' &&
-        typeof this.toks[this.pos + 1].value === 'string' &&
-        this.toks[this.pos + 1].value.endsWith(':') &&
-        this.toks[this.pos + 2] &&
-        (this.toks[this.pos + 2].typ === 'IriRef' || this.toks[this.pos + 2].typ === 'Ident')
-      ) {
-        this.next();
-        this.parseSparqlPrefixDirective();
-        continue;
-      }
-      if (
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'base' &&
-        this.toks[this.pos + 1] &&
-        (this.toks[this.pos + 1].typ === 'IriRef' || this.toks[this.pos + 1].typ === 'Ident')
-      ) {
-        this.next();
-        this.parseSparqlBaseDirective();
+      if (this.parseDirectiveIfPresent()) {
         continue;
       }
 
@@ -8970,14 +8914,7 @@ class Parser {
         // N3 grammar allows: triples ::= subject predicateObjectList?
         // So a bare subject (optionally producing helper triples) is allowed inside formulas as well.
         if (this.peek().typ === 'Dot' || this.peek().typ === 'RBrace') {
-          if (this.pendingTriples.length > 0) {
-            triples.push(...this.pendingTriples);
-            this.pendingTriples = [];
-          }
-          if (this.pendingTriplesAfter.length > 0) {
-            triples.push(...this.pendingTriplesAfter);
-            this.pendingTriplesAfter = [];
-          }
+          this.flushPendingTriples(triples);
           if (this.peek().typ === 'Dot') this.next();
           continue;
         }
@@ -8995,61 +8932,50 @@ class Parser {
     return new GraphTerm(triples);
   }
 
+  parseStatementVerb() {
+    let verb;
+    let invert = false;
+
+    if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
+      this.next();
+      verb = internIri(RDF_NS + 'type');
+    } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'has') {
+      // N3 syntactic sugar: "S has P O." means "S P O."
+      this.next();
+      verb = this.parseTerm();
+    } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'is') {
+      // N3 syntactic sugar: "S is P of O." means "O P S." (inverse; equivalent to "<-")
+      this.next();
+      verb = this.parseTerm();
+      if (!(this.peek().typ === 'Ident' && (this.peek().value || '') === 'of')) {
+        this.fail(`Expected 'of' after 'is <expr>', got ${this.peek().toString()}`);
+      }
+      this.next();
+      invert = true;
+    } else if (this.peek().typ === 'OpPredInvert') {
+      this.next();
+      verb = this.parseTerm();
+      invert = true;
+    } else {
+      verb = this.parseTerm();
+    }
+
+    return { verb, invert };
+  }
+
   parsePredicateObjectList(subject) {
     const out = [];
 
     // If the SUBJECT was a path or property-list, emit its helper triples first.
-    if (this.pendingTriples.length > 0) {
-      out.push(...this.pendingTriples);
-      this.pendingTriples = [];
-    }
-    if (this.pendingTriplesAfter.length > 0) {
-      out.push(...this.pendingTriplesAfter);
-      this.pendingTriplesAfter = [];
-    }
+    this.flushPendingTriples(out);
 
     while (true) {
-      let verb;
-      let invert = false;
-
-      if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
-        this.next();
-        verb = internIri(RDF_NS + 'type');
-      } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'has') {
-        // N3 syntactic sugar: "S has P O." means "S P O."
-        this.next(); // consume "has"
-        verb = this.parseTerm();
-      } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'is') {
-        // N3 syntactic sugar: "S is P of O." means "O P S." (inverse; equivalent to "<-")
-        this.next(); // consume "is"
-        verb = this.parseTerm();
-        if (!(this.peek().typ === 'Ident' && (this.peek().value || '') === 'of')) {
-          this.fail(`Expected 'of' after 'is <expr>', got ${this.peek().toString()}`);
-        }
-        this.next(); // consume "of"
-        invert = true;
-      } else if (this.peek().typ === 'OpPredInvert') {
-        this.next(); // "<-"
-        verb = this.parseTerm();
-        invert = true;
-      } else {
-        verb = this.parseTerm();
-      }
-
+      const { verb, invert } = this.parseStatementVerb();
       const objects = this.parseObjectList();
 
       // If VERB or OBJECTS contained paths, their helper triples must come
       // before the triples that consume the path results (Easter depends on this).
-      if (this.pendingTriples.length > 0) {
-        out.push(...this.pendingTriples);
-        this.pendingTriples = [];
-      }
-
-      // If VERB produced a property list (rare), don't let it leak.
-      if (this.pendingTriplesAfter.length > 0) {
-        out.push(...this.pendingTriplesAfter);
-        this.pendingTriplesAfter = [];
-      }
+      this.flushPendingTriples(out);
 
       for (const { term: o, postTriples } of objects) {
         out.push(new Triple(invert ? o : subject, verb, invert ? subject : o));

package/lib/parser.js

@@ -76,6 +76,72 @@ class Parser {
     }
   }
 
+  peekAt(offset) {
+    return this.toks[this.pos + offset];
+  }
+
+  isIdentKeyword(tok, keyword) {
+    return tok && tok.typ === 'Ident' && typeof tok.value === 'string' && tok.value.toLowerCase() === keyword;
+  }
+
+  canStartSparqlPrefixDirective() {
+    const prefixNameTok = this.peekAt(1);
+    const iriTok = this.peekAt(2);
+    return (
+      this.isIdentKeyword(this.peek(), 'prefix') &&
+      prefixNameTok &&
+      prefixNameTok.typ === 'Ident' &&
+      typeof prefixNameTok.value === 'string' &&
+      prefixNameTok.value.endsWith(':') &&
+      iriTok &&
+      (iriTok.typ === 'IriRef' || iriTok.typ === 'Ident')
+    );
+  }
+
+  canStartSparqlBaseDirective(allowIdentIri = false) {
+    const iriTok = this.peekAt(1);
+    return (
+      this.isIdentKeyword(this.peek(), 'base') &&
+      iriTok &&
+      (iriTok.typ === 'IriRef' || (allowIdentIri && iriTok.typ === 'Ident'))
+    );
+  }
+
+  parseDirectiveIfPresent({ allowIdentBaseIri = false } = {}) {
+    if (this.peek().typ === 'AtPrefix') {
+      this.next();
+      this.parsePrefixDirective();
+      return true;
+    }
+    if (this.peek().typ === 'AtBase') {
+      this.next();
+      this.parseBaseDirective();
+      return true;
+    }
+    if (this.canStartSparqlPrefixDirective()) {
+      this.next();
+      this.parseSparqlPrefixDirective();
+      return true;
+    }
+    if (this.canStartSparqlBaseDirective(allowIdentBaseIri)) {
+      this.next();
+      this.parseSparqlBaseDirective();
+      return true;
+    }
+    return false;
+  }
+
+  flushPendingTriples(out, { includeBefore = true, includeAfter = true } = {}) {
+    if (includeBefore && this.pendingTriples.length > 0) {
+      out.push(...this.pendingTriples);
+      this.pendingTriples = [];
+    }
+    if (includeAfter && this.pendingTriplesAfter.length > 0) {
+      out.push(...this.pendingTriplesAfter);
+      this.pendingTriplesAfter = [];
+    }
+  }
+
   parseDocument() {
     const triples = [];
     const forwardRules = [];
@@ -83,86 +149,50 @@ class Parser {
     const logQueries = [];
 
     while (this.peek().typ !== 'EOF') {
-      if (this.peek().typ === 'AtPrefix') {
+      if (this.parseDirectiveIfPresent({ allowIdentBaseIri: true })) {
+        continue;
+      }
+
+      const first = this.parseTerm();
+      if (this.peek().typ === 'OpImplies') {
         this.next();
-        this.parsePrefixDirective();
-      } else if (this.peek().typ === 'AtBase') {
+        const second = this.parseTerm();
+        this.expectDot();
+        forwardRules.push(this.makeRule(first, second, true));
+      } else if (this.peek().typ === 'OpImpliedBy') {
         this.next();
-        this.parseBaseDirective();
-      } else if (
-        // SPARQL-style/Turtle-style directives (case-insensitive, no trailing '.')
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'prefix' &&
-        this.toks[this.pos + 1] &&
-        this.toks[this.pos + 1].typ === 'Ident' &&
-        typeof this.toks[this.pos + 1].value === 'string' &&
-        // Require PNAME_NS form (e.g., "ex:" or ":") to avoid clashing with a normal triple starting with IRI "prefix".
-        this.toks[this.pos + 1].value.endsWith(':') &&
-        this.toks[this.pos + 2] &&
-        (this.toks[this.pos + 2].typ === 'IriRef' || this.toks[this.pos + 2].typ === 'Ident')
-      ) {
-        this.next(); // consume PREFIX keyword
-        this.parseSparqlPrefixDirective();
-      } else if (
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'base' &&
-        this.toks[this.pos + 1] &&
-        // SPARQL BASE requires an IRIREF.
-        this.toks[this.pos + 1].typ === 'IriRef'
-      ) {
-        this.next(); // consume BASE keyword
-        this.parseSparqlBaseDirective();
+        const second = this.parseTerm();
+        this.expectDot();
+        backwardRules.push(this.makeRule(first, second, false));
       } else {
-        const first = this.parseTerm();
-        if (this.peek().typ === 'OpImplies') {
-          this.next();
-          const second = this.parseTerm();
-          this.expectDot();
-          forwardRules.push(this.makeRule(first, second, true));
-        } else if (this.peek().typ === 'OpImpliedBy') {
-          this.next();
-          const second = this.parseTerm();
-          this.expectDot();
-          backwardRules.push(this.makeRule(first, second, false));
+        let more;
+
+        if (this.peek().typ === 'Dot') {
+          // N3 grammar allows: triples ::= subject predicateObjectList?
+          // So a bare subject followed by '.' is syntactically valid.
+          // If the subject was a path / property-list that generated helper triples,
+          // we emit those; otherwise this statement contributes no triples.
+          more = [];
+          this.flushPendingTriples(more);
+          this.next(); // consume '.'
         } else {
-          let more;
-
-          if (this.peek().typ === 'Dot') {
-            // N3 grammar allows: triples ::= subject predicateObjectList?
-            // So a bare subject followed by '.' is syntactically valid.
-            // If the subject was a path / property-list that generated helper triples,
-            // we emit those; otherwise this statement contributes no triples.
-            more = [];
-            if (this.pendingTriples.length > 0) {
-              more.push(...this.pendingTriples);
-              this.pendingTriples = [];
-            }
-            if (this.pendingTriplesAfter.length > 0) {
-              more.push(...this.pendingTriplesAfter);
-              this.pendingTriplesAfter = [];
-            }
-            this.next(); // consume '.'
-          } else {
-            more = this.parsePredicateObjectList(first);
-            this.expectDot();
-          }
+          more = this.parsePredicateObjectList(first);
+          this.expectDot();
+        }
 
-          // normalize explicit log:implies / log:impliedBy at top-level
-          for (const tr of more) {
-            if (isLogImplies(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
-              forwardRules.push(this.makeRule(tr.s, tr.o, true));
-            } else if (isLogImpliedBy(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
-              backwardRules.push(this.makeRule(tr.s, tr.o, false));
-            } else if (isLogQuery(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
-              // Output-selection directive: { premise } log:query { conclusion }.
-              // When present at top-level, eyeling prints only the instantiated conclusion
-              // triples (unique) instead of all newly derived facts.
-              logQueries.push(this.makeRule(tr.s, tr.o, true));
-            } else {
-              triples.push(tr);
-            }
+        // normalize explicit log:implies / log:impliedBy at top-level
+        for (const tr of more) {
+          if (isLogImplies(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
+            forwardRules.push(this.makeRule(tr.s, tr.o, true));
+          } else if (isLogImpliedBy(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
+            backwardRules.push(this.makeRule(tr.s, tr.o, false));
+          } else if (isLogQuery(tr.p) && tr.s instanceof GraphTerm && tr.o instanceof GraphTerm) {
+            // Output-selection directive: { premise } log:query { conclusion }.
+            // When present at top-level, eyeling prints only the instantiated conclusion
+            // triples (unique) instead of all newly derived facts.
+            logQueries.push(this.makeRule(tr.s, tr.o, true));
+          } else {
+            triples.push(tr);
           }
         }
       }
@@ -394,64 +424,7 @@ class Parser {
         return iriTerm;
       }
 
-      const subj = iriTerm;
-      const localTriples = [];
-      while (true) {
-        let pred;
-        let invert = false;
-        if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
-          this.next();
-          pred = internIri(RDF_NS + 'type');
-        } else if (this.peek().typ === 'OpPredInvert') {
-          this.next(); // "<-"
-          pred = this.parseTerm();
-          invert = true;
-        } else {
-          pred = this.parseTerm();
-        }
-
-        // If a pathological predicate term produced post-triples, don't let them leak.
-        if (this.pendingTriplesAfter.length > 0) {
-          localTriples.push(...this.pendingTriplesAfter);
-          this.pendingTriplesAfter = [];
-        }
-
-        // Object list: o1, o2, ...  (capture post-triples per object)
-        const objs = [];
-        const readObj = () => {
-          const o = this.parseTerm();
-          const post = this.pendingTriplesAfter;
-          this.pendingTriplesAfter = [];
-          objs.push({ term: o, postTriples: post });
-        };
-        readObj();
-        while (this.peek().typ === 'Comma') {
-          this.next();
-          readObj();
-        }
-
-        for (const { term: o, postTriples } of objs) {
-          // Path helper triples must come before the triple that consumes the path result.
-          if (this.pendingTriples.length > 0) {
-            localTriples.push(...this.pendingTriples);
-            this.pendingTriples = [];
-          }
-          localTriples.push(invert ? new Triple(o, pred, subj) : new Triple(subj, pred, o));
-          if (postTriples && postTriples.length) localTriples.push(...postTriples);
-        }
-
-        if (this.peek().typ === 'Semicolon') {
-          this.next();
-          if (this.peek().typ === 'RBracket') break;
-          continue;
-        }
-        break;
-      }
-
-      if (this.peek().typ !== 'RBracket') {
-        this.fail(`Expected ']' at end of IRI property list, got ${this.peek().toString()}`);
-      }
-      this.next();
+      const localTriples = this.parsePropertyListTriples(iriTerm, 'RBracket', 'IRI property list');
 
       // Defer the embedded description until after the triple that references the IRI.
       if (localTriples.length) this.pendingTriplesAfter.push(...localTriples);
@@ -462,38 +435,48 @@ class Parser {
     this.blankCounter += 1;
     const id = `_:b${this.blankCounter}`;
     const subj = new Blank(id);
+    const localTriples = this.parsePropertyListTriples(subj, 'RBracket', 'blank node property list');
+
+    // Defer the blank-node description until after the triple that references it.
+    if (localTriples.length) this.pendingTriplesAfter.push(...localTriples);
+    return new Blank(id);
+  }
+
+  parsePropertyVerb() {
+    let pred;
+    let invert = false;
 
+    if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
+      this.next();
+      pred = internIri(RDF_NS + 'type');
+    } else if (this.peek().typ === 'OpPredInvert') {
+      this.next();
+      pred = this.parseTerm();
+      invert = true;
+    } else {
+      pred = this.parseTerm();
+    }
+
+    return { pred, invert };
+  }
+
+  parsePropertyListTriples(subject, closingTyp, contextLabel) {
     const localTriples = [];
 
     while (true) {
-      // Verb (can also be 'a')
-      let pred;
-      let invert = false;
-      if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
-        this.next();
-        pred = internIri(RDF_NS + 'type');
-      } else if (this.peek().typ === 'OpPredInvert') {
-        this.next(); // consume "<-"
-        pred = this.parseTerm();
-        invert = true;
-      } else {
-        pred = this.parseTerm();
-      }
+      const { pred, invert } = this.parsePropertyVerb();
 
       // If a pathological predicate term produced post-triples, don't let them leak.
-      if (this.pendingTriplesAfter.length > 0) {
-        localTriples.push(...this.pendingTriplesAfter);
-        this.pendingTriplesAfter = [];
-      }
+      this.flushPendingTriples(localTriples, { includeBefore: false, includeAfter: true });
 
-      // Object list: o1, o2, ...  (capture post-triples per object)
       const objs = [];
       const readObj = () => {
-        const o = this.parseTerm();
-        const post = this.pendingTriplesAfter;
+        const term = this.parseTerm();
+        const postTriples = this.pendingTriplesAfter;
         this.pendingTriplesAfter = [];
-        objs.push({ term: o, postTriples: post });
+        objs.push({ term, postTriples });
       };
+
       readObj();
       while (this.peek().typ === 'Comma') {
         this.next();
@@ -502,31 +485,25 @@ class Parser {
 
       for (const { term: o, postTriples } of objs) {
         // Path helper triples must come before the triple that consumes the path result.
-        if (this.pendingTriples.length > 0) {
-          localTriples.push(...this.pendingTriples);
-          this.pendingTriples = [];
-        }
-        localTriples.push(invert ? new Triple(o, pred, subj) : new Triple(subj, pred, o));
+        this.flushPendingTriples(localTriples, { includeBefore: true, includeAfter: false });
+        localTriples.push(invert ? new Triple(o, pred, subject) : new Triple(subject, pred, o));
         if (postTriples && postTriples.length) localTriples.push(...postTriples);
       }
 
       if (this.peek().typ === 'Semicolon') {
         this.next();
-        if (this.peek().typ === 'RBracket') break;
+        if (this.peek().typ === closingTyp) break;
         continue;
       }
       break;
     }
 
-    if (this.peek().typ === 'RBracket') {
-      this.next();
-    } else {
-      this.fail(`Expected ']' at end of blank node property list, got ${this.peek().toString()}`);
+    if (this.peek().typ !== closingTyp) {
+      this.fail(`Expected ']' at end of ${contextLabel}, got ${this.peek().toString()}`);
     }
+    this.next();
 
-    // Defer the blank-node description until after the triple that references it.
-    if (localTriples.length) this.pendingTriplesAfter.push(...localTriples);
-    return new Blank(id);
+    return localTriples;
   }
 
   parseGraph() {
@@ -535,40 +512,7 @@ class Parser {
       // N3 allows @prefix/@base and SPARQL-style PREFIX/BASE directives anywhere
       // outside of a triple. This includes inside quoted graph terms.
       // These directives affect parsing (prefix/base resolution) but do not emit triples.
-      if (this.peek().typ === 'AtPrefix') {
-        this.next();
-        this.parsePrefixDirective();
-        continue;
-      }
-      if (this.peek().typ === 'AtBase') {
-        this.next();
-        this.parseBaseDirective();
-        continue;
-      }
-      if (
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'prefix' &&
-        this.toks[this.pos + 1] &&
-        this.toks[this.pos + 1].typ === 'Ident' &&
-        typeof this.toks[this.pos + 1].value === 'string' &&
-        this.toks[this.pos + 1].value.endsWith(':') &&
-        this.toks[this.pos + 2] &&
-        (this.toks[this.pos + 2].typ === 'IriRef' || this.toks[this.pos + 2].typ === 'Ident')
-      ) {
-        this.next();
-        this.parseSparqlPrefixDirective();
-        continue;
-      }
-      if (
-        this.peek().typ === 'Ident' &&
-        typeof this.peek().value === 'string' &&
-        this.peek().value.toLowerCase() === 'base' &&
-        this.toks[this.pos + 1] &&
-        (this.toks[this.pos + 1].typ === 'IriRef' || this.toks[this.pos + 1].typ === 'Ident')
-      ) {
-        this.next();
-        this.parseSparqlBaseDirective();
+      if (this.parseDirectiveIfPresent()) {
         continue;
       }
 
@@ -599,14 +543,7 @@ class Parser {
         // N3 grammar allows: triples ::= subject predicateObjectList?
         // So a bare subject (optionally producing helper triples) is allowed inside formulas as well.
         if (this.peek().typ === 'Dot' || this.peek().typ === 'RBrace') {
-          if (this.pendingTriples.length > 0) {
-            triples.push(...this.pendingTriples);
-            this.pendingTriples = [];
-          }
-          if (this.pendingTriplesAfter.length > 0) {
-            triples.push(...this.pendingTriplesAfter);
-            this.pendingTriplesAfter = [];
-          }
+          this.flushPendingTriples(triples);
           if (this.peek().typ === 'Dot') this.next();
           continue;
         }
@@ -624,61 +561,50 @@ class Parser {
     return new GraphTerm(triples);
   }
 
+  parseStatementVerb() {
+    let verb;
+    let invert = false;
+
+    if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
+      this.next();
+      verb = internIri(RDF_NS + 'type');
+    } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'has') {
+      // N3 syntactic sugar: "S has P O." means "S P O."
+      this.next();
+      verb = this.parseTerm();
+    } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'is') {
+      // N3 syntactic sugar: "S is P of O." means "O P S." (inverse; equivalent to "<-")
+      this.next();
+      verb = this.parseTerm();
+      if (!(this.peek().typ === 'Ident' && (this.peek().value || '') === 'of')) {
+        this.fail(`Expected 'of' after 'is <expr>', got ${this.peek().toString()}`);
+      }
+      this.next();
+      invert = true;
+    } else if (this.peek().typ === 'OpPredInvert') {
+      this.next();
+      verb = this.parseTerm();
+      invert = true;
+    } else {
+      verb = this.parseTerm();
+    }
+
+    return { verb, invert };
+  }
+
   parsePredicateObjectList(subject) {
     const out = [];
 
     // If the SUBJECT was a path or property-list, emit its helper triples first.
-    if (this.pendingTriples.length > 0) {
-      out.push(...this.pendingTriples);
-      this.pendingTriples = [];
-    }
-    if (this.pendingTriplesAfter.length > 0) {
-      out.push(...this.pendingTriplesAfter);
-      this.pendingTriplesAfter = [];
-    }
+    this.flushPendingTriples(out);
 
     while (true) {
-      let verb;
-      let invert = false;
-
-      if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'a') {
-        this.next();
-        verb = internIri(RDF_NS + 'type');
-      } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'has') {
-        // N3 syntactic sugar: "S has P O." means "S P O."
-        this.next(); // consume "has"
-        verb = this.parseTerm();
-      } else if (this.peek().typ === 'Ident' && (this.peek().value || '') === 'is') {
-        // N3 syntactic sugar: "S is P of O." means "O P S." (inverse; equivalent to "<-")
-        this.next(); // consume "is"
-        verb = this.parseTerm();
-        if (!(this.peek().typ === 'Ident' && (this.peek().value || '') === 'of')) {
-          this.fail(`Expected 'of' after 'is <expr>', got ${this.peek().toString()}`);
-        }
-        this.next(); // consume "of"
-        invert = true;
-      } else if (this.peek().typ === 'OpPredInvert') {
-        this.next(); // "<-"
-        verb = this.parseTerm();
-        invert = true;
-      } else {
-        verb = this.parseTerm();
-      }
-
+      const { verb, invert } = this.parseStatementVerb();
       const objects = this.parseObjectList();
 
       // If VERB or OBJECTS contained paths, their helper triples must come
       // before the triples that consume the path results (Easter depends on this).
-      if (this.pendingTriples.length > 0) {
-        out.push(...this.pendingTriples);
-        this.pendingTriples = [];
-      }
-
-      // If VERB produced a property list (rare), don't let it leak.
-      if (this.pendingTriplesAfter.length > 0) {
-        out.push(...this.pendingTriplesAfter);
-        this.pendingTriplesAfter = [];
-      }
+      this.flushPendingTriples(out);
 
       for (const { term: o, postTriples } of objects) {
         out.push(new Triple(invert ? o : subject, verb, invert ? subject : o));

package/package.json

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