eyeprolog 1.1.3 → 1.1.4

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/src/cli.js

@@ -48,9 +48,9 @@ export async function main(argv) {
       options.version = true;
     } else if (!endOptions && (arg === '--warnings' || arg === '-w')) {
       options.warnings = true;
-    } else if (!endOptions && arg === '--goal') {
+    } else if (!endOptions && (arg === '--goal' || arg === '-g')) {
       const goal = argv[++i];
-      if (goal == null) throw new Error('option --goal requires a goal');
+      if (goal == null) throw new Error(`option ${arg} requires a goal`);
       options.goals.push(goal);
     } else if (!endOptions && arg.startsWith('-') && !arg.startsWith('--') && arg.length > 2) {
       const flags = arg.slice(1);
@@ -210,7 +210,7 @@ Options:
   -s, --stats           Print solver statistics to stderr after execution.
   -v, --version         Show the package version and exit.
   -w, --warnings        Print non-fatal portability warnings to stderr.
-  --goal goal           Solve goal and print its ground answers; may be repeated.
+  -g, --goal goal       Solve goal and print its ground answers; may be repeated.
                         If omitted, use %% goal: comments from the inputs.
   --                    Stop option parsing; following arguments are treated as files.
 `);

package/test/run-regression.mjs

@@ -210,6 +210,7 @@ why(
         assertEqual(result.status, 0, 'exit status');
         assertIncludes(result.stdout, 'Usage:\n  eyeprolog\n  eyeprolog [options] [file-or-url.pl|- ...]', 'stdout');
         assertIncludes(result.stdout, 'With no arguments, start a Prolog REPL.', 'stdout');
+        assertIncludes(result.stdout, '-g, --goal goal', 'stdout');
         assertIncludes(result.stdout, '-p, --proof', 'stdout');
         assertIncludes(result.stdout, '-s, --stats', 'stdout');
         assertIncludes(result.stdout, '-v, --version', 'stdout');
@@ -366,6 +367,31 @@ why(
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: '-g supplies an explicit CLI goal',
+      run: () => {
+        const input = [
+          '%% goal: answer(metadata, X)',
+          'value(metadata, ignored).',
+          'value(explicit, selected).',
+          'answer(Kind, Value) :- value(Kind, Value).',
+          '',
+        ].join('\n');
+        const result = runCli(['-g', 'answer(explicit, X)', '-'], { input });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout, 'answer(explicit, selected).\n', 'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
+    {
+      name: '-g requires a goal argument',
+      run: () => {
+        const result = runCli(['-g']);
+        assertEqual(result.status, 1, 'exit status');
+        assertEqual(result.stdout, '', 'stdout');
+        assertEqual(result.stderr, 'eyeprolog: option -g requires a goal\n', 'stderr');
+      },
+    },
 
     {
       name: '--proof enables query explanations',

package/the-art-of-eyeprolog.md

@@ -6046,13 +6046,13 @@ displays command-line help.
 ### Selecting goals
 
 A Prolog source file states facts, rules, and ISO directives; the command line
-selects what to solve. Supply `--goal` followed by a callable Prolog goal:
+selects what to solve. Supply `-g` or `--goal` followed by a callable Prolog goal:
 
 ```sh
 eyeprolog --goal 'ancestor(ada, Who)' examples/ancestor.pl
 ```
 
-Repeat `--goal` to request several result relations in one run. EyeProlog prints
+Repeat `-g` or `--goal` to request several result relations in one run. EyeProlog prints
 their ground answers in the order the goals were supplied.
 
 For a self-running example, place the host goal in an ordinary comment:
@@ -6061,8 +6061,8 @@ For a self-running example, place the host goal in an ordinary comment:
 %% goal: ancestor(ada, Who)
 ```
 
-When no `--goal` option is present, the CLI reads these comments from all input
-sources and runs them in source order. An explicit `--goal` overrides them.
+When no `-g` or `--goal` option is present, the CLI reads these comments from all
+input sources and runs them in source order. An explicit goal option overrides them.
 Because `%% goal:` is a comment rather than a Prolog directive, another ISO
 processor may ignore it and the program remains portable Prolog text. External
 goals are still preferable when a script, shell history, or API call should
@@ -6075,7 +6075,7 @@ make the observed question explicit.
 | `-s`, `--stats` | Print solver counters to stderr |
 | `-v`, `--version` | Print the package version |
 | `-w`, `--warnings` | Print non-fatal portability warnings |
-| `--goal Goal` | Solve a callable goal; may be repeated; overrides `%% goal:` comments |
+| `-g`, `--goal Goal` | Solve a callable goal; may be repeated; overrides `%% goal:` comments |
 | `--` | Treat following arguments as inputs |
 
 Short flags may be combined, so `-pw` is equivalent to `-p -w`.