> modified: es6/zil/index.js

> modified: lib/zil/index.js
FireStack-Lab · Aug 28, 2018 · 2f7a29d · 2f7a29d
1 parent db171a0
commit 2f7a29d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/es6/zil/index.js b/es6/zil/index.js
@@ -13,11 +13,12 @@ import propertyObjects from './propertyObjects'
 const mapObjectToMethods = (main) => {
   methodObjects.map((data) => {
     const zilMethod = new Method(data)
-    const zilKey = data.name
-    const zilObject = {}
+    // const zilKey = data.name
+    // const zilObject = {}
     zilMethod.setMessanger(main.messanger)
-    zilObject[zilKey] = zilMethod.methodBuilder()
-    Object.assign(main, zilObject)
+    zilMethod.assignToObject(main)
+    // zilObject[zilKey] = zilMethod.methodBuilder()
+    // Object.assign(main, zilObject)
     return false
   })
 }
@@ -27,6 +28,7 @@ const mapPropertyToObjects = (main) => {
     const zilProperty = new Property(data)
     const zilName = data.name
     zilProperty.setMessanger(main.messanger)
+    //
     const asyncGetterName = (getName) => {
       return `get${getName.charAt(0).toUpperCase()}${getName.slice(1)}`
     }
@@ -37,6 +39,7 @@ const mapPropertyToObjects = (main) => {
     const newZilObject = {}
     newZilObject[asyncGetterName(zilName)] = zilProperty.propertyBuilder()
     Object.defineProperty(main, zilName, zilObject)
+    //
     Object.assign(main, newZilObject)
     return false
   })

diff --git a/lib/zil/index.js b/lib/zil/index.js
@@ -12,14 +12,14 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _defineProperty = require('babel-runtime/core-js/object/define-property');
-
-var _defineProperty2 = _interopRequireDefault(_defineProperty);
-
 var _assign = require('babel-runtime/core-js/object/assign');
 
 var _assign2 = _interopRequireDefault(_assign);
 
+var _defineProperty = require('babel-runtime/core-js/object/define-property');
+
+var _defineProperty2 = _interopRequireDefault(_defineProperty);
+
 var _method = require('../util/method');
 
 var _method2 = _interopRequireDefault(_method);
@@ -47,11 +47,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var mapObjectToMethods = function mapObjectToMethods(main) {
   _methodObjects2.default.map(function (data) {
     var zilMethod = new _method2.default(data);
-    var zilKey = data.name;
-    var zilObject = {};
+    // const zilKey = data.name
+    // const zilObject = {}
     zilMethod.setMessanger(main.messanger);
-    zilObject[zilKey] = zilMethod.methodBuilder();
-    (0, _assign2.default)(main, zilObject);
+    zilMethod.assignToObject(main);
+    // zilObject[zilKey] = zilMethod.methodBuilder()
+    // Object.assign(main, zilObject)
     return false;
   });
 };
@@ -61,6 +62,7 @@ var mapPropertyToObjects = function mapPropertyToObjects(main) {
     var zilProperty = new _property2.default(data);
     var zilName = data.name;
     zilProperty.setMessanger(main.messanger);
+    //
     var asyncGetterName = function asyncGetterName(getName) {
       return 'get' + getName.charAt(0).toUpperCase() + getName.slice(1);
     };
@@ -71,6 +73,7 @@ var mapPropertyToObjects = function mapPropertyToObjects(main) {
     var newZilObject = {};
     newZilObject[asyncGetterName(zilName)] = zilProperty.propertyBuilder();
     (0, _defineProperty2.default)(main, zilName, zilObject);
+    //
     (0, _assign2.default)(main, newZilObject);
     return false;
   });