eyeleng 1.1.0 → 1.1.2

package/examples/output/hanoi.trig

@@ -34,16 +34,6 @@ _:http://example/eyeling/hanoi/root-second-second :start 6 .
 _:http://example/eyeling/hanoi/root-second-second :startPeg :left .
 _:http://example/eyeling/hanoi/root-second-second :targetPeg :right .
 _:http://example/eyeling/hanoi/root-second-second a :HanoiProblem .
-:level1 :pow2 2 .
-:level10 :pow2 1024 .
-:level2 :pow2 4 .
-:level3 :pow2 8 .
-:level4 :pow2 16 .
-:level5 :pow2 32 .
-:level6 :pow2 64 .
-:level7 :pow2 128 .
-:level8 :pow2 256 .
-:level9 :pow2 512 .
 :move-1 :disk 1 .
 :move-1 :from :left .
 :move-1 :step 1 .

package/examples/output/spec-2-5-assignment-with-negation.trig

@@ -1 +0,0 @@
-:route1 :distanceKm 16.0934 .

package/examples/output/sudoku.trig

@@ -1,4 +1,3 @@
-:case :solution "162857493534129678789643521475312986913586742628794135356478219241935867897261354" .
 :r1c1 :value 1 .
 :r1c2 :value 6 .
 :r1c3 :value 2 .

package/examples/output/turing.trig

@@ -13,7 +13,6 @@
 :case1 :hasStep <http://example/eyeling/turing/case1/step-7> .
 :case1 :hasStep <http://example/eyeling/turing/case1/step-8> .
 :case1 :hasStep <http://example/eyeling/turing/case1/step-9> .
-:case1 :output "101010" .
 :case1 :rawOutput "101010#" .
 :case1 :reportLine "101001 + 1 = 101010" .
 :case1 log:outputString "101001 + 1 = 101010" .
@@ -31,7 +30,6 @@
 :case2 :hasStep <http://example/eyeling/turing/case2/step-7> .
 :case2 :hasStep <http://example/eyeling/turing/case2/step-8> .
 :case2 :hasStep <http://example/eyeling/turing/case2/step-9> .
-:case2 :output "110000" .
 :case2 :rawOutput "110000#" .
 :case2 :reportLine "101111 + 1 = 110000" .
 :case2 log:outputString "101111 + 1 = 110000" .
@@ -51,7 +49,6 @@
 :case3 :hasStep <http://example/eyeling/turing/case3/step-7> .
 :case3 :hasStep <http://example/eyeling/turing/case3/step-8> .
 :case3 :hasStep <http://example/eyeling/turing/case3/step-9> .
-:case3 :output "1000000" .
 :case3 :rawOutput "1000000#" .
 :case3 :reportLine "111111 + 1 = 1000000" .
 :case3 log:outputString "111111 + 1 = 1000000" .
@@ -59,7 +56,6 @@
 :case4 :hasStep <http://example/eyeling/turing/case4/step-0> .
 :case4 :hasStep <http://example/eyeling/turing/case4/step-1> .
 :case4 :hasStep <http://example/eyeling/turing/case4/step-2> .
-:case4 :output "1" .
 :case4 :rawOutput "1#" .
 :case4 :reportLine "empty tape + 1 = 1" .
 :case4 log:outputString "empty tape + 1 = 1" .
@@ -73,7 +69,6 @@
 :case5 :hasStep <http://example/eyeling/turing/case5/step-6> .
 :case5 :hasStep <http://example/eyeling/turing/case5/step-7> .
 :case5 :hasStep <http://example/eyeling/turing/case5/step-8> .
-:case5 :output "100001" .
 :case5 :rawOutput "100001#" .
 :case5 :reportLine "100000 + 1 = 100001" .
 :case5 log:outputString "100000 + 1 = 100001" .

package/eyeleng.js

