Improve examples

Author: tshemsedinov

JavaScript/1-wrap.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// const wrap = f => (...args) => f(...args);
+// const wrap = (f) => (...args) => f(...args);
 
 const wrap = (f) => {
   console.log('Wrap function:', f.name);

JavaScript/2-before-after.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const wrap = (before, after, f) => (...args) => after(f(...before(...args)));
+const wrap = (f, before, after) => (...args) => after(f(...before(...args)));
 
 // Usage
 
@@ -19,7 +19,7 @@ const after = (res) => {
   return res;
 };
 
-const wrapped = wrap(before, after, func);
+const wrapped = wrap(func, before, after);
 const res = wrapped('Uno', 'Due');
 console.dir({
   res,

JavaScript/3-callback.js

@@ -1,8 +1,8 @@
 'use strict';
 
-// const wrap = (before, after, f) => (...args) => after(f(...before(...args)));
+// const wrap = (f, before, after) => (...args) => after(f(...before(...args)));
 
-// const wrapAsync = (before, after, beforeCb, afterCb, f) =>
+// const wrapAsync = (f, before, after, beforeCb, afterCb) =>
 //   (...args) => {
 //     const callback = args[args.length - 1];
 //     if (typeof callback === 'function') {

JavaScript/5-timeout.js

@@ -2,7 +2,7 @@
 
 // Wrapper will prevent call after timeout
 
-const timeout = (msec, f) => {
+const timeout = (f, msec) => {
   let timer = setTimeout(() => {
     if (timer) console.log('Function timed out');
     timer = null;
@@ -21,8 +21,8 @@ const fn = (par) => {
   console.log('Function called, par:', par);
 };
 
-const fn100 = timeout(100, fn);
-const fn200 = timeout(200, fn);
+const fn100 = timeout(fn, 100);
+const fn200 = timeout(fn, 200);
 
 setTimeout(() => {
   fn100('first');

JavaScript/6-timeout-async.js

@@ -2,7 +2,7 @@
 
 // Wrapper will prevent call after timeout
 
-const timeout = (msec, f) => {
+const timeout = (f, msec) => {
   let timer = setTimeout(() => {
     if (timer) console.log('Function timedout');
     timer = null;
@@ -22,8 +22,8 @@ const fn = (par, callback) => {
   callback(null, par);
 };
 
-const fn100 = timeout(100, fn);
-const fn200 = timeout(200, fn);
+const fn100 = timeout(fn, 100);
+const fn200 = timeout(fn, 200);
 
 setTimeout(() => {
   fn100('first', (err, data) => {

JavaScript/8-limit.js

@@ -4,7 +4,7 @@
 
 const emptiness = () => {};
 
-const limit = (count, fn) => {
+const limit = (fn, count) => {
   let counter = 0;
   if (!fn) return emptiness;
   const wrapped = (...args) => {
@@ -21,7 +21,7 @@ const fn = (par) => {
   console.log('Function called, par:', par);
 };
 
-const fn2 = limit(2, fn);
+const fn2 = limit(fn, 2);
 
 fn2('first');
 fn2('second');

JavaScript/9-cancelable.js

@@ -1,6 +1,16 @@
 'use strict';
 
-const cancelable = (fn) => {
+// Return struct
+
+const cancelable1 = (fn) => {
+  const wrapper = (...args) => (fn ? fn(...args) : null);
+  const cancel = () => fn = null;
+  return { call: wrapper, cancel };
+};
+
+// Mixin
+
+const cancelable2 = (fn) => {
   const wrapper = (...args) => (fn ? fn(...args) : null);
   wrapper.cancel = () => fn = null;
   return wrapper;
@@ -12,8 +22,16 @@ const fn = (par) => {
   console.log('Function called, par:', par);
 };
 
-const f2 = cancelable(fn);
+{ // Return struct
+  const f2 = cancelable1(fn);
+  f2.call('first');
+  f2.cancel();
+  f2.call('second');
+}
 
-f2('first');
-f2.cancel();
-f2('second');
+{ // Mixin
+  const f2 = cancelable2(fn);
+  f2('first');
+  f2.cancel();
+  f2('second');
+}