Adjust subModuleName

rbuckton · rbuckton · commit aa04ef5ce758 · 2018-08-20T20:49:52.000-07:00
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -934,7 +934,7 @@ namespace ts {
         if (endsWith(path, ".d.ts")) {
             return path;
         }
-        if (endsWith(path, "/index")) {
+        if (path === "index" || endsWith(path, "/index")) {
             return path + ".d.ts";
         }
         return path + "/index.d.ts";
@@ -1069,9 +1069,9 @@ namespace ts {
                 }
             }
 
-            // if (versionPath) {
-            //     subModuleName = combinePaths(versionPath, subModuleName);
-            // }
+            if (versionPath) {
+                subModuleName = combinePaths(versionPath, subModuleName);
+            }
 
             if (!endsWith(subModuleName, Extension.Dts)) {
                 subModuleName = addExtensionAndIndex(subModuleName);

Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,7 @@ namespace ts {`
`934`	`934`	`if (endsWith(path, ".d.ts")) {`
`935`	`935`	`return path;`
`936`	`936`	`}`
`937`		`- if (endsWith(path, "/index")) {`
	`937`	`+ if (path === "index" \|\| endsWith(path, "/index")) {`
`938`	`938`	`return path + ".d.ts";`
`939`	`939`	`}`
`940`	`940`	`return path + "/index.d.ts";`
`@@ -1069,9 +1069,9 @@ namespace ts {`
`1069`	`1069`	`}`
`1070`	`1070`	`}`
`1071`	`1071`
`1072`		`- // if (versionPath) {`
`1073`		`- // subModuleName = combinePaths(versionPath, subModuleName);`
`1074`		`- // }`
	`1072`	`+ if (versionPath) {`
	`1073`	`+ subModuleName = combinePaths(versionPath, subModuleName);`
	`1074`	`+ }`
`1075`	`1075`
`1076`	`1076`	`if (!endsWith(subModuleName, Extension.Dts)) {`
`1077`	`1077`	`subModuleName = addExtensionAndIndex(subModuleName);`