From c44c6c0c43f050618e13c383242cb9cc7a618acf Mon Sep 17 00:00:00 2001 From: shawn_hu_ls Date: Fri, 10 Mar 2023 17:21:29 +0800 Subject: [PATCH] Fix ClassType cannot distinct base class Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/I6LPUL?from=project-issue Signed-off-by: shawn_hu_ls --- es2panda/compiler/core/emitter/emitter.cpp | 2 +- es2panda/compiler/core/emitter/emitter.h | 2 +- .../typescript/extractor/typeExtractor.cpp | 21 +++++++-- es2panda/typescript/extractor/typeExtractor.h | 6 ++- es2panda/typescript/extractor/typeSystem.h | 16 ++++++- .../classAbstractAsIdentifier.txt | 2 +- .../classDeclarations/classInsideBlock.txt | 2 +- .../classWithSemicolonClassElement1.txt | 2 +- .../classWithSemicolonClassElement2.txt | 2 +- .../classExpressions/classExpression1.txt | 2 +- .../classExpressions/classExpression2.txt | 2 +- .../classExpressions/classExpression3.txt | 2 +- .../classExpressions/classExpression4.txt | 2 +- ...ifierOnClassExpressionMemberInFunction.txt | 2 +- .../declarationEmitReadonly.txt | 2 +- .../quotedConstructors.txt | 8 ++-- ...desIndexersWithAssignmentCompatibility.txt | 4 +- .../typeOfThisInStaticMembers.txt | 4 +- .../staticFactory1.txt | 2 +- .../staticAndNonStaticPropertiesSameName.txt | 2 +- .../staticPropertyAndFunctionWithSameName.txt | 4 +- ...cPropertyNameConflictsInAmbientContext.txt | 20 ++++---- .../controlFlowSuperPropertyAccess.txt | 2 +- .../controlFlow/typeGuardsTypeParameters.txt | 2 +- .../declarationEmitWorkWithInlineComments.txt | 6 +-- ...nceofOperatorWithInvalidStaticToString.txt | 6 +-- .../typeGuards/TypeGuardWithArrayUnion.txt | 2 +- .../importDefaultNamedType.txt | 2 +- .../constructorTagOnClassConstructor.txt | 4 +- .../declarations/jsDeclarationsThisTypes.txt | 2 +- .../jsdocImplements_namespacedInterface.txt | 4 +- .../jsdoc/jsdocTypeReferenceUseBeforeDef.txt | 2 +- .../parserClassDeclaration23.txt | 2 +- .../parserClassDeclarationIndexSignature1.txt | 2 +- .../parserConstructorDeclaration1.txt | 2 +- .../parserAccessibilityAfterStatic11.txt | 2 +- .../parserAccessibilityAfterStatic14.txt | 2 +- .../parserAccessibilityAfterStatic4.txt | 2 +- .../Generics/parserGenericClass1.txt | 2 +- .../Generics/parserGenericClass2.txt | 2 +- .../Generics/parserGenericConstraint1.txt | 2 +- .../parserIndexMemberDeclaration1.txt | 2 +- .../parserIndexMemberDeclaration2.txt | 2 +- .../parserIndexMemberDeclaration3.txt | 2 +- .../parserIndexMemberDeclaration4.txt | 2 +- .../ecmascript5/Protected/Protected5.txt | 2 +- .../parser/ecmascript5/parserUnicode3.txt | 2 +- .../expect/types/any/assignEveryTypeToAny.txt | 2 +- testTs/expect/types/conditional/variance.txt | 2 +- .../expect/types/import/importTypeAmbient.txt | 2 +- .../types/keyof/keyofAndIndexedAccess.txt | 28 +++++------ testTs/expect/types/literal/literalTypes2.txt | 4 +- .../expect/types/localTypes/localTypes2.txt | 6 +-- .../expect/types/localTypes/localTypes3.txt | 6 +-- .../expect/types/localTypes/localTypes5.txt | 4 +- testTs/expect/types/mapped/mappedTypes3.txt | 2 +- .../types/mapped/mappedTypesAndObjects.txt | 2 +- .../members/classWithProtectedProperty.txt | 2 +- .../types/members/classWithPublicProperty.txt | 2 +- .../typesWithSpecializedCallSignatures.txt | 4 +- ...ypesWithSpecializedConstructSignatures.txt | 4 +- .../namedTypes/classWithOptionalParameter.txt | 4 +- .../types/namedTypes/optionalMethods.txt | 4 +- testTs/expect/types/never/neverType.txt | 2 +- .../parametersWithNoAnnotationAreAny.txt | 2 +- ...tureIsSubtypeOfNonSpecializedSignature.txt | 6 +-- ...LiteralTypesInImplementationSignatures.txt | 2 +- .../typeParameterAsTypeArgument.txt | 2 +- ...structSignaturesWithIdenticalOverloads.txt | 4 +- .../constructSignaturesWithOverloads.txt | 4 +- ...ithOverloadsThatDifferOnlyByReturnType.txt | 4 +- .../indexSignatures/stringIndexingResults.txt | 2 +- .../propertyNameWithoutTypeAnnotation.txt | 2 +- .../propertyNamesOfReservedWords.txt | 2 +- .../undefined/invalidUndefinedValues.txt | 2 +- .../expect/types/rest/objectRestParameter.txt | 2 +- .../functionLiteralForOverloads2.txt | 4 +- .../typeQueries/typeofClass2.txt | 2 +- .../typeofModuleWithoutExports.txt | 2 +- .../types/thisType/thisTypeAndConstraints.txt | 4 +- .../types/thisType/thisTypeInClasses.txt | 10 ++-- .../types/thisType/thisTypeInFunctions3.txt | 2 +- .../circularTypeAliasForUnionWithClass.txt | 6 +-- .../expect/types/typeAliases/typeAliases.txt | 2 +- ...llGenericFunctionWithZeroTypeArguments.txt | 4 +- .../constraintSatisfactionWithAny.txt | 6 +-- .../constraintSatisfactionWithEmptyObject.txt | 4 +- .../functionConstraintSatisfaction.txt | 6 +-- .../functionConstraintSatisfaction3.txt | 4 +- ...tiateGenericClassWithZeroTypeArguments.txt | 4 +- .../wrappedAndRecursiveConstraints.txt | 4 +- .../wrappedAndRecursiveConstraints2.txt | 2 +- .../wrappedAndRecursiveConstraints3.txt | 2 +- ...yAccessOnTypeParameterWithConstraints3.txt | 4 +- .../typeParametersAvailableInNestedScope.txt | 2 +- .../anyAssignableToEveryType.txt | 2 +- .../assignmentCompatWithObjectMembers.txt | 8 ++-- .../assignmentCompatWithObjectMembers3.txt | 4 +- ...entCompatWithObjectMembersNumericNames.txt | 4 +- ...llSignatureAssignabilityInInheritance2.txt | 2 +- ...llSignatureAssignabilityInInheritance4.txt | 2 +- ...llSignatureAssignabilityInInheritance5.txt | 2 +- ...ctSignatureAssignabilityInInheritance2.txt | 2 +- ...ctSignatureAssignabilityInInheritance5.txt | 2 +- .../everyTypeAssignableToAny.txt | 2 +- .../nullAssignableToEveryType.txt | 2 +- .../undefinedAssignableToEveryType.txt | 2 +- .../narrowingConstrainedTypeVariable.txt | 6 +-- .../arrayLiteralsWithRecursiveGenerics.txt | 4 +- .../recursiveTypeInGenericConstraint.txt | 6 +-- ...recursiveTypesUsedAsFunctionParameters.txt | 4 +- .../subtypingWithCallSignatures3.txt | 2 +- .../subtypingWithConstructSignatures3.txt | 2 +- .../subtypingWithObjectMembers4.txt | 8 ++-- .../objectTypesIdentity.txt | 6 +-- .../objectTypesIdentity2.txt | 6 +-- .../objectTypesIdentityWithCallSignatures.txt | 6 +-- ...objectTypesIdentityWithCallSignatures2.txt | 6 +-- ...WithCallSignaturesDifferingParamCounts.txt | 6 +-- ...dentityWithCallSignaturesWithOverloads.txt | 6 +-- ...ctTypesIdentityWithConstructSignatures.txt | 6 +-- ...tTypesIdentityWithConstructSignatures2.txt | 4 +- ...onstructSignaturesDifferingParamCounts.txt | 4 +- ...TypesIdentityWithGenericCallSignatures.txt | 6 +-- ...ypesIdentityWithGenericCallSignatures2.txt | 6 +-- ...icCallSignaturesDifferingByConstraints.txt | 6 +-- ...cCallSignaturesDifferingByConstraints2.txt | 8 ++-- ...cCallSignaturesDifferingByConstraints3.txt | 12 ++--- ...ricCallSignaturesDifferingByReturnType.txt | 6 +-- ...icCallSignaturesDifferingByReturnType2.txt | 6 +-- ...SignaturesDifferingTypeParameterCounts.txt | 6 +-- ...lSignaturesDifferingTypeParameterNames.txt | 6 +-- ...ithGenericCallSignaturesOptionalParams.txt | 6 +-- ...thGenericCallSignaturesOptionalParams2.txt | 6 +-- ...thGenericCallSignaturesOptionalParams3.txt | 6 +-- ...structSignaturesDifferingByConstraints.txt | 4 +- ...tructSignaturesDifferingByConstraints2.txt | 6 +-- ...tructSignaturesDifferingByConstraints3.txt | 10 ++-- ...nstructSignaturesDifferingByReturnType.txt | 4 +- ...structSignaturesDifferingByReturnType2.txt | 4 +- ...SignaturesDifferingTypeParameterCounts.txt | 4 +- ...tSignaturesDifferingTypeParameterNames.txt | 4 +- ...nericConstructSignaturesOptionalParams.txt | 4 +- ...ericConstructSignaturesOptionalParams2.txt | 4 +- ...ericConstructSignaturesOptionalParams3.txt | 4 +- .../objectTypesIdentityWithOptionality.txt | 6 +-- .../objectTypesIdentityWithPrivates.txt | 6 +-- .../objectTypesIdentityWithPrivates2.txt | 2 +- .../objectTypesIdentityWithPublics.txt | 6 +-- ...typeParametersAreIdenticalToThemselves.txt | 4 +- .../genericCallTypeArgumentInference.txt | 2 +- ...llWithConstraintsTypeArgumentInference.txt | 4 +- ...cClassWithObjectTypeArgsAndConstraints.txt | 10 ++-- .../keyofInferenceLowerPriorityThanReturn.txt | 8 ++-- ts2panda/src/base/typeSystem.ts | 2 +- ts2panda/src/typeChecker.ts | 47 ++++++++++++++----- 156 files changed, 376 insertions(+), 326 deletions(-) mode change 100644 => 100755 testTs/expect/types/any/assignEveryTypeToAny.txt mode change 100644 => 100755 testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt mode change 100644 => 100755 testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt mode change 100644 => 100755 testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt diff --git a/es2panda/compiler/core/emitter/emitter.cpp b/es2panda/compiler/core/emitter/emitter.cpp index 4c17c86282..c906d509be 100644 --- a/es2panda/compiler/core/emitter/emitter.cpp +++ b/es2panda/compiler/core/emitter/emitter.cpp @@ -414,7 +414,7 @@ void Emitter::AddSourceTextModuleRecord(ModuleRecordEmitter *module, CompilerCon prog_->literalarray_table.emplace(static_cast(moduleLiteral), std::move(literalArrayInstance)); } -void Emitter::FillTypeInfoRecord(CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, +void Emitter::FillTypeInfoRecord(const CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, const std::string &recordName) const { if (!context->IsMergeAbc()) { diff --git a/es2panda/compiler/core/emitter/emitter.h b/es2panda/compiler/core/emitter/emitter.h index c58afaf421..32335e0bd1 100644 --- a/es2panda/compiler/core/emitter/emitter.h +++ b/es2panda/compiler/core/emitter/emitter.h @@ -107,7 +107,7 @@ public: void AddFunction(FunctionEmitter *func, CompilerContext *context); void AddSourceTextModuleRecord(ModuleRecordEmitter *module, CompilerContext *context); - void FillTypeInfoRecord(CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, + void FillTypeInfoRecord(const CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, const std::string &recordName) const; void FillTypeLiteralBuffers(const extractor::TypeRecorder *recorder) const; static void GenBufferLiterals(ArenaVector>> &literalBuffers, diff --git a/es2panda/typescript/extractor/typeExtractor.cpp b/es2panda/typescript/extractor/typeExtractor.cpp index 543b4652ac..400c8b17de 100644 --- a/es2panda/typescript/extractor/typeExtractor.cpp +++ b/es2panda/typescript/extractor/typeExtractor.cpp @@ -810,20 +810,25 @@ int64_t TypeExtractor::GetTypeIndexFromTSLiteralType(const ir::TSLiteralType *ts } int64_t TypeExtractor::GetTypeIndexFromBuiltin(const util::StringView &name, - const ir::TSTypeParameterInstantiation *node) + const ir::TSTypeParameterInstantiation *node, + bool isNewInstance) { auto typeIndexBuiltin = GetBuiltinTypeIndex(name); if (typeIndexBuiltin != PrimitiveType::ANY) { if (node == nullptr) { + if (!isNewInstance) { + return typeIndexBuiltin; + } return GetTypeIndexFromClassInst(typeIndexBuiltin); } - return GetTypeIndexFromBuiltinInst(typeIndexBuiltin, node); + return GetTypeIndexFromBuiltinInst(typeIndexBuiltin, node, isNewInstance); } return PrimitiveType::ANY; } int64_t TypeExtractor::GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, - const ir::TSTypeParameterInstantiation *node) + const ir::TSTypeParameterInstantiation *node, + bool isNewInstance) { std::vector allTypes = {typeIndexBuiltin}; for (const auto &t : node->Params()) { @@ -831,11 +836,17 @@ int64_t TypeExtractor::GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, } auto typeIndex = recorder_->GetBuiltinInst(allTypes); if (typeIndex != PrimitiveType::ANY) { - return typeIndex; + if (!isNewInstance) { + return typeIndex; + } + return GetTypeIndexFromClassInst(typeIndex); } // New instance for builtin generic type BuiltinInstType builtinInstType(this, allTypes); + if (!isNewInstance) { + return builtinInstType.GetTypeIndexShift(); + } return GetTypeIndexFromClassInst(builtinInstType.GetTypeIndexShift()); } @@ -848,7 +859,7 @@ int64_t TypeExtractor::GetTypeIndexFromGenericInst(int64_t typeIndexGeneric, } auto typeIndex = recorder_->GetGenericInst(allTypes); if (typeIndex != PrimitiveType::ANY) { - return typeIndex; + return GetTypeIndexFromClassInst(typeIndex); } // New instance for generic type diff --git a/es2panda/typescript/extractor/typeExtractor.h b/es2panda/typescript/extractor/typeExtractor.h index 524e5f0700..d3b404d6c9 100644 --- a/es2panda/typescript/extractor/typeExtractor.h +++ b/es2panda/typescript/extractor/typeExtractor.h @@ -45,6 +45,8 @@ public: int64_t GetTypeIndexFromIdentifier(const ir::Identifier *identifier); int64_t GetTypeIndexFromInitializer(const ir::Expression *initializer); int64_t GetTypeIndexFromClassInst(int64_t typeIndex); + int64_t GetTypeIndexFromBuiltin(const util::StringView &name, const ir::TSTypeParameterInstantiation *node, + bool isNewInstance = true); void SetGenericParamTypeMap(const ArenaMap *genericParamTypeMap) { @@ -99,8 +101,8 @@ private: int64_t GetTypeIndexFromTSLiteralType(const ir::TSLiteralType *tsLiteralType); // Builtin and Generic Helpers - int64_t GetTypeIndexFromBuiltin(const util::StringView &name, const ir::TSTypeParameterInstantiation *node); - int64_t GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, const ir::TSTypeParameterInstantiation *node); + int64_t GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, const ir::TSTypeParameterInstantiation *node, + bool isNewInstance); int64_t GetTypeIndexFromGenericInst(int64_t typeIndexGeneric, const ir::TSTypeParameterInstantiation *node); // Other Helpers diff --git a/es2panda/typescript/extractor/typeSystem.h b/es2panda/typescript/extractor/typeSystem.h index d3c1dfda53..4746e69554 100644 --- a/es2panda/typescript/extractor/typeSystem.h +++ b/es2panda/typescript/extractor/typeSystem.h @@ -668,7 +668,15 @@ private: { auto super = classDef->Super(); if (super != nullptr) { - extendsHeritage_ = extractor_->GetTypeIndexFromInitializer(super); + if (super->IsIdentifier()) { + extendsHeritage_ = extractor_->GetTypeIndexFromBuiltin(super->AsIdentifier()->Name(), + classDef->SuperTypeParams(), false); + } + if (extendsHeritage_ == PrimitiveType::ANY) { + extendsHeritage_ = extractor_->GetTypeIndexFromInitializer(super); + } + } else { + extendsHeritage_ = -1; // -1 means it's a base class } for (const auto &t : classDef->Implements()) { @@ -838,7 +846,11 @@ private: { buffer_->Add(recorder_->Allocator()->New(UserType::CLASS)); buffer_->Add(recorder_->Allocator()->New(modifierAB_)); - FillTypeIndexLiteralBuffer(extendsHeritage_); + if (extendsHeritage_ == -1) { // -1 means it's a base class + buffer_->Add(recorder_->Allocator()->New(extendsHeritage_)); + } else { + FillTypeIndexLiteralBuffer(extendsHeritage_); + } buffer_->Add(recorder_->Allocator()->New(implementsHeritages_.size())); std::for_each(implementsHeritages_.begin(), implementsHeritages_.end(), [this](const auto &t) { FillTypeIndexLiteralBuffer(t); diff --git a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt index 6485f38a41..6a21de3c5c 100644 --- a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt +++ b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/classDeclarations/classInsideBlock.txt b/testTs/expect/classes/classDeclarations/classInsideBlock.txt index 9ed12c7370..024050fada 100644 --- a/testTs/expect/classes/classDeclarations/classInsideBlock.txt +++ b/testTs/expect/classes/classDeclarations/classInsideBlock.txt @@ -1,3 +1,3 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} diff --git a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt +++ b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt +++ b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/classes/classExpressions/classExpression1.txt b/testTs/expect/classes/classExpressions/classExpression1.txt index c3f3a54c62..04d9350811 100644 --- a/testTs/expect/classes/classExpressions/classExpression1.txt +++ b/testTs/expect/classes/classExpressions/classExpression1.txt @@ -1 +1 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} diff --git a/testTs/expect/classes/classExpressions/classExpression2.txt b/testTs/expect/classes/classExpressions/classExpression2.txt index 44b0fc942e..5bb927a5fc 100644 --- a/testTs/expect/classes/classExpressions/classExpression2.txt +++ b/testTs/expect/classes/classExpressions/classExpression2.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/classExpressions/classExpression3.txt b/testTs/expect/classes/classExpressions/classExpression3.txt index 7e712dd6a4..126aec14e6 100644 --- a/testTs/expect/classes/classExpressions/classExpression3.txt +++ b/testTs/expect/classes/classExpressions/classExpression3.txt @@ -1,6 +1,6 @@ {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_6'} diff --git a/testTs/expect/classes/classExpressions/classExpression4.txt b/testTs/expect/classes/classExpressions/classExpression4.txt index 6485f38a41..6a21de3c5c 100644 --- a/testTs/expect/classes/classExpressions/classExpression4.txt +++ b/testTs/expect/classes/classExpressions/classExpression4.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt b/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt index 7da8286419..f4a060c8d1 100644 --- a/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt +++ b/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt @@ -1,4 +1,4 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} diff --git a/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt b/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt index 470cd39b98..f2fafd824f 100644 --- a/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt +++ b/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt b/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt index f8a8087fe8..cfef23fdac 100644 --- a/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt +++ b/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} diff --git a/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt b/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt index a44306abf2..e39347e8d5 100644 --- a/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt +++ b/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt b/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt index a189b29b07..a99e68a991 100644 --- a/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt +++ b/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt @@ -1,8 +1,8 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'test'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_7'}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'test'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_7'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_8'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt b/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt index 08ca134069..65664c2e01 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'create'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt b/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt index 12b036d92e..795e0a2cb7 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt index e525cc4ed0..efaeb4e0be 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt index 5515d14560..cb8f2d5f97 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt @@ -1,29 +1,29 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_4'}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_4'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_10'}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_10'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_15'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_15'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_15'}], 'k': '_17'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_18'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_18'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_18'}], 'k': '_19'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_22'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_21'}], 'k': '_20'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_22'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_21'}], 'k': '_20'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_20'}], 'k': '_23'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_24'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_24'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_24'}], 'k': '_25'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_28'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_27'}], 'k': '_26'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_28'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_27'}], 'k': '_26'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_26'}], 'k': '_29'} diff --git a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt index 31670798f9..8d89272210 100644 --- a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt +++ b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'body'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/controlFlow/typeGuardsTypeParameters.txt b/testTs/expect/controlFlow/typeGuardsTypeParameters.txt index 2732833cb2..0eedfd8191 100644 --- a/testTs/expect/controlFlow/typeGuardsTypeParameters.txt +++ b/testTs/expect/controlFlow/typeGuardsTypeParameters.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt b/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt index bc56ad9cf7..dba0973175 100644 --- a/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt +++ b/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} diff --git a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt index 92ed3c53fb..c47eb77066 100644 --- a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt +++ b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt @@ -1,12 +1,12 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_3'}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_3'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_8'}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 24, 'v': '_7'}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 24, 'v': '_7'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}, {'t': 25, 'v': 0}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} diff --git a/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt b/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt index 54e6376629..0b2501fc44 100644 --- a/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt +++ b/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'saySize'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}, {'t': 24, 'v': '_5'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt b/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt index e8110382ea..dbe7d8ae18 100644 --- a/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt +++ b/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt @@ -1,2 +1,2 @@ {'lb': [{'t': 2, 'v': 7}, {'t': 5, 'v': '#type#./a'}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} diff --git a/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt b/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt index cf8038ff66..570d4554c1 100644 --- a/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt +++ b/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} diff --git a/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt b/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt index bef0783bfe..ddc11fa4f6 100644 --- a/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt +++ b/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'method'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'method'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'method'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'verify'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt b/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt index d1c9e27e4c..965b58f50f 100644 --- a/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt +++ b/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'mNumber'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'mNumber'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'mNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'gen'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'gen'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'gen'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt b/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt +++ b/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt +++ b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt +++ b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt b/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt index bb92f2a92a..82776f3c30 100644 --- a/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt +++ b/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt index 5bdaed1bbd..feb682ba7b 100644 --- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt +++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt index 5bdaed1bbd..feb682ba7b 100644 --- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt +++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt index 889d1de80b..974080df21 100644 --- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt +++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt +++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt +++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt +++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt index dff14d6979..21aa19a673 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt index dff14d6979..21aa19a673 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt index dff14d6979..21aa19a673 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Protected/Protected5.txt b/testTs/expect/parser/ecmascript5/Protected/Protected5.txt index 235bd1e07e..4e7b4c878b 100644 --- a/testTs/expect/parser/ecmascript5/Protected/Protected5.txt +++ b/testTs/expect/parser/ecmascript5/Protected/Protected5.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 6}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/parserUnicode3.txt b/testTs/expect/parser/ecmascript5/parserUnicode3.txt index 2f2d6dc5c4..bdb58c8ffe 100644 --- a/testTs/expect/parser/ecmascript5/parserUnicode3.txt +++ b/testTs/expect/parser/ecmascript5/parserUnicode3.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/types/any/assignEveryTypeToAny.txt b/testTs/expect/types/any/assignEveryTypeToAny.txt old mode 100644 new mode 100755 index b2f0d38355..88f971decb --- a/testTs/expect/types/any/assignEveryTypeToAny.txt +++ b/testTs/expect/types/any/assignEveryTypeToAny.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'j'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/conditional/variance.txt b/testTs/expect/types/conditional/variance.txt index c06fa54099..c4e38bfecd 100644 --- a/testTs/expect/types/conditional/variance.txt +++ b/testTs/expect/types/conditional/variance.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'cast'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'pushThis'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'instance'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'cast'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'pushThis'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'instance'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_3'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'cast'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/import/importTypeAmbient.txt b/testTs/expect/types/import/importTypeAmbient.txt index d8857161a7..5051922b28 100644 --- a/testTs/expect/types/import/importTypeAmbient.txt +++ b/testTs/expect/types/import/importTypeAmbient.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'item'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'item'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 4}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/types/keyof/keyofAndIndexedAccess.txt b/testTs/expect/types/keyof/keyofAndIndexedAccess.txt index c825b99526..1d705f60f9 100644 --- a/testTs/expect/types/keyof/keyofAndIndexedAccess.txt +++ b/testTs/expect/types/keyof/keyofAndIndexedAccess.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'width'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'height'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'visible'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'width'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'height'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'visible'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tag'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'price'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'visible'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'price'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'visible'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'setProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} @@ -11,7 +11,7 @@ {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_9'}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'getProperty'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'setProperty'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'getProperty'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'setProperty'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'setProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_14'}], 'k': '_17'} @@ -24,7 +24,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f33'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f34'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_26'}, {'t': 25, 'v': 0}], 'k': '_25'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_26'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'z'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_27'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'z'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_27'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f40'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_29'}, {'t': 25, 'v': 0}], 'k': '_28'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_27'}], 'k': '_29'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f50'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_30'} @@ -46,7 +46,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f82'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_46'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f83'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_47'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f84'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_48'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_50'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_51'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_52'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_49'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_50'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_51'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_52'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_49'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_50'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'set'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_51'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_52'} @@ -57,7 +57,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f92'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_57'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_59'}, {'t': 25, 'v': 6}, {'t': 25, 'v': 7}], 'k': '_58'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 0}], 'k': '_59'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_61'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_62'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_60'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_61'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_62'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_60'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_61'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'set'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_62'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_60'}], 'k': '_63'} @@ -65,7 +65,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_65'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getParts'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_66'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_64'}], 'k': '_67'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'parts'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_69'}, {'t': 5, 'v': 'getParts'}, {'t': 24, 'v': '_70'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_68'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'parts'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_69'}, {'t': 5, 'v': 'getParts'}, {'t': 24, 'v': '_70'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_68'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_69'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getParts'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_70'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_68'}], 'k': '_71'} @@ -73,7 +73,7 @@ {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 1}], 'k': '_73'} {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_73'}], 'k': '_74'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_75'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_77'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_79'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_76'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_77'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_79'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_76'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_78'}, {'t': 25, 'v': 0}], 'k': '_77'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'computed'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_78'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_79'} @@ -85,14 +85,14 @@ {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 7}], 'k': '_85'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'updateIds2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 24, 'v': '_87'}, {'t': 25, 'v': 0}], 'k': '_86'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_87'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_88'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_88'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_88'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_90'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_89'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_90'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_89'}], 'k': '_91'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'childFormFactories'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_93'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_92'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'childFormFactories'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_93'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_92'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'set'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_93'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_92'}], 'k': '_94'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_96'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_95'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_96'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_95'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_96'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_95'}], 'k': '_97'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_98'} @@ -106,14 +106,14 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'fn'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_106'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_108'}, {'t': 25, 'v': 7}, {'t': 25, 'v': 6}], 'k': '_107'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 0}], 'k': '_108'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_110'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_109'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_110'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_109'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_110'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_109'}], 'k': '_111'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'ff1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_112'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'ff2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_113'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_114'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_115'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_117'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_119'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_116'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_117'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_119'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_116'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_118'}, {'t': 25, 'v': 0}], 'k': '_117'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'computed'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_118'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_119'} diff --git a/testTs/expect/types/literal/literalTypes2.txt b/testTs/expect/types/literal/literalTypes2.txt index c3f1903f21..e06419f45a 100644 --- a/testTs/expect/types/literal/literalTypes2.txt +++ b/testTs/expect/types/literal/literalTypes2.txt @@ -2,7 +2,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 2}, {'t': 25, 'v': 76}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'kind'}, {'t': 25, 'v': 1}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 16}, {'t': 5, 'v': 'x1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 16}, {'t': 5, 'v': 'x1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'b'}, {'t': 24, 'v': '_10'}], 'k': '_8'} @@ -16,7 +16,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_20'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_21'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_19'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_20'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_21'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_19'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_19'}], 'k': '_22'} diff --git a/testTs/expect/types/localTypes/localTypes2.txt b/testTs/expect/types/localTypes/localTypes2.txt index 2166411e49..763fc1ca6b 100644 --- a/testTs/expect/types/localTypes/localTypes2.txt +++ b/testTs/expect/types/localTypes/localTypes2.txt @@ -1,14 +1,14 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'} diff --git a/testTs/expect/types/localTypes/localTypes3.txt b/testTs/expect/types/localTypes/localTypes3.txt index 6d4b4ea3a7..7600a38f5a 100644 --- a/testTs/expect/types/localTypes/localTypes3.txt +++ b/testTs/expect/types/localTypes/localTypes3.txt @@ -1,14 +1,14 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'} diff --git a/testTs/expect/types/localTypes/localTypes5.txt b/testTs/expect/types/localTypes/localTypes5.txt index 076efee616..9b0a4d50f4 100644 --- a/testTs/expect/types/localTypes/localTypes5.txt +++ b/testTs/expect/types/localTypes/localTypes5.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} diff --git a/testTs/expect/types/mapped/mappedTypes3.txt b/testTs/expect/types/mapped/mappedTypes3.txt index 15c9fd2769..eee11f5678 100644 --- a/testTs/expect/types/mapped/mappedTypes3.txt +++ b/testTs/expect/types/mapped/mappedTypes3.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'isPerfect'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'weight'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/mapped/mappedTypesAndObjects.txt b/testTs/expect/types/mapped/mappedTypesAndObjects.txt index 11115d3e4d..57c470e719 100644 --- a/testTs/expect/types/mapped/mappedTypesAndObjects.txt +++ b/testTs/expect/types/mapped/mappedTypesAndObjects.txt @@ -3,5 +3,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'values'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'values'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_7'} diff --git a/testTs/expect/types/members/classWithProtectedProperty.txt b/testTs/expect/types/members/classWithProtectedProperty.txt index 106d4ad525..1ccab98278 100644 --- a/testTs/expect/types/members/classWithProtectedProperty.txt +++ b/testTs/expect/types/members/classWithProtectedProperty.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 6}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/types/members/classWithPublicProperty.txt b/testTs/expect/types/members/classWithPublicProperty.txt index 231510909e..7a4aead330 100644 --- a/testTs/expect/types/members/classWithPublicProperty.txt +++ b/testTs/expect/types/members/classWithPublicProperty.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt b/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt index ff4736ee4a..87a15279c1 100644 --- a/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt +++ b/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_6'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_8'}], 'k': '_7'} diff --git a/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt b/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt index 6f428a15f7..78b022e7a8 100644 --- a/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt +++ b/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/namedTypes/classWithOptionalParameter.txt b/testTs/expect/types/namedTypes/classWithOptionalParameter.txt index c4915193c7..0b9d803bd8 100644 --- a/testTs/expect/types/namedTypes/classWithOptionalParameter.txt +++ b/testTs/expect/types/namedTypes/classWithOptionalParameter.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/types/namedTypes/optionalMethods.txt b/testTs/expect/types/namedTypes/optionalMethods.txt index c0b4a6b6ba..b80dbd9c2e 100644 --- a/testTs/expect/types/namedTypes/optionalMethods.txt +++ b/testTs/expect/types/namedTypes/optionalMethods.txt @@ -2,14 +2,14 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}, {'t': 24, 'v': '_4'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'test2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_10'}, {'t': 25, 'v': 0}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_13'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_15'} diff --git a/testTs/expect/types/never/neverType.txt b/testTs/expect/types/never/neverType.txt index fe7c720cc8..78dbee6fb7 100644 --- a/testTs/expect/types/never/neverType.txt +++ b/testTs/expect/types/never/neverType.txt @@ -9,7 +9,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'move2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_8'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'check'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_11'}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 7}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'void1'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'void2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'never1'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'never2'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'void1'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'void2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'never1'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'never2'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'never1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt index 63f8574305..11fb9d822f 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt index dc8fc4c76e..26ee41a2d3 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt @@ -1,16 +1,16 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_15'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt index 8de5ed821a..274ede603a 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt index f7f9a70836..c88a55d859 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt @@ -1,3 +1,3 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt index 220190028b..ec8f598eed 100644 --- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt +++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt index 220190028b..ec8f598eed 100644 --- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt +++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt index f206f99a50..2ceb066f3b 100644 --- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt +++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt b/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt index 2c01a3bd6f..7da78cb20a 100644 --- a/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt +++ b/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}], 'k': '_4'} diff --git a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt index 082513e2a1..d7900094a4 100644 --- a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt +++ b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt index dbfa952367..e6282fa347 100644 --- a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt +++ b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt b/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt index 42b42337ba..a03d3a0bec 100644 --- a/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt +++ b/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/rest/objectRestParameter.txt b/testTs/expect/types/rest/objectRestParameter.txt index f1d5ac1eb9..350f78c247 100644 --- a/testTs/expect/types/rest/objectRestParameter.txt +++ b/testTs/expect/types/rest/objectRestParameter.txt @@ -1,6 +1,6 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'cloneAgain'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 25, 'v': 3}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 5, 'v': 'p'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 5, 'v': 'p'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_5'}, {'t': 25, 'v': 3}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 32}, {'t': 5, 'v': 'p'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt b/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt index 1c9fccae42..dfe4043e5a 100644 --- a/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt +++ b/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} diff --git a/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt b/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt index b1804580cd..f5a9474772 100644 --- a/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt +++ b/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_9'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_9'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt b/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt index ec1811aeb9..b5e2cb5884 100644 --- a/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt +++ b/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt @@ -1 +1 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} diff --git a/testTs/expect/types/thisType/thisTypeAndConstraints.txt b/testTs/expect/types/thisType/thisTypeAndConstraints.txt index d400b630f9..a2420c9b11 100644 --- a/testTs/expect/types/thisType/thisTypeAndConstraints.txt +++ b/testTs/expect/types/thisType/thisTypeAndConstraints.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'self'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'self'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'self'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_9'} diff --git a/testTs/expect/types/thisType/thisTypeInClasses.txt b/testTs/expect/types/thisType/thisTypeInClasses.txt index 72c1ecf23a..81ec5458e7 100644 --- a/testTs/expect/types/thisType/thisTypeInClasses.txt +++ b/testTs/expect/types/thisType/thisTypeInClasses.txt @@ -1,18 +1,18 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 5, 'v': 'a'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'i'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'j'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 5, 'v': 'a'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'i'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'j'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 24, 'v': '_8'}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_8'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_14'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_15'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_16'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_16'}], 'k': '_18'} diff --git a/testTs/expect/types/thisType/thisTypeInFunctions3.txt b/testTs/expect/types/thisType/thisTypeInFunctions3.txt index 57d12d8174..ef35ca96d8 100644 --- a/testTs/expect/types/thisType/thisTypeInFunctions3.txt +++ b/testTs/expect/types/thisType/thisTypeInFunctions3.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'check'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'check'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'check'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} diff --git a/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt b/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt index 3b0d7af6f9..51e9efffd6 100644 --- a/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt +++ b/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} diff --git a/testTs/expect/types/typeAliases/typeAliases.txt b/testTs/expect/types/typeAliases/typeAliases.txt index a339e8eddd..27f543ff8d 100644 --- a/testTs/expect/types/typeAliases/typeAliases.txt +++ b/testTs/expect/types/typeAliases/typeAliases.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 2}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}], 'k': '_5'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt b/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt index 533469b549..83dcd1ae59 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt @@ -1,11 +1,11 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt index 695c8392f8..69f74de6d7 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt @@ -1,12 +1,12 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt index 5fe6f2a5c5..af4068da5f 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt @@ -1,10 +1,10 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt old mode 100644 new mode 100755 index 645abdd2e0..90c6b6af9f --- a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt @@ -1,15 +1,15 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_6'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 21}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_14'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_15'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt index a4fe4ced71..a90060645e 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt @@ -1,11 +1,11 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_6'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_11'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt b/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt index 156ffac082..e726627daf 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_4'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt old mode 100644 new mode 100755 index 0feeb395cc..8c3b191303 --- a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 33}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt index e081783c52..99eca44093 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt index fe7913a4e9..b953d66350 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} diff --git a/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt b/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt index 32b27b6490..9895d6008d 100644 --- a/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt +++ b/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_10'} diff --git a/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt b/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt index b9456535ac..034a11d8b3 100644 --- a/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt +++ b/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt @@ -1,4 +1,4 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'temp'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt index 45b95bf054..1ee3e2e8f2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt index cc2af3fb8f..b89afe3b1b 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt @@ -1,14 +1,14 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_7'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_12'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_14'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt index bef6e0acfa..1595289865 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt index 6614b02b46..dae6d407c5 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt index 9cadd75f95..758d384ff2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt index 9cadd75f95..758d384ff2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt index 9cadd75f95..758d384ff2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt index 9cadd75f95..758d384ff2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt index 9cadd75f95..758d384ff2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt index 45b95bf054..1ee3e2e8f2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt index 45b95bf054..1ee3e2e8f2 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt old mode 100644 new mode 100755 index 45b95bf054..1ee3e2e8f2 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt b/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt index 1794d37780..a23c2b448e 100644 --- a/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt +++ b/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 25, 'v': 3}], 'k': '_2'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 7}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_10'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 24, 'v': '_11'}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt b/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt index 376c003487..7fa13d9e8c 100644 --- a/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt +++ b/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt index 959de77bb5..73e14904b4 100644 --- a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt +++ b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt index 1041651499..fb669636e1 100644 --- a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt +++ b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt index fb444c79b4..4d16e19932 100644 --- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt +++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt index fb444c79b4..4d16e19932 100644 --- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt +++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt index df9c9151ce..369f23159f 100644 --- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt +++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'fooo'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_12'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt index 8bfb5ced6e..026a4b6ebf 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt index 601cb1b808..8b798bcd62 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 38}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt index 1b3f25fda6..4e83f3354e 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt index d40a8b4322..381cea7062 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt index 898ea9e0c1..7b3d4cd979 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt index 6cce6d1e5a..e1464b1309 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt @@ -1,14 +1,14 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt index ad3512319f..6b3913084b 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt index 77b5255251..ec5d925626 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt index 8121a5db94..f14446af3a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt index ed583ed902..dda545905f 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt index 6122225699..26a54fdc11 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt index a14ed858de..380888e94d 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt index f6c4ad6981..ae663f6d09 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt @@ -1,13 +1,13 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_13'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt index f8d9bc31fd..13cb22bd5a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt @@ -1,15 +1,15 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_10'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_12'}], 'k': '_14'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_15'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt index 3405338bd9..e7fe4301b5 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt index 3405338bd9..e7fe4301b5 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt index ed583ed902..dda545905f 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt index ed583ed902..dda545905f 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt index 6122225699..26a54fdc11 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt index 6122225699..26a54fdc11 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt index 6122225699..26a54fdc11 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt index 326f86fe0d..76c5b6ae27 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt index 941ffcddf7..9e746d5dc8 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt index 4796f4fdcc..affc9b7df4 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_11'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_12'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt index 94d995c309..4222deebd6 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt index dd514e0a49..c069d80a67 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt index d55cff1110..0bbb7c30f0 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_6'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt index d02464f15a..a93e5e7e4c 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt index b825c00577..f9020cd643 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt index b825c00577..f9020cd643 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt index b825c00577..f9020cd643 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt index c6c12a5299..5a10065078 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt index cf776caa16..817b4b94cc 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt index 6629778ddd..6e746a5433 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt index 8bfb5ced6e..026a4b6ebf 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt index 6172525939..7b938f44f5 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt @@ -3,7 +3,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'inner'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'inner2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_18'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_18'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} @@ -17,7 +17,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_19'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_23'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_26'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_29'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_20'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_23'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_26'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_29'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_20'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'} diff --git a/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt b/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt index 066a064cf7..311892e7e9 100644 --- a/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt +++ b/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt @@ -1,7 +1,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_10'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_10'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt b/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt index b78b864630..907aedf464 100644 --- a/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt +++ b/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} @@ -8,7 +8,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_16'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_17'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_18'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_19'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_20'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_16'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_17'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_18'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_19'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_20'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'} diff --git a/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt b/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt index 21c16919d7..f8bbe74300 100644 --- a/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt +++ b/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt @@ -1,11 +1,11 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'} diff --git a/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt b/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt index 3c1427f1f9..94b0c14e76 100644 --- a/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt +++ b/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'insertOnConflictDoNothing'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_7'}, {'t': 25, 'v': 2}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tableColumns'}, {'t': 24, 'v': '_5'}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tableColumns'}, {'t': 24, 'v': '_5'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'tableColumns'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_7'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_12'} diff --git a/ts2panda/src/base/typeSystem.ts b/ts2panda/src/base/typeSystem.ts index 18a04e5132..2be6bb1709 100644 --- a/ts2panda/src/base/typeSystem.ts +++ b/ts2panda/src/base/typeSystem.ts @@ -271,7 +271,7 @@ export class TypeSummary extends BaseType { export class ClassType extends BaseType { modifier: number = ModifierAbstract.NONABSTRACT; // 0 -> unabstract, 1 -> abstract; - extendsHeritage: number = PrimitiveType.ANY; + extendsHeritage: number = -1; implementsHeritages: Array = new Array(); // fileds Array: [typeIndex] [public -> 0, private -> 1, protected -> 2] [readonly -> 1] staticFields: Map> = new Map>(); diff --git a/ts2panda/src/typeChecker.ts b/ts2panda/src/typeChecker.ts index 85764ad230..5c6c2a19ec 100644 --- a/ts2panda/src/typeChecker.ts +++ b/ts2panda/src/typeChecker.ts @@ -255,7 +255,7 @@ export class TypeChecker { if (BuiltinType[typeIdentifierName]) { let declNode = this.getDeclNodeForInitializer(typeIdentifier); if (declNode && (ts.isClassLike(declNode) || declNode.kind == ts.SyntaxKind.InterfaceDeclaration)) { - return this.getBuiltinTypeIndex(typeNode, typeIdentifierName); + return this.getBuiltinTypeIndex(typeNode, typeIdentifierName, true); } else { return BuiltinType[typeIdentifierName]; } @@ -265,11 +265,16 @@ export class TypeChecker { } } - isBuiltinType(expr: ts.NewExpression) { + isBuiltinType(expr: ts.NewExpression | ts.ExpressionWithTypeArguments) { let name = expr.expression.getFullText().replace(/\s/g, ""); return name in BuiltinType; } + isBuiltinIdentifier(id: ts.Identifier) { + let name = id.escapedText.toString(); + return name in BuiltinType; + } + isFromDefaultLib(node: ts.Node) { return node.getSourceFile().hasNoDefaultLib; } @@ -283,17 +288,23 @@ export class TypeChecker { return instanceType.shiftedTypeIndex; } - getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature: object) { + getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature: object, getTypeForInstace: boolean) { let typeRec = TypeRecorder.getInstance(); if (typeRec.hasBuiltinContainer2InstanceMap(builtinContainerSignature)) { + if (getTypeForInstace) { + return this.getOrCreateInstanceType(typeRec.getBuiltinContainer2InstanceMap(builtinContainerSignature)); + } return typeRec.getBuiltinContainer2InstanceMap(builtinContainerSignature); } let builtinContainerType = new BuiltinContainerType(builtinContainerSignature); let builtinContainerTypeIdx = builtinContainerType.shiftedTypeIndex; - return this.getOrCreateInstanceType(builtinContainerTypeIdx); + if (getTypeForInstace) { + return this.getOrCreateInstanceType(builtinContainerTypeIdx); + } + return builtinContainerTypeIdx; } - getBuiltinTypeIndex(node: ts.NewExpression | ts.TypeReferenceNode, name: string) { + getBuiltinTypeIndex(node: ts.NewExpression | ts.TypeReferenceNode | ts.ExpressionWithTypeArguments, name: string, getTypeForInstace: boolean) { let typeArguments = node.typeArguments; if (typeArguments && this.needRecordBuiltinContainer) { let typeArgIdxs = new Array(); @@ -305,15 +316,25 @@ export class TypeChecker { "typeIndex": BuiltinType[name], "typeArgIdxs": typeArgIdxs } - return this.getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature); + return this.getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature, getTypeForInstace); } - return this.getOrCreateInstanceType(BuiltinType[name]); + if (getTypeForInstace) { + return this.getOrCreateInstanceType(BuiltinType[name]); + } + return BuiltinType[name]; } - getBuiltinTypeIndexForExpr(expr: ts.NewExpression) { - let origExprNode = ts.getOriginalNode(expr); + getBuiltinTypeIndexForExpr(expr: ts.NewExpression | ts.ExpressionWithTypeArguments, getTypeForInstace: boolean) { + let origExprNode = ts.getOriginalNode(expr); let name = origExprNode.expression.getFullText().replace(/\s/g, ""); - return this.getBuiltinTypeIndex(origExprNode, name); + return this.getBuiltinTypeIndex(origExprNode, name, getTypeForInstace); + } + + getBuiltinTypeIndexForIdentifier(id: ts.Identifier, getTypeForInstace: boolean) { + if (getTypeForInstace) { + return this.getOrCreateInstanceType(BuiltinType[id.escapedText.toString()]); + } + return BuiltinType[id.escapedText.toString()]; } public getOrCreateRecordForDeclNode(initializer: ts.Node | undefined, variableNode?: ts.Node) { @@ -323,7 +344,11 @@ export class TypeChecker { let typeIndex = PrimitiveType.ANY; if (initializer.kind == ts.SyntaxKind.NewExpression && this.isBuiltinType(initializer)) { - typeIndex = this.getBuiltinTypeIndexForExpr(initializer); + typeIndex = this.getBuiltinTypeIndexForExpr(initializer, true); + } else if (initializer.kind == ts.SyntaxKind.ExpressionWithTypeArguments && this.isBuiltinType(initializer)) { + typeIndex = this.getBuiltinTypeIndexForExpr(initializer, false); + } else if (initializer.kind == ts.SyntaxKind.Identifier && this.isBuiltinIdentifier(initializer)) { + typeIndex = this.getBuiltinTypeIndexForIdentifier(initializer, false); } else { let declNode = this.getDeclNodeForInitializer(initializer); typeIndex = this.getTypeFromDecl(declNode, initializer.kind == ts.SyntaxKind.NewExpression); -- Gitee