eyelang 1.4.1 → 1.5.0

package/conformance/cases/extension/016_negation_filter.pl

@@ -4,3 +4,4 @@ candidate(b).
 candidate(c).
 blocked(b).
 answer(open, X) :- candidate(X), not(blocked(X)).
+materialize(answer, 2).

package/conformance/cases/extension/017_once_user_predicate.pl

@@ -2,3 +2,4 @@
 choice(a).
 choice(b).
 answer(first, X) :- once(choice(X)).
+materialize(answer, 2).

package/conformance/cases/extension/018_findall_user_goal.pl

@@ -3,3 +3,4 @@ p(b).
 p(a).
 p(b).
 answer(bag, X) :- findall(P, p(P), X).
+materialize(answer, 2).

package/conformance/cases/extension/019_sort_deduplicates_atoms.pl

@@ -1,2 +1,3 @@
 % SPEC 9.8: sort/2 sorts and deduplicates a proper list.
 answer(sorted, X) :- sort([c, a, b, a], X).
+materialize(answer, 2).

package/conformance/cases/extension/020_append_bound_prefix_suffix.pl

@@ -1,3 +1,4 @@
 % SPEC 9.7: append/3 supports bound prefix and suffix use cases.
 answer(prefix, X) :- append(X, [c], [a, b, c]).
 answer(suffix, X) :- append([a], X, [a, b, c]).
+materialize(answer, 2).

package/conformance/cases/extension/021_nth0_index_generation.pl

@@ -1,2 +1,3 @@
 % SPEC 9.7: nth0/3 can bind the index for a known list element.
 answer(index, I) :- nth0(I, [a, b, c], b).
+materialize(answer, 2).

package/conformance/cases/extension/022_set_nth0_edges.pl

@@ -1,3 +1,4 @@
 % SPEC 9.7: set_nth0/4 updates zero-based positions functionally.
 answer(first, X) :- set_nth0(0, [a, b, c], x, X).
 answer(last, X) :- set_nth0(2, [a, b, c], z, X).
+materialize(answer, 2).

package/conformance/cases/extension/023_select_duplicate_occurrences.pl

@@ -1,2 +1,3 @@
 % SPEC 9.7: select/3 enumerates removals of matching occurrences.
 answer(rest, X) :- select(a, [a, b, a], X).
+materialize(answer, 2).

package/conformance/cases/extension/024_not_member_filter.pl

@@ -3,3 +3,4 @@ candidate(a).
 candidate(b).
 candidate(c).
 answer(not_present, X) :- candidate(X), not_member(X, [a, b]).
+materialize(answer, 2).

package/conformance/cases/extension/025_is_list_filter.pl

@@ -2,3 +2,4 @@
 thing([a, b]).
 thing(pair(a, b)).
 answer(list, X) :- thing(X), is_list(X).
+materialize(answer, 2).

package/conformance/cases/extension/026_nested_formula_terms.pl

@@ -2,3 +2,4 @@
 formula(((name(a, "A"), knows(a, b)), likes(b, c))).
 answer(atom, A) :- formula(F), formula_atom(F, A).
 answer(binary, exposed(S, P, O)) :- formula(F), formula_binary(F, S, P, O).
+materialize(answer, 2).

package/conformance/cases/extension/027_materialize_excludes_source_fact.pl

@@ -1,4 +1,4 @@
-% SPEC 11: no-query materialization excludes source facts even if also derivable.
+% SPEC 11: default materialization excludes source facts even if also derivable.
 materialize(answer, 2).
 seed(a).
 answer(a, ok).

package/conformance/cases/extension/028_numeric_and_lexical_comparison.pl

@@ -2,3 +2,4 @@
 answer(numeric_gt, true) :- gt(10, 2).
 answer(numeric_le, true) :- le(2, 2.0).
 answer(lexical_ge, true) :- ge(beta, alpha).
+materialize(answer, 2).

package/conformance/cases/extension/029_string_matching_filters.pl

@@ -3,3 +3,4 @@ text(a, "alpha").
 text(b, "beta").
 answer(has_ph, K) :- text(K, T), matches(T, "ph").
 answer(no_ph, K) :- text(K, T), not_matches(T, "ph").
+materialize(answer, 2).

package/conformance/cases/extension/030_string_and_atom_concat.pl

