Merge pull request #464 from bem/issues/459@release-1.0.0

deps: possibility to declare dependence without explicit including item
bem-archive · Oct 16, 2013 · 901e92a · 901e92a
2 parents 0e80de9 + b23dbdb
commit 901e92a
Show file tree

Hide file tree

Showing 11 changed files with 1,183 additions and 26 deletions.
diff --git a/lib/techs/deps.js.js b/lib/techs/deps.js.js
@@ -94,10 +94,15 @@ var Deps = exports.Deps = INHERIT({
         var items = this.items,
             targetKey = target.buildKey(),
             itemKey = item.buildKey(),
+            itemByKey = items[itemKey],
             deps;
 
-        if (!items[itemKey]) {
+        if(!itemByKey) {
             items[itemKey] = item;
+            item.include && this.itemsByOrder.push(itemKey);
+        } else if(!itemByKey.include && item.include) {
+            // update `include` for existing item in case of adding of new item without `include: false`
+            itemByKey.include = true;
             this.itemsByOrder.push(itemKey);
         }
 
@@ -376,11 +381,13 @@ var Deps = exports.Deps = INHERIT({
                 var key = i.buildKey(),
                     ctxTech = ctx && ctx.item.tech || '';
                 if(!uniq.hasOwnProperty(key) || !uniq[key].hasOwnProperty(ctxTech)) {
-                    (uniq[key] || (uniq[key] = {}))[ctxTech] = true;
-                    var newCtx = ctx || i;
-                    _this.forEach(fn, uniq, i.mustDeps, i);
-                    fn.call(_this, i, newCtx);
-                    _this.forEach(fn, uniq, i.shouldDeps, i);
+                    if(i.include) { // include only items without `include: false`
+                        (uniq[key] || (uniq[key] = {}))[ctxTech] = true;
+                        var newCtx = ctx || i;
+                        _this.forEach(fn, uniq, i.mustDeps, i);
+                        fn.call(_this, i, newCtx);
+                        _this.forEach(fn, uniq, i.shouldDeps, i);
+                    }
                 }
             }
         });
@@ -497,7 +504,7 @@ var DepsItem = exports.DepsItem = INHERIT({
         this.item = {};
         this.extendByCtx({ item: item });
         this.extendByCtx(ctx);
-
+        this.include = item.include !== false;
     },
 
     extendByCtx: function(ctx) {

diff --git a/lib/techs/v2/deps.js.js b/lib/techs/v2/deps.js.js
@@ -198,10 +198,15 @@ var Deps = exports.Deps = INHERIT(/** @lends Deps.prototype */{
         var items = this.items,
             targetKey = target.buildKey(),
             itemKey = item.buildKey(),
+            itemByKey = items[itemKey],
             deps;
 
-        if (!items[itemKey]) {
+        if(!itemByKey) {
             items[itemKey] = item;
+            item.include && this.itemsByOrder.push(itemKey);
+        } else if(!itemByKey.include && item.include) {
+            // update `include` for existing item in case of adding of new item without `include: false`
+            itemByKey.include = true;
             this.itemsByOrder.push(itemKey);
         }
 
@@ -557,11 +562,13 @@ var Deps = exports.Deps = INHERIT(/** @lends Deps.prototype */{
                 var key = i.buildKey(),
                     ctxTech = ctx && ctx.item.tech || '';
                 if(!uniq.hasOwnProperty(key) || !uniq[key].hasOwnProperty(ctxTech)) {
-                    (uniq[key] || (uniq[key] = {}))[ctxTech] = true;
-                    var newCtx = ctx || i;
-                    _this.forEach(fn, uniq, i.mustDeps, i);
-                    fn.call(_this, i, newCtx);
-                    _this.forEach(fn, uniq, i.shouldDeps, i);
+                    if(i.include) { // include only items without `include: false`
+                        (uniq[key] || (uniq[key] = {}))[ctxTech] = true;
+                        var newCtx = ctx || i;
+                        _this.forEach(fn, uniq, i.mustDeps, i);
+                        fn.call(_this, i, newCtx);
+                        _this.forEach(fn, uniq, i.shouldDeps, i);
+                    }
                 }
             }
         });
@@ -604,7 +611,7 @@ var Deps = exports.Deps = INHERIT(/** @lends Deps.prototype */{
         var _this = this, uniq = {}, res = [];
         _filter();
         return res;
-        
+
         function _filter(itemsByOrder,ctx){
             (itemsByOrder||_this.items[''].shouldDeps).forEach(function(item){
                 if(item = _this.items[item]){
@@ -677,7 +684,11 @@ var Deps = exports.Deps = INHERIT(/** @lends Deps.prototype */{
      * @returns {Object}
      */
     serializeFull: function() {
-        return this.items;
+        var result = {};
+        for(var item in this.items){
+            result[item] = this.items[item].serializeFull();
+        }
+        return result;
     },
 
     /**
@@ -700,6 +711,7 @@ var DepsItem = exports.DepsItem = INHERIT({
         this.item = {};
         this.extendByCtx({ item: item });
         this.extendByCtx(ctx);
+        this.include = item.include !== false;
     },
 
     extendByCtx: function(ctx) {
@@ -775,6 +787,16 @@ var DepsItem = exports.DepsItem = INHERIT({
 
         while(k = ks.shift()) this.item[k] && (res[k] = this.item[k]);
         if(res.block) return res;
+    },
+
+    serializeFull: function() {
+        var res = {};
+        for (var key in this) {
+            if (this.hasOwnProperty(key)) {
+                res[key] = this[key];
+            }
+        }
+        return res;
     }
 
 });