eolang 0.27.1 → 0.28.1

package/README.md

@@ -18,7 +18,7 @@ First, you install [npm][npm-install] and [Java SE][java-se].
 Then, you install [eolang][npm] package:
 
 ```bash
-npm install -g eolang@0.26.0
+npm install -g eolang@0.28.0
 ```
 
 Then, you write a simple [EO](https://www.eolang.org) program in `hello.eo` file
@@ -34,7 +34,7 @@ in the current directory:
 Then, you run it:
 
 ```bash
-eoc dataize hello
+eoc --easy dataize hello
 ```
 
 That's it.

package/eo-version.txt

@@ -1 +1 @@
-0.48.2
+0.49.2

package/home-tag.txt

@@ -1 +1 @@
-0.48.2
+0.49.2

package/mvnw/dependency-reduced-pom.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eolang</groupId>
+  <artifactId>eoc</artifactId>
+  <version>0.0.0</version>
+  <build>
+    <sourceDirectory>${eo.generatedDir}</sourceDirectory>
+    <outputDirectory>${eo.targetDir}/classes</outputDirectory>
+    <testOutputDirectory>${eo.targetDir}/classes</testOutputDirectory>
+    <directory>${eo.targetDir}</directory>
+    <finalName>eoc</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.5.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>[11,)</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eolang</groupId>
+        <artifactId>eo-maven-plugin</artifactId>
+        <version>${eo.version}</version>
+        <configuration>
+          <withRuntimeDependency>false</withRuntimeDependency>
+          <excludeSources>**/.eoc/**</excludeSources>
+          <sodgIncludes>${eo.sodgIncludes}</sodgIncludes>
+          <sodgExcludes>${eo.sodgExcludes}</sodgExcludes>
+          <foreign>${project.build.directory}/eo-foreign.json</foreign>
+          <foreignFormat>json</foreignFormat>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eolang</groupId>
+        <artifactId>jeo-maven-plugin</artifactId>
+        <version>${jeo.version}</version>
+        <configuration>
+          <skipVerification>true</skipVerification>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <release>11</release>
+          <source>11</source>
+          <target>11</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.4.2</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.eolang.Main</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.6.0</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.2</version>
+        <configuration>
+          <failIfNoTests>true</failIfNoTests>
+          <useFile>false</useFile>
+          <trimStackTrace>false</trimStackTrace>
+          <runOrder>random</runOrder>
+          <argLine>-Xmx${heap-size} -Xss${stack-size}</argLine>
+          <forkNode />
+          <properties>
+            <configurationParameters>junit.jupiter.execution.parallel.enabled = true
+              junit.jupiter.execution.parallel.mode.default = concurrent
+              junit.jupiter.execution.parallel.mode.classes.default = concurrent</configurationParameters>
+          </properties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <properties>
+    <eo.version>undefined</eo.version>
+    <stack-size>undefined</stack-size>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <heap-size>undefined</heap-size>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jeo.version>0.6.26</jeo.version>
+  </properties>
+</project>

package/mvnw/pom.xml

@@ -25,11 +25,14 @@ SOFTWARE.
   <groupId>org.eolang</groupId>
   <artifactId>eoc</artifactId>
   <version>0.0.0</version>
+  <packaging>jar</packaging>
   <properties>
+    <jeo.version>0.6.26</jeo.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <eo.version>undefined</eo.version>
-    <jeo.version>0.6.22</jeo.version>
+    <heap-size>undefined</heap-size>
+    <stack-size>undefined</stack-size>
   </properties>
   <dependencies>
     <dependency>
@@ -40,12 +43,14 @@ SOFTWARE.
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.11.3</version>
+      <version>5.11.4</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.11.3</version>
+      <version>5.11.4</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
@@ -55,12 +60,31 @@ SOFTWARE.
     <outputDirectory>${eo.targetDir}/classes</outputDirectory>
     <testOutputDirectory>${eo.targetDir}/classes</testOutputDirectory>
     <plugins>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.5.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>[11,)</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
         <version>${eo.version}</version>
         <configuration>
-          <excludeSources>.eoc/**</excludeSources>
+          <withRuntimeDependency>false</withRuntimeDependency>
+          <excludeSources>**/.eoc/**</excludeSources>
           <sodgIncludes>${eo.sodgIncludes}</sodgIncludes>
           <sodgExcludes>${eo.sodgExcludes}</sodgExcludes>
           <foreign>${project.build.directory}/eo-foreign.json</foreign>
@@ -79,8 +103,9 @@ SOFTWARE.
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <release>11</release>
+          <source>11</source>
+          <target>11</target>
         </configuration>
       </plugin>
       <plugin>
@@ -89,11 +114,16 @@ SOFTWARE.
         <configuration>
           <archive>
             <manifest>
+              <addClasspath>true</addClasspath>
               <mainClass>org.eolang.Main</mainClass>
             </manifest>
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.6.0</version>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.5.2</version>
@@ -101,6 +131,16 @@ SOFTWARE.
           <failIfNoTests>true</failIfNoTests>
           <useFile>false</useFile>
           <trimStackTrace>false</trimStackTrace>
+          <runOrder>random</runOrder>
+          <argLine>-Xmx${heap-size} -Xss${stack-size}</argLine>
+          <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory"/>
+          <properties>
+            <configurationParameters>
+              junit.jupiter.execution.parallel.enabled = true
+              junit.jupiter.execution.parallel.mode.default = concurrent
+              junit.jupiter.execution.parallel.mode.classes.default = concurrent
+            </configurationParameters>
+          </properties>
         </configuration>
       </plugin>
     </plugins>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.27.1",
+  "version": "0.28.1",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -32,9 +32,9 @@
   "dependencies": {
     "colors": "1.4.0",
     "commander": "12.1.0",
-    "eo2js": "0.0.7",
-    "fast-xml-parser": "4.5.0",
-    "node": "23.4.0",
+    "eo2js": "0.0.8",
+    "fast-xml-parser": "4.5.1",
+    "node": "23.5.0",
     "relative": "3.0.2",
     "semver": "7.6.3",
     "sync-request": "6.1.0",

package/src/commands/assemble.js

@@ -25,6 +25,7 @@
 const rel = require('relative');
 const path = require('path');
 const {mvnw, flags} = require('../mvnw');
+const {elapsed} = require('../elapsed');
 
 /**
  * Command to assemble .XMIR files.
@@ -33,8 +34,10 @@ const {mvnw, flags} = require('../mvnw');
  */
 module.exports = function(opts) {
   const target = path.resolve(opts.target);
-  return mvnw(['eo:assemble'].concat(flags(opts)), opts.target, opts.batch).then((r) => {
-    console.info('EO program assembled in %s', rel(target));
-    return r;
+  return elapsed((tracked) => {
+    return mvnw(['eo:assemble'].concat(flags(opts)), opts.target, opts.batch).then((r) => {
+      tracked.print('EO program assembled in %s', rel(target));
+      return r;
+    });
   });
 };

package/src/commands/docs.js

@@ -22,10 +22,14 @@
  * SOFTWARE.
  */
 
+const fs = require('fs');
+const path = require('path');
+
 /**
  * Command to create docs from .EO sources.
  * @param {Hash} opts - All options
  */
 module.exports = function(opts) {
-  console.info('This command is not yet implemented, sorry');
+  const filePath = path.resolve('eodocs.html');
+  fs.writeFileSync(filePath, '');
 };

package/src/commands/java/compile.js

@@ -33,6 +33,10 @@ const path = require('path');
  */
 module.exports = function(opts) {
   const target = path.resolve(opts.target);
+  /**
+   * @todo #368:30min Wrap logs in 'elapsed'
+   *  It is necessary to use 'elapsed' in all logging cases that require output of elapsed time
+   */
   return mvnw(['compiler:compile'].concat(flags(opts)), opts.target, opts.batch).then((r) => {
     console.info('Java .class files compiled into %s', rel(target));
     return r;

package/src/commands/java/link.js

@@ -33,7 +33,7 @@ const path = require('path');
  */
 module.exports = function(opts) {
   const jar = path.resolve(opts.target, 'eoc.jar');
-  return mvnw(['jar:jar'].concat(flags(opts)), opts.target, opts.batch).then((r) => {
+  return mvnw(['jar:jar', 'shade:shade'].concat(flags(opts)), opts.target, opts.batch).then((r) => {
     console.info('Executable JAR created at %s', rel(jar));
     return r;
   });

package/src/commands/java/test.js

@@ -30,5 +30,11 @@ const {mvnw, flags} = require('../../mvnw');
  * @return {Promise} of compile task
  */
 module.exports = function(opts) {
-  return mvnw(['surefire:test'].concat(flags(opts)));
+  return mvnw(
+    [
+      'surefire:test',
+      `-Dstack-size=${opts.stack}`,
+      `-Dheap-size=${opts.heap}`,
+    ].concat(flags(opts))
+  );
 };

package/src/commands/lint.js

@@ -43,6 +43,10 @@ module.exports = function(opts) {
     ).then((r) => {
       console.info('EO program linted in %s', rel(path.resolve(opts.target)));
       return r;
+    }).catch((error) => {
+      throw new Error(
+        'There are error and/or warnings; you may disable warnings via the --easy option'
+      );
     });
   } else {
     return mvnw(
@@ -51,6 +55,8 @@ module.exports = function(opts) {
     ).then((r) => {
       console.info('EO program verified in %s', rel(path.resolve(opts.target)));
       return r;
+    }).catch((error) => {
+      throw new Error('You may disable warnings via the --easy option');
     });
   }
 };

package/src/demand.js

@@ -32,6 +32,9 @@ const semver = require('semver');
  * @param {String} min - Minimal expected version
  */
 module.exports.gte = function(subject, current, min) {
+  if (current.endsWith('-SNAPSHOT')) {
+    return;
+  }
   if (semver.lt(current, min)) {
     console.error(
       '%s is required to have version %s or higher, while you use %s',

package/src/elapsed.js

@@ -0,0 +1,60 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022-2024 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.
+ */
+
+/**
+ * A utility function to measure the elapsed time of a task and provide
+ * detailed timing information.
+ *
+ * This function wraps a given task (callback function) and provides it with
+ * a `tracked` object that includes a `print` method. The `print` method can
+ * be used within the task to log messages along with the elapsed time
+ * since the task started execution. The elapsed time is formatted in milliseconds,
+ * seconds, or minutes, based on the duration.
+ *
+ * @param {Function} task - A callback function to be measured. The function
+ *                          is invoked with a `tracked` object as an argument.
+ * @return {*} Result of the wrapped callback function. The result of the
+ *             `task` callback will be returned unchanged.
+ * @todo #368:30min Decide if the `elapsed` utility function is in the right place,
+ *  consider relocating it and its test file if needed
+ */
+module.exports.elapsed = function elapsed(task) {
+  const startTime = Date.now();
+  return task({
+    print: (message) => {
+      const duration = Date.now() - startTime;
+      let extended;
+      if (duration < 1000) {
+        extended = `${duration}ms`;
+      } else if (duration < 60 * 1000) {
+        extended = `${Math.ceil(duration / 1000)}s`;
+      } else {
+        extended = `${Math.ceil(duration / 3600000)}min`;
+      }
+      const msg = `${message} in ${extended}`;
+      console.info(msg);
+      return msg;
+    }
+  });
+};

package/src/eoc.js

@@ -310,7 +310,7 @@ program.command('link')
 
 program.command('dataize')
   .description('Run the single executable binary and dataize an object')
-  .option('--stack <size>', 'Set stack size for the virtual machine', '1M')
+  .option('--stack <size>', 'Set stack size for the virtual machine', '64M')
   .option('--heap <size>', 'Set the heap size for the VM', '256M')
   .action((str, opts) => {
     clear(str);
@@ -333,6 +333,8 @@ program.command('dataize')
 
 program.command('test')
   .description('Run all visible unit tests')
+  .option('--stack <size>', 'Set stack size for the virtual machine', '64M')
+  .option('--heap <size>', 'Set the heap size for the VM', '256M')
   .action((str, opts) => {
     clear(str);
     if (program.opts().alone == undefined) {
@@ -342,9 +344,9 @@ program.command('test')
         .then((r) => coms().transpile(program.opts()))
         .then((r) => coms().compile(program.opts()))
         .then((r) => coms().link(program.opts()))
-        .then((r) => coms().test(program.opts()));
+        .then((r) => coms().test({...program.opts(), ...str}));
     } else {
-      coms().test(program.opts());
+      coms().test({...program.opts(), ...str});
     }
   });
 

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.27.1',
-  when: '2024-12-15'
+  what: '0.28.1',
+  when: '2024-12-23'
 };