@@ -42,7 +42,7 @@
       const VERSION = readPackageVersion();
       
       function help() {
-        return `eyeleng ${VERSION}\n\nA dependency-free JavaScript implementation experiment for the SHACL 1.2 Rules draft, including SRL and RDF Rules syntax front-ends.\n\nUsage:\n  eyeleng [options] [file ...]\n\nOptions:\n  --all                 Print the full closure, including input facts\n  --json                Print JSON instead of compact triples/bindings\n  --trace               Print derivation trace to stderr, or include it in JSON\n  --stats               Print iteration and triple counts to stderr\n  --check               Parse and analyze only; do not run rules\n  --strict              Treat static warnings as errors, including recursive term generation\n  --deps                Print rule dependency edges during --check\n  --query TEXT          Run a raw SRL body pattern over the closure or backward planner\n  --query-file FILE     Read a raw SRL body pattern from a file\n  --query-mode MODE     Use auto, forward, or backward query planning (default auto)\n  --hybrid              Orient function-like rules backward during forward execution and queries\n  --max-iterations N    Stop after N fixpoint iterations within a recursive layer\n  --no-imports          Parse IMPORTS/owl:imports but do not load imported rule sets\n  --rdf-messages        Parse input as an RDF Message Log\n  --include-message-facts Include payload facts while parsing RDF Message Logs\n  --syntax MODE         Use srl, rdf, or auto syntax detection (default auto)\n  --ruleset TERM        In RDF syntax, run only the selected srl:RuleSet\n  --version             Print version\n  -h, --help            Print this help\n\nWith no file arguments, eyeleng reads from stdin.\n`;
+        return `eyeleng ${VERSION}\n\nA dependency-free JavaScript implementation experiment for the SHACL 1.2 Rules draft, including SRL and RDF Rules syntax front-ends.\n\nUsage:\n  eyeleng [options] [file ...]\n\nOptions:\n  --all                 Print the full closure, including input facts\n  --json                Print JSON instead of compact triples/bindings\n  --trace               Print derivation trace to stderr, or include it in JSON\n  --stats               Print iteration and triple counts to stderr\n  --check               Parse and analyze only; do not run rules\n  --strict              Treat static warnings as errors, including recursive term generation\n  --deps                Print rule dependency edges during --check\n  --query TEXT          Run a raw SRL body pattern over the closure or backward planner\n  --query-file FILE     Read a raw SRL body pattern from a file\n  --query-mode MODE     Use auto, forward, or backward query planning (default auto)\n  --hybrid              Force aggressive hybrid orientation for function-like rules\n  --no-hybrid           Disable automatic hybrid forward/backward execution\n  --max-iterations N    Stop after N fixpoint iterations within a recursive layer\n  --no-imports          Parse IMPORTS/owl:imports but do not load imported rule sets\n  --rdf-messages        Parse input as an RDF Message Log\n  --include-message-facts Include payload facts while parsing RDF Message Logs\n  --syntax MODE         Use srl, rdf, or auto syntax detection (default auto)\n  --ruleset TERM        In RDF syntax, run only the selected srl:RuleSet\n  --version             Print version\n  -h, --help            Print this help\n\nWith no file arguments, eyeleng reads from stdin.\n`;
       }
       
       function parseArgs(argv) {
@@ -57,7 +57,7 @@
           query: null,
           queryFile: null,
           queryMode: 'auto',
-          hybrid: false,
+          hybrid: 'auto',
           maxIterations: 10000,
           imports: true,
           syntax: 'auto',
@@ -77,6 +77,7 @@
           else if (arg === '--deps') options.deps = true;
           else if (arg === '--no-imports') options.imports = false;
           else if (arg === '--hybrid') options.hybrid = true;
+          else if (arg === '--no-hybrid') options.hybrid = false;
           else if (arg === '--rdf-messages') options.rdfMessages = true;
           else if (arg === '--include-message-facts') options.includeMessageFacts = true;
           else if (arg === '--syntax') {
@@ -709,7 +710,7 @@
         }
       
         parseTripleStatement(options = {}) {
-          const subjectNode = this.parseGraphNode(options);
+          const subjectNode = this.parseGraphNode({ ...options, position: 'subject' });
           const triples = [...subjectNode.triples];
           triples.push(...this.parsePropertyListForSubject(subjectNode.term, options));
           return triples;
@@ -723,7 +724,7 @@
             if (terminators.some((value) => this.checkValue(value)) || this.checkValue('.')) break;
             const predicate = options.allowPath ? this.parseVerbPathOrSimple(options) : this.parseVerbTerm(options);
             do {
-              const objectNode = this.parseGraphNode(options);
+              const objectNode = this.parseGraphNode({ ...options, position: 'object' });
               triples.push(...objectNode.triples);
               const baseTriple = { s: subject, p: predicate, o: objectNode.term };
               triples.push(baseTriple);
@@ -790,6 +791,7 @@
               currentReifier = this.parseOptionalReifier(options);
               triples.push({ s: currentReifier, p: iri(RDF_REIFIES), o: reified });
             } else if (this.matchValue('{|')) {
+              if (this.checkValue('|}')) throw this.error('Annotation blocks may not be empty');
               const annotationSubject = currentReifier || this.freshGraphNode(options);
               triples.push({ s: annotationSubject, p: iri(RDF_REIFIES), o: reified });
               triples.push(...this.parsePropertyListForSubject(annotationSubject, options, ['|}']));
@@ -839,7 +841,7 @@
         }
       
         parseVerbTerm(options = {}) {
-          const term = this.parseTerm(options);
+          const term = this.parseTerm({ ...options, position: 'predicate' });
           if (term.type !== 'iri' && term.type !== 'var') throw this.error('Expected IRI or variable as predicate');
           return term;
         }
@@ -962,7 +964,10 @@
           if (token.value === '<<(') return this.parseTripleTermAfterOpen(options);
           if (token.value === '<<') throw this.error('Use << s p o >> as a graph node reifier; use <<( s p o )>> for a triple term', token);
           if (token.type === 'word') {
-            if (token.value === 'a') return iri(RDF_TYPE);
+            if (token.value === 'a') {
+              if (options.position !== 'predicate') throw this.error('a is only allowed as a predicate', token);
+              return iri(RDF_TYPE);
+            }
             if (token.value === 'true') return literal(true, XSD_BOOLEAN);
             if (token.value === 'false') return literal(false, XSD_BOOLEAN);
             if (token.value.startsWith('_:')) return blankNode(token.value.slice(2));
@@ -996,7 +1001,13 @@
             return literal(coerceLexicalLiteral(token.value, datatype), datatype, null);
           }
           if (this.checkType('word') && /^@[A-Za-z]+(?:-[A-Za-z0-9]+)*(?:--[A-Za-z]+)?$/.test(this.peek().value)) {
-            const tag = this.advance().value.slice(1).toLowerCase();
+            const tagToken = this.advance();
+            const rawTag = tagToken.value.slice(1);
+            const direction = rawTag.includes('--') ? rawTag.slice(rawTag.lastIndexOf('--') + 2) : null;
+            if (direction && direction !== 'ltr' && direction !== 'rtl') {
+              throw this.error(`Invalid base direction --${direction}; expected --ltr or --rtl`, tagToken);
+            }
+            const tag = rawTag.toLowerCase();
             const [lang, langDir = null] = tag.split('--');
             return literal(token.value, null, lang, langDir);
           }
@@ -2775,6 +2786,7 @@
         const syntaxProfile = String(options.profile || options.profileId || '').toLowerCase();
         const rdf12Surface = syntaxProfile === 'turtle' || syntaxProfile === 'trig';
         const implicitStatementNodes = new Set();
+        function implicitStatementNodeKey(term) { return `${term.kind}:${term.value}`; }
       
         function freshBlank() { bnodeCounter += 1; return blank(`b${bnodeCounter}`); }
         function peek(offset = 0) { return tokens[i + offset]; }
@@ -2925,7 +2937,7 @@
           expect('>>');
           const node = reifier || freshBlank();
           out.push(triple(node, iri(RDF_REIFIES), tripleTerm(s, p, o), graph));
-          if (node.kind === 'blank') implicitStatementNodes.add(node.value);
+          implicitStatementNodes.add(implicitStatementNodeKey(node));
           return node;
         }
       
@@ -2954,7 +2966,7 @@
           if (accept(']')) return node;
           parsePredicateObjectList(node, out, graph);
           expect(']');
-          if (node.kind === 'blank') implicitStatementNodes.add(node.value);
+          if (node.kind === 'blank') implicitStatementNodes.add(implicitStatementNodeKey(node));
           return node;
         }
       
