reactive-di - npm Package Compare versions

Comparing version 6.0.3 to 6.0.4

CHANGELOG.md

@@ -5,2 +5,7 @@ # Change Log
 
+<a name="6.0.4"></a>
+## [6.0.4](https://github.com/zerkalica/reactive-di/compare/v6.0.3...v6.0.4) (2017-12-02)
+
+
+
 <a name="6.0.3"></a>
@@ -7,0 +12,0 @@ ## [6.0.3](https://github.com/zerkalica/reactive-di/compare/v6.0.2...v6.0.3) (2017-11-30)

dist/reactive-di.es.js

@@ -141,2 +141,4 @@ function _defineProperties(target, props) {
   function Injector(items, sheetProcessor, state, displayName, instance, cache) {
+    this.id = '';
+    this.rendered = '';
     this._resolved = false;
@@ -475,6 +477,8 @@ this._listeners = undefined;
         if (props.__lom_ctx !== undefined) injector = props.__lom_ctx;
+        if (props.id) name = props.id;
       }
 
       _this._render = cns.render;
-      _this._injector = injector.copy(name, cns.instance, _this._render.aliases);
+      _this._injector = injector.copy(cns.displayName, cns.instance, _this._render.aliases);
+      _this._injector.id = name;
       cns.instance++;
@@ -533,8 +537,8 @@ return _this;
       var prevContext = Injector.parentContext;
-      Injector.parentContext = this._injector;
+      var injector = Injector.parentContext = this._injector;
 
       try {
-        data = this._injector.invokeWithProps(render, this.props, this._propsChanged);
+        data = injector.invokeWithProps(render, this.props, this._propsChanged);
       } catch (error) {
-        data = this._injector.invokeWithProps(render.onError || ErrorComponent, {
+        data = injector.invokeWithProps(render.onError || ErrorComponent, {
           error: error
@@ -545,2 +549,3 @@ });
 
+      injector.rendered = '';
       Injector.parentContext = prevContext;
@@ -586,4 +591,2 @@
 function createCreateElement(atomize, createElement, compositeId) {
-  var parentId = '';
-
   function lomCreateElement() {
@@ -597,9 +600,13 @@ var args = arguments;
     var parentContext = Injector.parentContext;
-    var oldParentId = parentId;
 
     if (compositeId === true) {
       if (!attrs) attrs = {};
-      attrs.id = parentContext.toString();
-      if (id) attrs.id += '.' + id;
-      parentId = attrs.id;
+
+      if (!attrs.id) {
+        if (parentContext.rendered) throw new Error(parentContext.rendered + " need id");
+        attrs.id = parentContext.id;
+        parentContext.rendered = parentContext.displayName + '.' + el;
+      } else if (parentContext.id) attrs.id = parentContext.id + '.' + attrs.id;
+
+      if (!attrs.key) attrs.key = attrs.id;
     }
@@ -609,8 +616,3 @@
       newEl = parentContext.alias(el, id);
-
-      if (newEl === null) {
-        parentId = oldParentId;
-        return null;
-      }
-
+      if (newEl === null) return null;
       if (newEl !== undefined) el = newEl;
@@ -634,8 +636,3 @@
         newEl = parentContext.alias(el, id);
-
-        if (newEl === null) {
-          parentId = oldParentId;
-          return null;
-        }
-
+        if (newEl === null) return null;
         if (newEl !== undefined) el = newEl;
@@ -647,40 +644,30 @@ }
 
-    var result;
-
     switch (args.length) {
       case 2:
-        result = createElement(newEl, attrs);
-        break;
+        return createElement(newEl, attrs);
 
       case 3:
-        result = createElement(newEl, attrs, args[2]);
-        break;
+        return createElement(newEl, attrs, args[2]);
 
       case 4:
-        result = createElement(newEl, attrs, args[2], args[3]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3]);
 
       case 5:
-        result = createElement(newEl, attrs, args[2], args[3], args[4]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4]);
 
       case 6:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
 
       case 7:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
 
       case 8:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
 
       case 9:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
 
       default:
         if (isAtomic === false) {
-          result = createElement.apply(null, args);
+          return createElement.apply(null, args);
         } else {
@@ -693,9 +680,6 @@ var newArgs = [newEl, attrs];
 
-          result = createElement.apply(null, newArgs);
+          return createElement.apply(null, newArgs);
         }
 
     }
-
-    parentId = oldParentId;
-    return result;
   }
@@ -702,0 +686,0 @@

dist/reactive-di.js

@@ -145,2 +145,4 @@ 'use strict';
   function Injector(items, sheetProcessor, state, displayName, instance, cache) {
+    this.id = '';
+    this.rendered = '';
     this._resolved = false;
@@ -479,6 +481,8 @@ this._listeners = undefined;
         if (props.__lom_ctx !== undefined) injector = props.__lom_ctx;
+        if (props.id) name = props.id;
       }
 
       _this._render = cns.render;
-      _this._injector = injector.copy(name, cns.instance, _this._render.aliases);
+      _this._injector = injector.copy(cns.displayName, cns.instance, _this._render.aliases);
+      _this._injector.id = name;
       cns.instance++;
@@ -537,8 +541,8 @@ return _this;
       var prevContext = Injector.parentContext;
-      Injector.parentContext = this._injector;
+      var injector = Injector.parentContext = this._injector;
 
       try {
-        data = this._injector.invokeWithProps(render, this.props, this._propsChanged);
+        data = injector.invokeWithProps(render, this.props, this._propsChanged);
       } catch (error) {
-        data = this._injector.invokeWithProps(render.onError || ErrorComponent, {
+        data = injector.invokeWithProps(render.onError || ErrorComponent, {
           error: error
@@ -549,2 +553,3 @@ });
 
+      injector.rendered = '';
       Injector.parentContext = prevContext;
@@ -590,4 +595,2 @@
 function createCreateElement(atomize, createElement, compositeId) {
-  var parentId = '';
-
   function lomCreateElement() {
@@ -601,9 +604,13 @@ var args = arguments;
     var parentContext = Injector.parentContext;
-    var oldParentId = parentId;
 
     if (compositeId === true) {
       if (!attrs) attrs = {};
-      attrs.id = parentContext.toString();
-      if (id) attrs.id += '.' + id;
-      parentId = attrs.id;
+
+      if (!attrs.id) {
+        if (parentContext.rendered) throw new Error(parentContext.rendered + " need id");
+        attrs.id = parentContext.id;
+        parentContext.rendered = parentContext.displayName + '.' + el;
+      } else if (parentContext.id) attrs.id = parentContext.id + '.' + attrs.id;
+
+      if (!attrs.key) attrs.key = attrs.id;
     }
@@ -613,8 +620,3 @@
       newEl = parentContext.alias(el, id);
-
-      if (newEl === null) {
-        parentId = oldParentId;
-        return null;
-      }
-
+      if (newEl === null) return null;
       if (newEl !== undefined) el = newEl;
@@ -638,8 +640,3 @@
         newEl = parentContext.alias(el, id);
-
-        if (newEl === null) {
-          parentId = oldParentId;
-          return null;
-        }
-
+        if (newEl === null) return null;
         if (newEl !== undefined) el = newEl;
@@ -651,40 +648,30 @@ }
 
-    var result;
-
     switch (args.length) {
       case 2:
-        result = createElement(newEl, attrs);
-        break;
+        return createElement(newEl, attrs);
 
       case 3:
-        result = createElement(newEl, attrs, args[2]);
-        break;
+        return createElement(newEl, attrs, args[2]);
 
       case 4:
-        result = createElement(newEl, attrs, args[2], args[3]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3]);
 
       case 5:
-        result = createElement(newEl, attrs, args[2], args[3], args[4]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4]);
 
       case 6:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
 
       case 7:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
 
       case 8:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
 
       case 9:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
 
       default:
         if (isAtomic === false) {
-          result = createElement.apply(null, args);
+          return createElement.apply(null, args);
         } else {
@@ -697,9 +684,6 @@ var newArgs = [newEl, attrs];
 
-          result = createElement.apply(null, newArgs);
+          return createElement.apply(null, newArgs);
         }
 
     }
-
-    parentId = oldParentId;
-    return result;
   }
@@ -706,0 +690,0 @@

dist/reactive-di.umd.js

@@ -147,2 +147,4 @@ (function (global, factory) {
   function Injector(items, sheetProcessor, state, displayName, instance, cache) {
+    this.id = '';
+    this.rendered = '';
     this._resolved = false;
@@ -481,6 +483,8 @@ this._listeners = undefined;
         if (props.__lom_ctx !== undefined) injector = props.__lom_ctx;
+        if (props.id) name = props.id;
       }
 
       _this._render = cns.render;
-      _this._injector = injector.copy(name, cns.instance, _this._render.aliases);
+      _this._injector = injector.copy(cns.displayName, cns.instance, _this._render.aliases);
+      _this._injector.id = name;
       cns.instance++;
@@ -539,8 +543,8 @@ return _this;
       var prevContext = Injector.parentContext;
-      Injector.parentContext = this._injector;
+      var injector = Injector.parentContext = this._injector;
 
       try {
-        data = this._injector.invokeWithProps(render, this.props, this._propsChanged);
+        data = injector.invokeWithProps(render, this.props, this._propsChanged);
       } catch (error) {
-        data = this._injector.invokeWithProps(render.onError || ErrorComponent, {
+        data = injector.invokeWithProps(render.onError || ErrorComponent, {
           error: error
@@ -551,2 +555,3 @@ });
 
+      injector.rendered = '';
       Injector.parentContext = prevContext;
@@ -592,4 +597,2 @@
 function createCreateElement(atomize, createElement, compositeId) {
-  var parentId = '';
-
   function lomCreateElement() {
@@ -603,9 +606,13 @@ var args = arguments;
     var parentContext = Injector.parentContext;
-    var oldParentId = parentId;
 
     if (compositeId === true) {
       if (!attrs) attrs = {};
-      attrs.id = parentContext.toString();
-      if (id) attrs.id += '.' + id;
-      parentId = attrs.id;
+
+      if (!attrs.id) {
+        if (parentContext.rendered) throw new Error(parentContext.rendered + " need id");
+        attrs.id = parentContext.id;
+        parentContext.rendered = parentContext.displayName + '.' + el;
+      } else if (parentContext.id) attrs.id = parentContext.id + '.' + attrs.id;
+
+      if (!attrs.key) attrs.key = attrs.id;
     }
@@ -615,8 +622,3 @@
       newEl = parentContext.alias(el, id);
-
-      if (newEl === null) {
-        parentId = oldParentId;
-        return null;
-      }
-
+      if (newEl === null) return null;
       if (newEl !== undefined) el = newEl;
@@ -640,8 +642,3 @@
         newEl = parentContext.alias(el, id);
-
-        if (newEl === null) {
-          parentId = oldParentId;
-          return null;
-        }
-
+        if (newEl === null) return null;
         if (newEl !== undefined) el = newEl;
@@ -653,40 +650,30 @@ }
 
-    var result;
-
     switch (args.length) {
       case 2:
-        result = createElement(newEl, attrs);
-        break;
+        return createElement(newEl, attrs);
 
       case 3:
-        result = createElement(newEl, attrs, args[2]);
-        break;
+        return createElement(newEl, attrs, args[2]);
 
       case 4:
-        result = createElement(newEl, attrs, args[2], args[3]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3]);
 
       case 5:
-        result = createElement(newEl, attrs, args[2], args[3], args[4]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4]);
 
       case 6:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
 
       case 7:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
 
       case 8:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
 
       case 9:
-        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
-        break;
+        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
 
       default:
         if (isAtomic === false) {
-          result = createElement.apply(null, args);
+          return createElement.apply(null, args);
         } else {
@@ -699,9 +686,6 @@ var newArgs = [newEl, attrs];
 
-          result = createElement.apply(null, newArgs);
+          return createElement.apply(null, newArgs);
         }
 
     }
-
-    parentId = oldParentId;
-    return result;
   }
@@ -708,0 +692,0 @@

package.json

 {
   "name": "reactive-di",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "description": "Reactive dependency injection",
@@ -56,12 +56,12 @@ "publishConfig": {
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.32",
-    "@babel/plugin-external-helpers": "^7.0.0-beta.32",
-    "@babel/plugin-proposal-class-properties": "^7.0.0-beta.32",
-    "@babel/plugin-proposal-decorators": "^7.0.0-beta.32",
-    "@babel/plugin-transform-flow-strip-types": "^7.0.0-beta.32",
-    "@babel/preset-es2015": "^7.0.0-beta.32",
-    "@babel/register": "^7.0.0-beta.32",
+    "@babel/core": "^7.0.0-beta.34",
+    "@babel/plugin-external-helpers": "^7.0.0-beta.34",
+    "@babel/plugin-proposal-class-properties": "^7.0.0-beta.34",
+    "@babel/plugin-proposal-decorators": "^7.0.0-beta.34",
+    "@babel/plugin-transform-flow-strip-types": "^7.0.0-beta.34",
+    "@babel/preset-es2015": "^7.0.0-beta.34",
+    "@babel/register": "^7.0.0-beta.34",
     "chokidar-cli": "^1.2.0",
-    "flow-bin": "^0.59.0",
-    "lom_atom": "^3.0.8",
+    "flow-bin": "^0.60.1",
+    "lom_atom": "^3.0.9",
     "mobx": "^3.3.2",
@@ -68,0 +68,0 @@ "mocha": "^4.0.1",

src/createCreateElement.js

@@ -11,3 +11,2 @@ // @flow
 ): CreateElement {
-    let parentId = ''
     function lomCreateElement() {
@@ -22,8 +21,11 @@ const args = arguments
 
-        const oldParentId = parentId
         if (compositeId === true) {
             if(!attrs) attrs = {}
-            attrs.id = parentContext.toString()
-            if (id) attrs.id += '.' + id
-            parentId = attrs.id
+            if (!attrs.id) {
+                if (parentContext.rendered) throw new Error(`${parentContext.rendered} need id`)
+                attrs.id = parentContext.id
+                parentContext.rendered = parentContext.displayName + '.' + el
+            } else if (parentContext.id) attrs.id = parentContext.id + '.' + attrs.id
+
+            if (!attrs.key) attrs.key = attrs.id
         }
@@ -33,6 +35,3 @@
             newEl = parentContext.alias(el, id)
-            if (newEl === null) {
-                parentId = oldParentId
-                return null
-            }
+            if (newEl === null) return null
             if (newEl !== undefined) el = newEl
@@ -52,6 +51,3 @@ if (!attrs) {
                 newEl = parentContext.alias(el, id)
-                if (newEl === null) {
-                    parentId = oldParentId
-                    return null
-                }
+                if (newEl === null) return null
                 if (newEl !== undefined) el = newEl
@@ -61,26 +57,25 @@ }
         }
-        let result: mixed
         switch(args.length) {
             case 2:
-                result = createElement(newEl, attrs);break
+                return createElement(newEl, attrs)
             case 3:
-                result = createElement(newEl, attrs, args[2]);break
+                return createElement(newEl, attrs, args[2])
             case 4:
-                result = createElement(newEl, attrs, args[2], args[3]);break
+                return createElement(newEl, attrs, args[2], args[3])
             case 5:
-                result = createElement(newEl, attrs, args[2], args[3], args[4]);break
+                return createElement(newEl, attrs, args[2], args[3], args[4])
             case 6:
-                result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);break
+                return createElement(newEl, attrs, args[2], args[3], args[4], args[5])
             case 7:
-                result = createElement(newEl, attrs, args[2], args[3],
-                    args[4], args[5], args[6]);break
+                return createElement(newEl, attrs, args[2], args[3],
+                    args[4], args[5], args[6])
             case 8:
-                result = createElement(newEl, attrs, args[2], args[3],
-                    args[4], args[5], args[6], args[7]);break
+                return createElement(newEl, attrs, args[2], args[3],
+                    args[4], args[5], args[6], args[7])
             case 9:
-                result = createElement(newEl, attrs, args[2], args[3],
-                    args[4], args[5], args[6], args[7], args[8]);break
+                return createElement(newEl, attrs, args[2], args[3],
+                    args[4], args[5], args[6], args[7], args[8])
             default:
                 if (isAtomic === false) {
-                    result = createElement.apply(null, args)
+                    return createElement.apply(null, args)
                 } else {
@@ -91,8 +86,5 @@ const newArgs = [newEl, attrs]
                     }
-                    result = createElement.apply(null, newArgs)
+                    return createElement.apply(null, newArgs)
                 }
         }
-
-        parentId = oldParentId
-        return result
     }
@@ -99,0 +91,0 @@

src/createReactWrapper.js

@@ -41,9 +41,11 @@ // @flow
                 if (props.__lom_ctx !== undefined) injector = props.__lom_ctx
+                if (props.id) name = props.id
             }
             this._render = cns.render
             this._injector = injector.copy(
-                name,
+                cns.displayName,
                 cns.instance,
                 this._render.aliases
             )
+            this._injector.id = name
             cns.instance++
@@ -99,9 +101,10 @@ }
             const prevContext = Injector.parentContext
-            Injector.parentContext = this._injector
+            const injector = Injector.parentContext = this._injector
             try {
-                data = this._injector.invokeWithProps(render, this.props, this._propsChanged)
+                data = injector.invokeWithProps(render, this.props, this._propsChanged)
             } catch (error) {
-                data = this._injector.invokeWithProps(render.onError || ErrorComponent, {error})
+                data = injector.invokeWithProps(render.onError || ErrorComponent, {error})
                 error[rdiRendered] = true
             }
+            injector.rendered = ''
             Injector.parentContext = prevContext
@@ -108,0 +111,0 @@

src/Injector.js

@@ -32,2 +32,4 @@ // @flow
 
+    id = ''
+    rendered = ''
     constructor(
@@ -34,0 +36,0 @@ items?: IProvideItem[],

No alert changes

Improved metrics

Total package byte prevSize

310561

increased by0.99%

Worsened metrics

Lines of code

2746

decreased by-1.29%

No dependency changes