Skip to content

Commit 9730eac

Browse files
iclantoniclanton
committed
Merge branch 'master' into ianc/bump-cyclics
2 parents fe7c385 + 24cf755 commit 9730eac

109 files changed

Lines changed: 864 additions & 173 deletions

File tree

Some content is hidden

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

‎apps/api-documenter/CHANGELOG.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
{
22
"name": "@microsoft/api-documenter",
33
"entries": [
4+
{
5+
"version": "7.0.24",
6+
"tag": "@microsoft/api-documenter_v7.0.24",
7+
"date": "Mon, 11 Feb 2019 10:32:37 GMT",
8+
"comments": {
9+
"dependency": [
10+
{
11+
"comment": "Updating dependency \"@microsoft/api-extractor\" from `7.0.16` to `7.0.17`"
12+
},
13+
{
14+
"comment": "Updating dependency \"@microsoft/rush-stack-compiler-3.0\" from `0.5.1` to `0.5.2`"
15+
},
16+
{
17+
"comment": "Updating dependency \"@microsoft/node-library-build\" from `6.0.28` to `6.0.29`"
18+
}
19+
]
20+
}
21+
},
422
{
523
"version": "7.0.23",
624
"tag": "@microsoft/api-documenter_v7.0.23",

‎apps/api-documenter/CHANGELOG.md‎

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

3-
This log was last generated on Mon, 11 Feb 2019 08:55:57 GMT and should not be manually modified.
3+
This log was last generated on Mon, 11 Feb 2019 10:32:37 GMT and should not be manually modified.
4+
5+
## 7.0.24
6+
Mon, 11 Feb 2019 10:32:37 GMT
7+
8+
*Version update only*
49

510
## 7.0.23
611
Mon, 11 Feb 2019 08:55:57 GMT

‎apps/api-documenter/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-documenter",
3-
"version": "7.0.23",
3+
"version": "7.0.24",
44
"description": "Read JSON files from api-extractor, generate documentation pages",
55
"repository": {
66
"type": "git",
@@ -15,16 +15,16 @@
1515
"api-documenter": "./bin/api-documenter"
1616
},
1717
"dependencies": {
18-
"@microsoft/api-extractor": "7.0.16",
18+
"@microsoft/api-extractor": "7.0.17",
1919
"@microsoft/node-core-library": "3.10.0",
2020
"@microsoft/ts-command-line": "4.2.3",
2121
"@microsoft/tsdoc": "0.12.5",
2222
"colors": "~1.2.1",
2323
"js-yaml": "~3.9.1"
2424
},
2525
"devDependencies": {
26-
"@microsoft/rush-stack-compiler-3.1": "0.5.1",
27-
"@microsoft/node-library-build": "6.0.28",
26+
"@microsoft/rush-stack-compiler-3.1": "0.5.2",
27+
"@microsoft/node-library-build": "6.0.29",
2828
"@types/js-yaml": "3.9.1",
2929
"@types/node": "8.5.8",
3030
"gulp": "~3.9.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"run",
8181
"--local",
8282
"--config",
83-
"./temp/configs/api-extractor-defaultExportOfEntryPoint1.json"
83+
"./temp/configs/api-extractor-typeof.json"
8484
],
8585
"sourceMaps": true
8686
},

‎apps/api-extractor/CHANGELOG.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@microsoft/api-extractor",
33
"entries": [
4+
{
5+
"version": "7.0.17",
6+
"tag": "@microsoft/api-extractor_v7.0.17",
7+
"date": "Mon, 11 Feb 2019 10:32:37 GMT",
8+
"comments": {
9+
"patch": [
10+
{
11+
"comment": "Fix an issue where API Extractor neglected to analyze \"typeof\" expressions"
12+
},
13+
{
14+
"comment": "Fix an issue where declarations inside a namespace were sometimes being incorrectly emitted as top-level exports of the .d.ts rollup"
15+
}
16+
]
17+
}
18+
},
419
{
520
"version": "7.0.16",
621
"tag": "@microsoft/api-extractor_v7.0.16",

‎apps/api-extractor/CHANGELOG.md‎

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

3-
This log was last generated on Mon, 11 Feb 2019 08:55:57 GMT and should not be manually modified.
3+
This log was last generated on Mon, 11 Feb 2019 10:32:37 GMT and should not be manually modified.
4+
5+
## 7.0.17
6+
Mon, 11 Feb 2019 10:32:37 GMT
7+
8+
### Patches
9+
10+
- Fix an issue where API Extractor neglected to analyze "typeof" expressions
11+
- Fix an issue where declarations inside a namespace were sometimes being incorrectly emitted as top-level exports of the .d.ts rollup
412

513
## 7.0.16
614
Mon, 11 Feb 2019 08:55:57 GMT

‎apps/api-extractor/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/api-extractor",
3-
"version": "7.0.16",
3+
"version": "7.0.17",
44
"description": "Validate, document, and review the exported API for a TypeScript library",
55
"keywords": [
66
"typescript",
@@ -47,7 +47,7 @@
4747
"tslint-microsoft-contrib": "~5.2.1",
4848
"@types/lodash": "4.14.116",
4949
"gulp": "~3.9.1",
50-
"@microsoft/node-library-build": "6.0.28",
50+
"@microsoft/node-library-build": "6.0.29",
5151
"@types/jest": "23.3.11"
5252
}
5353
}

‎apps/api-extractor/src/analyzer/AstSymbolTable.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export class AstSymbolTable {
210210
case ts.SyntaxKind.TypeReference: // general type references
211211
case ts.SyntaxKind.ExpressionWithTypeArguments: // special case for e.g. the "extends" keyword
212212
case ts.SyntaxKind.ComputedPropertyName: // used for EcmaScript "symbols", e.g. "[toPrimitive]".
213+
case ts.SyntaxKind.TypeQuery: // represents for "typeof X" as a type
213214
{
214215
// Sometimes the type reference will involve multiple identifiers, e.g. "a.b.C".
215216
// In this case, we only need to worry about importing the first identifier,

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,17 @@ export class Collector {
314314
if (astEntity instanceof AstSymbol) {
315315
astEntity.forEachDeclarationRecursive((astDeclaration: AstDeclaration) => {
316316
for (const referencedAstEntity of astDeclaration.referencedAstEntities) {
317-
this._createCollectorEntity(referencedAstEntity, undefined);
317+
if (referencedAstEntity instanceof AstSymbol) {
318+
// We only create collector entities for root-level symbols.
319+
// For example, if a symbols is nested inside a namespace, only the root-level namespace
320+
// get a collector entity
321+
if (referencedAstEntity.parentAstSymbol === undefined) {
322+
this._createCollectorEntity(referencedAstEntity, undefined);
323+
}
324+
} else {
325+
this._createCollectorEntity(referencedAstEntity, undefined);
326+
}
327+
318328
this._createEntityForIndirectReferences(referencedAstEntity, alreadySeenAstEntities);
319329
}
320330
});

‎apps/rush-lib/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"license": "MIT",
2323
"dependencies": {
2424
"@microsoft/node-core-library": "3.10.0",
25-
"@microsoft/package-deps-hash": "2.2.119",
26-
"@microsoft/stream-collator": "3.0.34",
25+
"@microsoft/package-deps-hash": "2.2.120",
26+
"@microsoft/stream-collator": "3.0.35",
2727
"@microsoft/ts-command-line": "4.2.3",
2828
"@pnpm/link-bins": "~1.0.1",
2929
"@pnpm/logger": "~1.0.1",
@@ -49,8 +49,8 @@
4949
"z-schema": "~3.18.3"
5050
},
5151
"devDependencies": {
52-
"@microsoft/rush-stack-compiler-3.1": "0.5.1",
53-
"@microsoft/node-library-build": "6.0.28",
52+
"@microsoft/rush-stack-compiler-3.1": "0.5.2",
53+
"@microsoft/node-library-build": "6.0.29",
5454
"@types/node": "8.5.8",
5555
"@types/node-fetch": "1.6.9",
5656
"@types/tar": "4.0.0",

0 commit comments

Comments
 (0)