Skip to content

Commit 920a125

Browse files
zelliottzelliott
committed
Rebased off of recent changes
1 parent 1178704 commit 920a125

File tree

7 files changed

+44
-6
lines changed

7 files changed

+44
-6
lines changed

‎apps/api-extractor/src/collector/MessageRouter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ export class MessageRouter {
639639
* Sorts an array of messages according to a reasonable ordering
640640
*/
641641
private _sortMessagesForOutput(messages: ExtractorMessage[]): void {
642-
LegacyAdapters.sortStable(messages, (a: ExtractorMessage, b: ExtractorMessage) => {
642+
messages.sort((a, b) => {
643643
let diff: number;
644644
// First sort by file name
645645
diff = Sort.compareByValue(a.sourceFilePath, b.sourceFilePath);

‎build-tests/api-extractor-scenarios/etc/docReferencesAlias/api-extractor-scenarios.api.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"metadata": {
33
"toolPackage": "@microsoft/api-extractor",
44
"toolVersion": "[test mode]",
5-
"schemaVersion": 1009,
5+
"schemaVersion": 1010,
66
"oldestForwardsCompatibleVersion": 1001,
77
"tsdocConfig": {
88
"$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -182,6 +182,7 @@
182182
"text": "export default class Item "
183183
}
184184
],
185+
"fileUrlPath": "src/docReferencesAlias/Item.ts",
185186
"releaseTag": "Public",
186187
"name": "Item",
187188
"preserveMemberOrder": false,
@@ -229,6 +230,7 @@
229230
"text": "export default interface Options "
230231
}
231232
],
233+
"fileUrlPath": "src/docReferencesAlias/Options.ts",
232234
"releaseTag": "Public",
233235
"name": "renamed_Options",
234236
"preserveMemberOrder": false,

‎build-tests/api-extractor-scenarios/etc/docReferencesNamespaceAlias/api-extractor-scenarios.api.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"metadata": {
33
"toolPackage": "@microsoft/api-extractor",
44
"toolVersion": "[test mode]",
5-
"schemaVersion": 1009,
5+
"schemaVersion": 1010,
66
"oldestForwardsCompatibleVersion": 1001,
77
"tsdocConfig": {
88
"$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -182,6 +182,7 @@
182182
"text": "export default class Item "
183183
}
184184
],
185+
"fileUrlPath": "src/docReferencesNamespaceAlias/Item.ts",
185186
"releaseTag": "Public",
186187
"name": "Item",
187188
"preserveMemberOrder": false,
@@ -224,6 +225,7 @@
224225
"canonicalReference": "api-extractor-scenarios!renamed:namespace",
225226
"docComment": "",
226227
"excerptTokens": [],
228+
"fileUrlPath": "src/docReferencesNamespaceAlias/index.ts",
227229
"releaseTag": "None",
228230
"name": "renamed",
229231
"preserveMemberOrder": false,
@@ -238,6 +240,7 @@
238240
"text": "export default interface Options "
239241
}
240242
],
243+
"fileUrlPath": "src/docReferencesNamespaceAlias/renamed/Options.ts",
241244
"releaseTag": "Public",
242245
"name": "Options",
243246
"preserveMemberOrder": false,
@@ -332,6 +335,7 @@
332335
"canonicalReference": "api-extractor-scenarios!renamed.sub:namespace",
333336
"docComment": "",
334337
"excerptTokens": [],
338+
"fileUrlPath": "src/docReferencesNamespaceAlias/renamed/index.ts",
335339
"releaseTag": "None",
336340
"name": "sub",
337341
"preserveMemberOrder": false,
@@ -346,6 +350,7 @@
346350
"text": "export default interface SubOptions "
347351
}
348352
],
353+
"fileUrlPath": "src/docReferencesNamespaceAlias/renamed/sub/SubOptions.ts",
349354
"releaseTag": "Public",
350355
"name": "SubOptions",
351356
"preserveMemberOrder": false,

