eolang 0.7.0 → 0.8.2

package/README.md

@@ -1,6 +1,13 @@
 <img alt="logo" src="https://www.objectionary.com/cactus.svg" height="92px" />
 
+[![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/)
+
 [![grunt](https://github.com/objectionary/eoc/actions/workflows/grunt.yml/badge.svg)](https://github.com/objectionary/eoc/actions/workflows/grunt.yml)
+[![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)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/objectionary/eoc/blob/master/LICENSE.txt)
 
 First, you install [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
 and [Java SE](https://www.oracle.com/java/technologies/downloads/).
@@ -38,8 +45,8 @@ You can also do many other things with `eoc` commands
   * `transpile` converts XMIR to target programming language (Java by default)
   * `compile` converts target language sources to binaries
   * `link` puts all binaries together into a single executable binary
-  * `dataize` executes the binary and dataizes a single object
-  * `test` executes all visible unit tests
+  * `dataize` dataizes a single object from the executable binary
+  * `test` dataizes all visible unit tests
 
 There are also commands that help manipulate with XMIR and EO sources (some of them are not implemented as of yet):
 

package/mvnw/pom.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-The MIT License (MIT)
-
 Copyright (c) 2022 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.7.0",
+  "version": "0.8.2",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -22,16 +22,16 @@
   },
   "dependencies": {
     "colors": "1.4.0",
-    "commander": "9.2.0",
-    "fast-xml-parser": "4.0.0",
+    "commander": "9.4.0",
+    "fast-xml-parser": "4.0.9",
     "xmlhttprequest": "1.8.0"
   },
   "devDependencies": {
-    "eslint": "5.15.3",
-    "eslint-config-google": "0.12.0",
-    "grunt": "^1.5.3",
-    "grunt-contrib-clean": "2.0.0",
-    "grunt-eslint": "21.0.0",
+    "eslint": "5.16.0",
+    "eslint-config-google": "0.14.0",
+    "grunt": "1.5.3",
+    "grunt-contrib-clean": "2.0.1",
+    "grunt-eslint": "21.1.0",
     "grunt-mocha-cli": "7.0.0",
     "mocha": "^10.0.0"
   },

package/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

package/src/commands/assemble.js

@@ -33,7 +33,7 @@ const parserVersion = require('../parser-version');
 module.exports = function(opts) {
   mvnwSync([
     'eo:assemble',
-    '-Deo.version=' + (opts.parserVersion ? opts.parserVersion : parserVersion()),
+    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
     opts.verbose ? '' : '--quiet',
     opts.trackOptimizationSteps ? '-Deo.trackOptimizationSteps' : '',
     opts.hash ? '-Deo.hash=' + opts.hash : '',

package/src/commands/clean.js

@@ -24,6 +24,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
 /**
  * Deletes all temporary files.
@@ -33,4 +34,11 @@ module.exports = function(opts) {
   const home = path.resolve(opts.target);
   fs.rmSync(home, {recursive: true, force: true});
   console.info('The directory %s deleted', home);
+  if (opts.cached) {
+    const eo = path.join(os.homedir(), '.eo');
+    if (fs.existsSync(eo)) {
+      fs.rmSync(eo, {recursive: true});
+      console.info('The directory ~/.eo was deleted');
+    }
+  }
 };

package/src/commands/gmi.js

@@ -0,0 +1,45 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Yegor Bugayenko
+ *
+ * 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.
+ */
+
+const path = require('path');
+const mvnwSync = require('../mvnw');
+const parserVersion = require('../parser-version');
+
+/**
+ * Generate GMI files from XMIR.
+ * @param {Hash} opts - All options
+ */
+module.exports = function(opts) {
+  mvnwSync([
+    'eo:gmi',
+    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
+    opts.verbose ? '' : '--quiet',
+    opts.gmiXml ? '-Deo.generateGmiXmlFiles' : '',
+    opts.gmiXembly ? '-Deo.generateXemblyFiles' : '',
+    opts.gmiGraph ? '-Deo.generateGraphFiles' : '',
+    opts.gmiDot ? '-Deo.generateDotFiles' : '',
+    `-Deo.targetDir=${path.resolve(opts.target)}`,
+  ]);
+  console.info('GMI files generated in %s', path.resolve(opts.target));
+};

package/src/commands/register.js

@@ -34,7 +34,7 @@ module.exports = function(opts) {
   const foreign = path.resolve(opts.target, 'eo-foreign.json');
   mvnwSync([
     'eo:register',
-    '-Deo.version=' + (opts.parserVersion ? opts.parserVersion : parserVersion()),
+    '-Deo.version=' + (opts.parser ? opts.parser : parserVersion()),
     opts.verbose ? '' : '--quiet',
     `-Deo.targetDir=${path.resolve(opts.target)}`,
     `-Deo.sourcesDir=${path.resolve(opts.sources)}`,

package/src/commands/transpile.js

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

package/src/eoc.js

@@ -28,6 +28,7 @@ const tinted = require('./tinted-console');
 const audit = require('./commands/audit');
 const clean = require('./commands/clean');
 const assemble = require('./commands/assemble');
+const gmi = require('./commands/gmi');
 const register = require('./commands/register');
 const transpile = require('./commands/transpile');
 const compile = require('./commands/compile');
@@ -69,10 +70,12 @@ program.command('foreign')
     foreign(program.opts());
   });
 
-program.command('clean')
+program
+  .command('clean')
+  .option('--cached', 'delete ~/.eo directory')
   .description('delete all temporary files')
   .action((str, opts) => {
-    clean(program.opts());
+    clean({...program.opts(), ...str});
   });
 
 program.command('register')
@@ -90,6 +93,20 @@ program.command('assemble')
     assemble(program.opts());
   });
 
+program.command('gmi')
+  .description('generate GMI files from XMIR')
+  .option('--gmi-xml', 'generate .gmi.xml files')
+  .option('--gmi-xembly', 'generate .gmi.xe files')
+  .option('--gmi-graph', 'generate .gmi.graph files')
+  .option('--gmi-dot', 'generate .gmi.dot files')
+  .action((str, opts) => {
+    if (program.opts().alone == undefined) {
+      register(program.opts());
+      assemble(program.opts());
+    }
+    gmi({...program.opts(), ...str});
+  });
+
 program.command('transpile')
   .description('convert EO files into target language')
   .action((str, opts) => {

package/src/mvnw.js

@@ -25,6 +25,16 @@
 const path = require('path');
 const {spawnSync} = require('child_process');
 
+/**
+ * The shell to use (depending on operating system).
+ * @return {String} Path to shell or "undefined" if default one should be used
+ */
+function shell() {
+  if (process.platform == 'win32') {
+    return 'C:\\Windows\\SysWOW64\\WindowsPowerShell\\v1.0\\powershell.exe';
+  }
+}
+
 /**
  * Run mvnw with provided commands.
  * @param {Hash} args - All arguments to pass to it
@@ -48,13 +58,7 @@ module.exports = function(args) {
     {
       cwd: home,
       stdio: 'inherit',
-      shell: (
-        process.platform == 'win32'
-        ?
-        'C:\\Windows\\SysWOW64\\WindowsPowerShell\\v1.0\\powershell.exe'
-        :
-        undefined
-      ),
+      shell: shell(),
     }
   );
   if (result.status != 0) {

package/src/version.js

@@ -22,4 +22,4 @@
  * SOFTWARE.
  */
 
-module.exports = '0.7.0';
+module.exports = '0.8.2';