Implement tsconfigFilePath

octogonz · octogonz · commit fd8ff3610587 · 2019-04-10T22:03:57.000-07:00
diff --git a/apps/api-extractor/src/api/CompilerState.ts b/apps/api-extractor/src/api/CompilerState.ts
@@ -52,7 +52,7 @@ export class CompilerState {
     let tsconfig: {} | undefined = extractorConfig.overrideTsconfig;
     if (!tsconfig) {
       // If it wasn't overridden, then load it from disk
-      tsconfig = JsonFile.load(path.join(extractorConfig.projectFolder, 'tsconfig.json'));
+      tsconfig = JsonFile.load(extractorConfig.tsconfigFilePath);
     }
 
     const commandLine: ts.ParsedCommandLine = ts.parseJsonConfigFileContent(
diff --git a/apps/api-extractor/src/api/ExtractorConfig.ts b/apps/api-extractor/src/api/ExtractorConfig.ts
@@ -94,6 +94,7 @@ interface IExtractorConfigParameters {
   packageJson: INodePackageJson | undefined;
   packageJsonFullPath: string | undefined;
   mainEntryPointFile: string;
+  tsconfigFilePath: string;
   overrideTsconfig: { } | undefined;
   skipLibCheck: boolean;
   apiReportEnabled: boolean;
@@ -150,6 +151,9 @@ export class ExtractorConfig {
   /** {@inheritDoc IConfigFile.mainEntryPointFile} */
   public readonly mainEntryPointFile: string;
 
+  /** {@inheritDoc IConfigCompiler.tsconfigFilePath} */
+  public readonly tsconfigFilePath: string;
+
   /** {@inheritDoc IConfigCompiler.overrideTsconfig} */
   public readonly overrideTsconfig: { } | undefined;
 
@@ -194,6 +198,7 @@ export class ExtractorConfig {
     this.packageJson = parameters.packageJson;
     this.packageJsonFullPath = parameters.packageJsonFullPath;
     this.mainEntryPointFile = parameters.mainEntryPointFile;
+    this.tsconfigFilePath = parameters.tsconfigFilePath;
     this.overrideTsconfig = parameters.overrideTsconfig;
     this.skipLibCheck = parameters.skipLibCheck;
     this.apiReportEnabled = parameters.apiReportEnabled;
@@ -342,6 +347,13 @@ export class ExtractorConfig {
         'mainEntryPointFile', configFile.mainEntryPointFile, currentConfigFolderPath);
     }
 
+    if (configFile.compiler) {
+      if (configFile.compiler.tsconfigFilePath) {
+        configFile.compiler.tsconfigFilePath = ExtractorConfig._resolveConfigFileRelativePath(
+          'tsconfigFilePath', configFile.compiler.tsconfigFilePath, currentConfigFolderPath);
+      }
+    }
+
     if (configFile.apiReport) {
       if (configFile.apiReport.reportFolder) {
         configFile.apiReport.reportFolder = ExtractorConfig._resolveConfigFileRelativePath(
@@ -494,17 +506,29 @@ export class ExtractorConfig {
 
       if (!configObject.mainEntryPointFile) {
         // A merged configuration should have this
-        throw new Error('mainEntryPointFile is missing');
+        throw new Error('The "mainEntryPointFile" setting is missing');
       }
       const mainEntryPointFile: string = ExtractorConfig._resolvePathWithTokens('mainEntryPointFile',
         configObject.mainEntryPointFile, tokenContext);
 
       if (!ExtractorConfig.hasDtsFileExtension(mainEntryPointFile)) {
-        throw new Error('The mainEntryPointFile is not a declaration file: ' + mainEntryPointFile);
+        throw new Error('The "mainEntryPointFile" is not a declaration file: ' + mainEntryPointFile);
       }
 
       if (!FileSystem.exists(mainEntryPointFile)) {
-        throw new Error('The mainEntryPointFile does not exist: ' + mainEntryPointFile);
+        throw new Error('The "mainEntryPointFile" does not exist: ' + mainEntryPointFile);
+      }
+
+      const tsconfigFilePath: string = ExtractorConfig._resolvePathWithTokens('tsconfigFilePath',
+        configObject.compiler.tsconfigFilePath, tokenContext);
+
+      if (configObject.compiler.overrideTsconfig === undefined) {
+        if (!configObject.compiler.tsconfigFilePath) {
+          throw new Error('Either the "tsconfigFilePath" or "overrideTsconfig" setting must be specified');
+        }
+        if (!FileSystem.exists(configObject.compiler.tsconfigFilePath)) {
+          throw new Error('The "tsconfigFilePath" does not exist: ' + configObject.compiler.tsconfigFilePath);
+        }
       }
 
       let apiReportEnabled: boolean = false;
@@ -594,6 +618,7 @@ export class ExtractorConfig {
         packageJson,
         packageJsonFullPath,
         mainEntryPointFile,
+        tsconfigFilePath,
         overrideTsconfig: configObject.compiler.overrideTsconfig,
         skipLibCheck: !!configObject.compiler.skipLibCheck,
         apiReportEnabled,
diff --git a/common/reviews/api/api-extractor.api.md b/common/reviews/api/api-extractor.api.md
@@ -61,6 +61,7 @@ export class ExtractorConfig {
     readonly rollupEnabled: boolean;
     readonly skipLibCheck: boolean;
     readonly testMode: boolean;
+    readonly tsconfigFilePath: string;
     readonly tsdocMetadataEnabled: boolean;
     readonly tsdocMetadataFilePath: string;
     readonly untrimmedFilePath: string;
@@ -150,6 +151,7 @@ export interface IConfigApiReport {
 export interface IConfigCompiler {
     overrideTsconfig?: {};
     skipLibCheck?: boolean;
+    tsconfigFilePath?: string;
 }
 
 // @public

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export class CompilerState {`
`52`	`52`	`let tsconfig: {} \| undefined = extractorConfig.overrideTsconfig;`
`53`	`53`	`if (!tsconfig) {`
`54`	`54`	`// If it wasn't overridden, then load it from disk`
`55`		`- tsconfig = JsonFile.load(path.join(extractorConfig.projectFolder, 'tsconfig.json'));`
	`55`	`+ tsconfig = JsonFile.load(extractorConfig.tsconfigFilePath);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`const commandLine: ts.ParsedCommandLine = ts.parseJsonConfigFileContent(`