Rebased off of recent changes

microsoft · Oct 11, 2022 · 920a125 · 920a125
1 parent 1178704
commit 920a125
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 6 deletions.
diff --git a/apps/api-extractor/src/collector/MessageRouter.ts b/apps/api-extractor/src/collector/MessageRouter.ts
@@ -639,7 +639,7 @@ export class MessageRouter {
    * Sorts an array of messages according to a reasonable ordering
    */
   private _sortMessagesForOutput(messages: ExtractorMessage[]): void {
-    LegacyAdapters.sortStable(messages, (a: ExtractorMessage, b: ExtractorMessage) => {
+    messages.sort((a, b) => {
       let diff: number;
       // First sort by file name
       diff = Sort.compareByValue(a.sourceFilePath, b.sourceFilePath);

diff --git a/build-tests/api-extractor-scenarios/etc/docReferencesAlias/api-extractor-scenarios.api.json b/build-tests/api-extractor-scenarios/etc/docReferencesAlias/api-extractor-scenarios.api.json
@@ -2,7 +2,7 @@
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
     "toolVersion": "[test mode]",
-    "schemaVersion": 1009,
+    "schemaVersion": 1010,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
       "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -182,6 +182,7 @@
               "text": "export default class Item "
             }
           ],
+          "fileUrlPath": "src/docReferencesAlias/Item.ts",
           "releaseTag": "Public",
           "name": "Item",
           "preserveMemberOrder": false,
@@ -229,6 +230,7 @@
               "text": "export default interface Options "
             }
           ],
+          "fileUrlPath": "src/docReferencesAlias/Options.ts",
           "releaseTag": "Public",
           "name": "renamed_Options",
           "preserveMemberOrder": false,

diff --git a/.../api-extractor-scenarios/etc/docReferencesNamespaceAlias/api-extractor-scenarios.api.json b/.../api-extractor-scenarios/etc/docReferencesNamespaceAlias/api-extractor-scenarios.api.json
@@ -2,7 +2,7 @@
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
     "toolVersion": "[test mode]",
-    "schemaVersion": 1009,
+    "schemaVersion": 1010,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
       "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -182,6 +182,7 @@
               "text": "export default class Item "
             }
           ],
+          "fileUrlPath": "src/docReferencesNamespaceAlias/Item.ts",
           "releaseTag": "Public",
           "name": "Item",
           "preserveMemberOrder": false,
@@ -224,6 +225,7 @@
           "canonicalReference": "api-extractor-scenarios!renamed:namespace",
           "docComment": "",
           "excerptTokens": [],
+          "fileUrlPath": "src/docReferencesNamespaceAlias/index.ts",
           "releaseTag": "None",
           "name": "renamed",
           "preserveMemberOrder": false,
@@ -238,6 +240,7 @@
                   "text": "export default interface Options "
                 }
               ],
+              "fileUrlPath": "src/docReferencesNamespaceAlias/renamed/Options.ts",
               "releaseTag": "Public",
               "name": "Options",
               "preserveMemberOrder": false,
@@ -332,6 +335,7 @@
               "canonicalReference": "api-extractor-scenarios!renamed.sub:namespace",
               "docComment": "",
               "excerptTokens": [],
+              "fileUrlPath": "src/docReferencesNamespaceAlias/renamed/index.ts",
               "releaseTag": "None",
               "name": "sub",
               "preserveMemberOrder": false,
@@ -346,6 +350,7 @@
                       "text": "export default interface SubOptions "
                     }
                   ],
+                  "fileUrlPath": "src/docReferencesNamespaceAlias/renamed/sub/SubOptions.ts",
                   "releaseTag": "Public",
                   "name": "SubOptions",
                   "preserveMemberOrder": false,

diff --git a/...ests/api-extractor-scenarios/etc/includeForgottenExports/api-extractor-scenarios.api.json b/...ests/api-extractor-scenarios/etc/includeForgottenExports/api-extractor-scenarios.api.json
@@ -2,7 +2,7 @@
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
     "toolVersion": "[test mode]",
-    "schemaVersion": 1009,
+    "schemaVersion": 1010,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
       "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -182,6 +182,7 @@
               "text": "declare class AnotherDuplicateName "
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/internal1.ts",
           "releaseTag": "Public",
           "name": "AnotherDuplicateName_2",
           "preserveMemberOrder": false,
@@ -198,6 +199,7 @@
               "text": "declare class AnotherDuplicateName "
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "Public",
           "name": "AnotherDuplicateName",
           "preserveMemberOrder": false,
@@ -222,6 +224,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/internal1.ts",
           "releaseTag": "Public",
           "name": "DuplicateName_2",
           "typeTokenRange": {
@@ -247,6 +250,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "Public",
           "name": "DuplicateName",
           "typeTokenRange": {
@@ -264,6 +268,7 @@
               "text": "declare class ForgottenExport1 "
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "Public",
           "name": "ForgottenExport1",
           "preserveMemberOrder": false,
@@ -334,6 +339,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "Public",
           "name": "ForgottenExport2",
           "typeTokenRange": {
@@ -351,6 +357,7 @@
               "text": "declare namespace ForgottenExport4 "
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "Public",
           "name": "ForgottenExport4",
           "preserveMemberOrder": false,
@@ -383,6 +390,7 @@
               "text": "export declare class ForgottenExport6 "
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/internal2.ts",
           "releaseTag": "Public",
           "name": "ForgottenExport6",
           "preserveMemberOrder": false,
@@ -394,6 +402,7 @@
           "canonicalReference": "api-extractor-scenarios!~internal2:namespace",
           "docComment": "",
           "excerptTokens": [],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "None",
           "name": "internal2",
           "preserveMemberOrder": false,
@@ -408,6 +417,7 @@
                   "text": "export declare class ForgottenExport6 "
                 }
               ],
+              "fileUrlPath": "src/includeForgottenExports/internal2.ts",
               "releaseTag": "Public",
               "name": "ForgottenExport6",
               "preserveMemberOrder": false,
@@ -435,6 +445,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2
@@ -463,6 +474,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/internal1.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2
@@ -491,6 +503,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2
@@ -519,6 +532,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2
@@ -547,6 +561,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2
@@ -575,6 +590,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/internal1.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2
@@ -594,6 +610,7 @@
               "text": "export declare namespace SomeNamespace1 "
             }
           ],
