Separate class NodeWithGraph for building graph

enb · SwinX · Sep 23, 2015 · Sep 11, 2015 · Sep 11, 2015 · Sep 23, 2015
commit 5f97701160aabad5cf36ad2737bb7854e9a3b9e6
diff --git a/.jshintrc b/.jshintrc
@@ -3,5 +3,6 @@
     "maxlen": 120,
     "unused": true,
     "undef": true,
-    "node": true
+    "node": true,
+    "laxbreak": true
 }
diff --git a/lib/make.js b/lib/make.js
@@ -1,5 +1,5 @@
 var vow = require('vow'),
-    Node = require('./node'),
+    nodeFactory = require('./node'),
     path = require('path'),
     clearRequire = require('clear-require'),
     Logger = require('./logger'),
@@ -334,10 +334,9 @@ module.exports = inherit(/** @lends MakePlatform.prototype */ {
             var _this = this,
                 cdir = this.getDir(),
                 nodeConfig = this._projectConfig.getNodeConfig(nodePath),
-                node = new Node(nodePath, this, this._cache);
+                node = nodeFactory.mkNode(nodePath, this, this._cache, this._graph);
 
             node.setLogger(this._logger.subLogger(nodePath));
-            node.setBuildGraph(this._graph);
             this._nodes[nodePath] = node;
             this._nodeInitPromises[nodePath] = vowFs.makeDir(path.join(cdir, nodePath))
                 .then(function () {

diff --git a/lib/node/index.js b/lib/node/index.js
@@ -0,0 +1,8 @@
+var Node = require('./node');
+var NodeWithGraph = require('./node-with-graph');
+
+exports.mkNode = function (nodePath, makePlatform, cache, graph) {
+    return graph
+        ? new NodeWithGraph(nodePath, makePlatform, cache, graph)
+        : new Node(nodePath, makePlatform, cache);
+};
diff --git a/lib/node/node-with-graph.js b/lib/node/node-with-graph.js
@@ -0,0 +1,98 @@
+/**
+ * NodeWithGraph
+ * =============
+ */
+
+var Node = require('./node');
+var Vow = require('vow');
+var inherit = require('inherit');
+var path = require('path');
+var _ = require('lodash');
+
+module.exports = inherit(Node, {
+    __constructor: function (nodePath, makePlatform, cache, graph) {
+        this.__base(nodePath, makePlatform, cache);
+
+        /**
+         * Построитель графа сборки.
+         * @type {BuildGraph}
+         * @name NodeWithGraph.prototype._graph
+         * @private
+         */
+        this._graph = graph;
+    },
+
+    ///
+    _initTech: function (tech) {
+        var _this = this;
+        var nodeAdapterClass = function () {};
+        nodeAdapterClass.prototype = _this;
+        var nodeAdapter = new nodeAdapterClass();
+
+        return Vow.when(tech.init(nodeAdapter)).then(function () {
+            return Vow.when(tech.getTargets()).then(function (targets) {
+                targets.forEach(function (target) {
+                    var targetPath = path.join(_this._path, target);
+                    _this._graph.addTarget(targetPath, tech.getName());
+                });
+
+                nodeAdapter.requireSources = function (sources) {
+                    return _this.requireSources(sources, targets);
+                };
+                nodeAdapter.requireNodeSources = function (sources) {
+                    return _this.requireNodeSources(sources, targets);
+                };
+            });
+        });
+    },
+
+    ///
+    requireSources: function (sources, targets) {
+        var _this = this;
+        this._addDepsToGraph(targets, sources, function (source) {
+            return path.join(_this._path, _this.unmaskTargetName(source));
+        });
+
+        return Node.prototype.requireSources.apply(this, arguments);
+    },
+
+    ///
+    requireNodeSources: function (sources, targets) {
+        var _this = this;
+        _.forEach(sources, function (nodeSources, nodeName) {
+            _this._addDepsToGraph(targets, nodeSources, function (source) {
+                return path.join(nodeName, _this.unmaskNodeTargetName(nodeName, source));
+            });
+        });
+
+        return Node.prototype.requireNodeSources.apply(this, arguments);
+    },
+
+    ///
+    _addDepsToGraph: function (targets, sources, getDepFromPath) {
+        var _this = this;
+        targets = targets || [];
+
+        targets.forEach(function (target) {
+            var targetPath = path.join(_this._path, target);
+            sources.forEach(function (source) {
+                _this._graph.addDep(
+                    targetPath,
+                    getDepFromPath(source)
+                );
+            });
+        });
+    },
+
+    ///
+    resolveTarget: function (target) {
+        this._graph.resolveTarget(path.join(this._path, target));
+        return Node.prototype.resolveTarget.apply(this, arguments);
+    },
+
+    ///
+    destruct: function () {
+        this.__base();
+        delete this._graph;
+    }
+});
diff --git a/lib/node.js → lib/node/node.js b/lib/node.js → lib/node/node.js
@@ -4,10 +4,10 @@
  */
 var Vow = require('vow'),
     fs = require('fs'),
-    vowFs = require('./fs/async-fs'),
+    vowFs = require('../fs/async-fs'),
     path = require('path'),
     inherit = require('inherit'),
-    TargetNotFoundEror = require('./errors/target-not-found-error');
+    TargetNotFoundEror = require('../errors/target-not-found-error');
 
 /**
  * Нода — директория, в которой происходит сборка. Например, сборка страницы.
@@ -127,13 +127,6 @@ module.exports = inherit(/** @lends Node.prototype */ {
          * @private
          */
         this._registerTargetsPromise = null;
-        /**
-         * Построитель графа сборки.
-         * @type {BuildGraph}
-         * @name Node.prototype._graph
-         * @private
-         */
-        this._graph = null;
     },
 
     /**
@@ -236,16 +229,6 @@ module.exports = inherit(/** @lends Node.prototype */ {
         this._targetNamesToClean = targetsToClean;
     },
 
-    /**
-     * Устанавливает построитель графа сборки.
-     * @param {BuildGraph} graph
-     * @returns {Node}
-     */
-    setBuildGraph: function (graph) {
-        this._graph = graph;
-        return this;
-    },
-
     /**
      * Возвращает абсолютный путь к файлу, лежащему в директории с нодой.
      * @param {String} filename
@@ -351,54 +334,19 @@ module.exports = inherit(/** @lends Node.prototype */ {
     loadTechs: function () {
         var _this = this;
         return Vow.all(this._techs.map(function (t) {
-            var NodeMirrorClass = function () {};
-            NodeMirrorClass.prototype = _this;
-            var mirror = new NodeMirrorClass();
-            return Vow.when(t.init(mirror)).then(function () {
-                return Vow.when(t.getTargets()).then(function (targets) {
-                    if (_this._graph) {
-                        targets.forEach(function (target) {
-                            var targetPath = path.join(_this._path, target);
-                            _this._graph.addTarget(targetPath, t.getName());
-                        });
-                    }
-                    var origRequireSources = _this.requireSources;
-                    var origRequireNodeSources = _this.requireNodeSources;
-                    mirror.requireSources = function (sources) {
-                        if (_this._graph) {
-                            targets.forEach(function (target) {
-                                var targetPath = path.join(_this._path, target);
-                                sources.forEach(function (source) {
-                                    _this._graph.addDep(
-                                        targetPath,
-                                        path.join(_this._path, _this.unmaskTargetName(source))
-                                    );
-                                });
-                            });
-                        }
-                        return origRequireSources.apply(_this, arguments);
-                    };
-                    mirror.requireNodeSources = function (sources) {
-                        if (_this._graph) {
-                            Object.keys(sources).forEach(function (nodeName) {
-                                targets.forEach(function (target) {
-                                    var targetPath = path.join(_this._path, target);
-                                    sources[nodeName].forEach(function (source) {
-                                        _this._graph.addDep(
-                                            targetPath,
-                                            path.join(nodeName, _this.unmaskNodeTargetName(nodeName, source))
-                                        );
-                                    });
-                                });
-                            });
-                        }
-                        return origRequireNodeSources.apply(_this, arguments);
-                    };
-                });
-            });
+            return _this._initTech(t);
         }));
     },
 
+    /**
+     * Инициализирует технологию
+     * @param {Tech} tech
+     * @return {Promise}
+     */
+    _initTech: function (tech) {
+        return tech.init(this);
+    },
+
     /**
      * Возвращает техническую информацию об указанном таргете.
      * Формат результата: { tech: <ссылка на технологию>, started: true|false, promise: <промис на выполнение> }
@@ -475,9 +423,7 @@ module.exports = inherit(/** @lends Node.prototype */ {
         if (!targetObj.isValid) {
             this._logger.logAction('rebuild', target, targetObj.tech && targetObj.tech.getName());
         }
-        if (this._graph) {
-            this._graph.resolveTarget(path.join(this._path, target));
-        }
+
         targetObj.deferred.resolve(value);
         return targetObj.deferred.promise();
     },
@@ -694,6 +640,5 @@ module.exports = inherit(/** @lends Node.prototype */ {
         this._nodeCache.destruct();
         delete this._nodeCache;
         delete this._techs;
-        delete this._graph;
     }
 });
diff --git a/test/lib/make/build-targets.js b/test/lib/make/build-targets.js
@@ -4,7 +4,7 @@ var vow = require('vow');
 var vowFs = require('vow-fs');
 var _ = require('lodash');
 var MakePlatform = require('../../../lib/make');
-var Node = require('../../../lib/node');
+var Node = require('../../../lib/node/node');
 var ProjectConfig = require('../../../lib/config/project-config');
 var NodeConfig = require('../../../lib/config/node-config');
 var NodeMaskConfig = require('../../../lib/config/node-mask-config');

diff --git a/test/lib/make/build.js b/test/lib/make/build.js
@@ -3,7 +3,7 @@ var path = require('path');
 var vow = require('vow');
 var vowFs = require('vow-fs');
 var _ = require('lodash');
-var Node = require('../../../lib/node');
+var Node = require('../../../lib/node/node');
 var MakePlatform = require('../../../lib/make');
 var ProjectConfig = require('../../../lib/config/project-config');
 var NodeMaskConfig = require('../../../lib/config/node-mask-config');

diff --git a/test/lib/make/clean-targets.js b/test/lib/make/clean-targets.js
@@ -3,7 +3,7 @@ var path = require('path');
 var vow = require('vow');
 var vowFs = require('vow-fs');
 var _ = require('lodash');
-var Node = require('../../../lib/node');
+var Node = require('../../../lib/node/node');
 var MakePlatform = require('../../../lib/make');
 var ProjectConfig = require('../../../lib/config/project-config');
 var NodeMaskConfig = require('../../../lib/config/node-mask-config');

diff --git a/test/lib/make/constructor-desrtuctor.js b/test/lib/make/constructor-desrtuctor.js
@@ -1,7 +1,7 @@
 var fs = require('fs');
 var MakePlatform = require('../../../lib/make');
 var ProjectConfig = require('../../../lib/config/project-config');
-var Node = require('../../../lib/node');
+var Node = require('../../../lib/node/node');
 var CacheStorage = require('../../../lib/cache/cache-storage');
 var Cache = require('../../../lib/cache/cache');
 var SharedResources = require('../../../lib/shared-resources');