From b1366bae269f6ebbdb95f9925e0ea51067b231a2 Mon Sep 17 00:00:00 2001 From: Ron S Date: Sat, 18 Sep 2021 15:25:32 -0400 Subject: [PATCH] refactor: Update for TS 4.4 --- src/transformer.ts | 3 ++- src/utils/ts-helpers.ts | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/transformer.ts b/src/transformer.ts index e4990f8..8365d66 100755 --- a/src/transformer.ts +++ b/src/transformer.ts @@ -101,8 +101,9 @@ export default function transformer( /* Create Visitor Context */ const { configFile, paths } = compilerOptions; - const { tryParsePatterns } = tsInstance; + const [tsVersionMajor, tsVersionMinor] = tsInstance.versionMajorMinor.split(".").map((v) => +v); + const tryParsePatterns: typeof ts.tryParsePatterns | undefined = tsInstance.tryParsePatterns; if (!tsVersionMajor || !tsVersionMinor) throw new Error("Expected version to be parsed"); diff --git a/src/utils/ts-helpers.ts b/src/utils/ts-helpers.ts index a11a66d..582a177 100755 --- a/src/utils/ts-helpers.ts +++ b/src/utils/ts-helpers.ts @@ -10,7 +10,6 @@ import type { REGISTER_INSTANCE } from "ts-node"; /** Determine output file path for source file */ export function getOutputDirForSourceFile(context: VisitorContext, sourceFile: SourceFile): string { const { - tsInstance, emitHost, outputFileNamesCache, compilerOptions, @@ -49,7 +48,7 @@ export function isModulePathsMatch(context: VisitorContext, moduleName: string): pathsPatterns, tsInstance: { matchPatternOrExact }, } = context; - return !!(pathsPatterns && matchPatternOrExact(pathsPatterns as readonly string[], moduleName)); + return !!(pathsPatterns && matchPatternOrExact(pathsPatterns, moduleName)); } /** Create barebones EmitHost (for no-Program transform) */