+          "fileUrlPath": "src/includeForgottenExports/index.ts",
           "releaseTag": "Public",
           "name": "SomeNamespace1",
           "preserveMemberOrder": false,

diff --git a/build-tests/api-extractor-scenarios/etc/namespaceImports/api-extractor-scenarios.api.json b/build-tests/api-extractor-scenarios/etc/namespaceImports/api-extractor-scenarios.api.json
@@ -2,7 +2,7 @@
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
     "toolVersion": "[test mode]",
-    "schemaVersion": 1009,
+    "schemaVersion": 1010,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
       "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -177,6 +177,7 @@
           "canonicalReference": "api-extractor-scenarios!i1:namespace",
           "docComment": "",
           "excerptTokens": [],
+          "fileUrlPath": "src/namespaceImports/index.ts",
           "releaseTag": "None",
           "name": "i1",
           "preserveMemberOrder": false,
@@ -186,6 +187,7 @@
               "canonicalReference": "api-extractor-scenarios!i1.internal:namespace",
               "docComment": "",
               "excerptTokens": [],
+              "fileUrlPath": "src/namespaceImports/intermediate1.ts",
               "releaseTag": "None",
               "name": "internal",
               "preserveMemberOrder": false,
@@ -200,6 +202,7 @@
                       "text": "export declare class SomeClass "
                     }
                   ],
+                  "fileUrlPath": "src/namespaceImports/internal.ts",
                   "releaseTag": "Public",
                   "name": "SomeClass",
                   "preserveMemberOrder": false,
@@ -215,6 +218,7 @@
           "canonicalReference": "api-extractor-scenarios!i2:namespace",
           "docComment": "",
           "excerptTokens": [],
+          "fileUrlPath": "src/namespaceImports/index.ts",
           "releaseTag": "None",
           "name": "i2",
           "preserveMemberOrder": false,
@@ -224,6 +228,7 @@
               "canonicalReference": "api-extractor-scenarios!i2.internal:namespace",
               "docComment": "",
               "excerptTokens": [],
+              "fileUrlPath": "src/namespaceImports/intermediate1.ts",
               "releaseTag": "None",
               "name": "internal",
               "preserveMemberOrder": false,
@@ -238,6 +243,7 @@
                       "text": "export declare class SomeClass "
                     }
                   ],
+                  "fileUrlPath": "src/namespaceImports/internal.ts",
                   "releaseTag": "Public",
                   "name": "SomeClass",
                   "preserveMemberOrder": false,
@@ -267,6 +273,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/namespaceImports/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2

diff --git a/build-tests/api-extractor-scenarios/etc/namespaceImports2/api-extractor-scenarios.api.json b/build-tests/api-extractor-scenarios/etc/namespaceImports2/api-extractor-scenarios.api.json
@@ -2,7 +2,7 @@
   "metadata": {
     "toolPackage": "@microsoft/api-extractor",
     "toolVersion": "[test mode]",
-    "schemaVersion": 1009,
+    "schemaVersion": 1010,
     "oldestForwardsCompatibleVersion": 1001,
     "tsdocConfig": {
       "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -177,6 +177,7 @@
           "canonicalReference": "api-extractor-scenarios!internal:namespace",
           "docComment": "",
           "excerptTokens": [],
+          "fileUrlPath": "src/namespaceImports2/index.ts",
           "releaseTag": "None",
           "name": "internal",
           "preserveMemberOrder": false,
@@ -191,6 +192,7 @@
                   "text": "export declare class SomeClass "
                 }
               ],
+              "fileUrlPath": "src/namespaceImports2/internal.ts",
               "releaseTag": "Public",
               "name": "SomeClass",
               "preserveMemberOrder": false,
@@ -209,6 +211,7 @@
               "text": "export declare class SomeClass "
             }
           ],
+          "fileUrlPath": "src/namespaceImports2/internal.ts",
           "releaseTag": "Public",
           "name": "SomeClass",
           "preserveMemberOrder": false,
@@ -234,6 +237,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/namespaceImports2/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 1,
             "endIndex": 2

diff --git a/build-tests/api-extractor-scenarios/etc/referenceTokens/api-extractor-scenarios.api.json b/build-tests/api-extractor-scenarios/etc/referenceTokens/api-extractor-scenarios.api.json
@@ -476,6 +476,7 @@
               "text": " "
             }
           ],
+          "fileUrlPath": "src/referenceTokens/index.ts",
           "releaseTag": "Public",
           "name": "SomeClass4",
           "preserveMemberOrder": false,
@@ -756,6 +757,7 @@
               "text": ";"
             }
           ],
+          "fileUrlPath": "src/referenceTokens/index.ts",
           "returnTypeTokenRange": {
             "startIndex": 3,
             "endIndex": 4
@@ -784,6 +786,7 @@
               "text": "export interface SomeInterface1 "
             }
           ],
+          "fileUrlPath": "src/referenceTokens/index.ts",
           "releaseTag": "Public",
           "name": "SomeInterface1",
           "preserveMemberOrder": false,