eyeling 1.30.4 → 1.30.6

package/README.md

@@ -593,16 +593,17 @@ RDF 1.2 triple terms require explicit RDF compatibility mode. This protects ordi
 
 ### RDF Surfaces
 
-RDF Surfaces are enabled with `--rdf-surfaces` on the CLI or `{ rdfSurfaces: true }` in the API. The option implies RDF compatibility mode. The syntax follows the BLOGIC text convention from Pat Hayes' ISWC 2009 slides: `%not[` and `%]` surface parentheses plus explicit blank-node binding graffiti at the beginning of a surface. Because this is Turtle plus the surface extension, the examples use `.ttl` for RDF Surface input files.
+RDF Surfaces are enabled with `--rdf-surfaces` on the CLI or `{ rdfSurfaces: true }` in the API. The option implies RDF compatibility mode. The syntax follows the BLOGIC text convention from Pat Hayes' ISWC 2009 slides: `%not[` and `%]` surface parentheses plus explicit blank-node binding graffiti at the beginning of a surface. Because RDF Surfaces may now combine the surface extension with RDF 1.2 TriG features, the examples use `.trig` for RDF Surface input files and start with `VERSION "1.2-surfaces"`.
 
 The examples keep RDF Surface input separate from Eyeling queries:
 
-- `examples/input/<name>.ttl` contains ordinary RDF triples and RDF Surface rules.
+- `examples/input/<name>.trig` contains RDF 1.2 TriG input, RDF Surface rules, and the `VERSION "1.2-surfaces"` header.
 - `examples/<name>.n3` contains only the corresponding `log:query`.
 
 Use separate non-indented lines for triples and surface closes. Put only newly bound blank marks on the surface-opening line; marks already bound by an outer surface are reused in inner triples and are not repeated after `%not[`.
 
-```turtle
+```trig
+VERSION "1.2-surfaces"
 @prefix ex: <http://example.org/> .
 
 ex:Brussels a ex:City .
@@ -625,7 +626,7 @@ The slide-32 shape above is normalized as:
 
 The first slide-33 abbreviation, range, is written as:
 
