eolang 0.34.0 → 0.35.0

package/.markdownlint.json

@@ -0,0 +1,8 @@
+{
+  "MD033": {
+    "allowed_elements": [
+      "details",
+      "summary"
+    ]
+  }
+}

package/CLAUDE.md

@@ -0,0 +1,5 @@
+# Instructions for Agents
+
+To build the repo use 'npm install' and then 'npx grunt'.
+To run all lints use 'npx eslint'.
+Run eslint after every change you make.

package/Formula/eolang.rb

@@ -7,9 +7,9 @@ require "language/node"
 class Eolang < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.5.tar.gz"
-  version "0.33.1"
-  sha256 "f2a88bad46caa6a67d9058e8e7add2ff05f26959b08b3151c13f9178aab7e6a9"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.34.1.tar.gz"
+  version "0.34.1"
+  sha256 "ecf7f19115086fadbe1785b789378928d81dc8f0e3aa154b268f3a747c80fd01"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.32.0.rb

@@ -4,12 +4,12 @@
 #
 
 require "language/node"
-class Eolang < Formula
+class EolangAT0320 < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.5.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.32.0.tar.gz"
   version "0.32.0"
-  sha256 "f2a88bad46caa6a67d9058e8e7add2ff05f26959b08b3151c13f9178aab7e6a9"
+  sha256 "a24da178f48e1e64280aa467fd97986d9456a25ea023525bf36a9308ec1a4cea"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.32.1.rb

@@ -4,12 +4,12 @@
 #
 
 require "language/node"
-class Eolang < Formula
+class EolangAT0321 < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.5.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.32.1.tar.gz"
   version "0.32.1"
-  sha256 "f2a88bad46caa6a67d9058e8e7add2ff05f26959b08b3151c13f9178aab7e6a9"
+  sha256 "6770b4eb3068b5675e2f8c1cce580693f2ad844c6f9472fd2e236f81ba356ab2"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.33.0.rb

@@ -4,12 +4,12 @@
 #
 
 require "language/node"
-class Eolang < Formula
+class EolangAT0330 < Formula
   desc "Command-line Tool-Kit"
   homepage "https://github.com/objectionary/eoc"
-  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.5.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.0.tar.gz"
   version "0.33.0"
-  sha256 "f2a88bad46caa6a67d9058e8e7add2ff05f26959b08b3151c13f9178aab7e6a9"
+  sha256 "6e01b4d88ba92018c359fa0bffc3a23742610de454107a7605cd2eecb9ba9a33"
   license "MIT"
 
   depends_on "node"

package/README.md

