@dallaylaen/ski-interpreter 2.3.0 → 2.3.2

package/CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.2] - 2026-03-01
+
+### Added
+
+- `SKI.extras.foldr(expr: Expr, fun: (expr: Expr, args: T[]) => T): T` (experimental) -
+apply function `fun` to every term in root position in a subexpression,
+followed by the result of folding its arguments.
+
+## [2.3.1] - 2026-03-01
+
+### Fixed
+- Links in documentation.
+
+### Added
+- `ski.js extract <expression> <term> ...` - rewrite the given expression to an equivalent using provided terms where possible.
+- `ski.js search <expression> <term> ...` - brute-force search for an expression equivalent to the given one using the provided terms.
+
 ## [2.3.0] - 2026-02-28
 
 ### BREAKING CHANGES

package/README.md

@@ -270,7 +270,7 @@ q.check('K'); // fail
 q.check('K(K(y x))') // nope! the variable scopes won't match
 ```
 
-See also [the quest guide](./docs/quest-intro.md) for more details on building your own quests or even interactive quest pages.
+See also [the quest guide](quest-intro.md) for more details on building your own quests or even interactive quest pages.
 
 # Package contents
 

package/bin/ski.js

@@ -40,6 +40,22 @@ program
     evaluateFile(filepath, options.verbose);
   });
 
+// Search subcommand
+program
+  .command('search <target> <terms...>')
+  .description('Search for an expression equivalent to target using known terms')
+  .action((target, terms) => {
+    searchExpression(target, terms);
+  });
+
+// Extract subcommand
+program
+  .command('extract <target> <terms...>')
+  .description('Rewrite target expression using known terms where possible')
+  .action((target, terms) => {
+    extractExpression(target, terms);
+  });
+
 // Quest-check subcommand
 program
   .command('quest-check <files...>')
@@ -203,6 +219,64 @@ async function questCheck (files, solutionFile) {
   }
 }
 
+function searchExpression (targetStr, termStrs) {
+  const ski = new SKI();
+  const jar = {};
+  const target = ski.parse(targetStr, { vars: jar });
+  const seed = termStrs.map(s => ski.parse(s, { vars: jar }));
+
+  const { expr } = target.infer();
+  if (!expr) {
+    console.error('target expression is not normalizable: ' + target);
+    process.exit(1);
+  }
+
+  const res = SKI.extras.search(seed, { tries: 10_000_000, depth: 100 }, (e, p) => {
+    if (!p.expr)
+      return -1;
+    if (p.expr.equals(expr))
+      return 1;
+    return 0;
+  });
+
+  if (res.expr) {
+    console.log(`Found ${res.expr} after ${res.total} tries.`);
+    process.exit(0);
+  } else {
+    console.error(`No equivalent expression found for ${target} after ${res.total} tries.`);
+    process.exit(1);
+  }
+}
+
+function extractExpression (targetStr, termStrs) {
+  const ski = new SKI();
+  const expr = ski.parse(targetStr);
+  const pairs = termStrs
+    .map(s => ski.parse(s))
+    .map(e => [e.infer().expr, e]);
+
+  const uncanonical = pairs.filter(pair => !pair[0]);
+  if (uncanonical.length) {
+    console.error('Some expressions could not be canonized: '
+      + uncanonical.map(p => p[1].toString()).join(', '));
+    process.exit(1);
+  }
+
+  const replaced = expr.traverse(e => {
+    const canon = e.infer().expr;
+    for (const [lambda, term] of pairs) {
+      if (canon.equals(lambda))
+        return term;
+    }
+    return null;
+  });
+
+  if (replaced)
+    console.log(replaced.toString());
+  else
+    console.log('// unchanged');
+}
+
 function handleCommand (input, ski) {
   const parts = input.trim().split(/\s+/);
   const cmd = parts[0];

package/lib/ski-interpreter.cjs.js

@@ -2220,7 +2220,11 @@ var require_extras = __commonJS({
         return s.format({ inventory: res.env });
       }).join("; ");
     }
-    module2.exports = { search, deepFormat, declare };
+    function foldr(expr, fun) {
+      const [head, ...tail] = expr.unroll();
+      return fun(head, tail.map((e) => foldr(e, fun)));
+    }
+    module2.exports = { search, deepFormat, declare, foldr };
   }
 });