-```turtle
+```trig
 %not[ _:x _:y
 _:x ex:parent _:y .
 %not[
@@ -644,7 +645,7 @@ and behaves like:
 
 Eyeling also recognizes codex-style surfaces that introduce rules from RDF/OWL vocabulary facts. For example, this `rdfs:range` codex:
 
-```turtle
+```trig
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 %not[ _:p _:c
@@ -673,7 +674,7 @@ is normalized to the Horn rule shape:
 
 The slide-33 `owl:allValuesFrom` codex is supported in both directions:
 
-```turtle
+```trig
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 
 %not[ _:a _:b _:c
@@ -706,7 +707,7 @@ The forward part derives filler types. The reverse part is compiled into a data-
 
 A top-level negative surface without a nested negative child is treated as an inference fuse:
 
-```turtle
+```trig
 %not[ _:x
 _:x a ex:Impossible .
 %]
@@ -723,24 +724,27 @@ The implementation is intentionally conservative: it supports the practical Horn
 Run the included examples:
 
 ```bash
-eyeling --rdf-surfaces examples/input/rdf-surfaces-city.ttl examples/rdf-surfaces-city.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-range.ttl examples/rdf-surfaces-range.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-domain.ttl examples/rdf-surfaces-domain.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-property-chain.ttl examples/rdf-surfaces-property-chain.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-ancestor.ttl examples/rdf-surfaces-ancestor.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-multi-premise.ttl examples/rdf-surfaces-multi-premise.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-all-values-from.ttl examples/rdf-surfaces-all-values-from.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-all-values-from-reverse.ttl examples/rdf-surfaces-all-values-from-reverse.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-rdfs-range-codex.ttl examples/rdf-surfaces-rdfs-range-codex.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-rdfs-subclass-codex.ttl examples/rdf-surfaces-rdfs-subclass-codex.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-owl-all-values-from-codex.ttl examples/rdf-surfaces-owl-all-values-from-codex.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-strong-negation-access.ttl examples/rdf-surfaces-strong-negation-access.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-disjunction-route-filter.ttl examples/rdf-surfaces-disjunction-route-filter.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-explicit-disjunction.ttl examples/rdf-surfaces-explicit-disjunction.n3
-eyeling --rdf-surfaces examples/input/rdf-surfaces-disjunction-elimination.ttl examples/rdf-surfaces-disjunction-elimination.n3
-```
-
-The additional examples show ordinary Horn-style RDF Surface patterns beyond the exact slide-33 abbreviations: subject typing (`rdf-surfaces-domain`), a two-hop property chain (`rdf-surfaces-property-chain`), recursive transitive closure (`rdf-surfaces-ancestor`), a conjunctive classification rule (`rdf-surfaces-multi-premise`), and codex-style RDFS/OWL rule generation (`rdf-surfaces-rdfs-range-codex`, `rdf-surfaces-rdfs-subclass-codex`, `rdf-surfaces-owl-all-values-from-codex`). More challenging examples keep the engine unchanged and add N3 helper rules on top: `rdf-surfaces-strong-negation-access` uses a top-level negative surface as a strong-negation fuse for an access policy, `rdf-surfaces-disjunction-route-filter` represents a disjunction as explicit candidate routes and filters one with a strong-negation policy, `rdf-surfaces-explicit-disjunction` puts the disjunction directly in the RDF Surface file with one outer negative surface and two inner alternatives, and `rdf-surfaces-disjunction-elimination` uses `log:forAllIn` to derive a conclusion only when every option in a disjunction implies it.
+eyeling --rdf-surfaces examples/input/rdf-surfaces-city.trig examples/rdf-surfaces-city.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-range.trig examples/rdf-surfaces-range.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-domain.trig examples/rdf-surfaces-domain.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-property-chain.trig examples/rdf-surfaces-property-chain.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-ancestor.trig examples/rdf-surfaces-ancestor.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-multi-premise.trig examples/rdf-surfaces-multi-premise.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-all-values-from.trig examples/rdf-surfaces-all-values-from.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-all-values-from-reverse.trig examples/rdf-surfaces-all-values-from-reverse.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-rdfs-range-codex.trig examples/rdf-surfaces-rdfs-range-codex.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-rdfs-subclass-codex.trig examples/rdf-surfaces-rdfs-subclass-codex.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-rdf12-named-graph.trig examples/rdf-surfaces-rdf12-named-graph.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-rdf12-triple-term.trig examples/rdf-surfaces-rdf12-triple-term.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-rdf12-graph-triple-term.trig examples/rdf-surfaces-rdf12-graph-triple-term.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-owl-all-values-from-codex.trig examples/rdf-surfaces-owl-all-values-from-codex.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-strong-negation-access.trig examples/rdf-surfaces-strong-negation-access.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-disjunction-route-filter.trig examples/rdf-surfaces-disjunction-route-filter.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-explicit-disjunction.trig examples/rdf-surfaces-explicit-disjunction.n3
+eyeling --rdf-surfaces examples/input/rdf-surfaces-disjunction-elimination.trig examples/rdf-surfaces-disjunction-elimination.n3
+```
+
+The additional examples show ordinary Horn-style RDF Surface patterns beyond the exact slide-33 abbreviations: subject typing (`rdf-surfaces-domain`), a two-hop property chain (`rdf-surfaces-property-chain`), recursive transitive closure (`rdf-surfaces-ancestor`), a conjunctive classification rule (`rdf-surfaces-multi-premise`), codex-style RDFS/OWL rule generation (`rdf-surfaces-rdfs-range-codex`, `rdf-surfaces-rdfs-subclass-codex`, `rdf-surfaces-owl-all-values-from-codex`), and RDF 1.2 inputs with named graphs and triple terms (`rdf-surfaces-rdf12-named-graph`, `rdf-surfaces-rdf12-triple-term`, `rdf-surfaces-rdf12-graph-triple-term`). More challenging examples keep the engine unchanged and add N3 helper rules on top: `rdf-surfaces-strong-negation-access` uses a top-level negative surface as a strong-negation fuse for an access policy, `rdf-surfaces-disjunction-route-filter` represents a disjunction as explicit candidate routes and filters one with a strong-negation policy, `rdf-surfaces-explicit-disjunction` puts the disjunction directly in the RDF Surface file with one outer negative surface and two inner alternatives, and `rdf-surfaces-disjunction-elimination` uses `log:forAllIn` to derive a conclusion only when every option in a disjunction implies it.
 
 ---
 

package/dist/browser/eyeling.browser.js

@@ -12852,7 +12852,7 @@ function normalizeRdfCompatibility(inputText) {
   // unless they actually contain RDF 1.2 triple terms, VERSION directives, or a
   // plausible top-level TriG named graph block.
   const hasTripleTerms = text.includes('<<');
-  const hasVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)\1\s*\.?\s*(?:#.*)?$/im.test(text);
+  const hasVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic|1\.2-surfaces)\1\s*\.?\s*(?:#.*)?$/im.test(text);
   const hasMessageVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)-messages\1\s*\.?\s*(?:#.*)?$/im.test(text);
   const hasNamedGraphCandidate = /(?:^|[.\r\n])\s*(?:GRAPH\s+)?(?:<[^>\r\n]*>|_:[A-Za-z][A-Za-z0-9_-]*|[A-Za-z][A-Za-z0-9_-]*:[^\s{};,.()[\]]*|:[^\s{};,.()[\]]+)\s*\{/m.test(text);
   const hasAnnotationSyntax = /(?:^|\s)~|\{\|/.test(text);
@@ -13321,7 +13321,7 @@ function normalizeRdfCompatibility(inputText) {
   }
 
   function stripVersionDirectives(s) {
-    return s.replace(/^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)(?:-messages)?\1\s*\.?\s*(?:#.*)?$/gim, '');
+    return s.replace(/^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic|1\.2-surfaces|(?:1\.1|1\.2|1\.2-basic)-messages)\1\s*\.?\s*(?:#.*)?$/gim, '');
   }
 
   function skipWsAndComments(s, at) {
@@ -16988,6 +16988,24 @@ function extractLeadingBinders(raw) {
   const contentStart = skipWsAndComments(text, 0);
   if (contentStart >= text.length) return { binders: [], text };
 
+  // Preferred BLOGIC graffiti style: put newly bound marks on the `%not[`
+  // line and put triples on following non-indented lines, e.g.
+  // `%not[ _:x _:y\n_:x :p _:y .`.  Reading that first line directly
+  // avoids guessing from the first triple shape, which matters for RDF 1.2
+  // formula objects and TriG named graph blocks.
+  let lineEnd = text.indexOf('\n', contentStart);
+  if (lineEnd < 0) lineEnd = text.length;
+  let lineText = text.slice(contentStart, lineEnd);
+  let newlineEnd = lineEnd < text.length ? lineEnd + 1 : lineEnd;
+  if (lineText.endsWith('\r')) {
+    lineText = lineText.slice(0, -1);
+  }
+  const lineTrim = lineText.trim();
+  if (/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(lineTrim)) {
+    const binders = lineTrim.split(/\s+/).map((tok) => tok.slice(2));
+    return { binders, text: text.slice(0, contentStart) + text.slice(newlineEnd) };
+  }
+
   const segment = readStatementSegment(text.slice(contentStart));
   const toks = tokenizeLeadingSegment(segment);
   let leadingBlankCount = 0;
@@ -17015,6 +17033,57 @@ function extractLeadingBinders(raw) {
   return { binders, text: text.slice(0, contentStart) + text.slice(contentStart + cut) };
 }
 
+
+function readBalancedCurlyAt(s, at) {
+  if (s[at] !== '{') return null;
+  let i = at;
+  let depth = 0;
+  while (i < s.length) {
+    const ch = s[i];
+    if (ch === '"' || ch === "'") {
+      i = readStringAt(s, i).end;
+      continue;
+    }
+    if (ch === '<') {
+      i = readIriAt(s, i).end;
+      continue;
+    }
+    if (ch === '#') {
+      while (i < s.length && s[i] !== '\n' && s[i] !== '\r') i += 1;
+      continue;
+    }
+    if (ch === '{') depth += 1;
+    else if (ch === '}') {
+      depth -= 1;
+      if (depth === 0) return { text: s.slice(at, i + 1), end: i + 1 };
+    }
+    i += 1;
+  }
+  throw syntaxError('Unterminated named graph block inside RDF Surface', at);
+}
+
+function normalizeSurfaceStatement(statement) {
+  const raw = String(statement || '').trim();
+  if (!raw) return raw;
+
+  let i = 0;
+  const first = readBareTokenAt(raw, i);
+  if (first && /^GRAPH$/i.test(first.text)) {
+    i = first.end;
+  }
+
+  const term = readBareTokenAt(raw, i);
+  if (!term) return raw;
+  const afterTerm = skipWsAndComments(raw, term.end);
+  if (raw[afterTerm] !== '{') return raw;
+
+  const block = readBalancedCurlyAt(raw, afterTerm);
+  const afterBlock = skipWsAndComments(raw, block.end);
+  if (afterBlock !== raw.length) return raw;
+
+  return `${term.text} ${LOG_NAME_OF_IRI} ${block.text}`;
+}
+
 function splitTopLevelStatements(raw, surfaceOffset = null) {
   const text = String(raw || '');
   const out = [];
@@ -17046,7 +17115,7 @@ function splitTopLevelStatements(raw, surfaceOffset = null) {
     else if (ch === ')' && depthParen > 0) depthParen -= 1;
     else if (ch === '.' && depthBrace === 0 && depthBracket === 0 && depthParen === 0) {
       const stmt = text.slice(start, i).trim();
-      if (stmt) out.push(stmt);
+      if (stmt) out.push(normalizeSurfaceStatement(stmt));
       start = i + 1;
     }
     i += 1;
@@ -17054,9 +17123,13 @@ function splitTopLevelStatements(raw, surfaceOffset = null) {
 
   const tail = text.slice(start).trim();
   if (tail) {
-    // A raw binder-only segment is OK; any other dangling text is most likely a
+    // A raw binder-only segment is OK; RDF 1.2 TriG named graph blocks are
+    // also OK without a trailing dot. Any other dangling text is most likely a
     // missing dot in the surface body.
-    if (!/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(tail)) {
+    const normalizedTail = normalizeSurfaceStatement(tail);
+    if (normalizedTail !== tail) {
+      out.push(normalizedTail);
+    } else if (!/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(tail)) {
       throw syntaxError('RDF Surface statement is missing a terminating dot', surfaceOffset);
     }
   }
@@ -17126,6 +17199,7 @@ function readSurfaceAt(s, at) {
 }
 
 const LOG_FOR_ALL_IN_IRI = '<http://www.w3.org/2000/10/swap/log#forAllIn>';
+const LOG_NAME_OF_IRI = '<http://www.w3.org/2000/10/swap/log#nameOf>';
 
 function rewriteBlankMarksWithMap(statement, labelToVarName) {
   const map = labelToVarName instanceof Map ? labelToVarName : new Map();

package/examples/input/{rdf-surfaces-all-values-from-reverse.ttl → rdf-surfaces-all-values-from-reverse.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-all-values-from.ttl → rdf-surfaces-all-values-from.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-ancestor.ttl → rdf-surfaces-ancestor.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-city.ttl → rdf-surfaces-city.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-disjunction-elimination.ttl → rdf-surfaces-disjunction-elimination.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-disjunction-route-filter.ttl → rdf-surfaces-disjunction-route-filter.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-domain.ttl → rdf-surfaces-domain.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-explicit-disjunction.ttl → rdf-surfaces-explicit-disjunction.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-multi-premise.ttl → rdf-surfaces-multi-premise.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-owl-all-values-from-codex.ttl → rdf-surfaces-owl-all-values-from-codex.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .

package/examples/input/{rdf-surfaces-property-chain.ttl → rdf-surfaces-property-chain.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/{rdf-surfaces-range.ttl → rdf-surfaces-range.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/input/rdf-surfaces-rdf12-graph-triple-term.trig

@@ -0,0 +1,15 @@
+VERSION "1.2-surfaces"
+# eyeling-options: --rdf-surfaces
+@prefix ex: <http://example.org/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+ex:auditGraph {
+ex:obs1 rdf:reifies <<( ex:sensor17 ex:reports ex:Overheating )>> .
+}
+
+%not[ _:obs
+ex:auditGraph { _:obs rdf:reifies <<( ex:sensor17 ex:reports ex:Overheating )>> . }
+%not[
+_:obs a ex:AuditedObservation .
+%]
+%]

package/examples/input/rdf-surfaces-rdf12-named-graph.trig

@@ -0,0 +1,14 @@
+VERSION "1.2-surfaces"
+# eyeling-options: --rdf-surfaces
+@prefix ex: <http://example.org/> .
+
+ex:regionalReport {
+ex:Brussels a ex:City .
+}
+
+%not[ _:x
+ex:regionalReport { _:x a ex:City . }
+%not[
+_:x a ex:ReportedCity .
+%]
+%]

package/examples/input/rdf-surfaces-rdf12-triple-term.trig

@@ -0,0 +1,13 @@
+VERSION "1.2-surfaces"
+# eyeling-options: --rdf-surfaces
+@prefix ex: <http://example.org/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+ex:claim1 rdf:reifies <<( ex:Brussels rdf:type ex:City )>> .
+
+%not[ _:claim
+_:claim rdf:reifies <<( ex:Brussels rdf:type ex:City )>> .
+%not[
+_:claim a ex:CityClaim .
+%]
+%]

package/examples/input/{rdf-surfaces-rdfs-range-codex.ttl → rdf-surfaces-rdfs-range-codex.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

package/examples/input/{rdf-surfaces-rdfs-subclass-codex.ttl → rdf-surfaces-rdfs-subclass-codex.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

package/examples/input/{rdf-surfaces-strong-negation-access.ttl → rdf-surfaces-strong-negation-access.trig}

@@ -1,3 +1,4 @@
+VERSION "1.2-surfaces"
 # eyeling-options: --rdf-surfaces
 @prefix ex: <http://example.org/> .
 

package/examples/output/rdf-surfaces-rdf12-graph-triple-term.n3

@@ -0,0 +1,3 @@
+@prefix ex: <http://example.org/> .
+
+ex:obs1 a ex:AuditedObservation .

package/examples/output/rdf-surfaces-rdf12-named-graph.n3

@@ -0,0 +1,3 @@
+@prefix ex: <http://example.org/> .
+
+ex:Brussels a ex:ReportedCity .

package/examples/output/rdf-surfaces-rdf12-triple-term.n3

@@ -0,0 +1,3 @@
+@prefix ex: <http://example.org/> .
+
+ex:claim1 a ex:CityClaim .

package/examples/rdf-surfaces-rdf12-graph-triple-term.n3

@@ -0,0 +1,6 @@
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+{ ?s a ex:AuditedObservation . }
+log:query
+{ ?s a ex:AuditedObservation . } .

package/examples/rdf-surfaces-rdf12-named-graph.n3

@@ -0,0 +1,6 @@
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+{ ?s a ex:ReportedCity . }
+log:query
+{ ?s a ex:ReportedCity . } .

package/examples/rdf-surfaces-rdf12-triple-term.n3

@@ -0,0 +1,6 @@
+@prefix ex: <http://example.org/> .
+@prefix log: <http://www.w3.org/2000/10/swap/log#> .
+
+{ ?s a ex:CityClaim . }
+log:query
+{ ?s a ex:CityClaim . } .

package/eyeling.js

@@ -12852,7 +12852,7 @@ function normalizeRdfCompatibility(inputText) {
   // unless they actually contain RDF 1.2 triple terms, VERSION directives, or a
   // plausible top-level TriG named graph block.
   const hasTripleTerms = text.includes('<<');
-  const hasVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)\1\s*\.?\s*(?:#.*)?$/im.test(text);
+  const hasVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic|1\.2-surfaces)\1\s*\.?\s*(?:#.*)?$/im.test(text);
   const hasMessageVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)-messages\1\s*\.?\s*(?:#.*)?$/im.test(text);
   const hasNamedGraphCandidate = /(?:^|[.\r\n])\s*(?:GRAPH\s+)?(?:<[^>\r\n]*>|_:[A-Za-z][A-Za-z0-9_-]*|[A-Za-z][A-Za-z0-9_-]*:[^\s{};,.()[\]]*|:[^\s{};,.()[\]]+)\s*\{/m.test(text);
   const hasAnnotationSyntax = /(?:^|\s)~|\{\|/.test(text);
@@ -13321,7 +13321,7 @@ function normalizeRdfCompatibility(inputText) {
   }
 
   function stripVersionDirectives(s) {
-    return s.replace(/^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)(?:-messages)?\1\s*\.?\s*(?:#.*)?$/gim, '');
+    return s.replace(/^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic|1\.2-surfaces|(?:1\.1|1\.2|1\.2-basic)-messages)\1\s*\.?\s*(?:#.*)?$/gim, '');
   }
 
   function skipWsAndComments(s, at) {
@@ -16988,6 +16988,24 @@ function extractLeadingBinders(raw) {
   const contentStart = skipWsAndComments(text, 0);
   if (contentStart >= text.length) return { binders: [], text };
 
+  // Preferred BLOGIC graffiti style: put newly bound marks on the `%not[`
+  // line and put triples on following non-indented lines, e.g.
+  // `%not[ _:x _:y\n_:x :p _:y .`.  Reading that first line directly
+  // avoids guessing from the first triple shape, which matters for RDF 1.2
+  // formula objects and TriG named graph blocks.
+  let lineEnd = text.indexOf('\n', contentStart);
+  if (lineEnd < 0) lineEnd = text.length;
+  let lineText = text.slice(contentStart, lineEnd);
+  let newlineEnd = lineEnd < text.length ? lineEnd + 1 : lineEnd;
+  if (lineText.endsWith('\r')) {
+    lineText = lineText.slice(0, -1);
+  }
+  const lineTrim = lineText.trim();
+  if (/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(lineTrim)) {
+    const binders = lineTrim.split(/\s+/).map((tok) => tok.slice(2));
+    return { binders, text: text.slice(0, contentStart) + text.slice(newlineEnd) };
+  }
+
   const segment = readStatementSegment(text.slice(contentStart));
   const toks = tokenizeLeadingSegment(segment);
   let leadingBlankCount = 0;
@@ -17015,6 +17033,57 @@ function extractLeadingBinders(raw) {
   return { binders, text: text.slice(0, contentStart) + text.slice(contentStart + cut) };
 }
 
+
+function readBalancedCurlyAt(s, at) {
+  if (s[at] !== '{') return null;
+  let i = at;
+  let depth = 0;
+  while (i < s.length) {
+    const ch = s[i];
+    if (ch === '"' || ch === "'") {
+      i = readStringAt(s, i).end;
+      continue;
+    }
+    if (ch === '<') {
+      i = readIriAt(s, i).end;
+      continue;
+    }
+    if (ch === '#') {
+      while (i < s.length && s[i] !== '\n' && s[i] !== '\r') i += 1;
+      continue;
+    }
+    if (ch === '{') depth += 1;
+    else if (ch === '}') {
+      depth -= 1;
+      if (depth === 0) return { text: s.slice(at, i + 1), end: i + 1 };
+    }
+    i += 1;
+  }
+  throw syntaxError('Unterminated named graph block inside RDF Surface', at);
+}
+
+function normalizeSurfaceStatement(statement) {
+  const raw = String(statement || '').trim();
+  if (!raw) return raw;
+
+  let i = 0;
+  const first = readBareTokenAt(raw, i);
+  if (first && /^GRAPH$/i.test(first.text)) {
+    i = first.end;
+  }
+
+  const term = readBareTokenAt(raw, i);
+  if (!term) return raw;
+  const afterTerm = skipWsAndComments(raw, term.end);
+  if (raw[afterTerm] !== '{') return raw;
+
+  const block = readBalancedCurlyAt(raw, afterTerm);
+  const afterBlock = skipWsAndComments(raw, block.end);
+  if (afterBlock !== raw.length) return raw;
+
+  return `${term.text} ${LOG_NAME_OF_IRI} ${block.text}`;
+}
+
 function splitTopLevelStatements(raw, surfaceOffset = null) {
   const text = String(raw || '');
   const out = [];
@@ -17046,7 +17115,7 @@ function splitTopLevelStatements(raw, surfaceOffset = null) {
     else if (ch === ')' && depthParen > 0) depthParen -= 1;
     else if (ch === '.' && depthBrace === 0 && depthBracket === 0 && depthParen === 0) {
       const stmt = text.slice(start, i).trim();
-      if (stmt) out.push(stmt);
+      if (stmt) out.push(normalizeSurfaceStatement(stmt));
       start = i + 1;
     }
     i += 1;
@@ -17054,9 +17123,13 @@ function splitTopLevelStatements(raw, surfaceOffset = null) {
 
   const tail = text.slice(start).trim();
   if (tail) {
-    // A raw binder-only segment is OK; any other dangling text is most likely a
+    // A raw binder-only segment is OK; RDF 1.2 TriG named graph blocks are
+    // also OK without a trailing dot. Any other dangling text is most likely a
     // missing dot in the surface body.
-    if (!/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(tail)) {
+    const normalizedTail = normalizeSurfaceStatement(tail);
+    if (normalizedTail !== tail) {
+      out.push(normalizedTail);
+    } else if (!/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(tail)) {
       throw syntaxError('RDF Surface statement is missing a terminating dot', surfaceOffset);
     }
   }
@@ -17126,6 +17199,7 @@ function readSurfaceAt(s, at) {
 }
 
 const LOG_FOR_ALL_IN_IRI = '<http://www.w3.org/2000/10/swap/log#forAllIn>';
+const LOG_NAME_OF_IRI = '<http://www.w3.org/2000/10/swap/log#nameOf>';
 
 function rewriteBlankMarksWithMap(statement, labelToVarName) {
   const map = labelToVarName instanceof Map ? labelToVarName : new Map();

package/lib/lexer.js

@@ -402,7 +402,7 @@ function normalizeRdfCompatibility(inputText) {
   // unless they actually contain RDF 1.2 triple terms, VERSION directives, or a
   // plausible top-level TriG named graph block.
   const hasTripleTerms = text.includes('<<');
-  const hasVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)\1\s*\.?\s*(?:#.*)?$/im.test(text);
+  const hasVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic|1\.2-surfaces)\1\s*\.?\s*(?:#.*)?$/im.test(text);
   const hasMessageVersionDirective = /^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)-messages\1\s*\.?\s*(?:#.*)?$/im.test(text);
   const hasNamedGraphCandidate = /(?:^|[.\r\n])\s*(?:GRAPH\s+)?(?:<[^>\r\n]*>|_:[A-Za-z][A-Za-z0-9_-]*|[A-Za-z][A-Za-z0-9_-]*:[^\s{};,.()[\]]*|:[^\s{};,.()[\]]+)\s*\{/m.test(text);
   const hasAnnotationSyntax = /(?:^|\s)~|\{\|/.test(text);
@@ -871,7 +871,7 @@ function normalizeRdfCompatibility(inputText) {
   }
 
   function stripVersionDirectives(s) {
-    return s.replace(/^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic)(?:-messages)?\1\s*\.?\s*(?:#.*)?$/gim, '');
+    return s.replace(/^\s*(?:@version|VERSION)\s+(["'])(?:1\.1|1\.2|1\.2-basic|1\.2-surfaces|(?:1\.1|1\.2|1\.2-basic)-messages)\1\s*\.?\s*(?:#.*)?$/gim, '');
   }
 
   function skipWsAndComments(s, at) {

package/lib/rdf_surfaces.js

@@ -158,6 +158,24 @@ function extractLeadingBinders(raw) {
   const contentStart = skipWsAndComments(text, 0);
   if (contentStart >= text.length) return { binders: [], text };
 
+  // Preferred BLOGIC graffiti style: put newly bound marks on the `%not[`
+  // line and put triples on following non-indented lines, e.g.
+  // `%not[ _:x _:y\n_:x :p _:y .`.  Reading that first line directly
+  // avoids guessing from the first triple shape, which matters for RDF 1.2
+  // formula objects and TriG named graph blocks.
+  let lineEnd = text.indexOf('\n', contentStart);
+  if (lineEnd < 0) lineEnd = text.length;
+  let lineText = text.slice(contentStart, lineEnd);
+  let newlineEnd = lineEnd < text.length ? lineEnd + 1 : lineEnd;
+  if (lineText.endsWith('\r')) {
+    lineText = lineText.slice(0, -1);
+  }
+  const lineTrim = lineText.trim();
+  if (/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(lineTrim)) {
+    const binders = lineTrim.split(/\s+/).map((tok) => tok.slice(2));
+    return { binders, text: text.slice(0, contentStart) + text.slice(newlineEnd) };
+  }
+
   const segment = readStatementSegment(text.slice(contentStart));
   const toks = tokenizeLeadingSegment(segment);
   let leadingBlankCount = 0;
@@ -185,6 +203,57 @@ function extractLeadingBinders(raw) {
   return { binders, text: text.slice(0, contentStart) + text.slice(contentStart + cut) };
 }
 
+
+function readBalancedCurlyAt(s, at) {
+  if (s[at] !== '{') return null;
+  let i = at;
+  let depth = 0;
+  while (i < s.length) {
+    const ch = s[i];
+    if (ch === '"' || ch === "'") {
+      i = readStringAt(s, i).end;
+      continue;
+    }
+    if (ch === '<') {
+      i = readIriAt(s, i).end;
+      continue;
+    }
+    if (ch === '#') {
+      while (i < s.length && s[i] !== '\n' && s[i] !== '\r') i += 1;
+      continue;
+    }
+    if (ch === '{') depth += 1;
+    else if (ch === '}') {
+      depth -= 1;
+      if (depth === 0) return { text: s.slice(at, i + 1), end: i + 1 };
+    }
+    i += 1;
+  }
+  throw syntaxError('Unterminated named graph block inside RDF Surface', at);
+}
+
+function normalizeSurfaceStatement(statement) {
+  const raw = String(statement || '').trim();
+  if (!raw) return raw;
+
+  let i = 0;
+  const first = readBareTokenAt(raw, i);
+  if (first && /^GRAPH$/i.test(first.text)) {
+    i = first.end;
+  }
+
+  const term = readBareTokenAt(raw, i);
+  if (!term) return raw;
+  const afterTerm = skipWsAndComments(raw, term.end);
+  if (raw[afterTerm] !== '{') return raw;
+
+  const block = readBalancedCurlyAt(raw, afterTerm);
+  const afterBlock = skipWsAndComments(raw, block.end);
+  if (afterBlock !== raw.length) return raw;
+
+  return `${term.text} ${LOG_NAME_OF_IRI} ${block.text}`;
+}
+
 function splitTopLevelStatements(raw, surfaceOffset = null) {
   const text = String(raw || '');
   const out = [];
@@ -216,7 +285,7 @@ function splitTopLevelStatements(raw, surfaceOffset = null) {
     else if (ch === ')' && depthParen > 0) depthParen -= 1;
     else if (ch === '.' && depthBrace === 0 && depthBracket === 0 && depthParen === 0) {
       const stmt = text.slice(start, i).trim();
-      if (stmt) out.push(stmt);
+      if (stmt) out.push(normalizeSurfaceStatement(stmt));
       start = i + 1;
     }
     i += 1;
@@ -224,9 +293,13 @@ function splitTopLevelStatements(raw, surfaceOffset = null) {
 
   const tail = text.slice(start).trim();
   if (tail) {
-    // A raw binder-only segment is OK; any other dangling text is most likely a
+    // A raw binder-only segment is OK; RDF 1.2 TriG named graph blocks are
+    // also OK without a trailing dot. Any other dangling text is most likely a
     // missing dot in the surface body.
-    if (!/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(tail)) {
+    const normalizedTail = normalizeSurfaceStatement(tail);
+    if (normalizedTail !== tail) {
+      out.push(normalizedTail);
+    } else if (!/^_:[A-Za-z_][A-Za-z0-9._-]*(?:\s+_:[A-Za-z_][A-Za-z0-9._-]*)*$/.test(tail)) {
       throw syntaxError('RDF Surface statement is missing a terminating dot', surfaceOffset);
     }
   }
@@ -296,6 +369,7 @@ function readSurfaceAt(s, at) {
 }
 
 const LOG_FOR_ALL_IN_IRI = '<http://www.w3.org/2000/10/swap/log#forAllIn>';
+const LOG_NAME_OF_IRI = '<http://www.w3.org/2000/10/swap/log#nameOf>';
 
 function rewriteBlankMarksWithMap(statement, labelToVarName) {
   const map = labelToVarName instanceof Map ? labelToVarName : new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeling",
-  "version": "1.30.4",
+  "version": "1.30.6",
   "description": "A minimal Notation3 (N3) reasoner in JavaScript.",
   "main": "./index.js",
   "keywords": [
@@ -42,7 +42,7 @@
     "lint:fix": "eslint . --fix",
     "build": "node tools/bundle.js",
     "test:packlist": "node test/packlist.test.js",
-    "test:api": "node test/api.test.js && node test/stream_messages.test.js && node test/rdf_surfaces.test.js",
+    "test:api": "node test/api.test.js",
     "test:rdf-surfaces": "node test/rdf_surfaces.test.js",
     "test:builtins": "node test/builtins.test.js",
     "test:store": "node test/store.test.js",
@@ -57,9 +57,7 @@
     "test:rdf12:trig": "node test/rdf12.test.js trig",
     "test:playground": "node test/playground.test.js",
     "test:package": "node test/package.test.js",
-    "pretest": "npm run build && npm run test:packlist",
-    "test": "npm run test:api && npm run test:builtins && npm run test:store && npm run test:examples && npm run test:examples:proof && npm run test:manifest && npm run test:rdf12 && npm run test:playground",
-    "posttest": "npm run test:package",
+    "test": "node test/run.js",
     "preversion": "npm test",
     "postversion": "git push origin HEAD --follow-tags"
   },

package/test/examples.test.js

@@ -154,7 +154,7 @@ function resolveExampleTrigInput(root, inputFile) {
 
 function resolveExampleRdfSurfaceInput(root, inputFile) {
   const stem = path.basename(inputFile, path.extname(inputFile));
-  const rel = path.join('input', `${stem}.ttl`);
+  const rel = path.join('input', `${stem}.trig`);
   const abs = path.join(root, 'examples', rel);
   if (!fs.existsSync(abs)) return null;
   const text = fs.readFileSync(abs, 'utf8');

package/test/playground.test.js

@@ -62,7 +62,7 @@ function guessContentType(p) {
   if (ext === '.js') return 'application/javascript; charset=utf-8';
   if (ext === '.css') return 'text/css; charset=utf-8';
   if (ext === '.json') return 'application/json; charset=utf-8';
-  if (ext === '.ttl' || ext === '.n3') return 'text/plain; charset=utf-8';
+  if (ext === '.ttl' || ext === '.trig' || ext === '.n3') return 'text/plain; charset=utf-8';
   if (ext === '.txt' || ext === '.md') return 'text/plain; charset=utf-8';
   return 'application/octet-stream';
 }

package/test/rdf_surfaces.test.js

@@ -6,7 +6,7 @@ const cp = require('node:child_process');
 const path = require('node:path');
 
 const { reason } = require('../index.js');
-const { C, failResult, pass } = require('./report');
+const { C, failResult, formatDuration, info, pass } = require('./report');
 
 const ROOT = path.resolve(__dirname, '..');
 const EYELING = path.join(ROOT, 'eyeling.js');
@@ -22,7 +22,7 @@ function runCli(input, args = ['--rdf-surfaces']) {
 function runExample(name) {
   return cp.spawnSync(
     process.execPath,
-    [EYELING, '--rdf-surfaces', path.join(ROOT, 'examples', 'input', `${name}.ttl`), path.join(ROOT, 'examples', `${name}.n3`)],
+    [EYELING, '--rdf-surfaces', path.join(ROOT, 'examples', 'input', `${name}.trig`), path.join(ROOT, 'examples', `${name}.n3`)],
     { encoding: 'utf8', maxBuffer: 20 * 1024 * 1024 },
   );
 }
@@ -128,6 +128,9 @@ const exampleCases = [
   ['rdf-surfaces-all-values-from-reverse', '@prefix ex: <http://example.org/> .\n\nex:box a ex:AllowedContainer .'],
   ['rdf-surfaces-rdfs-range-codex', '@prefix ex: <http://example.org/> .\n\nex:bob a ex:Person .'],
   ['rdf-surfaces-rdfs-subclass-codex', '@prefix ex: <http://example.org/> .\n\nex:Brussels a ex:HumanCommunity .'],
+  ['rdf-surfaces-rdf12-named-graph', '@prefix ex: <http://example.org/> .\n\nex:Brussels a ex:ReportedCity .'],
+  ['rdf-surfaces-rdf12-triple-term', '@prefix ex: <http://example.org/> .\n\nex:claim1 a ex:CityClaim .'],
+  ['rdf-surfaces-rdf12-graph-triple-term', '@prefix ex: <http://example.org/> .\n\nex:obs1 a ex:AuditedObservation .'],
   [
     'rdf-surfaces-owl-all-values-from-codex',
     '@prefix ex: <http://example.org/> .\n\nex:item43 a ex:AllowedItem .\nex:item42 a ex:AllowedItem .\nex:box a ex:AllowedContainer .\nex:crate a ex:AllowedContainer .',
@@ -144,6 +147,10 @@ const exampleCases = [
   ],
 ];
 
+const suiteStart = Date.now();
+
+info('RDF Surfaces tests');
+
 let seq = 0;
 let failed = 0;
 
@@ -211,4 +218,10 @@ _:x a ex:Impossible .
   }
 }
 
-if (failed) process.exit(1);
+const suiteMs = Date.now() - suiteStart;
+info(`Total elapsed: ${formatDuration(suiteMs)}`);
+if (failed) {
+  info(`Some RDF Surfaces tests failed (${seq - failed}/${seq})`);
+  process.exit(1);
+}
+info(`All RDF Surfaces tests passed (${seq}/${seq})`);

package/test/run.js

@@ -0,0 +1,61 @@
+#!/usr/bin/env node
+'use strict';
+
+const cp = require('node:child_process');
+
+const { C, formatDuration } = require('./report');
+
+const sections = [
+  ['Build bundle', 'npm', ['run', 'build']],
+  ['Packlist checks', 'npm', ['run', 'test:packlist']],
+  ['API tests', 'npm', ['run', 'test:api']],
+  ['Streaming RDF Messages tests', 'npm', ['run', 'test:stream-messages']],
+  ['RDF Surfaces tests', 'npm', ['run', 'test:rdf-surfaces']],
+  ['Builtin contract tests', 'npm', ['run', 'test:builtins']],
+  ['Store tests', 'npm', ['run', 'test:store']],
+  ['Examples tests', 'npm', ['run', 'test:examples']],
+  ['Proof examples tests', 'npm', ['run', 'test:examples:proof']],
+  ['Manifest tests', 'npm', ['run', 'test:manifest']],
+  ['RDF 1.2 syntax tests', 'npm', ['run', 'test:rdf12']],
+  ['Playground tests', 'npm', ['run', 'test:playground']],
+  ['Package tests', 'npm', ['run', 'test:package']],
+];
+
+function sectionLine(kind, label, ms) {
+  const suffix = typeof ms === 'number' ? ` (${formatDuration(ms)})` : '';
+  console.log(`${C.y}==${C.n} ${kind} ${label}${suffix}`);
+}
+
+function runSection(label, cmd, args) {
+  console.log('');
+  sectionLine('Start', label);
+  const startedAt = Date.now();
+  const r = cp.spawnSync(cmd, args, {
+    cwd: process.cwd(),
+    env: process.env,
+    shell: process.platform === 'win32',
+    stdio: 'inherit',
+  });
+  const elapsed = Date.now() - startedAt;
+  if (r.error) {
+    console.error(`${C.r}FAIL${C.n} ${label}: ${r.error.message || String(r.error)}`);
+    sectionLine('End', `${label} failed`, elapsed);
+    console.log('');
+    return 1;
+  }
+  const status = typeof r.status === 'number' ? r.status : 1;
+  sectionLine('End', status === 0 ? `${label} passed` : `${label} failed`, elapsed);
+  console.log('');
+  return status;
+}
+
+let status = 0;
+for (const [label, cmd, args] of sections) {
+  const sectionStatus = runSection(label, cmd, args);
+  if (sectionStatus !== 0) {
+    status = sectionStatus;
+    break;
+  }
+}
+
+process.exit(status);