Fixes.

dsherret · Mar 16, 2023 · 187c4a8 · 187c4a8
1 parent fd64e5c
commit 187c4a8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/packages/ts-morph/src/compiler/ast/base/AwaitableNode.ts b/packages/ts-morph/src/compiler/ast/base/AwaitableNode.ts
@@ -5,7 +5,7 @@ import { Constructor } from "../../../types";
 import { callBaseSet } from "../callBaseSet";
 import { Node } from "../common";
 
-export type AwaitableNodeExtensionType = Node<ts.Node & { awaitModifier?: ts.AwaitKeywordToken }>;
+export type AwaitableNodeExtensionType = Node<ts.Node & { awaitModifier?: ts.AwaitKeyword }>;
 
 export interface AwaitableNode {
   /**
@@ -15,11 +15,11 @@ export interface AwaitableNode {
   /**
    * Gets the await token or undefined if none exists.
    */
-  getAwaitKeyword(): Node<ts.AwaitKeywordToken> | undefined;
+  getAwaitKeyword(): Node<ts.AwaitKeyword> | undefined;
   /**
    * Gets the await token or throws if none exists.
    */
-  getAwaitKeywordOrThrow(message?: string | (() => string)): Node<ts.AwaitKeywordToken>;
+  getAwaitKeywordOrThrow(message?: string | (() => string)): Node<ts.AwaitKeyword>;
   /**
    * Sets if the node is awaited.
    * @param value - If it should be awaited or not.
@@ -33,13 +33,13 @@ export function AwaitableNode<T extends Constructor<AwaitableNodeExtensionType>>
       return this.compilerNode.awaitModifier != null;
     }
 
-    getAwaitKeyword(): Node<ts.AwaitKeywordToken> | undefined {
+    getAwaitKeyword(): Node<ts.AwaitKeyword> | undefined {
       const awaitModifier = this.compilerNode.awaitModifier;
       return this._getNodeFromCompilerNodeIfExists(awaitModifier);
     }
 
-    getAwaitKeywordOrThrow(message?: string | (() => string)): Node<ts.AwaitKeywordToken> {
-      return errors.throwIfNullOrUndefined(this.getAwaitKeyword(), "Expected to find an await token.");
+    getAwaitKeywordOrThrow(message?: string | (() => string)): Node<ts.AwaitKeyword> {
+      return errors.throwIfNullOrUndefined(this.getAwaitKeyword(), message ?? "Expected to find an await token.");
     }
 
     setIsAwaited(value: boolean) {

diff --git a/packages/ts-morph/src/compiler/ast/base/ModifierableNode.ts b/packages/ts-morph/src/compiler/ast/base/ModifierableNode.ts
@@ -186,8 +186,8 @@ export function ModifierableNode<T extends Constructor<ModifierableNodeExtension
       return true;
     }
 
-    private getCompilerModifiers() {
-      return this.compilerNode.modifiers || ([] as any as ts.NodeArray<ts.Modifier>);
+    private getCompilerModifiers(): ts.NodeArray<ts.ModifierLike> {
+      return (this.compilerNode as any).modifiers || [];
     }
   };
 }

diff --git a/packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts b/packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts
@@ -106,6 +106,7 @@ export abstract class CompilerCommentNode implements ts.Node {
 }
 
 export class CompilerCommentStatement extends CompilerCommentNode implements ts.Statement {
+  _jsdocContainerBrand: any;
   _statementBrand: any;
   /** @internal */
   _commentKind = CommentNodeKind.Statement;

diff --git a/packages/ts-morph/src/fileSystem/Directory.ts b/packages/ts-morph/src/fileSystem/Directory.ts
@@ -891,13 +891,14 @@ export class Directory {
 
       function getPathForDirectory(dir: Directory) {
         switch (moduleResolution) {
-          case ModuleResolutionKind.NodeJs:
+          case ModuleResolutionKind.Node10:
             if (dir === thisDirectory)
               return FileUtils.pathJoin(dir.getPath(), "index.ts");
             return dir.getPath();
           case ModuleResolutionKind.Classic:
           case ModuleResolutionKind.Node16:
           case ModuleResolutionKind.NodeNext:
+          case ModuleResolutionKind.Bundler:
             return FileUtils.pathJoin(dir.getPath(), "index.ts");
           default:
             return errors.throwNotImplementedForNeverValueError(moduleResolution);
@@ -907,13 +908,14 @@ export class Directory {
       function getPathForFilePath(filePath: StandardizedFilePath) {
         const dirPath = FileUtils.getDirPath(filePath);
         switch (moduleResolution) {
-          case ModuleResolutionKind.NodeJs:
+          case ModuleResolutionKind.Node10:
             if (dirPath === thisDirectory.getPath())
               return filePath;
             return filePath.replace(/\/index?(\.d\.ts|\.ts|\.js)$/i, "") as StandardizedFilePath;
           case ModuleResolutionKind.Classic:
           case ModuleResolutionKind.Node16:
           case ModuleResolutionKind.NodeNext:
+          case ModuleResolutionKind.Bundler:
             return filePath;
           default:
             return errors.throwNotImplementedForNeverValueError(moduleResolution);