@@ -3032,9 +3044,8 @@
             if (options3.requireDot) expect('.'); else accept('.');
             return;
           }
-          if (peek()?.type === '<<' && peek(1)?.type === '(') throw new Error('Triple term cannot be used as a subject');
-          const subject = parseTerm(out, graph, { noLiteral: true, noA: true });
-          if ((peek()?.type === '.' || peek()?.type === '}' || peek()?.type === undefined) && subject.kind === 'blank' && implicitStatementNodes.has(subject.value)) {
+          const subject = parseTerm(out, graph, { noLiteral: !rdf12Surface, noA: true });
+          if ((peek()?.type === '.' || peek()?.type === '}' || peek()?.type === undefined) && implicitStatementNodes.has(implicitStatementNodeKey(subject))) {
             if (options3.requireDot) expect('.'); else accept('.');
             return;
           }
@@ -4356,7 +4367,8 @@
         const relaxedRecursiveRunOnce = options.relaxedRecursion === false
           ? new Set()
           : recursiveTermGenerationRuleIndexes(analysis);
-        const hybridBackwardPredicates = options.hybrid || options.backwardBodyCalls
+        const useHybrid = options.hybrid !== false && !options.shacl12Conformance;
+        const hybridBackwardPredicates = useHybrid || options.backwardBodyCalls
           ? preferredBackwardPredicates(program, options)
           : new Set();
         const hybridBackwardRules = new Set();
@@ -5892,10 +5904,7 @@
           const entry = this.memo.get(key);
           if (entry && entry.complete) {
             this.stats.memoHits += 1;
-            for (const answer of entry.answers) {
-              const next = unifyTriples(pattern, answer, binding);
-              if (next) yield next;
-            }
+            yield* this.replayAnswers(pattern, binding, entry.answers);
             return;
           }
           if (this.active.has(key)) return;
@@ -5909,7 +5918,6 @@
               if (!next) continue;
               rememberAnswer(answers, answerKeys, pattern, next);
               this.stats.facts += 1;
-              yield next;
             }
       
             for (const item of this.ruleCandidates(resolvedPattern)) {
@@ -5921,7 +5929,6 @@
               for (const solved of this.solveBody(freshBody, next, depth + 1, 0)) {
                 rememberAnswer(answers, answerKeys, pattern, solved);
                 this.stats.rules += 1;
-                yield solved;
               }
             }
           } finally {
@@ -5930,6 +5937,14 @@
       
           this.memo.set(key, { complete: true, answers });
           this.stats.memoStores += 1;
+          yield* this.replayAnswers(pattern, binding, answers);
+        }
+      
+        *replayAnswers(pattern, binding, answers) {
+          for (const answer of answers) {
+            const next = unifyTriples(pattern, answer, binding);
+            if (next) yield next;
+          }
         }
       
         factCandidates(pattern, binding) {
@@ -6209,15 +6224,57 @@
         if (explicit) return supportedBackwardPredicates(program, { ...options, hybridPredicates: explicit });
         const supported = supportedBackwardPredicates(program, options);
         const preferred = new Set();
+        const force = options.hybrid === true || options.hybridMode === 'force';
+        const demanded = force ? null : demandedBodyPredicates(program);
         for (const rule of program.rules || []) {
           if (!ruleIsFunctionLike(rule)) continue;
+          if (!force && ruleCreatesHeadTerms(rule)) continue;
           for (const head of rule.head || []) {
-            if (head && head.p && head.p.type === 'iri' && supported.has(head.p.value)) preferred.add(head.p.value);
+            if (!head || !head.p || head.p.type !== 'iri' || !supported.has(head.p.value)) continue;
+            if (force || demanded.has(head.p.value)) preferred.add(head.p.value);
           }
         }
         return preferred;
       }
       
