Skip to content

Commit d222c95

Browse files
RyanCavanaughRyanCavanaugh
authored
Merge pull request #26520 from RyanCavanaugh/release-3.0.2
Release 3.0.2
2 parents 9b95d56 + dde51ef commit d222c95

19 files changed

+245
-985
lines changed

‎lib/lib.dom.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14132,6 +14132,7 @@ interface Storage {
1413214132
* storage[key] = value
1413314133
*/
1413414134
setItem(key: string, value: string): void;
14135+
[name: string]: any;
1413514136
}
1413614137

1413714138
declare var Storage: {

‎lib/tsc.js‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
6060
var ts;
6161
(function (ts) {
6262
ts.versionMajorMinor = "3.0";
63-
ts.version = ts.versionMajorMinor + ".1";
63+
ts.version = ts.versionMajorMinor + ".2";
6464
})(ts || (ts = {}));
6565
(function (ts) {
6666
function createDictionaryObject() {
@@ -27809,19 +27809,23 @@ var ts;
2780927809
return createAnonymousType(symbol, exports_1, ts.emptyArray, ts.emptyArray, jsObjectLiteralIndexInfo, undefined);
2781027810
}
2781127811
}
27812-
function getAnnotatedAccessorType(accessor) {
27812+
function getAnnotatedAccessorTypeNode(accessor) {
2781327813
if (accessor) {
2781427814
if (accessor.kind === 156) {
2781527815
var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
27816-
return getterTypeAnnotation && getTypeFromTypeNode(getterTypeAnnotation);
27816+
return getterTypeAnnotation;
2781727817
}
2781827818
else {
2781927819
var setterTypeAnnotation = ts.getEffectiveSetAccessorTypeAnnotationNode(accessor);
27820-
return setterTypeAnnotation && getTypeFromTypeNode(setterTypeAnnotation);
27820+
return setterTypeAnnotation;
2782127821
}
2782227822
}
2782327823
return undefined;
2782427824
}
27825+
function getAnnotatedAccessorType(accessor) {
27826+
var node = getAnnotatedAccessorTypeNode(accessor);
27827+
return node && getTypeFromTypeNode(node);
27828+
}
2782527829
function getAnnotatedAccessorThisParameter(accessor) {
2782627830
var parameter = getAccessorThisParameter(accessor);
2782727831
return parameter && parameter.symbol;
@@ -42059,9 +42063,13 @@ var ts;
4205942063
}
4206042064
}
4206142065
break;
42062-
case 154:
4206342066
case 156:
4206442067
case 157:
42068+
var otherKind = node.kind === 156 ? 157 : 156;
42069+
var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
42070+
markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
42071+
break;
42072+
case 154:
4206542073
for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
4206642074
var parameter = _c[_b];
4206742075
markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
@@ -53166,14 +53174,19 @@ var ts;
5316653174
}
5316753175
return false;
5316853176
}
53177+
function getAccessorTypeNode(node) {
53178+
var accessors = resolver.getAllAccessorDeclarations(node);
53179+
return accessors.setAccessor && ts.getSetAccessorTypeAnnotationNode(accessors.setAccessor)
53180+
|| accessors.getAccessor && ts.getEffectiveReturnTypeNode(accessors.getAccessor);
53181+
}
5316953182
function serializeTypeOfNode(node) {
5317053183
switch (node.kind) {
5317153184
case 152:
5317253185
case 149:
53173-
case 156:
5317453186
return serializeTypeNode(node.type);
5317553187
case 157:
53176-
return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
53188+
case 156:
53189+
return serializeTypeNode(getAccessorTypeNode(node));
5317753190
case 238:
5317853191
case 207:
5317953192
case 154:
@@ -61494,7 +61507,7 @@ var ts;
6149461507
}
6149561508
if (node.kind === 278) {
6149661509
isBundledEmit = true;
61497-
var refs_1 = ts.createMap();
61510+
refs = ts.createMap();
6149861511
var hasNoDefaultLib_1 = false;
6149961512
var bundle = ts.createBundle(ts.map(node.sourceFiles, function (sourceFile) {
6150061513
if (sourceFile.isDeclarationFile || ts.isSourceFileJavaScript(sourceFile))
@@ -61508,7 +61521,7 @@ var ts;
6150861521
getSymbolAccessibilityDiagnostic = throwDiagnostic;
6150961522
needsScopeFixMarker = false;
6151061523
resultHasScopeMarker = false;
61511-
collectReferences(sourceFile, refs_1);
61524+
collectReferences(sourceFile, refs);
6151261525
if (ts.isExternalModule(sourceFile)) {
6151361526
resultHasExternalModuleIndicator = false;
6151461527
needsDeclare = false;
@@ -61529,7 +61542,7 @@ var ts;
6152961542
bundle.hasNoDefaultLib = hasNoDefaultLib_1;
6153061543
var outputFilePath_1 = ts.getDirectoryPath(ts.normalizeSlashes(ts.getOutputPathsFor(node, host, true).declarationFilePath));
6153161544
var referenceVisitor_1 = mapReferencesIntoArray(bundle.syntheticFileReferences, outputFilePath_1);
61532-
refs_1.forEach(referenceVisitor_1);
61545+
refs.forEach(referenceVisitor_1);
6153361546
return bundle;
6153461547
}
6153561548
needsDeclare = true;
@@ -62229,6 +62242,15 @@ var ts;
6222962242
}
6223062243
return false;
6223162244
}
62245+
function isScopeMarker(node) {
62246+
return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
62247+
}
62248+
function hasScopeMarker(node) {
62249+
if (ts.isModuleBlock(node)) {
62250+
return ts.some(node.statements, isScopeMarker);
62251+
}
62252+
return false;
62253+
}
6223262254
function ensureModifiers(node, privateDeclaration) {
6223362255
var currentFlags = ts.getModifierFlags(node);
6223462256
var newFlags = ensureModifierFlags(node, privateDeclaration);
@@ -62242,7 +62264,7 @@ var ts;
6224262264
var additions = (needsDeclare && !isAlwaysType(node)) ? 2 : 0;
6224362265
var parentIsFile = node.parent.kind === 277;
6224462266
if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
62245-
mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) ? 0 : 1) | 512 | 2);
62267+
mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1) | 2);
6224662268
additions = 0;
6224762269
}
6224862270
return maskModifierFlags(node, mask, additions);
@@ -62299,6 +62321,9 @@ var ts;
6229962321
if (modifierMask === void 0) { modifierMask = 3071 ^ 4; }
6230062322
if (modifierAdditions === void 0) { modifierAdditions = 0; }
6230162323
var flags = (ts.getModifierFlags(node) & modifierMask) | modifierAdditions;
62324+
if (flags & 512 && !(flags & 1)) {
62325+
flags ^= 1;
62326+
}
6230262327
if (flags & 512 && flags & 2) {
6230362328
flags ^= 2;
6230462329
}

