If import is used in the file, prefer that import specifier over calculating new one (microsoft#42224)

sheetalkamat · typescript-bot · Zzzen · commit 564ef6577256 · 2021-01-16T22:40:51.000+08:00
* Test case where the wrong path is emitted * If import is used in the file, prefer that import specifier over calculating new one Fixes microsoft#39117 * Update Baselines and/or Applied Lint Fixes * When non-relative path is used as user preference, ignore relative paths even if they are from the existing file * Fix test * Add comment Co-authored-by: TypeScript Bot <typescriptbot@microsoft.com>
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4395,6 +4395,7 @@ namespace ts {
                         getProjectReferenceRedirect: fileName => host.getProjectReferenceRedirect(fileName),
                         isSourceOfProjectReferenceRedirect: fileName => host.isSourceOfProjectReferenceRedirect(fileName),
                         fileExists: fileName => host.fileExists(fileName),
+                        getFileIncludeReasons: () => host.getFileIncludeReasons(),
                     } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -849,7 +849,8 @@ namespace ts {
             useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
             getProgramBuildInfo: returnUndefined,
             getSourceFileFromReference: returnUndefined,
-            redirectTargetsMap: createMultiMap()
+            redirectTargetsMap: createMultiMap(),
+            getFileIncludeReasons: notImplemented,
         };
         emitFiles(
             notImplementedResolver,
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -104,8 +104,21 @@ namespace ts.moduleSpecifiers {
         const info = getInfo(importingSourceFile.path, host);
         const moduleSourceFile = getSourceFileOfNode(moduleSymbol.valueDeclaration || getNonAugmentationDeclaration(moduleSymbol));
         const modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
-
         const preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
+
+        const existingSpecifier = forEach(modulePaths, modulePath => forEach(
+            host.getFileIncludeReasons().get(toPath(modulePath.path, host.getCurrentDirectory(), info.getCanonicalFileName)),
+            reason => {
+                if (reason.kind !== FileIncludeKind.Import || reason.file !== importingSourceFile.path) return undefined;
+                const specifier = getModuleNameStringLiteralAt(importingSourceFile, reason.index).text;
+                // If the preference is for non relative and the module specifier is relative, ignore it
+                return preferences.relativePreference !== RelativePreference.NonRelative || !pathIsRelative(specifier) ?
+                    specifier :
+                    undefined;
+            }
+        ));
+        if (existingSpecifier) return [existingSpecifier];
+
         const importedFileIsInNodeModules = some(modulePaths, p => p.isInNodeModules);
 
         // Module specifier priority:
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1649,6 +1649,7 @@ namespace ts {
                 getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo(),
                 getSourceFileFromReference: (file, ref) => program.getSourceFileFromReference(file, ref),
                 redirectTargetsMap,
+                getFileIncludeReasons: program.getFileIncludeReasons,
             };
         }
 
@@ -3968,7 +3969,8 @@ namespace ts {
         return res;
     }
 
-    function getModuleNameStringLiteralAt({ imports, moduleAugmentations }: SourceFile, index: number): StringLiteralLike {
+    /* @internal */
+    export function getModuleNameStringLiteralAt({ imports, moduleAugmentations }: SourceFile, index: number): StringLiteralLike {
         if (index < imports.length) return imports[index];
         let augIndex = imports.length;
         for (const aug of moduleAugmentations) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -7953,6 +7953,7 @@ namespace ts {
         readonly redirectTargetsMap: RedirectTargetsMap;
         getProjectReferenceRedirect(fileName: string): string | undefined;
         isSourceOfProjectReferenceRedirect(fileName: string): boolean;
+        getFileIncludeReasons(): MultiMap<Path, FileIncludeReason>;
     }
 
     // Note: this used to be deprecated in our public API, but is still used internally
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1835,6 +1835,7 @@ namespace ts {
             getProjectReferenceRedirect: fileName => program.getProjectReferenceRedirect(fileName),
             isSourceOfProjectReferenceRedirect: fileName => program.isSourceOfProjectReferenceRedirect(fileName),
             getNearestAncestorDirectoryWithPackageJson: maybeBind(host, host.getNearestAncestorDirectoryWithPackageJson),
+            getFileIncludeReasons: () => program.getFileIncludeReasons(),
         };
     }
 
diff --git a/src/testRunner/unittests/tsbuild/declarationEmit.ts b/src/testRunner/unittests/tsbuild/declarationEmit.ts
@@ -75,5 +75,44 @@ declare type MyNominal<T, Name extends string> = T & {
             }),
             commandLineArgs: ["--b", "/src/solution/tsconfig.json", "--verbose"]
         });
