Improve examples

tshemsedinov · tshemsedinov · commit a720bf80b560 · 2018-03-26T19:35:40.000+03:00
diff --git a/JavaScript/1-decorator.js b/JavaScript/1-decorator.js
@@ -8,12 +8,12 @@ const g3 = { area: 300 };
 g2.area = 200;
 
 // Mixin as a function
-function mixinCalculateCost(obj) {
+const mixinCalculateCost = (obj) => {
   obj.area = obj.area || 0;
   obj.calculateCost = function(price) {
     return this.area * price;
   };
-}
+};
 
 // Mixin to single object
 mixinCalculateCost(g1);
diff --git a/JavaScript/2-extend.js b/JavaScript/2-extend.js
@@ -1,19 +1,21 @@
 'use strict';
 
-/*function extend(obj, mixin) {
-  for (let key in mixin) {
-    if (mixin.hasOwnProperty(key)) {
-      obj[key] = mixin[key];
-    }
-  }
-  return obj;
-}*/
+// const extend = (obj, mixin) => {
+//   for (let key in mixin) {
+//     if (mixin.hasOwnProperty(key)) {
+//       obj[key] = mixin[key];
+//     }
+//   }
+//   return obj;
+// };
 
 const extend = (obj, mixin) => {
   Object.keys(mixin).forEach(key => obj[key] = mixin[key]);
   return obj;
 };
 
+// Usage
+
 const obj1 = {
   name: 'Marcus Aurelius',
   city: 'Rome',
diff --git a/JavaScript/3-assign.js b/JavaScript/3-assign.js
@@ -23,7 +23,7 @@ const mix2 = {
   }
 };
 
-Object.assign(obj1, mix1, mix2);
+const res = Object.assign(obj1, mix1, mix2);
 console.log(obj1);
-console.log(obj1.toString());
+console.log(res.toString());
 console.log(`His age is ${obj1.age()} as of today`);
diff --git a/JavaScript/4-behavior.js b/JavaScript/4-behavior.js
@@ -1,13 +1,13 @@
 'use strict';
 
-function scalable(image) {
+const scalable = (image) => {
   image.scale = () => console.log('Image scaled');
-}
+};
 
-function lazy(image) {
+const lazy = (image) => {
   const scale = image.scale;
   image.scale = () => setImmediate(() => scale());
-}
+};
 
 const image = {};
 
diff --git a/JavaScript/6-events.js b/JavaScript/6-events.js
@@ -1,14 +1,13 @@
 'use strict';
 
-const emitable = obj => Object.assign(obj, {
-  events: {},
+const emitable = (obj, events = {}) => Object.assign(obj, {
   on(name, fn) {
-    const event = this.events[name] || [];
-    this.events[name] = event;
+    const event = events[name] || [];
+    events[name] = event;
     event.push(fn);
   },
   emit(name, ...data) {
-    const event = this.events[name];
+    const event = events[name];
     if (event) event.forEach(fn => fn(...data));
   }
 });
diff --git a/JavaScript/7-build.js b/JavaScript/7-build.js
@@ -30,32 +30,21 @@ const accessors = {
 
 };
 
-// Assign metadata to array elements
-//   data - array of objects
-//   metadata - data describes PrototypeClass structure
-// Returns: built PrototypeClass
-//
-function assignMetadata(data, metadata) {
-  const proto = buildPrototype(metadata);
-  assignPrototype(data, proto);
-  return proto;
-}
-
 // Assign prototype to records array or single record
 //   data - array of objects
 //   proto - dynamically built prototipe to be assigned
-//
-function assignPrototype(data, proto) {
+
+const assignPrototype = (data, proto) => {
   if (Array.isArray(data)) {
     data.forEach(item => item.__proto__ = proto.prototype);
   } else {
     data.__proto__ = proto.prototype;
   }
-}
+};
 
 // Build Prototype from Metadata
-//
-function buildPrototype(metadata) {
+
+const buildPrototype = (metadata) => {
   const protoClass = function ProtoClass() {};
   let index = 0, fieldDef, buildGetter, fieldType;
   for (const name in metadata) {
@@ -66,10 +55,23 @@ function buildPrototype(metadata) {
     if (buildGetter) buildGetter(protoClass, name, index++, fieldDef);
   }
   return protoClass;
-}
+};
+
+// Assign metadata to array elements
+//   data - array of objects
+//   metadata - data describes PrototypeClass structure
+// Returns: built PrototypeClass
+
+const assignMetadata = (data, metadata) => {
+  const proto = buildPrototype(metadata);
+  assignPrototype(data, proto);
+  return proto;
+};
+
+// Usage
 
 // Define Data Source
-//
+
 const data = [
   ['Marcus Aurelius', 'Rome', '212-04-26'],
   ['Victor Glushkov', 'Rostov on Don', '1923-08-24'],
@@ -79,7 +81,7 @@ const data = [
 ];
 
 // Define metadata to build prototype dynamically
-//
+
 const metadata = {
   name: 'string',
   city: 'string',
@@ -93,7 +95,7 @@ const metadata = {
 };
 
 // Define query using regular JavaScript syntax
-//
+
 const query = person => (
   person.name !== '' &&
   person.age > 25 &&

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ const mix2 = {`
`23`	`23`	`}`
`24`	`24`	`};`
`25`	`25`
`26`		`-Object.assign(obj1, mix1, mix2);`
	`26`	`+const res = Object.assign(obj1, mix1, mix2);`
`27`	`27`	`console.log(obj1);`
`28`		`-console.log(obj1.toString());`
	`28`	`+console.log(res.toString());`
`29`	`29`	console.log(`His age is ${obj1.age()} as of today`);