Fix an issue found during testing

octogonz · octogonz · commit 511e50953788 · 2019-10-05T16:50:02.000-07:00
diff --git a/apps/api-extractor/src/analyzer/ExportAnalyzer.ts b/apps/api-extractor/src/analyzer/ExportAnalyzer.ts
@@ -53,6 +53,14 @@ interface IAstModuleReference {
  * generating .d.ts rollups.
  */
 export class ExportAnalyzer {
+  // Captures "@a/b" or "d" from these examples:
+  //   @a/b
+  //   @a/b/c
+  //   d
+  //   d/
+  //   d/e
+  private static _modulePathRegExp: RegExp = /^((?:@[^@\/\s]+\/)?[^@\/\s]+)(?:.*)$/;
+
   private readonly _program: ts.Program;
   private readonly _typeChecker: ts.TypeChecker;
   private readonly _bundledPackageNames: Set<string>;
@@ -234,14 +242,6 @@ export class ExportAnalyzer {
     return entryPointAstModule.astModuleExportInfo;
   }
 
-  // Captures "@a/b" or "d" from these examples:
-  //   @a/b
-  //   @a/b/c
-  //   d
-  //   d/
-  //   d/e
-  private static _modulePathRegExp: RegExp = /^((?:@[^@\/\s]+\/)?[^@\/\s]+)(?:.*)$/;
-
   /**
    * Returns true if the module specifier refers to an external package.  Ignores packages listed in the
    * "bundledPackages" setting from the api-extractor.json config file.
@@ -261,7 +261,7 @@ export class ExportAnalyzer {
     const match: RegExpExecArray | null = ExportAnalyzer._modulePathRegExp.exec(moduleSpecifier);
     if (match) {
       // Extract "@my-scope/my-package" from "@my-scope/my-package/path/module"
-      const packageName: string = match[0];
+      const packageName: string = match[1];
       if (this._bundledPackageNames.has(packageName)) {
         return false;
       }
diff --git a/build-tests/api-extractor-scenarios/etc/test-outputs/bundledPackages/api-extractor-scenarios.api.md b/build-tests/api-extractor-scenarios/etc/test-outputs/bundledPackages/api-extractor-scenarios.api.md
@@ -4,7 +4,7 @@
 
 ```ts
 
-import { Lib2Class } from 'api-extractor-lib2-test';
+import { Lib2Class } from 'api-extractor-lib2-test/lib/index';
 
 // Warning: (ae-forgotten-export) The symbol "Lib1Class" needs to be exported by the entry point index.d.ts
 // 
diff --git a/build-tests/api-extractor-scenarios/etc/test-outputs/bundledPackages/rollup.d.ts b/build-tests/api-extractor-scenarios/etc/test-outputs/bundledPackages/rollup.d.ts
@@ -1,4 +1,4 @@
-import { Lib2Class } from 'api-extractor-lib2-test';
+import { Lib2Class } from 'api-extractor-lib2-test/lib/index';
 
 /** @public */
 export declare function f(arg1: Lib1Class, arg2: Lib2Class): void;
diff --git a/build-tests/api-extractor-scenarios/src/bundledPackages/index.ts b/build-tests/api-extractor-scenarios/src/bundledPackages/index.ts
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { Lib1Class } from "api-extractor-lib1-test";
-import { Lib2Class } from "api-extractor-lib2-test";
+import { Lib1Class } from "api-extractor-lib1-test/lib/index";
+import { Lib2Class } from "api-extractor-lib2-test/lib/index";
 
 /** @public */
 export function f(arg1: Lib1Class, arg2: Lib2Class): void {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Lib2Class } from 'api-extractor-lib2-test';`
	`1`	`+import { Lib2Class } from 'api-extractor-lib2-test/lib/index';`
`2`	`2`
`3`	`3`	`/** @public */`
`4`	`4`	`export declare function f(arg1: Lib1Class, arg2: Lib2Class): void;`