eolang 0.16.0 → 0.17.0

package/eo-version.txt

@@ -1 +1 @@
-0.35.1
+0.35.2

package/home-hash.txt

@@ -0,0 +1 @@
+130afdd1456a0cbafd52aee8d7bc612e1faac547

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eolang",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "author": "Yegor Bugayenko <yegor256@gmail.com> (https://www.yegor256.com/)",
   "license": "MIT",
   "repository": "objectionary/eoc",
@@ -35,6 +35,7 @@
     "fast-xml-parser": "4.3.4",
     "node": "21.6.1",
     "relative": "3.0.2",
+    "semver": "7.6.0",
     "sync-request": "6.1.0",
     "xmlhttprequest": "1.8.0"
   },

package/src/commands/phi.js

@@ -24,6 +24,7 @@
 
 const rel = require('relative');
 const path = require('path');
+const {gte} = require('../demand');
 const {mvnw, flags} = require('../mvnw');
 
 /**
@@ -32,6 +33,7 @@ const {mvnw, flags} = require('../mvnw');
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
+  gte('EO parser', opts.parser, '0.35.2');
   const target = path.resolve(opts.target);
   const input = path.resolve(opts.target, '2-optimize');
   console.debug('Reading .XMIR files from %s', rel(input));
@@ -42,8 +44,8 @@ module.exports = function(opts) {
       .concat(flags(opts))
       .concat(
         [
-          `-DphiInputDir=${input}`,
-          `-DphiOutputDir=${output}`,
+          `-Deo.phiInputDir=${input}`,
+          `-Deo.phiOutputDir=${output}`,
         ]
       ),
     opts.target, opts.batch

package/src/commands/unphi.js

@@ -25,6 +25,7 @@
 const rel = require('relative');
 const path = require('path');
 const {mvnw, flags} = require('../mvnw');
+const {gte} = require('../demand');
 
 /**
  * Command to convert .PHI files into .XMIR files.
@@ -32,6 +33,7 @@ const {mvnw, flags} = require('../mvnw');
  * @return {Promise} of assemble task
  */
 module.exports = function(opts) {
+  gte('EO parser', opts.parser, '0.35.2');
   const input = path.resolve(opts.target, 'phi');
   console.debug('Reading .PHI files from %s', rel(input));
   const output = path.resolve(opts.target, 'unphi');
@@ -41,8 +43,8 @@ module.exports = function(opts) {
       .concat(flags(opts))
       .concat(
         [
-          `-DunphiInputDir=${input}`,
-          `-DunphiOutputDir=${output}`,
+          `-Deo.unphiInputDir=${input}`,
+          `-Deo.unphiOutputDir=${output}`,
         ]
       ),
     opts.target, opts.batch

package/src/demand.js

@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+const semver = require('semver');
+
+/**
+ * Only if provided version is the required one or younger.
+ *
+ * @param {String} subject - What is being checked
+ * @param {String} current - Current version
+ * @param {String} min - Minimal expected version
+ */
+module.exports.gte = function(subject, current, min) {
+  if (semver.lt(current, min)) {
+    console.error(
+      '%s is required to have version %s or higher, while you use %s',
+      subject, min, current
+    );
+    process.exit(1);
+  }
+};

package/src/eoc.js

@@ -49,9 +49,13 @@ if (process.argv.includes('--verbose')) {
 
 const fs = require('fs');
 const path = require('path');
+const hash = fs.readFileSync(path.join(__dirname, '../home-hash.txt'), 'utf8');
 let parser = fs.readFileSync(path.join(__dirname, '../eo-version.txt'), 'utf8');
 if (process.argv.includes('--latest')) {
   parser = require('./parser-version').get();
+  // Maybe here we should also go to GITHUB, find out what is the
+  // latest hash of the objectionary/home repository, and then
+  // set it to the "hash" variable?
 } else {
   console.debug('EO parser ' + parser + '; use the --latest flag if you need a freshier one');
 }
@@ -68,7 +72,7 @@ program
 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', parser)
+  .option('--hash <hex>', 'Hash in objectionary/home to compile against', hash)
   .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')

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.16.0',
+  what: '0.17.0',
   when: '2024-02-14'
 };