reactive-di - npm Package Compare versions

Comparing version 6.0.2 to 6.0.3

CHANGELOG.md

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

dist/reactive-di.es.js

@@ -69,3 +69,3 @@ function _defineProperties(target, props) {
         meta: key,
-        classNamePrefix: key.replace(badClassSymbols, '_').slice(2) + '__'
+        classNamePrefix: key.replace(badClassSymbols, '') + '_'
       });
@@ -130,5 +130,2 @@
 
-var _class;
-var _temp;
-
 var depId = 0;
@@ -142,3 +139,3 @@ var rdiId = Symbol('rdiId');
 
-var Injector = (_temp = _class =
+var Injector =
 /*#__PURE__*/
@@ -151,3 +148,4 @@ function () {
     this.instance = instance || 0;
-    this.displayName = displayName || '$';
+    this.displayName = displayName || '';
+    if (Injector.parentContext === undefined) Injector.parentContext = this;
 
@@ -367,3 +365,3 @@ if (sheetProcessor) {
   _proto.copy = function copy(displayName, instance, items) {
-    return new Injector(items, null, this._state, this.displayName + '.' + displayName, instance, Object.create(this._cache));
+    return new Injector(items, null, this._state, displayName, instance, Object.create(this._cache));
   };
@@ -419,3 +417,3 @@
   return Injector;
-}(), _class.parentContext = undefined, _temp);
+}();
 
@@ -475,2 +473,4 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
       _this._keys = undefined;
+      var cns = _this.constructor;
+      var name = cns.displayName;
 
