JavaScriptExpert
diff --git a/‎apps/api-extractor/src/ExtractorContext.ts‎
Lines changed: 2 additions & 2 deletions b/‎apps/api-extractor/src/ExtractorContext.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎apps/api-extractor/src/ast/AstItem.ts‎
Lines changed: 6 additions & 6 deletions b/‎apps/api-extractor/src/ast/AstItem.ts‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎apps/api-extractor/src/cli/RunAction.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/api-extractor/src/cli/RunAction.ts‎
Lines changed: 1 addition & 1 deletion
@@ -73,13 +73,13 @@ export class ExtractorContext {
     this.policies = options.policies;
     this.validationRules = options.validationRules;
 
-    const folder: string | undefined = this.packageJsonLookup.tryGetPackageFolder(options.entryPointFile);
+    const folder: string | undefined = this.packageJsonLookup.tryGetPackageFolderFor(options.entryPointFile);
     if (!folder) {
       throw new Error('Unable to find a package.json for entry point: ' + options.entryPointFile);
     }
     this._packageFolder = folder;
 
-    this._packageName = this.packageJsonLookup.getPackageName(this._packageFolder);
+    this._packageName = this.packageJsonLookup.tryLoadPackageJsonFor(this._packageFolder)!.name;
 
     this.docItemLoader = new DocItemLoader(this._packageFolder);
 
 
@@ -18,6 +18,7 @@ import {
   IApiDefinitionReferenceParts
 } from '../ApiDefinitionReference';
 import { AstItemContainer } from './AstItemContainer';
+import { IPackageJson } from '@microsoft/node-core-library';
 
 /**
  * Indicates the type of definition represented by a AstItem object.
@@ -602,18 +603,17 @@ export abstract class AstItem {
     // Walk upwards from that directory until you find a directory containing package.json,
     // this is where the referenced type is located.
     // Example: "c:\users\<username>\sp-client\spfx-core\sp-core-library"
-    const typeReferencePackagePath: string | undefined = this.context.packageJsonLookup
-      .tryGetPackageFolder(sourceFile.fileName);
+    const typeReferencePackageJson: IPackageJson | undefined = this.context.packageJsonLookup
+      .tryLoadPackageJsonFor(sourceFile.fileName);
     // Example: "@microsoft/sp-core-library"
     let typeReferencePackageName: string = '';
 
     // If we can not find a package path, we consider the type to be part of the current project's package.
     // One case where this happens is when looking for a type that is a symlink
-    if (!typeReferencePackagePath) {
+    if (!typeReferencePackageJson) {
       typeReferencePackageName = this.context.package.name;
     } else {
-      typeReferencePackageName = this.context.packageJsonLookup
-        .getPackageName(typeReferencePackagePath);
+      typeReferencePackageName = typeReferencePackageJson.name;
 
       typingsScopeNames.every(typingScopeName => {
         if (typeReferencePackageName.indexOf(typingScopeName) > -1) {
@@ -630,7 +630,7 @@ export abstract class AstItem {
     const currentPackageName: string = this.context.package.name;
 
     const typeName: string = typeReferenceNode.typeName.getText();
-    if (!typeReferencePackagePath || typeReferencePackageName === currentPackageName) {
+    if (!typeReferencePackageJson || typeReferencePackageName === currentPackageName) {
       // The type is defined in this project.  Did the person remember to export it?
       const exportedLocalName: string | undefined = this.context.package.tryGetExportedSymbolName(currentSymbol);
       if (exportedLocalName) {
 
@@ -63,7 +63,7 @@ export class RunAction extends CommandLineAction {
       // Otherwise, figure out which project we're in and look for the config file
       // at the project root
       const lookup: PackageJsonLookup = new PackageJsonLookup();
-      const packageFolder: string|undefined = lookup.tryGetPackageFolder('.');
+      const packageFolder: string|undefined = lookup.tryGetPackageFolderFor('.');
 
       if (packageFolder) {
         configFilename = path.join(packageFolder, AE_CONFIG_FILENAME);