eolang 0.13.2 → 0.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -38,7 +38,7 @@
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "eslint": "8.41.0",
+    "eslint": "8.42.0",
     "eslint-config-google": "0.14.0",
     "grunt": "1.6.1",
     "grunt-contrib-clean": "2.0.1",

package/src/commands/assemble.js

@@ -35,6 +35,7 @@ module.exports = function(opts) {
     'eo:assemble',
     '-Deo.version=' + opts.parser,
     '-Deo.hash=' + (opts.hash ? opts.hash : opts.parser),
+    opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     opts.trackOptimizationSteps ? '-Deo.trackOptimizationSteps' : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,

package/src/commands/compile.js

@@ -34,6 +34,7 @@ module.exports = function(opts) {
   const target = path.resolve(opts.target);
   return mvnw([
     'compiler:compile',
+    opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     `-Dmaven.compiler.source=1.8`,
     `-Dmaven.compiler.target=1.8`,

package/src/commands/link.js

@@ -33,6 +33,7 @@ const path = require('path');
 module.exports = function(opts) {
   return mvnw([
     'jar:jar',
+    opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     '-Deo.version=' + opts.parser,

package/src/commands/parse.js

@@ -35,6 +35,7 @@ module.exports = function(opts) {
     'eo:parse',
     '-Deo.version=' + opts.parser,
     '-Deo.hash=' + (opts.hash ? opts.hash : opts.parser),
+    opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.outputDir=${path.resolve(opts.target, 'classes')}`,

package/src/commands/register.js

@@ -35,6 +35,7 @@ module.exports = function(opts) {
   return mvnw([
     'eo:register',
     '-Deo.version=' + opts.parser,
+    opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.sourcesDir=${path.resolve(opts.sources)}`,

package/src/commands/sodg.js

@@ -35,6 +35,7 @@ module.exports = function(opts) {
     'eo:sodg',
     '-Deo.version=' + opts.parser,
     opts.verbose ? '' : '--quiet',
+    opts.verbose ? '--errors' : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
   ];
   argv.push('-Deo.sodgIncludes=' + opts.include);

package/src/commands/test.js

@@ -33,6 +33,8 @@ const path = require('path');
 module.exports = function(opts) {
   return mvnw([
     'surefire:test',
+    opts.verbose ? '--errors' : '',
+    opts.verbose ? '' : '--quiet',
     '-Deo.version=' + opts.parser,
     `-Deo.targetDir=${path.resolve(opts.target)}`,
   ]);

package/src/commands/transpile.js

@@ -35,6 +35,7 @@ module.exports = function(opts) {
   return mvnw([
     'eo:transpile',
     '-Deo.version=' + opts.parser,
+    opts.verbose ? '--errors' : '',
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.generatedDir=${sources}`,

package/src/eoc.js

@@ -51,8 +51,11 @@ if (process.argv.includes('--latest')) {
 const version = require('./version');
 program
   .name('eoc')
-  .description('EO command-line toolkit (' + version.what + ' ' + version.when + ')')
-  .version(version.what);
+  .usage('[options] command')
+  .summary('EO command line toolkit')
+  .description('EO command-line toolkit (' + version.what + ' built on ' + version.when + ')')
+  .version(version.what, '-v, --version', 'Output the version number')
+  .helpOption('-?, --help', 'Print this help information');
 
 program
   .option('-s, --sources <path>', 'Directory with .EO sources', '.')

package/src/mvnw.js

@@ -26,6 +26,7 @@ const path = require('path');
 const fs = require('fs');
 const readline = require('readline');
 const {spawn} = require('child_process');
+const colors = require('colors');
 
 /**
  * The shell to use (depending on operating system).
@@ -123,15 +124,13 @@ function start() {
  */
 function stop() {
   running = false;
-  process.stdout.write('\n');
+  readline.clearLine(process.stdout);
 }
 
 /**
  * Prints mvnw execution status.
  */
 function print() {
-  readline.clearLine(process.stdout);
-  readline.cursorTo(process.stdout, 0);
   const duration = Date.now() - beginning;
   /**
    * Recursively calculates number of files under a directory.
@@ -161,7 +160,9 @@ function print() {
     elapsed = `${Math.ceil(duration / 3600000)}min`;
   }
   process.stdout.write(
-    `\x1b[33m[${phase}] ${elapsed}; ${count(target, 0)} files generated...\x1b[0m`
+    colors.yellow(`[${phase}] ${elapsed}; ${count(target, 0)} files generated so far...`)
   );
+  readline.clearLine(process.stdout, 1);
+  readline.cursorTo(process.stdout, 0);
 }
 

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.13.2',
-  when: '2023-05-31'
+  what: '0.13.4',
+  when: '2023-06-03'
 };

package/CITATION.cff

@@ -1,11 +0,0 @@
-cff-version: 1.2.0
-message: "If you use this software, please cite it as below."
-authors:
-- family-names: "Bugayenko"
-  given-names: "Yegor"
-  orcid: "https://orcid.org/0000-0001-6370-0678"
-title: "EOLANG and 𝜑-calculus"
-version: 0.23.0
-doi: 10.48550/arXiv.2111.13384
-date-released: 2022-05-09
-url: "https://github.com/objectionary/eoc"

package/itest/README.md

@@ -1,16 +0,0 @@
-[![grunt](https://github.com/objectionary/eoc/actions/workflows/itest.yml/badge.svg)](https://github.com/objectionary/eoc/actions/workflows/itest.yml)
-
-There is a simple integration test here. Just run this to make sure
-it works:
-
-```
-$ ../src/eoc.js dataize program
-```
-
-Then, you can execute the unit tests too:
-
-```
-$ ../src/eoc.js test
-```
-
-If doesn't work, submit an issue.

package/itest/program.eo

@@ -1,27 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2022-2023 Objectionary.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-+alias story
-
-[args...] > program
-  QQ.io.stdout > @
-    story

package/itest/story-test.eo

@@ -1,31 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2022-2023 Objectionary.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-+junit
-+alias org.eolang.hamcrest.assert-that
-+alias story
-
-[] > story-is-long-enough
-  assert-that > @
-    story.length
-    $.is
-      $.greater-than 1

package/itest/story.eo

@@ -1,30 +0,0 @@
-# The MIT License (MIT)
-#
-# Copyright (c) 2022-2023 Objectionary.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-[] > story
-  QQ.txt.sprintf > @
-    "Hello, Mr. #%d!\n"
-    as-int.
-      QQ.math.number
-        times.
-          QQ.math.random.pseudo
-          100.0