@@ -483,5 +483,4 @@ if (props) {
 
-      var cns = _this.constructor;
       _this._render = cns.render;
-      _this._injector = injector.copy(cns.displayName, cns.instance, _this._render.aliases);
+      _this._injector = injector.copy(name, cns.instance, _this._render.aliases);
       cns.instance++;
@@ -591,2 +590,4 @@ return _this;
 function createCreateElement(atomize, createElement, compositeId) {
+  var parentId = '';
+
   function lomCreateElement() {
@@ -600,23 +601,29 @@ var args = arguments;
     var parentContext = Injector.parentContext;
+    var oldParentId = parentId;
 
-    if (compositeId === true && id !== undefined && parentContext !== undefined) {
-      attrs.id = parentContext.toString() + "." + id;
-      attrs.key = attrs.key || attrs.id;
+    if (compositeId === true) {
+      if (!attrs) attrs = {};
+      attrs.id = parentContext.toString();
+      if (id) attrs.id += '.' + id;
+      parentId = attrs.id;
     }
 
     if (isAtomic) {
-      if (parentContext !== undefined) {
-        newEl = parentContext.alias(el, id);
-        if (newEl === null) return null;
-        if (newEl !== undefined) el = newEl;
+      newEl = parentContext.alias(el, id);
 
-        if (!attrs) {
-          attrs = {
-            __lom_ctx: parentContext
-          };
-        } else {
-          attrs.__lom_ctx = parentContext;
-        }
+      if (newEl === null) {
+        parentId = oldParentId;
+        return null;
       }
 
+      if (newEl !== undefined) el = newEl;
+
+      if (!attrs) {
+        attrs = {
+          __lom_ctx: parentContext
+        };
+      } else {
+        attrs.__lom_ctx = parentContext;
+      }
+
       if (el.__lom === undefined) {
@@ -628,5 +635,10 @@ el.__lom = atomize(el);
     } else {
-      if (parentContext !== undefined && id) {
+      if (id) {
         newEl = parentContext.alias(el, id);
-        if (newEl === null) return null;
+
+        if (newEl === null) {
+          parentId = oldParentId;
+          return null;
+        }
+
         if (newEl !== undefined) el = newEl;
@@ -638,40 +650,54 @@ }
 
+    var result;
+
     switch (args.length) {
       case 2:
-        return createElement(newEl, attrs);
+        result = createElement(newEl, attrs);
+        break;
 
       case 3:
-        return createElement(newEl, attrs, args[2]);
+        result = createElement(newEl, attrs, args[2]);
+        break;
 
       case 4:
-        return createElement(newEl, attrs, args[2], args[3]);
+        result = createElement(newEl, attrs, args[2], args[3]);
+        break;
 
       case 5:
-        return createElement(newEl, attrs, args[2], args[3], args[4]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4]);
+        break;
 
       case 6:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
+        break;
 
       case 7:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
+        break;
 
       case 8:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
+        break;
 
       case 9:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        break;
 
       default:
         if (isAtomic === false) {
-          return createElement.apply(null, args);
-        }
+          result = createElement.apply(null, args);
+        } else {
+          var newArgs = [newEl, attrs];
 
-        var newArgs = [newEl, attrs];
+          for (var i = 2, l = args.length; i < l; i++) {
+            newArgs.push(args[i]);
+          }
 
-        for (var i = 2, l = args.length; i < l; i++) {
-          newArgs.push(args[i]);
+          result = createElement.apply(null, newArgs);
         }
 
-        return createElement.apply(null, newArgs);
     }
+
+    parentId = oldParentId;
+    return result;
   }
@@ -678,0 +704,0 @@

dist/reactive-di.js

@@ -73,3 +73,3 @@ 'use strict';
         meta: key,
-        classNamePrefix: key.replace(badClassSymbols, '_').slice(2) + '__'
+        classNamePrefix: key.replace(badClassSymbols, '') + '_'
       });
@@ -134,5 +134,2 @@
 
-var _class;
-var _temp;
-
 var depId = 0;
@@ -146,3 +143,3 @@ var rdiId = Symbol('rdiId');
 
-var Injector = (_temp = _class =
+var Injector =
 /*#__PURE__*/
@@ -155,3 +152,4 @@ function () {
     this.instance = instance || 0;
-    this.displayName = displayName || '$';
+    this.displayName = displayName || '';
+    if (Injector.parentContext === undefined) Injector.parentContext = this;
 
@@ -371,3 +369,3 @@ if (sheetProcessor) {
   _proto.copy = function copy(displayName, instance, items) {
-    return new Injector(items, null, this._state, this.displayName + '.' + displayName, instance, Object.create(this._cache));
+    return new Injector(items, null, this._state, displayName, instance, Object.create(this._cache));
   };
@@ -423,3 +421,3 @@
   return Injector;
-}(), _class.parentContext = undefined, _temp);
+}();
 
@@ -479,2 +477,4 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
       _this._keys = undefined;
+      var cns = _this.constructor;
+      var name = cns.displayName;
 
@@ -487,5 +487,4 @@ if (props) {
 
-      var cns = _this.constructor;
       _this._render = cns.render;
-      _this._injector = injector.copy(cns.displayName, cns.instance, _this._render.aliases);
+      _this._injector = injector.copy(name, cns.instance, _this._render.aliases);
       cns.instance++;
@@ -595,2 +594,4 @@ return _this;
 function createCreateElement(atomize, createElement, compositeId) {
+  var parentId = '';
+
   function lomCreateElement() {
@@ -604,23 +605,29 @@ var args = arguments;
     var parentContext = Injector.parentContext;
+    var oldParentId = parentId;
 
-    if (compositeId === true && id !== undefined && parentContext !== undefined) {
-      attrs.id = parentContext.toString() + "." + id;
-      attrs.key = attrs.key || attrs.id;
+    if (compositeId === true) {
+      if (!attrs) attrs = {};
+      attrs.id = parentContext.toString();
+      if (id) attrs.id += '.' + id;
+      parentId = attrs.id;
     }
 
     if (isAtomic) {
-      if (parentContext !== undefined) {
-        newEl = parentContext.alias(el, id);
-        if (newEl === null) return null;
-        if (newEl !== undefined) el = newEl;
+      newEl = parentContext.alias(el, id);
 
-        if (!attrs) {
-          attrs = {
-            __lom_ctx: parentContext
-          };
-        } else {
-          attrs.__lom_ctx = parentContext;
-        }
+      if (newEl === null) {
+        parentId = oldParentId;
+        return null;
       }
 
+      if (newEl !== undefined) el = newEl;
+
+      if (!attrs) {
+        attrs = {
+          __lom_ctx: parentContext
+        };
+      } else {
+        attrs.__lom_ctx = parentContext;
+      }
+
       if (el.__lom === undefined) {
@@ -632,5 +639,10 @@ el.__lom = atomize(el);
     } else {
-      if (parentContext !== undefined && id) {
+      if (id) {
         newEl = parentContext.alias(el, id);
-        if (newEl === null) return null;
+
+        if (newEl === null) {
+          parentId = oldParentId;
+          return null;
+        }
+
         if (newEl !== undefined) el = newEl;
@@ -642,40 +654,54 @@ }
 
+    var result;
+
     switch (args.length) {
       case 2:
-        return createElement(newEl, attrs);
+        result = createElement(newEl, attrs);
+        break;
 
       case 3:
-        return createElement(newEl, attrs, args[2]);
+        result = createElement(newEl, attrs, args[2]);
+        break;
 
       case 4:
-        return createElement(newEl, attrs, args[2], args[3]);
+        result = createElement(newEl, attrs, args[2], args[3]);
+        break;
 
       case 5:
-        return createElement(newEl, attrs, args[2], args[3], args[4]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4]);
+        break;
 
       case 6:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
+        break;
 
       case 7:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
+        break;
 
       case 8:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
+        break;
 
       case 9:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        break;
 
       default:
         if (isAtomic === false) {
-          return createElement.apply(null, args);
-        }
+          result = createElement.apply(null, args);
+        } else {
+          var newArgs = [newEl, attrs];
 
-        var newArgs = [newEl, attrs];
+          for (var i = 2, l = args.length; i < l; i++) {
+            newArgs.push(args[i]);
+          }
 
-        for (var i = 2, l = args.length; i < l; i++) {
-          newArgs.push(args[i]);
+          result = createElement.apply(null, newArgs);
         }
 
-        return createElement.apply(null, newArgs);
     }
+
+    parentId = oldParentId;
+    return result;
   }
@@ -682,0 +708,0 @@

dist/reactive-di.umd.js

@@ -75,3 +75,3 @@ (function (global, factory) {
         meta: key,
-        classNamePrefix: key.replace(badClassSymbols, '_').slice(2) + '__'
+        classNamePrefix: key.replace(badClassSymbols, '') + '_'
       });
@@ -136,5 +136,2 @@
 
-var _class;
-var _temp;
-
 var depId = 0;
@@ -148,3 +145,3 @@ var rdiId = Symbol('rdiId');
 
-var Injector = (_temp = _class =
+var Injector =
 /*#__PURE__*/
@@ -157,3 +154,4 @@ function () {
     this.instance = instance || 0;
-    this.displayName = displayName || '$';
+    this.displayName = displayName || '';
+    if (Injector.parentContext === undefined) Injector.parentContext = this;
 
@@ -373,3 +371,3 @@ if (sheetProcessor) {
   _proto.copy = function copy(displayName, instance, items) {
-    return new Injector(items, null, this._state, this.displayName + '.' + displayName, instance, Object.create(this._cache));
+    return new Injector(items, null, this._state, displayName, instance, Object.create(this._cache));
   };
@@ -425,3 +423,3 @@
   return Injector;
-}(), _class.parentContext = undefined, _temp);
+}();
 
@@ -481,2 +479,4 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
       _this._keys = undefined;
+      var cns = _this.constructor;
+      var name = cns.displayName;
 
@@ -489,5 +489,4 @@ if (props) {
 
-      var cns = _this.constructor;
       _this._render = cns.render;
-      _this._injector = injector.copy(cns.displayName, cns.instance, _this._render.aliases);
+      _this._injector = injector.copy(name, cns.instance, _this._render.aliases);
       cns.instance++;
@@ -597,2 +596,4 @@ return _this;
 function createCreateElement(atomize, createElement, compositeId) {
+  var parentId = '';
+
   function lomCreateElement() {
@@ -606,23 +607,29 @@ var args = arguments;
     var parentContext = Injector.parentContext;
+    var oldParentId = parentId;
 
-    if (compositeId === true && id !== undefined && parentContext !== undefined) {
-      attrs.id = parentContext.toString() + "." + id;
-      attrs.key = attrs.key || attrs.id;
+    if (compositeId === true) {
+      if (!attrs) attrs = {};
+      attrs.id = parentContext.toString();
+      if (id) attrs.id += '.' + id;
+      parentId = attrs.id;
     }
 
     if (isAtomic) {
-      if (parentContext !== undefined) {
-        newEl = parentContext.alias(el, id);
-        if (newEl === null) return null;
-        if (newEl !== undefined) el = newEl;
+      newEl = parentContext.alias(el, id);
 
-        if (!attrs) {
-          attrs = {
-            __lom_ctx: parentContext
-          };
-        } else {
-          attrs.__lom_ctx = parentContext;
-        }
+      if (newEl === null) {
+        parentId = oldParentId;
+        return null;
       }
 
+      if (newEl !== undefined) el = newEl;
+
+      if (!attrs) {
+        attrs = {
+          __lom_ctx: parentContext
+        };
+      } else {
+        attrs.__lom_ctx = parentContext;
+      }
+
       if (el.__lom === undefined) {
@@ -634,5 +641,10 @@ el.__lom = atomize(el);
     } else {
-      if (parentContext !== undefined && id) {
+      if (id) {
         newEl = parentContext.alias(el, id);
-        if (newEl === null) return null;
+
+        if (newEl === null) {
+          parentId = oldParentId;
+          return null;
+        }
+
         if (newEl !== undefined) el = newEl;
@@ -644,40 +656,54 @@ }
 
+    var result;
+
     switch (args.length) {
       case 2:
-        return createElement(newEl, attrs);
+        result = createElement(newEl, attrs);
+        break;
 
       case 3:
-        return createElement(newEl, attrs, args[2]);
+        result = createElement(newEl, attrs, args[2]);
+        break;
 
       case 4:
-        return createElement(newEl, attrs, args[2], args[3]);
+        result = createElement(newEl, attrs, args[2], args[3]);
+        break;
 
       case 5:
-        return createElement(newEl, attrs, args[2], args[3], args[4]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4]);
+        break;
 
       case 6:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);
+        break;
 
       case 7:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6]);
+        break;
 
       case 8:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7]);
+        break;
 
       case 9:
-        return createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        result = createElement(newEl, attrs, args[2], args[3], args[4], args[5], args[6], args[7], args[8]);
+        break;
 
       default:
         if (isAtomic === false) {
-          return createElement.apply(null, args);
-        }
+          result = createElement.apply(null, args);
+        } else {
+          var newArgs = [newEl, attrs];
 
-        var newArgs = [newEl, attrs];
+          for (var i = 2, l = args.length; i < l; i++) {
+            newArgs.push(args[i]);
+          }
 
-        for (var i = 2, l = args.length; i < l; i++) {
-          newArgs.push(args[i]);
+          result = createElement.apply(null, newArgs);
         }
 
-        return createElement.apply(null, newArgs);
     }
+
+    parentId = oldParentId;
+    return result;
   }
@@ -684,0 +710,0 @@

package.json

 {
   "name": "reactive-di",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "Reactive dependency injection",
@@ -65,3 +65,3 @@ "publishConfig": {
     "flow-bin": "^0.59.0",
-    "lom_atom": "^3.0.6",
+    "lom_atom": "^3.0.8",
     "mobx": "^3.3.2",
@@ -68,0 +68,0 @@ "mocha": "^4.0.1",

src/createCreateElement.js

@@ -11,2 +11,3 @@ // @flow
 ): CreateElement {
+    let parentId = ''
     function lomCreateElement() {
@@ -18,19 +19,25 @@ const args = arguments
         const isAtomic = typeof el === 'function' && el.constructor.render === undefined
-        const id: string | void = attrs ? attrs._id || attrs.id : undefined
-        const parentContext: Injector | void = Injector.parentContext
-        if (compositeId === true && id !== undefined && parentContext !== undefined) {
-            attrs.id = `${parentContext.toString()}.${id}`
-            attrs.key = attrs.key || attrs.id
+        let id: string | void = attrs ? attrs._id || attrs.id : undefined
+        const parentContext: Injector = Injector.parentContext
+
+        const oldParentId = parentId
+        if (compositeId === true) {
+            if(!attrs) attrs = {}
+            attrs.id = parentContext.toString()
+            if (id) attrs.id += '.' + id
+            parentId = attrs.id
         }
+
         if (isAtomic) {
-            if (parentContext !== undefined) {
-                newEl = parentContext.alias(el, id)
-                if (newEl === null) return null
-                if (newEl !== undefined) el = newEl
-                if (!attrs) {
-                    attrs = {__lom_ctx: parentContext}
-                } else {
-                    attrs.__lom_ctx = parentContext
-                }
+            newEl = parentContext.alias(el, id)
+            if (newEl === null) {
+                parentId = oldParentId
+                return null
             }
+            if (newEl !== undefined) el = newEl
+            if (!attrs) {
+                attrs = {__lom_ctx: parentContext}
+            } else {
+                attrs.__lom_ctx = parentContext
+            }
 
@@ -42,5 +49,8 @@ if (el.__lom === undefined) {
         } else {
-            if (parentContext !== undefined && id) {
+            if (id) {
                 newEl = parentContext.alias(el, id)
-                if (newEl === null) return null
+                if (newEl === null) {
+                    parentId = oldParentId
+                    return null
+                }
                 if (newEl !== undefined) el = newEl
@@ -50,32 +60,37 @@ }
         }
+        let result: mixed
         switch(args.length) {
             case 2:
-                return createElement(newEl, attrs)
+                result = createElement(newEl, attrs);break
             case 3:
-                return createElement(newEl, attrs, args[2])
+                result = createElement(newEl, attrs, args[2]);break
             case 4:
-                return createElement(newEl, attrs, args[2], args[3])
+                result = createElement(newEl, attrs, args[2], args[3]);break
             case 5:
-                return createElement(newEl, attrs, args[2], args[3], args[4])
+                result = createElement(newEl, attrs, args[2], args[3], args[4]);break
             case 6:
-                return createElement(newEl, attrs, args[2], args[3], args[4], args[5])
+                result = createElement(newEl, attrs, args[2], args[3], args[4], args[5]);break
             case 7:
-                return createElement(newEl, attrs, args[2], args[3],
-                    args[4], args[5], args[6])
+                result = createElement(newEl, attrs, args[2], args[3],
+                    args[4], args[5], args[6]);break
             case 8:
-                return createElement(newEl, attrs, args[2], args[3],
-                    args[4], args[5], args[6], args[7])
+                result = createElement(newEl, attrs, args[2], args[3],
+                    args[4], args[5], args[6], args[7]);break
             case 9:
-                return createElement(newEl, attrs, args[2], args[3],
-                    args[4], args[5], args[6], args[7], args[8])
+                result = createElement(newEl, attrs, args[2], args[3],
+                    args[4], args[5], args[6], args[7], args[8]);break
             default:
                 if (isAtomic === false) {
-                    return createElement.apply(null, args)
+                    result = createElement.apply(null, args)
+                } else {
+                    const newArgs = [newEl, attrs]
+                    for (let i = 2, l = args.length; i < l; i++) {
+                        newArgs.push(args[i])
+                    }
+                    result = createElement.apply(null, newArgs)
                 }
-                const newArgs = [newEl, attrs]
-                for (let i = 2, l = args.length; i < l; i++) {
-                    newArgs.push(args[i])
-                }
-                return createElement.apply(null, newArgs)
         }
+
+        parentId = oldParentId
+        return result
     }
@@ -82,0 +97,0 @@

src/createReactWrapper.js

@@ -35,2 +35,4 @@ // @flow
             this._keys = undefined
+            const cns = this.constructor
+            let name = cns.displayName
             if (props) {
@@ -41,6 +43,5 @@ this._keys = Object.keys(props)
             }
-            const cns = this.constructor
             this._render = cns.render
             this._injector = injector.copy(
-                cns.displayName,
+                name,
                 cns.instance,
@@ -47,0 +48,0 @@ this._render.aliases

src/Injector.js

@@ -27,3 +27,3 @@ // @flow
 
-    static parentContext: Injector | void = undefined
+    static parentContext: Injector
 
@@ -43,3 +43,4 @@ _cache: ICache
         this.instance = instance || 0
-        this.displayName = displayName || '$'
+        this.displayName = displayName || ''
+        if (Injector.parentContext === undefined) Injector.parentContext = this
         if (sheetProcessor) {
@@ -199,3 +200,3 @@ theme.sheetManager = new SheetManager(sheetProcessor)
             this._state,
-            this.displayName + '.' + displayName,
+            displayName,
             instance,
@@ -202,0 +203,0 @@ Object.create(this._cache)

src/SheetManager.js

@@ -42,3 +42,3 @@ // @flow
                 meta: key,
-                classNamePrefix: key.replace(badClassSymbols, '_').slice(2) + '__'
+                classNamePrefix: key.replace(badClassSymbols, '') + '_'
             })
@@ -45,0 +45,0 @@ sheet.attach()

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

307504

increased by0.82%

Lines of code

2782

increased by2.73%

No dependency changes