@@ -9,6 +9,7 @@
 [![codecov](https://codecov.io/gh/objectionary/eoc/branch/master/graph/badge.svg)](https://codecov.io/gh/objectionary/eoc)
 [![Hits-of-Code](https://hitsofcode.com/github/objectionary/eoc)](https://hitsofcode.com/view/github/objectionary/eoc)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/objectionary/eoc/blob/master/LICENSE.txt)
+[![Release](https://img.shields.io/github/v/release/objectionary/eoc.svg)](https://github.com/objectionary/eoc/releases/tag/0.34.1)
 
 This is a command-line tool-kit for [EO](https://www.eolang.org)
 programming languages, allowing you to compile EO programs, test, dataize,
@@ -19,14 +20,14 @@ First, you install [npm][npm-install] and [Java SE][java-se].
 Then, you install [eolang][npm] package, using [npm][npm-install]:
 
 ```bash
-npm install -g eolang@0.33.5
+npm install -g eolang@0.34.1
 ```
 
 You can also use [Homebrew] (on macOS):
 
 ```bash
 brew tap objectionary/eoc https://github.com/objectionary/eoc
-brew install objectionary/eoc/eolang@0.33.5
+brew install objectionary/eoc/eolang@0.34.1
 ```
 
 Or install it via [Nix flakes](https://nixos.wiki/wiki/Flakes):
@@ -35,7 +36,9 @@ Or install it via [Nix flakes](https://nixos.wiki/wiki/Flakes):
 nix run github:objectionary/eoc
 ```
 
-You can also include EOLANG in your own flake:
+<details>
+
+<summary>You can also include EOLANG in your own flake</summary>
 
 ```nix
 {
@@ -87,13 +90,15 @@ After that, select one of the methods for installing the package:
 }
 ```
 
+</details>
+
 Then, you write a simple [EO](https://www.eolang.org) program in `hello.eo` file
 in the current directory:
 
 ```eo
 # My first object in EO!
 [args] > hello
-  QQ.io.stdout > @
+  io.stdout > @
     "Hello, world!\n"
 ```
 
@@ -131,13 +136,15 @@ There are also commands that help manipulate with XMIR and EO sources
 
 * `audit` inspects all required packages and reports their status
 * `foreign` inspects all objects found in the program after the `assemble` step
-* `sodg` generates `.sodg` from `.xmir`, further rederable as XML or [Dot][dot]
 * `print` generates `.eo` files from `.xmir` files
 * `generate_comments` generates `.json` files with LLM-generated
   documentation for `.eo` structures
 * `docs` generates HTML documentation from `.xmir` files
 * `latex` generates `.tex` files from `.eo` sources
 * `fmt` formats `.eo` files in the source directory
+* `normalize` normalizes `.eo` files via phi-calculus rewriting using
+  [phino](https://github.com/objectionary/phino) (must be installed separately);
+  original files are saved to `.eoc/before-normalize/` for debugging
 * ~~`translate` converts Java/C++/Python/etc. program to EO program~~
 * ~~`demu` removes `cage` and `memory` objects~~
 * ~~`dejump` removes `goto` objects~~
@@ -197,6 +204,5 @@ a pull request.
 [npm]: https://www.npmjs.com/package/eolang
 [java-se]: https://www.oracle.com/java/technologies/downloads/
 [npm-install]: https://docs.npmjs.com/downloading-and-installing-node-js-and-npm
-[dot]: https://en.wikipedia.org/wiki/DOT_%28graph_description_language%29
 [blog]: https://www.yegor256.com/2021/10/21/objectionary.html
 [Homebrew]: https://brew.sh/

package/eo-version.txt

@@ -1 +1 @@
-0.59.5
+0.59.9

package/eslint.config.js

@@ -14,7 +14,7 @@ const localPlugin = {
 
 module.exports = [
   {
-    ignores: ['node_modules/'],
+    ignores: ['node_modules/', '.aidy/'],
   },
   {
     ...configs.all,

package/home-tag.txt

@@ -1 +1 @@
-0.59.5
+0.59.7

package/mvnw/.mvn/wrapper/maven-wrapper.properties

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
 # SPDX-License-Identifier: MIT
 
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip

package/mvnw/dependency-reduced-pom.xml

@@ -35,8 +35,6 @@
         <version>${eo.version}</version>
         <configuration>
           <excludeSources>**/.eoc/**</excludeSources>
-          <sodgIncludes>${eo.sodgIncludes}</sodgIncludes>
-          <sodgExcludes>${eo.sodgIncludes},**/*-test.eo</sodgExcludes>
           <foreign>${project.build.directory}/eo-foreign.json</foreign>
           <foreignFormat>json</foreignFormat>
         </configuration>
@@ -75,11 +73,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>
@@ -97,8 +95,6 @@
             <version>${eo.version}</version>
             <configuration>
               <excludeSources>**/.eoc/**</excludeSources>
-              <sodgIncludes>${eo.sodgIncludes},**/*-test.eo</sodgIncludes>
-              <sodgExcludes>${eo.sodgExcludes}</sodgExcludes>
               <foreign>${project.build.directory}/eo-foreign.json</foreign>
               <foreignFormat>json</foreignFormat>
             </configuration>
@@ -124,7 +120,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.5</version>
             <configuration>
               <skipTests>false</skipTests>
               <failIfNoTests>true</failIfNoTests>

package/mvnw/pom.xml

@@ -56,8 +56,6 @@
         <version>${eo.version}</version>
         <configuration>
           <excludeSources>**/.eoc/**</excludeSources>
-          <sodgIncludes>${eo.sodgIncludes}</sodgIncludes>
-          <sodgExcludes>${eo.sodgIncludes},**/*-test.eo</sodgExcludes>
           <foreign>${project.build.directory}/eo-foreign.json</foreign>
           <foreignFormat>json</foreignFormat>
         </configuration>
@@ -96,11 +94,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.5.4</version>
+        <version>3.5.5</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>
@@ -137,8 +135,6 @@
             <version>${eo.version}</version>
             <configuration>
               <excludeSources>**/.eoc/**</excludeSources>
-              <sodgIncludes>${eo.sodgIncludes},**/*-test.eo</sodgIncludes>
-              <sodgExcludes>${eo.sodgExcludes}</sodgExcludes>
               <foreign>${project.build.directory}/eo-foreign.json</foreign>
               <foreignFormat>json</foreignFormat>
             </configuration>
@@ -164,7 +160,7 @@
           </plugin>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.5.4</version>
+            <version>3.5.5</version>
             <configuration>
               <skipTests>false</skipTests>
               <failIfNoTests>true</failIfNoTests>

package/package.json

@@ -25,10 +25,10 @@
     "grunt": "^1.6.1",
     "grunt-contrib-clean": "^2.0.1",
     "grunt-eslint": "^26.0.0",
-    "grunt-mocha-cli": "^7.0.0",
+    "grunt-mocha-test": "^0.13.3",
     "istanbul": "^0.4.5",
     "mocha": "^11.7.5",
-    "nyc": "^17.1.0",
+    "nyc": "^18.0.0",
     "patch-package": "^8.0.0"
   },
   "engines": {
@@ -74,5 +74,5 @@
     "postinstall": "node scripts/postinstall.js",
     "test": "mocha 'test/**/*.js' --timeout 1200000"
   },
-  "version": "0.34.0"
+  "version": "0.35.0"
 }

package/renovate.json

@@ -7,5 +7,8 @@
     "org.apache.maven.plugins:maven-compiler-plugin",
     "org.eolang:eo-maven-plugin",
     "org.eolang:eo-runtime"
+  ],
+  "ignorePaths": [
+    "Formula/**"
   ]
 }

package/src/commands/assemble.js

@@ -16,8 +16,18 @@ const {elapsed} = require('../elapsed');
 module.exports = function(opts) {
   const target = path.resolve(opts.target);
   return elapsed(async (tracked) => {
-    const r = await mvnw(['eo:assemble'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     tracked.print(`EO program assembled in ${rel(target)}`);
     return r;
   });
 };
+
+/**
+ * Command to get Maven goals for assemble command.
+ * @return {Array.<String>} of Maven goals to run for assemble command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['eo:assemble'];
+}

package/src/commands/docs.js

@@ -8,25 +8,8 @@ const path = require('path');
 const SaxonJS = require('saxon-js');
 const { marked } = require('marked');
 const {elapsed} = require('../elapsed');
+const {findFiles} = require('../files');
 
-/**
- * Recursively reads all .xmir files from a directory.
- * @param {string} dir - Directory path
- * @return {string[]} Array of file paths
- */
-function readXmirsRecursively(dir) {
-  const files = [];
-  const entries = fs.readdirSync(dir, {withFileTypes: true});
-  for (const entry of entries) {
-    const full = path.join(dir, entry.name);
-    if (entry.isDirectory()) {
-      files.push(...readXmirsRecursively(full));
-    } else if (entry.name.endsWith('.xmir')) {
-      files.push(full);
-    }
-  }
-  return files;
-}
 
 /**
  * Applies XSLT to XMIR
@@ -136,7 +119,7 @@ module.exports = function(opts) {
       fs.writeFileSync(css, '');
       const packages_info = {};
       const all_xmir_htmls = [];
-      const xmirs = readXmirsRecursively(input);
+      const xmirs = findFiles(input, '.xmir');
       for (const xmir of xmirs) {
         const relative = path.relative(input, xmir);
         const name = path.parse(xmir).name;

package/src/commands/java/compile.js

@@ -2,7 +2,6 @@
  * SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
  * SPDX-License-Identifier: MIT
  */
-
 const rel = require('relative');
 const {mvnw, flags} = require('../../mvnw');
 const {elapsed} = require('../../elapsed');
@@ -16,8 +15,18 @@ const path = require('path');
 module.exports = function(opts) {
   const target = path.resolve(opts.target);
   return elapsed(async (tracked) => {
-    const r = await mvnw(['test-compile'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     tracked.print(`Java .class files compiled in ${rel(target)}`);
     return r;
   });
 };
+
+/**
+ * Method to get Maven goals for compile command.
+ * @return {Array.<String>} of Maven goals to run for compile command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['test-compile'];
+}

package/src/commands/java/link.js

@@ -16,8 +16,18 @@ const path = require('path');
 module.exports = function(opts) {
   const jar = path.resolve(opts.target, 'eoc.jar');
   return elapsed(async (tracked) => {
-    const r = await mvnw(['jar:jar', 'shade:shade'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     tracked.print(`Executable JAR created at ${rel(jar)}`);
     return r;
   });
 };
+
+/**
+ * Command to get Maven goals for link command.
+ * @return {Array.<String>} of Maven goals to run for link command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['jar:jar', 'shade:shade'];
+}

package/src/commands/java/pipeline.js

@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
+ * SPDX-License-Identifier: MIT
+ */
+
+const {mvnw, flags} = require('../../mvnw');
+const {elapsed} = require('../../elapsed');
+
+/**
+ * Runs multiple Maven goals in a single Maven invocation.
+ * @param {Object} coms - Command map to resolve goals and extra flags from
+ * @param {Array.<String>} commands - Command names to run in order
+ * @param {Object} opts - All options
+ * @return {Promise} of pipeline task
+ */
+module.exports = function(coms, commands, opts, maven = mvnw) {
+  return elapsed(async (tracked) => {
+    const {goals, extras} = collect(coms, commands, opts);
+    const result = await maven(goals.concat(flags(opts)).concat(extras), opts.target, opts.batch);
+    tracked.print(`Pipeline [${commands.join(' \u2192 ')}] done`);
+    return result;
+  });
+};
+
+function collect(coms, commands, opts) {
+  const extras = [];
+  const goals = commands.flatMap((cmd) => {
+    const command = coms[cmd];
+    if (command.extras) {
+      extras.push(...command.extras(opts));
+    }
+    return command.goals(opts) || [];
+  });
+  return {goals, extras};
+};

package/src/commands/java/resolve.js

@@ -15,12 +15,19 @@ const path = require('path');
  */
 module.exports = function(opts) {
   return elapsed(async (tracked) => {
-    await mvnw(['eo:resolve'].concat(flags(opts)), opts.target, opts.batch);
-    const sources = path.resolve(opts.target, 'eo/6-resolve');
-    console.info('Dependencies resolved in %s', rel(sources));
-    const r = await mvnw(['eo:place'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     const classes = path.resolve(opts.target, 'classes');
     tracked.print(`Dependencies placed in ${rel(classes)}`);
     return r;
   });
 };
+
+/**
+ * Command to get Maven goals for resolve command.
+ * @return {Array.<String>} of Maven goals to run for resolve command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['eo:resolve', 'eo:place'];
+}

package/src/commands/java/transpile.js

@@ -16,8 +16,18 @@ const path = require('path');
 module.exports = function(opts) {
   const sources = path.resolve(opts.target, 'generated-sources');
   return elapsed(async (tracked) => {
-    const r = await mvnw(['eo:transpile'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     tracked.print(`Java sources generated in ${rel(sources)}`);
     return r;
   });
 };
+
+/**
+ * Command to get Maven goals for transpile command.
+ * @return {Array.<String>} of Maven goals to run for transpile command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['eo:transpile'];
+}

package/src/commands/js/pipeline.js

@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
+ * SPDX-License-Identifier: MIT
+ */
+
+const {elapsed} = require('../../elapsed');
+
+/**
+ * Runs multiple JS pipeline steps sequentially.
+ * @param {Object} coms - Command map to resolve step functions from
+ * @param {Array.<String>} commands - Command names to run in order
+ * @param {Object} opts - All options
+ * @return {Promise} of pipeline task
+ */
+module.exports = function(coms, commands, opts) {
+  return elapsed(async (tracked) => {
+    for (const cmd of commands) {
+      // eslint-disable-next-line no-await-in-loop
+      await coms[cmd](opts);
+    }
+    tracked.print(`Pipeline [${commands.join(' \u2192 ')}] done`);
+  });
+};

package/src/commands/js/transpile.js

@@ -15,7 +15,7 @@ const path = require('path');
  */
 module.exports = function(opts) {
   return elapsed(async (tracked) => {
-    const r = await eo2jsw('transpile', { ...opts, alone: true, project: 'project' });
+    const r = await eo2jsw('transpile', {...opts, alone: true, project: 'project'});
     tracked.print(`JS sources generated in ${rel(path.resolve(opts.target, 'project'))}`);
     return r;
   });

package/src/commands/lint.js

@@ -15,14 +15,12 @@ const semver = require('semver');
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
-  const extra = [
-    `-Deo.failOnWarning=${opts.easy ? 'false' : 'true'}`,
-  ];
+  const extra = extraFlags(opts);
   return elapsed(async (tracked) => {
-    if (opts.parser.endsWith('-SNAPSHOT') || semver.gte(opts.parser, '0.45.0')) {
+    if (goals(opts)[0] === 'eo:lint') {
       try {
         const r = await mvnw(
-          ['eo:lint'].concat(flags(opts)).concat(extra),
+          goals(opts).concat(flags(opts)).concat(extra),
           opts.target, opts.batch
         );
         tracked.print(`EO program linted in ${rel(path.resolve(opts.target))}`);
@@ -30,13 +28,13 @@ module.exports = function(opts) {
       } catch (error) {
         throw new Error(
           'There are errors and/or warnings; you may disable warnings via the --easy option',
-          { cause: error }
+          {cause: error}
         );
       }
     }
     try {
       const r = await mvnw(
-        ['eo:verify'].concat(flags(opts)).concat(extra),
+        goals(opts).concat(flags(opts)).concat(extra),
         opts.target, opts.batch
       );
       tracked.print(`EO program verified in ${rel(path.resolve(opts.target))}`);
@@ -44,8 +42,31 @@ module.exports = function(opts) {
     } catch (error) {
       throw new Error(
         'You may disable warnings via the --easy option',
-        { cause: error }
+        {cause: error}
       );
     }
   });
 };
+
+/**
+ * Command to get Maven goals for lint command.
+ * @return {Array.<String>} of Maven goals to run for lint command
+ */
+module.exports.goals = goals;
+
+/**
+* Command to get extra Maven flags for lint command.
+* @return {Array.<String>} of extra Maven flags to run for lint command
+*/
+module.exports.extras = extras;
+
+function goals(opts) {
+  if (opts.parser.endsWith('-SNAPSHOT') || semver.gte(opts.parser, '0.45.0')) {
+    return ['eo:lint'];
+  }
+  return ['eo:verify'];
+}
+
+function extras(opts) {
+  return [`-Deo.failOnWarning=${opts.easy ? 'false' : 'true'}`];
+}

package/src/commands/normalize.js

@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
+ * SPDX-License-Identifier: MIT
+ */
+
+const path = require('path');
+const {execSync} = require('child_process');
+const {mvnw, flags} = require('../mvnw');
+const {elapsed} = require('../elapsed');
+const {findFiles, saveFile, copyDir} = require('../files');
+const relative = require('relative');
+
+/**
+ * Command to normalize .EO files via phi-calculus using phino.
+ * Runs parse, converts XMIR → .phi → normalize → .phi → XMIR → .eo.
+ * Original .eo files are saved to .eoc/before-normalize/ for debugging.
+ * Fails if phino is not installed.
+ * @param {Object} opts - All options
+ * @return {Promise} of normalize task
+ */
+module.exports = function(opts) {
+  if (opts.sources === undefined) {
+    throw new Error('Sources directory is not specified. Please provide it with --sources option.');
+  }
+  if (opts.target === undefined) {
+    throw new Error('Target directory is not specified. Please provide it with --target option.');
+  }
+  try {
+    execSync('phino --version', {stdio: 'pipe'});
+  } catch (e) {
+    throw new Error('phino is not installed, see https://github.com/objectionary/phino', {cause: e});
+  }
+  const sources = path.resolve(opts.sources);
+  const target = path.resolve(opts.target);
+  return elapsed(async (tracked) => {
+    copyDir(sources, path.join(target, 'before-normalize'), '.eo');
+    const parsed = path.join(target, '1-parse');
+    const normed = path.join(target, 'xmir-normalized');
+    const xmirs = findFiles(parsed, '.xmir');
+    console.debug('Found %d XMIR file(s) to normalize', xmirs.length);
+    for (const xmir of xmirs) {
+      const rel = path.relative(parsed, xmir);
+      console.debug('Normalizing %s', rel);
+      const ts = Date.now();
+      const out = execSync(
+        `phino rewrite --input=xmir --output=xmir --normalize ${xmir}`,
+        {stdio: ['pipe', 'pipe', 'pipe']}
+      );
+      console.debug('Normalized in %dms', Date.now() - ts);
+      saveFile(normed, rel, out);
+    }
+    const r = await mvnw(
+      ['eo:print']
+        .concat(flags(opts))
+        .concat([
+          `-Deo.printSourcesDir=${normed}`,
+          `-Deo.printOutputDir=${sources}`,
+        ]),
+      opts.target, opts.batch
+    );
+    tracked.print(`EO files normalized in ${relative(sources)}`);
+    return r;
+  });
+};

package/src/commands/parse.js

@@ -16,8 +16,18 @@ const {elapsed} = require('../elapsed');
 module.exports = function(opts) {
   const target = path.resolve(opts.target);
   return elapsed(async (tracked) => {
-    const r = await mvnw(['eo:parse'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     tracked.print(`EO sources parsed in ${rel(target)}`);
     return r;
   });
 };
+
+/**
+ * Command to get Maven goals for parse command.
+ * @return {Array.<String>} of Maven goals to run for parse command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['eo:parse'];
+}

package/src/commands/register.js

@@ -16,8 +16,18 @@ const path = require('path');
 module.exports = function(opts) {
   const foreign = path.resolve(opts.target, 'eo-foreign.json');
   return elapsed(async (tracked) => {
-    const r = await mvnw(['eo:register'].concat(flags(opts)), opts.target, opts.batch);
+    const r = await mvnw(goals().concat(flags(opts)), opts.target, opts.batch);
     tracked.print(`EO objects registered in ${rel(foreign)}`);
     return r;
   });
 };
+
+/**
+ * Command to get Maven goals for register command.
+ * @return {Array.<String>} of Maven goals to run for register command
+ */
+module.exports.goals = goals;
+
+function goals() {
+  return ['eo:register'];
+}

package/src/eoc.js

@@ -26,13 +26,13 @@ const {program} = require('commander'),
     parse: require('./commands/parse'),
     print: require('./commands/print'),
     register: require('./commands/register'),
-    sodg: require('./commands/sodg'),
     lint: require('./commands/lint'),
     docs: require('./commands/docs'),
     generate_comments: require('./commands/generate_comments'),
     jeo_disassemble: require('./commands/jeo/disassemble'),
     jeo_assemble: require('./commands/jeo/assemble'),
-    latex: require('./commands/latex')
+    latex: require('./commands/latex'),
+    normalize: require('./commands/normalize'),
   },
   commands = {
     [language.java]: {
@@ -43,7 +43,7 @@ const {program} = require('commander'),
         link: require('./commands/java/link'),
         compile: require('./commands/java/compile'),
         dataize: require('./commands/java/dataize'),
-        test: require('./commands/java/test')
+        test: require('./commands/java/test'),
       }
     },
     [language.js]: {
@@ -54,9 +54,13 @@ const {program} = require('commander'),
         link: require('./commands/js/link'),
         compile: require('./commands/js/compile'),
         dataize: require('./commands/js/dataize'),
-        test: require('./commands/js/test')
+        test: require('./commands/js/test'),
       }
     }
+  },
+  pipelines = {
+    [language.java]: require('./commands/java/pipeline'),
+    [language.js]: require('./commands/js/pipeline'),
   };
 
 if (process.argv.includes('--verbose')) {
@@ -106,7 +110,8 @@ program
   .option('-c, --clean', 'Delete .eoc directory before running a command')
   .option('--debug', 'Print ALL debug messages, heavily overloading the log')
   .option('--verbose', 'Print debug messages and full output of child processes')
-  .option('--pin <version>', 'Fail if eoc version doesn\'t match exactly', version.what);
+  .option('--pin <version>', 'Fail if eoc version doesn\'t match exactly', version.what)
+  .option('--update-snapshots', 'Update snapshots in the local repository if they are outdated');
 
 program.command('audit')
   .description('Inspect all packages and report their status')
@@ -142,8 +147,7 @@ program.command('parse')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().parse(program.opts());
+      await pipe()(coms(), ['register', 'parse'], program.opts());
     } else {
       await coms().parse(program.opts());
     }
@@ -155,33 +159,12 @@ program.command('assemble')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
+      await pipe()(coms(), ['register', 'assemble'], program.opts());
     } else {
       await coms().assemble(program.opts());
     }
   });
 
-program.command('sodg')
-  .description('Generate SODG files from XMIR')
-  .option('--xml', 'Generate .sodg.xml files')
-  .option('--xembly', 'Generate .sodg.xe files')
-  .option('--graph', 'Generate .sodg.graph files')
-  .option('--dot', 'Generate .sodg.dot files')
-  .option('--include <names>', 'Generate SODG for these object names (using mask)', '**')
-  .option('--exclude <names>', 'Don\'t generate SODG for these objects')
-  .action(async (str, opts) => {
-    pin(program.opts());
-    clear(str);
-    if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().sodg({...program.opts(), ...str});
-    } else {
-      await coms().sodg({...program.opts(), ...str});
-    }
-  });
-
 program.command('print')
   .description('Generate EO files from XMIR files')
   .option(
@@ -206,9 +189,7 @@ program.command('lint')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint'], program.opts());
     } else {
       await coms().lint(program.opts());
     }
@@ -220,10 +201,7 @@ program.command('resolve')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
-      await coms().resolve(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve'], program.opts());
     } else {
       await coms().resolve(program.opts());
     }
@@ -235,11 +213,7 @@ program.command('transpile')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
-      await coms().resolve(program.opts());
-      await coms().transpile(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile'], program.opts());
     } else {
       await coms().transpile(program.opts());
     }
@@ -251,12 +225,7 @@ program.command('compile')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
-      await coms().resolve(program.opts());
-      await coms().transpile(program.opts());
-      await coms().compile(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile'], program.opts());
     } else {
       await coms().compile(program.opts());
     }
@@ -267,13 +236,7 @@ program.command('link')
   .action(async (str, opts) => {
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
-      await coms().resolve(program.opts());
-      await coms().transpile(program.opts());
-      await coms().compile(program.opts());
-      await coms().link(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
     } else {
       await coms().link(program.opts());
     }
@@ -287,13 +250,7 @@ program.command('dataize')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
-      await coms().resolve(program.opts());
-      await coms().transpile(program.opts());
-      await coms().compile(program.opts());
-      await coms().link(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
       await coms().dataize(
         program.args[1], program.args.slice(2), {...program.opts(), ...str}
       );
@@ -312,13 +269,7 @@ program.command('test')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().register(program.opts());
-      await coms().assemble(program.opts());
-      await coms().lint(program.opts());
-      await coms().resolve(program.opts());
-      await coms().transpile(program.opts());
-      await coms().compile(program.opts());
-      await coms().link(program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
       await coms().test({...program.opts(), ...str});
     } else {
       await coms().test({...program.opts(), ...str});
@@ -397,18 +348,25 @@ program.command('latex')
   .action(async (str, opts) => {
     pin(program.opts());
     clear(str);
-    await coms().register(program.opts());
-    await coms().parse(program.opts());
+    await pipe()(coms(), ['register', 'parse'], program.opts());
     await coms().latex(program.opts());
   });
 
+program.command('normalize')
+  .description('Normalize EO files using phi-calculus normalization via phino')
+  .action(async (str, opts) => {
+    pin(program.opts());
+    clear(str);
+    await pipe()(coms(), ['register', 'parse'], program.opts());
+    await coms().normalize(program.opts());
+  });
+
 program.command('fmt')
   .description('Format EO files in the source directory')
   .action(async (str, opts) => {
     pin(program.opts());
     clear(str);
-    await coms().register(program.opts());
-    await coms().parse(program.opts());
+    await pipe()(coms(), ['register', 'parse'], program.opts());
     await coms().print({
       printInput: '1-parse',
       printOutput: program.opts().sources,
@@ -457,3 +415,16 @@ function coms() {
   }
   return hash;
 }
+
+/**
+ * Get pipeline for the target language.
+ * @return {Function} - pipeline function
+ */
+function pipe() {
+  const lang = program.opts().language;
+  const pipeline = pipelines[lang];
+  if (pipeline === undefined) {
+    throw new Error(`Unknown platform ${lang}`);
+  }
+  return pipeline;
+}

package/src/files.js

@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
+ * SPDX-License-Identifier: MIT
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Recursively find all files with given extension in a directory.
+ * @param {string} dir - Directory to search
+ * @param {string} ext - File extension including dot (e.g. '.xmir')
+ * @return {Array.<string>} List of absolute file paths
+ */
+function findFiles(dir, ext) {
+  if (!fs.existsSync(dir)) {return [];}
+  const result = [];
+  for (const entry of fs.readdirSync(dir, {withFileTypes: true})) {
+    const full = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      result.push(...findFiles(full, ext));
+    } else if (entry.name.endsWith(ext)) {
+      result.push(full);
+    }
+  }
+  return result;
+}
+
+/**
+ * Write content to a file, creating parent directories as needed.
+ * @param {string} dir - Parent directory
+ * @param {string} name - File name relative to dir
+ * @param {Buffer} content - File content
+ */
+function saveFile(dir, name, content) {
+  const file = path.join(dir, name);
+  fs.mkdirSync(path.dirname(file), {recursive: true});
+  fs.writeFileSync(file, content);
+}
+
+/**
+ * Recursively copy files with given extension from src to dst directory.
+ * @param {string} src - Source directory
+ * @param {string} dst - Destination directory
+ * @param {string} ext - File extension filter (e.g. '.eo'), or empty for all files
+ */
+function copyDir(src, dst, ext) {
+  if (!fs.existsSync(src)) {return;}
+  fs.mkdirSync(dst, {recursive: true});
+  for (const entry of fs.readdirSync(src, {withFileTypes: true})) {
+    const source = path.join(src, entry.name);
+    const dest = path.join(dst, entry.name);
+    if (entry.isDirectory()) {
+      copyDir(source, dest, ext);
+    } else if (!ext || entry.name.endsWith(ext)) {
+      fs.copyFileSync(source, dest);
+    }
+  }
+}
+
+module.exports = {findFiles, saveFile, copyDir};

package/src/mvnw.js

@@ -7,7 +7,7 @@ const path = require('path');
 const fs = require('fs');
 const rel = require('relative');
 const readline = require('readline');
-const { spawn } = require('child_process');
+const {spawn} = require('child_process');
 const colors = require('colors');
 const parserVersion = require('./parser-version');
 
@@ -31,7 +31,13 @@ let beginning,
  * @param {Object} opts - Opts provided to the "eoc"
  * @return {Array} of Maven options
  */
-module.exports.flags = function (opts) {
+module.exports.flags = function(opts) {
+  if (opts.sources === undefined) {
+    throw new Error('Sources directory is not specified. Please provide it with --sources option.');
+  }
+  if (opts.target === undefined) {
+    throw new Error('Target directory is not specified. Please provide it with --target option.');
+  }
   const sources = path.resolve(opts.sources);
   console.debug('Sources in %s', rel(sources));
   const target = path.resolve(opts.target);
@@ -50,6 +56,7 @@ module.exports.flags = function (opts) {
     opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     opts.debug ? '--debug' : '',
+    opts.updateSnapshots ? '--update-snapshots' : '',
     `-Deo.sourcesDir=${sources}`,
     `-Deo.targetDir=${target}`,
     `-Deo.outputDir=${path.resolve(opts.target, 'classes')}`,
@@ -58,7 +65,7 @@ module.exports.flags = function (opts) {
     `-Deo.placedFormat=csv`,
     `-Deo.skipLinting=${opts.blind ? 'true' : 'false'}`,
     opts.trackTransformationSteps ? '-Deo.trackTransformationSteps' : '',
-  ];
+  ].filter(flag => flag !== '');
 };
 
 /**
@@ -68,11 +75,11 @@ module.exports.flags = function (opts) {
  * @param {Boolean} [batch] - Is it batch mode (TRUE) or interactive (FALSE)?
  * @return {Promise} of maven execution task
  */
-module.exports.mvnw = function (args, tgt, batch) {
+module.exports.mvnw = function(args, tgt, batch) {
   return new Promise((resolve, reject) => {
     console.debug(`Running mvnw with arguments: ${args.join(' ')}`);
     target = tgt;
-    phase = args[0];
+    phase = args.filter((a) => !a.startsWith('-')).join(' + ');
     const home = path.resolve(__dirname, '../mvnw');
     let bin = path.resolve(home, 'mvnw') + (process.platform === 'win32' ? '.cmd' : '');
     if (!fs.existsSync(bin)) {
@@ -82,7 +89,6 @@ module.exports.mvnw = function (args, tgt, batch) {
     const params = args.filter((t) => t !== '').concat([
       '--batch-mode',
       '--color=never',
-      '--update-snapshots',
       '--fail-fast',
       '--strict-checksums',
     ]);
@@ -129,7 +135,7 @@ module.exports.mvnw = function (args, tgt, batch) {
 function start() {
   running = true;
   beginning = Date.now();
-  const check = function () {
+  const check = function() {
     if (running) {
       print();
       setTimeout(check, 1000);

package/src/version.js

@@ -6,6 +6,6 @@
 // The values here are replaced automatically by the .rultor.yml script,
 // at the "release" pipeline:
 module.exports = {
-  what: '0.34.0',
-  when: '2026-02-19'
+  what: '0.35.0',
+  when: '2026-04-20'
 };

package/src/commands/sodg.js

@@ -1,45 +0,0 @@
-/*
- * SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
- * SPDX-License-Identifier: MIT
- */
-
-const rel = require('relative');
-const path = require('path');
-const {mvnw, flags} = require('../mvnw');
-const {elapsed} = require('../elapsed');
-
-/**
- * Generate SODG files from XMIR.
- * @param {Hash} opts - All options
- * @return {Promise} of sodg task
- */
-module.exports = function(opts) {
-  return elapsed(async (tracked) => {
-    const argv = ['eo:sodg'].concat(flags(opts));
-    argv.push(`-Deo.sodgIncludes=${opts.include}`);
-    if (opts.exclude) {
-      argv.push(`-Deo.sodgExcludes=${opts.exclude}`);
-    }
-    if (opts.xml) {
-      argv.push('-Deo.generateSodgXmlFiles');
-    }
-    if (opts.xembly) {
-      argv.push('-Deo.generateSodgXmlFiles');
-      argv.push('-Deo.generateXemblyFiles');
-    }
-    if (opts.graph) {
-      argv.push('-Deo.generateSodgXmlFiles');
-      argv.push('-Deo.generateXemblyFiles');
-      argv.push('-Deo.generateGraphFiles');
-    }
-    if (opts.dot) {
-      argv.push('-Deo.generateSodgXmlFiles');
-      argv.push('-Deo.generateXemblyFiles');
-      argv.push('-Deo.generateGraphFiles');
-      argv.push('-Deo.generateDotFiles');
-    }
-    const r = await mvnw(argv, opts.target, opts.batch);
-    tracked.print(`SODG files generated in ${rel(path.resolve(opts.target))}`);
-    return r;
-  });
-};