eolang 0.11.1 → 0.13.0

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Yegor Bugayenko
+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

package/README.md

@@ -3,8 +3,8 @@
 [![EO principles respected here](https://www.elegantobjects.org/badge.svg)](https://www.elegantobjects.org)
 [![We recommend IntelliJ IDEA](https://www.elegantobjects.org/intellij-idea.svg)](https://www.jetbrains.com/idea/)
 
-[![node-current](https://img.shields.io/node/v/eolang)](https://www.npmjs.com/package/eolang)
 [![grunt](https://github.com/objectionary/eoc/actions/workflows/grunt.yml/badge.svg)](https://github.com/objectionary/eoc/actions/workflows/grunt.yml)
+[![node-current](https://img.shields.io/node/v/eolang)](https://www.npmjs.com/package/eolang)
 [![PDD status](http://www.0pdd.com/svg?name=objectionary/eoc)](http://www.0pdd.com/p?name=objectionary/eoc)
 [![Hits-of-Code](https://hitsofcode.com/github/objectionary/eoc)](https://hitsofcode.com/view/github/objectionary/eoc)
 ![Lines of code](https://img.shields.io/tokei/lines/github/objectionary/eoc)

package/itest/program.eo

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 #
-# Copyright (c) 2022 Yegor Bugayenko
+# 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

package/itest/story-test.eo

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 #
-# Copyright (c) 2022 Yegor Bugayenko
+# 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

package/itest/story.eo

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 #
-# Copyright (c) 2022 Yegor Bugayenko
+# 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

package/mvnw/.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

package/mvnw/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2022 Yegor Bugayenko
+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
@@ -31,15 +31,20 @@ SOFTWARE.
     <eo.version>0.0.0</eo.version>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>org.eolang</groupId>
+      <artifactId>eo-runtime</artifactId>
+      <version>${eo.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.2</version>
+      <version>5.9.3</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.2</version>
+      <version>5.9.3</version>
     </dependency>
   </dependencies>
   <build>
@@ -82,7 +87,7 @@ SOFTWARE.
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M8</version>
+        <version>3.1.0</version>
         <configuration>
           <failIfNoTests>true</failIfNoTests>
         </configuration>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.11.1",
+  "version": "0.13.0",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -31,20 +31,21 @@
   ],
   "dependencies": {
     "colors": "1.4.0",
-    "commander": "10.0.0",
-    "fast-xml-parser": "4.0.13",
+    "commander": "10.0.1",
+    "fast-xml-parser": "4.2.2",
+    "node": "20.2.0",
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "eslint": "8.32.0",
+    "eslint": "8.41.0",
     "eslint-config-google": "0.14.0",
-    "grunt": "1.5.3",
+    "grunt": "1.6.1",
     "grunt-contrib-clean": "2.0.1",
-    "grunt-eslint": "24.0.1",
-    "grunt-mocha-cli": "7.0.0",
+    "grunt-eslint": "24.1.0",
+    "grunt-mocha-cli": "^7.0.0",
     "mocha": "^10.2.0"
   },
   "scripts": {
-    "test": "mocha --timeout 1200000"
+    "test": "mocha --timeout 120.13.0"
   }
 }

package/renovate.json

@@ -3,5 +3,9 @@
   "extends": [
     "config:base"
   ],
-  "ignoreDeps": ["maven-compiler-plugin", "org.eolang:eo-maven-plugin"]
+  "ignoreDeps": [
+    "org.apache.maven.plugins:maven-compiler-plugin",
+    "org.eolang:eo-maven-plugin",
+    "org.eolang:eo-runtime"
+  ]
 }

package/src/commands/assemble.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const path = require('path');
 const mvnw = require('../mvnw');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to assemble .XMIR files.
@@ -34,10 +33,10 @@ const parserVersion = require('../parser-version');
 module.exports = function(opts) {
   return mvnw([
     'eo:assemble',
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
+    '-Deo.hash=' + (opts.hash ? opts.hash : opts.parser),
     opts.verbose ? '' : '--quiet',
     opts.trackOptimizationSteps ? '-Deo.trackOptimizationSteps' : '',
-    opts.hash ? '-Deo.hash=' + opts.hash : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.outputDir=${path.resolve(opts.target, 'classes')}`,
     `-Deo.placed=${path.resolve(opts.target, 'eo-placed.csv')}`,

package/src/commands/audit.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -23,7 +23,6 @@
  */
 
 const mvnw = require('../mvnw');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to audit all packages.
@@ -31,6 +30,5 @@ const parserVersion = require('../parser-version');
  * @return {Promise} of audit task
  */
 module.exports = function(opts) {
-  parserVersion.get();
   return mvnw(['--version'], null, opts.batch);
 };

package/src/commands/clean.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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

package/src/commands/compile.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const mvnw = require('../mvnw');
 const path = require('path');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to compile target language into binaries.
@@ -40,7 +39,7 @@ module.exports = function(opts) {
     `-Dmaven.compiler.target=1.8`,
     `-Deo.targetDir=${target}`,
     `-Deo.generatedDir=${path.resolve(opts.target, 'generated-sources')}`,
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
   ], opts.target, opts.batch).then((r) => {
     console.info('Java .class files compiled into %s', target);
     return r;

package/src/commands/dataize.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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

package/src/commands/foreign.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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

package/src/commands/link.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const mvnw = require('../mvnw');
 const path = require('path');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to link binaries into a single executable binary.
@@ -36,7 +35,7 @@ module.exports = function(opts) {
     'jar:jar',
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
   ], opts.target, opts.batch).then((r) => {
     console.info('Executable JAR created at %s', path.resolve(opts.target, 'eoc.jar'));
     return r;

package/src/commands/parse.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const path = require('path');
 const mvnw = require('../mvnw');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to parse EO into .XMIR files.
@@ -34,9 +33,9 @@ const parserVersion = require('../parser-version');
 module.exports = function(opts) {
   return mvnw([
     'eo:parse',
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
+    '-Deo.hash=' + (opts.hash ? opts.hash : opts.parser),
     opts.verbose ? '' : '--quiet',
-    opts.hash ? '-Deo.hash=' + opts.hash : '',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.outputDir=${path.resolve(opts.target, 'classes')}`,
   ], opts.target, opts.batch).then((r) => {

package/src/commands/register.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const mvnw = require('../mvnw');
 const path = require('path');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to register .EO sources.
@@ -35,7 +34,7 @@ module.exports = function(opts) {
   const foreign = path.resolve(opts.target, 'eo-foreign.json');
   return mvnw([
     'eo:register',
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.sourcesDir=${path.resolve(opts.sources)}`,

package/src/commands/sodg.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const path = require('path');
 const mvnw = require('../mvnw');
-const parserVersion = require('../parser-version');
 
 /**
  * Generate SODG files from XMIR.
@@ -34,7 +33,7 @@ const parserVersion = require('../parser-version');
 module.exports = function(opts) {
   const argv = [
     'eo:sodg',
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
   ];

package/src/commands/test.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -33,6 +33,7 @@ const path = require('path');
 module.exports = function(opts) {
   return mvnw([
     'surefire:test',
+    '-Deo.version=' + opts.parser,
     `-Deo.targetDir=${path.resolve(opts.target)}`,
   ]);
 };

package/src/commands/transpile.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -24,7 +24,6 @@
 
 const mvnw = require('../mvnw');
 const path = require('path');
-const parserVersion = require('../parser-version');
 
 /**
  * Command to transpile XMIR files into target language.
@@ -35,7 +34,7 @@ module.exports = function(opts) {
   const sources = path.resolve(opts.target, 'generated-sources');
   return mvnw([
     'eo:transpile',
-    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion.get()),
+    '-Deo.version=' + opts.parser,
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.generatedDir=${sources}`,

package/src/eoc.js

@@ -2,7 +2,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -41,23 +41,34 @@ const test = require('./commands/test');
 if (process.argv.includes('--verbose')) {
   tinted.enable('debug');
   console.debug('Debug output is turned ON');
-  console.info('INFO');
 }
 
+if (process.argv.includes('--latest')) {
+  const ver = require('./parser-version').get();
+  process.argv.push('--parser');
+  process.argv.push(ver);
+  process.argv.push('--hash');
+  process.argv.push(ver);
+}
+
+const version = require('./version');
 program
   .name('eoc')
-  .description('EO command-line toolkit (' + require('./version') + ')')
-  .version(require('./version'));
+  .description('EO command-line toolkit (' + version.what + ' ' + version.when + ')')
+  .version(version.what);
 
+const parser = '0.29.4';
 program
   .option('-s, --sources <path>', 'Directory with .EO sources', '.')
   .option('-t, --target <path>', 'Directory with all generated files', '.eoc')
-  .option('--hash <hex>', 'Hash in objectionary/home to compile against')
-  .option('--parser <version>', 'Set the version of parser to use')
+  .option('--hash <hex>', 'Hash in objectionary/home to compile against', parser)
+  .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('-b, --batch', 'Run in batch mode, suppress interactive messages')
   .option('--no-color', 'Disable colorization of console messages')
   .option('--track-optimization-steps', 'Save intermediate XMIR files')
+  .option('-c, --clean', 'Delete ./.eoc directory')
   .option('--verbose', 'Print debug messages and full output of child processes');
 
 program.command('audit')
@@ -89,6 +100,7 @@ program.command('register')
 program.command('parse')
   .description('Parse EO files into XMIR')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => parse(program.opts()));
@@ -100,6 +112,7 @@ program.command('parse')
 program.command('assemble')
   .description('Parse EO files into XMIR and join them with required dependencies')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()));
@@ -117,6 +130,7 @@ program.command('sodg')
   .option('--include <names>', 'Generate SODG for these object names (using mask)', '**')
   .option('--exclude <names>', 'Don\'t generate SODG for these objects')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
@@ -129,6 +143,7 @@ program.command('sodg')
 program.command('transpile')
   .description('Convert EO files into target language')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
@@ -141,6 +156,7 @@ program.command('transpile')
 program.command('compile')
   .description('Compile target language sources into binaries')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
@@ -154,6 +170,7 @@ program.command('compile')
 program.command('link')
   .description('Link together all binaries into a single executable binary')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
@@ -169,6 +186,7 @@ program.command('dataize')
   .description('Run the single executable binary and dataize an object')
   .option('--stack <size>', 'Change stack size', '1M')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
@@ -184,6 +202,7 @@ program.command('dataize')
 program.command('test')
   .description('Run all visible unit tests')
   .action((str, opts) => {
+    clear(str);
     if (program.opts().alone == undefined) {
       register(program.opts())
         .then((r) => assemble(program.opts()))
@@ -203,3 +222,13 @@ try {
   console.debug(e.stack);
   process.exit(1);
 }
+
+/**
+ * Checks --clean option and clears the .eoc directory if true.
+ * @param {*} str Str
+ */
+function clear(str) {
+  if (program.opts().clean) {
+    clean({...program.opts(), ...str});
+  }
+}

package/src/mvnw.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -59,8 +59,10 @@ module.exports = function(args, tgt, batch) {
       return t != '';
     }).concat([
       '--batch-mode',
+      '--color=never',
       '--update-snapshots',
       '--fail-fast',
+      '--strict-checksums',
     ]);
     const cmd = bin + ' ' + params.join(' ');
     console.debug('+ %s', cmd);
@@ -73,13 +75,14 @@ module.exports = function(args, tgt, batch) {
         shell: shell(),
       }
     );
-    if (tgt != undefined) {
+    if (tgt != undefined && args.includes('--quiet')) {
       if (!batch) {
         start();
       }
       result.on('close', (code) => {
         if (code !== 0) {
-          throw new Error(`The command "${cmd}" exited with #${code} code`);
+          console.error(`The command "${cmd}" exited with #${code} code`);
+          process.exit(1);
         }
         if (!batch) {
           stop();
@@ -89,7 +92,8 @@ module.exports = function(args, tgt, batch) {
     } else {
       result.on('close', (code) => {
         if (code !== 0) {
-          throw new Error(`The command "${cmd}" exited with #${code} code`);
+          console.error(`The command "${cmd}" exited with #${code} code`);
+          process.exit(1);
         }
         resolve(args);
       });

package/src/parser-version.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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

package/src/tinted-console.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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

package/src/version.js

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Yegor Bugayenko
+ * 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
@@ -22,4 +22,9 @@
  * SOFTWARE.
  */
 
-module.exports = '0.11.1';
+// The values here are replaced automatically by the .rultor.yml script,
+// at the "release" pipeline:
+module.exports = {
+  what: '0.13.0',
+  when: '00.13.00-00'
+};