support extends "tstl" object for tsconfig.json in node_modules (#1440)

pilaoda · web-flow · commit 6a37cf189eab · 2023-05-05T20:52:02.000+02:00
* support extends "tstl" object tsconfig.json in node_modules upgrade typescript to 5.0.4 to fix extends resolving. microsoft/TypeScript#53443 * support extends "tstl" object tsconfig.json in node_modules upgrade typescript to 5.0.4 to fix extends resolving. microsoft/TypeScript#53443 * using pathIsAbsolute and pathIsRelative from ts export with declaration. * add a comment in code explaining that if a path is not absolute and not relative that it is then a module path that needs to be resolved
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,6 +70,6 @@
         "prettier": "^2.8.4",
         "ts-jest": "^29.1.0",
         "ts-node": "^10.9.1",
-        "typescript": "^5.0.2"
+        "typescript": "^5.0.4"
     }
 }
diff --git a/src/cli/tsconfig.ts b/src/cli/tsconfig.ts
@@ -58,13 +58,33 @@ export function parseConfigFileWithSystem(
     return updateParsedConfigFile(parsedConfigFile);
 }
 
+function resolveNpmModuleConfig(
+    moduleName: string,
+    configRootDir: string,
+    host: ts.ModuleResolutionHost
+): string | undefined {
+    const resolved = ts.nodeNextJsonConfigResolver(moduleName, path.join(configRootDir, "tsconfig.json"), host);
+    if (resolved.resolvedModule) {
+        return resolved.resolvedModule.resolvedFileName;
+    }
+}
+
 function getExtendedTstlOptions(
     configFilePath: string,
     configRootDir: string,
     cycleCache: Set<string>,
     system: ts.System
 ): TypeScriptToLuaOptions {
-    const absolutePath = path.isAbsolute(configFilePath) ? configFilePath : path.resolve(configRootDir, configFilePath);
+    const absolutePath = ts.pathIsAbsolute(configFilePath)
+        ? configFilePath
+        : ts.pathIsRelative(configFilePath)
+        ? path.resolve(configRootDir, configFilePath)
+        : resolveNpmModuleConfig(configFilePath, configRootDir, system); // if a path is neither relative nor absolute, it is probably a npm module
+
+    if (!absolutePath) {
+        return {};
+    }
+
     const newConfigRoot = path.dirname(absolutePath);
 
     if (cycleCache.has(absolutePath)) {
diff --git a/src/typescript-internal.d.ts b/src/typescript-internal.d.ts
@@ -50,4 +50,13 @@ declare module "typescript" {
 
     function skipOuterExpressions(node: Expression, kinds?: OuterExpressionKinds): Expression;
     export function isOuterExpression(node: Node, kinds?: OuterExpressionKinds): node is OuterExpression;
+
+    export function nodeNextJsonConfigResolver(
+        moduleName: string,
+        containingFile: string,
+        host: ModuleResolutionHost
+    ): ResolvedModuleWithFailedLookupLocations;
+
+    export function pathIsAbsolute(path: string): boolean;
+    export function pathIsRelative(path: string): boolean;
 }

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,6 @@`
`70`	`70`	`"prettier": "^2.8.4",`
`71`	`71`	`"ts-jest": "^29.1.0",`
`72`	`72`	`"ts-node": "^10.9.1",`
`73`		`- "typescript": "^5.0.2"`
	`73`	`+ "typescript": "^5.0.4"`
`74`	`74`	`}`
`75`	`75`	`}`