polish refactoring

Author: akasimov

src/commands/java/pipeline.js

@@ -8,17 +8,19 @@ const {elapsed} = require('../../elapsed');
 
 /**
  * Runs multiple Maven goals in a single Maven invocation.
+ * @param {Object} coms - Command map to resolve goals and extra flags from
  * @param {Array.<String>} commands - Command names to run in order
  * @param {Object} opts - All options
  * @return {Promise} of pipeline task
  */
-module.exports = function(commands, opts) {
-  const coms = this;
+module.exports = function(coms, commands, opts) {
   return elapsed(async (tracked) => {
     const extraFlags = [];
     const goalList = commands.flatMap((cmd) => {
       const command = coms[cmd];
-      if (command.extraFlags) extraFlags.push(...command.extraFlags(opts));
+      if (command.extraFlags) {
+        extraFlags.push(...command.extraFlags(opts));
+      }
       return typeof command.goals === 'function' ? command.goals(opts) : command.goals || [];
     });
     const result = await mvnw(goalList.concat(flags(opts)).concat(extraFlags), opts.target, opts.batch);

src/commands/js/pipeline.js

@@ -3,15 +3,21 @@
  * SPDX-License-Identifier: MIT
  */
 
+const {elapsed} = require('../../elapsed');
+
 /**
  * Runs multiple JS pipeline steps sequentially.
+ * @param {Object} coms - Command map to resolve step functions from
  * @param {Array.<String>} commands - Command names to run in order
  * @param {Object} opts - All options
  * @return {Promise} of pipeline task
  */
-module.exports = async function(commands, opts) {
-  const coms = this;
-  for (const cmd of commands) {
-    await coms[cmd](opts);
-  }
+module.exports = function(coms, commands, opts) {
+  return elapsed(async (tracked) => {
+    for (const cmd of commands) {
+      // eslint-disable-next-line no-await-in-loop
+      await coms[cmd](opts);
+    }
+    tracked.print(`Pipeline [${commands.join(' \u2192 ')}] done`);
+  });
 };

src/eoc.js

@@ -44,7 +44,6 @@ const {program} = require('commander'),
         compile: require('./commands/java/compile'),
         dataize: require('./commands/java/dataize'),
         test: require('./commands/java/test'),
-        pipeline: require('./commands/java/pipeline'),
       }
     },
     [language.js]: {
@@ -56,9 +55,12 @@ const {program} = require('commander'),
         compile: require('./commands/js/compile'),
         dataize: require('./commands/js/dataize'),
         test: require('./commands/js/test'),
-        pipeline: require('./commands/js/pipeline'),
       }
     }
+  },
+  pipelines = {
+    [language.java]: require('./commands/java/pipeline'),
+    [language.js]: require('./commands/js/pipeline'),
   };
 
 if (process.argv.includes('--verbose')) {
@@ -144,7 +146,7 @@ program.command('parse')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'parse'], program.opts());
+      await pipe()(coms(), ['register', 'parse'], program.opts());
     } else {
       await coms().parse(program.opts());
     }
@@ -156,7 +158,7 @@ program.command('assemble')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble'], program.opts());
+      await pipe()(coms(), ['register', 'assemble'], program.opts());
     } else {
       await coms().assemble(program.opts());
     }
@@ -174,7 +176,7 @@ program.command('sodg')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble'], program.opts());
+      await pipe()(coms(), ['register', 'assemble'], program.opts());
       await coms().sodg({...program.opts(), ...str});
     } else {
       await coms().sodg({...program.opts(), ...str});
@@ -190,7 +192,7 @@ program.command('print')
   )
   .option(
     '--print-output <dir>',
-    'Directory where translated EO files are stored (relative to --target)',
+    'Directory where translated EO files are pipelinesd (relative to --target)',
     'print'
   )
   .action((str, opts) => {
@@ -205,7 +207,7 @@ program.command('lint')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint'], program.opts());
     } else {
       await coms().lint(program.opts());
     }
@@ -217,7 +219,7 @@ program.command('resolve')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint', 'resolve'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve'], program.opts());
     } else {
       await coms().resolve(program.opts());
     }
@@ -229,7 +231,7 @@ program.command('transpile')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint', 'resolve', 'transpile'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile'], program.opts());
     } else {
       await coms().transpile(program.opts());
     }
@@ -241,7 +243,7 @@ program.command('compile')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile'], program.opts());
     } else {
       await coms().compile(program.opts());
     }
@@ -252,7 +254,7 @@ program.command('link')
   .action(async (str, opts) => {
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
     } else {
       await coms().link(program.opts());
     }
@@ -266,7 +268,7 @@ program.command('dataize')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
       await coms().dataize(
         program.args[1], program.args.slice(2), {...program.opts(), ...str}
       );
@@ -285,7 +287,7 @@ program.command('test')
     pin(program.opts());
     clear(str);
     if (program.opts().alone === undefined) {
-      await coms().pipeline(['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
+      await pipe()(coms(), ['register', 'assemble', 'lint', 'resolve', 'transpile', 'compile', 'link'], program.opts());
       await coms().test({...program.opts(), ...str});
     } else {
       await coms().test({...program.opts(), ...str});
@@ -364,7 +366,7 @@ program.command('latex')
   .action(async (str, opts) => {
     pin(program.opts());
     clear(str);
-    await coms().pipeline(['register', 'parse'], program.opts());
+    await pipe()(coms(), ['register', 'parse'], program.opts());
     await coms().latex(program.opts());
   });
 
@@ -373,7 +375,7 @@ program.command('fmt')
   .action(async (str, opts) => {
     pin(program.opts());
     clear(str);
-    await coms().pipeline(['register', 'parse'], program.opts());
+    await pipe()(coms(), ['register', 'parse'], program.opts());
     await coms().print({
       printInput: '1-parse',
       printOutput: program.opts().sources,
@@ -422,3 +424,16 @@ function coms() {
   }
   return hash;
 }
+
+/**
+ * Get pipeline for the target language.
+ * @return {Function} - pipeline function
+ */
+function pipe() {
+  const lang = program.opts().language,
+    pipeline = pipelines[lang];
+  if (pipeline === undefined) {
+    throw new Error(`Unknown platform ${lang}`);
+  }
+  return pipeline;
+}