Merge pull request #210 from enb/redundant

Redundant code of deps
enb · Apr 6, 2016 · 15ede42 · 15ede42
2 parents b055ad1 + f22cc90
commit 15ede42
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 161 deletions.
diff --git a/exlib/deps-old.js b/exlib/deps-old.js
@@ -265,46 +265,6 @@ module.exports.OldDeps = (function () {
             return promise;
         },
 
-        /**
-         * Вычитает зависимости из переданного OldDeps.
-         *
-         * @param {OldDeps} deps
-         * @returns {OldDeps}
-         */
-        subtract: function (deps) {
-            var fromItems = this.items,
-                itemsToSubstract = deps.items;
-
-            for (var key in itemsToSubstract) {
-                if (key && itemsToSubstract.hasOwnProperty(key)) {
-                    delete fromItems[key];
-                }
-            }
-            return this;
-        },
-
-        /**
-         * Сохраняет пересечение с другим OldDeps.
-         *
-         * @param {OldDeps} deps
-         * @returns {OldDeps}
-         */
-        intersect: function (deps) {
-            var selfItems = this.items,
-                anotherItems = deps.items,
-                newItems = {};
-
-            for (var key in anotherItems) {
-                if ((anotherItems.hasOwnProperty(key) && selfItems.hasOwnProperty(key)) || !key) {
-                    newItems[key] = selfItems[key];
-                }
-            }
-
-            this.items = newItems;
-
-            return this;
-        },
-
         /**
          * Возвращает количество зависимостей.
          *
@@ -387,20 +347,6 @@ module.exports.OldDeps = (function () {
             });
         },
 
-        /**
-         * Вызывает map для набора зависимостей.
-         *
-         * @param {Function} fn
-         * @returns {Array}
-         */
-        map: function (fn) {
-            var mapped = [];
-            this.forEach(function (item) {
-                mapped.push(fn.call(this, item));
-            });
-            return mapped;
-        },
-
         /**
          * Фильтрует зависимости, возвращает результат.
          * @param {Function} fn
@@ -435,27 +381,6 @@ module.exports.OldDeps = (function () {
             return byTech;
         },
 
-        /**
-         * Сериализует в строку.
-         *
-         * @returns {String}
-         */
-        stringify: function () {
-            var result = [];
-            var deps = this.serialize();
-
-            if (deps['']) {
-                result.push('exports.deps = ' + JSON.stringify(deps[''][''], null, 4) + ';\n');
-                delete deps[''][''];
-            } else {
-                result.push('exports.deps = [];\n');
-            }
-
-            isEmptyObject(deps) || result.push('exports.depsByTechs = ' + JSON.stringify(deps, null, 4) + ';\n');
-
-            return result.join('');
-        },
-
         /**
          * Возвращает результат раскрытия зависимостей.
          *
@@ -542,45 +467,6 @@ module.exports.OldDeps = (function () {
             return result;
         },
 
-        /**
-         * Расширяет зависимость.
-         *
-         * @param {OldDepsItem} item
-         * @returns {OldDepsItem}
-         */
-        extend: function (item) {
-            if (!item) {
-                return this;
-            }
-            var depsTypes = ['mustDeps', 'shouldDeps'],
-                depsType,
-                thisDeps,
-                itemDeps;
-
-            while (depsType = depsTypes.shift()) {
-                itemDeps = item[depsType] || (item[depsType] = {});
-                if (thisDeps = this.item[depsType]) {
-                    for (var dependency in thisDeps) {
-                        if (thisDeps.hasOwnProperty(dependency)) {
-                            (itemDeps[dependency] = thisDeps[dependency].extend(itemDeps[dependency]));
-                        }
-                    }
-                }
-            }
-            return item;
-        },
-
-        /**
-         * Записывает зависимость в кэш по ключу.
-         *
-         * @param {Object} cache
-         * @returns {OldDepsItem}
-         */
-        cache: function (cache) {
-            var key = this.buildKey();
-            return cache[key] = this.extend(cache[key]);
-        },
-
         /**
          * Строит ключ для зависимости.
          *

diff --git a/lib/deps/deps-resolver.js b/lib/deps/deps-resolver.js
@@ -321,53 +321,6 @@ module.exports = inherit(/** @lends DepsResolver.prototype */{
         }
     },
 
-    /**
-     * Adds block to resolver.
-     *
-     * @param {String} blockName
-     * @param {String} modName
-     * @param {String} modVal
-     * @returns {Promise}
-     */
-    addBlock: function (blockName, modName, modVal) {
-        if (modName) {
-            this.addDecl({
-                name: blockName,
-                modName: modName,
-                modVal: modVal
-            });
-        } else {
-            this.addDecl({
-                name: blockName
-            });
-        }
-    },
-
-    /**
-     * Adds element to resolver.
-     *
-     * @param {String} blockName
-     * @param {String} elemName
-     * @param {String} modName
-     * @param {String} modVal
-     * @returns {Promise}
-     */
-    addElem: function (blockName, elemName, modName, modVal) {
-        if (modName) {
-            return this.addDecl({
-                name: blockName,
-                elem: elemName,
-                modName: modName,
-                modVal: modVal
-            });
-        } else {
-            return this.addDecl({
-                name: blockName,
-                elem: elemName
-            });
-        }
-    },
-
     /**
      * Adds declaration to resolver.
      *