Merge remote-tracking branch 'origin/master'

Author: nonara

src/transformer.ts

@@ -28,6 +28,10 @@ export default function transformer(
 
     if (!pathsBasePath || !compilerOptions.paths) return (sourceFile: ts.SourceFile) => sourceFile;
 
+    const { configFile, paths } = compilerOptions;
+    // TODO - Remove typecast when tryParsePatterns is recognized (probably after ts v4.4)
+    const { tryParsePatterns } = tsInstance as any;
+
     const tsTransformPathsContext: TsTransformPathsContext = {
       compilerOptions,
       config,
@@ -43,6 +47,11 @@ export default function transformer(
       excludeMatchers: config.exclude?.map((globPattern) => new Minimatch(globPattern, { matchBase: true })),
       parsedCommandLine: createParsedCommandLineForProgram(tsInstance, program),
       outputFileNamesCache: new Map(),
+      // Get paths patterns appropriate for TS compiler version
+      pathsPatterns: tryParsePatterns
+        // TODO - Remove typecast when pathPatterns is recognized (probably after ts v4.4)
+        ? (configFile?.configFileSpecs as any)?.pathPatterns || tryParsePatterns(paths)
+        : tsInstance.getOwnKeys(paths)
     };
 
     return (sourceFile: ts.SourceFile) => {

src/types.ts

@@ -1,5 +1,5 @@
 import tsThree from "./declarations/typescript3";
-import ts, { CompilerOptions, GetCanonicalFileName, ParsedCommandLine } from "typescript";
+import ts, { CompilerOptions, GetCanonicalFileName, ParsedCommandLine, Pattern } from "typescript";
 import { PluginConfig } from "ts-patch";
 import { HarmonyFactory } from "./utils/harmony-factory";
 import { IMinimatch } from "minimatch";
@@ -51,6 +51,7 @@ export interface TsTransformPathsContext {
   readonly outputFileNamesCache: Map<string, string>;
   readonly pathsBasePath: string;
   readonly getCanonicalFileName: GetCanonicalFileName;
+  readonly pathsPatterns: (string | Pattern)[]
 }
 
 export interface VisitorContext extends TsTransformPathsContext {

src/utils/ts-helpers.ts

@@ -65,8 +65,9 @@ export function getOutputFile(context: VisitorContext, fileName: string): string
  * Determine if moduleName matches config in paths
  */
 export function isModulePathsMatch(context: VisitorContext, moduleName: string): boolean {
-  const { matchPatternOrExact, getOwnKeys } = context.tsInstance;
-  return !!matchPatternOrExact(getOwnKeys(context.compilerOptions.paths!), moduleName);
+  const { pathsPatterns, tsInstance: { matchPatternOrExact }} = context
+  // TODO - Remove typecast after ts v4.4
+  return !!matchPatternOrExact((pathsPatterns as any), moduleName);
 }
 
 export function isTsProjectSourceFile(context: VisitorContext, filePath: string): boolean {

yarn.lock

@@ -4574,9 +4574,9 @@ [email protected]:
     signal-exit "^3.0.2"
 
 ws@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
+  integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==
   dependencies:
     async-limiter "~1.0.0"