eolang 0.34.1 → 0.35.1

package/.markdownlint.json

@@ -1,6 +1,8 @@
 {
   "MD033": {
-    "allowed_elements": ["details", "summary"]
+    "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.34.0.tar.gz"
-  version "0.33.1"
-  sha256 "d29276ab1c51ac3195fd10fb9578c86851bfc2f49a3a6cce6c2d1c3adb72e7aa"
+  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.34.0.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.32.0.tar.gz"
   version "0.32.0"
-  sha256 "d29276ab1c51ac3195fd10fb9578c86851bfc2f49a3a6cce6c2d1c3adb72e7aa"
+  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.34.0.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.32.1.tar.gz"
   version "0.32.1"
-  sha256 "d29276ab1c51ac3195fd10fb9578c86851bfc2f49a3a6cce6c2d1c3adb72e7aa"
+  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.34.0.tar.gz"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.33.0.tar.gz"
   version "0.33.0"
-  sha256 "d29276ab1c51ac3195fd10fb9578c86851bfc2f49a3a6cce6c2d1c3adb72e7aa"
+  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.34.0
+npm install -g eolang@0.35.0
 ```
 
 You can also use [Homebrew] (on macOS):
 
 ```bash
 brew tap objectionary/eoc https://github.com/objectionary/eoc
-brew install objectionary/eoc/eolang@0.34.0
+brew install objectionary/eoc/eolang@0.35.0
 ```
 
 Or install it via [Nix flakes](https://nixos.wiki/wiki/Flakes):
@@ -97,7 +98,7 @@ in the current directory:
 ```eo
 # My first object in EO!
 [args] > hello
-  QQ.io.stdout > @
+  io.stdout > @
     "Hello, world!\n"
 ```
 
@@ -135,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~~
@@ -201,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.61.0

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,7 +73,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -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>

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,7 +94,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -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>

package/package.json

@@ -25,7 +25,7 @@
     "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": "^18.0.0",
@@ -74,5 +74,5 @@
     "postinstall": "node scripts/postinstall.js",
     "test": "mocha 'test/**/*.js' --timeout 1200000"
   },
-  "version": "0.34.1"
+  "version": "0.35.1"
 }

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/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/pipeline.js

@@ -33,4 +33,3 @@ function collect(coms, commands, opts) {
   });
   return {goals, extras};
 };
-

package/src/commands/lint.js

@@ -15,7 +15,7 @@ const semver = require('semver');
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
-  const extra = extraFlags(opts);
+  const extra = extras(opts);
   return elapsed(async (tracked) => {
     if (goals(opts)[0] === 'eo:lint') {
       try {

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

@@ -31,4 +31,3 @@ module.exports.goals = goals;
 function goals() {
   return ['eo:parse'];
 }
-

package/src/commands/register.js

@@ -31,4 +31,3 @@ 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'),
+    normalize: require('./commands/normalize'),
   },
   commands = {
     [language.java]: {
@@ -165,25 +165,6 @@ program.command('assemble')
     }
   });
 
-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 pipe()(coms(), ['register', '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(
@@ -371,6 +352,15 @@ program.command('latex')
     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) => {

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/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.1',
-  when: '2026-02-26'
+  what: '0.35.1',
+  when: '2026-04-23'
 };

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;
-  });
-};