feat: ts 5.5

docs/index.md

@@ -17,7 +17,7 @@ npm install --save-dev ts-morph
 Or if you're using Deno:
 
 ```
-deno add @ts-morph/ts-morph
+deno add ts-morph@jsr:@ts-morph/ts-morph
 ```
 
 ## Documentation Progress

dprint.json

@@ -15,8 +15,8 @@
  "dist-deno"
  ],
  "plugins": [
- "https://plugins.dprint.dev/typescript-0.88.6.wasm",
- "https://plugins.dprint.dev/json-0.19.1.wasm",
- "https://plugins.dprint.dev/markdown-0.16.3.wasm"
+ "https://plugins.dprint.dev/typescript-0.91.1.wasm",
+ "https://plugins.dprint.dev/json-0.19.3.wasm",
+ "https://plugins.dprint.dev/markdown-0.17.1.wasm"
  ]
 }

package.json

@@ -26,7 +26,6 @@
  "packages/ts-morph"
  ],
  "devDependencies": {
- "dprint": "^0.43.2",
- "every-ts": "^2.0.0"
+ "dprint": "^0.46.3"
  }
 }

packages/bootstrap/package.json

@@ -28,17 +28,17 @@
  },
  "devDependencies": {
  "@rollup/plugin-typescript": "^11.1.6",
- "@types/chai": "^4.3.12",
- "@types/mocha": "^10.0.6",
- "@types/node": "^20.11.25",
+ "@types/chai": "^4.3.16",
+ "@types/mocha": "^10.0.7",
+ "@types/node": "^20.14.8",
  "chai": "^4.3.10",
  "cross-env": "^7.0.3",
- "mocha": "^10.3.0",
- "rimraf": "^5.0.5",
- "rollup": "=4.12.1",
+ "mocha": "^10.4.0",
+ "rimraf": "^5.0.7",
+ "rollup": "=4.18.0",
  "ts-node": "^10.9.2",
- "tslib": "^2.6.2",
- "typescript": "~5.4.2"
+ "tslib": "^2.6.3",
+ "typescript": "~5.5.2"
  },
  "publishConfig": {
  "access": "public"

packages/common/package.json

@@ -20,23 +20,23 @@
  },
  "dependencies": {
  "fast-glob": "^3.3.2",
- "minimatch": "^9.0.3",
+ "minimatch": "^9.0.4",
  "mkdirp": "^3.0.1",
  "path-browserify": "^1.0.1"
  },
  "devDependencies": {
  "@rollup/plugin-typescript": "^11.1.6",
- "@types/chai": "^4.3.12",
- "@types/mocha": "^10.0.6",
- "@types/node": "^20.11.25",
+ "@types/chai": "^4.3.16",
+ "@types/mocha": "^10.0.7",
+ "@types/node": "^20.14.8",
  "chai": "^4.3.10",
  "cross-env": "^7.0.3",
- "mocha": "^10.3.0",
- "rimraf": "^5.0.5",
- "rollup": "=4.12.1",
+ "mocha": "^10.4.0",
+ "rimraf": "^5.0.7",
+ "rollup": "=4.18.0",
  "ts-node": "^10.9.2",
- "tslib": "^2.6.2",
- "typescript": "5.4.2"
+ "tslib": "^2.6.3",
+ "typescript": "5.5.2"
  },
  "publishConfig": {
  "access": "public"

packages/common/scripts/bundleLocalTs.ts

@@ -38,8 +38,4 @@ nodeWithTypeArgs.insertProperty(0, {
  name: "_nodeWithTypeArgumentsBrand",
  type: "any",
 });
-for (const qualifiedName of tsFile.getDescendantsOfKind(tsMorph.ts.SyntaxKind.QualifiedName)) {
- if (qualifiedName.getLeft().getText() === "ts")
- qualifiedName.replaceWithText(qualifiedName.getText().replace(/^ts\./, ""));
-}
 tsFile.saveSync();

packages/scripts/utils/Memoize.ts

@@ -1,10 +1,9 @@
 /** Decorator for memoizing the result of a method. */
 export function Memoize(target: (...args: any[]) => void) {
- if (target instanceof Function) {
+ if (target instanceof Function)
  return getNewFunction(target);
- } else {
+ else
  throw new Error("Not implemented.");
- }
 }
 
 const weakMap = new WeakMap<object, Map<string, unknown>>();

packages/ts-morph/breaking-changes.md

@@ -1,4 +1,4 @@
-# Breaking Changes
+# Breaking Changes
 
 View [CHANGELOG.md](CHANGELOG.md) for more detail on releases. This file is only a high level overview of breaking changes.
 

packages/ts-morph/lib/ts-morph.d.ts

@@ -9525,6 +9525,8 @@ export declare class EmitOutput {
  private constructor();
  /** TypeScript compiler emit result. */
  get compilerObject(): ts.EmitOutput;
+ /** Gets the diagnostics. */
+ getDiagnostics(): Diagnostic<ts.Diagnostic>[];
  /** Gets if the emit was skipped. */
  getEmitSkipped(): boolean;
  /** Gets the output files. */
@@ -10071,7 +10073,7 @@ export declare class Type<TType extends ts.Type = ts.Type> {
  * Gets the object flags.
  * @remarks Returns 0 for a non-object type.
  */
- getObjectFlags(): 0 | ObjectFlags.Class | ObjectFlags.Interface | ObjectFlags.Reference | ObjectFlags.Tuple | ObjectFlags.Anonymous | ObjectFlags.Mapped | ObjectFlags.Instantiated | ObjectFlags.ObjectLiteral | ObjectFlags.EvolvingArray | ObjectFlags.ObjectLiteralPatternWithComputedProperties | ObjectFlags.ReverseMapped | ObjectFlags.JsxAttributes | ObjectFlags.JSLiteral | ObjectFlags.FreshLiteral | ObjectFlags.ArrayLiteral | ObjectFlags.ClassOrInterface | ObjectFlags.ContainsSpread | ObjectFlags.ObjectRestType | ObjectFlags.InstantiationExpressionType;
+ getObjectFlags(): 0 | ObjectFlags.Class | ObjectFlags.Interface | ObjectFlags.Reference | ObjectFlags.Tuple | ObjectFlags.Anonymous | ObjectFlags.Mapped | ObjectFlags.Instantiated | ObjectFlags.ObjectLiteral | ObjectFlags.EvolvingArray | ObjectFlags.ObjectLiteralPatternWithComputedProperties | ObjectFlags.ReverseMapped | ObjectFlags.JsxAttributes | ObjectFlags.JSLiteral | ObjectFlags.FreshLiteral | ObjectFlags.ArrayLiteral | ObjectFlags.ClassOrInterface | ObjectFlags.ContainsSpread | ObjectFlags.ObjectRestType | ObjectFlags.InstantiationExpressionType | ObjectFlags.SingleSignatureType;
 }
 
 export declare class TypeParameter extends Type<ts.TypeParameter> {

packages/ts-morph/package.json

@@ -49,19 +49,19 @@
  },
  "devDependencies": {
  "@rollup/plugin-typescript": "^11.1.6",
- "@types/chai": "^4.3.12",
- "@types/diff": "^5.0.9",
- "@types/mocha": "^10.0.6",
- "@types/node": "^20.11.25",
+ "@types/chai": "^4.3.16",
+ "@types/diff": "^5.2.1",
+ "@types/mocha": "^10.0.7",
+ "@types/node": "^20.14.8",
  "chai": "^4.3.10",
  "conditional-type-checks": "^1.0.6",
  "cross-env": "^7.0.3",
  "diff": "^5.2.0",
- "mocha": "10.3.0",
- "rimraf": "^5.0.5",
- "rollup": "=4.12.1",
+ "mocha": "10.4.0",
+ "rimraf": "^5.0.7",
+ "rollup": "=4.18.0",
  "ts-node": "10.9.2",
- "typescript": "~5.3.2"
+ "typescript": "~5.5.2"
  },
  "standard-version": {
  "tagPrefix": "",

packages/ts-morph/readme.md

@@ -1,4 +1,4 @@
-# ts-morph
+# ts-morph
 
 [![npm version](https://badge.fury.io/js/ts-morph.svg)](https://badge.fury.io/js/ts-morph)
 [![CI](https://github.com/dsherret/ts-morph/workflows/CI/badge.svg)](https://github.com/dsherret/ts-morph/actions?query=workflow%3ACI)

packages/ts-morph/scripts/buildDeno.ts

@@ -44,7 +44,7 @@ fileSystem.writeFileSync(
 fileSystem.writeFileSync(
  `${destPath}/readme.md`,
  `
-# ts_morph
+# ts-morph
 
 To use:
 
@@ -59,7 +59,7 @@ import { Project } from "ts-morph";
 Or use \`@ts-morph/bootstrap\`:
 
 \`\`\`
-deno add @ts-morph/ts-morph
+deno add @ts-morph/bootstrap
 \`\`\`
 
 \`\`\`ts

packages/ts-morph/scripts/readme.md

@@ -1,3 +1,3 @@
-# Scripts
+# Scripts
 
 This folder contains the code that verifies, manipulates, and generates code for ts-morph.

packages/ts-morph/src/compiler/ast/common/Node.ts

@@ -26,7 +26,7 @@ import { Expression } from "../expression";
 import { KindToNodeMappings } from "../kindToNodeMappings.generated";
 import { SourceFile } from "../module";
 import { Statement, StatementedNode } from "../statement";
-import { ExtendedParser, hasParsedTokens } from "../utils";
+import { ExtendedParser } from "../utils";
 import { SyntaxList } from "./SyntaxList";
 import { TextRange } from "./TextRange";
 import { ForEachDescendantTraversalControl, TransformTraversalControl } from "./TraversalControl";
@@ -133,10 +133,6 @@ export class Node<NodeType extends ts.Node = ts.Node> {
  if (parent != null)
  parent._wrappedChildCount--;
 
- const parentSyntaxList = this._getParentSyntaxListIfWrapped();
- if (parentSyntaxList != null)
- parentSyntaxList._wrappedChildCount--;
-
  this.#storeTextForForgetting();
  this._context.compilerFactory.removeNodeFromCache(this);
  this._clearInternals();
@@ -156,7 +152,9 @@ export class Node<NodeType extends ts.Node = ts.Node> {
  * @internal
  */
  _hasWrappedChildren() {
- return this._wrappedChildCount > 0;
+ // always consider syntax lists as having warpped children because tracking
+ // them is more work than it's worth
+ return this._wrappedChildCount > 0 || this.#compilerNode?.kind === SyntaxKind.SyntaxList;
  }
 
  /**
@@ -1290,7 +1288,7 @@ export class Node<NodeType extends ts.Node = ts.Node> {
  */
  _getParentSyntaxListIfWrapped(): SyntaxList | undefined {
  const parent = this.getParent();
- if (parent == null || !hasParsedTokens(parent.compilerNode))
+ if (parent == null || !ExtendedParser.hasParsedTokens(parent.compilerNode))
  return undefined;
  return this.getParentSyntaxList();
  }
@@ -1926,15 +1924,15 @@ export class Node<NodeType extends ts.Node = ts.Node> {
  * Gets the compiler children of the node.
  * @internal
  */
- _getCompilerChildren(): ts.Node[] {
+ _getCompilerChildren(): readonly ts.Node[] {
  return ExtendedParser.getCompilerChildren(this.compilerNode, this._sourceFile.compilerNode);
  }
 
  /**
  * Gets the compiler children of the node using .forEachChild
  * @internal
  */
- _getCompilerForEachChildren(): ts.Node[] {
+ _getCompilerForEachChildren(): readonly ts.Node[] {
  return ExtendedParser.getCompilerForEachChildren(this.compilerNode, this._sourceFile.compilerNode);
  }
 
@@ -1943,15 +1941,15 @@ export class Node<NodeType extends ts.Node = ts.Node> {
  * @internal
  */
  _getCompilerChildrenFast() {
- return hasParsedTokens(this.compilerNode) ? this._getCompilerChildren() : this._getCompilerForEachChildren();
+ return ExtendedParser.hasParsedTokens(this.compilerNode) ? this._getCompilerChildren() : this._getCompilerForEachChildren();
  }
 
  /**
  * Gets the compiler children of the specified kind.
  * @internal
  */
  _getCompilerChildrenOfKind(kind: SyntaxKind) {
- const children: ts.Node[] = useParseTreeSearchForKind(this, kind) ? this._getCompilerForEachChildren() : this._getCompilerChildren();
+ const children: readonly ts.Node[] = useParseTreeSearchForKind(this, kind) ? this._getCompilerForEachChildren() : this._getCompilerChildren();
  return children.filter(c => c.kind === kind);
  }
 

packages/ts-morph/src/compiler/ast/utils/ExtendedParser.ts

@@ -1,9 +1,8 @@
 import { SyntaxKind, ts } from "@ts-morph/common";
 import { CommentNodeParser, ContainerNodes } from "./CommentNodeParser";
-import { hasParsedTokens } from "./hasParsedTokens";
 
 const forEachChildSaver = new WeakMap<ts.Node, ts.Node[]>();
-const getChildrenSaver = new WeakMap<ts.Node, ts.Node[]>();
+const getChildrenSaver = new WeakMap<ts.Node, readonly ts.Node[]>();
 
 /**
  * Parser that parses around nodes for comments.
@@ -14,8 +13,13 @@ export class ExtendedParser {
  return CommentNodeParser.getOrParseChildren(container, sourceFile);
  }
 
+ static hasParsedTokens(node: ts.Node) {
+ // if this is true, it means the compiler has previously parsed the tokens
+ return getChildrenSaver.has(node) || node.kind == SyntaxKind.SyntaxList;
+ }
+
  static getCompilerChildrenFast(node: ts.Node, sourceFile: ts.SourceFile) {
- if (hasParsedTokens(node))
+ if (ExtendedParser.hasParsedTokens(node))
  return ExtendedParser.getCompilerChildren(node, sourceFile);
 
  return ExtendedParser.getCompilerForEachChildren(node, sourceFile);
@@ -43,20 +47,21 @@ export class ExtendedParser {
  }
  }
 
- static getCompilerChildren(node: ts.Node, sourceFile: ts.SourceFile) {
- if (isStatementMemberOrPropertyHoldingSyntaxList()) {
-  let result = getChildrenSaver.get(node);
- if (result == null) {
+ static getCompilerChildren(node: ts.Node, sourceFile: ts.SourceFile): readonly ts.Node[] {
+ let result = getChildrenSaver.get(node);
+ if (result == null) {
+ if (isStatementMemberOrPropertyHoldingSyntaxList()) {
  // @code-fence-allow(getChildren): This merges in comment nodes.
- result = [...node.getChildren(sourceFile)]; // make a copy; do not modify the compiler api's array
- mergeInComments(result, CommentNodeParser.getOrParseChildren(node as ts.SyntaxList, sourceFile));
- getChildrenSaver.set(node, result);
+ const newArray = [...node.getChildren(sourceFile)]; // make a copy; do not modify the compiler api's array
+ mergeInComments(newArray, CommentNodeParser.getOrParseChildren(node as ts.SyntaxList, sourceFile));
+ result = newArray;
+ } else {
+ // @code-fence-allow(getChildren): No need to merge in comment nodes.
+ result = node.getChildren(sourceFile);
  }
- return result;
+ getChildrenSaver.set(node, result);
  }
-
- // @code-fence-allow(getChildren): No need to merge in comment nodes.
- return node.getChildren(sourceFile);
+ return result;
 
  function isStatementMemberOrPropertyHoldingSyntaxList() {
  if (node.kind !== ts.SyntaxKind.SyntaxList)

packages/ts-morph/src/compiler/ast/utils/index.ts

@@ -1,4 +1,3 @@
 export * from "./CommentNodeParser";
 export * from "./ExtendedParser";
-export * from "./hasParsedTokens";
 export * from "./isComment";

packages/ts-morph/src/compiler/tools/LanguageService.ts

@@ -273,7 +273,7 @@ export class LanguageService {
  function getCompilerEmitOutput(): ts.EmitOutput {
  const program = compilerObject.getProgram();
  if (program == null || program.getSourceFile(filePath) == null)
- return { emitSkipped: true, outputFiles: [] };
+ return { emitSkipped: true, outputFiles: [], diagnostics: [] };
  return compilerObject.getEmitOutput(filePath, emitOnlyDtsFiles);
  }
  }

packages/ts-morph/src/compiler/tools/results/EmitOutput.ts

@@ -26,6 +26,12 @@ export class EmitOutput {
  return this.#compilerObject;
  }
 
+ /** Gets the diagnostics. */
+ @Memoize
+ getDiagnostics() {
+ return this.compilerObject.diagnostics.map(d => this.#context.compilerFactory.getDiagnostic(d));
+ }
+
  /**
  * Gets if the emit was skipped.
  */

packages/ts-morph/src/manipulation/nodeHandlers/ChangeChildOrderParentHandler.ts

@@ -40,7 +40,7 @@ export class ChangeChildOrderParentHandler implements NodeHandler {
  this.#compilerFactory.replaceCompilerNode(currentNode, newNode);
  }
 
- #getChildrenInNewOrder(children: ts.Node[]) {
+ #getChildrenInNewOrder(children: readonly ts.Node[]) {
  const result = [...children];
  const movingNode = result.splice(this.#oldIndex, 1)[0];
  result.splice(this.#newIndex, 0, movingNode);

packages/ts-morph/src/manipulation/nodeHandlers/NodeHandlerHelper.ts

@@ -1,6 +1,6 @@
 import { ArrayUtils, SyntaxKind, ts } from "@ts-morph/common";
 import { Node, SourceFile } from "../../compiler";
-import { ExtendedParser, hasParsedTokens } from "../../compiler/ast/utils";
+import { ExtendedParser } from "../../compiler/ast/utils";
 import { CompilerFactory } from "../../factories";
 import { AdvancedIterator } from "../../utils";
 import { NodeHandler } from "./NodeHandler";
@@ -36,7 +36,7 @@ export class NodeHandlerHelper {
  ];
  }
 
- getCompilerChildren(currentNode: Node, newNode: ts.Node, newSourceFile: ts.SourceFile): [ts.Node[], ts.Node[]] {
+ getCompilerChildren(currentNode: Node, newNode: ts.Node, newSourceFile: ts.SourceFile): [readonly ts.Node[], readonly ts.Node[]] {
  const currentCompilerNode = currentNode.compilerNode;
  const currentSourceFile = currentNode._sourceFile.compilerNode;
 
@@ -49,10 +49,10 @@ export class NodeHandlerHelper {
  /**
  * Gets the children of the node according to whether the tokens have previously been parsed.
  */
- getChildrenFast(currentNode: Node, newNode: ts.Node, newSourceFile: ts.SourceFile): [ts.Node[], ts.Node[]] {
+ getChildrenFast(currentNode: Node, newNode: ts.Node, newSourceFile: ts.SourceFile): [readonly ts.Node[], readonly ts.Node[]] {
  const currentCompilerNode = currentNode.compilerNode;
  const currentSourceFile = currentNode._sourceFile.compilerNode;
- if (hasParsedTokens(currentCompilerNode)) {
+ if (ExtendedParser.hasParsedTokens(currentCompilerNode)) {
  return [
  ExtendedParser.getCompilerChildren(currentCompilerNode, currentSourceFile),
  ExtendedParser.getCompilerChildren(newNode, newSourceFile),