Change directory of some name nodes.

dsherret · Nov 24, 2019 · 9f2874c · 9f2874c
1 parent 5eaf5ff
commit 9f2874c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/packages/ts-morph/src/compiler/ast/aliases.ts b/packages/ts-morph/src/compiler/ast/aliases.ts
@@ -2,7 +2,8 @@ import { ts } from "@ts-morph/common";
 import { AssertTrue, IsExact } from "conditional-type-checks";
 import { ArrayBindingPattern, ObjectBindingPattern, BindingElement } from "./binding";
 import { GetAccessorDeclaration, MethodDeclaration, SetAccessorDeclaration, ClassDeclaration } from "./class";
-import { ComputedPropertyName, Identifier, Node, QualifiedName } from "./common";
+import { Node } from "./common";
+import { ComputedPropertyName, Identifier, QualifiedName } from "./name";
 import { Decorator } from "./decorator";
 import { EnumDeclaration } from "./enum";
 import { Expression, PropertyAccessExpression, PropertyAssignment, ShorthandPropertyAssignment, SpreadAssignment, ThisExpression, OmittedExpression,

diff --git a/packages/ts-morph/src/compiler/ast/base/name/NameableNode.ts b/packages/ts-morph/src/compiler/ast/base/name/NameableNode.ts
@@ -3,7 +3,8 @@ import { insertIntoParentTextRange, removeChildren } from "../../../../manipulat
 import { NameableNodeStructure } from "../../../../structures";
 import { Constructor } from "../../../../types";
 import { callBaseSet } from "../../callBaseSet";
-import { Identifier, Node } from "../../common";
+import { Node } from "../../common";
+import { Identifier } from "../../name";
 import { ReferenceFindableNode } from "./ReferenceFindableNode";
 import { callBaseGetStructure } from "../../callBaseGetStructure";
 import { RenameableNode } from "./RenameableNode";

diff --git a/packages/ts-morph/src/compiler/ast/base/name/NamedNode.ts b/packages/ts-morph/src/compiler/ast/base/name/NamedNode.ts
@@ -1,6 +1,6 @@
 import { ts } from "@ts-morph/common";
 import { Constructor } from "../../../../types";
-import { Identifier } from "../../common";
+import { Identifier } from "../../name";
 import { ReferenceFindableNode } from "./ReferenceFindableNode";
 import { RenameableNode } from "./RenameableNode";
 import { NamedNodeBase, NamedNodeBaseExtensionType, NamedNodeSpecificBase } from "./NamedNodeBase";

diff --git a/packages/ts-morph/src/compiler/ast/common/index.ts b/packages/ts-morph/src/compiler/ast/common/index.ts
@@ -1,7 +1,4 @@
-export * from "./ComputedPropertyName";
-export * from "./Identifier";
 export * from "./Node";
-export * from "./QualifiedName";
 export * from "./Scope";
 export * from "./SyntaxList";
 export * from "./TextRange";

diff --git a/packages/ts-morph/src/compiler/ast/doc/JSDocTag.ts b/packages/ts-morph/src/compiler/ast/doc/JSDocTag.ts
@@ -1,5 +1,6 @@
 import { ts } from "@ts-morph/common";
-import { Identifier, Node } from "../common";
+import { Node } from "../common";
+import { Identifier } from "../name";
 
 /**
  * JS doc tag node.

diff --git a/packages/ts-morph/src/compiler/ast/index.ts b/packages/ts-morph/src/compiler/ast/index.ts
@@ -16,6 +16,7 @@ export * from "./jsx";
 export * from "./kindToNodeMappings";
 export * from "./literal";
 export * from "./module";
+export * from "./name";
 export * from "./statement";
 export * from "./type";
 export * from "./variable";
diff --git a/packages/ts-morph/src/compiler/ast/module/NamespaceDeclaration.ts b/packages/ts-morph/src/compiler/ast/module/NamespaceDeclaration.ts
@@ -6,7 +6,7 @@ import { AmbientableNode, BodiedNode, ExportableNode, JSDocableNode, Modifierabl
 import { TypeGuards } from "../../../utils";
 import { callBaseGetStructure } from "../callBaseGetStructure";
 import { callBaseSet } from "../callBaseSet";
-import { Identifier } from "../common";
+import { Identifier } from "../name";
 import { Statement, StatementedNode } from "../statement";
 import { NamespaceChildableNode } from "./NamespaceChildableNode";
 import { NamespaceDeclarationKind } from "./NamespaceDeclarationKind";

diff --git a/...mpiler/ast/common/ComputedPropertyName.ts → ...compiler/ast/name/ComputedPropertyName.ts b/...mpiler/ast/common/ComputedPropertyName.ts → ...compiler/ast/name/ComputedPropertyName.ts
@@ -1,6 +1,6 @@
 import { ts } from "@ts-morph/common";
+import { Node } from "../common";
 import { Expression } from "../expression";
-import { Node } from "./Node";
 
 export class ComputedPropertyName extends Node<ts.ComputedPropertyName> {
     /**

diff --git a/...rph/src/compiler/ast/common/Identifier.ts → ...morph/src/compiler/ast/name/Identifier.ts b/...rph/src/compiler/ast/common/Identifier.ts → ...morph/src/compiler/ast/name/Identifier.ts
@@ -1,8 +1,8 @@
 import { ts } from "@ts-morph/common";
 import { ReferenceFindableNode, RenameableNode } from "../base";
+import { Node } from "../common";
 import { PrimaryExpression } from "../expression/PrimaryExpression";
 import { DefinitionInfo, ImplementationLocation } from "../../tools";
-import { Node } from "./Node";
 
 export const IdentifierBase = ReferenceFindableNode(RenameableNode(PrimaryExpression));
 export class Identifier extends IdentifierBase<ts.Identifier> {

diff --git a/.../src/compiler/ast/common/QualifiedName.ts → ...ph/src/compiler/ast/name/QualifiedName.ts b/.../src/compiler/ast/common/QualifiedName.ts → ...ph/src/compiler/ast/name/QualifiedName.ts
@@ -1,7 +1,7 @@
 import { ts } from "@ts-morph/common";
 import { EntityName } from "../aliases";
+import { Node } from "../common";
 import { Identifier } from "./Identifier";
-import { Node } from "./Node";
 
 export class QualifiedName extends Node<ts.QualifiedName> {
     /**

diff --git a/packages/ts-morph/src/compiler/ast/name/index.ts b/packages/ts-morph/src/compiler/ast/name/index.ts
@@ -0,0 +1,3 @@
+export * from "./ComputedPropertyName";
+export * from "./Identifier";
+export * from "./QualifiedName";