eolang 0.35.2 → 0.36.0

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.35.1.tar.gz"
-  version "0.35.1"
-  sha256 "694218ea2ab13179be731ab7d671ba5f7ebe9a8aa9fc6b5d695d699180879466"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.35.2.tar.gz"
+  version "0.35.2"
+  sha256 "436b27218fb5acc48bbc56ecd8d6c5c9b4592fa19735e75515e21297938dc7de"
   license "MIT"
 
   depends_on "node"

package/Formula/eolang@0.35.1.rb

@@ -0,0 +1,25 @@
+#
+# SPDX-FileCopyrightText: Copyright (c) 2022-2026 Objectionary.com
+# SPDX-License-Identifier: MIT
+#
+
+require "language/node"
+class EolangAT0352 < Formula
+  desc "Command-line Tool-Kit"
+  homepage "https://github.com/objectionary/eoc"
+  url "https://github.com/objectionary/eoc/archive/refs/tags/0.35.1.tar.gz"
+  version "0.35.1"
+  sha256 "694218ea2ab13179be731ab7d671ba5f7ebe9a8aa9fc6b5d695d699180879466"
+  license "MIT"
+
+  depends_on "node"
+
+  def install
+    system "npm", "install", *std_npm_args
+    bin.install_symlink Dir["#{libexec}/bin/*"]
+  end
+
+  test do
+    system "#{bin}/eoc", "--version"
+  end
+end

package/README.md

@@ -20,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.35.1
+npm install -g eolang@0.35.2
 ```
 
 You can also use [Homebrew] (on macOS):
 
 ```bash
 brew tap objectionary/eoc https://github.com/objectionary/eoc
-brew install objectionary/eoc/eolang@0.35.1
+brew install objectionary/eoc/eolang@0.35.2
 ```
 
 Or install it via [Nix flakes](https://nixos.wiki/wiki/Flakes):

package/eo-version.txt

@@ -1 +1 @@
-0.61.1
+0.61.3

package/eslint.config.js

@@ -5,6 +5,7 @@
 
 const { configs } = require('@eslint/js');
 const promise = require('eslint-plugin-promise');
+const jsdoc = require('eslint-plugin-jsdoc');
 const noEmptyLinesInMethod = require('./eslintPlugin/rules/noEmptyLinesInMethod');
 
 const localPlugin = {
@@ -25,6 +26,7 @@ module.exports = [
     },
     plugins: {
       promise,
+      jsdoc,
       local: localPlugin
     },
     rules: {
@@ -68,6 +70,7 @@ module.exports = [
       'sort-keys': 'off',
       'sort-vars': 'off',
       'promise/prefer-await-to-then': 'error',
+      'jsdoc/check-alignment': 'error',
       'local/no-empty-lines-in-method': 'error'
     }
   },

package/home-tag.txt

@@ -1 +1 @@
-0.59.7
+0.61.3

package/mvnw/dependency-reduced-pom.xml

@@ -207,6 +207,6 @@
     <heap-size>undefined</heap-size>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <junit.version>6.1.0</junit.version>
-    <jeo.version>0.15.2</jeo.version>
+    <jeo.version>0.15.3</jeo.version>
   </properties>
 </project>

package/mvnw/pom.xml

@@ -10,7 +10,7 @@
   <version>0.0.0</version>
   <packaging>jar</packaging>
   <properties>
-    <jeo.version>0.15.2</jeo.version>
+    <jeo.version>0.15.3</jeo.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <eo.version>undefined</eo.version>

package/package.json

@@ -21,6 +21,7 @@
     "@eslint/js": "^9.27.0",
     "eslint": "^9.28.0",
     "eslint-config-google": "^0.14.0",
+    "eslint-plugin-jsdoc": "^63.0.12",
     "eslint-plugin-promise": "^7.2.1",
     "grunt": "^1.6.1",
     "grunt-contrib-clean": "^2.0.1",
@@ -72,5 +73,5 @@
     "coverage": "nyc --reporter=lcov --reporter=text-summary mocha test/**/*.js --timeout 1200000",
     "test": "mocha 'test/**/*.js' --timeout 1200000"
   },
-  "version": "0.35.2"
+  "version": "0.36.0"
 }

package/src/commands/docs.js

@@ -10,6 +10,17 @@ const { marked } = require('marked');
 const {elapsed} = require('../elapsed');
 const {findFiles} = require('../files');
 
+/**
+ * Escape special XML characters.
+ * @param {String} str - Raw string
+ * @return {String} XML-safe string
+ */
+function xmlEscape(str) {
+  return str.replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;');
+}
 
 /**
  * Applies XSLT to XMIR
@@ -108,6 +119,7 @@ function wrapHtml(name, html, css) {
 /**
  * Command to generate documentation.
  * @param {Hash} opts - All options
+ * @return {Promise<String>} Resolves to the message reporting the summary path
  */
 module.exports = function(opts) {
   return elapsed(async (tracked) => {
@@ -132,10 +144,12 @@ module.exports = function(opts) {
         if (!(packages in packages_info)) {
           packages_info[packages] = {
             xmir_htmls : [],
+            names: [],
             path: html_package
           };
         }
         packages_info[packages].xmir_htmls.push(xmir_html);
+        packages_info[packages].names.push(name);
         all_xmir_htmls.push(xmir_html);
       }
       for (const package_name of Object.keys(packages_info)) {
@@ -145,7 +159,24 @@ module.exports = function(opts) {
       }
       const packages = path.join(output, 'packages.html');
       fs.writeFileSync(packages, generatePackageHtml('overall package', all_xmir_htmls, css));
+      const summary = path.join(output, 'summary.xml');
+      const pkgNames = Object.keys(packages_info);
+      const lines = [
+        '<?xml version="1.0" encoding="UTF-8"?>',
+        `<eodoc packages="${pkgNames.length}" objects="${xmirs.length}">`
+      ];
+      for (const pkg of pkgNames) {
+        lines.push(`  <package name="${xmlEscape(pkg)}">`);
+        for (const obj of packages_info[pkg].names) {
+          lines.push(`    <object name="${xmlEscape(obj)}"/>`);
+        }
+        lines.push('  </package>');
+      }
+      lines.push('</eodoc>');
+      fs.writeFileSync(summary, lines.join('\n'));
+      const located = tracked.print(`Summary XML generated at ${path.relative(process.cwd(), summary)}`);
       tracked.print(`Documentation generation completed in the ${output} directory`);
+      return located;
     } catch (error) {
       console.error('Error generating documentation:', error);
       throw error;

package/src/commands/lint.js

@@ -55,9 +55,9 @@ module.exports = function(opts) {
 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
-*/
+ * 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) {

package/src/commands/normalize.js

@@ -4,7 +4,7 @@
  */
 
 const path = require('path');
-const {execSync} = require('child_process');
+const {execSync, execFileSync} = require('child_process');
 const {mvnw, flags} = require('../mvnw');
 const {elapsed} = require('../elapsed');
 const {findFiles, saveFile, copyDir} = require('../files');
@@ -42,8 +42,9 @@ module.exports = function(opts) {
       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}`,
