Browse Source

moved node types for specific dir

sanex3339 8 years ago
parent
commit
3395ff10c9

+ 1 - 1
src/NodeUtils.ts

@@ -3,7 +3,7 @@ import * as estraverse from 'estraverse';
 import { INode } from './interfaces/nodes/INode';
 
 import { TNodeWithBlockStatement } from "./types/TNodeWithBlockStatement";
-import { TStatement } from "./types/TStatement";
+import { TStatement } from "./types/nodes/TStatement";
 
 import { NodeType } from "./enums/NodeType";
 

+ 1 - 1
src/Nodes.ts

@@ -7,7 +7,7 @@ import { IProgramNode } from "./interfaces/nodes/IProgramNode";
 import { IPropertyNode } from "./interfaces/nodes/IPropertyNode";
 import { IVariableDeclaratorNode } from "./interfaces/nodes/IVariableDeclaratorNode";
 
-import { TStatement } from "./types/TStatement";
+import { TStatement } from "./types/nodes/TStatement";
 
 import { TNodeWithBlockStatement } from "./types/TNodeWithBlockStatement";
 

+ 1 - 1
src/interfaces/nodes/IBlockStatementNode.d.ts

@@ -1,4 +1,4 @@
-import { TStatement } from "../../types/TStatement";
+import { TStatement } from "../../types/nodes/TStatement";
 
 import { INode } from "./INode";
 

+ 1 - 1
src/interfaces/nodes/ICallExpressionNode.d.ts

@@ -1,4 +1,4 @@
-import { TExpression } from "../../types/TExpression";
+import { TExpression } from "../../types/nodes/TExpression";
 
 import { INode } from "./INode";
 import { ISpreadElementNode } from "./ISpreadElementNode";

+ 1 - 1
src/interfaces/nodes/IExpressionStatementNode.d.ts

@@ -1,4 +1,4 @@
-import { TExpression } from "../../types/TExpression";
+import { TExpression } from "../../types/nodes/TExpression";
 
 import { INode } from "./INode";
 

+ 1 - 1
src/interfaces/nodes/IFunctionNode.d.ts

@@ -1,4 +1,4 @@
-import { TExpression } from "../../types/TExpression";
+import { TExpression } from "../../types/nodes/TExpression";
 
 import { IBlockStatementNode } from "./IBlockStatementNode";
 import { IIdentifierNode } from "./IIdentifierNode";

+ 1 - 1
src/interfaces/nodes/IProgramNode.d.ts

@@ -1,4 +1,4 @@
-import { TStatement } from "../../types/TStatement";
+import { TStatement } from "../../types/nodes/TStatement";
 
 import { INode } from "./INode";
 

+ 1 - 1
src/interfaces/nodes/ISpreadElementNode.d.ts

@@ -1,4 +1,4 @@
-import { TExpression } from "../../types/TExpression";
+import { TExpression } from "../../types/nodes/TExpression";
 
 import { INode } from "./INode";
 

+ 0 - 10
src/types/TExpression.d.ts

@@ -1,10 +0,0 @@
-import { IArrowFunctionExpressionNode } from "../interfaces/nodes/IArrowFunctionExpressionNode";
-import { ICallExpressionNode } from "../interfaces/nodes/ICallExpressionNode";
-import { IFunctionExpressionNode } from "../interfaces/nodes/IFunctionExpressionNode";
-import { IIdentifierNode } from "../interfaces/nodes/IIdentifierNode";
-import { ILiteralNode } from "../interfaces/nodes/ILiteralNode";
-import { IMemberExpressionNode } from "../interfaces/nodes/IMemberExpressionNode";
-import { INode } from "../interfaces/nodes/INode";
-
-export type TExpression = INode & (IArrowFunctionExpressionNode | ICallExpressionNode | IFunctionExpressionNode |
-    IIdentifierNode | ILiteralNode | IMemberExpressionNode);

+ 0 - 8
src/types/TStatement.d.ts

@@ -1,8 +0,0 @@
-import { IExpressionStatementNode } from "../interfaces/nodes/IExpressionStatementNode";
-import { IFunctionDeclarationNode } from "../interfaces/nodes/IFunctionDeclarationNode";
-import { IIfStatementNode } from "../interfaces/nodes/IIfStatementNode";
-import { INode } from "../interfaces/nodes/INode";
-import { IVariableDeclarationNode } from "../interfaces/nodes/IVariableDeclarationNode";
-
-export type TStatement = INode & (IExpressionStatementNode | IFunctionDeclarationNode | IIfStatementNode |
-    IVariableDeclarationNode);

+ 10 - 0
src/types/nodes/TExpression.d.ts

@@ -0,0 +1,10 @@
+import { IArrowFunctionExpressionNode } from "../../interfaces/nodes/IArrowFunctionExpressionNode";
+import { ICallExpressionNode } from "../../interfaces/nodes/ICallExpressionNode";
+import { IFunctionExpressionNode } from "../../interfaces/nodes/IFunctionExpressionNode";
+import { IIdentifierNode } from "../../interfaces/nodes/IIdentifierNode";
+import { ILiteralNode } from "../../interfaces/nodes/ILiteralNode";
+import { IMemberExpressionNode } from "../../interfaces/nodes/IMemberExpressionNode";
+import { INode } from "../../interfaces/nodes/INode";
+
+export type TExpression = INode & (IArrowFunctionExpressionNode | ICallExpressionNode | IFunctionExpressionNode |
+    IIdentifierNode | ILiteralNode | IMemberExpressionNode);

+ 8 - 0
src/types/nodes/TStatement.d.ts

@@ -0,0 +1,8 @@
+import { IExpressionStatementNode } from "../../interfaces/nodes/IExpressionStatementNode";
+import { IFunctionDeclarationNode } from "../../interfaces/nodes/IFunctionDeclarationNode";
+import { IIfStatementNode } from "../../interfaces/nodes/IIfStatementNode";
+import { INode } from "../../interfaces/nodes/INode";
+import { IVariableDeclarationNode } from "../../interfaces/nodes/IVariableDeclarationNode";
+
+export type TStatement = INode & (IExpressionStatementNode | IFunctionDeclarationNode | IIfStatementNode |
+    IVariableDeclarationNode);

+ 1 - 1
test/mocks/NodeMocks.ts

@@ -1,4 +1,4 @@
-import { TStatement } from "../../src/types/TStatement";
+import { TStatement } from "../../src/types/nodes/TStatement";
 
 import { IBlockStatementNode } from "../../src/interfaces/nodes/IBlockStatementNode";
 import { ICatchClauseNode } from "../../src/interfaces/nodes/ICatchClauseNode";