chore: Fix compile errors.

dsherret · Nov 21, 2020 · 7c524ec · 7c524ec
1 parent 916ffb4
commit 7c524ec
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/packages/ts-morph/src/tests/compiler/ast/class/classDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/class/classDeclarationTests.ts
@@ -2,7 +2,7 @@ import { SyntaxKind } from "@ts-morph/common";
 import { expect } from "chai";
 import { ClassDeclaration } from "../../../../compiler";
 import { ClassDeclarationSpecificStructure, ClassLikeDeclarationBaseSpecificStructure, ClassDeclarationStructure, InterfaceDeclarationStructure,
-    TypeParameterDeclarationStructure, StructureKind } from "../../../../structures";
+    StructureKind, OptionalKind } from "../../../../structures";
 import { getInfoFromText, getInfoFromTextWithDescendant, OptionalKindAndTrivia, OptionalTrivia, fillStructures } from "../../testHelpers";
 
 describe(nameof(ClassDeclaration), () => {
@@ -28,7 +28,7 @@ describe(nameof(ClassDeclaration), () => {
     describe(nameof<ClassDeclaration>(c => c.set), () => {
         function doTest(
             startingCode: string,
-            structure: OptionalKindAndTrivia<ClassDeclarationSpecificStructure & ClassLikeDeclarationBaseSpecificStructure>,
+            structure: OptionalKind<ClassDeclarationSpecificStructure & ClassLikeDeclarationBaseSpecificStructure>,
             expectedCode: string,
         ) {
             const { firstChild, sourceFile } = getInfoFromText<ClassDeclaration>(startingCode);

diff --git a/packages/ts-morph/src/tests/compiler/ast/class/constructorDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/class/constructorDeclarationTests.ts
@@ -123,7 +123,7 @@ describe(nameof(ConstructorDeclaration), () => {
     });
 
     describe(nameof<ConstructorDeclaration>(n => n.set), () => {
-        function doTest(startingCode: string, structure: OptionalKindAndTrivia<ConstructorDeclarationSpecificStructure>, expectedCode: string) {
+        function doTest(startingCode: string, structure: OptionalKind<ConstructorDeclarationSpecificStructure>, expectedCode: string) {
             const { firstChild, sourceFile } = getInfoFromText<ClassDeclaration>(startingCode);
             const ctor = firstChild.getConstructors()[0];
             ctor.set(structure);

diff --git a/packages/ts-morph/src/tests/compiler/ast/class/methodDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/class/methodDeclarationTests.ts
@@ -199,7 +199,7 @@ describe(nameof(MethodDeclaration), () => {
     });
 
     describe(nameof<MethodDeclaration>(m => m.set), () => {
-        function doTest(startingCode: string, structure: OptionalKindAndTrivia<MethodDeclarationSpecificStructure>, expectedCode: string) {
+        function doTest(startingCode: string, structure: OptionalKind<MethodDeclarationSpecificStructure>, expectedCode: string) {
             const { firstChild, sourceFile } = getInfoFromText<ClassDeclaration>(startingCode);
             const method = firstChild.getInstanceMethods()[0];
             method.set(structure);

diff --git a/packages/ts-morph/src/tests/compiler/ast/enum/enumDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/enum/enumDeclarationTests.ts
@@ -287,8 +287,8 @@ describe(nameof(EnumDeclaration), () => {
     });
 
     describe(nameof<EnumDeclaration>(n => n.set), () => {
-        function doTest(startingCode: string, structure: OptionalKindAndTrivia<EnumDeclarationSpecificStructure>, expectedCode: string) {
-            const { firstChild, sourceFile } = getInfoFromText<EnumDeclaration>(startingCode);
+        function doTest(startingCode: string, structure: OptionalKind<EnumDeclarationSpecificStructure>, expectedCode: string) {
+            const { firstChild } = getInfoFromText<EnumDeclaration>(startingCode);
             firstChild.set(structure);
             expect(firstChild.getText()).to.equal(expectedCode);
         }

diff --git a/packages/ts-morph/src/tests/compiler/ast/function/functionDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/function/functionDeclarationTests.ts
@@ -145,7 +145,7 @@ describe(nameof(FunctionDeclaration), () => {
     });
 
     describe(nameof<FunctionDeclaration>(f => f.set), () => {
-        function doTest(startingCode: string, structure: OptionalKindAndTrivia<FunctionDeclarationSpecificStructure>, expectedCode: string) {
+        function doTest(startingCode: string, structure: OptionalKind<FunctionDeclarationSpecificStructure>, expectedCode: string) {
             const { sourceFile } = getInfoFromText(startingCode);
             sourceFile.getFunctions()[0].set(structure);
             expect(sourceFile.getText()).to.equal(expectedCode);

diff --git a/packages/ts-morph/src/tests/compiler/ast/interface/interfaceDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/interface/interfaceDeclarationTests.ts
@@ -1,6 +1,6 @@
 import { expect } from "chai";
 import { InterfaceDeclaration } from "../../../../compiler";
-import { InterfaceDeclarationStructure, InterfaceDeclarationSpecificStructure, TypeParameterDeclarationStructure, StructureKind } from "../../../../structures";
+import { InterfaceDeclarationStructure, InterfaceDeclarationSpecificStructure, TypeParameterDeclarationStructure, StructureKind, OptionalKind } from "../../../../structures";
 import { getInfoFromText, OptionalKindAndTrivia, OptionalTrivia, fillStructures } from "../../testHelpers";
 
 describe(nameof(InterfaceDeclaration), () => {
@@ -57,7 +57,7 @@ describe(nameof(InterfaceDeclaration), () => {
     });
 
     describe(nameof<InterfaceDeclaration>(d => d.set), () => {
-        function doTest(startingCode: string, structure: OptionalKindAndTrivia<InterfaceDeclarationSpecificStructure>, expectedCode: string) {
+        function doTest(startingCode: string, structure: OptionalKind<InterfaceDeclarationSpecificStructure>, expectedCode: string) {
             const { firstChild } = getInfoFromText<InterfaceDeclaration>(startingCode);
             firstChild.set(structure);
             expect(firstChild.getText()).to.equal(expectedCode);

diff --git a/packages/ts-morph/src/tests/compiler/ast/module/namespaceDeclarationTests.ts b/packages/ts-morph/src/tests/compiler/ast/module/namespaceDeclarationTests.ts
@@ -1,8 +1,8 @@
 import { expect } from "chai";
 import { NamespaceDeclaration, NamespaceDeclarationKind, VariableDeclarationKind } from "../../../../compiler";
 import { errors } from "@ts-morph/common";
-import { NamespaceDeclarationStructure, NamespaceDeclarationSpecificStructure, StructureKind } from "../../../../structures";
-import { getInfoFromText, OptionalKindAndTrivia, fillStructures, OptionalTrivia } from "../../testHelpers";
+import { NamespaceDeclarationStructure, NamespaceDeclarationSpecificStructure, StructureKind, OptionalKind } from "../../../../structures";
+import { getInfoFromText, fillStructures, OptionalTrivia } from "../../testHelpers";
 
 describe(nameof(NamespaceDeclaration), () => {
     describe(nameof<NamespaceDeclaration>(d => d.getName), () => {
@@ -217,7 +217,7 @@ describe(nameof(NamespaceDeclaration), () => {
         });
 
         it("should modify when changed", () => {
-            const structure: OptionalKindAndTrivia<MakeRequired<NamespaceDeclarationSpecificStructure>> = {
+            const structure: OptionalKind<MakeRequired<NamespaceDeclarationSpecificStructure>> = {
                 declarationKind: NamespaceDeclarationKind.Module,
             };
             doTest("namespace Identifier {\n}", structure, "module Identifier {\n}");

diff --git a/packages/ts-morph/src/tests/compiler/testHelpers/types.ts b/packages/ts-morph/src/tests/compiler/testHelpers/types.ts
@@ -1,9 +1,9 @@
 import { Structure, StructureKind } from "../../../structures";
 
 export type OptionalKindAndTrivia<T extends Structure & { kind?: StructureKind; }> =
-    & Omit<T, "kind" | "leadingTrivia" | "trailingTrivia">
-    & Partial<Pick<T, "kind" | "leadingTrivia" | "trailingTrivia">>;
+    & Partial<Pick<T, "kind" | "leadingTrivia" | "trailingTrivia">>
+    & Omit<T, "kind" | "leadingTrivia" | "trailingTrivia">;
 
 export type OptionalTrivia<T extends Structure> =
-    & Omit<T, "leadingTrivia" | "trailingTrivia">
-    & Partial<Pick<T, "leadingTrivia" | "trailingTrivia">>;
+    & Partial<Pick<T, "leadingTrivia" | "trailingTrivia">>
+    & Omit<T, "leadingTrivia" | "trailingTrivia">;