+      const out = execFileSync(
+        'phino',
+        ['rewrite', '--input=xmir', '--output=xmir', '--normalize', xmir],
         {stdio: ['pipe', 'pipe', 'pipe']}
       );
       console.debug('Normalized in %dms', Date.now() - ts);

package/src/eo2jsw.js

@@ -7,11 +7,11 @@ const path = require('path');
 const {execSync} = require('child_process'),
 
   /**
- * Convert eoc arguments to appropriate eo2js flags
- * @param {Object} args - eoc arguments
- * @param {String} lib - Path to eo2js lib
- * @return {Array.<String>} - Flags for eo2js
- */
+   * Convert eoc arguments to appropriate eo2js flags
+   * @param {Object} args - eoc arguments
+   * @param {String} lib - Path to eo2js lib
+   * @return {Array.<String>} - Flags for eo2js
+   */
   flags = function(args, lib) {
     return [
       '--target', args.target,
@@ -24,11 +24,11 @@ const {execSync} = require('child_process'),
   },
 
   /**
- * Wrapper for eo2js.
- * @param {String} command - Command to execute
- * @param {Object} args - Command arguments
- * @return {Promise<Array.<String>>}
- */
+   * Wrapper for eo2js.
+   * @param {String} command - Command to execute
+   * @param {Object} args - Command arguments
+   * @return {Promise<Array.<String>>}
+   */
   eo2jsw = function(command, args) {
     const lib = path.resolve(__dirname, '../node_modules/eo2js/src'),
       bin = path.resolve(lib, 'eo2js.js');

package/src/eoc.js

@@ -5,63 +5,79 @@
  */
 
 const tinted = require('./tinted-console');
-const {program} = require('commander'),
+const {program} = require('commander');
 
-  /**
+/**
  * Target language option.
  */
-  language = {
-    java: 'Java',
-    js: 'JavaScript',
-  },
+const language = {
+  java: 'Java',
+  js: 'JavaScript',
+};
 
-  /**
+/**
  * Platform dependent commands.
  */
-  common = {
-    assemble: require('./commands/assemble'),
-    audit: require('./commands/audit'),
-    clean: require('./commands/clean'),
-    foreign: require('./commands/foreign'),
-    parse: require('./commands/parse'),
-    print: require('./commands/print'),
-    register: require('./commands/register'),
-    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]: {
-      ...common,
-      ...{
-        resolve: require('./commands/java/resolve'),
-        transpile: require('./commands/java/transpile'),
-        link: require('./commands/java/link'),
-        compile: require('./commands/java/compile'),
-        dataize: require('./commands/java/dataize'),
-        test: require('./commands/java/test'),
-      }
-    },
-    [language.js]: {
-      ...common,
-      ...{
-        resolve: require('./commands/js/resolve'),
-        transpile: require('./commands/js/transpile'),
-        link: require('./commands/js/link'),
-        compile: require('./commands/js/compile'),
-        dataize: require('./commands/js/dataize'),
-        test: require('./commands/js/test'),
-      }
+const common = {
+  assemble: require('./commands/assemble'),
+  audit: require('./commands/audit'),
+  clean: require('./commands/clean'),
+  foreign: require('./commands/foreign'),
+  parse: require('./commands/parse'),
+  print: require('./commands/print'),
+  register: require('./commands/register'),
+  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'),
+};
+
+const commands = {
+  [language.java]: {
+    ...common,
+    ...{
+      resolve: require('./commands/java/resolve'),
+      transpile: require('./commands/java/transpile'),
+      link: require('./commands/java/link'),
+      compile: require('./commands/java/compile'),
+      dataize: require('./commands/java/dataize'),
+      test: require('./commands/java/test'),
     }
   },
-  pipelines = {
-    [language.java]: require('./commands/java/pipeline'),
-    [language.js]: require('./commands/js/pipeline'),
-  };
+  [language.js]: {
+    ...common,
+    ...{
+      resolve: require('./commands/js/resolve'),
+      transpile: require('./commands/js/transpile'),
+      link: require('./commands/js/link'),
+      compile: require('./commands/js/compile'),
+      dataize: require('./commands/js/dataize'),
+      test: require('./commands/js/test'),
+    }
+  }
+};
+
+const pipelines = {
+  [language.java]: require('./commands/java/pipeline'),
+  [language.js]: require('./commands/js/pipeline'),
+};
+
+/**
+ * Every language name a user may type, mapped (in lower case) to its
+ * canonical platform key. Derived from `language` so the accepted names
+ * and the platforms can never drift apart. For each `[alias, canonical]`
+ * pair we accept the short alias (e.g. `js`) and the canonical name
+ * lower-cased (e.g. `javascript`); `select()` lower-cases the input, so
+ * mixed-case spellings such as `JavaScript` are matched too.
+ */
+const platforms = {};
+for (const [alias, canonical] of Object.entries(language)) {
+  platforms[alias] = canonical;
+  platforms[canonical.toLowerCase()] = canonical;
+}
 
 if (process.argv.includes('--verbose')) {
   tinted.enable('debug');
@@ -103,7 +119,7 @@ program
   .option('--parser <version>', 'Set the version of EO parser to use', parser)
   .option('--latest', 'Use the latest parser version from Maven Central')
   .option('--alone', 'Just run a single command without dependencies')
-  .option('-l, --language <name>', 'Language of target execution platform', language.java)
+  .option('-l, --language <name>', 'Language of target execution platform (Java or JavaScript, case-insensitive)', language.java)
   .option('-b, --batch', 'Run in batch mode, suppress interactive messages')
   .option('--no-color', 'Disable colorization of console messages')
   .option('--track-transformation-steps', 'Save intermediate XMIR files')
@@ -378,13 +394,7 @@ program.command('fmt')
   });
 
 if (require.main === module) {
-  try {
-    program.parse(process.argv);
-  } catch (e) {
-    console.error(e.message);
-    console.debug(e.stack);
-    process.exit(1);
-  }
+  program.parseAsync(process.argv);
 }
 
 module.exports.commandsDescription = function commandsDescription() {
@@ -418,12 +428,7 @@ function pin(opts) {
  * @return {Object} - commands
  */
 function coms() {
-  const lang = program.opts().language,
-    hash = commands[lang];
-  if (hash === undefined) {
-    throw new Error(`Unknown platform ${lang}`);
-  }
-  return hash;
+  return select(commands, program.opts().language);
 }
 
 /**
@@ -431,10 +436,24 @@ function coms() {
  * @return {Function} - pipeline function
  */
 function pipe() {
-  const lang = program.opts().language;
-  const pipeline = pipelines[lang];
-  if (pipeline === undefined) {
+  return select(pipelines, program.opts().language);
+}
+
+/**
+ * Resolve the entry registered for the requested language, matching the
+ * name case-insensitively and accepting aliases (e.g. `js`, `java`). The
+ * lookup and its validation live here, so callers never repeat the
+ * "unknown platform" check.
+ *
+ * @param {Object} registry - Map keyed by canonical platform name
+ * @param {String} lang - Language name as provided on the command line
+ * @return {*} The entry registered for the resolved platform
+ * @throws {Error} If the language does not resolve to a known platform
+ */
+function select(registry, lang) {
+  const found = registry[platforms[String(lang).toLowerCase()]];
+  if (found === undefined) {
     throw new Error(`Unknown platform ${lang}`);
   }
-  return pipeline;
+  return found;
 }

package/src/mvnw.js

@@ -11,6 +11,17 @@ const {spawn} = require('child_process');
 const colors = require('colors');
 const parserVersion = require('./parser-version');
 
+/**
+ * Short label for the Maven goals being executed, collapsing a list
+ * into a count and leaving a lone goal under its own name.
+ * @param {Array} args The arguments passed to Maven
+ * @return {String} Either the single goal or a count like "5 steps"
+ */
+module.exports.summary = function(args) {
+  const steps = args.filter((a) => !a.startsWith('-'));
+  return steps.length > 1 ? `${steps.length} steps` : steps.join('');
+};
+
 /**
  * The shell to use (depending on operating system).
  * @return {String} Path to shell or "undefined" if default one should be used
@@ -81,7 +92,7 @@ module.exports.mvnw = function(args, tgt, batch) {
   return new Promise((resolve, reject) => {
     console.debug(`Running mvnw with arguments: ${args.join(' ')}`);
     target = tgt;
-    phase = args.filter((a) => !a.startsWith('-')).join(' + ');
+    phase = module.exports.summary(args);
     const home = path.resolve(__dirname, '../mvnw');
     let bin = path.resolve(home, 'mvnw') + (process.platform === 'win32' ? '.cmd' : '');
     if (!fs.existsSync(bin)) {
@@ -110,20 +121,20 @@ module.exports.mvnw = function(args, tgt, batch) {
         start();
       }
       result.on('close', (code) => {
-        if (code !== 0) {
-          console.error(`The command "${cmd}" exited with #${code} code`);
-          process.exit(1);
-        }
         if (!batch) {
           stop();
         }
+        if (code !== 0) {
+          reject(new Error(`The command "${cmd}" exited with #${code} code`));
+          return;
+        }
         resolve(args);
       });
     } else {
       result.on('close', (code) => {
         if (code !== 0) {
-          console.error(`The command "${cmd}" exited with #${code} code`);
-          process.exit(1);
+          reject(new Error(`The command "${cmd}" exited with #${code} code`));
+          return;
         }
         resolve(args);
       });

package/src/parser-version.js

@@ -4,12 +4,13 @@
  */
 
 const {XMLParser} = require('fast-xml-parser');
+const colors = require('colors');
 const request = require('sync-request'),
 
   /**
- * Load the latest version from GitHub releases.
- * @return {String} Latest version, for example '0.23.1'
- */
+   * Load the latest version from GitHub releases.
+   * @return {String} Latest version, for example '0.23.1'
+   */
   version = module.exports = {
     value: '',
     get() {
@@ -40,7 +41,7 @@ const request = require('sync-request'),
      * Check if a specific parser version exists in Maven Central.
      * @param {String} ver - Version to check, for example '0.23.1'
      * @param {function} fetch - HTTP call, defaults to sync-request
-     * @return {Boolean} True if version exists, false otherwise
+     * @return {Boolean} True if version exists or cannot be verified, false if confirmed absent
      */
     exists(ver, fetch = request) {
       let result;
@@ -49,8 +50,10 @@ const request = require('sync-request'),
           const res = fetch('GET', version.url(ver), {timeout: 10000, socketTimeout: 10000});
           result = res.statusCode === 200;
         } catch (e) {
-          console.debug('Unable to validate parser version (network error): %s', e.message);
-          result = false;
+          console.warn(colors.yellow(
+            `Cannot verify parser version ${ver} in Maven Central (${e.message}), proceeding anyway`
+          ));
+          result = true;
         }
       } else {
         result = false;

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.35.2',
-  when: '2026-06-23'
+  what: '0.36.0',
+  when: '2026-07-09'
 };