eyeling 1.33.5 → 1.33.7

package/examples/eyelang/annotation.pl

@@ -1,7 +1,7 @@
 % Annotation with quoted formula data.
 %
 % The program keeps the annotation as data and derives visible relations from it.
-% Formula members become default output only when explicit rules project them.
+% Context members become default output only when explicit rules project them.
 
 % Output declarations: materialize/2 selects the relations written to this example's golden output.
 materialize(name, 2).
@@ -18,17 +18,17 @@ annotation(t, (
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
 name(S, O) :-
-  annotation(_T, Formula),
-  formula_binary(Formula, S, name, O).
+  annotation(_T, Context),
+  holds(Context, name(S, O)).
 
 log_nameOf(T, name(S, O)) :-
-  annotation(T, Formula),
-  formula_binary(Formula, S, name, O).
+  annotation(T, Context),
+  holds(Context, name(S, O)).
 
 statedBy(S, O) :-
-  annotation(_T, Formula),
-  formula_binary(Formula, S, statedBy, O).
+  annotation(_T, Context),
+  holds(Context, statedBy(S, O)).
 
 recorded(S, O) :-
-  annotation(_T, Formula),
-  formula_binary(Formula, S, recorded, O).
+  annotation(_T, Context),
+  holds(Context, recorded(S, O)).

package/examples/eyelang/context-association.pl

@@ -39,9 +39,9 @@ log_nameOf(g3, (
 % A tiny projection shows how a program can inspect a quoted context without
 % making the entire context globally true.
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
-context_statement(Context, Subject, Predicate, Object) :-
-  log_nameOf(Context, Formula),
-  formula_binary(Formula, Subject, Predicate, Object).
+context_statement(ContextName, Subject, Predicate, Object) :-
+  log_nameOf(ContextName, Context),
+  holds(Context, Predicate, [Subject, Object]).
 
 dataGraph(association, skolem_g0) :-
   context_statement(skolem_g0, bob, foaf_name, "Bob").

package/examples/eyelang/delfour.pl

@@ -4,7 +4,7 @@
 % checklist facts as relation materialization.
 %
 % Static input is kept as scoped data: the case, insight, policy, envelope, and
-% signature are formula terms, while the product catalog is a list of records.
+% signature are context terms, while the product catalog is a list of records.
 % Rules project only the fields they need, avoiding global permission/prohibition
 % facts that could contradict another policy formula in the same program.
 
@@ -41,7 +41,7 @@ materialize(marketingProhibited, 2).
 materialize(filesWrittenExpected, 2).
 
 % Program structure: facts set up the scenario, and rules derive the materialized conclusions.
-% Formula-valued facts keep each input graph scoped and easy to project.
+% Context-valued facts keep each input graph scoped and easy to project.
 case_graph(delfourCaseGraph, (
   caseName(case, "delfour"),
   requestPurpose(case, "shopping_assist"),
@@ -102,11 +102,11 @@ signature_graph(delfourSignatureGraph, (
 reason_text(reasonText, "Household requires low-sugar guidance (diabetes in POD). A neutral Insight is scoped to device 'self-scanner', event 'pick_up_scanner', retailer 'Delfour', and expires soon; the policy confines use to shopping assistance.").
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
-case_statement(S, P, O) :- case_graph(delfourCaseGraph, Formula), formula_binary(Formula, S, P, O).
-insight_statement(S, P, O) :- insight_graph(delfourInsightGraph, Formula), formula_binary(Formula, S, P, O).
-policy_statement(S, P, O) :- policy_graph(delfourPolicyGraph, Formula), formula_binary(Formula, S, P, O).
-envelope_statement(S, P, O) :- envelope_graph(delfourEnvelopeGraph, Formula), formula_binary(Formula, S, P, O).
-signature_statement(S, P, O) :- signature_graph(delfourSignatureGraph, Formula), formula_binary(Formula, S, P, O).
+case_statement(S, P, O) :- case_graph(delfourCaseGraph, Context), holds(Context, P, [S, O]).
+insight_statement(S, P, O) :- insight_graph(delfourInsightGraph, Context), holds(Context, P, [S, O]).
+policy_statement(S, P, O) :- policy_graph(delfourPolicyGraph, Context), holds(Context, P, [S, O]).
+envelope_statement(S, P, O) :- envelope_graph(delfourEnvelopeGraph, Context), holds(Context, P, [S, O]).
+signature_statement(S, P, O) :- signature_graph(delfourSignatureGraph, Context), holds(Context, P, [S, O]).
 
 case_name(case, Name) :- case_statement(case, caseName, Name).
 request_purpose(case, Purpose) :- case_statement(case, requestPurpose, Purpose).

package/examples/eyelang/dijkstra-risk-path.pl

@@ -32,8 +32,8 @@ route_network(riskNetwork, (
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
 route_segment(From, To, Raw, Risk) :-
-  route_network(riskNetwork, Formula),
-  formula_binary(Formula, From, segment, segment(To, Raw, Risk)).
+  route_network(riskNetwork, Context),
+  holds(Context, segment(From, segment(To, Raw, Risk))).
 
 candidate(pathB, [depotA, depotB, labD]).
 candidate(pathC, [depotA, depotC, labD]).

package/examples/eyelang/dijkstra.pl

@@ -24,8 +24,8 @@ weighted_graph(dijkstraGraph, (
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
 base_link(A, B, Cost) :-
-  weighted_graph(dijkstraGraph, Formula),
-  formula_binary(Formula, A, edge, arc(B, Cost)).
+  weighted_graph(dijkstraGraph, Context),
+  holds(Context, edge(A, arc(B, Cost))).
 
 link(A, B, Cost) :- base_link(A, B, Cost).
 link(B, A, Cost) :- base_link(A, B, Cost).

package/examples/eyelang/family-cousins.pl

@@ -33,7 +33,7 @@ family_graph(familyGraph, (
 )).
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
-family_statement(S, P, O) :- family_graph(familyGraph, Formula), formula_binary(Formula, S, P, O).
+family_statement(S, P, O) :- family_graph(familyGraph, Context), holds(Context, P, [S, O]).
 
 parent(Parent, Child) :- family_statement(Parent, parent, Child).
 branch(Person, Branch) :- family_statement(Person, seedBranch, Branch).

package/examples/eyelang/gps.pl

@@ -39,12 +39,12 @@ map_graph(mapBE, (
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
 case_statement(S, P, O) :-
-  case_graph(caseGraph, Formula),
-  formula_binary(Formula, S, P, O).
+  case_graph(caseGraph, Context),
+  holds(Context, P, [S, O]).
 
 map_description(From, To, Action, Duration, Cost, Belief, Comfort) :-
-  map_graph(mapBE, Formula),
-  formula_binary(Formula, mapBE, gps_description, description(From, true, To, Action, Duration, Cost, Belief, Comfort)).
+  map_graph(mapBE, Context),
+  holds(Context, gps_description(mapBE, description(From, true, To, Action, Duration, Cost, Belief, Comfort))).
 
 path(From, To, [Action], Duration, Cost, Belief, Comfort) :-
   map_description(From, To, Action, Duration, Cost, Belief, Comfort).

package/examples/eyelang/odrl-dpv-healthcare-risk-ranked.pl

@@ -114,8 +114,8 @@ policy_graph(policyGraphHC1, (
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
 policy_statement(GraphName, Subject, Predicate, Object) :-
-  policy_graph(GraphName, Formula),
-  formula_binary(Formula, Subject, Predicate, Object).
+  policy_graph(GraphName, Context),
+  holds(Context, Predicate, [Subject, Object]).
 
 permission(Graph, Permission) :- policy_statement(Graph, policyHC1, odrl_permission, Permission).
 clause(Graph, Permission, Clause) :- policy_statement(Graph, Permission, clause, Clause).

package/examples/eyelang/odrl-dpv-risk-ranked.pl

@@ -98,8 +98,8 @@ policy_graph(policyGraph1, (
 
 % Derivation rules: each rule below contributes one logical step toward the displayed results.
 policy_statement(Subject, Predicate, Object) :-
-  policy_graph(_Graph, Formula),
-  formula_binary(Formula, Subject, Predicate, Object).
+  policy_graph(_Graph, Context),
+  holds(Context, Predicate, [Subject, Object]).
 
 policy(Policy, Agreement) :- policy_statement(Policy, odrl_appliesTo, Agreement).
 permission(Policy, Rule) :- policy_statement(Policy, odrl_permission, Rule).

package/examples/eyelang/proof/annotation.pl

@@ -4,15 +4,15 @@ why(
   proof(
     goal(name(a, "Alice")),
     by(rule("annotation.pl", clause(6))),
-    bindings([binding("S", a), binding("O", "Alice"), binding("_T", t), binding("Formula", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
+    bindings([binding("S", a), binding("O", "Alice"), binding("_T", t), binding("Context", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
     uses([
       proof(
         goal(annotation(t, (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))),
         by(fact("annotation.pl", clause(5)))
       ),
       proof(
-        goal(formula_binary((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), a, name, "Alice")),
-        by(builtin(formula_binary, 4))
+        goal(holds((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), name(a, "Alice"))),
+        by(builtin(holds, 2))
       )
     ])
   )
@@ -24,15 +24,15 @@ why(
   proof(
     goal(log_nameOf(t, name(a, "Alice"))),
     by(rule("annotation.pl", clause(7))),
-    bindings([binding("T", t), binding("S", a), binding("O", "Alice"), binding("Formula", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
+    bindings([binding("T", t), binding("S", a), binding("O", "Alice"), binding("Context", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
     uses([
       proof(
         goal(annotation(t, (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))),
         by(fact("annotation.pl", clause(5)))
       ),
       proof(
-        goal(formula_binary((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), a, name, "Alice")),
-        by(builtin(formula_binary, 4))
+        goal(holds((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), name(a, "Alice"))),
+        by(builtin(holds, 2))
       )
     ])
   )
@@ -44,15 +44,15 @@ why(
   proof(
     goal(statedBy(t, bob)),
     by(rule("annotation.pl", clause(8))),
-    bindings([binding("S", t), binding("O", bob), binding("_T", t), binding("Formula", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
+    bindings([binding("S", t), binding("O", bob), binding("_T", t), binding("Context", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
     uses([
       proof(
         goal(annotation(t, (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))),
         by(fact("annotation.pl", clause(5)))
       ),
       proof(
-        goal(formula_binary((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), t, statedBy, bob)),
-        by(builtin(formula_binary, 4))
+        goal(holds((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), statedBy(t, bob))),
+        by(builtin(holds, 2))
       )
     ])
   )
@@ -64,15 +64,15 @@ why(
   proof(
     goal(recorded(t, "2021-07-07")),
     by(rule("annotation.pl", clause(9))),
-    bindings([binding("S", t), binding("O", "2021-07-07"), binding("_T", t), binding("Formula", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
+    bindings([binding("S", t), binding("O", "2021-07-07"), binding("_T", t), binding("Context", (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))]),
     uses([
       proof(
         goal(annotation(t, (name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")))),
         by(fact("annotation.pl", clause(5)))
       ),
       proof(
-        goal(formula_binary((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), t, recorded, "2021-07-07")),
-        by(builtin(formula_binary, 4))
+        goal(holds((name(a, "Alice"), statedBy(t, bob), recorded(t, "2021-07-07")), recorded(t, "2021-07-07"))),
+        by(builtin(holds, 2))
       )
     ])
   )

package/examples/eyelang/resilient-city-orchestration.pl

@@ -45,7 +45,7 @@ reading(substation_load_percent, 94).
 threshold(substation_load_percent, 85).
 
 % The deployable skills are stored as quoted formula data and projected by
-% formula_binary/4, showing how policy documents can be reasoned over as data.
+% holds/2, showing how policy documents can be reasoned over as data.
 policy_bundle(response_policy, (
   permission(medical_transport, deploy),
   permission(cold_chain, deploy),
@@ -168,13 +168,13 @@ criticalNeed(civic_storm, map_flood_front) :-
   activeSignal(civic_storm, river_surge).
 
 policyClearance(Skill, deploy) :-
-  policy_bundle(response_policy, Formula),
-  formula_binary(Formula, Skill, permission, deploy),
+  policy_bundle(response_policy, Context),
+  holds(Context, permission(Skill, deploy)),
   not(policyBlocked(Skill, deploy)).
 
 policyBlocked(Skill, deploy) :-
-  policy_bundle(response_policy, Formula),
-  formula_binary(Formula, Skill, prohibition, deploy).
+  policy_bundle(response_policy, Context),
+  holds(Context, prohibition(Skill, deploy)).
 
 usableRoute(Zone, route(Path, minutes(Minutes), risk(RouteRisk))) :-
   zone(Zone),

package/lib/eyelang/builtins/context.js

@@ -0,0 +1,42 @@
+// Context builtins that treat comma conjunctions as first-class data terms.
+// These are used by examples that construct or inspect rule bodies programmatically.
+import { atom, deref, isConjunction, listFromItems, unify } from '../term.js';
+
+export const contextBuiltins = {
+  register(registry) {
+    registry.add('holds', 2, holdsTerm);
+    registry.add('holds', 3, holdsParts);
+  }
+};
+
+function* emitContextTerm(context, term, env) {
+  context = deref(context, env);
+  if (isConjunction(context)) {
+    yield* emitContextTerm(context.args[0], term, env);
+    yield* emitContextTerm(context.args[1], term, env);
+    return;
+  }
+  const next = env.clone();
+  if (unify(term, context, next)) yield next;
+}
+
+function* emitContextParts(context, name, args, env) {
+  context = deref(context, env);
+  if (isConjunction(context)) {
+    yield* emitContextParts(context.args[0], name, args, env);
+    yield* emitContextParts(context.args[1], name, args, env);
+    return;
+  }
+  if (context.type !== 'atom' && context.type !== 'compound') return;
+  const next = env.clone();
+  const argList = context.type === 'compound' ? listFromItems(context.args) : listFromItems([]);
+  if (unify(name, atom(context.name), next) && unify(args, argList, next)) yield next;
+}
+
+function* holdsTerm({ goal, env }) {
+  yield* emitContextTerm(goal.args[0], goal.args[1], env);
+}
+
+function* holdsParts({ goal, env }) {
+  yield* emitContextParts(goal.args[0], goal.args[1], goal.args[2], env);
+}

package/lib/eyelang/builtins/registry.js

@@ -5,7 +5,7 @@ import { coreBuiltins } from './core.js';
 import { stringBuiltins } from './strings.js';
 import { listBuiltins } from './lists.js';
 import { aggregationBuiltins } from './aggregation.js';
-import { formulaBuiltins } from './formula.js';
+import { contextBuiltins } from './context.js';
 import { controlBuiltins } from './control.js';
 import { portfolioBuiltins } from './portfolio.js';
 import { searchBuiltins } from './search.js';
@@ -38,7 +38,7 @@ export class BuiltinRegistry {
 
 export function createDefaultRegistry() {
   const registry = new BuiltinRegistry();
-  for (const mod of [coreBuiltins, arithmeticBuiltins, stringBuiltins, listBuiltins, aggregationBuiltins, formulaBuiltins, controlBuiltins, portfolioBuiltins, searchBuiltins, numberTheoryBuiltins, matrixBuiltins, alphameticBuiltins]) {
+  for (const mod of [coreBuiltins, arithmeticBuiltins, stringBuiltins, listBuiltins, aggregationBuiltins, contextBuiltins, controlBuiltins, portfolioBuiltins, searchBuiltins, numberTheoryBuiltins, matrixBuiltins, alphameticBuiltins]) {
     mod.register(registry);
   }
   return registry;

package/package.json

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

package/test/eyelang/conformance/README.md

@@ -36,7 +36,7 @@ The runner executes materialized programs in-process through the public JavaScri
 
 `core` covers the portable core language profile from the [eyelang language reference](../../../docs/eyelang-language-reference.md): lexical syntax, facts, definite clauses, first-order terms, lists, conjunction, structured unification through user predicates, left-to-right goal-directed proof search, materialized output, and read-back printing.
 
-`extension` covers the standard built-in and host behavior exercised by the current reference implementation: arithmetic, comparison, strings, list relations, aggregation, formula-term helpers, number-theory helpers, finite-search helpers used by the example corpus, matrix helpers, `memoize/2`, `materialize/2`, and default derived output.
+`extension` covers the standard built-in and host behavior exercised by the current reference implementation: arithmetic, comparison, strings, list relations, aggregation, context-term helpers, number-theory helpers, finite-search helpers used by the example corpus, matrix helpers, `memoize/2`, `materialize/2`, and default derived output.
 
 The profile name `extension` is a test-suite grouping name. It does not mean that these cases are outside the eyelang language reference; most of them correspond to the standard built-in profile and standard host profile in the [eyelang language reference](../../../docs/eyelang-language-reference.md).
 

package/test/eyelang/conformance/cases/extension/006_holds_parts.pl

@@ -0,0 +1,4 @@
+% Reference 9.9: holds/3 exposes context members of any arity.
+context((ready, name(alice, "Alice"), route(alice, bob, 7))).
+answer(parts, exposed(Name, Args)) :- context(C), holds(C, Name, Args).
+materialize(answer, 2).

package/test/eyelang/conformance/cases/extension/026_nested_holds_parts.pl

@@ -0,0 +1,4 @@
+% Reference 9.9: holds/3 enumerates nested comma contexts.
+context(((ready, name(a, "A")), route(a, b, 7))).
+answer(parts, exposed(Name, Args)) :- context(C), holds(C, Name, Args).
+materialize(answer, 2).

package/test/eyelang/conformance/cases/extension/027_formula_member.query

@@ -0,0 +1 @@
+answer(Label, Term)

package/test/eyelang/conformance/cases/extension/027_holds_member.pl

@@ -0,0 +1,3 @@
+% Reference 9.9: holds/2 over comma context data.
+context((name(alice, "Alice"), knows(alice, bob))).
+answer(member, Term) :- context(C), holds(C, Term).

package/test/eyelang/conformance/expected/extension/006_holds_parts.out

@@ -0,0 +1,3 @@
+answer(parts, exposed(ready, [])).
+answer(parts, exposed(name, [alice, "Alice"])).
+answer(parts, exposed(route, [alice, bob, 7])).

package/test/eyelang/conformance/expected/extension/026_nested_holds_parts.out

@@ -0,0 +1,3 @@
+answer(parts, exposed(ready, [])).
+answer(parts, exposed(name, [a, "A"])).
+answer(parts, exposed(route, [a, b, 7])).

package/test/eyelang/conformance/expected/extension/027_holds_member.out

@@ -0,0 +1,2 @@
+answer(member, name(alice, "Alice")).
+answer(member, knows(alice, bob)).

package/test/eyelang/run-regression.mjs

@@ -491,9 +491,9 @@ function listExampleNames() {
 }
 
 function readmeCatalogExampleNames() {
-  const readme = fs.readFileSync(path.join(packageRoot, 'examples', 'eyelang', 'README.md'), 'utf8');
+  const readme = fs.readFileSync(path.join(packageRoot, 'docs', 'eyelang-guide.md'), 'utf8');
   const section = between(readme, '## Example catalog', '## Golden outputs, tests, and conformance');
-  return [...section.matchAll(/examples\/([A-Za-z0-9_-]+)\.pl/g)]
+  return [...section.matchAll(/examples\/eyelang\/([A-Za-z0-9_-]+)\.pl/g)]
     .map((match) => match[1])
     .filter((name, index, names) => names.indexOf(name) === index)
     .sort();

package/test/packlist.test.js

@@ -46,6 +46,7 @@ try {
     'bin/eyeling.cjs',
     'dist/browser/eyeling.browser.js',
     'dist/browser/index.mjs',
+    'docs/eyelang-guide.md',
     'docs/eyelang-language-reference.md',
   ];
 

package/examples/eyelang/INTEGRATION.md

@@ -1,20 +0,0 @@
-# Eyelang examples inside Eyeling
-
-This directory contains eyelang examples that can be exercised through Eyeling's experimental second engine:
-
-```bash
-eyeling --engine eyelang examples/eyelang/ancestor.pl
-```
-
-For a paired example, compare the N3 and eyelang versions of the same dependency-risk scenario:
-
-```bash
-eyeling examples/vulnerability-impact.n3
-eyeling --engine eyelang examples/eyelang/vulnerability-impact.pl
-```
-
-The eyelang conformance corpus is kept under `test/eyelang/` and can be run with:
-
-```bash
-npm run test:eyelang:corpus
-```