eolang 0.10.0 → 0.10.1

package/mvnw/pom.xml

@@ -34,12 +34,12 @@ SOFTWARE.
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.1</version>
+      <version>5.9.2</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.1</version>
+      <version>5.9.2</version>
     </dependency>
   </dependencies>
   <build>
@@ -63,7 +63,7 @@ SOFTWARE.
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.10.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -82,7 +82,7 @@ SOFTWARE.
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M7</version>
+        <version>3.0.0-M8</version>
         <configuration>
           <failIfNoTests>true</failIfNoTests>
         </configuration>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -22,18 +22,18 @@
   },
   "dependencies": {
     "colors": "1.4.0",
-    "commander": "9.4.1",
-    "fast-xml-parser": "4.0.12",
+    "commander": "10.0.0",
+    "fast-xml-parser": "4.0.13",
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "eslint": "8.30.0",
+    "eslint": "8.32.0",
     "eslint-config-google": "0.14.0",
     "grunt": "1.5.3",
     "grunt-contrib-clean": "2.0.1",
     "grunt-eslint": "24.0.1",
     "grunt-mocha-cli": "7.0.0",
-    "mocha": "^10.1.0"
+    "mocha": "^10.2.0"
   },
   "scripts": {
     "test": "mocha --timeout 120000"

package/src/commands/assemble.js

@@ -43,7 +43,7 @@ module.exports = function(opts) {
     `-Deo.placed=${path.resolve(opts.target, 'eo-placed.csv')}`,
     `-Deo.placedFormat=csv`,
   ], opts.target).then((r) => {
-     console.info('EO program assembled in %s', path.resolve(opts.target));
-     return r;
+    console.info('EO program assembled in %s', path.resolve(opts.target));
+    return r;
   });
 };

package/src/commands/compile.js

@@ -42,7 +42,7 @@ module.exports = function(opts) {
     `-Deo.generatedDir=${path.resolve(opts.target, 'generated-sources')}`,
     '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
   ], opts.target).then((r) => {
-     console.info('Java .class files compiled into %s', target);
-     return r;
+    console.info('Java .class files compiled into %s', target);
+    return r;
   });
 };

package/src/commands/link.js

@@ -38,7 +38,7 @@ module.exports = function(opts) {
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
   ], opts.target).then((r) => {
-     console.info('Executable JAR created at %s', path.resolve(opts.target, 'eoc.jar'));
-     return r;
+    console.info('Executable JAR created at %s', path.resolve(opts.target, 'eoc.jar'));
+    return r;
   });
 };

package/src/commands/register.js

@@ -40,7 +40,7 @@ module.exports = function(opts) {
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.sourcesDir=${path.resolve(opts.sources)}`,
   ], opts.target).then((r) => {
-     console.info('EO objects registered in %s', foreign);
-     return r;
+    console.info('EO objects registered in %s', foreign);
+    return r;
   });
 };

package/src/commands/sodg.js

@@ -61,7 +61,7 @@ module.exports = function(opts) {
     argv.push('-Deo.generateDotFiles');
   }
   return mvnw(argv, opts.target).then((r) => {
-      console.info('SODG files generated in %s', path.resolve(opts.target));
-      return r;
+    console.info('SODG files generated in %s', path.resolve(opts.target));
+    return r;
   });
 };

package/src/eoc.js

@@ -89,7 +89,7 @@ program.command('assemble')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()));
+        .then((r) => assemble(program.opts()));
     } else {
       assemble(program.opts());
     }
@@ -106,8 +106,8 @@ program.command('sodg')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()))
-      .then((r) => sodg({...program.opts(), ...str}));
+        .then((r) => assemble(program.opts()))
+        .then((r) => sodg({...program.opts(), ...str}));
     } else {
       sodg({...program.opts(), ...str});
     }
@@ -118,8 +118,8 @@ program.command('transpile')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()))
-      .then((r) => transpile(program.opts()));
+        .then((r) => assemble(program.opts()))
+        .then((r) => transpile(program.opts()));
     } else {
       transpile(program.opts());
     }
@@ -130,9 +130,9 @@ program.command('compile')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()))
-      .then((r) => transpile(program.opts()))
-      .then((r) => compile(program.opts()));
+        .then((r) => assemble(program.opts()))
+        .then((r) => transpile(program.opts()))
+        .then((r) => compile(program.opts()));
     } else {
       compile(program.opts());
     }
@@ -143,12 +143,12 @@ program.command('link')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()))
-      .then((r) => transpile(program.opts()))
-      .then((r) => compile(program.opts()))
-      .then((r) => link(program.opts()));
+        .then((r) => assemble(program.opts()))
+        .then((r) => transpile(program.opts()))
+        .then((r) => compile(program.opts()))
+        .then((r) => link(program.opts()));
     } else {
-       link(program.opts());
+      link(program.opts());
     }
   });
 
@@ -158,11 +158,11 @@ program.command('dataize')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()))
-      .then((r) => transpile(program.opts()))
-      .then((r) => compile(program.opts()))
-      .then((r) => link(program.opts()))
-      .then((r) => dataize(program.args[1], program.args.slice(2), {...program.opts(), ...str}));
+        .then((r) => assemble(program.opts()))
+        .then((r) => transpile(program.opts()))
+        .then((r) => compile(program.opts()))
+        .then((r) => link(program.opts()))
+        .then((r) => dataize(program.args[1], program.args.slice(2), {...program.opts(), ...str}));
     } else {
       dataize(program.args[1], program.args.slice(2), {...program.opts(), ...str});
     }
@@ -173,11 +173,11 @@ program.command('test')
   .action((str, opts) => {
     if (program.opts().alone == undefined) {
       register(program.opts())
-      .then((r) => assemble(program.opts()))
-      .then((r) => transpile(program.opts()))
-      .then((r) => compile(program.opts()))
-      .then((r) => link(program.opts()))
-      .then((r) => test(program.opts()));
+        .then((r) => assemble(program.opts()))
+        .then((r) => transpile(program.opts()))
+        .then((r) => compile(program.opts()))
+        .then((r) => link(program.opts()))
+        .then((r) => test(program.opts()));
     } else {
       test(program.opts());
     }

package/src/mvnw.js

@@ -77,7 +77,7 @@ module.exports = function(args, tgt) {
       start();
       result.on('close', (code) => {
         if (code !== 0) {
-          throw new Error('The command "' + cmd + '" exited with #' + code + ' code');
+          throw new Error(`The command "${cmd}" exited with #${code} code`);
         }
         stop();
         resolve(args);