‎build-tests/api-extractor-scenarios/etc/includeForgottenExports/api-extractor-scenarios.api.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"metadata": {
33
"toolPackage": "@microsoft/api-extractor",
44
"toolVersion": "[test mode]",
5-
"schemaVersion": 1009,
5+
"schemaVersion": 1010,
66
"oldestForwardsCompatibleVersion": 1001,
77
"tsdocConfig": {
88
"$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -182,6 +182,7 @@
182182
"text": "declare class AnotherDuplicateName "
183183
}
184184
],
185+
"fileUrlPath": "src/includeForgottenExports/internal1.ts",
185186
"releaseTag": "Public",
186187
"name": "AnotherDuplicateName_2",
187188
"preserveMemberOrder": false,
@@ -198,6 +199,7 @@
198199
"text": "declare class AnotherDuplicateName "
199200
}
200201
],
202+
"fileUrlPath": "src/includeForgottenExports/index.ts",
201203
"releaseTag": "Public",
202204
"name": "AnotherDuplicateName",
203205
"preserveMemberOrder": false,
@@ -222,6 +224,7 @@
222224
"text": ";"
223225
}
224226
],
227+
"fileUrlPath": "src/includeForgottenExports/internal1.ts",
225228
"releaseTag": "Public",
226229
"name": "DuplicateName_2",
227230
"typeTokenRange": {
@@ -247,6 +250,7 @@
247250
"text": ";"
248251
}
249252
],
253+
"fileUrlPath": "src/includeForgottenExports/index.ts",
250254
"releaseTag": "Public",
251255
"name": "DuplicateName",
252256
"typeTokenRange": {
@@ -264,6 +268,7 @@
264268
"text": "declare class ForgottenExport1 "
265269
}
266270
],
271+
"fileUrlPath": "src/includeForgottenExports/index.ts",
267272
"releaseTag": "Public",
268273
"name": "ForgottenExport1",
269274
"preserveMemberOrder": false,
@@ -334,6 +339,7 @@
334339
"text": ";"
335340
}
336341
],
342+
"fileUrlPath": "src/includeForgottenExports/index.ts",
337343
"releaseTag": "Public",
338344
"name": "ForgottenExport2",
339345
"typeTokenRange": {
@@ -351,6 +357,7 @@
351357
"text": "declare namespace ForgottenExport4 "
352358
}
353359
],
360+
"fileUrlPath": "src/includeForgottenExports/index.ts",
354361
"releaseTag": "Public",
355362
"name": "ForgottenExport4",
356363
"preserveMemberOrder": false,
@@ -383,6 +390,7 @@
383390
"text": "export declare class ForgottenExport6 "
384391
}
385392
],
393+
"fileUrlPath": "src/includeForgottenExports/internal2.ts",
386394
"releaseTag": "Public",
387395
"name": "ForgottenExport6",
388396
"preserveMemberOrder": false,
@@ -394,6 +402,7 @@
394402
"canonicalReference": "api-extractor-scenarios!~internal2:namespace",
395403
"docComment": "",
396404
"excerptTokens": [],
405+
"fileUrlPath": "src/includeForgottenExports/index.ts",
397406
"releaseTag": "None",
398407
"name": "internal2",
399408
"preserveMemberOrder": false,
@@ -408,6 +417,7 @@
408417
"text": "export declare class ForgottenExport6 "
409418
}
410419
],
420+
"fileUrlPath": "src/includeForgottenExports/internal2.ts",
411421
"releaseTag": "Public",
412422
"name": "ForgottenExport6",
413423
"preserveMemberOrder": false,
@@ -435,6 +445,7 @@
435445
"text": ";"
436446
}
437447
],
448+
"fileUrlPath": "src/includeForgottenExports/index.ts",
438449
"returnTypeTokenRange": {
439450
"startIndex": 1,
440451
"endIndex": 2
@@ -463,6 +474,7 @@
463474
"text": ";"
464475
}
465476
],
477+
"fileUrlPath": "src/includeForgottenExports/internal1.ts",
466478
"returnTypeTokenRange": {
467479
"startIndex": 1,
468480
"endIndex": 2
@@ -491,6 +503,7 @@
491503
"text": ";"
492504
}
493505
],
506+
"fileUrlPath": "src/includeForgottenExports/index.ts",
494507
"returnTypeTokenRange": {
495508
"startIndex": 1,
496509
"endIndex": 2
@@ -519,6 +532,7 @@
519532
"text": ";"
520533
}
521534
],
535+
"fileUrlPath": "src/includeForgottenExports/index.ts",
522536
"returnTypeTokenRange": {
523537
"startIndex": 1,
524538
"endIndex": 2
@@ -547,6 +561,7 @@
547561
"text": ";"
548562
}
549563
],
564+
"fileUrlPath": "src/includeForgottenExports/index.ts",
550565
"returnTypeTokenRange": {
551566
"startIndex": 1,
552567
"endIndex": 2
@@ -575,6 +590,7 @@
575590
"text": ";"
576591
}
577592
],
593+
"fileUrlPath": "src/includeForgottenExports/internal1.ts",
578594
"returnTypeTokenRange": {
579595
"startIndex": 1,
580596
"endIndex": 2
@@ -594,6 +610,7 @@
594610
"text": "export declare namespace SomeNamespace1 "
595611
}
596612
],
613+
"fileUrlPath": "src/includeForgottenExports/index.ts",
597614
"releaseTag": "Public",
598615
"name": "SomeNamespace1",
599616
"preserveMemberOrder": false,

