From 5c0a70280a3bc3a2379fd719114351aa4d8480c5 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Sat, 20 Nov 2021 19:33:09 -0500 Subject: [PATCH] chore: upgrade to ts-morph 13 internally --- packages/scripts/deps.ts | 2 +- packages/ts-morph/scripts/common/hasInternalDocTag.ts | 2 +- packages/ts-morph/scripts/inspectors/TsMorphInspector.ts | 2 +- .../ts-morph/scripts/verification/ensurePublicApiHasTests.ts | 2 +- packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/scripts/deps.ts b/packages/scripts/deps.ts index f0cf39c78..f35860cea 100644 --- a/packages/scripts/deps.ts +++ b/packages/scripts/deps.ts @@ -1,2 +1,2 @@ export * as path from "https://deno.land/std@0.114.0/path/mod.ts"; -export * as tsMorph from "https://deno.land/x/ts_morph@12.2.0/mod.ts"; +export * as tsMorph from "https://deno.land/x/ts_morph@13.0.0/mod.ts"; diff --git a/packages/ts-morph/scripts/common/hasInternalDocTag.ts b/packages/ts-morph/scripts/common/hasInternalDocTag.ts index 7758ac8bb..446588412 100644 --- a/packages/ts-morph/scripts/common/hasInternalDocTag.ts +++ b/packages/ts-morph/scripts/common/hasInternalDocTag.ts @@ -1,6 +1,6 @@ import { tsMorph } from "../deps.ts"; export function hasInternalDocTag(node: tsMorph.Node) { - return tsMorph.Node.isJSDocableNode(node) + return tsMorph.Node.isJSDocable(node) && node.getJsDocs().some(d => d.getTags().some(t => t.getTagName() === "internal")); } diff --git a/packages/ts-morph/scripts/inspectors/TsMorphInspector.ts b/packages/ts-morph/scripts/inspectors/TsMorphInspector.ts index 0eb201d11..188fd4b65 100644 --- a/packages/ts-morph/scripts/inspectors/TsMorphInspector.ts +++ b/packages/ts-morph/scripts/inspectors/TsMorphInspector.ts @@ -158,7 +158,7 @@ export class TsMorphInspector { const syntaxKind = nameNodeExpression.getName(); const typeNode = member.getTypeNodeOrThrow(); - if (!tsMorph.Node.isTypeReferenceNode(typeNode)) + if (!tsMorph.Node.isTypeReference(typeNode)) throw new Error(error); const typeNodeName = typeNode.getTypeName(); if (!tsMorph.Node.isQualifiedName(typeNodeName)) diff --git a/packages/ts-morph/scripts/verification/ensurePublicApiHasTests.ts b/packages/ts-morph/scripts/verification/ensurePublicApiHasTests.ts index 4ba06be39..4c02707db 100644 --- a/packages/ts-morph/scripts/verification/ensurePublicApiHasTests.ts +++ b/packages/ts-morph/scripts/verification/ensurePublicApiHasTests.ts @@ -14,7 +14,7 @@ export function ensurePublicApiHasTests(inspector: TsMorphInspector, addProblem: const nodes: (tsMorph.Node & tsMorph.ReferenceFindableNode)[] = []; function tryAddNode(node: tsMorph.Node & tsMorph.ReferenceFindableNode) { - if (tsMorph.Node.isScopedNode(node) && node.getScope() !== tsMorph.Scope.Public) + if (tsMorph.Node.isScoped(node) && node.getScope() !== tsMorph.Scope.Public) return; if (hasInternalDocTag(node)) return; diff --git a/packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts b/packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts index d47d84dc8..d36fc0eea 100644 --- a/packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts +++ b/packages/ts-morph/src/compiler/ast/comment/CompilerComments.ts @@ -56,6 +56,7 @@ export abstract class CompilerCommentNode implements ts.Node { return undefined as any as ts.Node; // the compiler definition is wrong } + // @code-fence-allow(getChildren): this is an implementation, so it's ok. getChildren(sourceFile?: ts.SourceFile | undefined): ts.Node[] { return []; }