Skip to content

Commit a076e9e

Browse files
author
TypeScript Bot
committedMay 19, 2020

File tree

8 files changed

+236
-160
lines changed

8 files changed

+236
-160
lines changed
 

‎lib/tsc.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
6767
var ts;
6868
(function (ts) {
6969
ts.versionMajorMinor = "3.9";
70-
ts.version = "3.9.2";
70+
ts.version = "3.9.3";
7171
function tryGetNativeMap() {
7272
return typeof Map !== "undefined" && "entries" in Map.prototype ? Map : undefined;
7373
}
@@ -36320,7 +36320,7 @@ var ts;
3632036320
return type.resolvedProperties;
3632136321
}
3632236322
function getPropertiesOfType(type) {
36323-
type = getApparentType(getReducedType(type));
36323+
type = getReducedApparentType(type);
3632436324
return type.flags & 3145728 ?
3632536325
getPropertiesOfUnionOrIntersectionType(type) :
3632636326
getPropertiesOfObjectType(type);
@@ -36600,6 +36600,9 @@ var ts;
3660036600
t.flags & 2 && !strictNullChecks ? emptyObjectType :
3660136601
t;
3660236602
}
36603+
function getReducedApparentType(type) {
36604+
return getReducedType(getApparentType(getReducedType(type)));
36605+
}
3660336606
function createUnionOrIntersectionProperty(containingType, name) {
3660436607
var singleProp;
3660536608
var propSet;
@@ -36782,7 +36785,7 @@ var ts;
3678236785
return errorInfo;
3678336786
}
3678436787
function getPropertyOfType(type, name) {
36785-
type = getApparentType(getReducedType(type));
36788+
type = getReducedApparentType(type);
3678636789
if (type.flags & 524288) {
3678736790
var resolved = resolveStructuredTypeMembers(type);
3678836791
var symbol = resolved.members.get(name);
@@ -36814,7 +36817,7 @@ var ts;
3681436817
return ts.emptyArray;
3681536818
}
3681636819
function getSignaturesOfType(type, kind) {
36817-
return getSignaturesOfStructuredType(getApparentType(getReducedType(type)), kind);
36820+
return getSignaturesOfStructuredType(getReducedApparentType(type), kind);
3681836821
}
3681936822
function getIndexInfoOfStructuredType(type, kind) {
3682036823
if (type.flags & 3670016) {
@@ -36827,10 +36830,10 @@ var ts;
3682736830
return info && info.type;
3682836831
}
3682936832
function getIndexInfoOfType(type, kind) {
36830-
return getIndexInfoOfStructuredType(getApparentType(getReducedType(type)), kind);
36833+
return getIndexInfoOfStructuredType(getReducedApparentType(type), kind);
3683136834
}
3683236835
function getIndexTypeOfType(type, kind) {
36833-
return getIndexTypeOfStructuredType(getApparentType(getReducedType(type)), kind);
36836+
return getIndexTypeOfStructuredType(getReducedApparentType(type), kind);
3683436837
}
3683536838
function getImplicitIndexTypeOfType(type, kind) {
3683636839
if (isObjectTypeWithInferableIndex(type)) {
@@ -38781,7 +38784,7 @@ var ts;
3878138784
}
3878238785
return type;
3878338786
}
38784-
var apparentObjectType = getApparentType(getReducedType(objectType));
38787+
var apparentObjectType = getReducedApparentType(objectType);
3878538788
if (indexType.flags & 1048576 && !(indexType.flags & 16)) {
3878638789
var propTypes = [];
3878738790
var wasMissingProp = false;
@@ -47127,7 +47130,7 @@ var ts;
4712747130
var right = _a[_i];
4712847131
var left = props.get(right.escapedName);
4712947132
var rightType = getTypeOfSymbol(right);
47130-
if (left && !maybeTypeOfKind(rightType, 98304) && !(maybeTypeOfKind(rightType, 1) && right.flags & 16777216)) {
47133+
if (left && !maybeTypeOfKind(rightType, 98304) && !(maybeTypeOfKind(rightType, 3) && right.flags & 16777216)) {
4713147134
var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
4713247135
ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
4713347136
}
@@ -65183,9 +65186,12 @@ var ts;
6518365186
return template.templateFlags ? ts.createIdentifier("undefined") : ts.createLiteral(template.text);
6518465187
}
6518565188
function getRawLiteral(node, currentSourceFile) {
65186-
var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
65187-
var isLast = node.kind === 14 || node.kind === 17;
65188-
text = text.substring(1, text.length - (isLast ? 1 : 2));
65189+
var text = node.rawText;
65190+
if (text === undefined) {
65191+
text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
65192+
var isLast = node.kind === 14 || node.kind === 17;
65193+
text = text.substring(1, text.length - (isLast ? 1 : 2));
65194+
}
6518965195
text = text.replace(/\r\n?/g, "\n");
6519065196
return ts.setTextRange(ts.createLiteral(text), node);
6519165197
}
@@ -74060,7 +74066,7 @@ var ts;
7406074066
scoped: false,
7406174067
dependencies: [ts.createBindingHelper],
7406274068
priority: 2,
74063-
text: "\n var __exportStar = (this && this.__exportStar) || function(m, exports) {\n for (var p in m) if (p !== \"default\" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);\n }"
74069+
text: "\n var __exportStar = (this && this.__exportStar) || function(m, exports) {\n for (var p in m) if (p !== \"default\" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);\n };"
7406474070
};
7406574071
function createExportStarHelper(context, module) {
7406674072
context.requestEmitHelper(exportStarHelper);

0 commit comments

Comments
 (0)