‎build-tests/api-extractor-scenarios/etc/namespaceImports/api-extractor-scenarios.api.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"metadata": {
33
"toolPackage": "@microsoft/api-extractor",
44
"toolVersion": "[test mode]",
5-
"schemaVersion": 1009,
5+
"schemaVersion": 1010,
66
"oldestForwardsCompatibleVersion": 1001,
77
"tsdocConfig": {
88
"$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -177,6 +177,7 @@
177177
"canonicalReference": "api-extractor-scenarios!i1:namespace",
178178
"docComment": "",
179179
"excerptTokens": [],
180+
"fileUrlPath": "src/namespaceImports/index.ts",
180181
"releaseTag": "None",
181182
"name": "i1",
182183
"preserveMemberOrder": false,
@@ -186,6 +187,7 @@
186187
"canonicalReference": "api-extractor-scenarios!i1.internal:namespace",
187188
"docComment": "",
188189
"excerptTokens": [],
190+
"fileUrlPath": "src/namespaceImports/intermediate1.ts",
189191
"releaseTag": "None",
190192
"name": "internal",
191193
"preserveMemberOrder": false,
@@ -200,6 +202,7 @@
200202
"text": "export declare class SomeClass "
201203
}
202204
],
205+
"fileUrlPath": "src/namespaceImports/internal.ts",
203206
"releaseTag": "Public",
204207
"name": "SomeClass",
205208
"preserveMemberOrder": false,
@@ -215,6 +218,7 @@
215218
"canonicalReference": "api-extractor-scenarios!i2:namespace",
216219
"docComment": "",
217220
"excerptTokens": [],
221+
"fileUrlPath": "src/namespaceImports/index.ts",
218222
"releaseTag": "None",
219223
"name": "i2",
220224
"preserveMemberOrder": false,
@@ -224,6 +228,7 @@
224228
"canonicalReference": "api-extractor-scenarios!i2.internal:namespace",
225229
"docComment": "",
226230
"excerptTokens": [],
231+
"fileUrlPath": "src/namespaceImports/intermediate1.ts",
227232
"releaseTag": "None",
228233
"name": "internal",
229234
"preserveMemberOrder": false,
@@ -238,6 +243,7 @@
238243
"text": "export declare class SomeClass "
239244
}
240245
],
246+
"fileUrlPath": "src/namespaceImports/internal.ts",
241247
"releaseTag": "Public",
242248
"name": "SomeClass",
243249
"preserveMemberOrder": false,
@@ -267,6 +273,7 @@
267273
"text": ";"
268274
}
269275
],
276+
"fileUrlPath": "src/namespaceImports/index.ts",
270277
"returnTypeTokenRange": {
271278
"startIndex": 1,
272279
"endIndex": 2

‎build-tests/api-extractor-scenarios/etc/namespaceImports2/api-extractor-scenarios.api.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"metadata": {
33
"toolPackage": "@microsoft/api-extractor",
44
"toolVersion": "[test mode]",
5-
"schemaVersion": 1009,
5+
"schemaVersion": 1010,
66
"oldestForwardsCompatibleVersion": 1001,
77
"tsdocConfig": {
88
"$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
@@ -177,6 +177,7 @@
177177
"canonicalReference": "api-extractor-scenarios!internal:namespace",
178178
"docComment": "",
179179
"excerptTokens": [],
180+
"fileUrlPath": "src/namespaceImports2/index.ts",
180181
"releaseTag": "None",
181182
"name": "internal",
182183
"preserveMemberOrder": false,
@@ -191,6 +192,7 @@
191192
"text": "export declare class SomeClass "
192193
}
193194
],
195+
"fileUrlPath": "src/namespaceImports2/internal.ts",
194196
"releaseTag": "Public",
195197
"name": "SomeClass",
196198
"preserveMemberOrder": false,
@@ -209,6 +211,7 @@
209211
"text": "export declare class SomeClass "
210212
}
211213
],
214+
"fileUrlPath": "src/namespaceImports2/internal.ts",
212215
"releaseTag": "Public",
213216
"name": "SomeClass",
214217
"preserveMemberOrder": false,
@@ -234,6 +237,7 @@
234237
"text": ";"
235238
}
236239
],
240+
"fileUrlPath": "src/namespaceImports2/index.ts",
237241
"returnTypeTokenRange": {
238242
"startIndex": 1,
239243
"endIndex": 2

‎build-tests/api-extractor-scenarios/etc/referenceTokens/api-extractor-scenarios.api.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@
476476
"text": " "
477477
}
478478
],
479+
"fileUrlPath": "src/referenceTokens/index.ts",
479480
"releaseTag": "Public",
480481
"name": "SomeClass4",
481482
"preserveMemberOrder": false,
@@ -756,6 +757,7 @@
756757
"text": ";"
757758
}
758759
],
760+
"fileUrlPath": "src/referenceTokens/index.ts",
759761
"returnTypeTokenRange": {
760762
"startIndex": 3,
761763
"endIndex": 4
@@ -784,6 +786,7 @@
784786
"text": "export interface SomeInterface1 "
785787
}
786788
],
789+
"fileUrlPath": "src/referenceTokens/index.ts",
787790
"releaseTag": "Public",
788791
"name": "SomeInterface1",
789792
"preserveMemberOrder": false,

0 commit comments

Comments
 (0)