Browse Source

Moved `parentize` method call from `Node.getNode` method to `NodeUtils.convertCodeToStructure` method

sanex3339 8 years ago
parent
commit
392f8456c5
3 changed files with 7 additions and 15 deletions
  1. 3 6
      dist/index.js
  2. 1 0
      src/NodeUtils.ts
  3. 3 9
      src/custom-nodes/Node.ts

+ 3 - 6
dist/index.js

@@ -252,6 +252,7 @@ var NodeUtils = function () {
         value: function convertCodeToStructure(code) {
             var structure = esprima.parse(code);
             NodeUtils.addXVerbatimPropertyToLiterals(structure);
+            NodeUtils.parentize(structure);
             return NodeUtils.getBlockStatementNodeByIndex(structure);
         }
     }, {
@@ -355,7 +356,7 @@ module.exports = require("estraverse");
 
 /***/ },
 /* 4 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ function(module, exports) {
 
 "use strict";
 "use strict";
@@ -364,8 +365,6 @@ var _createClass = function () { function defineProperties(target, props) { for
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var NodeUtils_1 = __webpack_require__(1);
-
 var Node = function () {
     function Node(options) {
         _classCallCheck(this, Node);
@@ -381,9 +380,7 @@ var Node = function () {
     }, {
         key: "getNode",
         value: function getNode() {
-            var node = this.getNodeStructure();
-            NodeUtils_1.NodeUtils.parentize(node);
-            return node;
+            return this.getNodeStructure();
         }
     }]);
 

+ 1 - 0
src/NodeUtils.ts

@@ -60,6 +60,7 @@ export class NodeUtils {
         let structure: INode = esprima.parse(code);
 
         NodeUtils.addXVerbatimPropertyToLiterals(structure);
+        NodeUtils.parentize(structure);
 
         return NodeUtils.getBlockStatementNodeByIndex(structure);
     }

+ 3 - 9
src/custom-nodes/Node.ts

@@ -4,8 +4,6 @@ import { IOptions } from "../interfaces/IOptions";
 
 import { AppendState } from '../enums/AppendState';
 
-import { NodeUtils } from "../NodeUtils";
-
 export abstract class Node implements ICustomNode {
     /**
      * TODO: add `abstract` modifier
@@ -39,15 +37,11 @@ export abstract class Node implements ICustomNode {
      * @returns {INode}
      */
     public getNode (): INode {
-        let node: INode = this.getNodeStructure();
-
-        NodeUtils.parentize(node);
-
-        return node;
+        return this.getNodeStructure();
     }
 
     /**
-     * @returns any
+     * @returns {INode}
      */
-    protected abstract getNodeStructure (): any;
+    protected abstract getNodeStructure (): INode;
 }