+
+        verifyTsc({
+            scenario: "declarationEmit",
+            subScenario: "when declaration file used inferred type from referenced project",
+            fs: () => loadProjectFromFiles({
+                "/src/tsconfig.json": JSON.stringify({
+                    compilerOptions: {
+                        composite: true,
+                        baseUrl: ".",
+                        paths: { "@fluentui/*": ["packages/*/src"] }
+                    }
+                }),
+                "/src/packages/pkg1/src/index.ts": Utils.dedent`
+export interface IThing {
+  a: string;
+}
+export interface IThings {
+  thing1: IThing;
+}`,
+                "/src/packages/pkg1/tsconfig.json": JSON.stringify({
+                    extends: "../../tsconfig",
+                    compilerOptions: { outDir: "lib" },
+                    include: ["src"]
+                }),
+                "/src/packages/pkg2/src/index.ts": Utils.dedent`
+import { IThings } from '@fluentui/pkg1';
+export function fn4() {
+  const a: IThings = { thing1: { a: 'b' } };
+  return a.thing1;
+}`,
+                "/src/packages/pkg2/tsconfig.json": JSON.stringify({
+                    extends: "../../tsconfig",
+                    compilerOptions: { outDir: "lib" },
+                    include: ["src"],
+                    references: [{ path: "../pkg1" }]
+                }),
+            }),
+            commandLineArgs: ["--b", "/src/packages/pkg2/tsconfig.json", "--verbose"]
+        });
     });
 }
diff --git a/src/testRunner/unittests/tsserver/projectReferenceErrors.ts b/src/testRunner/unittests/tsserver/projectReferenceErrors.ts
@@ -149,7 +149,7 @@ fnErr();
                             { line: 4, offset: 5 },
                             { line: 4, offset: 10 },
                             Diagnostics.Module_0_has_no_exported_member_1,
-                            [`"../dependency/fns"`, "fnErr"],
+                            [`"../decls/fns"`, "fnErr"],
                             "error",
                         )
                     ],
diff --git a/tests/baselines/reference/declarationEmitWithInvalidPackageJsonTypings.js b/tests/baselines/reference/declarationEmitWithInvalidPackageJsonTypings.js
@@ -45,4 +45,4 @@ export interface MutableRefObject<T> {
     current: T;
 }
 export declare function useRef<T>(current: T): MutableRefObject<T>;
-export declare const useCsvParser: () => MutableRefObject<typeof import("csv-parse/lib")>;
+export declare const useCsvParser: () => MutableRefObject<typeof import("csv-parse")>;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,30): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
-tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,30): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
 
 
 ==== tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_0.ts (0 errors) ====
@@ -15,24 +15,24 @@ tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27)
     var x1: number = defaultBinding1;
     import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding2;
     import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding3;
     import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
                                  ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding4;
     import defaultBinding5, { x as z,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding5;
     import defaultBinding6, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImport1_0";
                               ~
-!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
+!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead?
     var x1: number = defaultBinding6;
     
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/initial-build/when-declaration-file-used-inferred-type-from-referenced-project.js b/tests/baselines/reference/tsbuild/declarationEmit/initial-build/when-declaration-file-used-inferred-type-from-referenced-project.js
diff --git a/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/loads-js-based-projects-and-emits-them-correctly.js b/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/loads-js-based-projects-and-emits-them-correctly.js
diff --git a/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt b/tests/baselines/reference/typesVersionsDeclarationEmit.multiFileBackReferenceToSelf.errors.txt

Original file line number	Diff line number	Diff line change
`@@ -7953,6 +7953,7 @@ namespace ts {`
`7953`	`7953`	`readonly redirectTargetsMap: RedirectTargetsMap;`
`7954`	`7954`	`getProjectReferenceRedirect(fileName: string): string \| undefined;`
`7955`	`7955`	`isSourceOfProjectReferenceRedirect(fileName: string): boolean;`
	`7956`	`+ getFileIncludeReasons(): MultiMap<Path, FileIncludeReason>;`
`7956`	`7957`	`}`
`7957`	`7958`
`7958`	`7959`	`// Note: this used to be deprecated in our public API, but is still used internally`
Original file line number	Diff line number	Diff line change
`@@ -1835,6 +1835,7 @@ namespace ts {`
`1835`	`1835`	`getProjectReferenceRedirect: fileName => program.getProjectReferenceRedirect(fileName),`
`1836`	`1836`	`isSourceOfProjectReferenceRedirect: fileName => program.isSourceOfProjectReferenceRedirect(fileName),`
`1837`	`1837`	`getNearestAncestorDirectoryWithPackageJson: maybeBind(host, host.getNearestAncestorDirectoryWithPackageJson),`
	`1838`	`+ getFileIncludeReasons: () => program.getFileIncludeReasons(),`
`1838`	`1839`	`};`
`1839`	`1840`	`}`
`1840`	`1841`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ fnErr();`
`149`	`149`	`{ line: 4, offset: 5 },`
`150`	`150`	`{ line: 4, offset: 10 },`
`151`	`151`	`Diagnostics.Module_0_has_no_exported_member_1,`
`152`		- [`"../dependency/fns"`, "fnErr"],
	`152`	+ [`"../decls/fns"`, "fnErr"],
`153`	`153`	`"error",`
`154`	`154`	`)`
`155`	`155`	`],`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,4 @@ export interface MutableRefObject<T> {`
`45`	`45`	`current: T;`
`46`	`46`	`}`
`47`	`47`	`export declare function useRef<T>(current: T): MutableRefObject<T>;`
`48`		`-export declare const useCsvParser: () => MutableRefObject<typeof import("csv-parse/lib")>;`
	`48`	`+export declare const useCsvParser: () => MutableRefObject<typeof import("csv-parse")>;`