Syntax and code style

tshemsedinov · tshemsedinov · commit e3dfe8ca894f · 2016-12-19T05:11:02.000+02:00
diff --git a/JavaScript/1-superposition.js b/JavaScript/1-superposition.js
@@ -2,7 +2,7 @@
 
 let pow = Math.pow;
 let sqrt = Math.sqrt;
-let inc = x => ++x;
+let inc = x => x + 1;
 let add = (a, b) => a + b;
 let mul = (a, b) => a * b;
 let div = (a, b) => a / b;
diff --git a/JavaScript/2-composition.js b/JavaScript/2-composition.js
@@ -1,6 +1,6 @@
 'use strict';
 
-let compose = (f1, f2) => (x) => f2(f1(x));
+let compose = (f1, f2) => x => f2(f1(x));
 
 let s = 'MARCUS AURELIUS';
 console.log(s);
diff --git a/JavaScript/composeAsync.js b/JavaScript/composeAsync.js
@@ -1,35 +1,39 @@
+'use strict';
+
 global.api = {};
 api.fs = require('fs');
 
 let reduceAsync = function(items, performer, callback, initialValue) {
-  var nseted     = (typeof initialValue === 'undefined'),
-      counter    = nseted ? 1 : 0,
-      previous   = nseted ? items[0] : initialValue,
-      current    = nseted ? items[1] : items[0];
+  var nseted = (typeof(initialValue) === 'undefined'),
+      counter = nseted ? 1 : 0,
+      previous = nseted ? items[0] : initialValue,
+      current = nseted ? items[1] : items[0];
 
   function response(err, data) {
     if (!err && counter !== items.length - 1) {
       ++counter;
       previous = data;
       current  = items[counter];
       performer(previous, current, response, counter, items);
-    }
-    else {
-      if (callback) callback(err, data);
+    } else if (callback) {
+      callback(err, data);
     }
   }
 
   performer(previous, current, response, counter, items);
-}
+};
 
 // params - array of parametrs for functions
 // args - array of functions
 // args[i] - function
 // args[-1] - callback(err, data)
+//
 function composeAsync(params, ...args) {
   reduceAsync(
     args.slice(0, -1),
-    (params, fn, callback) => fn.apply(null, [].concat(params).concat(callback)),
+    (params, fn, callback) => fn.apply(
+      null, [].concat(params).concat(callback)
+    ),
     args[args.length - 1],
     params
   );
@@ -50,20 +54,20 @@ function wrapAsync(callback) {
 }
 
 function read(file, charset, callback) {
-  console.dir({read:{file, callback}});
+  console.dir({ read: { file, callback } });
   api.fs.readFile(file, charset, callback);
 }
 
 function parse(data, callback) {
-  console.dir({parse:{data, callback}});
-	wrapAsync(() => {
-  	callback(null, ['Data has been', 'processed!']);
-	});
+  console.dir({ parse: { data, callback } });
+  wrapAsync(() => {
+    callback(null, ['Data has been', 'processed!']);
+  });
 }
 
 function preprocess(data1, data2, callback) {
-  console.dir({preprocess:{data1, data2, callback}});
-	wrapAsync(() => {
-  	callback(null, data1 + ' ' + data2);
-	});
+  console.dir({ preprocess: { data1, data2, callback } });
+  wrapAsync(() => {
+    callback(null, data1 + ' ' + data2);
+  });
 }