@@ -1,3 +1,4 @@
 % SPEC 9.6: atom_concat/3 and str_concat/3 concatenate like-typed scalars.
 answer(atom, X) :- atom_concat(eye, lang, X).
 answer(string, X) :- str_concat("eye", "lang", X).
+materialize(answer, 2).

package/conformance/cases/extension/031_countall_empty_and_nonempty.pl

@@ -1,2 +1,4 @@
 item(a).
 item(b).
+answer(counts, counts(C, Z)) :- countall(item(X), C), countall(missing(X), Z).
+materialize(answer, 2).

package/conformance/cases/extension/032_sumall_numeric_template.pl

@@ -1,3 +1,5 @@
 score(a, 4).
 score(b, 5).
 score(c, -2).
+answer(sum, Sum) :- sumall(S, score(_Item, S), Sum).
+materialize(answer, 2).

package/conformance/cases/extension/033_aggregate_min_template.pl

@@ -1,3 +1,5 @@
 score(alpha, 7).
 score(beta, 3).
 score(gamma, 5).
+answer(min, result(BestS, Best)) :- aggregate_min(S, item(Name, S), score(Name, S), BestS, Best).
+materialize(answer, 2).

package/conformance/cases/extension/034_aggregate_max_compound_key.pl

@@ -1,3 +1,5 @@
 score(alpha, 7).
 score(beta, 7).
 score(gamma, 5).
+answer(max, result(Key, BestName)) :- aggregate_max([S, Name], Name, score(Name, S), Key, BestName).
+materialize(answer, 2).

package/conformance/expected/extension/031_countall_empty_and_nonempty.out

@@ -1 +1 @@
-(countall(item(X), 2), countall(missing(X), 0)).
+answer(counts, counts(2, 0)).

package/conformance/expected/extension/032_sumall_numeric_template.out

@@ -1 +1 @@
-sumall(S, score(_Item, S), 7).
+answer(sum, 7).

package/conformance/expected/extension/033_aggregate_min_template.out

@@ -1 +1 @@
-aggregate_min(S, item(Name, S), score(Name, S), 3, item(beta, 3)).
+answer(min, result(3, item(beta, 3))).

package/conformance/expected/extension/034_aggregate_max_compound_key.out

@@ -1 +1 @@
-aggregate_max([S, Name], Name, score(Name, S), [7, beta], beta).
+answer(max, result([7, beta], beta)).

package/examples/basic-monadic.pl

@@ -1,7 +1,7 @@
 % Basic Monadic Benchmark port from EYE reasoning/basic-monadic.
 %
 % This example uses the ten Turtle inputs 1tt1.ttl ... 1tt10.ttl
-% from EYE and the EYE query shape:
+% from EYE and the EYE selected-goal shape:
 %   D0 R D1, D1 R D2, ..., D9 R D0 -> R cycle (D0 ... D9 D0).
 %
 % The expected output contains 1518 distinct cycle relations, matching

package/examples/monkey-bananas.pl

@@ -2,7 +2,7 @@
 % input/monkey-bananas.pl.
 %
 % A state is [bananas_location, monkey_location, box_location, on_box,
-% has_bananas].  The query searches bounded move lists and derives successful
+% has_bananas].  The selected output searches bounded move lists and derives successful
 % plans.
 
 materialize(plan, 2).

package/examples/path-discovery.pl

@@ -1,11 +1,11 @@
 % Generic path discovery over the air-routes graph.
-% Change or add route_query(FromLabel, ToLabel, MaxStopOvers) to answer other routes.
+% Change or add route_request(FromLabel, ToLabel, MaxStopOvers) to answer other routes.
 materialize(airroute, 2).
 
-route_query("Ostend-Bruges International Airport", "Václav Havel Airport Prague", 2).
+route_request("Ostend-Bruges International Airport", "Václav Havel Airport Prague", 2).
 
 airroute(discovered, RouteText) :-
-  route_query(From, To, MaxStopOvers),
+  route_request(From, To, MaxStopOvers),
   airport(Source, From),
   airport(Destination, To),
   add(MaxStopOvers, 1, MaxLegs),

package/examples/peano-arithmetic.pl

@@ -1,7 +1,7 @@
 % Peano arithmetic port from EYE reasoning/peano.
 %
 % The EYE example defines add, multiply and factorial over Peano numerals.
