From 3395ff10c92498cb803df81dea0aa5437f9cb044 Mon Sep 17 00:00:00 2001 From: sanex3339 Date: Mon, 4 Jul 2016 13:53:55 +0300 Subject: [PATCH] moved node types for specific dir --- src/NodeUtils.ts | 2 +- src/Nodes.ts | 2 +- src/interfaces/nodes/IBlockStatementNode.d.ts | 2 +- src/interfaces/nodes/ICallExpressionNode.d.ts | 2 +- src/interfaces/nodes/IExpressionStatementNode.d.ts | 2 +- src/interfaces/nodes/IFunctionNode.d.ts | 2 +- src/interfaces/nodes/IProgramNode.d.ts | 2 +- src/interfaces/nodes/ISpreadElementNode.d.ts | 2 +- src/types/TExpression.d.ts | 10 ---------- src/types/TStatement.d.ts | 8 -------- src/types/nodes/TExpression.d.ts | 10 ++++++++++ src/types/nodes/TStatement.d.ts | 8 ++++++++ test/mocks/NodeMocks.ts | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 src/types/TExpression.d.ts delete mode 100644 src/types/TStatement.d.ts create mode 100644 src/types/nodes/TExpression.d.ts create mode 100644 src/types/nodes/TStatement.d.ts diff --git a/src/NodeUtils.ts b/src/NodeUtils.ts index a8871358..42f96ee2 100644 --- a/src/NodeUtils.ts +++ b/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"; diff --git a/src/Nodes.ts b/src/Nodes.ts index bcca3cf9..ea91d2c4 100644 --- a/src/Nodes.ts +++ b/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"; diff --git a/src/interfaces/nodes/IBlockStatementNode.d.ts b/src/interfaces/nodes/IBlockStatementNode.d.ts index c673beec..9f6931e3 100644 --- a/src/interfaces/nodes/IBlockStatementNode.d.ts +++ b/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"; diff --git a/src/interfaces/nodes/ICallExpressionNode.d.ts b/src/interfaces/nodes/ICallExpressionNode.d.ts index edae7d5b..90e52d29 100644 --- a/src/interfaces/nodes/ICallExpressionNode.d.ts +++ b/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"; diff --git a/src/interfaces/nodes/IExpressionStatementNode.d.ts b/src/interfaces/nodes/IExpressionStatementNode.d.ts index bf334b2b..ca18e5cc 100644 --- a/src/interfaces/nodes/IExpressionStatementNode.d.ts +++ b/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"; diff --git a/src/interfaces/nodes/IFunctionNode.d.ts b/src/interfaces/nodes/IFunctionNode.d.ts index 9eeb2934..fbbdd084 100644 --- a/src/interfaces/nodes/IFunctionNode.d.ts +++ b/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"; diff --git a/src/interfaces/nodes/IProgramNode.d.ts b/src/interfaces/nodes/IProgramNode.d.ts index 45bc86c0..bbb2f67c 100644 --- a/src/interfaces/nodes/IProgramNode.d.ts +++ b/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"; diff --git a/src/interfaces/nodes/ISpreadElementNode.d.ts b/src/interfaces/nodes/ISpreadElementNode.d.ts index bebd9841..e8e21f81 100644 --- a/src/interfaces/nodes/ISpreadElementNode.d.ts +++ b/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"; diff --git a/src/types/TExpression.d.ts b/src/types/TExpression.d.ts deleted file mode 100644 index ec6dc16c..00000000 --- a/src/types/TExpression.d.ts +++ /dev/null @@ -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); diff --git a/src/types/TStatement.d.ts b/src/types/TStatement.d.ts deleted file mode 100644 index e7491216..00000000 --- a/src/types/TStatement.d.ts +++ /dev/null @@ -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); diff --git a/src/types/nodes/TExpression.d.ts b/src/types/nodes/TExpression.d.ts new file mode 100644 index 00000000..38880731 --- /dev/null +++ b/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); diff --git a/src/types/nodes/TStatement.d.ts b/src/types/nodes/TStatement.d.ts new file mode 100644 index 00000000..645d8ef8 --- /dev/null +++ b/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); diff --git a/test/mocks/NodeMocks.ts b/test/mocks/NodeMocks.ts index 7d89b5f5..7bc74c6b 100644 --- a/test/mocks/NodeMocks.ts +++ b/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";