eolang 0.20.0 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -32,8 +32,8 @@
   "dependencies": {
     "colors": "1.4.0",
     "commander": "12.0.0",
-    "eo2js": "0.0.6",
-    "fast-xml-parser": "4.3.6",
+    "eo2js": "0.0.7",
+    "fast-xml-parser": "4.4.0",
     "node": "22.1.0",
     "relative": "3.0.2",
     "semver": "7.6.2",
@@ -41,7 +41,7 @@
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "eslint": "9.2.0",
+    "eslint": "9.4.0",
     "eslint-config-google": "0.14.0",
     "grunt": "1.6.1",
     "grunt-contrib-clean": "2.0.1",

package/src/commands/phi.js

@@ -29,15 +29,15 @@ const {mvnw, flags} = require('../mvnw');
 
 /**
  * Command to convert .XMIR files into .PHI files.
- * @param {Hash} opts - All options
+ * @param {Object} opts - All options
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
   gte('EO parser', opts.parser, '0.35.2');
   const target = path.resolve(opts.target);
-  const input = path.resolve(opts.target, '2-optimize');
+  const input = path.resolve(opts.target, opts.phiInput);
   console.debug('Reading .XMIR files from %s', rel(input));
-  const output = path.resolve(opts.target, 'phi');
+  const output = path.resolve(opts.target, opts.phiOutput);
   console.debug('Writing .PHI files to %s', rel(output));
   return mvnw(
     ['eo:xmir-to-phi']

package/src/commands/print.js

@@ -28,13 +28,13 @@ const {mvnw, flags} = require('../mvnw');
 
 /**
  * Command to convert .XMIR files into .EO files.
- * @param {Hash} opts - All options
+ * @param {Object} opts - All options
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
-  const input = path.resolve(opts.target, '2-optimize');
+  const input = path.resolve(opts.target, opts.printInput);
   console.debug('Reading from %s', rel(input));
-  const output = path.resolve(opts.target, 'print');
+  const output = path.resolve(opts.target, opts.printOutput);
   console.debug('Writing into %s', rel(output));
   return mvnw(
     ['eo:print']

package/src/commands/unphi.js

@@ -29,14 +29,14 @@ const {gte} = require('../demand');
 
 /**
  * Command to convert .PHI files into .XMIR files.
- * @param {Hash} opts - All options
+ * @param {Object} opts - All options
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
   gte('EO parser', opts.parser, '0.35.2');
-  const input = path.resolve(opts.target, 'phi');
+  const input = path.resolve(opts.target, opts.unphiInput);
   console.debug('Reading .PHI files from %s', rel(input));
-  const output = path.resolve(opts.target, 'unphi');
+  const output = path.resolve(opts.target, opts.unphiOutput);
   console.debug('Writing .XMIR files to %s', rel(output));
   return mvnw(
     ['eo:phi-to-xmir']

package/src/eoc.js

@@ -179,12 +179,22 @@ program.command('sodg')
 
 program.command('phi')
   .description('Generate PHI files from XMIR')
+  .option(
+    '--phi-input <dir>',
+    'Directory where XMIR files for translation to PHI are taken (relative to --target)',
+    '2-optimize'
+  )
+  .option(
+    '--phi-output <dir>',
+    'Directory where translated PHI files are stored (relative to --target)',
+    'phi'
+  )
   .action((str, opts) => {
     clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
-        .then((r) => phi(program.opts()));
+        .then((r) => phi({...program.opts(), ...str}));
     } else {
       phi(program.opts());
     }
@@ -192,6 +202,16 @@ program.command('phi')
 
 program.command('unphi')
   .option('--tests', 'Add "+tests" meta to result XMIR files')
+  .option(
+    '--unphi-input <dir>',
+    'Directory where PHI files for translation to XMIR are taken (relative to --target)',
+    'phi'
+  )
+  .option(
+    '--unphi-output <dir>',
+    'Directory where translated XMIR files are stored (relative to --target)',
+    'unphi'
+  )
   .description('Generate XMIR files from PHI files')
   .action((str, opts) => {
     clear(str);
@@ -200,9 +220,19 @@ program.command('unphi')
 
 program.command('print')
   .description('Generate EO files from XMIR files')
+  .option(
+    '--print-input <dir>',
+    'Directory where XMIR files for translation to EO are taken (relative to --target)',
+    '2-optimize'
+  )
+  .option(
+    '--print-output <dir>',
+    'Directory where translated EO files are stored (relative to --target)',
+    'print'
+  )
   .action((str, opts) => {
     clear(str);
-    print(program.opts());
+    print({...program.opts(), ...str});
   });
 
 program.command('verify')

package/src/version.js

@@ -25,6 +25,6 @@
 // The values here are replaced automatically by the .rultor.yml script,
 // at the "release" pipeline:
 module.exports = {
-  what: '0.20.0',
-  when: '2024-05-31'
+  what: '0.21.0',
+  when: '2024-06-05'
 };