Fix incorrect path matching when calculating module specifier

sheetalkamat · sheetalkamat · commit 85db43ec90c3 · 2021-01-06T11:31:01.000-08:00
diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts
@@ -429,7 +429,7 @@ namespace ts.moduleSpecifiers {
                         startsWith(relativeToBaseUrl, prefix) &&
                         endsWith(relativeToBaseUrl, suffix) ||
                         !suffix && relativeToBaseUrl === removeTrailingDirectorySeparator(prefix)) {
-                        const matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length);
+                        const matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length - prefix.length);
                         return key.replace("*", matchedStar);
                     }
                 }
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
@@ -109,7 +109,7 @@ exports.__esModule = true;
 }
 
 //// [/src/packages/pkg2/lib/src/index.d.ts]
-export declare function fn4(): import("@fluentui/pkg1/src").IThing;
+export declare function fn4(): import("@fluentui/pkg1").IThing;
 
 
 //// [/src/packages/pkg2/lib/src/index.js]
@@ -139,7 +139,7 @@ exports.fn4 = fn4;
       },
       "../src/index.ts": {
         "version": "8515046367-import { IThings } from '@fluentui/pkg1';\nexport function fn4() {\n  const a: IThings = { thing1: { a: 'b' } };\n  return a.thing1;\n}",
-        "signature": "-4446422616-export declare function fn4(): import(\"@fluentui/pkg1/src\").IThing;\r\n",
+        "signature": "-9447422063-export declare function fn4(): import(\"@fluentui/pkg1\").IThing;\r\n",
         "affectsGlobalScope": false
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ namespace ts.moduleSpecifiers {`
`429`	`429`	`startsWith(relativeToBaseUrl, prefix) &&`
`430`	`430`	`endsWith(relativeToBaseUrl, suffix) \|\|`
`431`	`431`	`!suffix && relativeToBaseUrl === removeTrailingDirectorySeparator(prefix)) {`
`432`		`- const matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length);`
	`432`	`+ const matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length - prefix.length);`
`433`	`433`	`return key.replace("*", matchedStar);`
`434`	`434`	`}`
`435`	`435`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ exports.__esModule = true;`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`//// [/src/packages/pkg2/lib/src/index.d.ts]`
`112`		`-export declare function fn4(): import("@fluentui/pkg1/src").IThing;`
	`112`	`+export declare function fn4(): import("@fluentui/pkg1").IThing;`
`113`	`113`
`114`	`114`
`115`	`115`	`//// [/src/packages/pkg2/lib/src/index.js]`
`@@ -139,7 +139,7 @@ exports.fn4 = fn4;`
`139`	`139`	`},`
`140`	`140`	`"../src/index.ts": {`
`141`	`141`	`"version": "8515046367-import { IThings } from '@fluentui/pkg1';\nexport function fn4() {\n const a: IThings = { thing1: { a: 'b' } };\n return a.thing1;\n}",`
`142`		`- "signature": "-4446422616-export declare function fn4(): import(\"@fluentui/pkg1/src\").IThing;\r\n",`
	`142`	`+ "signature": "-9447422063-export declare function fn4(): import(\"@fluentui/pkg1\").IThing;\r\n",`
`143`	`143`	`"affectsGlobalScope": false`
`144`	`144`	`}`
`145`	`145`	`},`