compiler: Allow configuring target, lib, and strict

frida · Nov 18, 2022 · 2db8de4 · 2db8de4
1 parent 2467dc8
commit 2db8de4
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -307,17 +307,36 @@ export function queryDefaultAssets(projectRoot: string, sys: ts.System): Assets
 function makeCompilerOptions(projectRoot: string, system: ts.System, options: OutputOptions): ts.CompilerOptions {
     const defaultTsOptions = makeDefaultCompilerOptions();
 
+    const softOptionNames = ["target", "lib", "strict"];
+    const fixedTsOptions = Object.assign({}, defaultTsOptions);
+    for (const name of softOptionNames) {
+        delete fixedTsOptions[name];
+    }
+
+    let opts: ts.CompilerOptions;
     const configFileHost = new FridaConfigFileHost(projectRoot, system);
+    const userOpts = ts.getParsedCommandLineOfConfigFile(crosspath.join(projectRoot, "tsconfig.json"), fixedTsOptions, configFileHost)?.options;
+    if (userOpts !== undefined) {
+        for (const name of softOptionNames) {
+            const val = userOpts[name];
+            if (val === undefined) {
+                userOpts[name] = defaultTsOptions[name];
+            }
+        }
+        delete userOpts.noEmit;
+        opts = userOpts;
+    } else {
+        opts = defaultTsOptions;
+    }
 
-    const opts = ts.getParsedCommandLineOfConfigFile(crosspath.join(projectRoot, "tsconfig.json"), defaultTsOptions, configFileHost)?.options ?? defaultTsOptions;
-    delete opts.noEmit;
     opts.rootDir = projectRoot;
     opts.outDir = "/";
     if (options.sourceMaps === "included") {
         opts.sourceRoot = projectRoot;
         opts.sourceMap = true;
         opts.inlineSourceMap = false;
     }
+
     return opts;
 }