[api-extractor] API Extractor 7 release branch

apps/api-documenter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/api-documenter",
-  "version": "1.5.59",
+  "version": "6.0.0",
   "description": "Read JSON files from api-extractor, generate documentation pages",
   "repository": {
     "type": "git",
@@ -18,6 +18,7 @@
     "@microsoft/api-extractor": "6.3.0",
     "@microsoft/node-core-library": "3.7.0",
     "@microsoft/ts-command-line": "4.2.2",
+    "@microsoft/tsdoc": "0.12.4",
     "colors": "~1.2.1",
     "js-yaml": "~3.9.1"
   },
@@ -27,6 +28,7 @@
     "@types/js-yaml": "3.9.1",
     "@types/node": "8.5.8",
     "gulp": "~3.9.1",
-    "@types/jest": "21.1.10"
+    "@types/jest": "21.1.10",
+    "jest": "~22.4.3"
   }
 }

apps/api-documenter/src/cli/BaseAction.ts

@@ -7,10 +7,8 @@ import {
   CommandLineAction,
   CommandLineStringParameter
 } from '@microsoft/ts-command-line';
-
 import { FileSystem } from '@microsoft/node-core-library';
-
-import { DocItemSet } from '../utils/DocItemSet';
+import { ApiModel } from '@microsoft/api-extractor';
 
 export abstract class BaseAction extends CommandLineAction {
   protected inputFolder: string;
@@ -38,8 +36,8 @@ export abstract class BaseAction extends CommandLineAction {
     });
   }
 
-  protected buildDocItemSet(): DocItemSet {
-    const docItemSet: DocItemSet = new DocItemSet();
+  protected buildApiModel(): ApiModel {
+    const apiModel: ApiModel = new ApiModel();
 
     this.inputFolder = this._inputFolderParameter.value || './input';
     if (!FileSystem.exists(this.inputFolder)) {
@@ -53,10 +51,10 @@ export abstract class BaseAction extends CommandLineAction {
       if (filename.match(/\.api\.json$/i)) {
         console.log(`Reading ${filename}`);
         const filenamePath: string = path.join(this.inputFolder, filename);
-        docItemSet.loadApiJsonFile(filenamePath);
+        apiModel.loadPackage(filenamePath);
       }
     }
 
-    return docItemSet;
+    return apiModel;
   }
 }

apps/api-documenter/src/cli/MarkdownAction.ts

@@ -3,8 +3,8 @@
 
 import { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
 import { BaseAction } from './BaseAction';
-import { DocItemSet } from '../utils/DocItemSet';
-import { MarkdownDocumenter } from '../markdown/MarkdownDocumenter';
+import { MarkdownDocumenter } from '../documenters/MarkdownDocumenter';
+import { ApiModel } from '@microsoft/api-extractor';
 
 export class MarkdownAction extends BaseAction {
   constructor(parser: ApiDocumenterCommandLine) {
@@ -17,8 +17,8 @@ export class MarkdownAction extends BaseAction {
   }
 
   protected onExecute(): Promise<void> { // override
-    const docItemSet: DocItemSet = this.buildDocItemSet();
-    const markdownDocumenter: MarkdownDocumenter = new MarkdownDocumenter(docItemSet);
+    const apiModel: ApiModel = this.buildApiModel();
+    const markdownDocumenter: MarkdownDocumenter = new MarkdownDocumenter(apiModel);
     markdownDocumenter.generateFiles(this.outputFolder);
     return Promise.resolve();
   }

apps/api-documenter/src/cli/YamlAction.ts

@@ -7,10 +7,10 @@ import {
 
 import { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
 import { BaseAction } from './BaseAction';
-import { DocItemSet } from '../utils/DocItemSet';
 
-import { YamlDocumenter } from '../yaml/YamlDocumenter';
-import { OfficeYamlDocumenter } from '../yaml/OfficeYamlDocumenter';
+import { YamlDocumenter } from '../documenters/YamlDocumenter';
+import { OfficeYamlDocumenter } from '../documenters/OfficeYamlDocumenter';
+import { ApiModel } from '@microsoft/api-extractor';
 
 export class YamlAction extends BaseAction {
   private _officeParameter: CommandLineFlagParameter;
@@ -35,11 +35,11 @@ export class YamlAction extends BaseAction {
   }
 
   protected onExecute(): Promise<void> { // override
-    const docItemSet: DocItemSet = this.buildDocItemSet();
+    const apiModel: ApiModel = this.buildApiModel();
 
     const yamlDocumenter: YamlDocumenter = this._officeParameter.value
-       ? new OfficeYamlDocumenter(docItemSet, this.inputFolder)
-       : new YamlDocumenter(docItemSet);
+       ? new OfficeYamlDocumenter(apiModel, this.inputFolder)
+       : new YamlDocumenter(apiModel);
 
     yamlDocumenter.generateFiles(this.outputFolder);
     return Promise.resolve();