Fixed at lecture

Author: tshemsedinov

JavaScript/1-wrap.js

@@ -17,9 +17,10 @@ const wrap = f => {
 // Usage
 
 const func = (par1, par2) => {
-  console.dir({ method: { par1, par2 } });
+  console.dir({ par1, par2 });
   return [par1, par2];
 };
 
+func('Uno', 'Due');
 const wrapped = wrap(func);
-wrapped('Uno', 'Due');
+wrapped('Tre', 'Quatro');

JavaScript/2-before-after.js

@@ -5,7 +5,7 @@ const wrap = (before, after, f) => (...args) => after(f(...before(...args)));
 // Usage
 
 const func = (par1, par2) => {
-  console.dir({ method: { par1, par2 } });
+  console.dir({ par1, par2 });
   return [par1, par2];
 };
 
@@ -14,15 +14,15 @@ const before = (...args) => {
   return args;
 };
 
-const after = (...args) => {
+const after = res => {
   console.log('after');
-  return args;
+  return res;
 };
 
 const wrapped = wrap(before, after, func);
-wrapped('Uno', 'Due');
-
+const res = wrapped('Uno', 'Due');
 console.dir({
+  res,
   func: func.length,
   wrapped: wrapped.length,
 });

JavaScript/3-callback.js

@@ -22,7 +22,9 @@ const wrapFunction = f => {
       if (typeof callback === 'function') {
         args[args.length - 1] = (...args) => {
           console.log('Callback:', f.name);
-          return callback(...args);
+          const cbRes = callback(...args);
+          console.log('Callback results:', cbRes);
+          return cbRes;
         };
       }
     }
@@ -37,7 +39,8 @@ const wrapFunction = f => {
 
 const cloneInterface = anInterface => {
   const clone = {};
-  for (const key in anInterface) {
+  const keys = Object.keys(anInterface);
+  for (const key of keys) {
     const fn = anInterface[key];
     clone[key] = wrapFunction(fn);
   }
@@ -48,12 +51,14 @@ const cloneInterface = anInterface => {
 
 const interfaceName = {
   methodName(par1, par2, callback) {
-    console.dir({ method: { par1, par2 } });
+    console.dir({ par1, par2 });
     callback(null, { field: 'value' });
+    return par1;
   }
 };
 
 const cloned = cloneInterface(interfaceName);
-cloned.methodName('Uno', 'Due', () => {
-  console.log('Fire');
+cloned.methodName('Uno', 'Due', (err, data) => {
+  console.log({ err, data });
+  return true;
 });

JavaScript/6-timeout-async.js

@@ -28,9 +28,9 @@ const fn200 = timeout(200, fn);
 
 setTimeout(() => {
   fn100('first', (err, data) => {
-    console.log('Callback first', data);
+    console.log('Callback', data);
   });
   fn200('second', (err, data) => {
-    console.log('Callback second', data);
+    console.log('Callback', data);
   });
 }, 150);