Skip to content

Commit e11d0c4

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into relm/upgrade_ts_eslint
# Conflicts: # build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml # common/config/rush/pnpm-lock.yaml # common/config/rush/repo-state.json
2 parents 7c74c5c + 76f12a1 commit e11d0c4

File tree

294 files changed

+8495
-4355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+8495
-4355
lines changed

apps/api-documenter/CHANGELOG.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,96 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.13.30",
6+
"tag": "@microsoft/api-documenter_v7.13.30",
7+
"date": "Thu, 08 Jul 2021 23:41:17 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@rushstack/heft\" to `0.34.5`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.10`"
15+
}
16+
]
17+
}
18+
},
19+
{
20+
"version": "7.13.29",
21+
"tag": "@microsoft/api-documenter_v7.13.29",
22+
"date": "Thu, 08 Jul 2021 06:00:48 GMT",
23+
"comments": {
24+
"dependency": [
25+
{
26+
"comment": "Updating dependency \"@rushstack/heft\" to `0.34.4`"
27+
},
28+
{
29+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.9`"
30+
}
31+
]
32+
}
33+
},
34+
{
35+
"version": "7.13.28",
36+
"tag": "@microsoft/api-documenter_v7.13.28",
37+
"date": "Thu, 01 Jul 2021 15:08:27 GMT",
38+
"comments": {
39+
"dependency": [
40+
{
41+
"comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.8.0`"
42+
},
43+
{
44+
"comment": "Updating dependency \"@rushstack/heft\" to `0.34.3`"
45+
},
46+
{
47+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.8`"
48+
}
49+
]
50+
}
51+
},
52+
{
53+
"version": "7.13.27",
54+
"tag": "@microsoft/api-documenter_v7.13.27",
55+
"date": "Wed, 30 Jun 2021 19:16:19 GMT",
56+
"comments": {
57+
"dependency": [
58+
{
59+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.7`"
60+
}
61+
]
62+
}
63+
},
64+
{
65+
"version": "7.13.26",
66+
"tag": "@microsoft/api-documenter_v7.13.26",
67+
"date": "Wed, 30 Jun 2021 15:06:54 GMT",
68+
"comments": {
69+
"dependency": [
70+
{
71+
"comment": "Updating dependency \"@rushstack/heft\" to `0.34.2`"
72+
},
73+
{
74+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.6`"
75+
}
76+
]
77+
}
78+
},
79+
{
80+
"version": "7.13.25",
81+
"tag": "@microsoft/api-documenter_v7.13.25",
82+
"date": "Wed, 30 Jun 2021 01:37:17 GMT",
83+
"comments": {
84+
"dependency": [
85+
{
86+
"comment": "Updating dependency \"@rushstack/heft\" to `0.34.1`"
87+
},
88+
{
89+
"comment": "Updating dependency \"@rushstack/heft-node-rig\" to `1.1.5`"
90+
}
91+
]
92+
}
93+
},
494
{
595
"version": "7.13.24",
696
"tag": "@microsoft/api-documenter_v7.13.24",

apps/api-documenter/CHANGELOG.md

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
# Change Log - @microsoft/api-documenter
22

3-
This log was last generated on Fri, 25 Jun 2021 00:08:28 GMT and should not be manually modified.
3+
This log was last generated on Thu, 08 Jul 2021 23:41:17 GMT and should not be manually modified.
4+
5+
## 7.13.30
6+
Thu, 08 Jul 2021 23:41:17 GMT
7+
8+
_Version update only_
9+
10+
## 7.13.29
11+
Thu, 08 Jul 2021 06:00:48 GMT
12+
13+
_Version update only_
14+
15+
## 7.13.28
16+
Thu, 01 Jul 2021 15:08:27 GMT
17+
18+
_Version update only_
19+
20+
## 7.13.27
21+
Wed, 30 Jun 2021 19:16:19 GMT
22+
23+
_Version update only_
24+
25+
## 7.13.26
26+
Wed, 30 Jun 2021 15:06:54 GMT
27+
28+
_Version update only_
29+
30+
## 7.13.25
31+
Wed, 30 Jun 2021 01:37:17 GMT
32+
33+
_Version update only_
434

535
## 7.13.24
636
Fri, 25 Jun 2021 00:08:28 GMT

apps/api-documenter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-documenter",
3-
"version": "7.13.24",
3+
"version": "7.13.30",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",

apps/api-extractor/.vscode/launch.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@
7474
"name": "scenario",
7575
"program": "${workspaceFolder}/lib/start.js",
7676
"cwd": "${workspaceFolder}/../../build-tests/api-extractor-scenarios",
77-
"args": ["--debug", "run", "--local", "--config", "./temp/configs/api-extractor-typeof.json"],
77+
"args": [
78+
"--debug",
79+
"run",
80+
"--local",
81+
"--config",
82+
"./temp/configs/api-extractor-spanSorting.json"
83+
],
7884
"sourceMaps": true
7985
}
8086
]

apps/api-extractor/CHANGELOG.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,62 @@
11
{
22
"name": "@microsoft/api-extractor",
33
"entries": [
4+
{
5+
"version": "7.18.1",
6+
"tag": "@microsoft/api-extractor_v7.18.1",
7+
"date": "Thu, 08 Jul 2021 23:41:16 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "Fix a recent regression that reported \"Internal Error: indentDocComment cannot be nested\" (GitHub #2797)"
12+
}
13+
]
14+
}
15+
},
16+
{
17+
"version": "7.18.0",
18+
"tag": "@microsoft/api-extractor_v7.18.0",
19+
"date": "Thu, 08 Jul 2021 06:00:48 GMT",
20+
"comments": {
21+
"minor": [
22+
{
23+
"comment": "Add support for import() type expressions (GitHub #1050) -- Thank you @javier-garcia-meteologica and @adventure-yunfei for solving this difficult problem!"
24+
},
25+
{
26+
"comment": "Improve formatting of declarations in .d.ts rollup and .api.md files, fixing some indentation issues"
27+
}
28+
]
29+
}
30+
},
31+
{
32+
"version": "7.17.1",
33+
"tag": "@microsoft/api-extractor_v7.17.1",
34+
"date": "Thu, 01 Jul 2021 15:08:27 GMT",
35+
"comments": {
36+
"dependency": [
37+
{
38+
"comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.8.0`"
39+
}
40+
]
41+
}
42+
},
43+
{
44+
"version": "7.17.0",
45+
"tag": "@microsoft/api-extractor_v7.17.0",
46+
"date": "Wed, 30 Jun 2021 15:06:54 GMT",
47+
"comments": {
48+
"minor": [
49+
{
50+
"comment": "Added support for \"import * as module from './local/module';\" (GitHub #1029) -- Big thanks to @adventure-yunfei, @mckn, @rbuckton, and @octogonz who all helped with this difficult PR!"
51+
}
52+
],
53+
"patch": [
54+
{
55+
"comment": "Include /// directives in API report"
56+
}
57+
]
58+
}
59+
},
460
{
561
"version": "7.16.1",
662
"tag": "@microsoft/api-extractor_v7.16.1",

apps/api-extractor/CHANGELOG.md

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,37 @@
11
# Change Log - @microsoft/api-extractor
22

3-
This log was last generated on Fri, 04 Jun 2021 19:59:53 GMT and should not be manually modified.
3+
This log was last generated on Thu, 08 Jul 2021 23:41:16 GMT and should not be manually modified.
4+
5+
## 7.18.1
6+
Thu, 08 Jul 2021 23:41:16 GMT
7+
8+
### Patches
9+
10+
- Fix a recent regression that reported "Internal Error: indentDocComment cannot be nested" (GitHub #2797)
11+
12+
## 7.18.0
13+
Thu, 08 Jul 2021 06:00:48 GMT
14+
15+
### Minor changes
16+
17+
- Add support for import() type expressions (GitHub #1050) -- Thank you @javier-garcia-meteologica and @adventure-yunfei for solving this difficult problem!
18+
- Improve formatting of declarations in .d.ts rollup and .api.md files, fixing some indentation issues
19+
20+
## 7.17.1
21+
Thu, 01 Jul 2021 15:08:27 GMT
22+
23+
_Version update only_
24+
25+
## 7.17.0
26+
Wed, 30 Jun 2021 15:06:54 GMT
27+
28+
### Minor changes
29+
30+
- Added support for "import * as module from './local/module';" (GitHub #1029) -- Big thanks to @adventure-yunfei, @mckn, @rbuckton, and @octogonz who all helped with this difficult PR!
31+
32+
### Patches
33+
34+
- Include /// directives in API report
435

536
## 7.16.1
637
Fri, 04 Jun 2021 19:59:53 GMT

apps/api-extractor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-extractor",
3-
"version": "7.16.1",
3+
"version": "7.18.1",
44
"description": "Analyze the exported API for a TypeScript library and generate reviews, documentation, and .d.ts rollups",
55
"keywords": [
66
"typescript",

apps/api-extractor/src/analyzer/AstDeclaration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as ts from 'typescript';
55
import { AstSymbol } from './AstSymbol';
66
import { Span } from './Span';
77
import { InternalError } from '@rushstack/node-core-library';
8-
import { AstEntity } from './AstSymbolTable';
8+
import { AstEntity } from './AstEntity';
99

1010
/**
1111
* Constructor options for AstDeclaration
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
2+
// See LICENSE in the project root for license information.
3+
4+
/**
5+
* `AstEntity` is the abstract base class for analyzer objects that can become a `CollectorEntity`.
6+
*
7+
* @remarks
8+
*
9+
* The subclasses are:
10+
* ```
11+
* - AstEntity
12+
* - AstSymbol
13+
* - AstSyntheticEntity
14+
* - AstImport
15+
* - AstNamespaceImport
16+
* ```
17+
*/
18+
export abstract class AstEntity {
19+
/**
20+
* The original name of the symbol, as exported from the module (i.e. source file)
21+
* containing the original TypeScript definition. Constructs such as
22+
* `import { X as Y } from` may introduce other names that differ from the local name.
23+
*
24+
* @remarks
25+
* For the most part, `localName` corresponds to `followedSymbol.name`, but there
26+
* are some edge cases. For example, the ts.Symbol.name for `export default class X { }`
27+
* is actually `"default"`, not `"X"`.
28+
*/
29+
public abstract readonly localName: string;
30+
}
31+
32+
/**
33+
* `AstSyntheticEntity` is the abstract base class for analyzer objects whose emitted declarations
34+
* are not text transformations performed by the `Span` helper.
35+
*
36+
* @remarks
37+
* Most of API Extractor's output is produced by using the using the `Span` utility to regurgitate strings from
38+
* the input .d.ts files. If we need to rename an identifier, the `Span` visitor can pick out an interesting
39+
* node and rewrite its string, but otherwise the transformation operates on dumb text and not compiler concepts.
40+
* (Historically we did this because the compiler's emitter was an internal API, but it still has some advantages,
41+
* for example preserving syntaxes generated by an older compiler to avoid incompatibilities.)
42+
*
43+
* This strategy does not work for cases where the output looks very different from the input. Today these
44+
* cases are always kinds of `import` statements, but that may change in the future.
45+
*/
46+
export abstract class AstSyntheticEntity extends AstEntity {}

0 commit comments

Comments
 (0)