Pipe config file all the way to YamlDocumenter

Vitalius1 · octogonz · commit 8d0fdbaa5e4b · 2019-05-06T22:07:13.000-07:00
diff --git a/apps/api-documenter/src/cli/YamlAction.ts b/apps/api-documenter/src/cli/YamlAction.ts
@@ -39,9 +39,9 @@ export class YamlAction extends BaseAction {
 
     const yamlDocumenter: YamlDocumenter = this._officeParameter.value
        ? new OfficeYamlDocumenter(apiModel, this.inputFolder)
-       : new YamlDocumenter(apiModel, this.configFolder);
+       : new YamlDocumenter(apiModel);
 
-    yamlDocumenter.generateFiles(this.outputFolder);
+    yamlDocumenter.generateFiles(this.outputFolder, this.configFolder);
     return Promise.resolve();
   }
 }
diff --git a/apps/api-documenter/src/documenters/YamlDocumenter.ts b/apps/api-documenter/src/documenters/YamlDocumenter.ts
@@ -55,30 +55,36 @@ const yamlApiSchema: JsonSchema = JsonSchema.fromFile(path.join(__dirname, '..',
 export class YamlDocumenter {
   private readonly _apiModel: ApiModel;
   private readonly _markdownEmitter: CustomMarkdownEmitter;
-  private readonly _configFolder: string;
-
+  
   // This is used by the _linkToUidIfPossible() workaround.
   // It stores a mapping from type name (e.g. "MyClass") to the corresponding ApiItem.
   // If the mapping would be ambiguous (e.g. "MyClass" is defined by multiple packages)
   // then it is excluded from the mapping.  Also excluded are ApiItem objects (such as package
   // and function) which are not typically used as a data type.
   private _apiItemsByTypeName: Map<string, ApiItem>;
-
+  
   private _outputFolder: string;
 
-  public constructor(apiModel: ApiModel, configFolder: string) {
+  // ideally this needs to be an interface with a defined shape a config file can take. And whoever creates the config
+  // should use it to leverage the type safety.
+  private _config: {};
+
+  public constructor(apiModel: ApiModel) {
     this._apiModel = apiModel;
     this._markdownEmitter = new CustomMarkdownEmitter(this._apiModel);
     this._apiItemsByTypeName = new Map<string, ApiItem>();
-    this._configFolder = configFolder;
-
+    
     this._initApiItemsByTypeName();
   }
-
+  
   /** @virtual */
-  public generateFiles(outputFolder: string): void {
+  public generateFiles(outputFolder: string, configFolder?: string): void {
     this._outputFolder = outputFolder;
 
+    const configFilePath: string = configFolder ? path.join(configFolder, 'api-documenter.json') : '';
+    this._config = configFilePath && JsonFile.load(configFilePath);
+    console.log(this._config);
+
     console.log();
     this._deleteOldOutputFiles();
 

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ export class YamlAction extends BaseAction {`
`39`	`39`
`40`	`40`	`const yamlDocumenter: YamlDocumenter = this._officeParameter.value`
`41`	`41`	`? new OfficeYamlDocumenter(apiModel, this.inputFolder)`
`42`		`- : new YamlDocumenter(apiModel, this.configFolder);`
	`42`	`+ : new YamlDocumenter(apiModel);`
`43`	`43`
`44`		`- yamlDocumenter.generateFiles(this.outputFolder);`
	`44`	`+ yamlDocumenter.generateFiles(this.outputFolder, this.configFolder);`
`45`	`45`	`return Promise.resolve();`
`46`	`46`	`}`
`47`	`47`	`}`