Skip to content

Commit 635fdf8

Browse files
DanielRosenwasserDanielRosenwasser
committed
Update LKG.
1 parent a1d91c9 commit 635fdf8

6 files changed

Lines changed: 398 additions & 360 deletions

File tree

‎lib/tsc.js‎

Lines changed: 53 additions & 50 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.4";
63-
ts.version = ts.versionMajorMinor + ".3";
63+
ts.version = ts.versionMajorMinor + ".4";
6464
})(ts || (ts = {}));
6565
(function (ts) {
6666
ts.emptyArray = [];
@@ -9899,7 +9899,7 @@ var ts;
98999899
}
99009900
ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
99019901
function getObjectFlags(type) {
9902-
return type.flags & 3768320 ? type.objectFlags : 0;
9902+
return type.flags & 3899392 ? type.objectFlags : 0;
99039903
}
99049904
ts.getObjectFlags = getObjectFlags;
99059905
function typeHasCallOrConstructSignatures(type, checker) {
@@ -25788,10 +25788,10 @@ var ts;
2578825788
var wildcardType = createIntrinsicType(1, "any");
2578925789
var errorType = createIntrinsicType(1, "error");
2579025790
var unknownType = createIntrinsicType(2, "unknown");
25791-
var undefinedType = createNullableType(32768, "undefined", 0);
25792-
var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768, "undefined", 131072);
25793-
var nullType = createNullableType(65536, "null", 0);
25794-
var nullWideningType = strictNullChecks ? nullType : createNullableType(65536, "null", 131072);
25791+
var undefinedType = createIntrinsicType(32768, "undefined");
25792+
var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768, "undefined", 131072);
25793+
var nullType = createIntrinsicType(65536, "null");
25794+
var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536, "null", 131072);
2579525795
var stringType = createIntrinsicType(4, "string");
2579625796
var numberType = createIntrinsicType(8, "number");
2579725797
var bigintType = createIntrinsicType(64, "bigint");
@@ -25815,6 +25815,7 @@ var ts;
2581525815
var voidType = createIntrinsicType(16384, "void");
2581625816
var neverType = createIntrinsicType(131072, "never");
2581725817
var silentNeverType = createIntrinsicType(131072, "never");
25818+
var nonInferrableType = createIntrinsicType(131072, "never", 524288);
2581825819
var implicitNeverType = createIntrinsicType(131072, "never");
2581925820
var nonPrimitiveType = createIntrinsicType(67108864, "object");
2582025821
var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -27542,13 +27543,10 @@ var ts;
2754227543
result.id = typeCount;
2754327544
return result;
2754427545
}
27545-
function createIntrinsicType(kind, intrinsicName) {
27546+
function createIntrinsicType(kind, intrinsicName, objectFlags) {
27547+
if (objectFlags === void 0) { objectFlags = 0; }
2754627548
var type = createType(kind);
2754727549
type.intrinsicName = intrinsicName;
27548-
return type;
27549-
}
27550-
function createNullableType(kind, intrinsicName, objectFlags) {
27551-
var type = createIntrinsicType(kind, intrinsicName);
2755227550
type.objectFlags = objectFlags;
2755327551
return type;
2755427552
}
@@ -33598,15 +33596,15 @@ var ts;
3359833596
return newResult;
3359933597
}
3360033598
function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
33601-
if (falseType.flags & 131072 && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
33599+
if (falseType.flags & 131072 && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
3360233600
if (checkType.flags & 1 || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) {
3360333601
return trueType;
3360433602
}
3360533603
else if (isIntersectionEmpty(checkType, extendsType)) {
3360633604
return neverType;
3360733605
}
3360833606
}
33609-
else if (trueType.flags & 131072 && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
33607+
else if (trueType.flags & 131072 && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
3361033608
if (!(checkType.flags & 1) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) {
3361133609
return neverType;
3361233610
}
@@ -36898,7 +36896,7 @@ var ts;
3689836896
var stringIndexInfo = getIndexInfoOfType(type, 0);
3689936897
var numberIndexInfo = getIndexInfoOfType(type, 1);
3690036898
var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
36901-
result.objectFlags |= (ts.getObjectFlags(type) & 16384);
36899+
result.objectFlags |= (ts.getObjectFlags(type) & (16384 | 524288));
3690236900
return result;
3690336901
}
3690436902
function getWidenedType(type) {
@@ -37172,16 +37170,9 @@ var ts;
3717237170
return type;
3717337171
}
3717437172
function createReverseMappedType(source, target, constraint) {
37175-
var properties = getPropertiesOfType(source);
37176-
if (properties.length === 0 && !getIndexInfoOfType(source, 0)) {
37173+
if (ts.getObjectFlags(source) & 524288 || getPropertiesOfType(source).length === 0 && !getIndexInfoOfType(source, 0)) {
3717737174
return undefined;
3717837175
}
37179-
for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
37180-
var prop = properties_3[_i];
37181-
if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288) {
37182-
return undefined;
37183-
}
37184-
}
3718537176
if (isArrayType(source)) {
3718637177
return createArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint), isReadonlyArrayType(source));
3718737178
}
@@ -37208,16 +37199,16 @@ var ts;
3720837199
return getTypeFromInference(inference);
3720937200
}
3721037201
function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
37211-
var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
37202+
var properties, _i, properties_3, targetProp, sourceProp, targetType, sourceType;
3721237203
return __generator(this, function (_a) {
3721337204
switch (_a.label) {
3721437205
case 0:
3721537206
properties = target.flags & 2097152 ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
37216-
_i = 0, properties_4 = properties;
37207+
_i = 0, properties_3 = properties;
3721737208
_a.label = 1;
3721837209
case 1:
37219-
if (!(_i < properties_4.length)) return [3, 6];
37220-
targetProp = properties_4[_i];
37210+
if (!(_i < properties_3.length)) return [3, 6];
37211+
targetProp = properties_3[_i];
3722137212
if (!(requireOptionalProperties || !(targetProp.flags & 16777216))) return [3, 5];
3722237213
sourceProp = getPropertyOfType(source, targetProp.escapedName);
3722337214
if (!!sourceProp) return [3, 3];
@@ -37410,20 +37401,32 @@ var ts;
3741037401
inferFromTypes(source, target.falseType);
3741137402
}
3741237403
else if (target.flags & 3145728) {
37404+
var typeVariableCount = 0;
3741337405
for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
3741437406
var t = _e[_d];
37415-
var savePriority = priority;
3741637407
if (getInferenceInfoForType(t)) {
37417-
priority |= 1;
37408+
typeVariableCount++;
37409+
}
37410+
else {
37411+
inferFromTypes(source, t);
37412+
}
37413+
}
37414+
if (target.flags & 1048576 ? typeVariableCount !== 0 : typeVariableCount === 1) {
37415+
var savePriority = priority;
37416+
priority |= 1;
37417+
for (var _f = 0, _g = target.types; _f < _g.length; _f++) {
37418+
var t = _g[_f];
37419+
if (getInferenceInfoForType(t)) {
37420+
inferFromTypes(source, t);
37421+
}
3741837422
}
37419-
inferFromTypes(source, t);
3742037423
priority = savePriority;
3742137424
}
3742237425
}
3742337426
else if (source.flags & 1048576) {
3742437427
var sourceTypes = source.types;
37425-
for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
37426-
var sourceType = sourceTypes_3[_f];
37428+
for (var _h = 0, sourceTypes_3 = sourceTypes; _h < sourceTypes_3.length; _h++) {
37429+
var sourceType = sourceTypes_3[_h];
3742737430
inferFromTypes(sourceType, target);
3742837431
}
3742937432
}
@@ -37573,8 +37576,8 @@ var ts;
3757337576
}
3757437577
}
3757537578
var properties = getPropertiesOfObjectType(target);
37576-
for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
37577-
var targetProp = properties_5[_i];
37579+
for (var _i = 0, properties_4 = properties; _i < properties_4.length; _i++) {
37580+
var targetProp = properties_4[_i];
3757837581
var sourceProp = getPropertyOfType(source, targetProp.escapedName);
3757937582
if (sourceProp) {
3758037583
inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -41924,7 +41927,7 @@ var ts;
4192441927
spanArray = ts.createNodeArray(args);
4192541928
if (hasSpreadArgument && argCount) {
4192641929
var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
41927-
spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : max));
41930+
spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
4192841931
}
4192941932
}
4193041933
else {
@@ -42581,7 +42584,7 @@ var ts;
4258142584
checkGrammarArguments(node.arguments);
4258242585
var signature = getResolvedSignature(node, undefined, checkMode);
4258342586
if (signature === resolvingSignature) {
42584-
return silentNeverType;
42587+
return nonInferrableType;
4258542588
}
4258642589
if (node.expression.kind === 98) {
4258742590
return voidType;
@@ -43570,8 +43573,8 @@ var ts;
4357043573
if (strictNullChecks && properties.length === 0) {
4357143574
return checkNonNullType(sourceType, node);
4357243575
}
43573-
for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
43574-
var p = properties_6[_i];
43576+
for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
43577+
var p = properties_5[_i];
4357543578
checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
4357643579
}
4357743580
return sourceType;
@@ -47214,8 +47217,8 @@ var ts;
4721447217
for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
4721547218
var base = baseTypes_2[_i];
4721647219
var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
47217-
for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
47218-
var prop = properties_7[_a];
47220+
for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
47221+
var prop = properties_6[_a];
4721947222
var existing = seen.get(prop.escapedName);
4722047223
if (!existing) {
4722147224
seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -49380,7 +49383,7 @@ var ts;
4938049383
if (autoArrayType === emptyObjectType) {
4938149384
autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
4938249385
}
49383-
globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", 1);
49386+
globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", 1) || globalArrayType;
4938449387
anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
4938549388
globalThisType = getGlobalTypeOrUndefined("ThisType", 1);
4938649389
if (augmentations) {
@@ -53915,27 +53918,27 @@ var ts;
5391553918
function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
5391653919
var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
5391753920
if (property === firstAccessor) {
53918-
var properties_8 = [];
53921+
var properties_7 = [];
5391953922
if (getAccessor) {
5392053923
var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, undefined, undefined, undefined, getAccessor.parameters, undefined, getAccessor.body);
5392153924
ts.setTextRange(getterFunction, getAccessor);
5392253925
ts.setOriginalNode(getterFunction, getAccessor);
5392353926
var getter = ts.createPropertyAssignment("get", getterFunction);
53924-
properties_8.push(getter);
53927+
properties_7.push(getter);
5392553928
}
5392653929
if (setAccessor) {
5392753930
var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, undefined, undefined, undefined, setAccessor.parameters, undefined, setAccessor.body);
5392853931
ts.setTextRange(setterFunction, setAccessor);
5392953932
ts.setOriginalNode(setterFunction, setAccessor);
5393053933
var setter = ts.createPropertyAssignment("set", setterFunction);
53931-
properties_8.push(setter);
53934+
properties_7.push(setter);
5393253935
}
53933-
properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
53934-
properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
53936+
properties_7.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
53937+
properties_7.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
5393553938
var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), undefined, [
5393653939
receiver,
5393753940
createExpressionForPropertyName(property.name),
53938-
ts.createObjectLiteral(properties_8, multiLine)
53941+
ts.createObjectLiteral(properties_7, multiLine)
5393953942
]), firstAccessor);
5394053943
return ts.aggregateTransformFlags(expression);
5394153944
}
@@ -57301,8 +57304,8 @@ var ts;
5730157304
&& member.initializer !== undefined;
5730257305
}
5730357306
function addInitializedPropertyStatements(statements, properties, receiver) {
57304-
for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
57305-
var property = properties_9[_i];
57307+
for (var _i = 0, properties_8 = properties; _i < properties_8.length; _i++) {
57308+
var property = properties_8[_i];
5730657309
var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
5730757310
ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
5730857311
ts.setCommentRange(statement, property);
@@ -57312,8 +57315,8 @@ var ts;
5731257315
}
5731357316
function generateInitializedPropertyExpressions(properties, receiver) {
5731457317
var expressions = [];
57315-
for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
57316-
var property = properties_10[_i];
57318+
for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
57319+
var property = properties_9[_i];
5731757320
var expression = transformInitializedProperty(property, receiver);
5731857321
ts.startOnNewLine(expression);
5731957322
ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));

0 commit comments

Comments
 (0)