+      function demandedBodyPredicates(program) {
+        const out = new Set();
+        for (const rule of program.rules || []) {
+          for (const predicate of bodyPredicateDemands(rule.body || [])) if (predicate) out.add(predicate);
+        }
+        return out;
+      }
+      
+      
+      function ruleCreatesHeadTerms(rule) {
+        const headVars = new Set();
+        for (const triple of rule.head || []) {
+          for (const term of [triple.s, triple.p, triple.o]) {
+            if (!term) continue;
+            if (term.type === 'blank') return true;
+            if (term.type === 'var') headVars.add(term.value);
+          }
+        }
+        if (headVars.size === 0) return false;
+        for (const clause of rule.body || []) {
+          if ((clause.type === 'set' || clause.type === 'bind') && headVars.has(clause.variable) && expressionCreatesTerm(clause.expr)) return true;
+        }
+        return false;
+      }
+      
+      function expressionCreatesTerm(expr) {
+        if (!expr) return false;
+        if (expr.type === 'call') {
+          const name = String(expr.name || '').toUpperCase();
+          if (name === 'BNODE' || name === 'IRI' || name === 'URI' || name === 'TRIPLE' || name === 'UUID' || name === 'STRUUID') return true;
+          return (expr.args || []).some(expressionCreatesTerm);
+        }
+        if (expr.type === 'binary') return expressionCreatesTerm(expr.left) || expressionCreatesTerm(expr.right);
+        if (expr.type === 'unary') return expressionCreatesTerm(expr.expr);
+        if (expr.type === 'in') return expressionCreatesTerm(expr.left) || (expr.values || []).some(expressionCreatesTerm);
+        return false;
+      }
+      
       function ruleIsFunctionLike(rule) {
         return (rule.body || []).some((clause) => clause.type === 'set' || clause.type === 'bind');
       }