-% Its query computes (1 * 2 + 3)! and emits the factorial of 5.
+% Its selected output computes (1 * 2 + 3)! and emits the factorial of 5.
 
 materialize(factorial, 2).
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyelang",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "type": "module",
   "description": "A small rule engine for Prolog-style Horn clauses",
   "keywords": [

package/playground-worker.mjs

@@ -46,7 +46,7 @@ async function initialize(requestId) {
 }
 
 async function runEyelang(request) {
-  const { id, program, query, stats, proof = false } = request;
+  const { id, program, stats, proof = false } = request;
   if (active) {
     self.postMessage({
       type: 'result',
@@ -72,7 +72,6 @@ async function runEyelang(request) {
       Program,
       Solver,
       copyResolved,
-      parseQueryGoal,
       termIsGround,
       termToString,
       whyNoProof,
@@ -82,19 +81,7 @@ async function runEyelang(request) {
     phase = 'parsing input';
     const parsed = Program.parse(program || '', { filename: '<playground>', sourceMetadata: proof, markRecursive: proof });
 
-    if (query && query.trim()) {
-      phase = 'parsing query';
-      const goal = parseQueryGoal(query.trim());
-      phase = 'solving query';
-      const solver = new Solver(parsed);
-      const out = [];
-      for (const env of solver.solve([goal], new Env(), 0)) {
-        out.push(`${termToString(goal, env, true)}.\n`);
-        if (proof) appendExplanation(out, parsed, copyResolved(goal, env), whyProof, whyNoProof);
-      }
-      stdout = out.join('');
-      if (stats) stderr = formatStats(solver.stats);
-    } else {
+    {
       phase = 'materializing output';
       const goals = parsed.materializationGoals();
       const materializedKeys = new Set(goals.map((goal) => `${goal.name}/${goal.arity}`));

package/playground.html

@@ -172,13 +172,6 @@
     button.primary { border-color: var(--accent); background: var(--accent); color: white; }
     button.primary:hover { background: var(--accent-strong); }
     button:disabled { opacity: 0.55; cursor: not-allowed; }
-    .query-row {
-      display: grid;
-      grid-template-columns: minmax(0, 1fr);
-      gap: 8px;
-      margin-top: 10px;
-    }
-    .query-row input { width: 100%; }
     .run-options {
       margin-top: 10px;
       align-items: flex-start;
@@ -399,10 +392,6 @@
             <textarea id="programInput" class="program-textarea" spellcheck="false" autocapitalize="off" autocomplete="off" wrap="soft" aria-label="Editable eyelang program"></textarea>
           </div>
         </div>
-        <div class="query-row">
-          <label for="queryInput">Optional <code>--query</code> goal</label>
-          <input id="queryInput" type="text" placeholder="ancestor(pat, X)" spellcheck="false">
-        </div>
         <div class="toolbar run-options">
           <label class="row"><input id="statsToggle" type="checkbox"> include <code>--stats</code> counters</label>
           <label class="row"><input id="proofToggle" type="checkbox"> include <code>--proof</code> explanations</label>
@@ -415,7 +404,7 @@
           <button id="clearSavedButton" type="button">Clear autosave</button>
           <span id="status" class="status" role="status">Idle.</span>
         </div>
-        <p class="small">The playground concatenates loaded background programs before the editor contents. Use the query field and <code>--stats</code> toggle like the CLI. Output is ordinary eyelang syntax: answer facts by default, with <code>why/2</code> explanations added when <code>--proof</code> is selected.</p>
+        <p class="small">The playground concatenates loaded background programs before the editor contents. Use <code>materialize/2</code> declarations to focus output and the <code>--stats</code> toggle for counters. Output is ordinary eyelang syntax: answer facts by default, with <code>why/2</code> explanations added when <code>--proof</code> is selected.</p>
       </div>
     </section>
 
@@ -566,13 +555,12 @@
   "zebra"
 ];
     const DEFAULT_PROGRAM = "% Socrates is mortal.\n\nmaterialize(type, 2).\nmaterialize(is, 2).\n\ntype(socrates, man).\n\ntype(X, mortal) :-\n  type(X, man).\n\nis(test, true) :-\n  type(socrates, mortal).";
-    const STORAGE_KEY = 'eyelang.playground.v6';
+    const STORAGE_KEY = 'eyelang.playground.v7';
 
     const programInput = document.getElementById('programInput');
     const programSyntax = document.getElementById('programSyntax');
     const programGutter = document.getElementById('programGutter');
     const programErrorBand = document.getElementById('programErrorBand');
-    const queryInput = document.getElementById('queryInput');
     const statsToggle = document.getElementById('statsToggle');
     const proofToggle = document.getElementById('proofToggle');
     const commandPreview = document.getElementById('commandPreview');
@@ -943,7 +931,6 @@
       saveTimer = setTimeout(() => {
         localStorage.setItem(STORAGE_KEY, JSON.stringify({
           program: programInput.value,
-          query: queryInput.value,
           stats: statsToggle.checked,
           proof: proofToggle.checked,
           backgroundPrograms,
@@ -979,7 +966,6 @@
       const args = ['eyelang'];
       if (statsToggle.checked) args.push('--stats');
       if (proofToggle.checked) args.push('--proof');
-      if (queryInput.value.trim()) args.push('--query', shellQuote(queryInput.value.trim()));
       args.push(currentProgramStillMatchesUrl() ? currentProgramUrl : 'input.pl');
       commandPreview.textContent = args.join(' ');
     }
@@ -989,7 +975,6 @@
       if (searchParams.has('url')) {
         const sourceUrl = searchParams.get('url');
         urlInput.value = sourceUrl;
-        queryInput.value = searchParams.get('query') || searchParams.get('q') || '';
         statsToggle.checked = parseFlag(searchParams.get('stats') || searchParams.get('s'));
         proofToggle.checked = parseFlag(searchParams.get('proof') || searchParams.get('pr'));
         updateCommandPreview();
@@ -1006,7 +991,6 @@
       if (params.has('p')) {
         try {
           setProgramValue(decodePayload(params.get('p')));
-          queryInput.value = params.has('q') ? decodePayload(params.get('q')) : '';
           statsToggle.checked = parseFlag(params.get('s'));
           proofToggle.checked = parseFlag(params.get('r'));
           currentProgramUrl = null;
@@ -1018,11 +1002,10 @@
         }
       }
       try {
-        const raw = localStorage.getItem(STORAGE_KEY) || localStorage.getItem('eyelang.playground.v4') || localStorage.getItem('eyelang.playground.v3') || localStorage.getItem('eyelang.playground.v2') || localStorage.getItem('eyelang.playground.v1');
+        const raw = localStorage.getItem(STORAGE_KEY) || localStorage.getItem('eyelang.playground.v6') || localStorage.getItem('eyelang.playground.v5') || localStorage.getItem('eyelang.playground.v4') || localStorage.getItem('eyelang.playground.v3') || localStorage.getItem('eyelang.playground.v2') || localStorage.getItem('eyelang.playground.v1');
         if (raw) {
           const payload = JSON.parse(raw);
           setProgramValue(payload.program || DEFAULT_PROGRAM);
-          queryInput.value = payload.query || '';
           statsToggle.checked = Boolean(payload.stats);
           proofToggle.checked = Boolean(payload.proof);
           backgroundPrograms = Array.isArray(payload.backgroundPrograms) ? payload.backgroundPrograms : [];
@@ -1248,7 +1231,6 @@
         type: 'run',
         id: currentRunId,
         program: combinedProgram(),
-        query: queryInput.value,
         stats: statsToggle.checked,
         proof: proofToggle.checked,
       });
@@ -1304,13 +1286,11 @@
       if (currentProgramStillMatchesUrl()) {
         url.search = '';
         url.searchParams.set('url', currentProgramUrl);
-        if (queryInput.value.trim()) url.searchParams.set('query', queryInput.value.trim());
         if (statsToggle.checked) url.searchParams.set('stats', '1');
         if (proofToggle.checked) url.searchParams.set('proof', '1');
       } else {
         const params = new URLSearchParams();
         params.set('p', encodePayload(programInput.value));
-        if (queryInput.value.trim()) params.set('q', encodePayload(queryInput.value));
         if (statsToggle.checked) params.set('s', '1');
         if (proofToggle.checked) params.set('r', '1');
         url.search = '';
@@ -1324,7 +1304,6 @@
     loadExampleButton.addEventListener('click', () => loadIntoEditor(`examples/${exampleSelect.value}.pl`, false).catch(error => setStatus(error.message, 'error')));
     resetButton.addEventListener('click', () => {
       setProgramValue(DEFAULT_PROGRAM);
-      queryInput.value = '';
       statsToggle.checked = false;
       proofToggle.checked = false;
       backgroundPrograms = [];
@@ -1357,6 +1336,8 @@
     copyLinkButton.addEventListener('click', () => copyShareLink().catch(error => setStatus(`Could not copy link: ${error.message}`, 'error')));
     clearSavedButton.addEventListener('click', () => {
       localStorage.removeItem(STORAGE_KEY);
+      localStorage.removeItem('eyelang.playground.v6');
+      localStorage.removeItem('eyelang.playground.v5');
       localStorage.removeItem('eyelang.playground.v4');
       localStorage.removeItem('eyelang.playground.v3');
       localStorage.removeItem('eyelang.playground.v2');
@@ -1366,7 +1347,6 @@
     programInput.addEventListener('input', () => { clearErrorLine(); updateProgramSyntax(); markProgramEdited(); });
     programInput.addEventListener('scroll', updateProgramHighlight);
     combinedOutput.addEventListener('scroll', () => { outputGutter.scrollTop = combinedOutput.scrollTop; });
-    queryInput.addEventListener('input', saveState);
     statsToggle.addEventListener('change', saveState);
     proofToggle.addEventListener('change', saveState);
 

package/src/builtins/aggregation.js

@@ -1,4 +1,4 @@
-// Aggregation builtins that run a subquery and collect, count, sum, or select the best answers.
+// Aggregation builtins that run a inner goal and collect, count, sum, or select the best answers.
 // Each handler clones the solver so the inner goal can enumerate independently of the outer goal.
 import { compareTerms, copyResolved, isDecimalInteger, lexicalValue, listFromItems, numberTerm, numberTextFromDouble, parseFiniteNumber, unify } from '../term.js';
 
@@ -14,7 +14,7 @@ export const aggregationBuiltins = {
 
 function* findall({ solver, goal, env }) {
   const [template, innerGoal, bag] = goal.args;
-  const collector = solver.cloneForSubquery(10000000);
+  const collector = solver.cloneForInnerGoal(10000000);
   const collected = [];
   for (const answerEnv of collector.solve([innerGoal], env.clone(), 0)) collected.push(copyResolved(template, answerEnv));
   const next = env.clone();
@@ -23,7 +23,7 @@ function* findall({ solver, goal, env }) {
 
 function* countall({ solver, goal, env }) {
   const [innerGoal, count] = goal.args;
-  const collector = solver.cloneForSubquery(10000000);
+  const collector = solver.cloneForInnerGoal(10000000);
   let n = 0;
   for (const _ of collector.solve([innerGoal], env.clone(), 0)) n++;
   const next = env.clone();
@@ -32,7 +32,7 @@ function* countall({ solver, goal, env }) {
 
 function* sumall({ solver, goal, env }) {
   const [template, innerGoal, sum] = goal.args;
-  const collector = solver.cloneForSubquery(10000000);
+  const collector = solver.cloneForInnerGoal(10000000);
   let intSum = 0n;
   let floatMode = false;
   let floatSum = 0;
@@ -55,7 +55,7 @@ function* sumall({ solver, goal, env }) {
 function aggregateBest(wantMin) {
   return function* ({ solver, goal, env }) {
     const [keyTemplate, valueTemplate, innerGoal, bestKey, bestValue] = goal.args;
-    const collector = solver.cloneForSubquery(10000000);
+    const collector = solver.cloneForInnerGoal(10000000);
     let has = false;
     let key = null;
     let value = null;

package/src/builtins/control.js

@@ -1,4 +1,4 @@
-// Control builtins.  These intentionally use bounded sub-solvers so not/1 and once/1 only ask for the answers they need.
+// Control builtins.  These intentionally use bounded nested solvers so not/1 and once/1 only ask for the answers they need.
 export const controlBuiltins = {
   register(registry) {
     registry.add('not', 1, notBuiltin);
@@ -7,14 +7,14 @@ export const controlBuiltins = {
 };
 
 function* notBuiltin({ solver, goal, env }) {
-  const limited = solver.cloneForSubquery(1);
+  const limited = solver.cloneForInnerGoal(1);
   let found = false;
   for (const _ of limited.solve([goal.args[0]], env.clone(), 0)) { found = true; break; }
   if (!found) yield env;
 }
 
 function* onceBuiltin({ solver, goal, env }) {
-  const limited = solver.cloneForSubquery(1);
+  const limited = solver.cloneForInnerGoal(1);
   for (const answerEnv of limited.solve([goal.args[0]], env.clone(), 0)) {
     yield answerEnv;
     break;

package/src/cli.js

@@ -1,5 +1,5 @@
 // Command-line interface for eyelang.
-// It loads programs from files, URLs, or stdin, then either materializes derived output or evaluates an explicit query.
+// It loads programs from files, URLs, or stdin, then materializes derived output predicates.
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import process from 'node:process';
@@ -16,7 +16,6 @@ export async function main(argv) {
   const options = {
     files: [],
     proof: false,
-    query: null,
     stats: false,
     version: false,
   };
@@ -35,9 +34,6 @@ export async function main(argv) {
       return;
     } else if (!endOptions && (arg === '--proof' || arg === '-p')) {
       options.proof = true;
-    } else if (!endOptions && arg === '--query') {
-      if (i + 1 >= argv.length) throw new Error('--query requires an argument');
-      options.query = argv[++i];
     } else if (!endOptions && arg === '--stats') {
       options.stats = true;
     } else if (!endOptions && arg.startsWith('-') && arg !== '-') {
@@ -76,20 +72,18 @@ export async function main(argv) {
   const engine = await loadEngine();
   const program = engine.Program.parseSources(sourceParts, { sourceMetadata: options.proof, markRecursive: options.proof });
 
-  if (options.query != null) await runQuery(engine, program, options.query, options);
-  else await runDefault(engine, program, options);
+  await runDefault(engine, program, options);
 }
 
 async function loadEngine() {
   if (engineModule == null) {
-    const [term, program, solver, parser, registry] = await Promise.all([
+    const [term, program, solver, registry] = await Promise.all([
       import('./term.js'),
       import('./program.js'),
       import('./solver.js'),
-      import('./parser.js'),
       import('./builtins/registry.js'),
     ]);
-    engineModule = { ...term, ...program, ...solver, ...parser, ...registry };
+    engineModule = { ...term, ...program, ...solver, ...registry };
   }
   return engineModule;
 }
@@ -99,21 +93,6 @@ async function loadExplanation() {
   return explanationModule;
 }
 
-async function runQuery(engine, program, query, options) {
-  const goal = engine.parseQueryGoal(query);
-  const registry = engine.getDefaultRegistry();
-  const solver = new engine.Solver(program, { registry });
-  const explanation = options.proof ? await loadExplanation() : null;
-
-  for (const env of solver.solve([goal], new engine.Env(), 0)) {
-    process.stdout.write(`${engine.termToString(goal, env, true)}.\n`);
-
-    if (options.proof) writeExplanation(explanation, program, engine.copyResolved(goal, env), registry);
-  }
-
-  if (options.stats) printStats(solver.stats);
-}
-
 async function runDefault(engine, program, options) {
   const goals = program.materializationGoals();
   const materializedKeys = new Set(goals.map((goal) => `${goal.name}/${goal.arity}`));
@@ -163,7 +142,6 @@ Input:
 Options:
   -h, --help            Show this help text and exit.
   -p, --proof           Enable proof explanations.
-      --query GOAL      Run GOAL as a query instead of materializing output predicates.
       --stats           Print solver statistics to stderr after execution.
   -v, --version         Show the package version and exit.
   --                    Stop option parsing; following arguments are treated as files.

package/src/index.js

@@ -1,7 +1,7 @@
 // Public JavaScript API surface for embedders and the browser playground.
 // The CLI imports the same parser, program, solver, and term primitives from here.
 export { Program, makeProgram } from './program.js';
-export { parseClauses, parseProgramText, parseQueryGoal } from './parser.js';
+export { parseClauses, parseProgramText } from './parser.js';
 export { Solver } from './solver.js';
 export * from './term.js';
 export { BuiltinRegistry, createDefaultRegistry, getDefaultRegistry } from './builtins/registry.js';
@@ -9,7 +9,6 @@ export { BuiltinRegistry, createDefaultRegistry, getDefaultRegistry } from './bu
 import { Env, copyResolved, termIsGround, termToString } from './term.js';
 import { Program } from './program.js';
 import { Solver } from './solver.js';
-import { parseQueryGoal } from './parser.js';
 import { whyNoProof, whyProof } from './explain.js';
 import { getDefaultRegistry } from './builtins/registry.js';
 
@@ -20,28 +19,20 @@ export function run(source, options = {}) {
   const runOptions = options.registry ? options : { ...options, registry: getDefaultRegistry() };
   const solver = new Solver(program, runOptions);
   const output = [];
-  if (options.query) {
-    const goal = typeof options.query === 'string' ? parseQueryGoal(options.query) : options.query;
-    for (const env of solver.solve([goal], new Env(), 0)) {
-      output.push(`${termToString(goal, env, true)}.\n`);
-      if (includeWhy) appendExplanation(output, program, copyResolved(goal, env), runOptions.registry);
-    }
-  } else {
-    const goals = program.materializationGoals();
-    const materializedKeys = new Set(goals.map((goal) => `${goal.name}/${goal.arity}`));
-    const facts = program.sourceFactLines(materializedKeys);
-    const seen = new Set();
-    for (const goal of goals) {
-      const localSolver = new Solver(program, runOptions);
-      for (const env of localSolver.solve([goal], new Env(), 0)) {
-        const resolved = copyResolved(goal, env);
-        if (!termIsGround(resolved)) continue;
-        const line = `${termToString(resolved, new Env(), true)}.\n`;
-        if (facts.has(line) || seen.has(line)) continue;
-        seen.add(line);
-        output.push(line);
-        if (includeWhy) appendExplanation(output, program, resolved, runOptions.registry);
-      }
+  const goals = program.materializationGoals();
+  const materializedKeys = new Set(goals.map((goal) => `${goal.name}/${goal.arity}`));
+  const facts = program.sourceFactLines(materializedKeys);
+  const seen = new Set();
+  for (const goal of goals) {
+    const localSolver = new Solver(program, runOptions);
+    for (const env of localSolver.solve([goal], new Env(), 0)) {
+      const resolved = copyResolved(goal, env);
+      if (!termIsGround(resolved)) continue;
+      const line = `${termToString(resolved, new Env(), true)}.\n`;
+      if (facts.has(line) || seen.has(line)) continue;
+      seen.add(line);
+      output.push(line);
+      if (includeWhy) appendExplanation(output, program, resolved, runOptions.registry);
     }
   }
   return { stdout: output.join(''), stats: solver.stats };

package/src/parser.js

@@ -399,9 +399,9 @@ export function parseProgramText(source) {
   return parseClauses(source);
 }
 
-export function parseQueryGoal(query) {
-  const clauses = parseClauses(`q(${query}).`);
+export function parseGoalText(text) {
+  const clauses = parseClauses(`zz_goal(${text}).`);
   const head = clauses[0]?.head;
-  if (!head || head.args.length < 1) throw new Error('bad query');
+  if (!head || head.args.length < 1) throw new Error('bad goal');
   return head.args[0];
 }

package/src/solver.js

@@ -31,7 +31,7 @@ export class Solver {
     };
   }
 
-  cloneForSubquery(solutionLimit = this.solutionLimit) {
+  cloneForInnerGoal(solutionLimit = this.solutionLimit) {
     const solver = new Solver(this.program, { registry: this.registry, maxDepth: this.maxDepth, solutionLimit });
     solver.memo = this.memo;
     return solver;
@@ -114,7 +114,7 @@ export class Solver {
     }
     if (!entry.complete && !entry.computing) {
       entry.computing = true;
-      const collector = this.cloneForSubquery();
+      const collector = this.cloneForInnerGoal();
       for (const answerEnv of collector.solveUserGoalUncached(group, goal, [], env.clone(), depth)) {
         entry.answers.push(goal.args.map((arg) => importResolved(arg, answerEnv)));
       }

package/test/run-conformance.js

@@ -37,12 +37,10 @@ function runProfile(reporter, profile) {
 
 function runCase(profile, name, file, casesDir, expectedDir) {
   const programFile = path.join(casesDir, file);
-  const queryFile = path.join(casesDir, `${name}.query`);
   const expected = path.join(expectedDir, `${name}.out`);
   const text = fs.readFileSync(programFile, 'utf8');
   const program = Program.parseSources([{ text, filename: file }], { sourceMetadata: false, markRecursive: false });
-  const options = fs.existsSync(queryFile) ? { query: fs.readFileSync(queryFile, 'utf8').trim() } : {};
-  const actual = run(program, options).stdout;
+  const actual = run(program).stdout;
 
   if (!fs.existsSync(expected)) {
     throw new Error(`missing expected file: ${path.relative(root, expected)}`);