‎lib/tsserver.js‎

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var ts;
8888
// If changing the text in this section, be sure to test `configureNightly` too.
8989
ts.versionMajorMinor = "3.0";
9090
/** The version of the TypeScript compiler release */
91-
ts.version = ts.versionMajorMinor + ".1";
91+
ts.version = ts.versionMajorMinor + ".2";
9292
})(ts || (ts = {}));
9393
(function (ts) {
9494
/* @internal */
@@ -33849,19 +33849,23 @@ var ts;
3384933849
return createAnonymousType(symbol, exports_1, ts.emptyArray, ts.emptyArray, jsObjectLiteralIndexInfo, undefined);
3385033850
}
3385133851
}
33852-
function getAnnotatedAccessorType(accessor) {
33852+
function getAnnotatedAccessorTypeNode(accessor) {
3385333853
if (accessor) {
3385433854
if (accessor.kind === 156 /* GetAccessor */) {
3385533855
var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
33856-
return getterTypeAnnotation && getTypeFromTypeNode(getterTypeAnnotation);
33856+
return getterTypeAnnotation;
3385733857
}
3385833858
else {
3385933859
var setterTypeAnnotation = ts.getEffectiveSetAccessorTypeAnnotationNode(accessor);
33860-
return setterTypeAnnotation && getTypeFromTypeNode(setterTypeAnnotation);
33860+
return setterTypeAnnotation;
3386133861
}
3386233862
}
3386333863
return undefined;
3386433864
}
33865+
function getAnnotatedAccessorType(accessor) {
33866+
var node = getAnnotatedAccessorTypeNode(accessor);
33867+
return node && getTypeFromTypeNode(node);
33868+
}
3386533869
function getAnnotatedAccessorThisParameter(accessor) {
3386633870
var parameter = getAccessorThisParameter(accessor);
3386733871
return parameter && parameter.symbol;
@@ -50647,9 +50651,13 @@ var ts;
5064750651
}
5064850652
}
5064950653
break;
50650-
case 154 /* MethodDeclaration */:
5065150654
case 156 /* GetAccessor */:
5065250655
case 157 /* SetAccessor */:
50656+
var otherKind = node.kind === 156 /* GetAccessor */ ? 157 /* SetAccessor */ : 156 /* GetAccessor */;
50657+
var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
50658+
markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
50659+
break;
50660+
case 154 /* MethodDeclaration */:
5065350661
for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
5065450662
var parameter = _c[_b];
5065550663
markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
@@ -63980,6 +63988,11 @@ var ts;
6398063988
}
6398163989
return false;
6398263990
}
63991+
function getAccessorTypeNode(node) {
63992+
var accessors = resolver.getAllAccessorDeclarations(node);
63993+
return accessors.setAccessor && ts.getSetAccessorTypeAnnotationNode(accessors.setAccessor)
63994+
|| accessors.getAccessor && ts.getEffectiveReturnTypeNode(accessors.getAccessor);
63995+
}
6398363996
/**
6398463997
* Serializes the type of a node for use with decorator type metadata.
6398563998
*
@@ -63989,10 +64002,10 @@ var ts;
6398964002
switch (node.kind) {
6399064003
case 152 /* PropertyDeclaration */:
6399164004
case 149 /* Parameter */:
63992-
case 156 /* GetAccessor */:
6399364005
return serializeTypeNode(node.type);
6399464006
case 157 /* SetAccessor */:
63995-
return serializeTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
64007+
case 156 /* GetAccessor */:
64008+
return serializeTypeNode(getAccessorTypeNode(node));
6399664009
case 238 /* ClassDeclaration */:
6399764010
case 207 /* ClassExpression */:
6399864011
case 154 /* MethodDeclaration */:
@@ -76386,7 +76399,7 @@ var ts;
7638676399
}
7638776400
if (node.kind === 278 /* Bundle */) {
7638876401
isBundledEmit = true;
76389-
var refs_1 = ts.createMap();
76402+
refs = ts.createMap();
7639076403
var hasNoDefaultLib_1 = false;
7639176404
var bundle = ts.createBundle(ts.map(node.sourceFiles, function (sourceFile) {
7639276405
if (sourceFile.isDeclarationFile || ts.isSourceFileJavaScript(sourceFile))
@@ -76400,7 +76413,7 @@ var ts;
7640076413
getSymbolAccessibilityDiagnostic = throwDiagnostic;
7640176414
needsScopeFixMarker = false;
7640276415
resultHasScopeMarker = false;
76403-
collectReferences(sourceFile, refs_1);
76416+
collectReferences(sourceFile, refs);
7640476417
if (ts.isExternalModule(sourceFile)) {
7640576418
resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
7640676419
needsDeclare = false;
@@ -76421,7 +76434,7 @@ var ts;
7642176434
bundle.hasNoDefaultLib = hasNoDefaultLib_1;
7642276435
var outputFilePath_1 = ts.getDirectoryPath(ts.normalizeSlashes(ts.getOutputPathsFor(node, host, /*forceDtsPaths*/ true).declarationFilePath));
7642376436
var referenceVisitor_1 = mapReferencesIntoArray(bundle.syntheticFileReferences, outputFilePath_1);
76424-
refs_1.forEach(referenceVisitor_1);
76437+
refs.forEach(referenceVisitor_1);
7642576438
return bundle;
7642676439
}
7642776440
// Single source file
@@ -77198,6 +77211,15 @@ var ts;
7719877211
}
7719977212
return false;
7720077213
}
77214+
function isScopeMarker(node) {
77215+
return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
77216+
}
77217+
function hasScopeMarker(node) {
77218+
if (ts.isModuleBlock(node)) {
77219+
return ts.some(node.statements, isScopeMarker);
77220+
}
77221+
return false;
77222+
}
7720177223
function ensureModifiers(node, privateDeclaration) {
7720277224
var currentFlags = ts.getModifierFlags(node);
7720377225
var newFlags = ensureModifierFlags(node, privateDeclaration);
@@ -77211,7 +77233,7 @@ var ts;
7721177233
var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
7721277234
var parentIsFile = node.parent.kind === 277 /* SourceFile */;
7721377235
if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
77214-
mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) ? 0 : 1 /* Export */) | 512 /* Default */ | 2 /* Ambient */);
77236+
mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
7721577237
additions = 0 /* None */;
7721677238
}
7721777239
return maskModifierFlags(node, mask, additions);
@@ -77270,6 +77292,11 @@ var ts;
7727077292
if (modifierMask === void 0) { modifierMask = 3071 /* All */ ^ 4 /* Public */; }
7727177293
if (modifierAdditions === void 0) { modifierAdditions = 0 /* None */; }
7727277294
var flags = (ts.getModifierFlags(node) & modifierMask) | modifierAdditions;
77295+
if (flags & 512 /* Default */ && !(flags & 1 /* Export */)) {
77296+
// A non-exported default is a nonsequitor - we usually try to remove all export modifiers
77297+
// from statements in ambient declarations; but a default export must retain its export modifier to be syntactically valid
77298+
flags ^= 1 /* Export */;
77299+
}
7727377300
if (flags & 512 /* Default */ && flags & 2 /* Ambient */) {
7727477301
flags ^= 2 /* Ambient */; // `declare` is never required alongside `default` (and would be an error if printed)
7727577302
}
@@ -86912,6 +86939,7 @@ var ts;
8691286939
}
8691386940
ts.createWatchProgram = createWatchProgram;
8691486941
})(ts || (ts = {}));
86942+
/* @internal */
8691586943
var ts;
8691686944
(function (ts) {
8691786945
var minimumDate = new Date(-8640000000000000);

0 commit comments

Comments
 (0)