@@ -6355,7 +6412,7 @@
           prefixes: result.prefixes,
           select,
           bindings: projectBindings(bindings, select),
-          mode: options.queryMode === 'hybrid' || options.hybrid ? 'hybrid' : 'forward',
+          mode: result.hybridStats ? 'hybrid' : 'forward',
         };
       }
       
@@ -6421,13 +6478,16 @@
       }
       
       function queryRunOptions(program, querySpec, options = {}) {
-        if (shouldUseHybridForQuery(program, querySpec, options)) return { ...options, hybrid: true };
+        const mode = options.queryMode || 'auto';
+        if (mode === 'forward') return { ...options, hybrid: false };
+        if (shouldUseHybridForQuery(program, querySpec, options)) return { ...options, hybrid: options.hybrid ?? 'auto' };
         return options;
       }
       
       function shouldUseHybridForQuery(program, querySpec, options = {}) {
         const mode = options.queryMode || 'auto';
-        if (options.hybrid || mode === 'hybrid') return true;
+        if (options.hybrid === false) return false;
+        if (options.hybrid === true) return true;
         if (mode !== 'auto') return false;
         if (!querySpec) return false;
         return preferredBackwardPredicates(program, options).size > 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyeleng",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "The EYE Logic Engine: a JavaScript implementation of SHACL Rules, including SRL and RDF Rules syntax front-ends.",
   "keywords": [
     "SRL",