@@ -85,7 +85,7 @@ module.exports = function(args, tgt) {
     } else {
       result.on('close', (code) => {
         if (code !== 0) {
-          throw new Error('The command "' + cmd + '" exited with #' + code + ' code');
+          throw new Error(`The command "${cmd}" exited with #${code} code`);
         }
         resolve(args);
       });
@@ -103,8 +103,8 @@ function start() {
   beginning = Date.now();
   const check = function() {
     if (running) {
-       print();
-       setTimeout(check, 200);
+      print();
+      setTimeout(check, 1000);
     }
   };
   check();
@@ -144,8 +144,16 @@ function print() {
     }
     return curr;
   }
+  let elapsed;
+  if (duration < 1000) {
+    elapsed = `${duration}ms`;
+  } else if (duration < 60 * 1000) {
+    elapsed = `${Math.ceil(duration / 1000)}s`;
+  } else {
+    elapsed = `${Math.ceil(duration / 3600000)}min`;
+  }
   process.stdout.write(
-    `\x1b[33m[${phase}] ${duration} ms. Total number of compiled files ${count(target, 0)}\x1b[0m`
+    `\x1b[33m[${phase}] ${elapsed}; ${count(target, 0)} files generated...\x1b[0m`
   );
 }
 

package/src/parser-version.js

@@ -30,22 +30,22 @@ const {XMLParser} = require('fast-xml-parser');
  * @return {String} Latest version, for example '0.23.1'
  */
 const version = module.exports = {
-    value: '',
-    get: function() {
-        if (version.value === '') {
-            const repo = 'org/eolang/eo-maven-plugin';
-            const url = 'https://repo.maven.apache.org/maven2/' + repo + '/maven-metadata.xml';
-            const xhr = new XMLHttpRequest();
-            xhr.open('GET', url, false);
-            xhr.send(null);
-            if (xhr.status != 200) {
-              throw new Error('Invalid response status ' + xhr.status + ' from ' + url);
-            }
-            const xml = new XMLParser().parse(xhr.responseText);
-            version.value = xml.metadata.versioning.release;
-            console.debug('The latest version of %s at %s is %s', repo, url, version.value);
-            console.info('EO version is %s', version.value);
-        }
-        return version.value;
+  value: '',
+  get: function() {
+    if (version.value === '') {
+      const repo = 'org/eolang/eo-maven-plugin';
+      const url = 'https://repo.maven.apache.org/maven2/' + repo + '/maven-metadata.xml';
+      const xhr = new XMLHttpRequest();
+      xhr.open('GET', url, false);
+      xhr.send(null);
+      if (xhr.status != 200) {
+        throw new Error('Invalid response status ' + xhr.status + ' from ' + url);
+      }
+      const xml = new XMLParser().parse(xhr.responseText);
+      version.value = xml.metadata.versioning.release;
+      console.debug('The latest version of %s at %s is %s', repo, url, version.value);
+      console.info('EO version is %s', version.value);
     }
+    return version.value;
+  }
 };

package/src/version.js

@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-module.exports = '0.10.0';
+module.exports = '0.10.1';