diff --git a/.gitignore b/.gitignore index ef631d99d78..af48864ed87 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ tests/*.d.ts *.config scripts/debug.bat scripts/run.bat +coverage/ \ No newline at end of file diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index a9533171238..ec8f2b39352 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -11,7 +11,11 @@ module ts { var nextNodeId = 1; var nextMergeId = 1; - export function createTypeChecker(program: Program): TypeChecker { + /// fullTypeCheck denotes if this instance of the typechecker will be used to get semantic diagnostics. + /// If fullTypeCheck === true - then typechecker should do every possible check to produce all errors + /// If fullTypeCheck === false - typechecker can shortcut and skip checks that only produce errors. + /// NOTE: checks that somehow affects decisions being made during typechecking should be executed in both cases. + export function createTypeChecker(program: Program, fullTypeCheck: boolean): TypeChecker { var Symbol = objectAllocator.getSymbolConstructor(); var Type = objectAllocator.getTypeConstructor(); @@ -21,6 +25,34 @@ module ts { var emptyArray: any[] = []; var emptySymbols: SymbolTable = {}; + + var checker: TypeChecker = { + getProgram: () => program, + getDiagnostics: getDiagnostics, + getGlobalDiagnostics: getGlobalDiagnostics, + getNodeCount: () => sum(program.getSourceFiles(), "nodeCount"), + getIdentifierCount: () => sum(program.getSourceFiles(), "identifierCount"), + getSymbolCount: () => sum(program.getSourceFiles(), "symbolCount"), + getTypeCount: () => typeCount, + checkProgram: checkProgram, + emitFiles: invokeEmitter, + getSymbolOfNode: getSymbolOfNode, + getParentOfSymbol: getParentOfSymbol, + getTypeOfSymbol: getTypeOfSymbol, + getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol, + getPropertiesOfType: getPropertiesOfType, + getPropertyOfType: getPropertyOfType, + getSignaturesOfType: getSignaturesOfType, + getIndexTypeOfType: getIndexTypeOfType, + getReturnTypeOfSignature: getReturnTypeOfSignature, + resolveEntityName: resolveEntityName, + getSymbolsInScope: getSymbolsInScope, + getSymbolInfo: getSymbolInfo, + getTypeOfExpression: getTypeOfExpression, + typeToString: typeToString, + symbolToString: symbolToString, + getAugmentedPropertiesOfApparentType: getAugmentedPropertiesOfApparentType + }; var undefinedSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "undefined"); var argumentsSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Transient, "arguments"); @@ -57,7 +89,6 @@ module ts { var globalRegExpType: ObjectType; var stringLiteralTypes: Map = {}; - var emitExtends = false; var mergedSymbols: Symbol[] = []; @@ -68,34 +99,6 @@ module ts { var diagnostics: Diagnostic[] = []; var diagnosticsModified: boolean = false; - var checker: TypeChecker = { - getProgram: () => program, - getDiagnostics: getDiagnostics, - getGlobalDiagnostics: getGlobalDiagnostics, - getNodeCount: () => sum(program.getSourceFiles(), "nodeCount"), - getIdentifierCount: () => sum(program.getSourceFiles(), "identifierCount"), - getSymbolCount: () => sum(program.getSourceFiles(), "symbolCount"), - getTypeCount: () => typeCount, - checkProgram: checkProgram, - emitFiles: invokeEmitter, - getSymbolOfNode: getSymbolOfNode, - getParentOfSymbol: getParentOfSymbol, - getTypeOfSymbol: getTypeOfSymbol, - getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol, - getPropertiesOfType: getPropertiesOfType, - getPropertyOfType: getPropertyOfType, - getSignaturesOfType: getSignaturesOfType, - getIndexTypeOfType: getIndexTypeOfType, - getReturnTypeOfSignature: getReturnTypeOfSignature, - resolveEntityName: resolveEntityName, - getSymbolsInScope: getSymbolsInScope, - getSymbolInfo: getSymbolInfo, - getTypeOfExpression: getTypeOfExpression, - typeToString: typeToString, - symbolToString: symbolToString, - getAugmentedPropertiesOfApparentType: getAugmentedPropertiesOfApparentType - }; - function addDiagnostic(diagnostic: Diagnostic) { diagnostics.push(diagnostic); diagnosticsModified = true; @@ -309,7 +312,7 @@ module ts { else { return returnResolvedSymbol(result); } - } + } break; case SyntaxKind.Method: case SyntaxKind.Constructor: @@ -449,7 +452,7 @@ module ts { return moduleSymbol; } - function getExportAssignmentSymbol(symbol: Symbol): Symbol { + function getExportAssignmentSymbol(symbol: Symbol): Symbol { checkTypeOfExportAssignmentSymbol(symbol); var symbolLinks = getSymbolLinks(symbol); return symbolLinks.exportAssignSymbol === unknownSymbol ? undefined : symbolLinks.exportAssignSymbol; @@ -660,38 +663,59 @@ module ts { return callback(globals); } - function getAccessibleSymbol(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) { - function getAccessibleSymbolFromSymbolTable(symbols: SymbolTable) { + function getQualifiedLeftMeaning(rightMeaning: SymbolFlags) { + // If we are looking in value space, the parent meaning is value, other wise it is namespace + return rightMeaning === SymbolFlags.Value ? SymbolFlags.Value : SymbolFlags.Namespace; + } + + function getAccessibleSymbolChain(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): Symbol[] { + function getAccessibleSymbolChainFromSymbolTable(symbols: SymbolTable): Symbol[] { + function canQualifySymbol(symbolFromSymbolTable: Symbol, meaning: SymbolFlags) { + // If the symbol is equivalent and doesnt need futher qualification, this symbol is accessible + if (!needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning)) { + return true; + } + + // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too + var accessibleParent = getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning)); + return !!accessibleParent; + } + function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol) { if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) { - // If the symbol is equivalent and doesnt need futher qualification, this symbol is accessible - if (!needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning)) { - return true; - } - - // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too - var accessibleParent = getAccessibleSymbol(symbolFromSymbolTable.parent, enclosingDeclaration, SymbolFlags.Namespace); - return !!accessibleParent; + // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table) + // and if symbolfrom symbolTable or alias resolution matches the symbol, + // check the symbol can be qualified, it is only then this symbol is accessible + return !forEach(symbolFromSymbolTable.declarations, declaration => hasExternalModuleSymbol(declaration)) && + canQualifySymbol(symbolFromSymbolTable, meaning); } } // If symbol is directly available by its name in the symbol table if (isAccessible(lookUp(symbols, symbol.name))) { - return symbol; + return [symbol]; } // Check if symbol is any of the alias return forEachValue(symbols, symbolFromSymbolTable => { if (symbolFromSymbolTable.flags & SymbolFlags.Import) { + var resolvedImportedSymbol = resolveImport(symbolFromSymbolTable); if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { - return symbolFromSymbolTable; + return [symbolFromSymbolTable]; + } + + // Look in the exported members, if we can find accessibleSymbolChain, symbol is accessible using this chain + // but only if the symbolFromSymbolTable can be qualified + var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined; + if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) { + return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports); } } }); } if (symbol) { - return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolFromSymbolTable); + return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable); } } @@ -730,20 +754,19 @@ module ts { var meaningToLook = meaning; while (symbol) { // Symbol is accessible if it by itself is accessible - var accessibleSymbol = getAccessibleSymbol(symbol, enclosingDeclaration, meaningToLook); - if (accessibleSymbol) { - if (forEach(accessibleSymbol.declarations, declaration => !isDeclarationVisible(declaration))) { + var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook); + if (accessibleSymbolChain) { + var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]); + if (!hasAccessibleDeclarations) { return { accessibility: SymbolAccessibility.NotAccessible, errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning), - errorModuleName: symbol !== initialSymbol ? symbolToString(symbol, enclosingDeclaration, SymbolFlags.Namespace) : undefined + errorModuleName: symbol !== initialSymbol ? symbolToString(symbol, enclosingDeclaration, SymbolFlags.Namespace) : undefined, }; } - return { accessibility: SymbolAccessibility.Accessible }; + return { accessibility: SymbolAccessibility.Accessible, aliasesToMakeVisible: hasAccessibleDeclarations.aliasesToMakeVisible }; } - // TODO(shkamat): Handle static method of class - // If we havent got the accessible symbol doesnt mean the symbol is actually inaccessible. // It could be qualified symbol and hence verify the path // eg: @@ -756,18 +779,91 @@ module ts { // we are going to see if c can be accessed in scope directly. // But it cant, hence the accessible is going to be undefined, but that doesnt mean m.c is accessible // It is accessible if the parent m is accessible because then m.c can be accessed through qualification - meaningToLook = SymbolFlags.Namespace; - symbol = symbol.parent; + meaningToLook = getQualifiedLeftMeaning(meaning); + symbol = getParentOfSymbol(symbol); } - // This is a local symbol that cannot be named + // This could be a symbol that is not exported in the external module + // or it could be a symbol from different external module that is not aliased and hence cannot be named + var symbolExternalModule = forEach(initialSymbol.declarations, declaration => getExternalModuleContainer(declaration)); + if (symbolExternalModule) { + var enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration); + if (symbolExternalModule !== enclosingExternalModule) { + // name from different external module that is not visibile + return { + accessibility: SymbolAccessibility.CannotBeNamed, + errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning), + errorModuleName: symbolToString(symbolExternalModule) + }; + } + } + + // Just a local name that is not accessible return { - accessibility: SymbolAccessibility.CannotBeNamed, + accessibility: SymbolAccessibility.NotAccessible, errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning), }; } return { accessibility: SymbolAccessibility.Accessible }; + + function getExternalModuleContainer(declaration: Declaration) { + for (; declaration; declaration = declaration.parent) { + if (hasExternalModuleSymbol(declaration)) { + return getSymbolOfNode(declaration); + } + } + } + } + + function hasExternalModuleSymbol(declaration: Declaration) { + return (declaration.kind === SyntaxKind.ModuleDeclaration && declaration.name.kind === SyntaxKind.StringLiteral) || + (declaration.kind === SyntaxKind.SourceFile && isExternalModule(declaration)); + } + + function hasVisibleDeclarations(symbol: Symbol): { aliasesToMakeVisible?: ImportDeclaration[]; } { + var aliasesToMakeVisible: ImportDeclaration[]; + if (forEach(symbol.declarations, declaration => !getIsDeclarationVisible(declaration))) { + return undefined; + } + return { aliasesToMakeVisible: aliasesToMakeVisible }; + + function getIsDeclarationVisible(declaration: Declaration) { + if (!isDeclarationVisible(declaration)) { + // Mark the unexported alias as visible if its parent is visible + // because these kind of aliases can be used to name types in declaration file + if (declaration.kind === SyntaxKind.ImportDeclaration && + !(declaration.flags & NodeFlags.Export) && + isDeclarationVisible(declaration.parent)) { + getNodeLinks(declaration).isVisible = true; + if (aliasesToMakeVisible) { + if (!contains(aliasesToMakeVisible, declaration)) { + aliasesToMakeVisible.push(declaration); + } + } + else { + aliasesToMakeVisible = [declaration]; + } + return true; + } + + // Declaration is not visible + return false; + } + + return true; + } + } + + function isImportDeclarationEntityNameReferenceDeclarationVisibile(entityName: EntityName): SymbolAccessiblityResult { + var firstIdentifier = getFirstIdentifier(entityName); + var firstIdentifierName = identifierToString(firstIdentifier); + var symbolOfNameSpace = resolveName(entityName.parent, (firstIdentifier).text, SymbolFlags.Namespace, Diagnostics.Cannot_find_name_0, firstIdentifierName); + // Verify if the symbol is accessible + var hasNamespaceDeclarationsVisibile = hasVisibleDeclarations(symbolOfNameSpace); + return hasNamespaceDeclarationsVisibile ? + { accessibility: SymbolAccessibility.Accessible, aliasesToMakeVisible: hasNamespaceDeclarationsVisibile.aliasesToMakeVisible } : + { accessibility: SymbolAccessibility.NotAccessible, errorSymbolName: firstIdentifierName }; } // Enclosing declaration is optional when we dont want to get qualified name in the enclosing declaration scope @@ -788,15 +884,27 @@ module ts { // Properties/methods/Signatures/Constructors/TypeParameters do not need qualification !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) { var symbolName: string; - while (symbol) { + while (symbol) { var isFirstName = !symbolName; - var meaningToLook = isFirstName ? meaning : SymbolFlags.Namespace; - var accessibleSymbol = getAccessibleSymbol(symbol, enclosingDeclaration, meaningToLook); - symbolName = getSymbolName(accessibleSymbol || symbol) + (isFirstName ? "" : ("." + symbolName)); - if (accessibleSymbol && !needsQualification(accessibleSymbol, enclosingDeclaration, meaningToLook)) { + var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning); + + var currentSymbolName: string; + if (accessibleSymbolChain) { + currentSymbolName = ts.map(accessibleSymbolChain, accessibleSymbol => getSymbolName(accessibleSymbol)).join("."); + } + else { + // If we didnt find accessible symbol chain for this symbol, break if this is external module + if (!isFirstName && ts.forEach(symbol.declarations, declaration => hasExternalModuleSymbol(declaration))) { + break; + } + currentSymbolName = getSymbolName(symbol); + } + symbolName = currentSymbolName + (isFirstName ? "" : ("." + symbolName)); + if (accessibleSymbolChain && !needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) { break; } - symbol = accessibleSymbol ? accessibleSymbol.parent : symbol.parent; + symbol = getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol); + meaning = getQualifiedLeftMeaning(meaning); } return symbolName; @@ -821,7 +929,7 @@ module ts { }; } - function typeToString(type: Type, enclosingDeclaration?:Node, flags?: TypeFormatFlags): string { + function typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string { var stringWriter = createSingleLineTextWriter(); // TODO(shkamat): typeToString should take enclosingDeclaration as input, once we have implemented enclosingDeclaration writeTypeToTextWriter(type, enclosingDeclaration, flags, stringWriter); @@ -880,10 +988,13 @@ module ts { writeTypeofSymbol(type); } // Use 'typeof T' for types of functions and methods that circularly reference themselves - // TODO(shkamat): correct the usuage of typeof function - always on functions that are visible - else if (type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method) && typeStack && contains(typeStack, type)) { + else if (shouldWriteTypeOfFunctionSymbol()) { writeTypeofSymbol(type); } + else if (typeStack && contains(typeStack, type)) { + // Recursive usage, use any + writer.write("any"); + } else { if (!typeStack) { typeStack = []; @@ -892,6 +1003,23 @@ module ts { writeLiteralType(type, allowFunctionOrConstructorTypeLiteral); typeStack.pop(); } + + function shouldWriteTypeOfFunctionSymbol() { + if (type.symbol) { + var isStaticMethodSymbol = !!(type.symbol.flags & SymbolFlags.Method && // typeof static method + ts.forEach(type.symbol.declarations, declaration => declaration.flags & NodeFlags.Static)); + var isNonLocalFunctionSymbol = !!(type.symbol.flags & SymbolFlags.Function) && + (type.symbol.parent || // is exported function symbol + ts.forEach(type.symbol.declarations, declaration => + declaration.parent.kind === SyntaxKind.SourceFile || declaration.parent.kind === SyntaxKind.ModuleBlock)); + + if (isStaticMethodSymbol || isNonLocalFunctionSymbol) { + // typeof is allowed only for static/non local functions + return !!(flags & TypeFormatFlags.UseTypeOfFunction) || // use typeof if format flags specify it + (typeStack && contains(typeStack, type)); // it is type of the symbol uses itself recursively + } + } + } } function writeTypeofSymbol(type: ObjectType) { @@ -1036,30 +1164,31 @@ module ts { // This is export assigned symbol node var externalModuleSymbol = getSymbolOfNode(externalModule); var exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol); + var resolvedExportSymbol: Symbol; var symbolOfNode = getSymbolOfNode(node); - if (exportAssignmentSymbol === symbolOfNode) { + if (isSymbolUsedInExportAssignment(symbolOfNode)) { + return true; + } + + // if symbolOfNode is import declaration, resolve the symbol declaration and check + if (symbolOfNode.flags & SymbolFlags.Import) { + return isSymbolUsedInExportAssignment(resolveImport(symbolOfNode)); + } + } + + // Check if the symbol is used in export assignment + function isSymbolUsedInExportAssignment(symbol: Symbol) { + if (exportAssignmentSymbol === symbol) { return true; } if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & SymbolFlags.Import)) { // if export assigned symbol is import declaration, resolve the import - var resolvedExportSymbol = resolveImport(exportAssignmentSymbol); - if (resolvedExportSymbol === symbolOfNode) { + resolvedExportSymbol = resolvedExportSymbol || resolveImport(exportAssignmentSymbol); + if (resolvedExportSymbol === symbol) { return true; } - // TODO(shkamat): Chained import assignment - // eg. a should be visible too. - //module m { - // export module c { - // export class c { - // } - // } - //} - //import a = m.c; - //import b = a; - //export = b; - // Container of resolvedExportSymbol is visible return forEach(resolvedExportSymbol.declarations, declaration => { while (declaration) { @@ -1076,25 +1205,21 @@ module ts { function determineIfDeclarationIsVisible() { switch (node.kind) { case SyntaxKind.VariableDeclaration: - if (!(node.flags & NodeFlags.Export)) { - // node.parent is variable statement so look at the variable statement's parent - return isGlobalSourceFile(node.parent.parent) || isUsedInExportAssignment(node); - } - // Exported members are visible if parent is visible - return isDeclarationVisible(node.parent.parent); - case SyntaxKind.ModuleDeclaration: case SyntaxKind.ClassDeclaration: case SyntaxKind.InterfaceDeclaration: case SyntaxKind.FunctionDeclaration: case SyntaxKind.EnumDeclaration: case SyntaxKind.ImportDeclaration: - if (!(node.flags & NodeFlags.Export)) { - // TODO(shkamat): non exported aliases can be visible if they are referenced else where for value/type/namespace - return isGlobalSourceFile(node.parent) || isUsedInExportAssignment(node); + // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent + var parent = node.kind === SyntaxKind.VariableDeclaration ? node.parent.parent : node.parent; + // If the node is not exported or it is not ambient module element (except import declaration) + if (!(node.flags & NodeFlags.Export) && + !(node.kind !== SyntaxKind.ImportDeclaration && parent.kind !== SyntaxKind.SourceFile && isInAmbientContext(parent))) { + return isGlobalSourceFile(parent) || isUsedInExportAssignment(node); } - // Exported members are visible if parent is visible - return isDeclarationVisible(node.parent); + // Exported members/ambient module elements (exception import declaraiton) are visible if parent is visible + return isDeclarationVisible(parent); case SyntaxKind.Property: case SyntaxKind.Method: @@ -1124,7 +1249,7 @@ module ts { if (node) { var links = getNodeLinks(node); if (links.isVisible === undefined) { - links.isVisible = determineIfDeclarationIsVisible(); + links.isVisible = !!determineIfDeclarationIsVisible(); } return links.isVisible; } @@ -1197,7 +1322,7 @@ module ts { return type; function checkImplicitAny(type: Type) { - if (!program.getCompilerOptions().noImplicitAny) { + if (!fullTypeCheck || !program.getCompilerOptions().noImplicitAny) { return; } // We need to have ended up with 'any', 'any[]', 'any[][]', etc. @@ -3945,7 +4070,7 @@ module ts { var typeArgNode = typeArguments[i]; var typeArgument = getTypeFromTypeNode(typeArgNode); var constraint = getConstraintOfTypeParameter(typeParameters[i]); - if (constraint) { + if (constraint && fullTypeCheck) { checkTypeAssignableTo(typeArgument, constraint, typeArgNode, Diagnostics.Type_0_does_not_satisfy_the_constraint_1_Colon, Diagnostics.Type_0_does_not_satisfy_the_constraint_1); } result.push(typeArgument); @@ -4161,7 +4286,7 @@ module ts { function checkTypeAssertion(node: TypeAssertion): Type { var exprType = checkExpression(node.operand); var targetType = getTypeFromTypeNode(node.type); - if (targetType !== unknownType) { + if (fullTypeCheck && targetType !== unknownType) { var widenedType = getWidenedType(exprType); if (!(isTypeAssignableTo(exprType, targetType) || isTypeAssignableTo(targetType, widenedType))) { checkTypeAssignableTo(targetType, widenedType, node, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other_Colon, Diagnostics.Neither_type_0_nor_type_1_is_assignable_to_the_other); @@ -4195,7 +4320,7 @@ module ts { var unwidenedType = checkAndMarkExpression(func.body, contextualMapper); var widenedType = getWidenedType(unwidenedType); - if (program.getCompilerOptions().noImplicitAny && widenedType !== unwidenedType && getInnermostTypeOfNestedArrayTypes(widenedType) === anyType) { + if (fullTypeCheck && program.getCompilerOptions().noImplicitAny && widenedType !== unwidenedType && getInnermostTypeOfNestedArrayTypes(widenedType) === anyType) { error(func, Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeToString(widenedType)); } @@ -4217,7 +4342,7 @@ module ts { var widenedType = getWidenedType(commonType); // Check and report for noImplicitAny if the best common type implicitly gets widened to an 'any'/arrays-of-'any' type. - if (program.getCompilerOptions().noImplicitAny && widenedType !== commonType && getInnermostTypeOfNestedArrayTypes(widenedType) === anyType) { + if (fullTypeCheck && program.getCompilerOptions().noImplicitAny && widenedType !== commonType && getInnermostTypeOfNestedArrayTypes(widenedType) === anyType) { var typeName = typeToString(widenedType); if (func.name) { @@ -4297,6 +4422,10 @@ module ts { // must have at least one return statement somewhere in its body. // An exception to this rule is if the function implementation consists of a single 'throw' statement. function checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(func: FunctionDeclaration, returnType: Type): void { + if (!fullTypeCheck) { + return; + } + // Functions that return 'void' or 'any' don't need any return expressions. if (returnType === voidType || returnType === anyType) { return; @@ -4355,7 +4484,7 @@ module ts { } } } - if (!(links.flags & NodeCheckFlags.TypeChecked)) { + if (fullTypeCheck && !(links.flags & NodeCheckFlags.TypeChecked)) { checkSignatureDeclaration(node); if (node.type) { checkIfNonVoidFunctionHasReturnExpressionsOrSingleThrowStatment(node, getTypeFromTypeNode(node.type)); @@ -4600,7 +4729,7 @@ module ts { } function checkAssignmentOperator(valueType: Type): void { - if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) { + if (fullTypeCheck && operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) { // TypeScript 1.0 spec (April 2014): 4.17 // An assignment of the form // VarExpr = ValueExpr @@ -4714,28 +4843,32 @@ module ts { // DECLARATION AND STATEMENT TYPE CHECKING function checkTypeParameter(node: TypeParameterDeclaration) { - checkTypeNameIsReserved(node.name, Diagnostics.Type_parameter_name_cannot_be_0); checkSourceElement(node.constraint); - checkTypeParameterHasIllegalReferencesInConstraint(node); + if (fullTypeCheck) { + checkTypeParameterHasIllegalReferencesInConstraint(node); + checkTypeNameIsReserved(node.name, Diagnostics.Type_parameter_name_cannot_be_0); + } // TODO: Check multiple declarations are identical } function checkParameter(parameterDeclaration: ParameterDeclaration) { checkVariableDeclaration(parameterDeclaration); - checkCollisionWithIndexVariableInGeneratedCode(parameterDeclaration, parameterDeclaration.name); + if (fullTypeCheck) { + checkCollisionWithIndexVariableInGeneratedCode(parameterDeclaration, parameterDeclaration.name); - if (parameterDeclaration.flags & (NodeFlags.Public | NodeFlags.Private) && !(parameterDeclaration.parent.kind === SyntaxKind.Constructor && (parameterDeclaration.parent).body)) { - error(parameterDeclaration, Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); - } - if (parameterDeclaration.flags & NodeFlags.Rest) { - if (!isArrayType(getTypeOfSymbol(parameterDeclaration.symbol))) { - error(parameterDeclaration, Diagnostics.A_rest_parameter_must_be_of_an_array_type); + if (parameterDeclaration.flags & (NodeFlags.Public | NodeFlags.Private) && !(parameterDeclaration.parent.kind === SyntaxKind.Constructor && (parameterDeclaration.parent).body)) { + error(parameterDeclaration, Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation); } - } - else { - if (parameterDeclaration.initializer && !(parameterDeclaration.parent).body) { - error(parameterDeclaration, Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation); + if (parameterDeclaration.flags & NodeFlags.Rest) { + if (!isArrayType(getTypeOfSymbol(parameterDeclaration.symbol))) { + error(parameterDeclaration, Diagnostics.A_rest_parameter_must_be_of_an_array_type); + } + } + else { + if (parameterDeclaration.initializer && !(parameterDeclaration.parent).body) { + error(parameterDeclaration, Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation); + } } } @@ -4779,18 +4912,19 @@ module ts { if (node.type) { checkSourceElement(node.type); } - - checkCollisionWithCapturedSuperVariable(node, node.name); - checkCollisionWithCapturedThisVariable(node, node.name); - checkCollisionWithArgumentsInGeneratedCode(node); - if (program.getCompilerOptions().noImplicitAny && !node.type) { - switch (node.kind) { - case SyntaxKind.ConstructSignature: - error(node, Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type); - break; - case SyntaxKind.CallSignature: - error(node, Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type); - break; + if (fullTypeCheck) { + checkCollisionWithCapturedSuperVariable(node, node.name); + checkCollisionWithCapturedThisVariable(node, node.name); + checkCollisionWithArgumentsInGeneratedCode(node); + if (program.getCompilerOptions().noImplicitAny && !node.type) { + switch (node.kind) { + case SyntaxKind.ConstructSignature: + error(node, Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type); + break; + case SyntaxKind.CallSignature: + error(node, Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type); + break; + } } } @@ -4867,6 +5001,10 @@ module ts { return; } + if (!fullTypeCheck) { + return; + } + function isSuperCallExpression(n: Node): boolean { return n.kind === SyntaxKind.CallExpression && (n).func.kind === SyntaxKind.SuperKeyword; } @@ -4931,29 +5069,31 @@ module ts { } function checkAccessorDeclaration(node: AccessorDeclaration) { - if (node.kind === SyntaxKind.GetAccessor) { - if (!isInAmbientContext(node) && node.body && !(bodyContainsAReturnStatement(node.body) || bodyContainsSingleThrowStatement(node.body))) { - error(node.name, Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement); - } - } - - // TypeScript 1.0 spec (April 2014): 8.4.3 - // Accessors for the same member name must specify the same accessibility. - var otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor; - var otherAccessor = getDeclarationOfKind(node.symbol, otherKind); - if (otherAccessor) { - var visibilityFlags = NodeFlags.Private | NodeFlags.Public; - if (((node.flags & visibilityFlags) !== (otherAccessor.flags & visibilityFlags))) { - error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility); + if (fullTypeCheck) { + if (node.kind === SyntaxKind.GetAccessor) { + if (!isInAmbientContext(node) && node.body && !(bodyContainsAReturnStatement(node.body) || bodyContainsSingleThrowStatement(node.body))) { + error(node.name, Diagnostics.A_get_accessor_must_return_a_value_or_consist_of_a_single_throw_statement); + } } - var thisType = getAnnotatedAccessorType(node); - var otherType = getAnnotatedAccessorType(otherAccessor); - // TypeScript 1.0 spec (April 2014): 4.5 - // If both accessors include type annotations, the specified types must be identical. - if (thisType && otherType) { - if (!isTypeIdenticalTo(thisType, otherType)) { - error(node, Diagnostics.get_and_set_accessor_must_have_the_same_type); + // TypeScript 1.0 spec (April 2014): 8.4.3 + // Accessors for the same member name must specify the same accessibility. + var otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor; + var otherAccessor = getDeclarationOfKind(node.symbol, otherKind); + if (otherAccessor) { + var visibilityFlags = NodeFlags.Private | NodeFlags.Public; + if (((node.flags & visibilityFlags) !== (otherAccessor.flags & visibilityFlags))) { + error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility); + } + + var thisType = getAnnotatedAccessorType(node); + var otherType = getAnnotatedAccessorType(otherAccessor); + // TypeScript 1.0 spec (April 2014): 4.5 + // If both accessors include type annotations, the specified types must be identical. + if (thisType && otherType) { + if (!isTypeIdenticalTo(thisType, otherType)) { + error(node, Diagnostics.get_and_set_accessor_must_have_the_same_type); + } } } } @@ -4970,7 +5110,7 @@ module ts { for (var i = 0; i < len; i++) { checkSourceElement(node.typeArguments[i]); var constraint = getConstraintOfTypeParameter((type).target.typeParameters[i]); - if (constraint) { + if (fullTypeCheck && constraint) { var typeArgument = (type).typeArguments[i]; checkTypeAssignableTo(typeArgument, constraint, node, Diagnostics.Type_0_does_not_satisfy_the_constraint_1_Colon, Diagnostics.Type_0_does_not_satisfy_the_constraint_1); } @@ -4984,9 +5124,11 @@ module ts { function checkTypeLiteral(node: TypeLiteralNode) { forEach(node.members, checkSourceElement); - var type = getTypeFromTypeLiteralNode(node); - checkIndexConstraints(type); - checkTypeForDuplicateIndexSignatures(node); + if (fullTypeCheck) { + var type = getTypeFromTypeLiteralNode(node); + checkIndexConstraints(type); + checkTypeForDuplicateIndexSignatures(node); + } } function checkArrayType(node: ArrayTypeNode) { @@ -4998,6 +5140,9 @@ module ts { } function checkSpecializedSignatureDeclaration(signatureDeclarationNode: SignatureDeclaration): void { + if (!fullTypeCheck) { + return; + } var signature = getSignatureFromDeclaration(signatureDeclarationNode); if (!signature.hasStringLiterals) { return; @@ -5051,7 +5196,10 @@ module ts { return flags & flagsToCheck; } - function checkFunctionOrConstructorSymbol(symbol: Symbol) { + function checkFunctionOrConstructorSymbol(symbol: Symbol): void { + if (!fullTypeCheck) { + return; + } function checkFlagAgreementBetweenOverloads(overloads: Declaration[], implementation: FunctionDeclaration, flagsToCheck: NodeFlags, someOverloadFlags: NodeFlags, allOverloadFlags: NodeFlags): void { // Error if some overloads have a flag that is not shared by all overloads. To find the @@ -5221,7 +5369,11 @@ module ts { } } - function checkExportsOnMergedDeclarations(node: Node) { + function checkExportsOnMergedDeclarations(node: Node): void { + if (!fullTypeCheck) { + return; + } + var symbol: Symbol; // Exports should be checked only if enclosing module contains both exported and non exported declarations. @@ -5291,7 +5443,7 @@ module ts { } } - function checkFunctionDeclaration(node: FunctionDeclaration) { + function checkFunctionDeclaration(node: FunctionDeclaration): void { checkSignatureDeclaration(node); var symbol = getSymbolOfNode(node); @@ -5320,7 +5472,7 @@ module ts { } // If there is no body and no explicit return type, then report an error. - if (program.getCompilerOptions().noImplicitAny && !node.body && !node.type) { + if (fullTypeCheck && program.getCompilerOptions().noImplicitAny && !node.body && !node.type) { // Ignore privates within ambient contexts; they exist purely for documentative purposes to avoid name clashing. // (e.g. privates within .d.ts files do not expose type information) if (!isPrivateWithinAmbient(node)) { @@ -5507,36 +5659,38 @@ module ts { function checkVariableDeclaration(node: VariableDeclaration) { checkSourceElement(node.type); - checkExportsOnMergedDeclarations(node); - var symbol = getSymbolOfNode(node); - - var typeOfValueDeclaration = getTypeOfVariableOrParameterOrProperty(symbol); - var type: Type; - var useTypeFromValueDeclaration = node === symbol.valueDeclaration; - if (useTypeFromValueDeclaration) { - type = typeOfValueDeclaration; - } - else { - type = getTypeOfVariableDeclaration(node); - } + if (fullTypeCheck) { + var symbol = getSymbolOfNode(node); - if (node.initializer) { - if (!(getNodeLinks(node.initializer).flags & NodeCheckFlags.TypeChecked)) { - // Use default messages - checkTypeAssignableTo(checkAndMarkExpression(node.initializer), type, node, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined); + var typeOfValueDeclaration = getTypeOfVariableOrParameterOrProperty(symbol); + var type: Type; + var useTypeFromValueDeclaration = node === symbol.valueDeclaration; + if (useTypeFromValueDeclaration) { + type = typeOfValueDeclaration; + } + else { + type = getTypeOfVariableDeclaration(node); } - } - checkCollisionWithCapturedSuperVariable(node, node.name); - checkCollisionWithCapturedThisVariable(node, node.name); - if (!useTypeFromValueDeclaration) { - // TypeScript 1.0 spec (April 2014): 5.1 - // Multiple declarations for the same variable name in the same declaration space are permitted, - // provided that each declaration associates the same type with the variable. - if (typeOfValueDeclaration !== unknownType && type !== unknownType && !isTypeIdenticalTo(typeOfValueDeclaration, type)) { - error(node.name, Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2, identifierToString(node.name), typeToString(typeOfValueDeclaration), typeToString(type)); + + if (node.initializer) { + if (!(getNodeLinks(node.initializer).flags & NodeCheckFlags.TypeChecked)) { + // Use default messages + checkTypeAssignableTo(checkAndMarkExpression(node.initializer), type, node, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined); + } + } + + checkCollisionWithCapturedSuperVariable(node, node.name); + checkCollisionWithCapturedThisVariable(node, node.name); + if (!useTypeFromValueDeclaration) { + // TypeScript 1.0 spec (April 2014): 5.1 + // Multiple declarations for the same variable name in the same declaration space are permitted, + // provided that each declaration associates the same type with the variable. + if (typeOfValueDeclaration !== unknownType && type !== unknownType && !isTypeIdenticalTo(typeOfValueDeclaration, type)) { + error(node.name, Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2, identifierToString(node.name), typeToString(typeOfValueDeclaration), typeToString(type)); + } } } } @@ -5668,7 +5822,7 @@ module ts { function checkSwitchStatement(node: SwitchStatement) { var expressionType = checkExpression(node.expression); forEach(node.clauses, clause => { - if (clause.expression) { + if (fullTypeCheck && clause.expression) { // TypeScript 1.0 spec (April 2014):5.9 // In a 'switch' statement, each 'case' expression must be of a type that is assignable to or from the type of the 'switch' expression. var caseType = checkExpression(clause.expression); @@ -5783,9 +5937,12 @@ module ts { for (var i = 0; i < typeParameterDeclarations.length; i++) { var node = typeParameterDeclarations[i]; checkTypeParameter(node); - for (var j = 0; j < i; j++) { - if (typeParameterDeclarations[j].symbol === node.symbol) { - error(node.name, Diagnostics.Duplicate_identifier_0, identifierToString(node.name)); + + if (fullTypeCheck) { + for (var j = 0; j < i; j++) { + if (typeParameterDeclarations[j].symbol === node.symbol) { + error(node.name, Diagnostics.Duplicate_identifier_0, identifierToString(node.name)); + } } } } @@ -5805,39 +5962,45 @@ module ts { checkTypeReference(node.baseType); } if (type.baseTypes.length) { - var baseType = type.baseTypes[0]; - checkTypeAssignableTo(type, baseType, node.name, Diagnostics.Class_0_incorrectly_extends_base_class_1_Colon, Diagnostics.Class_0_incorrectly_extends_base_class_1); - var staticBaseType = getTypeOfSymbol(baseType.symbol); - checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, - Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1_Colon, Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); - if (baseType.symbol !== resolveEntityName(node, node.baseType.typeName, SymbolFlags.Value)) { - error(node.baseType, Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); + if (fullTypeCheck) { + var baseType = type.baseTypes[0]; + checkTypeAssignableTo(type, baseType, node.name, Diagnostics.Class_0_incorrectly_extends_base_class_1_Colon, Diagnostics.Class_0_incorrectly_extends_base_class_1); + var staticBaseType = getTypeOfSymbol(baseType.symbol); + checkTypeAssignableTo(staticType, getTypeWithoutConstructors(staticBaseType), node.name, + Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1_Colon, Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1); + if (baseType.symbol !== resolveEntityName(node, node.baseType.typeName, SymbolFlags.Value)) { + error(node.baseType, Diagnostics.Type_name_0_in_extends_clause_does_not_reference_constructor_function_for_0, typeToString(baseType)); + } + + checkKindsOfPropertyMemberOverrides(type, baseType); } // Check that base type can be evaluated as expression checkExpression(node.baseType.typeName); - - checkKindsOfPropertyMemberOverrides(type, baseType); } if (node.implementedTypes) { forEach(node.implementedTypes, typeRefNode => { checkTypeReference(typeRefNode); - var t = getTypeFromTypeReferenceNode(typeRefNode); - if (t !== unknownType) { - var declaredType = (t.flags & TypeFlags.Reference) ? (t).target : t; - if (declaredType.flags & (TypeFlags.Class | TypeFlags.Interface)) { - checkTypeAssignableTo(type, t, node.name, Diagnostics.Class_0_incorrectly_implements_interface_1_Colon, Diagnostics.Class_0_incorrectly_implements_interface_1); - } - else { - error(typeRefNode, Diagnostics.A_class_may_only_implement_another_class_or_interface); + if (fullTypeCheck) { + var t = getTypeFromTypeReferenceNode(typeRefNode); + if (t !== unknownType) { + var declaredType = (t.flags & TypeFlags.Reference) ? (t).target : t; + if (declaredType.flags & (TypeFlags.Class | TypeFlags.Interface)) { + checkTypeAssignableTo(type, t, node.name, Diagnostics.Class_0_incorrectly_implements_interface_1_Colon, Diagnostics.Class_0_incorrectly_implements_interface_1); + } + else { + error(typeRefNode, Diagnostics.A_class_may_only_implement_another_class_or_interface); + } } } }); } - checkIndexConstraints(type); - forEach(node.members, checkSourceElement); - checkTypeForDuplicateIndexSignatures(node); + forEach(node.members, checkSourceElement); + if (fullTypeCheck) { + checkIndexConstraints(type); + checkTypeForDuplicateIndexSignatures(node); + } } function getTargetSymbol(s: Symbol) { @@ -5949,32 +6112,37 @@ module ts { } function checkInterfaceDeclaration(node: InterfaceDeclaration) { - checkTypeNameIsReserved(node.name, Diagnostics.Interface_name_cannot_be_0); checkTypeParameters(node.typeParameters); - checkExportsOnMergedDeclarations(node); - var symbol = getSymbolOfNode(node); - var firstInterfaceDecl = getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration); - if (symbol.declarations.length > 1) { - if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) { - error(node.name, Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters); - } - } + if (fullTypeCheck) { + checkTypeNameIsReserved(node.name, Diagnostics.Interface_name_cannot_be_0); - // Only check this symbol once - if (node === firstInterfaceDecl) { - var type = getDeclaredTypeOfSymbol(symbol); - // run subsequent checks only if first set succeeded - if (checkInheritedPropertiesAreIdentical(type, node.name)) { - forEach(type.baseTypes, baseType => { - checkTypeAssignableTo(type, baseType, node.name, Diagnostics.Interface_0_incorrectly_extends_interface_1_Colon, Diagnostics.Interface_0_incorrectly_extends_interface_1); - }); - checkIndexConstraints(type); + checkExportsOnMergedDeclarations(node); + var symbol = getSymbolOfNode(node); + var firstInterfaceDecl = getDeclarationOfKind(symbol, SyntaxKind.InterfaceDeclaration); + if (symbol.declarations.length > 1) { + if (node !== firstInterfaceDecl && !areTypeParametersIdentical(firstInterfaceDecl.typeParameters, node.typeParameters)) { + error(node.name, Diagnostics.All_declarations_of_an_interface_must_have_identical_type_parameters); + } + } + + // Only check this symbol once + if (node === firstInterfaceDecl) { + var type = getDeclaredTypeOfSymbol(symbol); + // run subsequent checks only if first set succeeded + if (checkInheritedPropertiesAreIdentical(type, node.name)) { + forEach(type.baseTypes, baseType => { + checkTypeAssignableTo(type, baseType, node.name, Diagnostics.Interface_0_incorrectly_extends_interface_1_Colon, Diagnostics.Interface_0_incorrectly_extends_interface_1); + }); + checkIndexConstraints(type); + } } } forEach(node.baseTypes, checkTypeReference); forEach(node.members, checkSourceElement); - checkTypeForDuplicateIndexSignatures(node); + if (fullTypeCheck) { + checkTypeForDuplicateIndexSignatures(node); + } } function getConstantValue(node: Expression): number { @@ -5995,6 +6163,9 @@ module ts { } function checkEnumDeclaration(node: EnumDeclaration) { + if (!fullTypeCheck) { + return; + } checkTypeNameIsReserved(node.name, Diagnostics.Enum_name_cannot_be_0); checkCollisionWithCapturedThisVariable(node, node.name); checkExportsOnMergedDeclarations(node); @@ -6068,26 +6239,28 @@ module ts { } function checkModuleDeclaration(node: ModuleDeclaration) { - checkCollisionWithCapturedThisVariable(node, node.name); - checkExportsOnMergedDeclarations(node); - var symbol = getSymbolOfNode(node); - if (symbol.flags & SymbolFlags.ValueModule && symbol.declarations.length > 1 && !isInAmbientContext(node)) { - var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol); - if (classOrFunc) { - if (getSourceFileOfNode(node) !== getSourceFileOfNode(classOrFunc)) { - error(node.name, Diagnostics.A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged); - } - else if (node.pos < classOrFunc.pos) { - error(node.name, Diagnostics.A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged); + if (fullTypeCheck) { + checkCollisionWithCapturedThisVariable(node, node.name); + checkExportsOnMergedDeclarations(node); + var symbol = getSymbolOfNode(node); + if (symbol.flags & SymbolFlags.ValueModule && symbol.declarations.length > 1 && !isInAmbientContext(node)) { + var classOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol); + if (classOrFunc) { + if (getSourceFileOfNode(node) !== getSourceFileOfNode(classOrFunc)) { + error(node.name, Diagnostics.A_module_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged); + } + else if (node.pos < classOrFunc.pos) { + error(node.name, Diagnostics.A_module_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged); + } } } - } - if (node.name.kind === SyntaxKind.StringLiteral) { - if (!isGlobalSourceFile(node.parent)) { - error(node.name, Diagnostics.Ambient_external_modules_cannot_be_nested_in_other_modules); - } - if (isExternalModuleNameRelative(node.name.text)) { - error(node.name, Diagnostics.Ambient_external_module_declaration_cannot_specify_relative_module_name); + if (node.name.kind === SyntaxKind.StringLiteral) { + if (!isGlobalSourceFile(node.parent)) { + error(node.name, Diagnostics.Ambient_external_modules_cannot_be_nested_in_other_modules); + } + if (isExternalModuleNameRelative(node.name.text)) { + error(node.name, Diagnostics.Ambient_external_module_declaration_cannot_specify_relative_module_name); + } } } checkSourceElement(node.body); @@ -6248,8 +6421,7 @@ module ts { } } - // Fully type check a source file and collect the relevant diagnostics. The fullTypeCheck flag is true during this - // operation, but otherwise is false when the compiler is used by the language service. + // Fully type check a source file and collect the relevant diagnostics. function checkSourceFile(node: SourceFile) { var links = getNodeLinks(node); if (!(links.flags & NodeCheckFlags.TypeChecked)) { @@ -6276,7 +6448,9 @@ module ts { forEach(program.getSourceFiles(), checkSourceFile); } - function getSortedDiagnostics(): Diagnostic[] { + function getSortedDiagnostics(): Diagnostic[]{ + Debug.assert(fullTypeCheck, "diagnostics are available only in the full typecheck mode"); + if (diagnosticsModified) { diagnostics.sort(compareDiagnostics); diagnostics = deduplicateSortedDiagnostics(diagnostics); @@ -6285,7 +6459,8 @@ module ts { return diagnostics; } - function getDiagnostics(sourceFile?: SourceFile): Diagnostic[] { + function getDiagnostics(sourceFile?: SourceFile): Diagnostic[]{ + if (sourceFile) { checkSourceFile(sourceFile); return filter(getSortedDiagnostics(), d => d.file === sourceFile); @@ -6758,7 +6933,8 @@ module ts { writeTypeAtLocation: writeTypeAtLocation, writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration, writeSymbol: writeSymbolToTextWriter, - isSymbolAccessible: isSymbolAccessible + isSymbolAccessible: isSymbolAccessible, + isImportDeclarationEntityNameReferenceDeclarationVisibile: isImportDeclarationEntityNameReferenceDeclarationVisibile }; checkProgram(); return emitFiles(resolver); diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index cc789bcca11..7b0f27d6327 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -113,6 +113,51 @@ module ts { Extends_clause_of_exported_class_0_has_or_is_using_name_1_from_private_module_2: { code: 2021, category: DiagnosticCategory.Error, key: "Extends clause of exported class '{0}' has or is using name '{1}' from private module '{2}'." }, Implements_clause_of_exported_class_0_has_or_is_using_name_1_from_private_module_2: { code: 2022, category: DiagnosticCategory.Error, key: "Implements clause of exported class '{0}' has or is using name '{1}' from private module '{2}'." }, Extends_clause_of_exported_interface_0_has_or_is_using_name_1_from_private_module_2: { code: 2023, category: DiagnosticCategory.Error, key: "Extends clause of exported interface '{0}' has or is using name '{1}' from private module '{2}'." }, + Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 2024, category: DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using private name '{1}'." }, + Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 2025, category: DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using private name '{1}'." }, + Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 2026, category: DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using private name '{1}'." }, + Exported_variable_0_has_or_is_using_private_name_1: { code: 2027, category: DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using private name '{1}'." }, + Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2028, category: DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." }, + Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2029, category: DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." }, + Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 2030, category: DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." }, + Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 2031, category: DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 2032, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." }, + Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 2033, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." }, + Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 2034, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." }, + Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 2035, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." }, + Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 2036, category: DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." }, + Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 2037, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." }, + Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 2038, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." }, + Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 2039, category: DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." }, + Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 2040, category: DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using private name '{1}'." }, + Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2041, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2042, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2043, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 2044, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 2045, category: DiagnosticCategory.Error, key: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2046, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 2047, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 2048, category: DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." }, + Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 2049, category: DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." }, + Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 2050, category: DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using private name '{0}'." }, + Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 2051, category: DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using private name '{0}'." }, + Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 2052, category: DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using private name '{0}'." }, + Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 2053, category: DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using private name '{0}'." }, + Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 2054, category: DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using private name '{0}'." }, + Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 2055, category: DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using private name '{0}'." }, + Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 2056, category: DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using private name '{0}'." }, + Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 2057, category: DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using private name '{0}'." }, + Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 2058, category: DiagnosticCategory.Error, key: "Return type of exported function has or is using private name '{0}'." }, + Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 2059, category: DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." }, + Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 2060, category: DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." }, + Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 2061, category: DiagnosticCategory.Error, key: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." }, + Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 2062, category: DiagnosticCategory.Error, key: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." }, + Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 2063, category: DiagnosticCategory.Error, key: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." }, + Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 2064, category: DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." }, + Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 2065, category: DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." }, + Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 2066, category: DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." }, + Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 2067, category: DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." }, + Import_declaration_0_is_using_private_name_1: { code: 2181, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." }, Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 2208, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." }, Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 2209, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." }, Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 2210, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." }, @@ -187,6 +232,18 @@ module ts { A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2246, category: DiagnosticCategory.Error, key: "A parameter property is only allowed in a constructor implementation." }, Function_overload_must_be_static: { code: 2247, category: DiagnosticCategory.Error, key: "Function overload must be static." }, Function_overload_must_not_be_static: { code: 2248, category: DiagnosticCategory.Error, key: "Function overload must not be static." }, + Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2249, category: DiagnosticCategory.Error, key: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." }, + Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2250, category: DiagnosticCategory.Error, key: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." }, + Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2251, category: DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." }, + Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2252, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." }, + Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2253, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." }, + Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2254, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." }, + Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 2255, category: DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." }, + Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 2256, category: DiagnosticCategory.Error, key: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." }, + Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 2257, category: DiagnosticCategory.Error, key: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." }, + Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 2258, category: DiagnosticCategory.Error, key: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." }, + Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 2259, category: DiagnosticCategory.Error, key: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." }, + Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 2260, category: DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." }, Circular_definition_of_import_alias_0: { code: 3000, category: DiagnosticCategory.Error, key: "Circular definition of import alias '{0}'." }, Cannot_find_name_0: { code: 3001, category: DiagnosticCategory.Error, key: "Cannot find name '{0}'." }, Module_0_has_no_exported_member_1: { code: 3002, category: DiagnosticCategory.Error, key: "Module '{0}' has no exported member '{1}'." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index d60fd2e5c4f..02cad50d8bb 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -444,6 +444,186 @@ "category": "Error", "code": 2023 }, + "Public static property '{0}' of exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2024 + }, + "Public property '{0}' of exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2025 + }, + "Property '{0}' of exported interface has or is using private name '{1}'.": { + "category": "Error", + "code": 2026 + }, + "Exported variable '{0}' has or is using private name '{1}'.": { + "category": "Error", + "code": 2027 + }, + "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2028 + }, + "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2029 + }, + "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2030 + }, + "Exported variable '{0}' has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2031 + }, + "Parameter '{0}' of constructor from exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2032 + }, + "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2033 + }, + "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2034 + }, + "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'.": { + "category": "Error", + "code": 2035 + }, + "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'.": { + "category": "Error", + "code": 2036 + }, + "Parameter '{0}' of public static method from exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2037 + }, + "Parameter '{0}' of public method from exported class has or is using private name '{1}'.": { + "category": "Error", + "code": 2038 + }, + "Parameter '{0}' of method from exported interface has or is using private name '{1}'.": { + "category": "Error", + "code": 2039 + }, + "Parameter '{0}' of exported function has or is using private name '{1}'.": { + "category": "Error", + "code": 2040 + }, + "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2041 + }, + "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2042 + }, + "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2043 + }, + "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2044 + }, + "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2045 + }, + "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2046 + }, + "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2047 + }, + "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2048 + }, + "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'.": { + "category": "Error", + "code": 2049 + }, + "Return type of public static property getter from exported class has or is using private name '{0}'.": { + "category": "Error", + "code": 2050 + }, + "Return type of public property getter from exported class has or is using private name '{0}'.": { + "category": "Error", + "code": 2051 + }, + "Return type of constructor signature from exported interface has or is using private name '{0}'.": { + "category": "Error", + "code": 2052 + }, + "Return type of call signature from exported interface has or is using private name '{0}'.": { + "category": "Error", + "code": 2053 + }, + "Return type of index signature from exported interface has or is using private name '{0}'.": { + "category": "Error", + "code": 2054 + }, + "Return type of public static method from exported class has or is using private name '{0}'.": { + "category": "Error", + "code": 2055 + }, + "Return type of public method from exported class has or is using private name '{0}'.": { + "category": "Error", + "code": 2056 + }, + "Return type of method from exported interface has or is using private name '{0}'.": { + "category": "Error", + "code": 2057 + }, + "Return type of exported function has or is using private name '{0}'.": { + "category": "Error", + "code": 2058 + }, + "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2059 + }, + "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2060 + }, + "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2061 + }, + "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2062 + }, + "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2063 + }, + "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2064 + }, + "Return type of public method from exported class has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2065 + }, + "Return type of method from exported interface has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2066 + }, + "Return type of exported function has or is using name '{0}' from private module '{1}'.": { + "category": "Error", + "code": 2067 + }, + "Import declaration '{0}' is using private name '{1}'.": { + "category": "Error", + "code": 2181 + }, "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'.": { "category": "Error", "code": 2208 @@ -740,6 +920,54 @@ "category": "Error", "code": 2248 }, + "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2249 + }, + "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2250 + }, + "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2251 + }, + "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2252 + }, + "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2253 + }, + "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2254 + }, + "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named.": { + "category": "Error", + "code": 2255 + }, + "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named.": { + "category": "Error", + "code": 2256 + }, + "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named.": { + "category": "Error", + "code": 2257 + }, + "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named.": { + "category": "Error", + "code": 2258 + }, + "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named.": { + "category": "Error", + "code": 2259 + }, + "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named.": { + "category": "Error", + "code": 2260 + }, "Circular definition of import alias '{0}'.": { "category": "Error", "code": 3000 diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 8c62617f7f6..7e11b978c67 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -9,6 +9,7 @@ module ts { getTextPos(): number; getLine(): number; getColumn(): number; + getIndent(): number; } var indentStrings: string[] = []; @@ -141,6 +142,7 @@ module ts { writeLine: writeLine, increaseIndent: () => indent++, decreaseIndent: () => indent--, + getIndent: () => indent, getTextPos: () => output.length, getLine: () => lineCount + 1, getColumn: () => lineStart ? indent * 4 + 1 : output.length - linePos + 1, @@ -1867,27 +1869,63 @@ module ts { var enclosingDeclaration: Node; var reportedDeclarationError = false; + var aliasDeclarationEmitInfo: { + declaration: ImportDeclaration; + outputPos: number; + indent: number; + asynchronousOutput?: string; // If the output for alias was written asynchronously, the corresponding output + }[] = []; + var getSymbolVisibilityDiagnosticMessage: (symbolAccesibilityResult: SymbolAccessiblityResult) => { errorNode: Node; diagnosticMessage: DiagnosticMessage; - typeName: Identifier + typeName?: Identifier + } + + function writeAsychronousImportDeclarations(importDeclarations: ImportDeclaration[]) { + var oldWriter = writer; + forEach(importDeclarations, aliasToWrite => { + var aliasEmitInfo = forEach(aliasDeclarationEmitInfo, declEmitInfo => declEmitInfo.declaration === aliasToWrite ? declEmitInfo : undefined); + writer = createTextWriter(writeSymbol); + for (var declarationIndent = aliasEmitInfo.indent; declarationIndent; declarationIndent--) { + writer.increaseIndent(); + } + + writeImportDeclaration(aliasToWrite); + aliasEmitInfo.asynchronousOutput = writer.getText(); + }); + writer = oldWriter; } function writeSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) { var symbolAccesibilityResult = resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning); - // TODO(shkamat): Since we dont have error reporting for all the cases as yet we have this check on handler being present - if (!getSymbolVisibilityDiagnosticMessage || symbolAccesibilityResult.accessibility === SymbolAccessibility.Accessible) { + if (symbolAccesibilityResult.accessibility === SymbolAccessibility.Accessible) { resolver.writeSymbol(symbol, enclosingDeclaration, meaning, writer); + + // write the aliases + if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) { + writeAsychronousImportDeclarations(symbolAccesibilityResult.aliasesToMakeVisible); + } } else { // Report error reportedDeclarationError = true; var errorInfo = getSymbolVisibilityDiagnosticMessage(symbolAccesibilityResult); - diagnostics.push(createDiagnosticForNode(errorInfo.errorNode, - errorInfo.diagnosticMessage, - getSourceTextOfLocalNode(errorInfo.typeName), - symbolAccesibilityResult.errorSymbolName, - symbolAccesibilityResult.errorModuleName)); + if (errorInfo) { + if (errorInfo.typeName) { + diagnostics.push(createDiagnosticForNode(errorInfo.errorNode, + errorInfo.diagnosticMessage, + getSourceTextOfLocalNode(errorInfo.typeName), + symbolAccesibilityResult.errorSymbolName, + symbolAccesibilityResult.errorModuleName)); + } + else { + diagnostics.push(createDiagnosticForNode(errorInfo.errorNode, + errorInfo.diagnosticMessage, + symbolAccesibilityResult.errorSymbolName, + symbolAccesibilityResult.errorModuleName)); + } + } } } @@ -1951,23 +1989,55 @@ module ts { } function emitImportDeclaration(node: ImportDeclaration) { - if (resolver.isDeclarationVisible(node)) { - if (node.flags & NodeFlags.Export) { - write("export "); - } - write("import "); - emitSourceTextOfNode(node.name); - write(" = "); - if (node.entityName) { - emitSourceTextOfNode(node.entityName); - write(";"); + var nodeEmitInfo = { + declaration: node, + outputPos: writer.getTextPos(), + indent: writer.getIndent(), + hasWritten: resolver.isDeclarationVisible(node) + }; + aliasDeclarationEmitInfo.push(nodeEmitInfo); + if (nodeEmitInfo.hasWritten) { + writeImportDeclaration(node); + } + } + + function writeImportDeclaration(node: ImportDeclaration) { + // note usage of writer. methods instead of aliases created, just to make sure we are using + // correct writer especially to handle asynchronous alias writing + if (node.flags & NodeFlags.Export) { + writer.write("export "); + } + writer.write("import "); + writer.write(getSourceTextOfLocalNode(node.name)); + writer.write(" = "); + if (node.entityName) { + checkEntityNameAccessible(); + writer.write(getSourceTextOfLocalNode(node.entityName)); + writer.write(";"); + } + else { + writer.write("require("); + writer.write(getSourceTextOfLocalNode(node.externalModuleName)); + writer.write(");"); + } + writer.writeLine(); + + function checkEntityNameAccessible() { + var symbolAccesibilityResult = resolver.isImportDeclarationEntityNameReferenceDeclarationVisibile(node.entityName); + if (symbolAccesibilityResult.accessibility === SymbolAccessibility.Accessible) { + // write the aliases + if (symbolAccesibilityResult.aliasesToMakeVisible) { + writeAsychronousImportDeclarations(symbolAccesibilityResult.aliasesToMakeVisible); + } } else { - write("require("); - emitSourceTextOfNode(node.externalModuleName); - write(");"); + // Report error + reportedDeclarationError = true; + diagnostics.push(createDiagnosticForNode(node, + Diagnostics.Import_declaration_0_is_using_private_name_1, + getSourceTextOfLocalNode(node.name), + symbolAccesibilityResult.errorSymbolName)); } - writeLine(); } } @@ -2023,7 +2093,7 @@ module ts { function emitTypeParameters(typeParameters: TypeParameterDeclaration[]) { function emitTypeParameter(node: TypeParameterDeclaration) { function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { - // TODO(shkamat) Cannot access name errors + // Type parameter constraints are named by user so we should always be able to name it var diagnosticMessage: DiagnosticMessage; switch (node.parent.kind) { case SyntaxKind.ClassDeclaration: @@ -2082,7 +2152,7 @@ module ts { diagnosticMessage: diagnosticMessage, errorNode: node, typeName: node.name - } + }; } emitSourceTextOfNode(node.name); @@ -2090,9 +2160,7 @@ module ts { if (node.constraint && (node.parent.kind !== SyntaxKind.Method || !(node.parent.flags & NodeFlags.Private))) { write(" extends "); getSymbolVisibilityDiagnosticMessage = getTypeParameterConstraintVisibilityError; - resolver.writeTypeAtLocation(node.constraint, enclosingDeclaration, TypeFormatFlags.None, writer); - // TODO(shkamat) This is just till we get rest of the error reporting up - getSymbolVisibilityDiagnosticMessage = undefined; + resolver.writeTypeAtLocation(node.constraint, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); } } @@ -2111,48 +2179,34 @@ module ts { function emitTypeOfTypeReference(node: Node) { getSymbolVisibilityDiagnosticMessage = getHeritageClauseVisibilityError; - resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.WriteArrayAsGenericType, writer); - // TODO(shkamat) This is just till we get rest of the error reporting up - getSymbolVisibilityDiagnosticMessage = undefined; + resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.WriteArrayAsGenericType | TypeFormatFlags.UseTypeOfFunction, writer); function getHeritageClauseVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { var diagnosticMessage: DiagnosticMessage; + // Heritage clause is written by user so it can always be named if (node.parent.kind === SyntaxKind.ClassDeclaration) { // Class - if (symbolAccesibilityResult.accessibility == SymbolAccessibility.NotAccessible) { - if (symbolAccesibilityResult.errorModuleName) { - // Module is inaccessible - diagnosticMessage = isImplementsList ? - Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_name_1_from_private_module_2 : - Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_name_1_from_private_module_2; - } - else { - // Class or Interface implemented/extended is inaccessible - diagnosticMessage = isImplementsList ? - Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : - Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; - } + if (symbolAccesibilityResult.errorModuleName) { + // Module is inaccessible + diagnosticMessage = isImplementsList ? + Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_name_1_from_private_module_2; } else { - // CannotBeNamed - // TODO(shkamat): CannotBeNamed error needs to be handled + // Class or Interface implemented/extended is inaccessible + diagnosticMessage = isImplementsList ? + Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 : + Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1; } } else { - // Interface - if (symbolAccesibilityResult.accessibility == SymbolAccessibility.NotAccessible) { - if (symbolAccesibilityResult.errorModuleName) { - // Module is inaccessible - diagnosticMessage = Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_name_1_from_private_module_2; - } - else { - // interface is inaccessible - diagnosticMessage = Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; - } + if (symbolAccesibilityResult.errorModuleName) { + // Module is inaccessible + diagnosticMessage = Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_name_1_from_private_module_2; } else { - // CannotBeNamed - // TODO(shkamat): CannotBeNamed error needs to be handled + // interface is inaccessible + diagnosticMessage = Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; } } @@ -2160,7 +2214,7 @@ module ts { diagnosticMessage: diagnosticMessage, errorNode: node, typeName: (node.parent).name - } + }; } } } @@ -2237,9 +2291,50 @@ module ts { } if (!(node.flags & NodeFlags.Private)) { write(": "); - resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.None, writer); + getSymbolVisibilityDiagnosticMessage = getVariableDeclarationTypeVisibilityError; + resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); } } + + function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { + var diagnosticMessage: DiagnosticMessage; + if (node.kind === SyntaxKind.VariableDeclaration) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Exported_variable_0_has_or_is_using_private_name_1; + } + // This check is to ensure we dont report error on constructor parameter property as that error would be reported during parameter emit + else if (node.kind === SyntaxKind.Property) { + if (node.flags & NodeFlags.Static) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1; + } + else if (node.parent.kind === SyntaxKind.ClassDeclaration) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1; + } + else { + // Interfaces cannot have types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1; + } + } + + return diagnosticMessage !== undefined ? { + diagnosticMessage: diagnosticMessage, + errorNode: node, + typeName: node.name + } : undefined; + } } function emitVariableStatement(node: VariableStatement) { @@ -2260,11 +2355,55 @@ module ts { emitSourceTextOfNode(node.name); if (!(node.flags & NodeFlags.Private)) { write(": "); - resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.None, writer); + getSymbolVisibilityDiagnosticMessage = getAccessorDeclarationTypeVisibilityError; + resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); } write(";"); writeLine(); } + + function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { + var diagnosticMessage: DiagnosticMessage; + if (node.kind === SyntaxKind.SetAccessor) { + // Setters have to have type named and cannot infer it so, the type should always be named + if (node.parent.flags & NodeFlags.Static) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1; + } + else { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1; + } + return { + diagnosticMessage: diagnosticMessage, + errorNode: node.parameters[0], + typeName: node.name + }; + } + else { + if (node.flags & NodeFlags.Static) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0; + } + else { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0; + } + return { + diagnosticMessage: diagnosticMessage, + errorNode: node.name, + typeName: undefined + }; + } + } } function emitFunctionDeclaration(node: FunctionDeclaration) { @@ -2317,10 +2456,76 @@ module ts { // If this is not a constructor and is not private, emit the return type if (node.kind !== SyntaxKind.Constructor && !(node.flags & NodeFlags.Private)) { write(": "); - resolver.writeReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, TypeFormatFlags.None, writer); + getSymbolVisibilityDiagnosticMessage = getReturnTypeVisibilityError; + resolver.writeReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); } write(";"); writeLine(); + + function getReturnTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { + var diagnosticMessage: DiagnosticMessage; + switch (node.kind) { + case SyntaxKind.ConstructSignature: + // Interfaces cannot have return types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0; + break; + + case SyntaxKind.CallSignature: + // Interfaces cannot have return types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0; + break; + + case SyntaxKind.IndexSignature: + // Interfaces cannot have return types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0; + break; + + case SyntaxKind.Method: + if (node.flags & NodeFlags.Static) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0; + } + else if (node.parent.kind === SyntaxKind.ClassDeclaration) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0; + } + else { + // Interfaces cannot have return types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0; + } + break; + + case SyntaxKind.FunctionDeclaration: + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named : + Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 : + Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0; + break; + + default: + Debug.fail("This is unknown kind for signature: " + SyntaxKind[node.kind]); + } + + return { + diagnosticMessage: diagnosticMessage, + errorNode: node.name || node, + }; + } } function emitParameterDeclaration(node: ParameterDeclaration) { @@ -2334,7 +2539,75 @@ module ts { if (!(node.parent.flags & NodeFlags.Private)) { write(": "); - resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.None, writer); + getSymbolVisibilityDiagnosticMessage = getParameterDeclarationTypeVisibilityError; + resolver.writeTypeAtLocation(node, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); + } + + function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { + var diagnosticMessage: DiagnosticMessage; + switch (node.parent.kind) { + case SyntaxKind.Constructor: + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1; + break; + + case SyntaxKind.ConstructSignature: + // Interfaces cannot have parameter types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; + break; + + case SyntaxKind.CallSignature: + // Interfaces cannot have parameter types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; + break; + + case SyntaxKind.Method: + if (node.parent.flags & NodeFlags.Static) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1; + } + else if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) { + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; + } + else { + // Interfaces cannot have parameter types that cannot be named + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; + } + break; + + case SyntaxKind.FunctionDeclaration: + diagnosticMessage = symbolAccesibilityResult.errorModuleName ? + symbolAccesibilityResult.accessibility === SymbolAccessibility.CannotBeNamed ? + Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : + Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 : + Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1; + break; + + default: + Debug.fail("This is unknown parent for parameter: " + SyntaxKind[node.parent.kind]); + } + + return { + diagnosticMessage: diagnosticMessage, + errorNode: node, + typeName: node.name + }; } } @@ -2448,7 +2721,19 @@ module ts { // TODO(shkamat): Should we not write any declaration file if any of them can produce error, // or should we just not write this file like we are doing now if (!reportedDeclarationError) { - writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", referencePathsOutput + writer.getText(), compilerOptions.emitBOM); + var declarationOutput = referencePathsOutput; + var synchronousDeclarationOutput = writer.getText(); + // apply additions + var appliedSyncOutputPos = 0; + forEach(aliasDeclarationEmitInfo, aliasEmitInfo => { + if (aliasEmitInfo.asynchronousOutput) { + declarationOutput += synchronousDeclarationOutput.substring(appliedSyncOutputPos, aliasEmitInfo.outputPos); + declarationOutput += aliasEmitInfo.asynchronousOutput; + appliedSyncOutputPos = aliasEmitInfo.outputPos; + } + }); + declarationOutput += synchronousDeclarationOutput.substring(appliedSyncOutputPos); + writeFile(getModuleNameFromFilename(jsFilePath) + ".d.ts", declarationOutput, compilerOptions.emitBOM); } } @@ -2469,6 +2754,11 @@ module ts { if (compilerOptions.out) { emitFile(compilerOptions.out); } + + // Sort and make the unique list of diagnostics + diagnostics.sort(compareDiagnostics); + diagnostics = deduplicateSortedDiagnostics(diagnostics); + return { errors: diagnostics, sourceMaps: sourceMapDataList diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 91a30143047..d75fea408dc 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -1554,11 +1554,11 @@ module ts { // Note: for ease of implementation we treat productions '2' and '3' as the same thing. // (i.e. they're both BinaryExpressions with an assignment operator in it). - // First, check if we have production '4' (an arrow function). Note that if we do, we - // must *not* recurse for productsion 1, 2 or 3. An ArrowFunction is not a - // LeftHandSideExpression, nor does it start a ConditionalExpression. So we are done + // First, check if we have an arrow function (production '4') that starts with a parenthesized + // parameter list. If we do, we must *not* recurse for productsion 1, 2 or 3. An ArrowFunction is + // not a LeftHandSideExpression, nor does it start a ConditionalExpression. So we are done // with AssignmentExpression if we see one. - var arrowExpression = tryParseArrowFunctionExpression(); + var arrowExpression = tryParseParenthesizedArrowFunctionExpression(); if (arrowExpression) { return arrowExpression; } @@ -1567,6 +1567,13 @@ module ts { // including a conditional expression. var expr = parseConditionalExpression(noIn); + // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized + // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single + // identifier and the current token is an arrow. + if (expr.kind === SyntaxKind.Identifier && token === SyntaxKind.EqualsGreaterThanToken) { + return parseSimpleArrowFunctionExpression(expr); + } + // Now see if we might be in cases '2' or '3'. // If the expression was a LHS expression, and we have an assignment operator, then // we're in '2' or '3'. Consume the assignment and return. @@ -1613,39 +1620,7 @@ module ts { return false; } - function tryParseArrowFunctionExpression(): Expression { - return isSimpleArrowFunctionExpression() - ? parseSimpleArrowFunctionExpression() - : tryParseParenthesizedArrowFunctionExpression(); - } - - function isSimpleArrowFunctionExpression(): boolean { - if (token === SyntaxKind.EqualsGreaterThanToken) { - // ERROR RECOVERY TWEAK: - // If we see a standalone => try to parse it as an arrow function expression as that's - // likely whatthe user intended to write. - return true; - } - - if (token === SyntaxKind.Identifier) { - // if we see: a => - // then this is clearly an arrow function expression. - return lookAhead(() => { - return nextToken() === SyntaxKind.EqualsGreaterThanToken; - }); - } - - // Definitely not a simple arrow function expression. - return false; - } - - function parseSimpleArrowFunctionExpression(): Expression { - Debug.assert(token === SyntaxKind.Identifier || token === SyntaxKind.EqualsGreaterThanToken); - - // Get the identifier for the simple arrow. If one isn't there then we'll report a useful - // message that it is missing. - var identifier = parseIdentifier(); - + function parseSimpleArrowFunctionExpression(identifier: Identifier): Expression { Debug.assert(token === SyntaxKind.EqualsGreaterThanToken, "parseSimpleArrowFunctionExpression should only have been called if we had a =>"); parseExpected(SyntaxKind.EqualsGreaterThanToken); @@ -1664,8 +1639,6 @@ module ts { } function tryParseParenthesizedArrowFunctionExpression(): Expression { - var pos = getNodePos(); - // Indicates whether we are certain that we should parse an arrow expression. var triState = isParenthesizedArrowFunctionExpression(); @@ -1673,6 +1646,8 @@ module ts { return undefined; } + var pos = getNodePos(); + if (triState === Tristate.True) { var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken); @@ -1765,7 +1740,12 @@ module ts { } }); } - + if (token === SyntaxKind.EqualsGreaterThanToken) { + // ERROR RECOVERY TWEAK: + // If we see a standalone => try to parse it as an arrow function expression as that's + // likely whatthe user intended to write. + return Tristate.True; + } // Definitely not a parenthesized arrow function. return Tristate.False; } @@ -3582,7 +3562,7 @@ module ts { getCompilerHost: () => host, getDiagnostics: getDiagnostics, getGlobalDiagnostics: getGlobalDiagnostics, - getTypeChecker: () => createTypeChecker(program), + getTypeChecker: fullTypeCheckMode => createTypeChecker(program, fullTypeCheckMode), getCommonSourceDirectory: () => commonSourceDirectory, }; return program; diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts index d6c19e61bb4..2f5ff604df3 100644 --- a/src/compiler/sys.ts +++ b/src/compiler/sys.ts @@ -14,7 +14,7 @@ interface System { createDirectory(directoryName: string): void; getExecutingFilePath(): string; getCurrentDirectory(): string; - getMemoryUsage(): number; + getMemoryUsage?(): number; exit(exitCode?: number): void; } @@ -128,9 +128,6 @@ var sys: System = (function () { getCurrentDirectory() { return new ActiveXObject("WScript.Shell").CurrentDirectory; }, - getMemoryUsage() { - return 0; - }, exit(exitCode?: number): void { try { WScript.Quit(exitCode); @@ -234,7 +231,9 @@ var sys: System = (function () { return (process).cwd(); }, getMemoryUsage() { - global.gc(); + if (global.gc) { + global.gc(); + } return process.memoryUsage().heapUsed; }, exit(exitCode?: number): void { diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 054b76c55b2..d355c49ab29 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -38,7 +38,7 @@ module ts { } function trySetLanguageAndTerritory(language: string, territory: string, errors: Diagnostic[]): boolean { - var compilerFilePath = sys.getExecutingFilePath(); + var compilerFilePath = normalizePath(sys.getExecutingFilePath()); var containingDirectoryPath = getDirectoryPath(compilerFilePath); var filePath = combinePaths(containingDirectoryPath, language); @@ -62,7 +62,7 @@ module ts { return false; } try { - localizedDiagnosticMessages = JSON.parse(fileContents); + ts.localizedDiagnosticMessages = JSON.parse(fileContents); } catch (e) { errors.push(createCompilerDiagnostic(Diagnostics.Corrupted_locale_file_0, filePath)); @@ -326,7 +326,7 @@ module ts { var reportStart = bindStart; } else { - var checker = program.getTypeChecker(); + var checker = program.getTypeChecker(/*fullTypeCheckMode*/ true); var checkStart = new Date().getTime(); var semanticErrors = checker.getDiagnostics(); var emitStart = new Date().getTime(); @@ -337,12 +337,16 @@ module ts { reportDiagnostics(errors); if (commandLine.options.diagnostics) { + var memoryUsed = sys.getMemoryUsage ? sys.getMemoryUsage() : -1; reportCountStatistic("Files", program.getSourceFiles().length); reportCountStatistic("Lines", countLines(program)); reportCountStatistic("Nodes", checker ? checker.getNodeCount() : 0); reportCountStatistic("Identifiers", checker ? checker.getIdentifierCount() : 0); reportCountStatistic("Symbols", checker ? checker.getSymbolCount() : 0); reportCountStatistic("Types", checker ? checker.getTypeCount() : 0); + if (memoryUsed >= 0) { + reportStatisticalValue("Memory used", Math.round(memoryUsed / 1000) + "K"); + } reportTimeStatistic("Parse time", bindStart - parseStart); reportTimeStatistic("Bind time", checkStart - bindStart); reportTimeStatistic("Check time", emitStart - checkStart); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 33414c75e3d..cc10f060c67 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -539,7 +539,7 @@ module ts { getCompilerHost(): CompilerHost; getDiagnostics(sourceFile?: SourceFile): Diagnostic[]; getGlobalDiagnostics(): Diagnostic[]; - getTypeChecker(): TypeChecker; + getTypeChecker(fullTypeCheckMode: boolean): TypeChecker; getCommonSourceDirectory(): string; } @@ -627,6 +627,8 @@ module ts { /** writes Array instead T[] */ WriteArrayAsGenericType = 0x00000001, // Declarations + + UseTypeOfFunction = 0x00000002, // instead of writing signature type of function use typeof } export enum SymbolAccessibility { @@ -637,8 +639,9 @@ module ts { export interface SymbolAccessiblityResult { accessibility: SymbolAccessibility; - errorSymbolName?: string; // Optional symbol name that results in error - errorModuleName?: string; // If the symbol is not visibile from module, module's name + errorSymbolName?: string // Optional symbol name that results in error + errorModuleName?: string // If the symbol is not visibile from module, module's name + aliasesToMakeVisible?: ImportDeclaration[]; // aliases that need to have this symbol visible } export interface EmitResolver { @@ -658,6 +661,7 @@ module ts { writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void; writeSymbol(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags, writer: TextWriter): void; isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult; + isImportDeclarationEntityNameReferenceDeclarationVisibile(entityName: EntityName): SymbolAccessiblityResult; } export enum SymbolFlags { diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts index 9dce321a275..81802516532 100644 --- a/src/harness/compilerRunner.ts +++ b/src/harness/compilerRunner.ts @@ -126,93 +126,7 @@ class CompilerBaselineRunner extends RunnerBase { otherFiles: { unitName: string; content: string }[], result: Harness.Compiler.CompilerResult ) { - - var outputLines: string[] = []; - // Count up all the errors we find so we don't miss any - var totalErrorsReported = 0; - - function outputErrorText(error: Harness.Compiler.MinimalDiagnostic) { - var errLines = RunnerBase.removeFullPaths(error.message) - .split('\n') - .map(s => s.length > 0 && s.charAt(s.length - 1) === '\r' ? s.substr(0, s.length - 1) : s) - .filter(s => s.length > 0) - .map(s => '!!! ' + s); - errLines.forEach(e => outputLines.push(e)); - - totalErrorsReported++; - } - - // Report glovbal errors: - var globalErrors = result.errors.filter(err => !err.filename); - globalErrors.forEach(err => outputErrorText(err)); - - // 'merge' the lines of each input file with any errors associated with it - toBeCompiled.concat(otherFiles).forEach(inputFile => { - // Filter down to the errors in the file - var fileErrors = result.errors.filter(e => { - var errFn = e.filename; - return errFn && errFn === inputFile.unitName; - }); - - - // Header - outputLines.push('==== ' + inputFile.unitName + ' (' + fileErrors.length + ' errors) ===='); - - // Make sure we emit something for every error - var markedErrorCount = 0; - // For each line, emit the line followed by any error squiggles matching this line - // Note: IE JS engine incorrectly handles consecutive delimiters here when using RegExp split, so - // we have to string-based splitting instead and try to figure out the delimiting chars - - var lineStarts = ts.getLineStarts(inputFile.content); - var lines = inputFile.content.split('\n'); - lines.forEach((line, lineIndex) => { - if (line.length > 0 && line.charAt(line.length - 1) === '\r') { - line = line.substr(0, line.length - 1); - } - - var thisLineStart = lineStarts[lineIndex]; - var nextLineStart: number; - // On the last line of the file, fake the next line start number so that we handle errors on the last character of the file correctly - if (lineIndex === lines.length - 1) { - nextLineStart = inputFile.content.length; - } else { - nextLineStart = lineStarts[lineIndex + 1]; - } - // Emit this line from the original file - outputLines.push(' ' + line); - fileErrors.forEach(err => { - // Does any error start or continue on to this line? Emit squiggles - if ((err.end >= thisLineStart) && ((err.start < nextLineStart) || (lineIndex === lines.length - 1))) { - // How many characters from the start of this line the error starts at (could be positive or negative) - var relativeOffset = err.start - thisLineStart; - // How many characters of the error are on this line (might be longer than this line in reality) - var length = (err.end - err.start) - Math.max(0, thisLineStart - err.start); - // Calculate the start of the squiggle - var squiggleStart = Math.max(0, relativeOffset); - // TODO/REVIEW: this doesn't work quite right in the browser if a multi file test has files whose names are just the right length relative to one another - outputLines.push(' ' + line.substr(0, squiggleStart).replace(/[^\s]/g, ' ') + new Array(Math.min(length, line.length - squiggleStart) + 1).join('~')); - - // If the error ended here, or we're at the end of the file, emit its message - if ((lineIndex === lines.length - 1) || nextLineStart > err.end) { - // Just like above, we need to do a split on a string instead of on a regex - // because the JS engine does regexes wrong - - outputErrorText(err); - markedErrorCount++; - } - } - }); - }); - - // Verify we didn't miss any errors in this file - assert.equal(markedErrorCount, fileErrors.length, 'count of errors in ' + inputFile.unitName); - }); - - // Verify we didn't miss any errors in total - assert.equal(totalErrorsReported, result.errors.length, 'total number of errors'); - - return outputLines.join('\r\n'); + return Harness.Compiler.getErrorBaseline(toBeCompiled.concat(otherFiles), result.errors); } // check errors @@ -250,7 +164,7 @@ class CompilerBaselineRunner extends RunnerBase { var declFile = ts.forEach(result.declFilesCode, declFile => declFile.fileName === (file.unitName.substr(0, file.unitName.length - ".ts".length) + ".d.ts") ? declFile : undefined); - return { unitName: rootDir + Harness.Path.getFileName(declFile.fileName), content: declFile.code }; + return { unitName: declFile.fileName, content: declFile.code }; } } @@ -294,7 +208,7 @@ class CompilerBaselineRunner extends RunnerBase { if (result.declFilesCode.length > 0) { jsCode += '\r\n\r\n'; - for (var i = 0; i < result.files.length; i++) { + for (var i = 0; i < result.declFilesCode.length; i++) { jsCode += '//// [' + Harness.Path.getFileName(result.declFilesCode[i].fileName) + ']\r\n'; jsCode += getByteOrderMarkText(result.declFilesCode[i]); jsCode += result.declFilesCode[i].code; diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index da649f77dd9..0fa27f0d1fa 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -1904,7 +1904,7 @@ module FourSlash { var host = Harness.Compiler.createCompilerHost(files, (fn, contents) => result = contents); var program = ts.createProgram([fourslashFilename, fileName], { out: "fourslashTestOutput.js" }, host); - var checker = ts.createTypeChecker(program); + var checker = ts.createTypeChecker(program, /*fullTypeCheckMode*/ true); checker.checkProgram(); var errs = checker.getDiagnostics(files[fileName]); diff --git a/src/harness/harness.ts b/src/harness/harness.ts index dce80544222..37edd1d4162 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -736,7 +736,7 @@ module Harness { var hadParseErrors = program.getDiagnostics().length > 0; - var checker = program.getTypeChecker(); + var checker = program.getTypeChecker(/*fullTypeCheckMode*/ true); checker.checkProgram(); // only emit if there weren't parse errors @@ -748,7 +748,7 @@ module Harness { var errors: MinimalDiagnostic[] = []; program.getDiagnostics().concat(checker.getDiagnostics()).concat(emitResult ? emitResult.errors : []).forEach(err => { // TODO: new compiler formats errors after this point to add . and newlines so we'll just do it manually for now - errors.push({ filename: err.file && err.file.filename, start: err.start, end: err.start + err.length, line: 0, character: 0, message: err.messageText }); + errors.push(getMinimalDiagnostic(err)); }); this.lastErrors = errors; @@ -763,6 +763,102 @@ module Harness { } } + export function getMinimalDiagnostic(err: ts.Diagnostic): MinimalDiagnostic { + return { filename: err.file && err.file.filename, start: err.start, end: err.start + err.length, line: 0, character: 0, message: err.messageText }; + } + + export function getErrorBaseline(inputFiles: { unitName: string; content: string }[], + diagnostics: MinimalDiagnostic[] + ) { + + var outputLines: string[] = []; + // Count up all the errors we find so we don't miss any + var totalErrorsReported = 0; + + function outputErrorText(error: Harness.Compiler.MinimalDiagnostic) { + var errLines = RunnerBase.removeFullPaths(error.message) + .split('\n') + .map(s => s.length > 0 && s.charAt(s.length - 1) === '\r' ? s.substr(0, s.length - 1) : s) + .filter(s => s.length > 0) + .map(s => '!!! ' + s); + errLines.forEach(e => outputLines.push(e)); + + totalErrorsReported++; + } + + // Report glovbal errors: + var globalErrors = diagnostics.filter(err => !err.filename); + globalErrors.forEach(err => outputErrorText(err)); + + // 'merge' the lines of each input file with any errors associated with it + inputFiles.forEach(inputFile => { + // Filter down to the errors in the file + var fileErrors = diagnostics.filter(e => { + var errFn = e.filename; + return errFn && errFn === inputFile.unitName; + }); + + + // Header + outputLines.push('==== ' + inputFile.unitName + ' (' + fileErrors.length + ' errors) ===='); + + // Make sure we emit something for every error + var markedErrorCount = 0; + // For each line, emit the line followed by any error squiggles matching this line + // Note: IE JS engine incorrectly handles consecutive delimiters here when using RegExp split, so + // we have to string-based splitting instead and try to figure out the delimiting chars + + var lineStarts = ts.getLineStarts(inputFile.content); + var lines = inputFile.content.split('\n'); + lines.forEach((line, lineIndex) => { + if (line.length > 0 && line.charAt(line.length - 1) === '\r') { + line = line.substr(0, line.length - 1); + } + + var thisLineStart = lineStarts[lineIndex]; + var nextLineStart: number; + // On the last line of the file, fake the next line start number so that we handle errors on the last character of the file correctly + if (lineIndex === lines.length - 1) { + nextLineStart = inputFile.content.length; + } else { + nextLineStart = lineStarts[lineIndex + 1]; + } + // Emit this line from the original file + outputLines.push(' ' + line); + fileErrors.forEach(err => { + // Does any error start or continue on to this line? Emit squiggles + if ((err.end >= thisLineStart) && ((err.start < nextLineStart) || (lineIndex === lines.length - 1))) { + // How many characters from the start of this line the error starts at (could be positive or negative) + var relativeOffset = err.start - thisLineStart; + // How many characters of the error are on this line (might be longer than this line in reality) + var length = (err.end - err.start) - Math.max(0, thisLineStart - err.start); + // Calculate the start of the squiggle + var squiggleStart = Math.max(0, relativeOffset); + // TODO/REVIEW: this doesn't work quite right in the browser if a multi file test has files whose names are just the right length relative to one another + outputLines.push(' ' + line.substr(0, squiggleStart).replace(/[^\s]/g, ' ') + new Array(Math.min(length, line.length - squiggleStart) + 1).join('~')); + + // If the error ended here, or we're at the end of the file, emit its message + if ((lineIndex === lines.length - 1) || nextLineStart > err.end) { + // Just like above, we need to do a split on a string instead of on a regex + // because the JS engine does regexes wrong + + outputErrorText(err); + markedErrorCount++; + } + } + }); + }); + + // Verify we didn't miss any errors in this file + assert.equal(markedErrorCount, fileErrors.length, 'count of errors in ' + inputFile.unitName); + }); + + // Verify we didn't miss any errors in total + assert.equal(totalErrorsReported, diagnostics.length, 'total number of errors'); + + return outputLines.join('\r\n'); + } + /* TODO: Delete? export function makeDefaultCompilerSettings(options?: { useMinimalDefaultLib: boolean; noImplicitAny: boolean; }) { var useMinimalDefaultLib = options ? options.useMinimalDefaultLib : true; diff --git a/src/harness/projectsRunner.ts b/src/harness/projectsRunner.ts index 5b4b1712e8e..c192c3acecf 100644 --- a/src/harness/projectsRunner.ts +++ b/src/harness/projectsRunner.ts @@ -29,13 +29,15 @@ interface BatchCompileProjectTestCaseEmittedFile extends Harness.Compiler.Genera emittedFileName: string; } -interface BatchCompileProjectTestCaseResult { +interface CompileProjectFilesResult { moduleKind: ts.ModuleKind; program: ts.Program; - readInputFiles: ts.SourceFile[]; - sourceMapData: ts.SourceMapData[]; - outputFiles: BatchCompileProjectTestCaseEmittedFile[]; errors: ts.Diagnostic[]; + sourceMapData: ts.SourceMapData[]; +} + +interface BatchCompileProjectTestCaseResult extends CompileProjectFilesResult { + outputFiles: BatchCompileProjectTestCaseEmittedFile[]; nonSubfolderDiskFiles: number; } @@ -114,13 +116,43 @@ class ProjectRunner extends RunnerBase { return url; } - - function batchCompilerProjectTestCase(moduleKind: ts.ModuleKind): BatchCompileProjectTestCaseResult{ - var nonSubfolderDiskFiles = 0; - var readInputFiles: ts.SourceFile[] = []; + function getCurrentDirectory() { + return sys.resolvePath(testCase.projectRoot); + } + + function compileProjectFiles(moduleKind: ts.ModuleKind, getInputFiles: ()=> string[], + getSourceFileText: (filename: string) => string, + writeFile: (filename: string, data: string, writeByteOrderMark: boolean) => void): CompileProjectFilesResult { + + var program = ts.createProgram(getInputFiles(), createCompilerOptions(), createCompilerHost()); + var errors = program.getDiagnostics(); var sourceMapData: ts.SourceMapData[] = null; - var outputFiles: BatchCompileProjectTestCaseEmittedFile[] = []; + if (!errors.length) { + var checker = program.getTypeChecker(/*fullTypeCheck*/ true); + errors = checker.getDiagnostics(); + var emitResult = checker.emitFiles(); + errors = ts.concatenate(errors, emitResult.errors); + sourceMapData = emitResult.sourceMaps; + + // Clean up source map data that will be used in baselining + if (sourceMapData) { + for (var i = 0; i < sourceMapData.length; i++) { + for (var j = 0; j < sourceMapData[i].sourceMapSources.length; j++) { + sourceMapData[i].sourceMapSources[j] = cleanProjectUrl(sourceMapData[i].sourceMapSources[j]); + } + sourceMapData[i].jsSourceMappingURL = cleanProjectUrl(sourceMapData[i].jsSourceMappingURL); + sourceMapData[i].sourceMapSourceRoot = cleanProjectUrl(sourceMapData[i].sourceMapSourceRoot); + } + } + } + + return { + moduleKind: moduleKind, + program: program, + errors: errors, + sourceMapData: sourceMapData + }; function createCompilerOptions(): ts.CompilerOptions { return { @@ -140,28 +172,55 @@ class ProjectRunner extends RunnerBase { sourceFile = Harness.Compiler.defaultLibSourceFile; } else { - assert.isTrue(!ts.filter(readInputFiles, sourceFile => sourceFile.filename == filename).length, "Compiler trying to read same file again: " + filename); - - try { - var text = sys.readFile(ts.isRootedDiskPath(filename) - ? filename - : ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(filename)); - } - catch (e) { - // text doesn't get defined. - } - + var text = getSourceFileText(filename); if (text !== undefined) { sourceFile = ts.createSourceFile(filename, text, languageVersion); } } - if (sourceFile) { - readInputFiles.push(sourceFile); - } return sourceFile; } + function createCompilerHost(): ts.CompilerHost { + return { + getSourceFile: getSourceFile, + getDefaultLibFilename: () => "lib.d.ts", + writeFile: writeFile, + getCurrentDirectory: getCurrentDirectory, + getCanonicalFileName: ts.getCanonicalFileName, + useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames, + getNewLine: () => sys.newLine + }; + } + } + + function batchCompilerProjectTestCase(moduleKind: ts.ModuleKind): BatchCompileProjectTestCaseResult{ + var nonSubfolderDiskFiles = 0; + + var outputFiles: BatchCompileProjectTestCaseEmittedFile[] = []; + + var projectCompilerResult = compileProjectFiles(moduleKind, () => testCase.inputFiles, getSourceFileText, writeFile); + return { + moduleKind: moduleKind, + program: projectCompilerResult.program, + sourceMapData: projectCompilerResult.sourceMapData, + outputFiles: outputFiles, + errors: projectCompilerResult.errors, + nonSubfolderDiskFiles: nonSubfolderDiskFiles, + }; + + function getSourceFileText(filename: string): string { + try { + var text = sys.readFile(ts.isRootedDiskPath(filename) + ? filename + : ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(filename)); + } + catch (e) { + // text doesn't get defined. + } + return text; + } + function writeFile(filename: string, data: string, writeByteOrderMark: boolean) { var diskFileName = ts.isRootedDiskPath(filename) ? filename @@ -209,53 +268,55 @@ class ProjectRunner extends RunnerBase { outputFiles.push({ emittedFileName: filename, code: data, fileName: diskRelativeName, writeByteOrderMark: writeByteOrderMark }); } + } - function getCurrentDirectory() { - return sys.resolvePath(testCase.projectRoot); + function compileCompileDTsFiles(compilerResult: BatchCompileProjectTestCaseResult) { + var inputDtsSourceFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(), + sourceFile => Harness.Compiler.isDTS(sourceFile.filename)), + sourceFile => { + return { emittedFileName: sourceFile.filename, code: sourceFile.text }; + }); + + var ouputDtsFiles = ts.filter(compilerResult.outputFiles, ouputFile => Harness.Compiler.isDTS(ouputFile.emittedFileName)); + var allInputFiles = inputDtsSourceFiles.concat(ouputDtsFiles); + return compileProjectFiles(compilerResult.moduleKind,getInputFiles, getSourceFileText, writeFile); + + function getInputFiles() { + return ts.map(allInputFiles, outputFile => outputFile.emittedFileName); + } + function getSourceFileText(filename: string): string { + return ts.forEach(allInputFiles, inputFile => inputFile.emittedFileName === filename ? inputFile.code : undefined); } - function createCompilerHost(): ts.CompilerHost { - return { - getSourceFile: getSourceFile, - getDefaultLibFilename: () => Harness.Compiler.defaultLibFileName, - writeFile: writeFile, - getCurrentDirectory: getCurrentDirectory, - getCanonicalFileName: ts.getCanonicalFileName, - useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames, - getNewLine:()=> sys.newLine - }; + function writeFile(filename: string, data: string, writeByteOrderMark: boolean) { } + } - var program = ts.createProgram(testCase.inputFiles, createCompilerOptions(), createCompilerHost()); - var errors = program.getDiagnostics(); - if (!errors.length) { - var checker = program.getTypeChecker(); - errors = checker.getDiagnostics(); - var emitResult = checker.emitFiles(); - errors = ts.concatenate(errors, emitResult.errors); - sourceMapData = emitResult.sourceMaps; - - // Clean up source map data that will be used in baselining - if (sourceMapData) { - for (var i = 0; i < sourceMapData.length; i++) { - for (var j = 0; j < sourceMapData[i].sourceMapSources.length; j++) { - sourceMapData[i].sourceMapSources[j] = cleanProjectUrl(sourceMapData[i].sourceMapSources[j]); - } - sourceMapData[i].jsSourceMappingURL = cleanProjectUrl(sourceMapData[i].jsSourceMappingURL); - sourceMapData[i].sourceMapSourceRoot = cleanProjectUrl(sourceMapData[i].sourceMapSourceRoot); - } + function getErrorsBaseline(compilerResult: CompileProjectFilesResult) { + // This is copied from tc.ts's reportError to replicate what tc does + var errors = ""; + for (var i = 0; i < compilerResult.errors.length; i++) { + var error = compilerResult.errors[i]; + // TODO(jfreeman): Remove assert + ts.Debug.assert(error.messageText.indexOf("{NL}") < 0); + if (error.file) { + var loc = error.file.getLineAndCharacterFromPosition(error.start); + errors += error.file.filename + "(" + loc.line + "," + loc.character + "): " + error.messageText + sys.newLine; + } + else { + errors += error.messageText + sys.newLine; } } - return { - moduleKind: moduleKind, - program: program, - readInputFiles: readInputFiles, - sourceMapData: sourceMapData, - outputFiles: outputFiles, - errors: errors, - nonSubfolderDiskFiles: nonSubfolderDiskFiles, - }; + var inputFiles = ts.map(ts.filter(compilerResult.program.getSourceFiles(), + sourceFile => sourceFile.filename !== "lib.d.ts"), + sourceFile => { + return { unitName: sourceFile.filename, content: sourceFile.text }; + }); + var diagnostics = ts.map(compilerResult.errors, error => Harness.Compiler.getMinimalDiagnostic(error)); + errors += sys.newLine + sys.newLine + Harness.Compiler.getErrorBaseline(inputFiles, diagnostics); + + return errors; } describe('Compiling project for ' + testCase.scenario +': testcase ' + testCaseFileName, () => { @@ -276,7 +337,7 @@ class ProjectRunner extends RunnerBase { baselineCheck: testCase.baselineCheck, runTest: testCase.runTest, bug: testCase.bug, - resolvedInputFiles: ts.map(compilerResult.readInputFiles, inputFile => inputFile.filename), + resolvedInputFiles: ts.map(compilerResult.program.getSourceFiles(), inputFile => inputFile.filename), emittedFiles: ts.map(compilerResult.outputFiles, outputFile => outputFile.emittedFileName) }; @@ -284,7 +345,6 @@ class ProjectRunner extends RunnerBase { } it('Resolution information of (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, () => { - assert.equal(compilerResult.program.getSourceFiles().length, compilerResult.readInputFiles.length, "Compiler missing/has extra source files that were read during compilation"); Harness.Baseline.runBaseline('Resolution information of (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + '.json', () => { return JSON.stringify(getCompilerResolutionInfo(), undefined, " "); }); @@ -293,22 +353,7 @@ class ProjectRunner extends RunnerBase { if (compilerResult.errors.length) { it('Errors for (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, () => { Harness.Baseline.runBaseline('Errors for (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + '.errors.txt', () => { - // This is copied from tc.ts's reportError to replicate what tc does - var errors = ""; - for (var i = 0; i < compilerResult.errors.length; i++) { - var error = compilerResult.errors[i]; - // TODO(jfreeman): Remove assert - ts.Debug.assert(error.messageText.indexOf("{NL}") < 0); - if (error.file) { - var loc = error.file.getLineAndCharacterFromPosition(error.start); - errors += error.file.filename + "(" + loc.line + "," + loc.character + "): " + error.messageText + sys.newLine; - } - else { - errors += error.messageText + sys.newLine; - } - } - - return errors; + return getErrorsBaseline(compilerResult); }); }); } @@ -335,6 +380,18 @@ class ProjectRunner extends RunnerBase { }); }); } + + // Verify that all the generated .d.ts files compile + if (!compilerResult.errors.length && testCase.declaration) { + var dTsCompileResult = compileCompileDTsFiles(compilerResult); + if (dTsCompileResult.errors.length) { + it('Errors in generated Dts files for (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, () => { + Harness.Baseline.runBaseline('Errors in generated Dts files for (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + testCaseJustName + '.dts.errors.txt', () => { + return getErrorsBaseline(dTsCompileResult); + }); + }); + } + } } } diff --git a/src/services/services.ts b/src/services/services.ts index 7ff47cc2c3e..c96223578ba 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1256,7 +1256,11 @@ module ts { var formattingRulesProvider: TypeScript.Services.Formatting.RulesProvider; var hostCache: HostCache; // A cache of all the information about the files on the host side. var program: Program; - var typeChecker: TypeChecker; + // this checker is used to answer all LS questions except errors + var typeInfoResolver: TypeChecker; + // the sole purpose of this checkes is to reutrn semantic diagnostics + // creation is deferred - use getFullTypeCheckChecker to get instance + var fullTypeCheckChecker_doNotAccessDirectly: TypeChecker; var useCaseSensitivefilenames = false; var sourceFilesByName: Map = {}; var documentRegistry = documentRegistry; @@ -1272,6 +1276,10 @@ module ts { return lookUp(sourceFilesByName, filename); } + function getFullTypeCheckChecker() { + return fullTypeCheckChecker_doNotAccessDirectly || (fullTypeCheckChecker_doNotAccessDirectly = program.getTypeChecker(/*fullTypeCheck*/ true)); + } + function createCompilerHost(): CompilerHost { return { getSourceFile: (filename, languageVersion) => { @@ -1403,7 +1411,8 @@ module ts { // Now create a new compiler program = createProgram(hostfilenames, compilationSettings, createCompilerHost()); - typeChecker = program.getTypeChecker(); + typeInfoResolver = program.getTypeChecker(/*fullTypeCheckMode*/ false); + fullTypeCheckChecker_doNotAccessDirectly = undefined; } /// Clean up any semantic caches that are not needed. @@ -1411,7 +1420,8 @@ module ts { /// We will just dump the typeChecker and recreate a new one. this should have the effect of destroying all the semantic caches. function cleanupSemanticCache(): void { if (program) { - typeChecker = program.getTypeChecker(); + typeInfoResolver = program.getTypeChecker(/*fullTypeCheckMode*/ false); + fullTypeCheckChecker_doNotAccessDirectly = undefined; } } @@ -1436,7 +1446,7 @@ module ts { filename = TypeScript.switchToForwardSlashes(filename) - return typeChecker.getDiagnostics(getSourceFile(filename).getSourceFile()); + return getFullTypeCheckChecker().getDiagnostics(getSourceFile(filename)); } function getCompilerOptionsDiagnostics() { @@ -1678,12 +1688,12 @@ module ts { entries: [], symbols: {}, location: mappedNode, - typeChecker: typeChecker + typeChecker: typeInfoResolver }; // Right of dot member completion list if (isRightOfDot) { - var type: Type = typeChecker.getTypeOfExpression(mappedNode); + var type: Type = typeInfoResolver.getTypeOfExpression(mappedNode); if (!type) { return undefined; } @@ -1731,7 +1741,7 @@ module ts { isMemberCompletion = false; /// TODO filter meaning based on the current context var symbolMeanings = SymbolFlags.Type | SymbolFlags.Value | SymbolFlags.Namespace; - var symbols = typeChecker.getSymbolsInScope(mappedNode, symbolMeanings); + var symbols = typeInfoResolver.getSymbolsInScope(mappedNode, symbolMeanings); getCompletionEntriesFromSymbols(symbols, activeCompletionSession); } @@ -1770,7 +1780,7 @@ module ts { kind: completionEntry.kind, kindModifiers: completionEntry.kindModifiers, type: session.typeChecker.typeToString(type, session.location), - fullSymbolName: typeChecker.symbolToString(symbol, session.location), + fullSymbolName: typeInfoResolver.symbolToString(symbol, session.location), docComment: "" }; } @@ -1882,13 +1892,13 @@ module ts { var node = getNodeAtPosition(sourceFile.getSourceFile(), position); if (!node) return undefined; - var symbol = typeChecker.getSymbolInfo(node); - var type = symbol && typeChecker.getTypeOfSymbol(symbol); + var symbol = typeInfoResolver.getSymbolInfo(node); + var type = symbol && typeInfoResolver.getTypeOfSymbol(symbol); if (type) { return { - memberName: new TypeScript.MemberNameString(typeChecker.typeToString(type)), + memberName: new TypeScript.MemberNameString(typeInfoResolver.typeToString(type)), docComment: "", - fullSymbolName: typeChecker.symbolToString(symbol, getContainerNode(node)), + fullSymbolName: typeInfoResolver.symbolToString(symbol, getContainerNode(node)), kind: getSymbolKind(symbol), minChar: node.pos, limChar: node.end @@ -2034,7 +2044,7 @@ module ts { return undefined; } - var symbol = typeChecker.getSymbolInfo(node); + var symbol = typeInfoResolver.getSymbolInfo(node); // Could not find a symbol e.g. node is string or number keyword, // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol @@ -2045,10 +2055,10 @@ module ts { var result: DefinitionInfo[] = []; var declarations = symbol.getDeclarations(); - var symbolName = typeChecker.symbolToString(symbol, node); + var symbolName = typeInfoResolver.symbolToString(symbol, node); var symbolKind = getSymbolKind(symbol); var containerSymbol = symbol.parent; - var containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : ""; + var containerName = containerSymbol ? typeInfoResolver.symbolToString(containerSymbol, node) : ""; var containerKind = containerSymbol ? getSymbolKind(symbol) : ""; if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) && diff --git a/tests/baselines/reference/aliasInaccessibleModule.errors.txt b/tests/baselines/reference/aliasInaccessibleModule.errors.txt new file mode 100644 index 00000000000..839ea965b02 --- /dev/null +++ b/tests/baselines/reference/aliasInaccessibleModule.errors.txt @@ -0,0 +1,8 @@ +==== tests/cases/compiler/aliasInaccessibleModule.ts (1 errors) ==== + module M { + module N { + } + export import X = N; + ~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'X' is using private name 'N'. + } \ No newline at end of file diff --git a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt new file mode 100644 index 00000000000..149410acb10 --- /dev/null +++ b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt @@ -0,0 +1,12 @@ +==== tests/cases/compiler/aliasInaccessibleModule2.ts (1 errors) ==== + module M { + module N { + class C { + } + + } + import R = N; + ~~~~~~~~~~~~~ +!!! Import declaration 'R' is using private name 'N'. + export import X = R; + } \ No newline at end of file diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt b/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt deleted file mode 100644 index 2fdccc7f49a..00000000000 --- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -==== tests/cases/compiler/aliasUsage1_main.ts (2 errors) ==== - import Backbone = require("aliasUsage1_backbone"); - import moduleA = require("aliasUsage1_moduleA"); - interface IHasVisualizationModel { - VisualizationModel: typeof Backbone.Model; - } - class C2 { - x: IHasVisualizationModel; - get A() { - ~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return this.x; - } - set A(x) { - ~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - x = moduleA; - } - } -==== tests/cases/compiler/aliasUsage1_backbone.ts (0 errors) ==== - export class Model { - public someData: string; - } - -==== tests/cases/compiler/aliasUsage1_moduleA.ts (0 errors) ==== - import Backbone = require("aliasUsage1_backbone"); - export class VisualizationModel extends Backbone.Model { - // interesting stuff here - } - \ No newline at end of file diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js new file mode 100644 index 00000000000..485aedc971d --- /dev/null +++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js @@ -0,0 +1,69 @@ +//// [tests/cases/compiler/aliasUsageInAccessorsOfClass.ts] //// + +//// [aliasUsage1_backbone.ts] +export class Model { + public someData: string; +} + +//// [aliasUsage1_moduleA.ts] +import Backbone = require("aliasUsage1_backbone"); +export class VisualizationModel extends Backbone.Model { + // interesting stuff here +} + +//// [aliasUsage1_main.ts] +import Backbone = require("aliasUsage1_backbone"); +import moduleA = require("aliasUsage1_moduleA"); +interface IHasVisualizationModel { + VisualizationModel: typeof Backbone.Model; +} +class C2 { + x: IHasVisualizationModel; + get A() { + return this.x; + } + set A(x) { + x = moduleA; + } +} + +//// [aliasUsage1_backbone.js] +var Model = (function () { + function Model() { + } + return Model; +})(); +exports.Model = Model; +//// [aliasUsage1_moduleA.js] +var __extends = this.__extends || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + __.prototype = b.prototype; + d.prototype = new __(); +}; +var Backbone = require("aliasUsage1_backbone"); +var VisualizationModel = (function (_super) { + __extends(VisualizationModel, _super); + function VisualizationModel() { + _super.apply(this, arguments); + } + return VisualizationModel; +})(Backbone.Model); +exports.VisualizationModel = VisualizationModel; +//// [aliasUsage1_main.js] +var moduleA = require("aliasUsage1_moduleA"); +var C2 = (function () { + function C2() { + } + Object.defineProperty(C2.prototype, "A", { + get: function () { + return this.x; + }, + set: function (x) { + x = moduleA; + }, + enumerable: true, + configurable: true + }); + return C2; +})(); diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js index 23360404b5e..999ba787bd9 100644 --- a/tests/baselines/reference/commentsClassMembers.js +++ b/tests/baselines/reference/commentsClassMembers.js @@ -487,11 +487,11 @@ declare var i1_ncf: (b: number) => number; declare var i1_ncr: number; declare var i1_ncprop: number; declare var i1_s_p: number; -declare var i1_s_f: (b: number) => number; +declare var i1_s_f: typeof c1.s2; declare var i1_s_r: number; declare var i1_s_prop: number; declare var i1_s_nc_p: number; -declare var i1_s_ncf: (b: number) => number; +declare var i1_s_ncf: typeof c1.nc_s2; declare var i1_s_ncr: number; declare var i1_s_ncprop: number; declare var i1_c: typeof c1; diff --git a/tests/baselines/reference/cyclicModuleImport.js b/tests/baselines/reference/cyclicModuleImport.js index 08f3c7d6147..1c9b74eea4f 100644 --- a/tests/baselines/reference/cyclicModuleImport.js +++ b/tests/baselines/reference/cyclicModuleImport.js @@ -20,3 +20,24 @@ declare module "MainModule" { //// [cyclicModuleImport.js] + + +//// [cyclicModuleImport.d.ts] +declare module "SubModule" { + import MainModule = require('MainModule'); + class SubModule { + static StaticVar: number; + InstanceVar: number; + main: MainModule; + constructor(); + } + export = SubModule; +} +declare module "MainModule" { + import SubModule = require('SubModule'); + class MainModule { + SubModule: SubModule; + constructor(); + } + export = MainModule; +} diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js index 11740adf2c9..d8e729782f8 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js @@ -27,28 +27,12 @@ exports.x; declare module "SubModule" { module m { module m3 { + interface c { + } } } } //// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts] /// +import SubModule = require('SubModule'); export declare var x: SubModule.m.m3.c; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts (1 errors) ==== - /// - export declare var x: SubModule.m.m3.c; - ~~~~~~~~~~~~~~~~ -!!! Cannot find name 'SubModule'. - -==== tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts (0 errors) ==== - declare module "SubModule" { - module m { - module m3 { - } - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index 37851569ad2..75968ed1794 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -28,20 +28,5 @@ interface Foo { } export = Foo; //// [declFileExportAssignmentOfGenericInterface_1.d.ts] +import a = require('declFileExportAssignmentOfGenericInterface_0'); export declare var x: a>; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileExportAssignmentOfGenericInterface_1.d.ts (1 errors) ==== - export declare var x: a>; - ~~~~~~~~~~~~ -!!! Cannot find name 'a'. - -==== tests/cases/compiler/declFileExportAssignmentOfGenericInterface_0.d.ts (0 errors) ==== - interface Foo { - a: string; - } - export = Foo; - \ No newline at end of file diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index b9cc3834a82..bac4bdadbda 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -74,33 +74,5 @@ export = b; //// [declFileExportImportChain_c.d.ts] export import b1 = require("declFileExportImportChain_b1"); //// [declFileExportImportChain_d.d.ts] -export declare var x: m1.m2.c1; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileExportImportChain_d.d.ts (1 errors) ==== - export declare var x: m1.m2.c1; - ~~~~~~~~ -!!! Cannot find name 'm1'. - -==== tests/cases/compiler/declFileExportImportChain_a.d.ts (0 errors) ==== - declare module m1 { - module m2 { - class c1 { - } - } - } - export = m1; - -==== tests/cases/compiler/declFileExportImportChain_b.d.ts (0 errors) ==== - export import a = require("declFileExportImportChain_a"); - -==== tests/cases/compiler/declFileExportImportChain_b1.d.ts (0 errors) ==== - import b = require("declFileExportImportChain_b"); - export = b; - -==== tests/cases/compiler/declFileExportImportChain_c.d.ts (0 errors) ==== - export import b1 = require("declFileExportImportChain_b1"); - \ No newline at end of file +import c = require("declFileExportImportChain_c"); +export declare var x: c.b1.a.m2.c1; diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 02b59139360..9a739056c3d 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -65,30 +65,5 @@ export = a; //// [declFileExportImportChain2_c.d.ts] export import b = require("declFileExportImportChain2_b"); //// [declFileExportImportChain2_d.d.ts] -export declare var x: m1.m2.c1; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileExportImportChain2_d.d.ts (1 errors) ==== - export declare var x: m1.m2.c1; - ~~~~~~~~ -!!! Cannot find name 'm1'. - -==== tests/cases/compiler/declFileExportImportChain2_a.d.ts (0 errors) ==== - declare module m1 { - module m2 { - class c1 { - } - } - } - export = m1; - -==== tests/cases/compiler/declFileExportImportChain2_b.d.ts (0 errors) ==== - import a = require("declFileExportImportChain2_a"); - export = a; - -==== tests/cases/compiler/declFileExportImportChain2_c.d.ts (0 errors) ==== - export import b = require("declFileExportImportChain2_b"); - \ No newline at end of file +import c = require("declFileExportImportChain2_c"); +export declare var x: c.b.m2.c1; diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index 2be231c1381..815b8712f15 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -131,10 +131,10 @@ export declare module C { } } export declare var a: C.A; -export declare var b: (x: T) => C.A; -export declare var c: (x: T) => C.A; -export declare var d: (x: T) => C.A[]; -export declare var e: >(x: T) => C.A[]; +export declare var b: typeof C.F; +export declare var c: typeof C.F2; +export declare var d: typeof C.F3; +export declare var e: typeof C.F4; export declare var x: C.A; export declare function f>(): void; export declare var g: C.A; @@ -142,4 +142,4 @@ export declare class h extends C.A { } export interface i extends C.A { } -export declare var j: >(x: T) => T; +export declare var j: typeof C.F6; diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js index 9e0578e0ef9..dd751feeaae 100644 --- a/tests/baselines/reference/declFileGenericType2.js +++ b/tests/baselines/reference/declFileGenericType2.js @@ -91,12 +91,21 @@ var templa; //// [declFileGenericType2.d.ts] declare module templa.mvc { + interface IModel { + } } declare module templa.mvc { + interface IController { + } } declare module templa.mvc { + class AbstractController implements IController { + } } declare module templa.mvc.composite { + interface ICompositeControllerModel extends IModel { + getControllers(): IController[]; + } } declare module templa.dom.mvc { interface IElementController extends templa.mvc.IController { @@ -113,45 +122,3 @@ declare module templa.dom.mvc.composite { constructor(); } } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileGenericType2.d.ts (6 errors) ==== - declare module templa.mvc { - } - declare module templa.mvc { - } - declare module templa.mvc { - } - declare module templa.mvc.composite { - } - declare module templa.dom.mvc { - interface IElementController extends templa.mvc.IController { - ~~~~~~~~~~~~~~~~~ -!!! Module 'templa.mvc' has no exported member 'IModel'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Module 'templa.mvc' has no exported member 'IController'. - } - } - declare module templa.dom.mvc { - class AbstractElementController extends templa.mvc.AbstractController implements IElementController { - ~~~~~~~~~~~~~~~~~ -!!! Module 'templa.mvc' has no exported member 'IModel'. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Module 'templa.mvc' has no exported member 'AbstractController'. - constructor(); - } - } - declare module templa.dom.mvc.composite { - class AbstractCompositeElementController extends AbstractElementController { - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Module 'templa.mvc.composite' has no exported member 'ICompositeControllerModel'. - _controllers: templa.mvc.IController[]; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Module 'templa.mvc' has no exported member 'IController'. - constructor(); - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js new file mode 100644 index 00000000000..73d8ede215a --- /dev/null +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js @@ -0,0 +1,39 @@ +//// [declFileImportChainInExportAssignment.ts] +module m { + export module c { + export class c { + } + } +} +import a = m.c; +import b = a; +export = b; + +//// [declFileImportChainInExportAssignment.js] +var m; +(function (m) { + (function (_c) { + var c = (function () { + function c() { + } + return c; + })(); + _c.c = c; + })(m.c || (m.c = {})); + var c = m.c; +})(m || (m = {})); +var a = m.c; +var b = a; +module.exports = b; + + +//// [declFileImportChainInExportAssignment.d.ts] +declare module m { + module c { + class c { + } + } +} +import a = m.c; +import b = a; +export = b; diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index 3f695dcb895..c07ac176806 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -52,43 +52,9 @@ declare var m2: { }; export = m2; //// [declFileImportModuleWithExportAssignment_1.d.ts] +import a1 = require("declFileImportModuleWithExportAssignment_0"); export declare var a: { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileImportModuleWithExportAssignment_1.d.ts (3 errors) ==== - export declare var a: { - (): a1.connectExport; - ~~~~~~~~~~~~~~~~ -!!! Cannot find name 'a1'. - test1: a1.connectModule; - ~~~~~~~~~~~~~~~~ -!!! Cannot find name 'a1'. - test2(): a1.connectModule; - ~~~~~~~~~~~~~~~~ -!!! Cannot find name 'a1'. - }; - -==== tests/cases/compiler/declFileImportModuleWithExportAssignment_0.d.ts (0 errors) ==== - declare module m2 { - interface connectModule { - (res: any, req: any, next: any): void; - } - interface connectExport { - use: (mod: connectModule) => connectExport; - listen: (port: number) => void; - } - } - declare var m2: { - (): m2.connectExport; - test1: m2.connectModule; - test2(): m2.connectModule; - }; - export = m2; - \ No newline at end of file diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js index 249b4a2874c..e12a921ffc2 100644 --- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js +++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js @@ -25,23 +25,10 @@ var List = (function () { declare class List { } declare module 'mod1' { + class Foo { + } } declare module 'moo' { + import x = require('mod1'); var p: List; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileImportedTypeUseInTypeArgPosition.d.ts (1 errors) ==== - declare class List { - } - declare module 'mod1' { - } - declare module 'moo' { - var p: List; - ~~~~~ -!!! Cannot find name 'x'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js index 8b35b3d80d3..c465644fcde 100644 --- a/tests/baselines/reference/declFileInternalAliases.js +++ b/tests/baselines/reference/declFileInternalAliases.js @@ -40,29 +40,10 @@ declare module m { } } declare module m1 { + import x = m.c; var d: x; } declare module m2 { export import x = m.c; var d: x; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declFileInternalAliases.d.ts (1 errors) ==== - declare module m { - class c { - } - } - declare module m1 { - var d: x; - ~ -!!! Cannot find name 'x'. - } - declare module m2 { - export import x = m.c; - var d: x; - } - \ No newline at end of file diff --git a/tests/baselines/reference/declFileTypeofFunction.js b/tests/baselines/reference/declFileTypeofFunction.js index 66517ca4a94..f488d418f6d 100644 --- a/tests/baselines/reference/declFileTypeofFunction.js +++ b/tests/baselines/reference/declFileTypeofFunction.js @@ -64,39 +64,15 @@ function foo5(x) { //// [declFileTypeofFunction.d.ts] -declare function f(n: { - (n: typeof f): string; - (n: { - (n: typeof g): number; - (n: typeof f): number; - }): string; -}): string; -declare function f(n: { - (n: typeof g): number; - (n: { - (n: typeof f): string; - (n: typeof g): string; - }): number; -}): string; -declare function g(n: { - (n: typeof g): number; - (n: { - (n: typeof f): string; - (n: typeof g): string; - }): number; -}): number; -declare function g(n: { - (n: typeof f): string; - (n: { - (n: typeof g): number; - (n: typeof f): number; - }): string; -}): number; +declare function f(n: typeof f): string; +declare function f(n: typeof g): string; +declare function g(n: typeof g): number; +declare function g(n: typeof f): number; declare var b: any; -declare function b1(): () => typeof b1; -declare function foo(): () => typeof foo; -declare var foo1: () => typeof foo; -declare var foo2: () => typeof foo; +declare function b1(): typeof b1; +declare function foo(): typeof foo; +declare var foo1: typeof foo; +declare var foo2: typeof foo; declare var foo3: any; declare var x: any; declare function foo5(x: number): (x: number) => number; diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js index e0d582806dd..a96cc86cdf3 100644 --- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js +++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.js @@ -58,6 +58,8 @@ var A; //// [declFileWithExtendsClauseThatHasItsContainerNameConflict.d.ts] declare module A.B.C { + class B { + } } declare module A.B { class EventManager { diff --git a/tests/baselines/reference/declInput-2.errors.txt b/tests/baselines/reference/declInput-2.errors.txt new file mode 100644 index 00000000000..a987b7ac179 --- /dev/null +++ b/tests/baselines/reference/declInput-2.errors.txt @@ -0,0 +1,32 @@ +==== tests/cases/compiler/declInput-2.ts (5 errors) ==== + module M { + class C { } + export class E {} + export interface I1 {} + interface I2 {} + export class D { + private c: C; // don't generate + public m1: number; + public m2: string; + public m22: C; // don't generate + ~~~~~~~~~~~~~~ +!!! Public property 'm22' of exported class has or is using private name 'C'. + public m23: E; + public m24: I1; + public m25: I2; // don't generate + ~~~~~~~~~~~~~~~ +!!! Public property 'm25' of exported class has or is using private name 'I2'. + public m232(): E { return null;} + public m242(): I1 { return null; } + public m252(): I2 { return null; } // don't generate + ~~~~ +!!! Return type of public method from exported class has or is using private name 'I2'. + public m26(i:I1) {} + public m262(i:I2) {} + ~~~~ +!!! Parameter 'i' of public method from exported class has or is using private name 'I2'. + public m3():C { return new C(); } + ~~ +!!! Return type of public method from exported class has or is using private name 'C'. + } + } \ No newline at end of file diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index a109d89165a..011167d9a35 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -58,65 +58,3 @@ var M; })(); M.D = D; })(M || (M = {})); - - -//// [declInput-2.d.ts] -declare module M { - class E { - } - interface I1 { - } - class D { - private c; - m1: number; - m2: string; - m22: C; - m23: E; - m24: I1; - m25: I2; - m232(): E; - m242(): I1; - m252(): I2; - m26(i: I1): void; - m262(i: I2): void; - m3(): C; - } -} - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declInput-2.d.ts (5 errors) ==== - declare module M { - class E { - } - interface I1 { - } - class D { - private c; - m1: number; - m2: string; - m22: C; - ~ -!!! Cannot find name 'C'. - m23: E; - m24: I1; - m25: I2; - ~~ -!!! Cannot find name 'I2'. - m232(): E; - m242(): I1; - m252(): I2; - ~~ -!!! Cannot find name 'I2'. - m26(i: I1): void; - m262(i: I2): void; - ~~ -!!! Cannot find name 'I2'. - m3(): C; - ~ -!!! Cannot find name 'C'. - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js index 0f34f789abc..941029774f4 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts.js @@ -28,7 +28,6 @@ export module M.P { export interface I { } } export import im = M.P.f; - // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope export var a = M.a; // emitted incorrectly as typeof f export var b = M.b; // ok export var c = M.c; // ok @@ -145,6 +144,7 @@ declare module f { } export = f; //// [declarationEmit_nameConflicts_0.d.ts] +import im = require('declarationEmit_nameConflicts_1'); export declare module M { function f(): void; class C { @@ -169,10 +169,10 @@ export declare module M.P { } } export import im = M.P.f; - var a: () => void; + var a: typeof M.f; var b: typeof M.C; var c: typeof M.N; - var g: () => void; + var g: typeof M.c.g; var d: typeof M.d; } export declare module M.Q { @@ -186,74 +186,10 @@ export declare module M.Q { } interface b extends M.C { } - interface I extends M.N.I { + interface I extends M.c.I { } module c { - interface I extends M.N.I { + interface I extends M.c.I { } } } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/declarationEmit_nameConflicts_0.d.ts (1 errors) ==== - export declare module M { - function f(): void; - class C { - } - module N { - function g(): void; - interface I { - } - } - export import a = M.f; - export import b = M.C; - export import c = N; - export import d = im; - ~~~~~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'im'. - } - export declare module M.P { - function f(): void; - class C { - } - module N { - function g(): void; - interface I { - } - } - export import im = M.P.f; - var a: () => void; - var b: typeof M.C; - var c: typeof M.N; - var g: () => void; - var d: typeof M.d; - } - export declare module M.Q { - function f(): void; - class C { - } - module N { - function g(): void; - interface I { - } - } - interface b extends M.C { - } - interface I extends M.N.I { - } - module c { - interface I extends M.N.I { - } - } - } - -==== tests/cases/compiler/declarationEmit_nameConflicts_1.d.ts (0 errors) ==== - declare module f { - class c { - } - } - export = f; - \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js index bc8ba2f63e9..79d73add32d 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js @@ -9,7 +9,6 @@ module X.Y.base { } module X.Y.base.Z { - // Bug 887180 export var f = X.Y.base.f; // Should be base.f export var C = X.Y.base.C; // Should be base.C export var M = X.Y.base.M; // Should be base.M @@ -72,7 +71,7 @@ declare module X.Y.base { } } declare module X.Y.base.Z { - var f: () => void; + var f: typeof base.f; var C: typeof base.C; var M: typeof base.M; var E: typeof base.E; diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js index cfec6264a77..daa5bac83d7 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js @@ -20,7 +20,6 @@ module M.P { export enum D { f } - // Bug 887180 export var v: M.D; // ok export var w = M.D.f; // error, should be typeof M.D.f export var x = M.C.f; // error, should be typeof M.C.f @@ -111,7 +110,7 @@ declare module M.P { f = 0, } var v: M.D; - var w: () => void; - var x: () => void; - var x: () => void; + var w: typeof M.D.f; + var x: typeof M.C.f; + var x: typeof M.C.f; } diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js index 72b2a9295f5..32ac2d47290 100644 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js @@ -1,5 +1,4 @@ //// [declarationEmit_nameConflictsWithAlias.ts] -// Bug 887180 export module C { export interface I { } } export import v = C; export module M { diff --git a/tests/baselines/reference/enumDecl1.js b/tests/baselines/reference/enumDecl1.js index f912586f28e..fb1c00a19a6 100644 --- a/tests/baselines/reference/enumDecl1.js +++ b/tests/baselines/reference/enumDecl1.js @@ -14,4 +14,9 @@ declare module mAmbient { //// [enumDecl1.d.ts] declare module mAmbient { + enum e { + x, + y, + z, + } } diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js index 6c0e64f0710..6d8748516ae 100644 --- a/tests/baselines/reference/exportImport.js +++ b/tests/baselines/reference/exportImport.js @@ -46,23 +46,5 @@ declare class Widget1 { //// [exporter.d.ts] export import w = require('./w1'); //// [consumer.d.ts] -export declare function w(): Widget1; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/consumer.d.ts (1 errors) ==== - export declare function w(): Widget1; - ~~~~~~~ -!!! Cannot find name 'Widget1'. - -==== tests/cases/compiler/w1.d.ts (0 errors) ==== - export = Widget1; - declare class Widget1 { - name: string; - } - -==== tests/cases/compiler/exporter.d.ts (0 errors) ==== - export import w = require('./w1'); - \ No newline at end of file +import e = require('./exporter'); +export declare function w(): e.w; diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js index 9aa343ee86b..2782a6f6f67 100644 --- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js +++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js @@ -38,23 +38,5 @@ interface Widget1 { //// [exporter.d.ts] export import w = require('./w1'); //// [consumer.d.ts] -export declare function w(): Widget1; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/consumer.d.ts (1 errors) ==== - export declare function w(): Widget1; - ~~~~~~~ -!!! Cannot find name 'Widget1'. - -==== tests/cases/compiler/w1.d.ts (0 errors) ==== - export = Widget1; - interface Widget1 { - name: string; - } - -==== tests/cases/compiler/exporter.d.ts (0 errors) ==== - export import w = require('./w1'); - \ No newline at end of file +import e = require('./exporter'); +export declare function w(): e.w; diff --git a/tests/baselines/reference/funcdecl.js b/tests/baselines/reference/funcdecl.js index 40eb8dde17b..de080873b9f 100644 --- a/tests/baselines/reference/funcdecl.js +++ b/tests/baselines/reference/funcdecl.js @@ -134,29 +134,26 @@ var f2 = function () { //// [funcdecl.d.ts] declare function simpleFunc(): string; -declare var simpleFuncVar: () => string; +declare var simpleFuncVar: typeof simpleFunc; declare function anotherFuncNoReturn(): void; -declare var anotherFuncNoReturnVar: () => void; +declare var anotherFuncNoReturnVar: typeof anotherFuncNoReturn; declare function withReturn(): string; -declare var withReturnVar: () => string; +declare var withReturnVar: typeof withReturn; declare function withParams(a: string): string; -declare var withparamsVar: (a: string) => string; +declare var withparamsVar: typeof withParams; declare function withMultiParams(a: number, b: any, c: Object): number; -declare var withMultiParamsVar: (a: number, b: any, c: Object) => number; +declare var withMultiParamsVar: typeof withMultiParams; declare function withOptionalParams(a?: string): void; -declare var withOptionalParamsVar: (a?: string) => void; +declare var withOptionalParamsVar: typeof withOptionalParams; declare function withInitializedParams(a: string, b0: any, b?: number, c?: string): void; -declare var withInitializedParamsVar: (a: string, b0: any, b?: number, c?: string) => void; +declare var withInitializedParamsVar: typeof withInitializedParams; declare function withOptionalInitializedParams(a: string, c?: string): void; -declare var withOptionalInitializedParamsVar: (a: string, c?: string) => void; +declare var withOptionalInitializedParamsVar: typeof withOptionalInitializedParams; declare function withRestParams(a: string, ...myRestParameter: number[]): number[]; -declare var withRestParamsVar: (a: string, ...myRestParameter: number[]) => number[]; +declare var withRestParamsVar: typeof withRestParams; declare function overload1(n: number): string; declare function overload1(s: string): string; -declare var withOverloadSignature: { - (n: number): string; - (s: string): string; -}; +declare var withOverloadSignature: typeof overload1; declare function f(n: () => void): void; declare module m2 { function foo(n: () => void): void; diff --git a/tests/baselines/reference/functionExpressionReturningItself.js b/tests/baselines/reference/functionExpressionReturningItself.js index 63e8e9734d2..8553d2da867 100644 --- a/tests/baselines/reference/functionExpressionReturningItself.js +++ b/tests/baselines/reference/functionExpressionReturningItself.js @@ -8,14 +8,4 @@ var x = function somefn() { //// [functionExpressionReturningItself.d.ts] -declare var x: () => typeof somefn; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/functionExpressionReturningItself.d.ts (1 errors) ==== - declare var x: () => typeof somefn; - ~~~~~~ -!!! Cannot find name 'somefn'. - \ No newline at end of file +declare var x: () => any; diff --git a/tests/baselines/reference/functionReturningItself.js b/tests/baselines/reference/functionReturningItself.js index e50215a524b..7d161241899 100644 --- a/tests/baselines/reference/functionReturningItself.js +++ b/tests/baselines/reference/functionReturningItself.js @@ -10,4 +10,4 @@ function somefn() { //// [functionReturningItself.d.ts] -declare function somefn(): () => typeof somefn; +declare function somefn(): typeof somefn; diff --git a/tests/baselines/reference/importDecl.errors.txt b/tests/baselines/reference/importDecl.errors.txt deleted file mode 100644 index 2a43a4362c5..00000000000 --- a/tests/baselines/reference/importDecl.errors.txt +++ /dev/null @@ -1,83 +0,0 @@ -==== tests/cases/compiler/importDecl_1.ts (1 errors) ==== - /// - /// - /// - /// - /// - import m4 = require("importDecl_require"); // Emit used - export var x4 = m4.x; - export var d4 = m4.d; - export var f4 = m4.foo(); - - export module m1 { - export var x2 = m4.x; - export var d2 = m4.d; - export var f2 = m4.foo(); - - var x3 = m4.x; - var d3 = m4.d; - var f3 = m4.foo(); - } - - //Emit global only usage - import glo_m4 = require("importDecl_require1"); - export var useGlo_m4_x4 = glo_m4.x; - ~ -!!! Property 'x' does not exist on type 'typeof "tests/cases/compiler/importDecl_require1"'. - export var useGlo_m4_d4 = glo_m4.d; - export var useGlo_m4_f4 = glo_m4.foo(); - - //Emit even when used just in function type - import fncOnly_m4 = require("importDecl_require2"); - export var useFncOnly_m4_f4 = fncOnly_m4.foo(); - - // only used privately no need to emit - import private_m4 = require("importDecl_require3"); - export module usePrivate_m4_m1 { - var x3 = private_m4.x; - var d3 = private_m4.d; - var f3 = private_m4.foo(); - } - - // Do not emit unused import - import m5 = require("importDecl_require4"); - export var d = m5.foo2(); - - // Do not emit multiple used import statements - import multiImport_m4 = require("importDecl_require"); // Emit used - export var useMultiImport_m4_x4 = multiImport_m4.x; - export var useMultiImport_m4_d4 = multiImport_m4.d; - export var useMultiImport_m4_f4 = multiImport_m4.foo(); - -==== tests/cases/compiler/importDecl_require.ts (0 errors) ==== - export class d { - foo: string; - } - export var x: d; - export function foo(): d { return null; } - -==== tests/cases/compiler/importDecl_require1.ts (0 errors) ==== - export class d { - bar: string; - } - var x: d; - export function foo(): d { return null; } - -==== tests/cases/compiler/importDecl_require2.ts (0 errors) ==== - export class d { - baz: string; - } - export var x: d; - export function foo(): d { return null; } - -==== tests/cases/compiler/importDecl_require3.ts (0 errors) ==== - export class d { - bing: string; - } - export var x: d; - export function foo(): d { return null; } - -==== tests/cases/compiler/importDecl_require4.ts (0 errors) ==== - import m4 = require("importDecl_require"); - export function foo2(): m4.d { return null; } - \ No newline at end of file diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js index b8ded724909..b6c9715df64 100644 --- a/tests/baselines/reference/importDecl.js +++ b/tests/baselines/reference/importDecl.js @@ -55,7 +55,6 @@ export module m1 { //Emit global only usage import glo_m4 = require("importDecl_require1"); -export var useGlo_m4_x4 = glo_m4.x; export var useGlo_m4_d4 = glo_m4.d; export var useGlo_m4_f4 = glo_m4.foo(); @@ -150,7 +149,6 @@ exports.f4 = m4.foo(); })(exports.m1 || (exports.m1 = {})); var m1 = exports.m1; var glo_m4 = require("importDecl_require1"); -exports.useGlo_m4_x4 = glo_m4.x; exports.useGlo_m4_d4 = glo_m4.d; exports.useGlo_m4_f4 = glo_m4.foo(); var fncOnly_m4 = require("importDecl_require2"); @@ -168,3 +166,57 @@ var multiImport_m4 = require("importDecl_require"); exports.useMultiImport_m4_x4 = multiImport_m4.x; exports.useMultiImport_m4_d4 = multiImport_m4.d; exports.useMultiImport_m4_f4 = multiImport_m4.foo(); + + +//// [importDecl_require.d.ts] +export declare class d { + foo: string; +} +export declare var x: d; +export declare function foo(): d; +//// [importDecl_require1.d.ts] +export declare class d { + bar: string; +} +export declare function foo(): d; +//// [importDecl_require2.d.ts] +export declare class d { + baz: string; +} +export declare var x: d; +export declare function foo(): d; +//// [importDecl_require3.d.ts] +export declare class d { + bing: string; +} +export declare var x: d; +export declare function foo(): d; +//// [importDecl_require4.d.ts] +import m4 = require("importDecl_require"); +export declare function foo2(): m4.d; +//// [importDecl_1.d.ts] +/// +/// +/// +/// +/// +import m4 = require("importDecl_require"); +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; +export declare module m1 { + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; +} +import glo_m4 = require("importDecl_require1"); +export declare var useGlo_m4_d4: typeof glo_m4.d; +export declare var useGlo_m4_f4: glo_m4.d; +import fncOnly_m4 = require("importDecl_require2"); +export declare var useFncOnly_m4_f4: fncOnly_m4.d; +export declare module usePrivate_m4_m1 { +} +export declare var d: m4.d; +export declare var useMultiImport_m4_x4: m4.d; +export declare var useMultiImport_m4_d4: typeof m4.d; +export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index f7b470ba411..9c6ca20eb06 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -28,20 +28,5 @@ export declare class B { } //// [importDeclarationUsedAsTypeQuery_1.d.ts] /// +import a = require('importDeclarationUsedAsTypeQuery_require'); export declare var x: typeof a; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/importDeclarationUsedAsTypeQuery_1.d.ts (1 errors) ==== - /// - export declare var x: typeof a; - ~ -!!! Cannot find name 'a'. - -==== tests/cases/compiler/importDeclarationUsedAsTypeQuery_require.d.ts (0 errors) ==== - export declare class B { - id: number; - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js index 0e4cb3f4ed5..6361d7fdf99 100644 --- a/tests/baselines/reference/internalAliasClass.js +++ b/tests/baselines/reference/internalAliasClass.js @@ -32,21 +32,6 @@ declare module a { } } declare module c { + import b = a.c; var x: b; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasClass.d.ts (1 errors) ==== - declare module a { - class c { - } - } - declare module c { - var x: b; - ~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js index 5b896ddd7ac..911800e0c69 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js @@ -47,25 +47,7 @@ export declare module x { } export declare module m2 { module m3 { + import c = x.c; var cProp: c; } } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.d.ts (1 errors) ==== - export declare module x { - class c { - foo(a: number): number; - } - } - export declare module m2 { - module m3 { - var cProp: c; - ~ -!!! Cannot find name 'c'. - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index de756dd7434..21b96842e17 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -35,19 +35,5 @@ export declare module x { foo(a: number): number; } } +import xc = x.c; export declare var cProp: xc; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.d.ts (1 errors) ==== - export declare module x { - class c { - foo(a: number): number; - } - } - export declare var cProp: xc; - ~~ -!!! Cannot find name 'xc'. - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js index 55331cc6cf9..b5c68ea5c16 100644 --- a/tests/baselines/reference/internalAliasEnum.js +++ b/tests/baselines/reference/internalAliasEnum.js @@ -39,24 +39,6 @@ declare module a { } } declare module c { + import b = a.weekend; var bVal: b; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasEnum.d.ts (1 errors) ==== - declare module a { - enum weekend { - Friday = 0, - Saturday = 1, - Sunday = 2, - } - } - declare module c { - var bVal: b; - ~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index 3767e38310e..b4b4730eb28 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -39,24 +39,6 @@ export declare module a { } } export declare module c { + import b = a.weekend; var bVal: b; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - enum weekend { - Friday = 0, - Saturday = 1, - Sunday = 2, - } - } - export declare module c { - var bVal: b; - ~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 0299b2d4a4d..762bc0a343a 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -35,21 +35,5 @@ export declare module a { Sunday = 2, } } +import b = a.weekend; export declare var bVal: b; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - enum weekend { - Friday = 0, - Saturday = 1, - Sunday = 2, - } - } - export declare var bVal: b; - ~ -!!! Cannot find name 'b'. - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasFunction.js b/tests/baselines/reference/internalAliasFunction.js index e46526f1f8b..3930c6cb801 100644 --- a/tests/baselines/reference/internalAliasFunction.js +++ b/tests/baselines/reference/internalAliasFunction.js @@ -33,6 +33,7 @@ declare module a { function foo(x: number): number; } declare module c { + import b = a.foo; var bVal: number; - var bVal2: (x: number) => number; + var bVal2: typeof b; } diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js index a0a61453735..eb758b913e6 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js @@ -35,5 +35,5 @@ export declare module a { export declare module c { export import b = a.foo; var bVal: number; - var bVal2: (x: number) => number; + var bVal2: typeof b; } diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js index 113396205ba..0423a587e84 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js @@ -33,5 +33,6 @@ export declare module a { function foo(x: number): number; } export declare module c { - var bVal2: (x: number) => number; + import b = a.foo; + var bVal2: typeof b; } diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js index 1213bbbbe26..7fe09d1e02b 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js @@ -31,4 +31,4 @@ export declare module a { } export import b = a.foo; export declare var bVal: number; -export declare var bVal2: (x: number) => number; +export declare var bVal2: typeof b; diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js index af546a20b5b..c049bfcf858 100644 --- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js @@ -27,5 +27,6 @@ exports.bVal2 = b; export declare module a { function foo(x: number): number; } +import b = a.foo; export declare var bVal: number; -export declare var bVal2: (x: number) => number; +export declare var bVal2: typeof b; diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js index 110d64e7388..9e97ba637d0 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.js +++ b/tests/baselines/reference/internalAliasInitializedModule.js @@ -39,23 +39,6 @@ declare module a { } } declare module c { + import b = a.b; var x: b.c; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasInitializedModule.d.ts (1 errors) ==== - declare module a { - module b { - class c { - } - } - } - declare module c { - var x: b.c; - ~~~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 57320ccdbbd..79cbcbac448 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -39,23 +39,6 @@ export declare module a { } } export declare module c { + import b = a.b; var x: b.c; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - module b { - class c { - } - } - } - export declare module c { - var x: b.c; - ~~~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 4983a0787fa..c066c10298e 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -35,20 +35,5 @@ export declare module a { } } } +import b = a.b; export declare var x: b.c; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - module b { - class c { - } - } - } - export declare var x: b.c; - ~~~ -!!! Cannot find name 'b'. - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js index a3a1f72302c..d2006caf24c 100644 --- a/tests/baselines/reference/internalAliasInterface.js +++ b/tests/baselines/reference/internalAliasInterface.js @@ -23,21 +23,6 @@ declare module a { } } declare module c { + import b = a.I; var x: b; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasInterface.d.ts (1 errors) ==== - declare module a { - interface I { - } - } - declare module c { - var x: b; - ~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index 3dec9ea9bc6..04a3bfa25c1 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -25,21 +25,6 @@ export declare module a { } } export declare module c { + import b = a.I; var x: b; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - interface I { - } - } - export declare module c { - var x: b; - ~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js index b96abee595d..bd1a83fdd85 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js @@ -19,18 +19,5 @@ export declare module a { interface I { } } +import b = a.I; export declare var x: b; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - interface I { - } - } - export declare var x: b; - ~ -!!! Cannot find name 'b'. - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js index 827868d1c37..ee62a10c1ca 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.js +++ b/tests/baselines/reference/internalAliasUninitializedModule.js @@ -30,24 +30,6 @@ declare module a { } } declare module c { + import b = a.b; var x: b.I; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasUninitializedModule.d.ts (1 errors) ==== - declare module a { - module b { - interface I { - foo(): any; - } - } - } - declare module c { - var x: b.I; - ~~~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index 415d4d2b4eb..13c4ef61689 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -30,24 +30,6 @@ export declare module a { } } export declare module c { + import b = a.b; var x: b.I; } - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - module b { - interface I { - foo(): any; - } - } - } - export declare module c { - var x: b.I; - ~~~ -!!! Cannot find name 'b'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index c89df290f44..3f626fd37ac 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -25,21 +25,5 @@ export declare module a { } } } +import b = a.b; export declare var x: b.I; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts (1 errors) ==== - export declare module a { - module b { - interface I { - foo(): any; - } - } - } - export declare var x: b.I; - ~~~ -!!! Cannot find name 'b'. - \ No newline at end of file diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.js b/tests/baselines/reference/internalAliasWithDottedNameEmit.js index d70da1ba16c..d6a4cfcfff7 100644 --- a/tests/baselines/reference/internalAliasWithDottedNameEmit.js +++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.js @@ -18,3 +18,11 @@ var a; })(a.b || (a.b = {})); var b = a.b; })(a || (a = {})); + + +//// [internalAliasWithDottedNameEmit.d.ts] +declare module a.b.c { + var d: any; +} +declare module a.e.f { +} diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js index 842aae0884e..29e3ba3929a 100644 --- a/tests/baselines/reference/missingImportAfterModuleImport.js +++ b/tests/baselines/reference/missingImportAfterModuleImport.js @@ -44,33 +44,9 @@ declare module "SubModule" { } //// [missingImportAfterModuleImport_1.d.ts] /// +import SubModule = require('SubModule'); declare class MainModule { SubModule: SubModule; constructor(); } export = MainModule; - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/missingImportAfterModuleImport_1.d.ts (1 errors) ==== - /// - declare class MainModule { - SubModule: SubModule; - ~~~~~~~~~ -!!! Cannot find name 'SubModule'. - constructor(); - } - export = MainModule; - -==== tests/cases/compiler/missingImportAfterModuleImport_0.d.ts (0 errors) ==== - declare module "SubModule" { - class SubModule { - static StaticVar: number; - InstanceVar: number; - constructor(); - } - export = SubModule; - } - \ No newline at end of file diff --git a/tests/baselines/reference/moduleOuterQualification.js b/tests/baselines/reference/moduleOuterQualification.js index e5c22402625..83c79703f99 100644 --- a/tests/baselines/reference/moduleOuterQualification.js +++ b/tests/baselines/reference/moduleOuterQualification.js @@ -14,4 +14,10 @@ declare module outer { //// [moduleOuterQualification.d.ts] declare module outer { + interface Beta { + } + module inner { + interface Beta extends outer.Beta { + } + } } diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js new file mode 100644 index 00000000000..4b35f939873 --- /dev/null +++ b/tests/baselines/reference/moduleSymbolMerging.js @@ -0,0 +1,42 @@ +//// [tests/cases/compiler/moduleSymbolMerging.ts] //// + +//// [A.ts] + +module A { export interface I {} } + +//// [B.ts] +/// +module A { ; } +module B { + export function f(): A.I { return null; } +} + + + +//// [A.js] +//// [B.js] +var A; +(function (A) { + ; +})(A || (A = {})); +var B; +(function (B) { + function f() { + return null; + } + B.f = f; +})(B || (B = {})); + + +//// [A.d.ts] +declare module A { + interface I { + } +} +//// [B.d.ts] +/// +declare module A { +} +declare module B { + function f(): A.I; +} diff --git a/tests/baselines/reference/multiImportExport.errors.txt b/tests/baselines/reference/multiImportExport.errors.txt deleted file mode 100644 index 6237131d641..00000000000 --- a/tests/baselines/reference/multiImportExport.errors.txt +++ /dev/null @@ -1,26 +0,0 @@ -==== tests/cases/compiler/consumer.ts (0 errors) ==== - import Drawing = require('./Drawing'); - var addr = new Drawing.Math.Adder(); - -==== tests/cases/compiler/Drawing.ts (0 errors) ==== - export import Math = require('Math/Math') - -==== tests/cases/compiler/Math/Math.ts (0 errors) ==== - import Adder = require('Math/Adder'); - - var Math = { - Adder:Adder - }; - - export = Math - -==== tests/cases/compiler/Math/Adder.ts (1 errors) ==== - class Adder { - add(a: number, b: number) { - - } - } - - export = Adder; - ~~~~~~~~~~~~~~~ -!!! Cannot compile external modules unless the '--module' flag is provided. \ No newline at end of file diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js new file mode 100644 index 00000000000..06d81f7e984 --- /dev/null +++ b/tests/baselines/reference/multiImportExport.js @@ -0,0 +1,63 @@ +//// [tests/cases/compiler/multiImportExport.ts] //// + +//// [consumer.ts] +import Drawing = require('./Drawing'); +var addr = new Drawing.Math.Adder(); + +//// [Drawing.ts] +export import Math = require('Math/Math') + +//// [Math.ts] +import Adder = require('Math/Adder'); + +var Math = { + Adder:Adder +}; + +export = Math + +//// [Adder.ts] +class Adder { + add(a: number, b: number) { + + } +} + +export = Adder; + +//// [Adder.js] +var Adder = (function () { + function Adder() { + } + Adder.prototype.add = function (a, b) { + }; + return Adder; +})(); +module.exports = Adder; +//// [Math.js] +var Adder = require('Math/Adder'); +var Math = { + Adder: Adder +}; +module.exports = Math; +//// [Drawing.js] +exports.Math = require('Math/Math'); +//// [consumer.js] +var Drawing = require('./Drawing'); +var addr = new Drawing.Math.Adder(); + + +//// [Adder.d.ts] +declare class Adder { + add(a: number, b: number): void; +} +export = Adder; +//// [Math.d.ts] +import Adder = require('Math/Adder'); +declare var Math: { + Adder: typeof Adder; +}; +export = Math; +//// [Drawing.d.ts] +export import Math = require('Math/Math'); +//// [consumer.d.ts] diff --git a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt new file mode 100644 index 00000000000..713f1807251 --- /dev/null +++ b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt @@ -0,0 +1,1130 @@ +==== tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts (24 errors) ==== + + class privateClass { + } + + export class publicClass { + } + + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using private name 'privateClass'. + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using private name 'privateClass'. + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + set myPublicMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + export module publicModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using private name 'privateClass'. + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using private name 'privateClass'. + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + set myPublicMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + } + +==== tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts (12 errors) ==== + class publicClassInGlobal { + } + + class publicClassInGlobalWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClassInGlobal { + return null; + } + private static get myPrivateStaticMethod(): publicClassInGlobal { + return null; + } + get myPublicMethod(): publicClassInGlobal { + return null; + } + private get myPrivateMethod(): publicClassInGlobal { + return null; + } + static get myPublicStaticMethod1() { + return new publicClassInGlobal(); + } + private static get myPrivateStaticMethod1() { + return new publicClassInGlobal(); + } + get myPublicMethod1() { + return new publicClassInGlobal(); + } + private get myPrivateMethod1() { + return new publicClassInGlobal(); + } + } + + class publicClassInGlobalWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClassInGlobal) { + } + private static set myPrivateStaticMethod(param: publicClassInGlobal) { + } + set myPublicMethod(param: publicClassInGlobal) { + } + private set myPrivateMethod(param: publicClassInGlobal) { + } + } + + module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + } + + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using private name 'privateClass'. + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using private name 'privateClass'. + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + set myPublicMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js new file mode 100644 index 00000000000..9744e4ef220 --- /dev/null +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -0,0 +1,3555 @@ +//// [tests/cases/compiler/privacyAccessorDeclFile.ts] //// + +//// [privacyAccessorDeclFile_externalModule.ts] + +class privateClass { +} + +export class publicClass { +} + +export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } +} + +export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } +} + +class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } +} + +class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } +} + +export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + } + private set myPrivateMethod(param: privateClass) { + } +} + +export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } +} + +class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } +} + +class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } +} + +export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + return new privateModule.publicClass(); + } +} + +export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + set myPublicMethod(param: privateModule.publicClass) { // Error + } +} + +class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } +} + +class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } +} + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + set myPublicMethod(param: privateModule.publicClass) { // Error + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } +} + +//// [privacyAccessorDeclFile_GlobalFile.ts] +class publicClassInGlobal { +} + +class publicClassInGlobalWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClassInGlobal { + return null; + } + private static get myPrivateStaticMethod(): publicClassInGlobal { + return null; + } + get myPublicMethod(): publicClassInGlobal { + return null; + } + private get myPrivateMethod(): publicClassInGlobal { + return null; + } + static get myPublicStaticMethod1() { + return new publicClassInGlobal(); + } + private static get myPrivateStaticMethod1() { + return new publicClassInGlobal(); + } + get myPublicMethod1() { + return new publicClassInGlobal(); + } + private get myPrivateMethod1() { + return new publicClassInGlobal(); + } +} + +class publicClassInGlobalWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClassInGlobal) { + } + private static set myPrivateStaticMethod(param: publicClassInGlobal) { + } + set myPublicMethod(param: publicClassInGlobal) { + } + private set myPrivateMethod(param: publicClassInGlobal) { + } +} + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + } + + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + set myPublicMethod(param: privateModule.publicClass) { // Error + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } +} + +//// [privacyAccessorDeclFile_externalModule.js] +var privateClass = (function () { + function privateClass() { + } + return privateClass; +})(); +var publicClass = (function () { + function publicClass() { + } + return publicClass; +})(); +exports.publicClass = publicClass; +var publicClassWithWithPrivateGetAccessorTypes = (function () { + function publicClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateGetAccessorTypes; +})(); +exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; +var publicClassWithWithPublicGetAccessorTypes = (function () { + function publicClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicGetAccessorTypes; +})(); +exports.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; +var privateClassWithWithPrivateGetAccessorTypes = (function () { + function privateClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateGetAccessorTypes; +})(); +var privateClassWithWithPublicGetAccessorTypes = (function () { + function privateClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicGetAccessorTypes; +})(); +var publicClassWithWithPrivateSetAccessorTypes = (function () { + function publicClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateSetAccessorTypes; +})(); +exports.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; +var publicClassWithWithPublicSetAccessorTypes = (function () { + function publicClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicSetAccessorTypes; +})(); +exports.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; +var privateClassWithWithPrivateSetAccessorTypes = (function () { + function privateClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateSetAccessorTypes; +})(); +var privateClassWithWithPublicSetAccessorTypes = (function () { + function privateClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicSetAccessorTypes; +})(); +var publicClassWithPrivateModuleGetAccessorTypes = (function () { + function publicClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleGetAccessorTypes; +})(); +exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; +var publicClassWithPrivateModuleSetAccessorTypes = (function () { + function publicClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleSetAccessorTypes; +})(); +exports.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; +var privateClassWithPrivateModuleGetAccessorTypes = (function () { + function privateClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleGetAccessorTypes; +})(); +var privateClassWithPrivateModuleSetAccessorTypes = (function () { + function privateClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleSetAccessorTypes; +})(); +(function (publicModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModule.publicClass = publicClass; + var publicClassWithWithPrivateGetAccessorTypes = (function () { + function publicClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateGetAccessorTypes; + })(); + publicModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; + var publicClassWithWithPublicGetAccessorTypes = (function () { + function publicClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicGetAccessorTypes; + })(); + publicModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; + var privateClassWithWithPrivateGetAccessorTypes = (function () { + function privateClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateGetAccessorTypes; + })(); + var privateClassWithWithPublicGetAccessorTypes = (function () { + function privateClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicGetAccessorTypes; + })(); + var publicClassWithWithPrivateSetAccessorTypes = (function () { + function publicClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateSetAccessorTypes; + })(); + publicModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; + var publicClassWithWithPublicSetAccessorTypes = (function () { + function publicClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicSetAccessorTypes; + })(); + publicModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; + var privateClassWithWithPrivateSetAccessorTypes = (function () { + function privateClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateSetAccessorTypes; + })(); + var privateClassWithWithPublicSetAccessorTypes = (function () { + function privateClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicSetAccessorTypes; + })(); + var publicClassWithPrivateModuleGetAccessorTypes = (function () { + function publicClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleGetAccessorTypes; + })(); + publicModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; + var publicClassWithPrivateModuleSetAccessorTypes = (function () { + function publicClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleSetAccessorTypes; + })(); + publicModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; + var privateClassWithPrivateModuleGetAccessorTypes = (function () { + function privateClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleGetAccessorTypes; + })(); + var privateClassWithPrivateModuleSetAccessorTypes = (function () { + function privateClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleSetAccessorTypes; + })(); +})(exports.publicModule || (exports.publicModule = {})); +var publicModule = exports.publicModule; +var privateModule; +(function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivateGetAccessorTypes = (function () { + function publicClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateGetAccessorTypes; + })(); + privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; + var publicClassWithWithPublicGetAccessorTypes = (function () { + function publicClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicGetAccessorTypes; + })(); + privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; + var privateClassWithWithPrivateGetAccessorTypes = (function () { + function privateClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateGetAccessorTypes; + })(); + var privateClassWithWithPublicGetAccessorTypes = (function () { + function privateClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicGetAccessorTypes; + })(); + var publicClassWithWithPrivateSetAccessorTypes = (function () { + function publicClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateSetAccessorTypes; + })(); + privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; + var publicClassWithWithPublicSetAccessorTypes = (function () { + function publicClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicSetAccessorTypes; + })(); + privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; + var privateClassWithWithPrivateSetAccessorTypes = (function () { + function privateClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateSetAccessorTypes; + })(); + var privateClassWithWithPublicSetAccessorTypes = (function () { + function privateClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicSetAccessorTypes; + })(); + var publicClassWithPrivateModuleGetAccessorTypes = (function () { + function publicClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleGetAccessorTypes; + })(); + privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; + var publicClassWithPrivateModuleSetAccessorTypes = (function () { + function publicClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleSetAccessorTypes; + })(); + privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; + var privateClassWithPrivateModuleGetAccessorTypes = (function () { + function privateClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleGetAccessorTypes; + })(); + var privateClassWithPrivateModuleSetAccessorTypes = (function () { + function privateClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleSetAccessorTypes; + })(); +})(privateModule || (privateModule = {})); +//// [privacyAccessorDeclFile_GlobalFile.js] +var publicClassInGlobal = (function () { + function publicClassInGlobal() { + } + return publicClassInGlobal; +})(); +var publicClassInGlobalWithPublicGetAccessorTypes = (function () { + function publicClassInGlobalWithPublicGetAccessorTypes() { + } + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClassInGlobal(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClassInGlobal(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClassInGlobal(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClassInGlobal(); + }, + enumerable: true, + configurable: true + }); + return publicClassInGlobalWithPublicGetAccessorTypes; +})(); +var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () { + function publicClassInGlobalWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassInGlobalWithWithPublicSetAccessorTypes; +})(); +var publicModuleInGlobal; +(function (publicModuleInGlobal) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModuleInGlobal.publicClass = publicClass; + var privateModule; + (function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivateGetAccessorTypes = (function () { + function publicClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateGetAccessorTypes; + })(); + privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; + var publicClassWithWithPublicGetAccessorTypes = (function () { + function publicClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicGetAccessorTypes; + })(); + privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; + var privateClassWithWithPrivateGetAccessorTypes = (function () { + function privateClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateGetAccessorTypes; + })(); + var privateClassWithWithPublicGetAccessorTypes = (function () { + function privateClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicGetAccessorTypes; + })(); + var publicClassWithWithPrivateSetAccessorTypes = (function () { + function publicClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateSetAccessorTypes; + })(); + privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; + var publicClassWithWithPublicSetAccessorTypes = (function () { + function publicClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicSetAccessorTypes; + })(); + privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; + var privateClassWithWithPrivateSetAccessorTypes = (function () { + function privateClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateSetAccessorTypes; + })(); + var privateClassWithWithPublicSetAccessorTypes = (function () { + function privateClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicSetAccessorTypes; + })(); + var publicClassWithPrivateModuleGetAccessorTypes = (function () { + function publicClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleGetAccessorTypes; + })(); + privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; + var publicClassWithPrivateModuleSetAccessorTypes = (function () { + function publicClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleSetAccessorTypes; + })(); + privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; + var privateClassWithPrivateModuleGetAccessorTypes = (function () { + function privateClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleGetAccessorTypes; + })(); + var privateClassWithPrivateModuleSetAccessorTypes = (function () { + function privateClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleSetAccessorTypes; + })(); + })(privateModule || (privateModule = {})); + var publicClassWithWithPrivateGetAccessorTypes = (function () { + function publicClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateGetAccessorTypes; + })(); + publicModuleInGlobal.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; + var publicClassWithWithPublicGetAccessorTypes = (function () { + function publicClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicGetAccessorTypes; + })(); + publicModuleInGlobal.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes; + var privateClassWithWithPrivateGetAccessorTypes = (function () { + function privateClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new privateClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateGetAccessorTypes; + })(); + var privateClassWithWithPublicGetAccessorTypes = (function () { + function privateClassWithWithPublicGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return new publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicGetAccessorTypes; + })(); + var publicClassWithWithPrivateSetAccessorTypes = (function () { + function publicClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateSetAccessorTypes; + })(); + publicModuleInGlobal.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes; + var publicClassWithWithPublicSetAccessorTypes = (function () { + function publicClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPublicSetAccessorTypes; + })(); + publicModuleInGlobal.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes; + var privateClassWithWithPrivateSetAccessorTypes = (function () { + function privateClassWithWithPrivateSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateSetAccessorTypes; + })(); + var privateClassWithWithPublicSetAccessorTypes = (function () { + function privateClassWithWithPublicSetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPublicSetAccessorTypes; + })(); + var publicClassWithPrivateModuleGetAccessorTypes = (function () { + function publicClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleGetAccessorTypes; + })(); + publicModuleInGlobal.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; + var publicClassWithPrivateModuleSetAccessorTypes = (function () { + function publicClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleSetAccessorTypes; + })(); + publicModuleInGlobal.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes; + var privateClassWithPrivateModuleGetAccessorTypes = (function () { + function privateClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return null; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return new privateModule.publicClass(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleGetAccessorTypes; + })(); + var privateClassWithPrivateModuleSetAccessorTypes = (function () { + function privateClassWithPrivateModuleSetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", { + set: function (param) { + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleSetAccessorTypes; + })(); +})(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt new file mode 100644 index 00000000000..4f7f684d073 --- /dev/null +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt @@ -0,0 +1,151 @@ +==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts (8 errors) ==== + import exporter = require("privacyCannotNameAccessorDeclFile_exporter"); + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget2(); + } + get myPublicMethod() { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget4(); + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + get myPublicMethod() { + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { + return exporter.createExportedWidget4(); + } + } +==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_GlobalWidgets.ts (0 errors) ==== + + declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } + } + +==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets.ts (0 errors) ==== + export class Widget1 { + name = 'one'; + } + export function createWidget1() { + return new Widget1(); + } + + export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } + } + +==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_exporter.ts (0 errors) ==== + /// + import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets"); + import Widgets1 = require("GlobalWidgets"); + export function createExportedWidget1() { + return Widgets.createWidget1(); + } + export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); + } + export function createExportedWidget3() { + return Widgets1.createWidget3(); + } + export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js new file mode 100644 index 00000000000..947c3c1fc0d --- /dev/null +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js @@ -0,0 +1,410 @@ +//// [tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts] //// + +//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.ts] + +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +//// [privacyCannotNameAccessorDeclFile_Widgets.ts] +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +//// [privacyCannotNameAccessorDeclFile_exporter.ts] +/// +import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +//// [privacyCannotNameAccessorDeclFile_consumer.ts] +import exporter = require("privacyCannotNameAccessorDeclFile_exporter"); +export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} + +class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + get myPublicMethod() { + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { + return exporter.createExportedWidget4(); + } +} + +//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js] +//// [privacyCannotNameAccessorDeclFile_Widgets.js] +var Widget1 = (function () { + function Widget1() { + this.name = 'one'; + } + return Widget1; +})(); +exports.Widget1 = Widget1; +function createWidget1() { + return new Widget1(); +} +exports.createWidget1 = createWidget1; +(function (SpecializedWidget) { + var Widget2 = (function () { + function Widget2() { + this.name = 'one'; + } + return Widget2; + })(); + SpecializedWidget.Widget2 = Widget2; + function createWidget2() { + return new Widget2(); + } + SpecializedWidget.createWidget2 = createWidget2; +})(exports.SpecializedWidget || (exports.SpecializedWidget = {})); +var SpecializedWidget = exports.SpecializedWidget; +//// [privacyCannotNameAccessorDeclFile_exporter.js] +var Widgets = require("privacyCannotNameAccessorDeclFile_Widgets"); +var Widgets1 = require("GlobalWidgets"); +function createExportedWidget1() { + return Widgets.createWidget1(); +} +exports.createExportedWidget1 = createExportedWidget1; +function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +exports.createExportedWidget2 = createExportedWidget2; +function createExportedWidget3() { + return Widgets1.createWidget3(); +} +exports.createExportedWidget3 = createExportedWidget3; +function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} +exports.createExportedWidget4 = createExportedWidget4; +//// [privacyCannotNameAccessorDeclFile_consumer.js] +var exporter = require("privacyCannotNameAccessorDeclFile_exporter"); +var publicClassWithWithPrivateGetAccessorTypes = (function () { + function publicClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithWithPrivateGetAccessorTypes; +})(); +exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes; +var privateClassWithWithPrivateGetAccessorTypes = (function () { + function privateClassWithWithPrivateGetAccessorTypes() { + } + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", { + get: function () { + return exporter.createExportedWidget1(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", { + get: function () { + return exporter.createExportedWidget3(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithWithPrivateGetAccessorTypes; +})(); +var publicClassWithPrivateModuleGetAccessorTypes = (function () { + function publicClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return exporter.createExportedWidget2(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return exporter.createExportedWidget2(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return exporter.createExportedWidget4(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return exporter.createExportedWidget4(); + }, + enumerable: true, + configurable: true + }); + return publicClassWithPrivateModuleGetAccessorTypes; +})(); +exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes; +var privateClassWithPrivateModuleGetAccessorTypes = (function () { + function privateClassWithPrivateModuleGetAccessorTypes() { + } + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", { + get: function () { + return exporter.createExportedWidget2(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", { + get: function () { + return exporter.createExportedWidget2(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", { + get: function () { + return exporter.createExportedWidget4(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", { + get: function () { + return exporter.createExportedWidget4(); + }, + enumerable: true, + configurable: true + }); + return privateClassWithPrivateModuleGetAccessorTypes; +})(); + + +//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts] +declare module "GlobalWidgets" { + class Widget3 { + name: string; + } + function createWidget3(): Widget3; + module SpecializedGlobalWidget { + class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} +//// [privacyCannotNameAccessorDeclFile_Widgets.d.ts] +export declare class Widget1 { + name: string; +} +export declare function createWidget1(): Widget1; +export declare module SpecializedWidget { + class Widget2 { + name: string; + } + function createWidget2(): Widget2; +} +//// [privacyCannotNameAccessorDeclFile_exporter.d.ts] +/// +import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export declare function createExportedWidget1(): Widgets.Widget1; +export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2; +export declare function createExportedWidget3(): Widgets1.Widget3; +export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4; diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt new file mode 100644 index 00000000000..92a2f349908 --- /dev/null +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt @@ -0,0 +1,123 @@ +==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts (12 errors) ==== + import exporter = require("privacyCannotNameVarTypeDeclFile_exporter"); + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + private myPrivateProperty1 = exporter.createExportedWidget3(); + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); + private myPrivateProperty1 = exporter.createExportedWidget3(); + } + + export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); + export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivatePropertyTypes1' has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); + + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + myPublicProperty = exporter.createExportedWidget2(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + myPublicProperty1 = exporter.createExportedWidget4(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + } + export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivateModulePropertyTypes1' has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); + myPublicProperty= exporter.createExportedWidget2(); + static myPublicStaticProperty1 = exporter.createExportedWidget4(); + myPublicProperty1 = exporter.createExportedWidget4(); + } + var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); + var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); +==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts (0 errors) ==== + + + declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } + } + +==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets.ts (0 errors) ==== + export class Widget1 { + name = 'one'; + } + export function createWidget1() { + return new Widget1(); + } + + export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } + } + +==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_exporter.ts (0 errors) ==== + /// + import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets"); + import Widgets1 = require("GlobalWidgets"); + export function createExportedWidget1() { + return Widgets.createWidget1(); + } + export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); + } + export function createExportedWidget3() { + return Widgets1.createWidget3(); + } + export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js new file mode 100644 index 00000000000..d113b0a8095 --- /dev/null +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js @@ -0,0 +1,238 @@ +//// [tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts] //// + +//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts] + + +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +//// [privacyCannotNameVarTypeDeclFile_Widgets.ts] +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +//// [privacyCannotNameVarTypeDeclFile_exporter.ts] +/// +import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +//// [privacyCannotNameVarTypeDeclFile_consumer.ts] +import exporter = require("privacyCannotNameVarTypeDeclFile_exporter"); +export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); // Error + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); // Error + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); // Error + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error +var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); +export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error +var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); + +export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); // Error + myPublicProperty = exporter.createExportedWidget2(); // Error + static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error + myPublicProperty1 = exporter.createExportedWidget4(); // Error +} +export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error +export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error + +class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); + myPublicProperty= exporter.createExportedWidget2(); + static myPublicStaticProperty1 = exporter.createExportedWidget4(); + myPublicProperty1 = exporter.createExportedWidget4(); +} +var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); +var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); + +//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js] +//// [privacyCannotNameVarTypeDeclFile_Widgets.js] +var Widget1 = (function () { + function Widget1() { + this.name = 'one'; + } + return Widget1; +})(); +exports.Widget1 = Widget1; +function createWidget1() { + return new Widget1(); +} +exports.createWidget1 = createWidget1; +(function (SpecializedWidget) { + var Widget2 = (function () { + function Widget2() { + this.name = 'one'; + } + return Widget2; + })(); + SpecializedWidget.Widget2 = Widget2; + function createWidget2() { + return new Widget2(); + } + SpecializedWidget.createWidget2 = createWidget2; +})(exports.SpecializedWidget || (exports.SpecializedWidget = {})); +var SpecializedWidget = exports.SpecializedWidget; +//// [privacyCannotNameVarTypeDeclFile_exporter.js] +var Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets"); +var Widgets1 = require("GlobalWidgets"); +function createExportedWidget1() { + return Widgets.createWidget1(); +} +exports.createExportedWidget1 = createExportedWidget1; +function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +exports.createExportedWidget2 = createExportedWidget2; +function createExportedWidget3() { + return Widgets1.createWidget3(); +} +exports.createExportedWidget3 = createExportedWidget3; +function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} +exports.createExportedWidget4 = createExportedWidget4; +//// [privacyCannotNameVarTypeDeclFile_consumer.js] +var exporter = require("privacyCannotNameVarTypeDeclFile_exporter"); +var publicClassWithWithPrivatePropertyTypes = (function () { + function publicClassWithWithPrivatePropertyTypes() { + this.myPublicProperty = exporter.createExportedWidget1(); + this.myPrivateProperty = exporter.createExportedWidget1(); + this.myPublicProperty1 = exporter.createExportedWidget3(); + this.myPrivateProperty1 = exporter.createExportedWidget3(); + } + publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); + publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1(); + publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); + publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3(); + return publicClassWithWithPrivatePropertyTypes; +})(); +exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; +var privateClassWithWithPrivatePropertyTypes = (function () { + function privateClassWithWithPrivatePropertyTypes() { + this.myPublicProperty = exporter.createExportedWidget1(); + this.myPrivateProperty = exporter.createExportedWidget1(); + this.myPublicProperty1 = exporter.createExportedWidget3(); + this.myPrivateProperty1 = exporter.createExportedWidget3(); + } + privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); + privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1(); + privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); + privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3(); + return privateClassWithWithPrivatePropertyTypes; +})(); +exports.publicVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); +var privateVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); +exports.publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); +var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); +var publicClassWithPrivateModulePropertyTypes = (function () { + function publicClassWithPrivateModulePropertyTypes() { + this.myPublicProperty = exporter.createExportedWidget2(); + this.myPublicProperty1 = exporter.createExportedWidget4(); + } + publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); + publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); + return publicClassWithPrivateModulePropertyTypes; +})(); +exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; +exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); +exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); +var privateClassWithPrivateModulePropertyTypes = (function () { + function privateClassWithPrivateModulePropertyTypes() { + this.myPublicProperty = exporter.createExportedWidget2(); + this.myPublicProperty1 = exporter.createExportedWidget4(); + } + privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); + privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); + return privateClassWithPrivateModulePropertyTypes; +})(); +var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); +var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); + + +//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts] +declare module "GlobalWidgets" { + class Widget3 { + name: string; + } + function createWidget3(): Widget3; + module SpecializedGlobalWidget { + class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} +//// [privacyCannotNameVarTypeDeclFile_Widgets.d.ts] +export declare class Widget1 { + name: string; +} +export declare function createWidget1(): Widget1; +export declare module SpecializedWidget { + class Widget2 { + name: string; + } + function createWidget2(): Widget2; +} +//// [privacyCannotNameVarTypeDeclFile_exporter.d.ts] +/// +import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export declare function createExportedWidget1(): Widgets.Widget1; +export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2; +export declare function createExportedWidget3(): Widgets1.Widget3; +export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4; diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js index 899f18693dc..f2f2ac9ae12 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js @@ -30,3 +30,7 @@ var Query; }); } })(Query || (Query = {})); + + +//// [privacyCheckAnonymousFunctionParameter.d.ts] +export declare var x: number; diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js index ac899bbdf14..a1897ac05a3 100644 --- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js +++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js @@ -31,3 +31,7 @@ define(["require", "exports"], function (require, exports) { } })(Q || (Q = {})); }); + + +//// [privacyCheckAnonymousFunctionParameter2.d.ts] +export declare var x: number; diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js index 02a4b682d94..faaef563ebb 100644 --- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js +++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js @@ -10,3 +10,11 @@ export interface B extends A { //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js] define(["require", "exports"], function (require, exports) { }); + + +//// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.d.ts] +export interface A { + f1(callback: (p: T) => any): any; +} +export interface B extends A { +} diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js index 1b02a38307b..7b5e63ce009 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js @@ -11,3 +11,14 @@ export = Foo; //// [privacyCheckExportAssignmentOnExportedGenericInterface1.js] var Foo; module.exports = Foo; + + +//// [privacyCheckExportAssignmentOnExportedGenericInterface1.d.ts] +declare module Foo { + interface A { + } +} +interface Foo { +} +declare var Foo: new () => Foo.A>; +export = Foo; diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js index 2b4e9ddf833..11a51318230 100644 --- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js +++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js @@ -24,3 +24,13 @@ define(["require", "exports"], function (require, exports) { })(Foo || (Foo = {})); return Foo; }); + + +//// [privacyCheckExportAssignmentOnExportedGenericInterface2.d.ts] +export = Foo; +interface Foo { +} +declare function Foo(array: T[]): Foo; +declare module Foo { + var x: string; +} diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js index 94aa5c28e92..eeaea58e0ab 100644 --- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js +++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js @@ -22,3 +22,17 @@ var Foo = (function () { })(); module.exports = Foo; //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js] + + +//// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts] +export = Foo; +declare class Foo { + a: A; + constructor(a: A); +} +//// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.d.ts] +import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0"); +export = Bar; +interface Bar { + foo: Foo; +} diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js index a1def385809..6e2ef744946 100644 --- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js +++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js @@ -26,3 +26,12 @@ define(["require", "exports"], function (require, exports) { })(); exports.B = B; }); + + +//// [privacyCheckOnTypeParameterReferenceInConstructorParameter.d.ts] +export declare class A { + constructor(callback: (self: A) => void); +} +export declare class B { + constructor(parent: T2); +} diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt index 3132a1c56a7..50b9dc0242b 100644 --- a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt +++ b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt @@ -1,8 +1,10 @@ -==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (1 errors) ==== +==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (2 errors) ==== function foo() { } export var x: typeof foo; - ~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Cannot compile external modules unless the '--module' flag is provided. + ~ +!!! Exported variable 'x' has or is using private name 'foo'. export var b = foo; + ~ +!!! Exported variable 'b' has or is using private name 'foo'. \ No newline at end of file diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js new file mode 100644 index 00000000000..757416c691b --- /dev/null +++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js @@ -0,0 +1,12 @@ +//// [privacyCheckTypeOfFunction.ts] +function foo() { +} +export var x: typeof foo; +export var b = foo; + + +//// [privacyCheckTypeOfFunction.js] +function foo() { +} +exports.x; +exports.b = foo; diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt new file mode 100644 index 00000000000..e09c933ce4f --- /dev/null +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt @@ -0,0 +1,11 @@ +==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts (1 errors) ==== + module Outer { + module Inner { + export var m: typeof Inner; + } + + export var f: typeof Inner; + ~ +!!! Exported variable 'f' has or is using private name 'Inner'. + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt new file mode 100644 index 00000000000..5c35fde466c --- /dev/null +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt @@ -0,0 +1,11 @@ +==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts (1 errors) ==== + module Outer { + module Inner { + export var m: number; + } + + export var f: typeof Inner; // Since we dont unwind inner any more, it is error here + ~ +!!! Exported variable 'f' has or is using private name 'Inner'. + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js index 76656e5a86a..4bf2ff55471 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js @@ -17,21 +17,3 @@ var Outer; })(Inner || (Inner = {})); Outer.f; })(Outer || (Outer = {})); - - -//// [privacyCheckTypeOfInvisibleModuleNoError.d.ts] -declare module Outer { - var f: typeof Inner; -} - - -//// [DtsFileErrors] - - -==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.d.ts (1 errors) ==== - declare module Outer { - var f: typeof Inner; - ~~~~~ -!!! Cannot find name 'Inner'. - } - \ No newline at end of file diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt new file mode 100644 index 00000000000..269be5ed425 --- /dev/null +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt @@ -0,0 +1,203 @@ +==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts (24 errors) ==== + import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter"); + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + } + export class publicClassWithWithPrivateParmeterTypes1 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { + } + } + class privateClassWithWithPrivateParmeterTypes2 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { + } + export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + } + function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { + } + + + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + myPublicMethod(param= exporter.createExportedWidget2()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + } + export class publicClassWithPrivateModuleParameterTypes2 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + } + myPublicMethod(param= exporter.createExportedWidget4()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + } + export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + } + + + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { + } + myPublicMethod(param= exporter.createExportedWidget2()) { + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { + } + } + class privateClassWithPrivateModuleParameterTypes1 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { + } + myPublicMethod(param= exporter.createExportedWidget4()) { + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { + } + function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { + } +==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts (0 errors) ==== + + + declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } + } + +==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts (0 errors) ==== + export class Widget1 { + name = 'one'; + } + export function createWidget1() { + return new Widget1(); + } + + export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } + } + +==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts (0 errors) ==== + /// + import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); + import Widgets1 = require("GlobalWidgets"); + export function createExportedWidget1() { + return Widgets.createWidget1(); + } + export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); + } + export function createExportedWidget3() { + return Widgets1.createWidget3(); + } + export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js new file mode 100644 index 00000000000..3db10b3da1a --- /dev/null +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js @@ -0,0 +1,424 @@ +//// [tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts] //// + +//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts] + + +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts] +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts] +/// +import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +//// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts] +import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error + } +} +export class publicClassWithWithPrivateParmeterTypes1 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { + } +} +class privateClassWithWithPrivateParmeterTypes2 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { + } +} + +export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error +} +function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { +} +export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error +} +function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { +} + + +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget2()) { // Error + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error + } +} +export class publicClassWithPrivateModuleParameterTypes2 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget4()) { // Error + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error + } +} +export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error +} +export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error +} + + +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { + } + myPublicMethod(param= exporter.createExportedWidget2()) { + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { + } +} +class privateClassWithPrivateModuleParameterTypes1 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { + } + myPublicMethod(param= exporter.createExportedWidget4()) { + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { + } +} +function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { +} +function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { +} + +//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js] +//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js] +var Widget1 = (function () { + function Widget1() { + this.name = 'one'; + } + return Widget1; +})(); +exports.Widget1 = Widget1; +function createWidget1() { + return new Widget1(); +} +exports.createWidget1 = createWidget1; +(function (SpecializedWidget) { + var Widget2 = (function () { + function Widget2() { + this.name = 'one'; + } + return Widget2; + })(); + SpecializedWidget.Widget2 = Widget2; + function createWidget2() { + return new Widget2(); + } + SpecializedWidget.createWidget2 = createWidget2; +})(exports.SpecializedWidget || (exports.SpecializedWidget = {})); +var SpecializedWidget = exports.SpecializedWidget; +//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js] +var Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); +var Widgets1 = require("GlobalWidgets"); +function createExportedWidget1() { + return Widgets.createWidget1(); +} +exports.createExportedWidget1 = createExportedWidget1; +function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +exports.createExportedWidget2 = createExportedWidget2; +function createExportedWidget3() { + return Widgets1.createWidget3(); +} +exports.createExportedWidget3 = createExportedWidget3; +function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} +exports.createExportedWidget4 = createExportedWidget4; +//// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js] +var exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter"); +var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget1(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget1(); } + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + return publicClassWithWithPrivateParmeterTypes; +})(); +exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; +var publicClassWithWithPrivateParmeterTypes1 = (function () { + function publicClassWithWithPrivateParmeterTypes1(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget3(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget3(); } + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes1.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + publicClassWithWithPrivateParmeterTypes1.myPrivateStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + publicClassWithWithPrivateParmeterTypes1.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + publicClassWithWithPrivateParmeterTypes1.prototype.myPrivateMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + return publicClassWithWithPrivateParmeterTypes1; +})(); +exports.publicClassWithWithPrivateParmeterTypes1 = publicClassWithWithPrivateParmeterTypes1; +var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget1(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget1(); } + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } + }; + return privateClassWithWithPrivateParmeterTypes; +})(); +var privateClassWithWithPrivateParmeterTypes2 = (function () { + function privateClassWithWithPrivateParmeterTypes2(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget3(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget3(); } + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes2.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + privateClassWithWithPrivateParmeterTypes2.myPrivateStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + privateClassWithWithPrivateParmeterTypes2.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + privateClassWithWithPrivateParmeterTypes2.prototype.myPrivateMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } + }; + return privateClassWithWithPrivateParmeterTypes2; +})(); +function publicFunctionWithPrivateParmeterTypes(param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } +} +exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; +function privateFunctionWithPrivateParmeterTypes(param) { + if (param === void 0) { param = exporter.createExportedWidget1(); } +} +function publicFunctionWithPrivateParmeterTypes1(param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } +} +exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; +function privateFunctionWithPrivateParmeterTypes1(param) { + if (param === void 0) { param = exporter.createExportedWidget3(); } +} +var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget2(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget2(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget2(); } + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget2(); } + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget2(); } + }; + return publicClassWithPrivateModuleParameterTypes; +})(); +exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; +var publicClassWithPrivateModuleParameterTypes2 = (function () { + function publicClassWithPrivateModuleParameterTypes2(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget4(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget4(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget4(); } + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes2.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget4(); } + }; + publicClassWithPrivateModuleParameterTypes2.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget4(); } + }; + return publicClassWithPrivateModuleParameterTypes2; +})(); +exports.publicClassWithPrivateModuleParameterTypes2 = publicClassWithPrivateModuleParameterTypes2; +function publicFunctionWithPrivateModuleParameterTypes(param) { + if (param === void 0) { param = exporter.createExportedWidget2(); } +} +exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; +function publicFunctionWithPrivateModuleParameterTypes1(param) { + if (param === void 0) { param = exporter.createExportedWidget4(); } +} +exports.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1; +var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget2(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget2(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget2(); } + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget2(); } + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget2(); } + }; + return privateClassWithPrivateModuleParameterTypes; +})(); +var privateClassWithPrivateModuleParameterTypes1 = (function () { + function privateClassWithPrivateModuleParameterTypes1(param, param1, param2) { + if (param === void 0) { param = exporter.createExportedWidget4(); } + if (param1 === void 0) { param1 = exporter.createExportedWidget4(); } + if (param2 === void 0) { param2 = exporter.createExportedWidget4(); } + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes1.myPublicStaticMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget4(); } + }; + privateClassWithPrivateModuleParameterTypes1.prototype.myPublicMethod = function (param) { + if (param === void 0) { param = exporter.createExportedWidget4(); } + }; + return privateClassWithPrivateModuleParameterTypes1; +})(); +function privateFunctionWithPrivateModuleParameterTypes(param) { + if (param === void 0) { param = exporter.createExportedWidget2(); } +} +function privateFunctionWithPrivateModuleParameterTypes1(param) { + if (param === void 0) { param = exporter.createExportedWidget4(); } +} + + +//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts] +declare module "GlobalWidgets" { + class Widget3 { + name: string; + } + function createWidget3(): Widget3; + module SpecializedGlobalWidget { + class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} +//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.d.ts] +export declare class Widget1 { + name: string; +} +export declare function createWidget1(): Widget1; +export declare module SpecializedWidget { + class Widget2 { + name: string; + } + function createWidget2(): Widget2; +} +//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.d.ts] +/// +import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export declare function createExportedWidget1(): Widgets.Widget1; +export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2; +export declare function createExportedWidget3(): Widgets1.Widget3; +export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4; diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt new file mode 100644 index 00000000000..834e3d783c6 --- /dev/null +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt @@ -0,0 +1,186 @@ +==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts (12 errors) ==== + import exporter = require("privacyFunctionReturnTypeDeclFile_exporter"); + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } + } + + export function publicFunctionWithPrivateParmeterTypes() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget1(); + } + function privateFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget3(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); + } + + export class publicClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget2(); + } + myPublicMethod() { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget4(); + } + } + export function publicFunctionWithPrivateModuleReturnTypes() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. + return exporter.createExportedWidget2(); + } + export function publicFunctionWithPrivateModuleReturnTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + return exporter.createExportedWidget4(); + } + + class privateClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + myPublicMethod() { + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } + } + function privateFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); + } + function privateFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); + } + +==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts (0 errors) ==== + + + declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } + } + +==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets.ts (0 errors) ==== + export class Widget1 { + name = 'one'; + } + export function createWidget1() { + return new Widget1(); + } + + export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } + } + +==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_exporter.ts (0 errors) ==== + /// + import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets"); + import Widgets1 = require("GlobalWidgets"); + export function createExportedWidget1() { + return Widgets.createWidget1(); + } + export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); + } + export function createExportedWidget3() { + return Widgets1.createWidget3(); + } + export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js new file mode 100644 index 00000000000..603a51467e8 --- /dev/null +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js @@ -0,0 +1,381 @@ +//// [tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts] //// + +//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts] + + +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +//// [privacyFunctionReturnTypeDeclFile_Widgets.ts] +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +//// [privacyFunctionReturnTypeDeclFile_exporter.ts] +/// +import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +//// [privacyFunctionReturnTypeDeclFile_consumer.ts] +import exporter = require("privacyFunctionReturnTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { // Error + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { // Error + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +export function publicFunctionWithPrivateParmeterTypes() { // Error + return exporter.createExportedWidget1(); +} +function privateFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); +} +export function publicFunctionWithPrivateParmeterTypes1() { // Error + return exporter.createExportedWidget3(); +} +function privateFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); +} + +export class publicClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +export function publicFunctionWithPrivateModuleReturnTypes() { // Error + return exporter.createExportedWidget2(); +} +export function publicFunctionWithPrivateModuleReturnTypes1() { // Error + return exporter.createExportedWidget4(); +} + +class privateClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + myPublicMethod() { + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +function privateFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); +} +function privateFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); +} + + +//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js] +//// [privacyFunctionReturnTypeDeclFile_Widgets.js] +var Widget1 = (function () { + function Widget1() { + this.name = 'one'; + } + return Widget1; +})(); +exports.Widget1 = Widget1; +function createWidget1() { + return new Widget1(); +} +exports.createWidget1 = createWidget1; +(function (SpecializedWidget) { + var Widget2 = (function () { + function Widget2() { + this.name = 'one'; + } + return Widget2; + })(); + SpecializedWidget.Widget2 = Widget2; + function createWidget2() { + return new Widget2(); + } + SpecializedWidget.createWidget2 = createWidget2; +})(exports.SpecializedWidget || (exports.SpecializedWidget = {})); +var SpecializedWidget = exports.SpecializedWidget; +//// [privacyFunctionReturnTypeDeclFile_exporter.js] +var Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets"); +var Widgets1 = require("GlobalWidgets"); +function createExportedWidget1() { + return Widgets.createWidget1(); +} +exports.createExportedWidget1 = createExportedWidget1; +function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +exports.createExportedWidget2 = createExportedWidget2; +function createExportedWidget3() { + return Widgets1.createWidget3(); +} +exports.createExportedWidget3 = createExportedWidget3; +function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} +exports.createExportedWidget4 = createExportedWidget4; +//// [privacyFunctionReturnTypeDeclFile_consumer.js] +var exporter = require("privacyFunctionReturnTypeDeclFile_exporter"); +var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes() { + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return exporter.createExportedWidget1(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return exporter.createExportedWidget1(); + ; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return exporter.createExportedWidget1(); + ; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return exporter.createExportedWidget1(); + ; + }; + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return exporter.createExportedWidget3(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return exporter.createExportedWidget3(); + ; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return exporter.createExportedWidget3(); + ; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return exporter.createExportedWidget3(); + ; + }; + return publicClassWithWithPrivateParmeterTypes; +})(); +exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; +var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes() { + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return exporter.createExportedWidget1(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return exporter.createExportedWidget1(); + ; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return exporter.createExportedWidget1(); + ; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return exporter.createExportedWidget1(); + ; + }; + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return exporter.createExportedWidget3(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return exporter.createExportedWidget3(); + ; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return exporter.createExportedWidget3(); + ; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return exporter.createExportedWidget3(); + ; + }; + return privateClassWithWithPrivateParmeterTypes; +})(); +function publicFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); +} +exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; +function privateFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); +} +function publicFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); +} +exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; +function privateFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); +} +var publicClassWithPrivateModuleReturnTypes = (function () { + function publicClassWithPrivateModuleReturnTypes() { + } + publicClassWithPrivateModuleReturnTypes.myPublicStaticMethod = function () { + return exporter.createExportedWidget2(); + }; + publicClassWithPrivateModuleReturnTypes.prototype.myPublicMethod = function () { + return exporter.createExportedWidget2(); + }; + publicClassWithPrivateModuleReturnTypes.myPublicStaticMethod1 = function () { + return exporter.createExportedWidget4(); + }; + publicClassWithPrivateModuleReturnTypes.prototype.myPublicMethod1 = function () { + return exporter.createExportedWidget4(); + }; + return publicClassWithPrivateModuleReturnTypes; +})(); +exports.publicClassWithPrivateModuleReturnTypes = publicClassWithPrivateModuleReturnTypes; +function publicFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); +} +exports.publicFunctionWithPrivateModuleReturnTypes = publicFunctionWithPrivateModuleReturnTypes; +function publicFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); +} +exports.publicFunctionWithPrivateModuleReturnTypes1 = publicFunctionWithPrivateModuleReturnTypes1; +var privateClassWithPrivateModuleReturnTypes = (function () { + function privateClassWithPrivateModuleReturnTypes() { + } + privateClassWithPrivateModuleReturnTypes.myPublicStaticMethod = function () { + return exporter.createExportedWidget2(); + }; + privateClassWithPrivateModuleReturnTypes.prototype.myPublicMethod = function () { + return exporter.createExportedWidget2(); + }; + privateClassWithPrivateModuleReturnTypes.myPublicStaticMethod1 = function () { + return exporter.createExportedWidget4(); + }; + privateClassWithPrivateModuleReturnTypes.prototype.myPublicMethod1 = function () { + return exporter.createExportedWidget4(); + }; + return privateClassWithPrivateModuleReturnTypes; +})(); +function privateFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); +} +function privateFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); +} + + +//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts] +declare module "GlobalWidgets" { + class Widget3 { + name: string; + } + function createWidget3(): Widget3; + module SpecializedGlobalWidget { + class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} +//// [privacyFunctionReturnTypeDeclFile_Widgets.d.ts] +export declare class Widget1 { + name: string; +} +export declare function createWidget1(): Widget1; +export declare module SpecializedWidget { + class Widget2 { + name: string; + } + function createWidget2(): Widget2; +} +//// [privacyFunctionReturnTypeDeclFile_exporter.d.ts] +/// +import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export declare function createExportedWidget1(): Widgets.Widget1; +export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2; +export declare function createExportedWidget3(): Widgets1.Widget3; +export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4; diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt new file mode 100644 index 00000000000..e4d45caccba --- /dev/null +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt @@ -0,0 +1,805 @@ +==== tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts (40 errors) ==== + + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. + (param: privateClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. + myMethod(param: privateClass): void; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'. + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using private name 'privateClass'. + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using private name 'privateClass'. + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + (param: privateModule.publicClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myMethod(param: privateModule.publicClass): void; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + myPublicMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + export module publicModule { + class privateClass { + } + + export class publicClass { + } + + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. + (param: privateClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. + myMethod(param: privateClass): void; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'. + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using private name 'privateClass'. + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using private name 'privateClass'. + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + (param: privateModule.publicClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myMethod(param: privateModule.publicClass): void; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + myPublicMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; + (param: privateClass): publicClass; + myMethod(param: privateClass): void; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + } + +==== tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts (20 errors) ==== + class publicClassInGlobal { + } + interface publicInterfaceWithPublicParmeterTypesInGlobal { + new (param: publicClassInGlobal): publicClassInGlobal; + (param: publicClassInGlobal): publicClassInGlobal; + myMethod(param: publicClassInGlobal): void; + } + class publicClassWithWithPublicParmeterTypesInGlobal { + static myPublicStaticMethod(param: publicClassInGlobal) { + } + private static myPrivateStaticMethod(param: publicClassInGlobal) { + } + myPublicMethod(param: publicClassInGlobal) { + } + private myPrivateMethod(param: publicClassInGlobal) { + } + constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) { + } + } + function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) { + } + declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; + + module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; + (param: privateClass): publicClass; + myMethod(param: privateClass): void; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. + (param: privateClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. + myMethod(param: privateClass): void; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'. + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using private name 'privateClass'. + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + ~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using private name 'privateClass'. + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + (param: privateModule.publicClass): publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myMethod(param: privateModule.publicClass): void; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + myPublicMethod(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js new file mode 100644 index 00000000000..0e2f72ce3a6 --- /dev/null +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -0,0 +1,1279 @@ +//// [tests/cases/compiler/privacyFunctionParameterDeclFile.ts] //// + +//// [privacyFunctionParameterDeclFile_externalModule.ts] + +class privateClass { +} + +export class publicClass { +} + +export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + (param: privateClass): publicClass; // Error + myMethod(param: privateClass): void; // Error +} + +export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; +} + +interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; +} + +interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; +} + +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + } +} + +export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } +} + +class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } +} + +export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error +} +export function publicFunctionWithPublicParmeterTypes(param: publicClass) { +} +function privateFunctionWithPrivateParmeterTypes(param: privateClass) { +} +function privateFunctionWithPublicParmeterTypes(param: publicClass) { +} + +export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error +export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; +declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; +declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + +export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + (param: privateModule.publicClass): publicClass; // Error + myMethod(param: privateModule.publicClass): void; // Error +} +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + myPublicMethod(param: privateModule.publicClass) { // Error + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + } +} +export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error +} +export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + +interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; +} +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } +} +function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { +} +declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + (param: privateClass): publicClass; // Error + myMethod(param: privateClass): void; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + (param: privateModule.publicClass): publicClass; // Error + myMethod(param: privateModule.publicClass): void; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + myPublicMethod(param: privateModule.publicClass) { // Error + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; + (param: privateClass): publicClass; + myMethod(param: privateClass): void; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; +} + +//// [privacyFunctionParameterDeclFile_GlobalFile.ts] +class publicClassInGlobal { +} +interface publicInterfaceWithPublicParmeterTypesInGlobal { + new (param: publicClassInGlobal): publicClassInGlobal; + (param: publicClassInGlobal): publicClassInGlobal; + myMethod(param: publicClassInGlobal): void; +} +class publicClassWithWithPublicParmeterTypesInGlobal { + static myPublicStaticMethod(param: publicClassInGlobal) { + } + private static myPrivateStaticMethod(param: publicClassInGlobal) { + } + myPublicMethod(param: publicClassInGlobal) { + } + private myPrivateMethod(param: publicClassInGlobal) { + } + constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) { + } +} +function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) { +} +declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; + (param: privateClass): publicClass; + myMethod(param: privateClass): void; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + (param: privateClass): publicClass; // Error + myMethod(param: privateClass): void; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + (param: privateModule.publicClass): publicClass; // Error + myMethod(param: privateModule.publicClass): void; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + myPublicMethod(param: privateModule.publicClass) { // Error + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; +} + +//// [privacyFunctionParameterDeclFile_externalModule.js] +var privateClass = (function () { + function privateClass() { + } + return privateClass; +})(); +var publicClass = (function () { + function publicClass() { + } + return publicClass; +})(); +exports.publicClass = publicClass; +var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPrivateParmeterTypes; +})(); +exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; +var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPublicParmeterTypes; +})(); +exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; +var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPrivateParmeterTypes; +})(); +var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPublicParmeterTypes; +})(); +function publicFunctionWithPrivateParmeterTypes(param) { +} +exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; +function publicFunctionWithPublicParmeterTypes(param) { +} +exports.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; +function privateFunctionWithPrivateParmeterTypes(param) { +} +function privateFunctionWithPublicParmeterTypes(param) { +} +var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return publicClassWithPrivateModuleParameterTypes; +})(); +exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; +function publicFunctionWithPrivateModuleParameterTypes(param) { +} +exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; +var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return privateClassWithPrivateModuleParameterTypes; +})(); +function privateFunctionWithPrivateModuleParameterTypes(param) { +} +(function (publicModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModule.publicClass = publicClass; + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPublicParmeterTypes; + })(); + publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes(param) { + } + publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes(param) { + } + publicModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes(param) { + } + function privateFunctionWithPublicParmeterTypes(param) { + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes(param) { + } + publicModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes(param) { + } +})(exports.publicModule || (exports.publicModule = {})); +var publicModule = exports.publicModule; +var privateModule; +(function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPublicParmeterTypes; + })(); + privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes(param) { + } + privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes(param) { + } + privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes(param) { + } + function privateFunctionWithPublicParmeterTypes(param) { + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes(param) { + } + privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes(param) { + } +})(privateModule || (privateModule = {})); +//// [privacyFunctionParameterDeclFile_GlobalFile.js] +var publicClassInGlobal = (function () { + function publicClassInGlobal() { + } + return publicClassInGlobal; +})(); +var publicClassWithWithPublicParmeterTypesInGlobal = (function () { + function publicClassWithWithPublicParmeterTypesInGlobal(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPublicParmeterTypesInGlobal; +})(); +function publicFunctionWithPublicParmeterTypesInGlobal(param) { +} +var publicModuleInGlobal; +(function (publicModuleInGlobal) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModuleInGlobal.publicClass = publicClass; + var privateModule; + (function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPublicParmeterTypes; + })(); + privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes(param) { + } + privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes(param) { + } + privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes(param) { + } + function privateFunctionWithPublicParmeterTypes(param) { + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes(param) { + } + privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes(param) { + } + })(privateModule || (privateModule = {})); + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return publicClassWithWithPublicParmeterTypes; + })(); + publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) { + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) { + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes(param) { + } + publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes(param) { + } + publicModuleInGlobal.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes(param) { + } + function privateFunctionWithPublicParmeterTypes(param) { + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes(param) { + } + publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes(param, param1, param2) { + this.param1 = param1; + this.param2 = param2; + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) { + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) { + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes(param) { + } +})(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt new file mode 100644 index 00000000000..0fe9b40ea83 --- /dev/null +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt @@ -0,0 +1,1324 @@ +==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts (44 errors) ==== + + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'. + (): privateClass; // Error + ~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using private name 'privateClass'. + [x: number]: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of index signature from exported interface has or is using private name 'privateClass'. + myMethod(): privateClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using private name 'privateClass'. + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using private name 'privateClass'. + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + [x: number]: privateModule.publicClass // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myMethod(): privateModule.publicClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + export module publicModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'. + (): privateClass; // Error + ~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using private name 'privateClass'. + [x: number]: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of index signature from exported interface has or is using private name 'privateClass'. + myMethod(): privateClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using private name 'privateClass'. + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using private name 'privateClass'. + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + [x: number]: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myMethod(): privateModule.publicClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + } + +==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts (22 errors) ==== + class publicClassInGlobal { + } + interface publicInterfaceWithPublicParmeterTypesInGlobal { + new (): publicClassInGlobal; + (): publicClassInGlobal; + [x: number]: publicClassInGlobal; + myMethod(): publicClassInGlobal; + } + class publicClassWithWithPublicParmeterTypesInGlobal { + static myPublicStaticMethod(): publicClassInGlobal { + return null; + } + private static myPrivateStaticMethod(): publicClassInGlobal { + return null; + } + myPublicMethod(): publicClassInGlobal { + return null; + } + private myPrivateMethod(): publicClassInGlobal { + return null; + } + static myPublicStaticMethod1() { + return new publicClassInGlobal(); + } + private static myPrivateStaticMethod1() { + return new publicClassInGlobal(); + } + myPublicMethod1() { + return new publicClassInGlobal(); + } + private myPrivateMethod1() { + return new publicClassInGlobal(); + } + } + function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal { + return null; + } + function publicFunctionWithPublicParmeterTypesInGlobal1() { + return new publicClassInGlobal(); + } + declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; + + module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'. + (): privateClass; // Error + ~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using private name 'privateClass'. + [x: number]: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of index signature from exported interface has or is using private name 'privateClass'. + myMethod(): privateClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using private name 'privateClass'. + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using private name 'privateClass'. + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using private name 'privateClass'. + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using private name 'privateClass'. + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + [x: number]: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myMethod(): privateModule.publicClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + static myPublicStaticMethod1() { // Error + ~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + ~~~~~~~~~~~~~~~ +!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js new file mode 100644 index 00000000000..06a64104148 --- /dev/null +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -0,0 +1,2279 @@ +//// [tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts] //// + +//// [privacyFunctionReturnTypeDeclFile_externalModule.ts] + +class privateClass { +} + +export class publicClass { +} + +export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + (): privateClass; // Error + [x: number]: privateClass; // Error + myMethod(): privateClass; // Error +} + +export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; +} + +interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; +} + +interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; +} + +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } +} + +export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } +} + +class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } +} + +export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + return null; +} +export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; +} +function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; +} +function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; +} +export function publicFunctionWithPrivateParmeterTypes1() { // Error + return new privateClass(); +} +export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); +} +function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); +} +function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); +} + +export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error +export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; +declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; +declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + +export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + (): privateModule.publicClass; // Error + [x: number]: privateModule.publicClass // Error + myMethod(): privateModule.publicClass; // Error +} +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + return new privateModule.publicClass(); + } +} +export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + return null; +} +export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + return new privateModule.publicClass(); +} +export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + +interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass + myMethod(): privateModule.publicClass; +} +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } +} +function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; +} +function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); +} +declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + (): privateClass; // Error + [x: number]: privateClass; // Error + myMethod(): privateClass; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + (): privateModule.publicClass; // Error + [x: number]: privateModule.publicClass; // Error + myMethod(): privateModule.publicClass; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; +} + +//// [privacyFunctionReturnTypeDeclFile_GlobalFile.ts] +class publicClassInGlobal { +} +interface publicInterfaceWithPublicParmeterTypesInGlobal { + new (): publicClassInGlobal; + (): publicClassInGlobal; + [x: number]: publicClassInGlobal; + myMethod(): publicClassInGlobal; +} +class publicClassWithWithPublicParmeterTypesInGlobal { + static myPublicStaticMethod(): publicClassInGlobal { + return null; + } + private static myPrivateStaticMethod(): publicClassInGlobal { + return null; + } + myPublicMethod(): publicClassInGlobal { + return null; + } + private myPrivateMethod(): publicClassInGlobal { + return null; + } + static myPublicStaticMethod1() { + return new publicClassInGlobal(); + } + private static myPrivateStaticMethod1() { + return new publicClassInGlobal(); + } + myPublicMethod1() { + return new publicClassInGlobal(); + } + private myPrivateMethod1() { + return new publicClassInGlobal(); + } +} +function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal { + return null; +} +function publicFunctionWithPublicParmeterTypesInGlobal1() { + return new publicClassInGlobal(); +} +declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + (): privateClass; // Error + [x: number]: privateClass; // Error + myMethod(): privateClass; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + (): privateModule.publicClass; // Error + [x: number]: privateModule.publicClass; // Error + myMethod(): privateModule.publicClass; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; +} + +//// [privacyFunctionReturnTypeDeclFile_externalModule.js] +var privateClass = (function () { + function privateClass() { + } + return privateClass; +})(); +var publicClass = (function () { + function publicClass() { + } + return publicClass; +})(); +exports.publicClass = publicClass; +var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes() { + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return publicClassWithWithPrivateParmeterTypes; +})(); +exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; +var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes() { + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return publicClassWithWithPublicParmeterTypes; +})(); +exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; +var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes() { + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return privateClassWithWithPrivateParmeterTypes; +})(); +var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes() { + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return privateClassWithWithPublicParmeterTypes; +})(); +function publicFunctionWithPrivateParmeterTypes() { + return null; +} +exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; +function publicFunctionWithPublicParmeterTypes() { + return null; +} +exports.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; +function privateFunctionWithPrivateParmeterTypes() { + return null; +} +function privateFunctionWithPublicParmeterTypes() { + return null; +} +function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); +} +exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; +function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); +} +exports.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1; +function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); +} +function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); +} +var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes() { + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return publicClassWithPrivateModuleParameterTypes; +})(); +exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; +function publicFunctionWithPrivateModuleParameterTypes() { + return null; +} +exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; +function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); +} +exports.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1; +var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes() { + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return privateClassWithPrivateModuleParameterTypes; +})(); +function privateFunctionWithPrivateModuleParameterTypes() { + return null; +} +function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); +} +(function (publicModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModule.publicClass = publicClass; + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes() { + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes() { + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return publicClassWithWithPublicParmeterTypes; + })(); + publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes() { + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes() { + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes() { + return null; + } + publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes() { + return null; + } + publicModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes() { + return null; + } + function privateFunctionWithPublicParmeterTypes() { + return null; + } + function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + publicModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; + function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + publicModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1; + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes() { + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes() { + return null; + } + publicModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + publicModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes() { + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes() { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } +})(exports.publicModule || (exports.publicModule = {})); +var publicModule = exports.publicModule; +var privateModule; +(function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes() { + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes() { + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return publicClassWithWithPublicParmeterTypes; + })(); + privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes() { + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes() { + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes() { + return null; + } + privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes() { + return null; + } + privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes() { + return null; + } + function privateFunctionWithPublicParmeterTypes() { + return null; + } + function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + privateModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; + function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + privateModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1; + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes() { + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes() { + return null; + } + privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + privateModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes() { + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes() { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } +})(privateModule || (privateModule = {})); +//// [privacyFunctionReturnTypeDeclFile_GlobalFile.js] +var publicClassInGlobal = (function () { + function publicClassInGlobal() { + } + return publicClassInGlobal; +})(); +var publicClassWithWithPublicParmeterTypesInGlobal = (function () { + function publicClassWithWithPublicParmeterTypesInGlobal() { + } + publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod1 = function () { + return new publicClassInGlobal(); + }; + publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod1 = function () { + return new publicClassInGlobal(); + }; + publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod1 = function () { + return new publicClassInGlobal(); + }; + publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod1 = function () { + return new publicClassInGlobal(); + }; + return publicClassWithWithPublicParmeterTypesInGlobal; +})(); +function publicFunctionWithPublicParmeterTypesInGlobal() { + return null; +} +function publicFunctionWithPublicParmeterTypesInGlobal1() { + return new publicClassInGlobal(); +} +var publicModuleInGlobal; +(function (publicModuleInGlobal) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModuleInGlobal.publicClass = publicClass; + var privateModule; + (function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes() { + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes() { + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return publicClassWithWithPublicParmeterTypes; + })(); + privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes() { + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes() { + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes() { + return null; + } + privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes() { + return null; + } + privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes() { + return null; + } + function privateFunctionWithPublicParmeterTypes() { + return null; + } + function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + privateModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; + function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + privateModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1; + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes() { + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes() { + return null; + } + privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + privateModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes() { + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes() { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + })(privateModule || (privateModule = {})); + var publicClassWithWithPrivateParmeterTypes = (function () { + function publicClassWithWithPrivateParmeterTypes() { + } + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return publicClassWithWithPrivateParmeterTypes; + })(); + publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes; + var publicClassWithWithPublicParmeterTypes = (function () { + function publicClassWithWithPublicParmeterTypes() { + } + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return publicClassWithWithPublicParmeterTypes; + })(); + publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes; + var privateClassWithWithPrivateParmeterTypes = (function () { + function privateClassWithWithPrivateParmeterTypes() { + } + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () { + return new privateClass(); + }; + privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () { + return new privateClass(); + }; + return privateClassWithWithPrivateParmeterTypes; + })(); + var privateClassWithWithPublicParmeterTypes = (function () { + function privateClassWithWithPublicParmeterTypes() { + } + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () { + return null; + }; + privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () { + return new publicClass(); + }; + privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () { + return new publicClass(); + }; + return privateClassWithWithPublicParmeterTypes; + })(); + function publicFunctionWithPrivateParmeterTypes() { + return null; + } + publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes; + function publicFunctionWithPublicParmeterTypes() { + return null; + } + publicModuleInGlobal.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes; + function privateFunctionWithPrivateParmeterTypes() { + return null; + } + function privateFunctionWithPublicParmeterTypes() { + return null; + } + function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1; + function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + publicModuleInGlobal.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1; + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + var publicClassWithPrivateModuleParameterTypes = (function () { + function publicClassWithPrivateModuleParameterTypes() { + } + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return publicClassWithPrivateModuleParameterTypes; + })(); + publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes() { + return null; + } + publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes; + function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1; + var privateClassWithPrivateModuleParameterTypes = (function () { + function privateClassWithPrivateModuleParameterTypes() { + } + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () { + return null; + }; + privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () { + return new privateModule.publicClass(); + }; + privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () { + return new privateModule.publicClass(); + }; + return privateClassWithPrivateModuleParameterTypes; + })(); + function privateFunctionWithPrivateModuleParameterTypes() { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } +})(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/privacyGetter.errors.txt b/tests/baselines/reference/privacyGetter.errors.txt deleted file mode 100644 index ea185031726..00000000000 --- a/tests/baselines/reference/privacyGetter.errors.txt +++ /dev/null @@ -1,304 +0,0 @@ -==== tests/cases/compiler/privacyGetter.ts (48 errors) ==== - export module m1 { - export class C1_public { - private f1() { - } - } - - class C2_private { - } - - export class C3_public { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p1_private(m1_c3_p1_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p2_private(m1_c3_p2_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - - private set p3_private(m1_c3_p3_arg: C2_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): C2_private { // error - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); //error - } - - public set p4_public(m1_c3_p4_arg: C2_private) { // error - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - - class C4_private { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p1_private(m1_c3_p1_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p2_private(m1_c3_p2_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - - private set p3_private(m1_c3_p3_arg: C2_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): C2_private { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - - public set p4_public(m1_c3_p4_arg: C2_private) { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - } - - module m2 { - export class m2_C1_public { - private f1() { - } - } - - class m2_C2_private { - } - - export class m2_C3_public { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C1_public(); - } - - private set p1_private(m2_c3_p1_arg: m2_C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C1_public(); - } - - private set p2_private(m2_c3_p2_arg: m2_C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C2_private(); - } - - private set p3_private(m2_c3_p3_arg: m2_C2_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): m2_C2_private { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C2_private(); - } - - public set p4_public(m2_c3_p4_arg: m2_C2_private) { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - - class m2_C4_private { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C1_public(); - } - - private set p1_private(m2_c3_p1_arg: m2_C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C1_public(); - } - - private set p2_private(m2_c3_p2_arg: m2_C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C2_private(); - } - - private set p3_private(m2_c3_p3_arg: m2_C2_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): m2_C2_private { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new m2_C2_private(); - } - - public set p4_public(m2_c3_p4_arg: m2_C2_private) { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - } - - class C5_private { - private f() { - } - } - - export class C6_public { - } - - export class C7_public { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C6_public(); - } - - private set p1_private(m1_c3_p1_arg: C6_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C6_public(); - } - - private set p2_private(m1_c3_p2_arg: C6_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C5_private(); - } - - private set p3_private(m1_c3_p3_arg: C5_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): C5_private { // error - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C5_private(); //error - } - - public set p4_public(m1_c3_p4_arg: C5_private) { // error - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - - class C8_private { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C6_public(); - } - - private set p1_private(m1_c3_p1_arg: C6_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C6_public(); - } - - private set p2_private(m1_c3_p2_arg: C6_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C5_private(); - } - - private set p3_private(m1_c3_p3_arg: C5_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): C5_private { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C5_private(); - } - - public set p4_public(m1_c3_p4_arg: C5_private) { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } \ No newline at end of file diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js new file mode 100644 index 00000000000..d144836e744 --- /dev/null +++ b/tests/baselines/reference/privacyGetter.js @@ -0,0 +1,506 @@ +//// [privacyGetter.ts] +export module m1 { + export class C1_public { + private f1() { + } + } + + class C2_private { + } + + export class C3_public { + private get p1_private() { + return new C1_public(); + } + + private set p1_private(m1_c3_p1_arg: C1_public) { + } + + private get p2_private() { + return new C1_public(); + } + + private set p2_private(m1_c3_p2_arg: C1_public) { + } + + private get p3_private() { + return new C2_private(); + } + + private set p3_private(m1_c3_p3_arg: C2_private) { + } + + public get p4_public(): C2_private { // error + return new C2_private(); //error + } + + public set p4_public(m1_c3_p4_arg: C2_private) { // error + } + } + + class C4_private { + private get p1_private() { + return new C1_public(); + } + + private set p1_private(m1_c3_p1_arg: C1_public) { + } + + private get p2_private() { + return new C1_public(); + } + + private set p2_private(m1_c3_p2_arg: C1_public) { + } + + private get p3_private() { + return new C2_private(); + } + + private set p3_private(m1_c3_p3_arg: C2_private) { + } + + public get p4_public(): C2_private { + return new C2_private(); + } + + public set p4_public(m1_c3_p4_arg: C2_private) { + } + } +} + +module m2 { + export class m2_C1_public { + private f1() { + } + } + + class m2_C2_private { + } + + export class m2_C3_public { + private get p1_private() { + return new m2_C1_public(); + } + + private set p1_private(m2_c3_p1_arg: m2_C1_public) { + } + + private get p2_private() { + return new m2_C1_public(); + } + + private set p2_private(m2_c3_p2_arg: m2_C1_public) { + } + + private get p3_private() { + return new m2_C2_private(); + } + + private set p3_private(m2_c3_p3_arg: m2_C2_private) { + } + + public get p4_public(): m2_C2_private { + return new m2_C2_private(); + } + + public set p4_public(m2_c3_p4_arg: m2_C2_private) { + } + } + + class m2_C4_private { + private get p1_private() { + return new m2_C1_public(); + } + + private set p1_private(m2_c3_p1_arg: m2_C1_public) { + } + + private get p2_private() { + return new m2_C1_public(); + } + + private set p2_private(m2_c3_p2_arg: m2_C1_public) { + } + + private get p3_private() { + return new m2_C2_private(); + } + + private set p3_private(m2_c3_p3_arg: m2_C2_private) { + } + + public get p4_public(): m2_C2_private { + return new m2_C2_private(); + } + + public set p4_public(m2_c3_p4_arg: m2_C2_private) { + } + } +} + +class C5_private { + private f() { + } +} + +export class C6_public { +} + +export class C7_public { + private get p1_private() { + return new C6_public(); + } + + private set p1_private(m1_c3_p1_arg: C6_public) { + } + + private get p2_private() { + return new C6_public(); + } + + private set p2_private(m1_c3_p2_arg: C6_public) { + } + + private get p3_private() { + return new C5_private(); + } + + private set p3_private(m1_c3_p3_arg: C5_private) { + } + + public get p4_public(): C5_private { // error + return new C5_private(); //error + } + + public set p4_public(m1_c3_p4_arg: C5_private) { // error + } +} + +class C8_private { + private get p1_private() { + return new C6_public(); + } + + private set p1_private(m1_c3_p1_arg: C6_public) { + } + + private get p2_private() { + return new C6_public(); + } + + private set p2_private(m1_c3_p2_arg: C6_public) { + } + + private get p3_private() { + return new C5_private(); + } + + private set p3_private(m1_c3_p3_arg: C5_private) { + } + + public get p4_public(): C5_private { + return new C5_private(); + } + + public set p4_public(m1_c3_p4_arg: C5_private) { + } +} + +//// [privacyGetter.js] +define(["require", "exports"], function (require, exports) { + (function (m1) { + var C1_public = (function () { + function C1_public() { + } + C1_public.prototype.f1 = function () { + }; + return C1_public; + })(); + m1.C1_public = C1_public; + var C2_private = (function () { + function C2_private() { + } + return C2_private; + })(); + var C3_public = (function () { + function C3_public() { + } + Object.defineProperty(C3_public.prototype, "p1_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C3_public.prototype, "p2_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C3_public.prototype, "p3_private", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C3_public.prototype, "p4_public", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return C3_public; + })(); + m1.C3_public = C3_public; + var C4_private = (function () { + function C4_private() { + } + Object.defineProperty(C4_private.prototype, "p1_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C4_private.prototype, "p2_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C4_private.prototype, "p3_private", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C4_private.prototype, "p4_public", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return C4_private; + })(); + })(exports.m1 || (exports.m1 = {})); + var m1 = exports.m1; + var m2; + (function (m2) { + var m2_C1_public = (function () { + function m2_C1_public() { + } + m2_C1_public.prototype.f1 = function () { + }; + return m2_C1_public; + })(); + m2.m2_C1_public = m2_C1_public; + var m2_C2_private = (function () { + function m2_C2_private() { + } + return m2_C2_private; + })(); + var m2_C3_public = (function () { + function m2_C3_public() { + } + Object.defineProperty(m2_C3_public.prototype, "p1_private", { + get: function () { + return new m2_C1_public(); + }, + set: function (m2_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(m2_C3_public.prototype, "p2_private", { + get: function () { + return new m2_C1_public(); + }, + set: function (m2_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(m2_C3_public.prototype, "p3_private", { + get: function () { + return new m2_C2_private(); + }, + set: function (m2_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(m2_C3_public.prototype, "p4_public", { + get: function () { + return new m2_C2_private(); + }, + set: function (m2_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return m2_C3_public; + })(); + m2.m2_C3_public = m2_C3_public; + var m2_C4_private = (function () { + function m2_C4_private() { + } + Object.defineProperty(m2_C4_private.prototype, "p1_private", { + get: function () { + return new m2_C1_public(); + }, + set: function (m2_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(m2_C4_private.prototype, "p2_private", { + get: function () { + return new m2_C1_public(); + }, + set: function (m2_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(m2_C4_private.prototype, "p3_private", { + get: function () { + return new m2_C2_private(); + }, + set: function (m2_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(m2_C4_private.prototype, "p4_public", { + get: function () { + return new m2_C2_private(); + }, + set: function (m2_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return m2_C4_private; + })(); + })(m2 || (m2 = {})); + var C5_private = (function () { + function C5_private() { + } + C5_private.prototype.f = function () { + }; + return C5_private; + })(); + var C6_public = (function () { + function C6_public() { + } + return C6_public; + })(); + exports.C6_public = C6_public; + var C7_public = (function () { + function C7_public() { + } + Object.defineProperty(C7_public.prototype, "p1_private", { + get: function () { + return new C6_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C7_public.prototype, "p2_private", { + get: function () { + return new C6_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C7_public.prototype, "p3_private", { + get: function () { + return new C5_private(); + }, + set: function (m1_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C7_public.prototype, "p4_public", { + get: function () { + return new C5_private(); + }, + set: function (m1_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return C7_public; + })(); + exports.C7_public = C7_public; + var C8_private = (function () { + function C8_private() { + } + Object.defineProperty(C8_private.prototype, "p1_private", { + get: function () { + return new C6_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C8_private.prototype, "p2_private", { + get: function () { + return new C6_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C8_private.prototype, "p3_private", { + get: function () { + return new C5_private(); + }, + set: function (m1_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C8_private.prototype, "p4_public", { + get: function () { + return new C5_private(); + }, + set: function (m1_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return C8_private; + })(); +}); diff --git a/tests/baselines/reference/privacyGloGetter.errors.txt b/tests/baselines/reference/privacyGloGetter.errors.txt deleted file mode 100644 index d23ed7d1491..00000000000 --- a/tests/baselines/reference/privacyGloGetter.errors.txt +++ /dev/null @@ -1,129 +0,0 @@ -==== tests/cases/compiler/privacyGloGetter.ts (20 errors) ==== - module m1 { - export class C1_public { - private f1() { - } - } - - class C2_private { - } - - export class C3_public { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p1_private(m1_c3_p1_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p2_private(m1_c3_p2_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - - private set p3_private(m1_c3_p3_arg: C2_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): C2_private { // error - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); //error - } - - public set p4_public(m1_c3_p4_arg: C2_private) { // error - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - - class C4_private { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p1_private(m1_c3_p1_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C1_public(); - } - - private set p2_private(m1_c3_p2_arg: C1_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p3_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - - private set p3_private(m1_c3_p3_arg: C2_private) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - public get p4_public(): C2_private { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C2_private(); - } - - public set p4_public(m1_c3_p4_arg: C2_private) { - ~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } - } - - class C6_public { - } - - class C7_public { - private get p1_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C6_public(); - } - - private set p1_private(m1_c3_p1_arg: C6_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - - private get p2_private() { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return new C6_public(); - } - - private set p2_private(m1_c3_p2_arg: C6_public) { - ~~~~~~~~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - } - } \ No newline at end of file diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js new file mode 100644 index 00000000000..9f65712805e --- /dev/null +++ b/tests/baselines/reference/privacyGloGetter.js @@ -0,0 +1,218 @@ +//// [privacyGloGetter.ts] +module m1 { + export class C1_public { + private f1() { + } + } + + class C2_private { + } + + export class C3_public { + private get p1_private() { + return new C1_public(); + } + + private set p1_private(m1_c3_p1_arg: C1_public) { + } + + private get p2_private() { + return new C1_public(); + } + + private set p2_private(m1_c3_p2_arg: C1_public) { + } + + private get p3_private() { + return new C2_private(); + } + + private set p3_private(m1_c3_p3_arg: C2_private) { + } + + public get p4_public(): C2_private { // error + return new C2_private(); //error + } + + public set p4_public(m1_c3_p4_arg: C2_private) { // error + } + } + + class C4_private { + private get p1_private() { + return new C1_public(); + } + + private set p1_private(m1_c3_p1_arg: C1_public) { + } + + private get p2_private() { + return new C1_public(); + } + + private set p2_private(m1_c3_p2_arg: C1_public) { + } + + private get p3_private() { + return new C2_private(); + } + + private set p3_private(m1_c3_p3_arg: C2_private) { + } + + public get p4_public(): C2_private { + return new C2_private(); + } + + public set p4_public(m1_c3_p4_arg: C2_private) { + } + } +} + +class C6_public { +} + +class C7_public { + private get p1_private() { + return new C6_public(); + } + + private set p1_private(m1_c3_p1_arg: C6_public) { + } + + private get p2_private() { + return new C6_public(); + } + + private set p2_private(m1_c3_p2_arg: C6_public) { + } +} + +//// [privacyGloGetter.js] +var m1; +(function (m1) { + var C1_public = (function () { + function C1_public() { + } + C1_public.prototype.f1 = function () { + }; + return C1_public; + })(); + m1.C1_public = C1_public; + var C2_private = (function () { + function C2_private() { + } + return C2_private; + })(); + var C3_public = (function () { + function C3_public() { + } + Object.defineProperty(C3_public.prototype, "p1_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C3_public.prototype, "p2_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C3_public.prototype, "p3_private", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C3_public.prototype, "p4_public", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return C3_public; + })(); + m1.C3_public = C3_public; + var C4_private = (function () { + function C4_private() { + } + Object.defineProperty(C4_private.prototype, "p1_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C4_private.prototype, "p2_private", { + get: function () { + return new C1_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C4_private.prototype, "p3_private", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p3_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C4_private.prototype, "p4_public", { + get: function () { + return new C2_private(); + }, + set: function (m1_c3_p4_arg) { + }, + enumerable: true, + configurable: true + }); + return C4_private; + })(); +})(m1 || (m1 = {})); +var C6_public = (function () { + function C6_public() { + } + return C6_public; +})(); +var C7_public = (function () { + function C7_public() { + } + Object.defineProperty(C7_public.prototype, "p1_private", { + get: function () { + return new C6_public(); + }, + set: function (m1_c3_p1_arg) { + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(C7_public.prototype, "p2_private", { + get: function () { + return new C6_public(); + }, + set: function (m1_c3_p2_arg) { + }, + enumerable: true, + configurable: true + }); + return C7_public; +})(); diff --git a/tests/baselines/reference/privacyGloImport.errors.txt b/tests/baselines/reference/privacyGloImport.errors.txt index 38d31860a5b..cd5c19fa9d7 100644 --- a/tests/baselines/reference/privacyGloImport.errors.txt +++ b/tests/baselines/reference/privacyGloImport.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/compiler/privacyGloImport.ts (21 errors) ==== +==== tests/cases/compiler/privacyGloImport.ts (2 errors) ==== module m1 { export module m1_M1_public { export class c1 { @@ -20,27 +20,21 @@ export var v2: c1; } - declare export module "m1_M3_public" { - ~~~~~~ -!!! 'export' modifier must precede 'declare' modifier. - ~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "m1_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} - declare module "m1_M4_private" { - ~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //declare module "m1_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import m1_im1_private = m1_M1_public; export var m1_im1_private_v1_public = m1_im1_private.c1; @@ -54,6 +48,8 @@ import m1_im2_private = m1_M2_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. export var m1_im2_private_v1_public = m1_im2_private.c1; export var m1_im2_private_v2_public = new m1_im2_private.c1(); export var m1_im2_private_v3_public = m1_im2_private.f1; @@ -63,43 +59,32 @@ var m1_im2_private_v3_private = m1_im2_private.f1; var m1_im2_private_v4_private = m1_im2_private.f1(); - import m1_im3_private = require("m1_M3_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - ~~~~~~~~~~~~~~ -!!! Cannot find external module 'm1_M3_public'. - export var m1_im3_private_v1_public = m1_im3_private.c1; - export var m1_im3_private_v2_public = new m1_im3_private.c1(); - export var m1_im3_private_v3_public = m1_im3_private.f1; - export var m1_im3_private_v4_public = m1_im3_private.f1(); - var m1_im3_private_v1_private = m1_im3_private.c1; - var m1_im3_private_v2_private = new m1_im3_private.c1(); - var m1_im3_private_v3_private = m1_im3_private.f1; - var m1_im3_private_v4_private = m1_im3_private.f1(); + //import m1_im3_private = require("m1_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); - import m1_im4_private = require("m1_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - ~~~~~~~~~~~~~~~ -!!! Cannot find external module 'm1_M4_private'. - export var m1_im4_private_v1_public = m1_im4_private.c1; - export var m1_im4_private_v2_public = new m1_im4_private.c1(); - export var m1_im4_private_v3_public = m1_im4_private.f1; - export var m1_im4_private_v4_public = m1_im4_private.f1(); - var m1_im4_private_v1_private = m1_im4_private.c1; - var m1_im4_private_v2_private = new m1_im4_private.c1(); - var m1_im4_private_v3_private = m1_im4_private.f1; - var m1_im4_private_v4_private = m1_im4_private.f1(); + //import m1_im4_private = require("m1_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); - // Parse error to export module export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; - export import m1_im3_public = require("m1_M3_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - export import m1_im4_public = require("m1_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); } module glo_M1_public { @@ -123,38 +108,26 @@ declare module "use_glo_M1_public" { import use_glo_M1_public = glo_M1_public; export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; - export var use_glo_M1_public_v2_public: use_glo_M1_public; - ~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M1_public'. + export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; - var use_glo_M1_public_v2_private: use_glo_M1_public; - ~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M1_public'. + var use_glo_M1_public_v2_private: typeof use_glo_M1_public; var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; import use_glo_M2_public = require("glo_M2_public"); export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; - export var use_glo_M2_public_v2_public: use_glo_M2_public; - ~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M2_public'. + export var use_glo_M2_public_v2_public: typeof use_glo_M2_public; export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; - var use_glo_M2_public_v2_private: use_glo_M2_public; - ~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M2_public'. + var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; module m2 { - import errorImport = require("glo_M2_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; module m5 { - import m5_errorImport = require("glo_M2_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } } @@ -162,35 +135,23 @@ declare module "anotherParseError" { module m2 { - declare module "abc" { - ~~~~~~~ -!!! A 'declare' modifier cannot be used in an already ambient context. - ~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } + //declare module "abc" { + //} } module m2 { - module "abc2" { - ~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } - module "abc3" { - ~~~~~~ -!!! Ambient external modules cannot be nested in other modules. + //module "abc2" { + //} } + //module "abc3" { + //} } module m2 { - import m3 = require("use_glo_M1_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m3 = require("use_glo_M1_public"); module m4 { var a = 10; - import m2 = require("use_glo_M1_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m2 = require("use_glo_M1_public"); } } \ No newline at end of file diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js new file mode 100644 index 00000000000..537e1eb43fa --- /dev/null +++ b/tests/baselines/reference/privacyGloImport.js @@ -0,0 +1,230 @@ +//// [privacyGloImport.ts] +module m1 { + export module m1_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m1_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + //export declare module "m1_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} + + //declare module "m1_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} + + import m1_im1_private = m1_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m1_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + //import m1_im3_private = require("m1_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); + + //import m1_im4_private = require("m1_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); + + export import m1_im1_public = m1_M1_public; + export import m1_im2_public = m1_M2_private; + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); +} + +module glo_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; +} + +declare module "glo_M2_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; +} + +declare module "use_glo_M1_public" { + import use_glo_M1_public = glo_M1_public; + export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; + export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; + export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; + var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; + var use_glo_M1_public_v2_private: typeof use_glo_M1_public; + var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + + import use_glo_M2_public = require("glo_M2_public"); + export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; + export var use_glo_M2_public_v2_public: typeof use_glo_M2_public; + export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; + var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; + var use_glo_M2_public_v2_private: typeof use_glo_M2_public; + var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + + module m2 { + //import errorImport = require("glo_M2_public"); + import nonerrorImport = glo_M1_public; + + module m5 { + //import m5_errorImport = require("glo_M2_public"); + import m5_nonerrorImport = glo_M1_public; + } + } +} + +declare module "anotherParseError" { + module m2 { + //declare module "abc" { + //} + } + + module m2 { + //module "abc2" { + //} + } + //module "abc3" { + //} +} + +module m2 { + //import m3 = require("use_glo_M1_public"); + module m4 { + var a = 10; + //import m2 = require("use_glo_M1_public"); + } + +} + +//// [privacyGloImport.js] +var m1; +(function (m1) { + (function (m1_M1_public) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + m1_M1_public.c1 = c1; + function f1() { + return new c1; + } + m1_M1_public.f1 = f1; + m1_M1_public.v1 = c1; + m1_M1_public.v2; + })(m1.m1_M1_public || (m1.m1_M1_public = {})); + var m1_M1_public = m1.m1_M1_public; + var m1_M2_private; + (function (m1_M2_private) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + m1_M2_private.c1 = c1; + function f1() { + return new c1; + } + m1_M2_private.f1 = f1; + m1_M2_private.v1 = c1; + m1_M2_private.v2; + })(m1_M2_private || (m1_M2_private = {})); + var m1_im1_private = m1_M1_public; + m1.m1_im1_private_v1_public = m1_im1_private.c1; + m1.m1_im1_private_v2_public = new m1_im1_private.c1(); + m1.m1_im1_private_v3_public = m1_im1_private.f1; + m1.m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + var m1_im2_private = m1_M2_private; + m1.m1_im2_private_v1_public = m1_im2_private.c1; + m1.m1_im2_private_v2_public = new m1_im2_private.c1(); + m1.m1_im2_private_v3_public = m1_im2_private.f1; + m1.m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + m1.m1_im1_public = m1_M1_public; + m1.m1_im2_public = m1_M2_private; +})(m1 || (m1 = {})); +var glo_M1_public; +(function (glo_M1_public) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + glo_M1_public.c1 = c1; + function f1() { + return new c1; + } + glo_M1_public.f1 = f1; + glo_M1_public.v1 = c1; + glo_M1_public.v2; +})(glo_M1_public || (glo_M1_public = {})); +var m2; +(function (m2) { + var m4; + (function (m4) { + var a = 10; + })(m4 || (m4 = {})); +})(m2 || (m2 = {})); diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt new file mode 100644 index 00000000000..d681008e3b5 --- /dev/null +++ b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt @@ -0,0 +1,185 @@ +==== tests/cases/compiler/privacyGloImportParseErrors.ts (16 errors) ==== + module m1 { + export module m1_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m1_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "m1_M3_public" { + ~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "m1_M4_private" { + ~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + import m1_im1_private = m1_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m1_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + import m1_im3_private = require("m1_M3_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~ +!!! Cannot find external module 'm1_M3_public'. + export var m1_im3_private_v1_public = m1_im3_private.c1; + export var m1_im3_private_v2_public = new m1_im3_private.c1(); + export var m1_im3_private_v3_public = m1_im3_private.f1; + export var m1_im3_private_v4_public = m1_im3_private.f1(); + var m1_im3_private_v1_private = m1_im3_private.c1; + var m1_im3_private_v2_private = new m1_im3_private.c1(); + var m1_im3_private_v3_private = m1_im3_private.f1; + var m1_im3_private_v4_private = m1_im3_private.f1(); + + import m1_im4_private = require("m1_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~~ +!!! Cannot find external module 'm1_M4_private'. + export var m1_im4_private_v1_public = m1_im4_private.c1; + export var m1_im4_private_v2_public = new m1_im4_private.c1(); + export var m1_im4_private_v3_public = m1_im4_private.f1; + export var m1_im4_private_v4_public = m1_im4_private.f1(); + var m1_im4_private_v1_private = m1_im4_private.c1; + var m1_im4_private_v2_private = new m1_im4_private.c1(); + var m1_im4_private_v3_private = m1_im4_private.f1; + var m1_im4_private_v4_private = m1_im4_private.f1(); + + export import m1_im1_public = m1_M1_public; + export import m1_im2_public = m1_M2_private; + export import m1_im3_public = require("m1_M3_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export import m1_im4_public = require("m1_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + } + + module glo_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + declare module "glo_M2_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "use_glo_M1_public" { + import use_glo_M1_public = glo_M1_public; + export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; + export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; + export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; + var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; + var use_glo_M1_public_v2_private: typeof use_glo_M1_public; + var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + + import use_glo_M2_public = require("glo_M2_public"); + export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; + export var use_glo_M2_public_v2_public: typeof use_glo_M2_public; + export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; + var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; + var use_glo_M2_public_v2_private: typeof use_glo_M2_public; + var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + + module m2 { + import errorImport = require("glo_M2_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + import nonerrorImport = glo_M1_public; + + module m5 { + import m5_errorImport = require("glo_M2_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + import m5_nonerrorImport = glo_M1_public; + } + } + } + + declare module "anotherParseError" { + module m2 { + declare module "abc" { + ~~~~~~~ +!!! A 'declare' modifier cannot be used in an already ambient context. + ~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + + module m2 { + module "abc2" { + ~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + module "abc3" { + ~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + + module m2 { + import m3 = require("use_glo_M1_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + module m4 { + var a = 10; + import m2 = require("use_glo_M1_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + } + + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyImport.errors.txt b/tests/baselines/reference/privacyImport.errors.txt index bb22a0c398c..a4ea4776a12 100644 --- a/tests/baselines/reference/privacyImport.errors.txt +++ b/tests/baselines/reference/privacyImport.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/compiler/privacyImport.ts (49 errors) ==== +==== tests/cases/compiler/privacyImport.ts (2 errors) ==== export module m1 { export module m1_M1_public { export class c1 { @@ -20,25 +20,21 @@ export var v2: c1; } - export declare module "m1_M3_public" { - ~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "m1_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} - declare module "m1_M4_private" { - ~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //declare module "m1_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import m1_im1_private = m1_M1_public; export var m1_im1_private_v1_public = m1_im1_private.c1; @@ -52,6 +48,8 @@ import m1_im2_private = m1_M2_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. export var m1_im2_private_v1_public = m1_im2_private.c1; export var m1_im2_private_v2_public = new m1_im2_private.c1(); export var m1_im2_private_v3_public = m1_im2_private.f1; @@ -61,42 +59,32 @@ var m1_im2_private_v3_private = m1_im2_private.f1; var m1_im2_private_v4_private = m1_im2_private.f1(); - import m1_im3_private = require("m1_M3_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - ~~~~~~~~~~~~~~ -!!! Cannot find external module 'm1_M3_public'. - export var m1_im3_private_v1_public = m1_im3_private.c1; - export var m1_im3_private_v2_public = new m1_im3_private.c1(); - export var m1_im3_private_v3_public = m1_im3_private.f1; - export var m1_im3_private_v4_public = m1_im3_private.f1(); - var m1_im3_private_v1_private = m1_im3_private.c1; - var m1_im3_private_v2_private = new m1_im3_private.c1(); - var m1_im3_private_v3_private = m1_im3_private.f1; - var m1_im3_private_v4_private = m1_im3_private.f1(); + //import m1_im3_private = require("m1_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); - import m1_im4_private = require("m1_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - ~~~~~~~~~~~~~~~ -!!! Cannot find external module 'm1_M4_private'. - export var m1_im4_private_v1_public = m1_im4_private.c1; - export var m1_im4_private_v2_public = new m1_im4_private.c1(); - export var m1_im4_private_v3_public = m1_im4_private.f1; - export var m1_im4_private_v4_public = m1_im4_private.f1(); - var m1_im4_private_v1_private = m1_im4_private.c1; - var m1_im4_private_v2_private = new m1_im4_private.c1(); - var m1_im4_private_v3_private = m1_im4_private.f1; - var m1_im4_private_v4_private = m1_im4_private.f1(); + //import m1_im4_private = require("m1_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; - export import m1_im3_public = require("m1_M3_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - export import m1_im4_public = require("m1_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); } module m2 { @@ -120,25 +108,21 @@ export var v2: c1; } - export declare module "m2_M3_public" { - ~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "m2_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} - declare module "m2_M4_private" { - ~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //declare module "m2_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import m1_im1_private = m2_M1_public; export var m1_im1_private_v1_public = m1_im1_private.c1; @@ -161,43 +145,31 @@ var m1_im2_private_v3_private = m1_im2_private.f1; var m1_im2_private_v4_private = m1_im2_private.f1(); - import m1_im3_private = require("m2_M3_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - ~~~~~~~~~~~~~~ -!!! Cannot find external module 'm2_M3_public'. - export var m1_im3_private_v1_public = m1_im3_private.c1; - export var m1_im3_private_v2_public = new m1_im3_private.c1(); - export var m1_im3_private_v3_public = m1_im3_private.f1; - export var m1_im3_private_v4_public = m1_im3_private.f1(); - var m1_im3_private_v1_private = m1_im3_private.c1; - var m1_im3_private_v2_private = new m1_im3_private.c1(); - var m1_im3_private_v3_private = m1_im3_private.f1; - var m1_im3_private_v4_private = m1_im3_private.f1(); + //import m1_im3_private = require("m2_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); - import m1_im4_private = require("m2_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - ~~~~~~~~~~~~~~~ -!!! Cannot find external module 'm2_M4_private'. - export var m1_im4_private_v1_public = m1_im4_private.c1; - export var m1_im4_private_v2_public = new m1_im4_private.c1(); - export var m1_im4_private_v3_public = m1_im4_private.f1; - export var m1_im4_private_v4_public = m1_im4_private.f1(); - var m1_im4_private_v1_private = m1_im4_private.c1; - var m1_im4_private_v2_private = new m1_im4_private.c1(); - var m1_im4_private_v3_private = m1_im4_private.f1; - var m1_im4_private_v4_private = m1_im4_private.f1(); + //import m1_im4_private = require("m2_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); // Parse error to export module export import m1_im1_public = m2_M1_public; export import m1_im2_public = m2_M2_private; - export import m1_im3_public = require("m2_M3_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - export import m1_im4_public = require("m2_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //export import m1_im3_public = require("m2_M3_public"); + //export import m1_im4_public = require("m2_M4_private"); } export module glo_M1_public { @@ -210,15 +182,13 @@ export var v2: c1; } - export declare module "glo_M2_public" { - ~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "glo_M2_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} export module glo_M3_private { export class c1 { @@ -230,15 +200,13 @@ export var v2: c1; } - export declare module "glo_M4_private" { - ~~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "glo_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import glo_im1_private = glo_M1_public; @@ -252,17 +220,15 @@ var glo_im1_private_v4_private = glo_im1_private.f1(); - import glo_im2_private = require("glo_M2_public"); - ~~~~~~~~~~~~~~~ -!!! Cannot find external module 'glo_M2_public'. - export var glo_im2_private_v1_public = glo_im2_private.c1; - export var glo_im2_private_v2_public = new glo_im2_private.c1(); - export var glo_im2_private_v3_public = glo_im2_private.f1; - export var glo_im2_private_v4_public = glo_im2_private.f1(); - var glo_im2_private_v1_private = glo_im2_private.c1; - var glo_im2_private_v2_private = new glo_im2_private.c1(); - var glo_im2_private_v3_private = glo_im2_private.f1; - var glo_im2_private_v4_private = glo_im2_private.f1(); + //import glo_im2_private = require("glo_M2_public"); + //export var glo_im2_private_v1_public = glo_im2_private.c1; + //export var glo_im2_private_v2_public = new glo_im2_private.c1(); + //export var glo_im2_private_v3_public = glo_im2_private.f1; + //export var glo_im2_private_v4_public = glo_im2_private.f1(); + //var glo_im2_private_v1_private = glo_im2_private.c1; + //var glo_im2_private_v2_private = new glo_im2_private.c1(); + //var glo_im2_private_v3_private = glo_im2_private.f1; + //var glo_im2_private_v4_private = glo_im2_private.f1(); import glo_im3_private = glo_M3_private; export var glo_im3_private_v1_public = glo_im3_private.c1; @@ -274,182 +240,122 @@ var glo_im3_private_v3_private = glo_im3_private.f1; var glo_im3_private_v4_private = glo_im3_private.f1(); - import glo_im4_private = require("glo_M4_private"); - ~~~~~~~~~~~~~~~~ -!!! Cannot find external module 'glo_M4_private'. - export var glo_im4_private_v1_public = glo_im4_private.c1; - export var glo_im4_private_v2_public = new glo_im4_private.c1(); - export var glo_im4_private_v3_public = glo_im4_private.f1; - export var glo_im4_private_v4_public = glo_im4_private.f1(); - var glo_im4_private_v1_private = glo_im4_private.c1; - var glo_im4_private_v2_private = new glo_im4_private.c1(); - var glo_im4_private_v3_private = glo_im4_private.f1; - var glo_im4_private_v4_private = glo_im4_private.f1(); + //import glo_im4_private = require("glo_M4_private"); + //export var glo_im4_private_v1_public = glo_im4_private.c1; + //export var glo_im4_private_v2_public = new glo_im4_private.c1(); + //export var glo_im4_private_v3_public = glo_im4_private.f1; + //export var glo_im4_private_v4_public = glo_im4_private.f1(); + //var glo_im4_private_v1_private = glo_im4_private.c1; + //var glo_im4_private_v2_private = new glo_im4_private.c1(); + //var glo_im4_private_v3_private = glo_im4_private.f1; + //var glo_im4_private_v4_private = glo_im4_private.f1(); // Parse error to export module export import glo_im1_public = glo_M1_public; export import glo_im2_public = glo_M3_private; - export import glo_im3_public = require("glo_M2_public"); - ~~~~~~~~~~~~~~~ -!!! Cannot find external module 'glo_M2_public'. - export import glo_im4_public = require("glo_M4_private"); - ~~~~~~~~~~~~~~~~ -!!! Cannot find external module 'glo_M4_private'. + //export import glo_im3_public = require("glo_M2_public"); + //export import glo_im4_public = require("glo_M4_private"); - export declare module "use_glo_M1_public" { - ~~~~~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - import use_glo_M1_public = glo_M1_public; - export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; - export var use_glo_M1_public_v2_public: use_glo_M1_public; - ~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M1_public'. - export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; - var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; - var use_glo_M1_public_v2_private: use_glo_M1_public; - ~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M1_public'. - var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + //export declare module "use_glo_M1_public" { + // import use_glo_M1_public = glo_M1_public; + // export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; + // export var use_glo_M1_public_v2_public: use_glo_M1_public; + // export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; + // var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; + // var use_glo_M1_public_v2_private: use_glo_M1_public; + // var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; - import use_glo_M2_public = require("glo_M2_public"); - ~~~~~~~~~~~~~~~ -!!! Cannot find external module 'glo_M2_public'. - export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; - export var use_glo_M2_public_v2_public: use_glo_M2_public; - export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; - var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; - var use_glo_M2_public_v2_private: use_glo_M2_public; - var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + // import use_glo_M2_public = require("glo_M2_public"); + // export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; + // export var use_glo_M2_public_v2_public: use_glo_M2_public; + // export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; + // var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; + // var use_glo_M2_public_v2_private: use_glo_M2_public; + // var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { - import errorImport = require("glo_M2_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - import nonerrorImport = glo_M1_public; + // module m2 { + // import errorImport = require("glo_M2_public"); + // import nonerrorImport = glo_M1_public; - module m5 { - import m5_errorImport = require("glo_M2_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - import m5_nonerrorImport = glo_M1_public; - } - } - } + // module m5 { + // import m5_errorImport = require("glo_M2_public"); + // import m5_nonerrorImport = glo_M1_public; + // } + // } + //} - declare module "use_glo_M3_private" { - ~~~~~~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - import use_glo_M3_private = glo_M3_private; - export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; - export var use_glo_M3_private_v2_public: use_glo_M3_private; - ~~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M3_private'. - export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; - var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; - var use_glo_M3_private_v2_private: use_glo_M3_private; - ~~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'use_glo_M3_private'. - var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; + //declare module "use_glo_M3_private" { + // import use_glo_M3_private = glo_M3_private; + // export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; + // export var use_glo_M3_private_v2_public: use_glo_M3_private; + // export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; + // var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; + // var use_glo_M3_private_v2_private: use_glo_M3_private; + // var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; - import use_glo_M4_private = require("glo_M4_private"); - ~~~~~~~~~~~~~~~~ -!!! Cannot find external module 'glo_M4_private'. - export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; - export var use_glo_M4_private_v2_public: use_glo_M4_private; - export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; - var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; - var use_glo_M4_private_v2_private: use_glo_M4_private; - var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; + // import use_glo_M4_private = require("glo_M4_private"); + // export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; + // export var use_glo_M4_private_v2_public: use_glo_M4_private; + // export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; + // var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; + // var use_glo_M4_private_v2_private: use_glo_M4_private; + // var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; - module m2 { - import errorImport = require("glo_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - import nonerrorImport = glo_M3_private; + // module m2 { + // import errorImport = require("glo_M4_private"); + // import nonerrorImport = glo_M3_private; - module m5 { - import m5_errorImport = require("glo_M4_private"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. - import m5_nonerrorImport = glo_M3_private; - } - } - } + // module m5 { + // import m5_errorImport = require("glo_M4_private"); + // import m5_nonerrorImport = glo_M3_private; + // } + // } + //} - declare module "anotherParseError" { - ~~~~~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - module m2 { - declare module "abc" { - ~~~~~~~ -!!! A 'declare' modifier cannot be used in an already ambient context. - ~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } + //declare module "anotherParseError" { + // module m2 { + // declare module "abc" { + // } + // } - module m2 { - module "abc2" { - ~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } - module "abc3" { - ~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } + // module m2 { + // module "abc2" { + // } + // } + // module "abc3" { + // } + //} - declare export module "anotherParseError2" { - ~~~~~~ -!!! 'export' modifier must precede 'declare' modifier. - ~~~~~~~~~~~~~~~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - module m2 { - declare module "abc" { - ~~~~~~~ -!!! A 'declare' modifier cannot be used in an already ambient context. - ~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } + //declare export module "anotherParseError2" { + // module m2 { + // declare module "abc" { + // } + // } - module m2 { - module "abc2" { - ~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } - module "abc3" { - ~~~~~~ -!!! Ambient external modules cannot be nested in other modules. - } - } + // module m2 { + // module "abc2" { + // } + // } + // module "abc3" { + // } + //} module m2 { - import m3 = require("use_glo_M1_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m3 = require("use_glo_M1_public"); module m4 { var a = 10; - import m2 = require("use_glo_M1_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m2 = require("use_glo_M1_public"); } } export module m3 { - import m3 = require("use_glo_M1_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m3 = require("use_glo_M1_public"); module m4 { var a = 10; - import m2 = require("use_glo_M1_public"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Import declarations in an internal module cannot reference an external module. + //import m2 = require("use_glo_M1_public"); } } \ No newline at end of file diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js new file mode 100644 index 00000000000..7b7e4c4977f --- /dev/null +++ b/tests/baselines/reference/privacyImport.js @@ -0,0 +1,529 @@ +//// [privacyImport.ts] +export module m1 { + export module m1_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m1_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + //export declare module "m1_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} + + //declare module "m1_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} + + import m1_im1_private = m1_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m1_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + //import m1_im3_private = require("m1_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); + + //import m1_im4_private = require("m1_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); + + export import m1_im1_public = m1_M1_public; + export import m1_im2_public = m1_M2_private; + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); +} + +module m2 { + export module m2_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m2_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + //export declare module "m2_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} + + //declare module "m2_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} + + import m1_im1_private = m2_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m2_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + //import m1_im3_private = require("m2_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); + + //import m1_im4_private = require("m2_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); + + // Parse error to export module + export import m1_im1_public = m2_M1_public; + export import m1_im2_public = m2_M2_private; + //export import m1_im3_public = require("m2_M3_public"); + //export import m1_im4_public = require("m2_M4_private"); +} + +export module glo_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; +} + +//export declare module "glo_M2_public" { +// export function f1(); +// export class c1 { +// } +// export var v1: { new (): c1; }; +// export var v2: c1; +//} + +export module glo_M3_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; +} + +//export declare module "glo_M4_private" { +// export function f1(); +// export class c1 { +// } +// export var v1: { new (): c1; }; +// export var v2: c1; +//} + + +import glo_im1_private = glo_M1_public; +export var glo_im1_private_v1_public = glo_im1_private.c1; +export var glo_im1_private_v2_public = new glo_im1_private.c1(); +export var glo_im1_private_v3_public = glo_im1_private.f1; +export var glo_im1_private_v4_public = glo_im1_private.f1(); +var glo_im1_private_v1_private = glo_im1_private.c1; +var glo_im1_private_v2_private = new glo_im1_private.c1(); +var glo_im1_private_v3_private = glo_im1_private.f1; +var glo_im1_private_v4_private = glo_im1_private.f1(); + + +//import glo_im2_private = require("glo_M2_public"); +//export var glo_im2_private_v1_public = glo_im2_private.c1; +//export var glo_im2_private_v2_public = new glo_im2_private.c1(); +//export var glo_im2_private_v3_public = glo_im2_private.f1; +//export var glo_im2_private_v4_public = glo_im2_private.f1(); +//var glo_im2_private_v1_private = glo_im2_private.c1; +//var glo_im2_private_v2_private = new glo_im2_private.c1(); +//var glo_im2_private_v3_private = glo_im2_private.f1; +//var glo_im2_private_v4_private = glo_im2_private.f1(); + +import glo_im3_private = glo_M3_private; +export var glo_im3_private_v1_public = glo_im3_private.c1; +export var glo_im3_private_v2_public = new glo_im3_private.c1(); +export var glo_im3_private_v3_public = glo_im3_private.f1; +export var glo_im3_private_v4_public = glo_im3_private.f1(); +var glo_im3_private_v1_private = glo_im3_private.c1; +var glo_im3_private_v2_private = new glo_im3_private.c1(); +var glo_im3_private_v3_private = glo_im3_private.f1; +var glo_im3_private_v4_private = glo_im3_private.f1(); + +//import glo_im4_private = require("glo_M4_private"); +//export var glo_im4_private_v1_public = glo_im4_private.c1; +//export var glo_im4_private_v2_public = new glo_im4_private.c1(); +//export var glo_im4_private_v3_public = glo_im4_private.f1; +//export var glo_im4_private_v4_public = glo_im4_private.f1(); +//var glo_im4_private_v1_private = glo_im4_private.c1; +//var glo_im4_private_v2_private = new glo_im4_private.c1(); +//var glo_im4_private_v3_private = glo_im4_private.f1; +//var glo_im4_private_v4_private = glo_im4_private.f1(); + +// Parse error to export module +export import glo_im1_public = glo_M1_public; +export import glo_im2_public = glo_M3_private; +//export import glo_im3_public = require("glo_M2_public"); +//export import glo_im4_public = require("glo_M4_private"); + + +//export declare module "use_glo_M1_public" { +// import use_glo_M1_public = glo_M1_public; +// export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; +// export var use_glo_M1_public_v2_public: use_glo_M1_public; +// export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; +// var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; +// var use_glo_M1_public_v2_private: use_glo_M1_public; +// var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + +// import use_glo_M2_public = require("glo_M2_public"); +// export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; +// export var use_glo_M2_public_v2_public: use_glo_M2_public; +// export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; +// var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; +// var use_glo_M2_public_v2_private: use_glo_M2_public; +// var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + +// module m2 { +// import errorImport = require("glo_M2_public"); +// import nonerrorImport = glo_M1_public; + +// module m5 { +// import m5_errorImport = require("glo_M2_public"); +// import m5_nonerrorImport = glo_M1_public; +// } +// } +//} + + +//declare module "use_glo_M3_private" { +// import use_glo_M3_private = glo_M3_private; +// export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; +// export var use_glo_M3_private_v2_public: use_glo_M3_private; +// export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; +// var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; +// var use_glo_M3_private_v2_private: use_glo_M3_private; +// var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; + +// import use_glo_M4_private = require("glo_M4_private"); +// export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; +// export var use_glo_M4_private_v2_public: use_glo_M4_private; +// export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; +// var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; +// var use_glo_M4_private_v2_private: use_glo_M4_private; +// var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; + +// module m2 { +// import errorImport = require("glo_M4_private"); +// import nonerrorImport = glo_M3_private; + +// module m5 { +// import m5_errorImport = require("glo_M4_private"); +// import m5_nonerrorImport = glo_M3_private; +// } +// } +//} + +//declare module "anotherParseError" { +// module m2 { +// declare module "abc" { +// } +// } + +// module m2 { +// module "abc2" { +// } +// } +// module "abc3" { +// } +//} + +//declare export module "anotherParseError2" { +// module m2 { +// declare module "abc" { +// } +// } + +// module m2 { +// module "abc2" { +// } +// } +// module "abc3" { +// } +//} + +module m2 { + //import m3 = require("use_glo_M1_public"); + module m4 { + var a = 10; + //import m2 = require("use_glo_M1_public"); + } + +} + +export module m3 { + //import m3 = require("use_glo_M1_public"); + module m4 { + var a = 10; + //import m2 = require("use_glo_M1_public"); + } + +} + +//// [privacyImport.js] +(function (m1) { + (function (m1_M1_public) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + m1_M1_public.c1 = c1; + function f1() { + return new c1; + } + m1_M1_public.f1 = f1; + m1_M1_public.v1 = c1; + m1_M1_public.v2; + })(m1.m1_M1_public || (m1.m1_M1_public = {})); + var m1_M1_public = m1.m1_M1_public; + var m1_M2_private; + (function (m1_M2_private) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + m1_M2_private.c1 = c1; + function f1() { + return new c1; + } + m1_M2_private.f1 = f1; + m1_M2_private.v1 = c1; + m1_M2_private.v2; + })(m1_M2_private || (m1_M2_private = {})); + var m1_im1_private = m1_M1_public; + m1.m1_im1_private_v1_public = m1_im1_private.c1; + m1.m1_im1_private_v2_public = new m1_im1_private.c1(); + m1.m1_im1_private_v3_public = m1_im1_private.f1; + m1.m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + var m1_im2_private = m1_M2_private; + m1.m1_im2_private_v1_public = m1_im2_private.c1; + m1.m1_im2_private_v2_public = new m1_im2_private.c1(); + m1.m1_im2_private_v3_public = m1_im2_private.f1; + m1.m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + m1.m1_im1_public = m1_M1_public; + m1.m1_im2_public = m1_M2_private; +})(exports.m1 || (exports.m1 = {})); +var m1 = exports.m1; +var m2; +(function (m2) { + (function (m2_M1_public) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + m2_M1_public.c1 = c1; + function f1() { + return new c1; + } + m2_M1_public.f1 = f1; + m2_M1_public.v1 = c1; + m2_M1_public.v2; + })(m2.m2_M1_public || (m2.m2_M1_public = {})); + var m2_M1_public = m2.m2_M1_public; + var m2_M2_private; + (function (m2_M2_private) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + m2_M2_private.c1 = c1; + function f1() { + return new c1; + } + m2_M2_private.f1 = f1; + m2_M2_private.v1 = c1; + m2_M2_private.v2; + })(m2_M2_private || (m2_M2_private = {})); + var m1_im1_private = m2_M1_public; + m2.m1_im1_private_v1_public = m1_im1_private.c1; + m2.m1_im1_private_v2_public = new m1_im1_private.c1(); + m2.m1_im1_private_v3_public = m1_im1_private.f1; + m2.m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + var m1_im2_private = m2_M2_private; + m2.m1_im2_private_v1_public = m1_im2_private.c1; + m2.m1_im2_private_v2_public = new m1_im2_private.c1(); + m2.m1_im2_private_v3_public = m1_im2_private.f1; + m2.m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + m2.m1_im1_public = m2_M1_public; + m2.m1_im2_public = m2_M2_private; +})(m2 || (m2 = {})); +(function (glo_M1_public) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + glo_M1_public.c1 = c1; + function f1() { + return new c1; + } + glo_M1_public.f1 = f1; + glo_M1_public.v1 = c1; + glo_M1_public.v2; +})(exports.glo_M1_public || (exports.glo_M1_public = {})); +var glo_M1_public = exports.glo_M1_public; +(function (glo_M3_private) { + var c1 = (function () { + function c1() { + } + return c1; + })(); + glo_M3_private.c1 = c1; + function f1() { + return new c1; + } + glo_M3_private.f1 = f1; + glo_M3_private.v1 = c1; + glo_M3_private.v2; +})(exports.glo_M3_private || (exports.glo_M3_private = {})); +var glo_M3_private = exports.glo_M3_private; +var glo_im1_private = glo_M1_public; +exports.glo_im1_private_v1_public = glo_im1_private.c1; +exports.glo_im1_private_v2_public = new glo_im1_private.c1(); +exports.glo_im1_private_v3_public = glo_im1_private.f1; +exports.glo_im1_private_v4_public = glo_im1_private.f1(); +var glo_im1_private_v1_private = glo_im1_private.c1; +var glo_im1_private_v2_private = new glo_im1_private.c1(); +var glo_im1_private_v3_private = glo_im1_private.f1; +var glo_im1_private_v4_private = glo_im1_private.f1(); +var glo_im3_private = glo_M3_private; +exports.glo_im3_private_v1_public = glo_im3_private.c1; +exports.glo_im3_private_v2_public = new glo_im3_private.c1(); +exports.glo_im3_private_v3_public = glo_im3_private.f1; +exports.glo_im3_private_v4_public = glo_im3_private.f1(); +var glo_im3_private_v1_private = glo_im3_private.c1; +var glo_im3_private_v2_private = new glo_im3_private.c1(); +var glo_im3_private_v3_private = glo_im3_private.f1; +var glo_im3_private_v4_private = glo_im3_private.f1(); +exports.glo_im1_public = glo_M1_public; +exports.glo_im2_public = glo_M3_private; +var m2; +(function (m2) { + var m4; + (function (m4) { + var a = 10; + })(m4 || (m4 = {})); +})(m2 || (m2 = {})); +(function (m3) { + var m4; + (function (m4) { + var a = 10; + })(m4 || (m4 = {})); +})(exports.m3 || (exports.m3 = {})); +var m3 = exports.m3; diff --git a/tests/baselines/reference/privacyImportParseErrors.errors.txt b/tests/baselines/reference/privacyImportParseErrors.errors.txt new file mode 100644 index 00000000000..6889ad85e1b --- /dev/null +++ b/tests/baselines/reference/privacyImportParseErrors.errors.txt @@ -0,0 +1,455 @@ +==== tests/cases/compiler/privacyImportParseErrors.ts (49 errors) ==== + export module m1 { + export module m1_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m1_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "m1_M3_public" { + ~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "m1_M4_private" { + ~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + import m1_im1_private = m1_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m1_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + import m1_im3_private = require("m1_M3_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~ +!!! Cannot find external module 'm1_M3_public'. + export var m1_im3_private_v1_public = m1_im3_private.c1; + export var m1_im3_private_v2_public = new m1_im3_private.c1(); + export var m1_im3_private_v3_public = m1_im3_private.f1; + export var m1_im3_private_v4_public = m1_im3_private.f1(); + var m1_im3_private_v1_private = m1_im3_private.c1; + var m1_im3_private_v2_private = new m1_im3_private.c1(); + var m1_im3_private_v3_private = m1_im3_private.f1; + var m1_im3_private_v4_private = m1_im3_private.f1(); + + import m1_im4_private = require("m1_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~~ +!!! Cannot find external module 'm1_M4_private'. + export var m1_im4_private_v1_public = m1_im4_private.c1; + export var m1_im4_private_v2_public = new m1_im4_private.c1(); + export var m1_im4_private_v3_public = m1_im4_private.f1; + export var m1_im4_private_v4_public = m1_im4_private.f1(); + var m1_im4_private_v1_private = m1_im4_private.c1; + var m1_im4_private_v2_private = new m1_im4_private.c1(); + var m1_im4_private_v3_private = m1_im4_private.f1; + var m1_im4_private_v4_private = m1_im4_private.f1(); + + export import m1_im1_public = m1_M1_public; + export import m1_im2_public = m1_M2_private; + export import m1_im3_public = require("m1_M3_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export import m1_im4_public = require("m1_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + } + + module m2 { + export module m2_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m2_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "m2_M3_public" { + ~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "m2_M4_private" { + ~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + import m1_im1_private = m2_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m2_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + import m1_im3_private = require("m2_M3_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~ +!!! Cannot find external module 'm2_M3_public'. + export var m1_im3_private_v1_public = m1_im3_private.c1; + export var m1_im3_private_v2_public = new m1_im3_private.c1(); + export var m1_im3_private_v3_public = m1_im3_private.f1; + export var m1_im3_private_v4_public = m1_im3_private.f1(); + var m1_im3_private_v1_private = m1_im3_private.c1; + var m1_im3_private_v2_private = new m1_im3_private.c1(); + var m1_im3_private_v3_private = m1_im3_private.f1; + var m1_im3_private_v4_private = m1_im3_private.f1(); + + import m1_im4_private = require("m2_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + ~~~~~~~~~~~~~~~ +!!! Cannot find external module 'm2_M4_private'. + export var m1_im4_private_v1_public = m1_im4_private.c1; + export var m1_im4_private_v2_public = new m1_im4_private.c1(); + export var m1_im4_private_v3_public = m1_im4_private.f1; + export var m1_im4_private_v4_public = m1_im4_private.f1(); + var m1_im4_private_v1_private = m1_im4_private.c1; + var m1_im4_private_v2_private = new m1_im4_private.c1(); + var m1_im4_private_v3_private = m1_im4_private.f1; + var m1_im4_private_v4_private = m1_im4_private.f1(); + + // Parse error to export module + export import m1_im1_public = m2_M1_public; + export import m1_im2_public = m2_M2_private; + export import m1_im3_public = require("m2_M3_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export import m1_im4_public = require("m2_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + } + + export module glo_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "glo_M2_public" { + ~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + export module glo_M3_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "glo_M4_private" { + ~~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + + import glo_im1_private = glo_M1_public; + export var glo_im1_private_v1_public = glo_im1_private.c1; + export var glo_im1_private_v2_public = new glo_im1_private.c1(); + export var glo_im1_private_v3_public = glo_im1_private.f1; + export var glo_im1_private_v4_public = glo_im1_private.f1(); + var glo_im1_private_v1_private = glo_im1_private.c1; + var glo_im1_private_v2_private = new glo_im1_private.c1(); + var glo_im1_private_v3_private = glo_im1_private.f1; + var glo_im1_private_v4_private = glo_im1_private.f1(); + + + import glo_im2_private = require("glo_M2_public"); + ~~~~~~~~~~~~~~~ +!!! Cannot find external module 'glo_M2_public'. + export var glo_im2_private_v1_public = glo_im2_private.c1; + export var glo_im2_private_v2_public = new glo_im2_private.c1(); + export var glo_im2_private_v3_public = glo_im2_private.f1; + export var glo_im2_private_v4_public = glo_im2_private.f1(); + var glo_im2_private_v1_private = glo_im2_private.c1; + var glo_im2_private_v2_private = new glo_im2_private.c1(); + var glo_im2_private_v3_private = glo_im2_private.f1; + var glo_im2_private_v4_private = glo_im2_private.f1(); + + import glo_im3_private = glo_M3_private; + export var glo_im3_private_v1_public = glo_im3_private.c1; + export var glo_im3_private_v2_public = new glo_im3_private.c1(); + export var glo_im3_private_v3_public = glo_im3_private.f1; + export var glo_im3_private_v4_public = glo_im3_private.f1(); + var glo_im3_private_v1_private = glo_im3_private.c1; + var glo_im3_private_v2_private = new glo_im3_private.c1(); + var glo_im3_private_v3_private = glo_im3_private.f1; + var glo_im3_private_v4_private = glo_im3_private.f1(); + + import glo_im4_private = require("glo_M4_private"); + ~~~~~~~~~~~~~~~~ +!!! Cannot find external module 'glo_M4_private'. + export var glo_im4_private_v1_public = glo_im4_private.c1; + export var glo_im4_private_v2_public = new glo_im4_private.c1(); + export var glo_im4_private_v3_public = glo_im4_private.f1; + export var glo_im4_private_v4_public = glo_im4_private.f1(); + var glo_im4_private_v1_private = glo_im4_private.c1; + var glo_im4_private_v2_private = new glo_im4_private.c1(); + var glo_im4_private_v3_private = glo_im4_private.f1; + var glo_im4_private_v4_private = glo_im4_private.f1(); + + // Parse error to export module + export import glo_im1_public = glo_M1_public; + export import glo_im2_public = glo_M3_private; + export import glo_im3_public = require("glo_M2_public"); + ~~~~~~~~~~~~~~~ +!!! Cannot find external module 'glo_M2_public'. + export import glo_im4_public = require("glo_M4_private"); + ~~~~~~~~~~~~~~~~ +!!! Cannot find external module 'glo_M4_private'. + + + export declare module "use_glo_M1_public" { + ~~~~~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + import use_glo_M1_public = glo_M1_public; + export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; + export var use_glo_M1_public_v2_public: use_glo_M1_public; + ~~~~~~~~~~~~~~~~~ +!!! Cannot find name 'use_glo_M1_public'. + export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; + var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; + var use_glo_M1_public_v2_private: use_glo_M1_public; + ~~~~~~~~~~~~~~~~~ +!!! Cannot find name 'use_glo_M1_public'. + var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + + import use_glo_M2_public = require("glo_M2_public"); + ~~~~~~~~~~~~~~~ +!!! Cannot find external module 'glo_M2_public'. + export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; + export var use_glo_M2_public_v2_public: use_glo_M2_public; + export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; + var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; + var use_glo_M2_public_v2_private: use_glo_M2_public; + var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + + module m2 { + import errorImport = require("glo_M2_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + import nonerrorImport = glo_M1_public; + + module m5 { + import m5_errorImport = require("glo_M2_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + import m5_nonerrorImport = glo_M1_public; + } + } + } + + + declare module "use_glo_M3_private" { + ~~~~~~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + import use_glo_M3_private = glo_M3_private; + export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; + export var use_glo_M3_private_v2_public: use_glo_M3_private; + ~~~~~~~~~~~~~~~~~~ +!!! Cannot find name 'use_glo_M3_private'. + export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; + var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; + var use_glo_M3_private_v2_private: use_glo_M3_private; + ~~~~~~~~~~~~~~~~~~ +!!! Cannot find name 'use_glo_M3_private'. + var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; + + import use_glo_M4_private = require("glo_M4_private"); + ~~~~~~~~~~~~~~~~ +!!! Cannot find external module 'glo_M4_private'. + export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; + export var use_glo_M4_private_v2_public: use_glo_M4_private; + export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; + var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; + var use_glo_M4_private_v2_private: use_glo_M4_private; + var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; + + module m2 { + import errorImport = require("glo_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + import nonerrorImport = glo_M3_private; + + module m5 { + import m5_errorImport = require("glo_M4_private"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + import m5_nonerrorImport = glo_M3_private; + } + } + } + + declare module "anotherParseError" { + ~~~~~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + module m2 { + declare module "abc" { + ~~~~~~~ +!!! A 'declare' modifier cannot be used in an already ambient context. + ~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + + module m2 { + module "abc2" { + ~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + module "abc3" { + ~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + + declare export module "anotherParseError2" { + ~~~~~~ +!!! 'export' modifier must precede 'declare' modifier. + ~~~~~~~~~~~~~~~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + module m2 { + declare module "abc" { + ~~~~~~~ +!!! A 'declare' modifier cannot be used in an already ambient context. + ~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + + module m2 { + module "abc2" { + ~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + module "abc3" { + ~~~~~~ +!!! Ambient external modules cannot be nested in other modules. + } + } + + module m2 { + import m3 = require("use_glo_M1_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + module m4 { + var a = 10; + import m2 = require("use_glo_M1_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + } + + } + + export module m3 { + import m3 = require("use_glo_M1_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + module m4 { + var a = 10; + import m2 = require("use_glo_M1_public"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + } + + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt new file mode 100644 index 00000000000..acbe63a21d7 --- /dev/null +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt @@ -0,0 +1,167 @@ +==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts (7 errors) ==== + // private elements + module m_private { + export class c_private { + } + export enum e_private { + Happy, + Grumpy + } + export function f_private() { + return new c_private(); + } + export var v_private = new c_private(); + export interface i_private { + } + export module mi_private { + export class c { + } + } + export module mu_private { + export interface i { + } + } + } + + // Public elements + export module m_public { + export class c_public { + } + export enum e_public { + Happy, + Grumpy + } + export function f_public() { + return new c_public(); + } + export var v_public = 10; + export interface i_public { + } + export module mi_public { + export class c { + } + } + export module mu_public { + export interface i { + } + } + } + + export module import_public { + // Privacy errors - importing private elements + export import im_public_c_private = m_private.c_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_c_private' is using private name 'm_private'. + export import im_public_e_private = m_private.e_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_e_private' is using private name 'm_private'. + export import im_public_f_private = m_private.f_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_f_private' is using private name 'm_private'. + export import im_public_v_private = m_private.v_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_v_private' is using private name 'm_private'. + export import im_public_i_private = m_private.i_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_i_private' is using private name 'm_private'. + export import im_public_mi_private = m_private.mi_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_mi_private' is using private name 'm_private'. + export import im_public_mu_private = m_private.mu_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_mu_private' is using private name 'm_private'. + + // Usage of privacy error imports + var privateUse_im_public_c_private = new im_public_c_private(); + export var publicUse_im_public_c_private = new im_public_c_private(); + var privateUse_im_public_e_private = im_public_e_private.Happy; + export var publicUse_im_public_e_private = im_public_e_private.Grumpy; + var privateUse_im_public_f_private = im_public_f_private(); + export var publicUse_im_public_f_private = im_public_f_private(); + var privateUse_im_public_v_private = im_public_v_private; + export var publicUse_im_public_v_private = im_public_v_private; + var privateUse_im_public_i_private: im_public_i_private; + export var publicUse_im_public_i_private: im_public_i_private; + var privateUse_im_public_mi_private = new im_public_mi_private.c(); + export var publicUse_im_public_mi_private = new im_public_mi_private.c(); + var privateUse_im_public_mu_private: im_public_mu_private.i; + export var publicUse_im_public_mu_private: im_public_mu_private.i; + + + // No Privacy errors - importing public elements + export import im_public_c_public = m_public.c_public; + export import im_public_e_public = m_public.e_public; + export import im_public_f_public = m_public.f_public; + export import im_public_v_public = m_public.v_public; + export import im_public_i_public = m_public.i_public; + export import im_public_mi_public = m_public.mi_public; + export import im_public_mu_public = m_public.mu_public; + + // Usage of above + var privateUse_im_public_c_public = new im_public_c_public(); + export var publicUse_im_public_c_public = new im_public_c_public(); + var privateUse_im_public_e_public = im_public_e_public.Happy; + export var publicUse_im_public_e_public = im_public_e_public.Grumpy; + var privateUse_im_public_f_public = im_public_f_public(); + export var publicUse_im_public_f_public = im_public_f_public(); + var privateUse_im_public_v_public = im_public_v_public; + export var publicUse_im_public_v_public = im_public_v_public; + var privateUse_im_public_i_public: im_public_i_public; + export var publicUse_im_public_i_public: im_public_i_public; + var privateUse_im_public_mi_public = new im_public_mi_public.c(); + export var publicUse_im_public_mi_public = new im_public_mi_public.c(); + var privateUse_im_public_mu_public: im_public_mu_public.i; + export var publicUse_im_public_mu_public: im_public_mu_public.i; + } + + module import_private { + // No Privacy errors - importing private elements + export import im_private_c_private = m_private.c_private; + export import im_private_e_private = m_private.e_private; + export import im_private_f_private = m_private.f_private; + export import im_private_v_private = m_private.v_private; + export import im_private_i_private = m_private.i_private; + export import im_private_mi_private = m_private.mi_private; + export import im_private_mu_private = m_private.mu_private; + + // Usage of above decls + var privateUse_im_private_c_private = new im_private_c_private(); + export var publicUse_im_private_c_private = new im_private_c_private(); + var privateUse_im_private_e_private = im_private_e_private.Happy; + export var publicUse_im_private_e_private = im_private_e_private.Grumpy; + var privateUse_im_private_f_private = im_private_f_private(); + export var publicUse_im_private_f_private = im_private_f_private(); + var privateUse_im_private_v_private = im_private_v_private; + export var publicUse_im_private_v_private = im_private_v_private; + var privateUse_im_private_i_private: im_private_i_private; + export var publicUse_im_private_i_private: im_private_i_private; + var privateUse_im_private_mi_private = new im_private_mi_private.c(); + export var publicUse_im_private_mi_private = new im_private_mi_private.c(); + var privateUse_im_private_mu_private: im_private_mu_private.i; + export var publicUse_im_private_mu_private: im_private_mu_private.i; + + // No privacy Error - importing public elements + export import im_private_c_public = m_public.c_public; + export import im_private_e_public = m_public.e_public; + export import im_private_f_public = m_public.f_public; + export import im_private_v_public = m_public.v_public; + export import im_private_i_public = m_public.i_public; + export import im_private_mi_public = m_public.mi_public; + export import im_private_mu_public = m_public.mu_public; + + // Usage of no privacy error imports + var privateUse_im_private_c_public = new im_private_c_public(); + export var publicUse_im_private_c_public = new im_private_c_public(); + var privateUse_im_private_e_public = im_private_e_public.Happy; + export var publicUse_im_private_e_public = im_private_e_public.Grumpy; + var privateUse_im_private_f_public = im_private_f_public(); + export var publicUse_im_private_f_public = im_private_f_public(); + var privateUse_im_private_v_public = im_private_v_public; + export var publicUse_im_private_v_public = im_private_v_public; + var privateUse_im_private_i_public: im_private_i_public; + export var publicUse_im_private_i_public: im_private_i_public; + var privateUse_im_private_mi_public = new im_private_mi_public.c(); + export var publicUse_im_private_mi_public = new im_private_mi_public.c(); + var privateUse_im_private_mu_public: im_private_mu_public.i; + export var publicUse_im_private_mu_public: im_private_mu_public.i; + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt new file mode 100644 index 00000000000..7872b2b0715 --- /dev/null +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt @@ -0,0 +1,163 @@ +==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts (5 errors) ==== + // private elements + module m_private { + export class c_private { + } + export enum e_private { + Happy, + Grumpy + } + export function f_private() { + return new c_private(); + } + export var v_private = new c_private(); + export interface i_private { + } + export module mi_private { + export class c { + } + } + export module mu_private { + export interface i { + } + } + } + + // Public elements + export module m_public { + export class c_public { + } + export enum e_public { + Happy, + Grumpy + } + export function f_public() { + return new c_public(); + } + export var v_public = 10; + export interface i_public { + } + export module mi_public { + export class c { + } + } + export module mu_public { + export interface i { + } + } + } + + export module import_public { + // No Privacy errors - importing private elements + import im_private_c_private = m_private.c_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_c_private' is using private name 'm_private'. + import im_private_e_private = m_private.e_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_e_private' is using private name 'm_private'. + import im_private_f_private = m_private.f_private; + import im_private_v_private = m_private.v_private; + import im_private_i_private = m_private.i_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_i_private' is using private name 'm_private'. + import im_private_mi_private = m_private.mi_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_mi_private' is using private name 'm_private'. + import im_private_mu_private = m_private.mu_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_mu_private' is using private name 'm_private'. + + // Usage of above decls + var privateUse_im_private_c_private = new im_private_c_private(); + export var publicUse_im_private_c_private = new im_private_c_private(); + var privateUse_im_private_e_private = im_private_e_private.Happy; + export var publicUse_im_private_e_private = im_private_e_private.Grumpy; + var privateUse_im_private_f_private = im_private_f_private(); + export var publicUse_im_private_f_private = im_private_f_private(); + var privateUse_im_private_v_private = im_private_v_private; + export var publicUse_im_private_v_private = im_private_v_private; + var privateUse_im_private_i_private: im_private_i_private; + export var publicUse_im_private_i_private: im_private_i_private; + var privateUse_im_private_mi_private = new im_private_mi_private.c(); + export var publicUse_im_private_mi_private = new im_private_mi_private.c(); + var privateUse_im_private_mu_private: im_private_mu_private.i; + export var publicUse_im_private_mu_private: im_private_mu_private.i; + + + // No Privacy errors - importing public elements + import im_private_c_public = m_public.c_public; + import im_private_e_public = m_public.e_public; + import im_private_f_public = m_public.f_public; + import im_private_v_public = m_public.v_public; + import im_private_i_public = m_public.i_public; + import im_private_mi_public = m_public.mi_public; + import im_private_mu_public = m_public.mu_public; + + // Usage of above decls + var privateUse_im_private_c_public = new im_private_c_public(); + export var publicUse_im_private_c_public = new im_private_c_public(); + var privateUse_im_private_e_public = im_private_e_public.Happy; + export var publicUse_im_private_e_public = im_private_e_public.Grumpy; + var privateUse_im_private_f_public = im_private_f_public(); + export var publicUse_im_private_f_public = im_private_f_public(); + var privateUse_im_private_v_public = im_private_v_public; + export var publicUse_im_private_v_public = im_private_v_public; + var privateUse_im_private_i_public: im_private_i_public; + export var publicUse_im_private_i_public: im_private_i_public; + var privateUse_im_private_mi_public = new im_private_mi_public.c(); + export var publicUse_im_private_mi_public = new im_private_mi_public.c(); + var privateUse_im_private_mu_public: im_private_mu_public.i; + export var publicUse_im_private_mu_public: im_private_mu_public.i; + } + + module import_private { + // No Privacy errors - importing private elements + import im_private_c_private = m_private.c_private; + import im_private_e_private = m_private.e_private; + import im_private_f_private = m_private.f_private; + import im_private_v_private = m_private.v_private; + import im_private_i_private = m_private.i_private; + import im_private_mi_private = m_private.mi_private; + import im_private_mu_private = m_private.mu_private; + + // Usage of above decls + var privateUse_im_private_c_private = new im_private_c_private(); + export var publicUse_im_private_c_private = new im_private_c_private(); + var privateUse_im_private_e_private = im_private_e_private.Happy; + export var publicUse_im_private_e_private = im_private_e_private.Grumpy; + var privateUse_im_private_f_private = im_private_f_private(); + export var publicUse_im_private_f_private = im_private_f_private(); + var privateUse_im_private_v_private = im_private_v_private; + export var publicUse_im_private_v_private = im_private_v_private; + var privateUse_im_private_i_private: im_private_i_private; + export var publicUse_im_private_i_private: im_private_i_private; + var privateUse_im_private_mi_private = new im_private_mi_private.c(); + export var publicUse_im_private_mi_private = new im_private_mi_private.c(); + var privateUse_im_private_mu_private: im_private_mu_private.i; + export var publicUse_im_private_mu_private: im_private_mu_private.i; + + // No privacy Error - importing public elements + import im_private_c_public = m_public.c_public; + import im_private_e_public = m_public.e_public; + import im_private_f_public = m_public.f_public; + import im_private_v_public = m_public.v_public; + import im_private_i_public = m_public.i_public; + import im_private_mi_public = m_public.mi_public; + import im_private_mu_public = m_public.mu_public; + + // Usage of above decls + var privateUse_im_private_c_public = new im_private_c_public(); + export var publicUse_im_private_c_public = new im_private_c_public(); + var privateUse_im_private_e_public = im_private_e_public.Happy; + export var publicUse_im_private_e_public = im_private_e_public.Grumpy; + var privateUse_im_private_f_public = im_private_f_public(); + export var publicUse_im_private_f_public = im_private_f_public(); + var privateUse_im_private_v_public = im_private_v_public; + export var publicUse_im_private_v_public = im_private_v_public; + var privateUse_im_private_i_public: im_private_i_public; + export var publicUse_im_private_i_public: im_private_i_public; + var privateUse_im_private_mi_public = new im_private_mi_public.c(); + export var publicUse_im_private_mi_public = new im_private_mi_public.c(); + var privateUse_im_private_mu_public: im_private_mu_public.i; + export var publicUse_im_private_mu_public: im_private_mu_public.i; + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt deleted file mode 100644 index 7a102fce1f2..00000000000 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt +++ /dev/null @@ -1,57 +0,0 @@ -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_core.ts (6 errors) ==== - // Privacy errors - importing private elements - export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require"); - export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1"); - export import im_public_mi_public = require("m"); - ~~~ -!!! Cannot find external module 'm'. - export import im_public_mu_public = require("m2"); - ~~~~ -!!! Cannot find external module 'm2'. - - // Usage of privacy error imports - var privateUse_im_public_mi_private = new im_public_mi_private.c_private(); - ~~~~~~~~~ -!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"'. - export var publicUse_im_public_mi_private = new im_public_mi_private.c_private(); - ~~~~~~~~~ -!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"'. - var privateUse_im_public_mu_private = new im_public_mu_private.c_private(); - ~~~~~~~~~ -!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"'. - export var publicUse_im_public_mu_private = new im_public_mu_private.c_private(); - ~~~~~~~~~ -!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"'. - var privateUse_im_public_mi_public = new im_public_mi_public.c_public(); - export var publicUse_im_public_mi_public = new im_public_mi_public.c_public(); - var privateUse_im_public_mi_public = new im_public_mi_public.c_public(); - export var publicUse_im_public_mi_public = new im_public_mi_public.c_public(); - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require.ts (0 errors) ==== - // Public elements - export class c_public { - foo: string; - } - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts (0 errors) ==== - export class c_public { - bar: string; - } - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts (0 errors) ==== - // private elements - // Export - Error ambient modules allowed only in global - declare module 'm' { - export class c_private { - baz: string; - } - } - - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts (0 errors) ==== - declare module 'm2' { - export class c_private { - bing: string; - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js index af8681e7899..dac4c23eb81 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js @@ -29,6 +29,8 @@ declare module 'm2' { } //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.ts] +/// +/// // Privacy errors - importing private elements export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require"); export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1"); @@ -36,16 +38,18 @@ export import im_public_mi_public = require("m"); export import im_public_mu_public = require("m2"); // Usage of privacy error imports -var privateUse_im_public_mi_private = new im_public_mi_private.c_private(); -export var publicUse_im_public_mi_private = new im_public_mi_private.c_private(); -var privateUse_im_public_mu_private = new im_public_mu_private.c_private(); -export var publicUse_im_public_mu_private = new im_public_mu_private.c_private(); -var privateUse_im_public_mi_public = new im_public_mi_public.c_public(); -export var publicUse_im_public_mi_public = new im_public_mi_public.c_public(); -var privateUse_im_public_mi_public = new im_public_mi_public.c_public(); -export var publicUse_im_public_mi_public = new im_public_mi_public.c_public(); +var privateUse_im_public_mi_private = new im_public_mi_private.c_public(); +export var publicUse_im_public_mi_private = new im_public_mi_private.c_public(); +var privateUse_im_public_mu_private = new im_public_mu_private.c_public(); +export var publicUse_im_public_mu_private = new im_public_mu_private.c_public(); +var privateUse_im_public_mi_public = new im_public_mi_public.c_private(); +export var publicUse_im_public_mi_public = new im_public_mi_public.c_private(); +var privateUse_im_public_mi_public = new im_public_mi_public.c_private(); +export var publicUse_im_public_mi_public = new im_public_mi_public.c_private(); +//// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.js] +//// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js] //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js] var c_public = (function () { function c_public() { @@ -64,11 +68,45 @@ exports.c_public = c_public; exports.im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require"); exports.im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1"); exports.im_public_mi_public = require("m"); -var privateUse_im_public_mi_private = new exports.im_public_mi_private.c_private(); -exports.publicUse_im_public_mi_private = new exports.im_public_mi_private.c_private(); -var privateUse_im_public_mu_private = new exports.im_public_mu_private.c_private(); -exports.publicUse_im_public_mu_private = new exports.im_public_mu_private.c_private(); -var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_public(); -exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_public(); -var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_public(); -exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_public(); +exports.im_public_mu_public = require("m2"); +var privateUse_im_public_mi_private = new exports.im_public_mi_private.c_public(); +exports.publicUse_im_public_mi_private = new exports.im_public_mi_private.c_public(); +var privateUse_im_public_mu_private = new exports.im_public_mu_private.c_public(); +exports.publicUse_im_public_mu_private = new exports.im_public_mu_private.c_public(); +var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); +exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); +var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); +exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private(); + + +//// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts] +declare module 'm' { + class c_private { + baz: string; + } +} +//// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts] +declare module 'm2' { + class c_private { + bing: string; + } +} +//// [privacyTopLevelAmbientExternalModuleImportWithExport_require.d.ts] +export declare class c_public { + foo: string; +} +//// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.d.ts] +export declare class c_public { + bar: string; +} +//// [privacyTopLevelAmbientExternalModuleImportWithExport_core.d.ts] +/// +/// +export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require"); +export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1"); +export import im_public_mi_public = require("m"); +export import im_public_mu_public = require("m2"); +export declare var publicUse_im_public_mi_private: im_public_mi_private.c_public; +export declare var publicUse_im_public_mu_private: im_public_mu_private.c_public; +export declare var publicUse_im_public_mi_public: im_public_mi_public.c_private; +export declare var publicUse_im_public_mi_public: im_public_mi_public.c_private; diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt deleted file mode 100644 index 359ee29c2d7..00000000000 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt +++ /dev/null @@ -1,49 +0,0 @@ -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts (2 errors) ==== - // Privacy errors - importing private elements - import im_private_mi_private = require("m"); - ~~~ -!!! Cannot find external module 'm'. - import im_private_mu_private = require("m2"); - ~~~~ -!!! Cannot find external module 'm2'. - import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); - import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1"); - - // Usage of privacy error imports - var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); - export var publicUse_im_private_mi_private = new im_private_mi_private.c_private(); - var privateUse_im_private_mu_private = new im_private_mu_private.c_private(); - export var publicUse_im_private_mu_private = new im_private_mu_private.c_private(); - var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); - export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); - var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); - export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts (0 errors) ==== - - // Public elements - export class c_public { - foo: string; - } - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts (0 errors) ==== - export class c_public { - bar: string; - } - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts (0 errors) ==== - // private elements - // Export - Error ambient modules allowed only in global - declare module 'm' { - export class c_private { - baz: string - } - } - -==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts (0 errors) ==== - declare module 'm2' { - export class c_private { - bing: string; - } - } - \ No newline at end of file diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js index 5aa6b762a02..2f7e0691317 100644 --- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js @@ -29,6 +29,8 @@ declare module 'm2' { } //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts] +/// +/// // Privacy errors - importing private elements import im_private_mi_private = require("m"); import im_private_mu_private = require("m2"); @@ -46,6 +48,8 @@ var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js] +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js] //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js] define(["require", "exports"], function (require, exports) { var c_public = (function () { @@ -75,3 +79,35 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); }); + + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts] +declare module 'm' { + class c_private { + baz: string; + } +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts] +declare module 'm2' { + class c_private { + bing: string; + } +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.d.ts] +export declare class c_public { + foo: string; +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.d.ts] +export declare class c_public { + bar: string; +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.d.ts] +/// +/// +import im_private_mi_private = require("m"); +import im_private_mu_private = require("m2"); +import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); +export declare var publicUse_im_private_mi_private: im_private_mi_private.c_private; +export declare var publicUse_im_private_mu_private: im_private_mu_private.c_private; +export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public; +export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public; diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt new file mode 100644 index 00000000000..899832db215 --- /dev/null +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt @@ -0,0 +1,114 @@ +==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts (7 errors) ==== + // private elements + module m_private { + export class c_private { + } + export enum e_private { + Happy, + Grumpy + } + export function f_private() { + return new c_private(); + } + export var v_private = new c_private(); + export interface i_private { + } + export module mi_private { + export class c { + } + } + export module mu_private { + export interface i { + } + } + } + + // Public elements + export module m_public { + export class c_public { + } + export enum e_public { + Happy, + Grumpy + } + export function f_public() { + return new c_public(); + } + export var v_public = 10; + export interface i_public { + } + export module mi_public { + export class c { + } + } + export module mu_public { + export interface i { + } + } + } + + // Privacy errors - importing private elements + export import im_public_c_private = m_private.c_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_c_private' is using private name 'm_private'. + export import im_public_e_private = m_private.e_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_e_private' is using private name 'm_private'. + export import im_public_f_private = m_private.f_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_f_private' is using private name 'm_private'. + export import im_public_v_private = m_private.v_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_v_private' is using private name 'm_private'. + export import im_public_i_private = m_private.i_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_i_private' is using private name 'm_private'. + export import im_public_mi_private = m_private.mi_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_mi_private' is using private name 'm_private'. + export import im_public_mu_private = m_private.mu_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_public_mu_private' is using private name 'm_private'. + + // Usage of privacy error imports + var privateUse_im_public_c_private = new im_public_c_private(); + export var publicUse_im_public_c_private = new im_public_c_private(); + var privateUse_im_public_e_private = im_public_e_private.Happy; + export var publicUse_im_public_e_private = im_public_e_private.Grumpy; + var privateUse_im_public_f_private = im_public_f_private(); + export var publicUse_im_public_f_private = im_public_f_private(); + var privateUse_im_public_v_private = im_public_v_private; + export var publicUse_im_public_v_private = im_public_v_private; + var privateUse_im_public_i_private: im_public_i_private; + export var publicUse_im_public_i_private: im_public_i_private; + var privateUse_im_public_mi_private = new im_public_mi_private.c(); + export var publicUse_im_public_mi_private = new im_public_mi_private.c(); + var privateUse_im_public_mu_private: im_public_mu_private.i; + export var publicUse_im_public_mu_private: im_public_mu_private.i; + + + // No Privacy errors - importing public elements + export import im_public_c_public = m_public.c_public; + export import im_public_e_public = m_public.e_public; + export import im_public_f_public = m_public.f_public; + export import im_public_v_public = m_public.v_public; + export import im_public_i_public = m_public.i_public; + export import im_public_mi_public = m_public.mi_public; + export import im_public_mu_public = m_public.mu_public; + + // Usage of above decls + var privateUse_im_public_c_public = new im_public_c_public(); + export var publicUse_im_public_c_public = new im_public_c_public(); + var privateUse_im_public_e_public = im_public_e_public.Happy; + export var publicUse_im_public_e_public = im_public_e_public.Grumpy; + var privateUse_im_public_f_public = im_public_f_public(); + export var publicUse_im_public_f_public = im_public_f_public(); + var privateUse_im_public_v_public = im_public_v_public; + export var publicUse_im_public_v_public = im_public_v_public; + var privateUse_im_public_i_public: im_public_i_public; + export var publicUse_im_public_i_public: im_public_i_public; + var privateUse_im_public_mi_public = new im_public_mi_public.c(); + export var publicUse_im_public_mi_public = new im_public_mi_public.c(); + var privateUse_im_public_mu_public: im_public_mu_public.i; + export var publicUse_im_public_mu_public: im_public_mu_public.i; + \ No newline at end of file diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt new file mode 100644 index 00000000000..b9791738e24 --- /dev/null +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt @@ -0,0 +1,111 @@ +==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts (5 errors) ==== + + // private elements + module m_private { + export class c_private { + } + export enum e_private { + Happy, + Grumpy + } + export function f_private() { + return new c_private(); + } + export var v_private = new c_private(); + export interface i_private { + } + export module mi_private { + export class c { + } + } + export module mu_private { + export interface i { + } + } + } + + // Public elements + export module m_public { + export class c_public { + } + export enum e_public { + Happy, + Grumpy + } + export function f_public() { + return new c_public(); + } + export var v_public = 10; + export interface i_public { + } + export module mi_public { + export class c { + } + } + export module mu_public { + export interface i { + } + } + } + + // No Privacy errors - importing private elements + import im_private_c_private = m_private.c_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_c_private' is using private name 'm_private'. + import im_private_e_private = m_private.e_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_e_private' is using private name 'm_private'. + import im_private_f_private = m_private.f_private; + import im_private_v_private = m_private.v_private; + import im_private_i_private = m_private.i_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_i_private' is using private name 'm_private'. + import im_private_mi_private = m_private.mi_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_mi_private' is using private name 'm_private'. + import im_private_mu_private = m_private.mu_private; + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declaration 'im_private_mu_private' is using private name 'm_private'. + + // Usage of above decls + var privateUse_im_private_c_private = new im_private_c_private(); + export var publicUse_im_private_c_private = new im_private_c_private(); + var privateUse_im_private_e_private = im_private_e_private.Happy; + export var publicUse_im_private_e_private = im_private_e_private.Grumpy; + var privateUse_im_private_f_private = im_private_f_private(); + export var publicUse_im_private_f_private = im_private_f_private(); + var privateUse_im_private_v_private = im_private_v_private; + export var publicUse_im_private_v_private = im_private_v_private; + var privateUse_im_private_i_private: im_private_i_private; + export var publicUse_im_private_i_private: im_private_i_private; + var privateUse_im_private_mi_private = new im_private_mi_private.c(); + export var publicUse_im_private_mi_private = new im_private_mi_private.c(); + var privateUse_im_private_mu_private: im_private_mu_private.i; + export var publicUse_im_private_mu_private: im_private_mu_private.i; + + + // No Privacy errors - importing public elements + import im_private_c_public = m_public.c_public; + import im_private_e_public = m_public.e_public; + import im_private_f_public = m_public.f_public; + import im_private_v_public = m_public.v_public; + import im_private_i_public = m_public.i_public; + import im_private_mi_public = m_public.mi_public; + import im_private_mu_public = m_public.mu_public; + + // Usage of above decls + var privateUse_im_private_c_public = new im_private_c_public(); + export var publicUse_im_private_c_public = new im_private_c_public(); + var privateUse_im_private_e_public = im_private_e_public.Happy; + export var publicUse_im_private_e_public = im_private_e_public.Grumpy; + var privateUse_im_private_f_public = im_private_f_public(); + export var publicUse_im_private_f_public = im_private_f_public(); + var privateUse_im_private_v_public = im_private_v_public; + export var publicUse_im_private_v_public = im_private_v_public; + var privateUse_im_private_i_public: im_private_i_public; + export var publicUse_im_private_i_public: im_private_i_public; + var privateUse_im_private_mi_public = new im_private_mi_public.c(); + export var publicUse_im_private_mi_public = new im_private_mi_public.c(); + var privateUse_im_private_mu_public: im_private_mu_public.i; + export var publicUse_im_private_mu_public: im_private_mu_public.i; + \ No newline at end of file diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js index 2f435522438..bce0ad5c8f6 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js @@ -1,4 +1,5 @@ //// [privacyTopLevelInternalReferenceImportWithoutExport.ts] + // private elements module m_private { export class c_private { diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt index 8e892e57dee..3297ac7228d 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts (24 errors) ==== +==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts (36 errors) ==== class privateClass { } @@ -7,12 +7,18 @@ export interface publicInterfaceWithPrivateTypeParameters { new (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'. ~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'. (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using private name 'privateClass'. ~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'. myMethod(): privateClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. ~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of method from exported interface has or is using private name 'privateClass'. } @@ -138,12 +144,18 @@ export interface publicInterfaceWithPrivatModuleTypeParameters { new (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. myMethod(): privateModule.publicClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. } @@ -187,12 +199,18 @@ export interface publicInterfaceWithPrivateTypeParameters { new (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'. ~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'. (): privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using private name 'privateClass'. ~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'. myMethod(): privateClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. ~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of method from exported interface has or is using private name 'privateClass'. } @@ -318,12 +336,18 @@ export interface publicInterfaceWithPrivatModuleTypeParameters { new (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. (): privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. myMethod(): privateModule.publicClass; // Error + ~~~~~~~~ +!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! Type parameter 'T' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. } diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt index 92aa57bcef1..c4e9934ce8c 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts (4 errors) ==== +==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts (20 errors) ==== class privateClass { } @@ -17,8 +17,16 @@ myMethod(val: T): T; myMethod0(): publicClassT; myMethod1(): privateClassT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassT'. myMethod2(): privateClassT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassT'. myMethod3(): publicClassT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. myMethod4(): publicClassT; } @@ -26,8 +34,16 @@ myMethod(val: T): T; myMethod0(): publicClassT myMethod1(): privateClassT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassT'. myMethod2(): privateClassT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassT'. myMethod3(): publicClassT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClass'. myMethod4(): publicClassT; } @@ -87,8 +103,16 @@ myMethod(val: T): T; myMethod0(): publicClassInPublicModuleT; myMethod1(): privateClassInPublicModuleT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. myMethod2(): privateClassInPublicModuleT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. myMethod3(): publicClassInPublicModuleT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. myMethod4(): publicClassInPublicModuleT; } @@ -96,8 +120,16 @@ myMethod(val: T): T; myMethod0(): publicClassInPublicModuleT myMethod1(): privateClassInPublicModuleT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. myMethod2(): privateClassInPublicModuleT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. myMethod3(): publicClassInPublicModuleT; + ~~~~~~~~~ +!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. myMethod4(): publicClassInPublicModuleT; } diff --git a/tests/baselines/reference/privacyVarDeclFile.errors.txt b/tests/baselines/reference/privacyVarDeclFile.errors.txt new file mode 100644 index 00000000000..7a0288f42df --- /dev/null +++ b/tests/baselines/reference/privacyVarDeclFile.errors.txt @@ -0,0 +1,484 @@ +==== tests/cases/compiler/privacyVarDeclFile_externalModule.ts (20 errors) ==== + + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myPublicProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'. + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + export module publicModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myPublicProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'. + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + } + +==== tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts (10 errors) ==== + class publicClassInGlobal { + } + interface publicInterfaceWithPublicPropertyTypesInGlobal { + myProperty: publicClassInGlobal; + } + class publicClassWithWithPublicPropertyTypesInGlobal { + static myPublicStaticProperty: publicClassInGlobal; + private static myPrivateStaticProperty: publicClassInGlobal; + myPublicProperty: publicClassInGlobal; + private myPrivateProperty: publicClassInGlobal; + } + var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; + declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; + + module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'. + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + myPublicProperty: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'. + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'. + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + } \ No newline at end of file diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js new file mode 100644 index 00000000000..922c056b3a7 --- /dev/null +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -0,0 +1,702 @@ +//// [tests/cases/compiler/privacyVarDeclFile.ts] //// + +//// [privacyVarDeclFile_externalModule.ts] + +class privateClass { +} + +export class publicClass { +} + +export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error +} + +export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; +} + +interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; +} + +interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; +} + +export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + private myPrivateProperty: privateClass; +} + +export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; +} + +class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; +} + +class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; +} + +export var publicVarWithPrivatePropertyTypes: privateClass; // Error +export var publicVarWithPublicPropertyTypes: publicClass; +var privateVarWithPrivatePropertyTypes: privateClass; +var privateVarWithPublicPropertyTypes: publicClass; + +export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error +export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; +declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; +declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + +export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error +} +export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + myPublicProperty: privateModule.publicClass; // Error +} +export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error +export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + +interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; +} +class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; +} +var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; +declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + myPublicProperty: privateModule.publicClass; // Error + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; +} + +//// [privacyVarDeclFile_GlobalFile.ts] +class publicClassInGlobal { +} +interface publicInterfaceWithPublicPropertyTypesInGlobal { + myProperty: publicClassInGlobal; +} +class publicClassWithWithPublicPropertyTypesInGlobal { + static myPublicStaticProperty: publicClassInGlobal; + private static myPrivateStaticProperty: publicClassInGlobal; + myPublicProperty: publicClassInGlobal; + private myPrivateProperty: publicClassInGlobal; +} +var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; +declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + myPublicProperty: privateModule.publicClass; // Error + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; +} + +//// [privacyVarDeclFile_externalModule.js] +var privateClass = (function () { + function privateClass() { + } + return privateClass; +})(); +var publicClass = (function () { + function publicClass() { + } + return publicClass; +})(); +exports.publicClass = publicClass; +var publicClassWithWithPrivatePropertyTypes = (function () { + function publicClassWithWithPrivatePropertyTypes() { + } + return publicClassWithWithPrivatePropertyTypes; +})(); +exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; +var publicClassWithWithPublicPropertyTypes = (function () { + function publicClassWithWithPublicPropertyTypes() { + } + return publicClassWithWithPublicPropertyTypes; +})(); +exports.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; +var privateClassWithWithPrivatePropertyTypes = (function () { + function privateClassWithWithPrivatePropertyTypes() { + } + return privateClassWithWithPrivatePropertyTypes; +})(); +var privateClassWithWithPublicPropertyTypes = (function () { + function privateClassWithWithPublicPropertyTypes() { + } + return privateClassWithWithPublicPropertyTypes; +})(); +exports.publicVarWithPrivatePropertyTypes; +exports.publicVarWithPublicPropertyTypes; +var privateVarWithPrivatePropertyTypes; +var privateVarWithPublicPropertyTypes; +var publicClassWithPrivateModulePropertyTypes = (function () { + function publicClassWithPrivateModulePropertyTypes() { + } + return publicClassWithPrivateModulePropertyTypes; +})(); +exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; +exports.publicVarWithPrivateModulePropertyTypes; +var privateClassWithPrivateModulePropertyTypes = (function () { + function privateClassWithPrivateModulePropertyTypes() { + } + return privateClassWithPrivateModulePropertyTypes; +})(); +var privateVarWithPrivateModulePropertyTypes; +(function (publicModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModule.publicClass = publicClass; + var publicClassWithWithPrivatePropertyTypes = (function () { + function publicClassWithWithPrivatePropertyTypes() { + } + return publicClassWithWithPrivatePropertyTypes; + })(); + publicModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; + var publicClassWithWithPublicPropertyTypes = (function () { + function publicClassWithWithPublicPropertyTypes() { + } + return publicClassWithWithPublicPropertyTypes; + })(); + publicModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; + var privateClassWithWithPrivatePropertyTypes = (function () { + function privateClassWithWithPrivatePropertyTypes() { + } + return privateClassWithWithPrivatePropertyTypes; + })(); + var privateClassWithWithPublicPropertyTypes = (function () { + function privateClassWithWithPublicPropertyTypes() { + } + return privateClassWithWithPublicPropertyTypes; + })(); + publicModule.publicVarWithPrivatePropertyTypes; + publicModule.publicVarWithPublicPropertyTypes; + var privateVarWithPrivatePropertyTypes; + var privateVarWithPublicPropertyTypes; + var publicClassWithPrivateModulePropertyTypes = (function () { + function publicClassWithPrivateModulePropertyTypes() { + } + return publicClassWithPrivateModulePropertyTypes; + })(); + publicModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; + publicModule.publicVarWithPrivateModulePropertyTypes; + var privateClassWithPrivateModulePropertyTypes = (function () { + function privateClassWithPrivateModulePropertyTypes() { + } + return privateClassWithPrivateModulePropertyTypes; + })(); + var privateVarWithPrivateModulePropertyTypes; +})(exports.publicModule || (exports.publicModule = {})); +var publicModule = exports.publicModule; +var privateModule; +(function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivatePropertyTypes = (function () { + function publicClassWithWithPrivatePropertyTypes() { + } + return publicClassWithWithPrivatePropertyTypes; + })(); + privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; + var publicClassWithWithPublicPropertyTypes = (function () { + function publicClassWithWithPublicPropertyTypes() { + } + return publicClassWithWithPublicPropertyTypes; + })(); + privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; + var privateClassWithWithPrivatePropertyTypes = (function () { + function privateClassWithWithPrivatePropertyTypes() { + } + return privateClassWithWithPrivatePropertyTypes; + })(); + var privateClassWithWithPublicPropertyTypes = (function () { + function privateClassWithWithPublicPropertyTypes() { + } + return privateClassWithWithPublicPropertyTypes; + })(); + privateModule.publicVarWithPrivatePropertyTypes; + privateModule.publicVarWithPublicPropertyTypes; + var privateVarWithPrivatePropertyTypes; + var privateVarWithPublicPropertyTypes; + var publicClassWithPrivateModulePropertyTypes = (function () { + function publicClassWithPrivateModulePropertyTypes() { + } + return publicClassWithPrivateModulePropertyTypes; + })(); + privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; + privateModule.publicVarWithPrivateModulePropertyTypes; + var privateClassWithPrivateModulePropertyTypes = (function () { + function privateClassWithPrivateModulePropertyTypes() { + } + return privateClassWithPrivateModulePropertyTypes; + })(); + var privateVarWithPrivateModulePropertyTypes; +})(privateModule || (privateModule = {})); +//// [privacyVarDeclFile_GlobalFile.js] +var publicClassInGlobal = (function () { + function publicClassInGlobal() { + } + return publicClassInGlobal; +})(); +var publicClassWithWithPublicPropertyTypesInGlobal = (function () { + function publicClassWithWithPublicPropertyTypesInGlobal() { + } + return publicClassWithWithPublicPropertyTypesInGlobal; +})(); +var publicVarWithPublicPropertyTypesInGlobal; +var publicModuleInGlobal; +(function (publicModuleInGlobal) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + publicModuleInGlobal.publicClass = publicClass; + var privateModule; + (function (privateModule) { + var privateClass = (function () { + function privateClass() { + } + return privateClass; + })(); + var publicClass = (function () { + function publicClass() { + } + return publicClass; + })(); + privateModule.publicClass = publicClass; + var publicClassWithWithPrivatePropertyTypes = (function () { + function publicClassWithWithPrivatePropertyTypes() { + } + return publicClassWithWithPrivatePropertyTypes; + })(); + privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; + var publicClassWithWithPublicPropertyTypes = (function () { + function publicClassWithWithPublicPropertyTypes() { + } + return publicClassWithWithPublicPropertyTypes; + })(); + privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; + var privateClassWithWithPrivatePropertyTypes = (function () { + function privateClassWithWithPrivatePropertyTypes() { + } + return privateClassWithWithPrivatePropertyTypes; + })(); + var privateClassWithWithPublicPropertyTypes = (function () { + function privateClassWithWithPublicPropertyTypes() { + } + return privateClassWithWithPublicPropertyTypes; + })(); + privateModule.publicVarWithPrivatePropertyTypes; + privateModule.publicVarWithPublicPropertyTypes; + var privateVarWithPrivatePropertyTypes; + var privateVarWithPublicPropertyTypes; + var publicClassWithPrivateModulePropertyTypes = (function () { + function publicClassWithPrivateModulePropertyTypes() { + } + return publicClassWithPrivateModulePropertyTypes; + })(); + privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; + privateModule.publicVarWithPrivateModulePropertyTypes; + var privateClassWithPrivateModulePropertyTypes = (function () { + function privateClassWithPrivateModulePropertyTypes() { + } + return privateClassWithPrivateModulePropertyTypes; + })(); + var privateVarWithPrivateModulePropertyTypes; + })(privateModule || (privateModule = {})); + var publicClassWithWithPrivatePropertyTypes = (function () { + function publicClassWithWithPrivatePropertyTypes() { + } + return publicClassWithWithPrivatePropertyTypes; + })(); + publicModuleInGlobal.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes; + var publicClassWithWithPublicPropertyTypes = (function () { + function publicClassWithWithPublicPropertyTypes() { + } + return publicClassWithWithPublicPropertyTypes; + })(); + publicModuleInGlobal.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes; + var privateClassWithWithPrivatePropertyTypes = (function () { + function privateClassWithWithPrivatePropertyTypes() { + } + return privateClassWithWithPrivatePropertyTypes; + })(); + var privateClassWithWithPublicPropertyTypes = (function () { + function privateClassWithWithPublicPropertyTypes() { + } + return privateClassWithWithPublicPropertyTypes; + })(); + publicModuleInGlobal.publicVarWithPrivatePropertyTypes; + publicModuleInGlobal.publicVarWithPublicPropertyTypes; + var privateVarWithPrivatePropertyTypes; + var privateVarWithPublicPropertyTypes; + var publicClassWithPrivateModulePropertyTypes = (function () { + function publicClassWithPrivateModulePropertyTypes() { + } + return publicClassWithPrivateModulePropertyTypes; + })(); + publicModuleInGlobal.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes; + publicModuleInGlobal.publicVarWithPrivateModulePropertyTypes; + var privateClassWithPrivateModulePropertyTypes = (function () { + function privateClassWithPrivateModulePropertyTypes() { + } + return privateClassWithPrivateModulePropertyTypes; + })(); + var privateVarWithPrivateModulePropertyTypes; +})(publicModuleInGlobal || (publicModuleInGlobal = {})); diff --git a/tests/baselines/reference/project/baseline/amd/baseline.json b/tests/baselines/reference/project/baseline/amd/baseline.json index 18a5cfbebaf..434ed4f9f09 100644 --- a/tests/baselines/reference/project/baseline/amd/baseline.json +++ b/tests/baselines/reference/project/baseline/amd/baseline.json @@ -7,9 +7,9 @@ "baselineCheck": true, "runTest": true, "resolvedInputFiles": [ - "emit.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "emit.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/baseline/node/baseline.json b/tests/baselines/reference/project/baseline/node/baseline.json index 18a5cfbebaf..434ed4f9f09 100644 --- a/tests/baselines/reference/project/baseline/node/baseline.json +++ b/tests/baselines/reference/project/baseline/node/baseline.json @@ -7,9 +7,9 @@ "baselineCheck": true, "runTest": true, "resolvedInputFiles": [ - "emit.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "emit.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/baseline2/amd/baseline2.json b/tests/baselines/reference/project/baseline2/amd/baseline2.json index 4a14da23589..c9bbe169f14 100644 --- a/tests/baselines/reference/project/baseline2/amd/baseline2.json +++ b/tests/baselines/reference/project/baseline2/amd/baseline2.json @@ -7,9 +7,9 @@ "baselineCheck": true, "runTest": true, "resolvedInputFiles": [ - "dont_emit.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "dont_emit.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/baseline2/node/baseline2.json b/tests/baselines/reference/project/baseline2/node/baseline2.json index 4a14da23589..c9bbe169f14 100644 --- a/tests/baselines/reference/project/baseline2/node/baseline2.json +++ b/tests/baselines/reference/project/baseline2/node/baseline2.json @@ -7,9 +7,9 @@ "baselineCheck": true, "runTest": true, "resolvedInputFiles": [ - "dont_emit.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "dont_emit.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/baseline3/amd/baseline3.json b/tests/baselines/reference/project/baseline3/amd/baseline3.json index 7c178ee16be..7eba4ec8287 100644 --- a/tests/baselines/reference/project/baseline3/amd/baseline3.json +++ b/tests/baselines/reference/project/baseline3/amd/baseline3.json @@ -7,8 +7,8 @@ "baselineCheck": true, "runTest": true, "resolvedInputFiles": [ - "nestedModule.ts", - "lib.d.ts" + "lib.d.ts", + "nestedModule.ts" ], "emittedFiles": [ "nestedModule.js" diff --git a/tests/baselines/reference/project/baseline3/node/baseline3.json b/tests/baselines/reference/project/baseline3/node/baseline3.json index 7c178ee16be..7eba4ec8287 100644 --- a/tests/baselines/reference/project/baseline3/node/baseline3.json +++ b/tests/baselines/reference/project/baseline3/node/baseline3.json @@ -7,8 +7,8 @@ "baselineCheck": true, "runTest": true, "resolvedInputFiles": [ - "nestedModule.ts", - "lib.d.ts" + "lib.d.ts", + "nestedModule.ts" ], "emittedFiles": [ "nestedModule.js" diff --git a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt index 2978ef073b5..360c00b51aa 100644 --- a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt +++ b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt @@ -1,3 +1,23 @@ decl.ts(1,26): Cannot find external module './foo/bar.js'. decl.ts(2,26): Cannot find external module 'baz'. decl.ts(3,26): Cannot find external module './baz'. + + +==== decl.ts (3 errors) ==== + import modErr = require("./foo/bar.js"); + ~~~~~~~~~~~~~~ +!!! Cannot find external module './foo/bar.js'. + import modErr1 = require("baz"); + ~~~~~ +!!! Cannot find external module 'baz'. + import modErr2 = require("./baz"); + ~~~~~~~ +!!! Cannot find external module './baz'. + + //import modErr1 = require("\bar"); + + //import mod = require("./foo/bar"); + //import mod1 = require("../module paths/foo/bar"); + //import mod2 = require("foo/bar"); + + \ No newline at end of file diff --git a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.json b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.json index 05a85481e7b..1d2f8d56e5a 100644 --- a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.json +++ b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.json @@ -5,8 +5,8 @@ "decl.ts" ], "resolvedInputFiles": [ - "decl.ts", - "lib.d.ts" + "lib.d.ts", + "decl.ts" ], "emittedFiles": [ "decl.js" diff --git a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt index 2978ef073b5..360c00b51aa 100644 --- a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt +++ b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt @@ -1,3 +1,23 @@ decl.ts(1,26): Cannot find external module './foo/bar.js'. decl.ts(2,26): Cannot find external module 'baz'. decl.ts(3,26): Cannot find external module './baz'. + + +==== decl.ts (3 errors) ==== + import modErr = require("./foo/bar.js"); + ~~~~~~~~~~~~~~ +!!! Cannot find external module './foo/bar.js'. + import modErr1 = require("baz"); + ~~~~~ +!!! Cannot find external module 'baz'. + import modErr2 = require("./baz"); + ~~~~~~~ +!!! Cannot find external module './baz'. + + //import modErr1 = require("\bar"); + + //import mod = require("./foo/bar"); + //import mod1 = require("../module paths/foo/bar"); + //import mod2 = require("foo/bar"); + + \ No newline at end of file diff --git a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.json b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.json index 05a85481e7b..1d2f8d56e5a 100644 --- a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.json +++ b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.json @@ -5,8 +5,8 @@ "decl.ts" ], "resolvedInputFiles": [ - "decl.ts", - "lib.d.ts" + "lib.d.ts", + "decl.ts" ], "emittedFiles": [ "decl.js" diff --git a/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.json b/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.json index 418891627ba..56acd20c288 100644 --- a/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.json +++ b/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.json @@ -5,9 +5,9 @@ "consume.ts" ], "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/circularReferencing/node/circularReferencing.json b/tests/baselines/reference/project/circularReferencing/node/circularReferencing.json index 418891627ba..56acd20c288 100644 --- a/tests/baselines/reference/project/circularReferencing/node/circularReferencing.json +++ b/tests/baselines/reference/project/circularReferencing/node/circularReferencing.json @@ -5,9 +5,9 @@ "consume.ts" ], "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.json b/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.json index 162d3d51c0b..04838cd9445 100644 --- a/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.json +++ b/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.json @@ -6,10 +6,10 @@ ], "runTest": true, "resolvedInputFiles": [ - "a.ts", - "c.ts", + "lib.d.ts", "b.ts", - "lib.d.ts" + "c.ts", + "a.ts" ], "emittedFiles": [ "b.js", diff --git a/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.json b/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.json index 162d3d51c0b..04838cd9445 100644 --- a/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.json +++ b/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.json @@ -6,10 +6,10 @@ ], "runTest": true, "resolvedInputFiles": [ - "a.ts", - "c.ts", + "lib.d.ts", "b.ts", - "lib.d.ts" + "c.ts", + "a.ts" ], "emittedFiles": [ "b.js", diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json b/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json index 158d3048989..12c70b9ee2c 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts index 1ffac0d4931..c766ad8c441 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts @@ -1,8 +1,10 @@ declare module "quotedm1" { + import m4 = require("m4"); class v { c: m4.d; } } declare module "quotedm2" { + import m1 = require("quotedm1"); var c: m1.v; } diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json b/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json index 158d3048989..12c70b9ee2c 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts index 1ffac0d4931..c766ad8c441 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts @@ -1,8 +1,10 @@ declare module "quotedm1" { + import m4 = require("m4"); class v { c: m4.d; } } declare module "quotedm2" { + import m1 = require("quotedm1"); var c: m1.v; } diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json b/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json index c7f0232f2a4..78bf819430e 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "glo_m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "glo_m4.js", diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts index b3f3616bb50..f9388238202 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts @@ -1,3 +1,4 @@ +import glo_m4 = require("glo_m4"); export declare var useGlo_m4_x4: glo_m4.d; export declare var useGlo_m4_d4: typeof glo_m4.d; export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json b/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json index c7f0232f2a4..78bf819430e 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "glo_m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "glo_m4.js", diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts index b3f3616bb50..f9388238202 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts @@ -1,3 +1,4 @@ +import glo_m4 = require("glo_m4"); export declare var useGlo_m4_x4: glo_m4.d; export declare var useGlo_m4_d4: typeof glo_m4.d; export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json index 61e3ee739ef..c6e51b9fc3b 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "private_m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "private_m4.js", diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json index 61e3ee739ef..c6e51b9fc3b 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "private_m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "private_m4.js", diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json index c695a7c7cfd..71dc130b83d 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "fncOnly_m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "fncOnly_m4.js", diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts index 65fe7458a3e..68bda5279ee 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts @@ -1 +1,2 @@ +import fncOnly_m4 = require("fncOnly_m4"); export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json index c695a7c7cfd..71dc130b83d 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "fncOnly_m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "fncOnly_m4.js", diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts index 65fe7458a3e..68bda5279ee 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts @@ -1 +1,2 @@ +import fncOnly_m4 = require("fncOnly_m4"); export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.json b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.json index 2662f28161d..bb463aa43e8 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.json +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.json @@ -6,10 +6,10 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", - "m5.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "m5.ts", + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.json b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.json index 2662f28161d..bb463aa43e8 100644 --- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.json +++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.json @@ -6,10 +6,10 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", - "m5.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "m5.ts", + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json index 7d52e1fc8b3..5f5cd70b619 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts index 492616037df..508c764d153 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts @@ -1,3 +1,4 @@ +import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json index 7d52e1fc8b3..5f5cd70b619 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts index 492616037df..508c764d153 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts @@ -1,3 +1,4 @@ +import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json index 7b92f7321cd..c5f28aeb3c4 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", "m5.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts index be50f5ad4a3..8f3e96bb9da 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts @@ -1 +1,2 @@ +import m4 = require("m4"); export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts index e7c6ad2f836..f2ba92bca9e 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts @@ -1,3 +1,4 @@ +import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json index 7b92f7321cd..c5f28aeb3c4 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", "m5.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts index be50f5ad4a3..8f3e96bb9da 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts @@ -1 +1,2 @@ +import m4 = require("m4"); export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts index e7c6ad2f836..f2ba92bca9e 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts @@ -1,3 +1,4 @@ +import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json index 2497ac9b8d0..41a5dcb845b 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts index 664759ceeef..c5355f22ef5 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts @@ -1,3 +1,4 @@ +import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json index 2497ac9b8d0..41a5dcb845b 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "useModule.ts", + "lib.d.ts", "m4.ts", - "lib.d.ts" + "useModule.ts" ], "emittedFiles": [ "m4.js", diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts index 664759ceeef..c5355f22ef5 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts @@ -1,3 +1,4 @@ +import m4 = require("m4"); export declare var x4: m4.d; export declare var d4: typeof m4.d; export declare var f4: m4.d; diff --git a/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.json b/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.json index b8657c85b44..5f1f8e737bb 100644 --- a/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.json +++ b/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.json @@ -6,9 +6,9 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "consumer.ts", + "lib.d.ts", "ref.d.ts", - "lib.d.ts" + "consumer.ts" ], "emittedFiles": [ "consumer.js" diff --git a/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.json b/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.json index b8657c85b44..5f1f8e737bb 100644 --- a/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.json +++ b/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.json @@ -6,9 +6,9 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "consumer.ts", + "lib.d.ts", "ref.d.ts", - "lib.d.ts" + "consumer.ts" ], "emittedFiles": [ "consumer.js" diff --git a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt index 9d595fad4a5..ec37b813a92 100644 --- a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt +++ b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt @@ -1 +1,22 @@ in2.d.ts(1,8): Duplicate identifier 'a'. + + +==== decl.d.ts (0 errors) ==== + // bug 535531: duplicate identifier error reported for "import" declarations in separate files + + declare module A + { + + class MyRoot { } + + export module B + { + class MyClass{ } + } + } +==== in1.d.ts (0 errors) ==== + import a = A; +==== in2.d.ts (1 errors) ==== + import a = A; + ~ +!!! Duplicate identifier 'a'. \ No newline at end of file diff --git a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.json b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.json index a32841c0b1c..f0360e53d7f 100644 --- a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.json +++ b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.json @@ -7,10 +7,10 @@ "in2.d.ts" ], "resolvedInputFiles": [ + "lib.d.ts", "decl.d.ts", "in1.d.ts", - "in2.d.ts", - "lib.d.ts" + "in2.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt index 9d595fad4a5..ec37b813a92 100644 --- a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt +++ b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt @@ -1 +1,22 @@ in2.d.ts(1,8): Duplicate identifier 'a'. + + +==== decl.d.ts (0 errors) ==== + // bug 535531: duplicate identifier error reported for "import" declarations in separate files + + declare module A + { + + class MyRoot { } + + export module B + { + class MyClass{ } + } + } +==== in1.d.ts (0 errors) ==== + import a = A; +==== in2.d.ts (1 errors) ==== + import a = A; + ~ +!!! Duplicate identifier 'a'. \ No newline at end of file diff --git a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.json b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.json index a32841c0b1c..f0360e53d7f 100644 --- a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.json +++ b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.json @@ -7,10 +7,10 @@ "in2.d.ts" ], "resolvedInputFiles": [ + "lib.d.ts", "decl.d.ts", "in1.d.ts", - "in2.d.ts", - "lib.d.ts" + "in2.d.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.json b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.json index c3722f9581e..610adfd2934 100644 --- a/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.json +++ b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.json @@ -5,10 +5,10 @@ "external.ts" ], "resolvedInputFiles": [ - "external.ts", + "lib.d.ts", "internal.ts", "external2.ts", - "lib.d.ts" + "external.ts" ], "emittedFiles": [ "internal.js", diff --git a/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.json b/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.json index c3722f9581e..610adfd2934 100644 --- a/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.json +++ b/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.json @@ -5,10 +5,10 @@ "external.ts" ], "resolvedInputFiles": [ - "external.ts", + "lib.d.ts", "internal.ts", "external2.ts", - "lib.d.ts" + "external.ts" ], "emittedFiles": [ "internal.js", diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt index d0786cec0a5..09a97c1bdc2 100644 --- a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt +++ b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt @@ -1 +1,11 @@ internal2.ts(2,2): Import declarations in an internal module cannot reference an external module. + + +==== internal2.ts (1 errors) ==== + module outer { + import g = require("external2") + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var a = g.square(5); + export var b = "foo"; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.json b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.json index 5eef712b09f..0f1a27234f6 100644 --- a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.json +++ b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.json @@ -5,8 +5,8 @@ "internal2.ts" ], "resolvedInputFiles": [ - "internal2.ts", - "lib.d.ts" + "lib.d.ts", + "internal2.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt index d0786cec0a5..09a97c1bdc2 100644 --- a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt +++ b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt @@ -1 +1,11 @@ internal2.ts(2,2): Import declarations in an internal module cannot reference an external module. + + +==== internal2.ts (1 errors) ==== + module outer { + import g = require("external2") + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var a = g.square(5); + export var b = "foo"; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.json b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.json index 5eef712b09f..0f1a27234f6 100644 --- a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.json +++ b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.json @@ -5,8 +5,8 @@ "internal2.ts" ], "resolvedInputFiles": [ - "internal2.ts", - "lib.d.ts" + "lib.d.ts", + "internal2.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json index 864fffa894a..fa9e0b566a9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json index 864fffa894a..fa9e0b566a9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index e0540132e7e..ebaec46d1e3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index e0540132e7e..ebaec46d1e3 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index f0348aeee31..ee020b0ff80 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index f0348aeee31..ee020b0ff80 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 06de8fc379f..ed7bcd289e7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -12,10 +12,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 06de8fc379f..ed7bcd289e7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -12,10 +12,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json index 345abfeadf8..8f512dcc98c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json index 345abfeadf8..8f512dcc98c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index cba8c8d1b64..4f65daf7560 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index cba8c8d1b64..4f65daf7560 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 4f15a75b8d9..6432d5ae91e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 4f15a75b8d9..6432d5ae91e 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json index b7beffd7609..31a0fb89c50 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json index b7beffd7609..31a0fb89c50 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index 6615ea576e3..355458526bc 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index 6615ea576e3..355458526bc 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 07e886edeba..f703a63b71f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 07e886edeba..f703a63b71f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json index aab45205df5..a6bc71dd664 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json index aab45205df5..a6bc71dd664 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index 08d543fdd33..e873c8fc472 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index 08d543fdd33..e873c8fc472 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index 85f503c6b94..d8f4cc74008 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index 85f503c6b94..d8f4cc74008 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json index 725572edc89..49018ee5973 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json index 725572edc89..49018ee5973 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json index fe0849476c9..097c9bbf209 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json index fe0849476c9..097c9bbf209 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json index d0d8958a721..bcf3a4400aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json index d0d8958a721..bcf3a4400aa 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json index 30c240dd45e..d5914d92950 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json index 30c240dd45e..d5914d92950 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json index 42ca7c875d2..2c5e1dae38a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json index 42ca7c875d2..2c5e1dae38a 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json index 03700f41451..8431a99c800 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json index 03700f41451..8431a99c800 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json index f2c2c11d40e..4a180368e20 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json index f2c2c11d40e..4a180368e20 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json index 4cbb9837b4e..a44a569a0a6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json index 4cbb9837b4e..a44a569a0a6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json index 7adae3efc6d..7c0069605da 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json index 7adae3efc6d..7c0069605da 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json index 2a9e9211d1f..1b09decc58d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json index 2a9e9211d1f..1b09decc58d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 0b7bb40e246..a02eb484aa2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 0b7bb40e246..a02eb484aa2 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json index bc2925bf6f5..ec516baecfe 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json index bc2925bf6f5..ec516baecfe 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json index 6e76d83b7f2..5352fd8a988 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json index 6e76d83b7f2..5352fd8a988 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 495a74523ef..0a0d68e300a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 495a74523ef..0a0d68e300a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json index bb6df8c1692..8e87f61b8df 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json index bb6df8c1692..8e87f61b8df 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 9411b60b0e8..4ed441e2552 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 9411b60b0e8..4ed441e2552 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json index fa1ee9b3187..8ec143b2dce 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json index fa1ee9b3187..8ec143b2dce 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index d2779418490..96777b6f502 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index d2779418490..96777b6f502 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index 3d3dfd46820..f3c86f22eb7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index 3d3dfd46820..f3c86f22eb7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json index 01dea65ccdd..a4e8c09b004 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json index 01dea65ccdd..a4e8c09b004 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 4d4614ead25..f4a8884b58e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 4d4614ead25..f4a8884b58e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index 4a86f6aed52..fe0b8045a5c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index 4a86f6aed52..fe0b8045a5c 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json index cbcb519f6e0..a2779060068 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json index cbcb519f6e0..a2779060068 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 2ee495e24c4..120bb5afbb6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 2ee495e24c4..120bb5afbb6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index 77aacc6e0cf..a87c7d36d8e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index 77aacc6e0cf..a87c7d36d8e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json index 86d530522ec..718cfdabf0f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json index 86d530522ec..718cfdabf0f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json index efc5d6f6df2..f51e53f02f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json index efc5d6f6df2..f51e53f02f6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json index 69615f0648a..0d3f3ad02d5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json index 69615f0648a..0d3f3ad02d5 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json index d1bd1e71752..d4d500a397e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json index d1bd1e71752..d4d500a397e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json index 797faccce7f..12801537d2b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json index 797faccce7f..12801537d2b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json index 065d4a4c017..d6bbe96a7e0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json index 065d4a4c017..d6bbe96a7e0 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json index b625cc5d15b..bb7ccbf453b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json index b625cc5d15b..bb7ccbf453b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json index a5177812b6c..f654dbc3fac 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json index a5177812b6c..f654dbc3fac 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json index ce0125908e9..fc285030e8f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json index ce0125908e9..fc285030e8f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json index 32209f1565b..b5b1dfba62e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json index 32209f1565b..b5b1dfba62e 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json index 44c4ec3f004..a06e2f34d5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json index 44c4ec3f004..a06e2f34d5a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json index 44b644014a6..77243118702 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json index 44b644014a6..77243118702 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt index e6f53596e2e..56186a7c597 100644 --- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt +++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt @@ -1,2 +1,27 @@ Option mapRoot cannot be specified without specifying sourcemap option. Option sourceRoot cannot be specified without specifying sourcemap option. + + +!!! Option mapRoot cannot be specified without specifying sourcemap option. +!!! Option sourceRoot cannot be specified without specifying sourcemap option. +==== m1.ts (0 errors) ==== + var m1_a1 = 10; + class m1_c1 { + public m1_c1_p1: number; + } + + var m1_instance1 = new m1_c1(); + function m1_f1() { + return m1_instance1; + } +==== test.ts (0 errors) ==== + /// + var a1 = 10; + class c1 { + public p1: number; + } + + var instance1 = new c1(); + function f1() { + return instance1; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.json b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.json index 7d54f007b94..9aefd24fb37 100644 --- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.json +++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.json @@ -7,9 +7,9 @@ "mapRoot": "../mapFiles", "sourceRoot": "../src", "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt index e6f53596e2e..56186a7c597 100644 --- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt +++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt @@ -1,2 +1,27 @@ Option mapRoot cannot be specified without specifying sourcemap option. Option sourceRoot cannot be specified without specifying sourcemap option. + + +!!! Option mapRoot cannot be specified without specifying sourcemap option. +!!! Option sourceRoot cannot be specified without specifying sourcemap option. +==== m1.ts (0 errors) ==== + var m1_a1 = 10; + class m1_c1 { + public m1_c1_p1: number; + } + + var m1_instance1 = new m1_c1(); + function m1_f1() { + return m1_instance1; + } +==== test.ts (0 errors) ==== + /// + var a1 = 10; + class c1 { + public p1: number; + } + + var instance1 = new c1(); + function f1() { + return instance1; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.json b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.json index 7d54f007b94..9aefd24fb37 100644 --- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.json +++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.json @@ -7,9 +7,9 @@ "mapRoot": "../mapFiles", "sourceRoot": "../src", "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt index 842372fce5d..6b7bce4c280 100644 --- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt +++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt @@ -1 +1,25 @@ Option mapRoot cannot be specified without specifying sourcemap option. + + +!!! Option mapRoot cannot be specified without specifying sourcemap option. +==== m1.ts (0 errors) ==== + var m1_a1 = 10; + class m1_c1 { + public m1_c1_p1: number; + } + + var m1_instance1 = new m1_c1(); + function m1_f1() { + return m1_instance1; + } +==== test.ts (0 errors) ==== + /// + var a1 = 10; + class c1 { + public p1: number; + } + + var instance1 = new c1(); + function f1() { + return instance1; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.json b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.json index 1f92658ffb5..f9d00318f8c 100644 --- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.json +++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.json @@ -6,9 +6,9 @@ ], "mapRoot": "../mapFiles", "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt index 842372fce5d..6b7bce4c280 100644 --- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt +++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt @@ -1 +1,25 @@ Option mapRoot cannot be specified without specifying sourcemap option. + + +!!! Option mapRoot cannot be specified without specifying sourcemap option. +==== m1.ts (0 errors) ==== + var m1_a1 = 10; + class m1_c1 { + public m1_c1_p1: number; + } + + var m1_instance1 = new m1_c1(); + function m1_f1() { + return m1_instance1; + } +==== test.ts (0 errors) ==== + /// + var a1 = 10; + class c1 { + public p1: number; + } + + var instance1 = new c1(); + function f1() { + return instance1; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.json b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.json index 1f92658ffb5..f9d00318f8c 100644 --- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.json +++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.json @@ -6,9 +6,9 @@ ], "mapRoot": "../mapFiles", "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json index 1ab3e27d443..c6612841210 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json index 1ab3e27d443..c6612841210 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json index 9edcfc2c208..b225c4e408f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json index 9edcfc2c208..b225c4e408f 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json index 18ba8246750..f987aa49ffe 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json index 18ba8246750..f987aa49ffe 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index cb6ad2ef380..2bb23cdc610 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index cb6ad2ef380..2bb23cdc610 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json index 016119a336e..6ecdc26ccd4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json index 016119a336e..6ecdc26ccd4 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json index 41127aa8f69..9884550745c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json index 41127aa8f69..9884550745c 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json index 89d5a87ce13..e061982b32f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json index 89d5a87ce13..e061982b32f 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json index 7521dcd510c..f9f02dcf789 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json index 7521dcd510c..f9f02dcf789 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json index 13a30a3b681..db2995acf69 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json index 13a30a3b681..db2995acf69 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json index 03769a184ff..e636ce61f7e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json index 03769a184ff..e636ce61f7e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json index 8df66978336..2c7699ff0fa 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json index 8df66978336..2c7699ff0fa 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json index dc6fdfdfc03..a61a50a760d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json index dc6fdfdfc03..a61a50a760d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json index 763adf95468..05da8c15292 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json index 763adf95468..05da8c15292 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json index c4dca1e7405..5ea7aa80665 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json index c4dca1e7405..5ea7aa80665 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json index 2c2405592d5..0d16b53af66 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json index 2c2405592d5..0d16b53af66 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json index d3a8f66663c..8fb63eb43b0 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json index d3a8f66663c..8fb63eb43b0 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json index 90c096ac3a6..6f141f81511 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json index 90c096ac3a6..6f141f81511 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json index fc9cc534316..1f73a2a33d6 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json index fc9cc534316..1f73a2a33d6 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json index 918c5434e23..dcd18f3e946 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json index 918c5434e23..dcd18f3e946 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json index 6425dee144e..689739aedce 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json index 6425dee144e..689739aedce 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json index 71b35945283..bbd1c10f320 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json index 71b35945283..bbd1c10f320 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json index 5326a8fad1a..634d80d7ff0 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json index 5326a8fad1a..634d80d7ff0 100644 --- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json index 0e04095152b..edd08fbfe10 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json index 0e04095152b..edd08fbfe10 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json index 2f03d61fa83..0b2ea473029 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json index 2f03d61fa83..0b2ea473029 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json index 3d2bd9aa1b9..d4965ed4e74 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json index 3d2bd9aa1b9..d4965ed4e74 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json index c5e3dd755e0..2f2a4280abf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json index c5e3dd755e0..2f2a4280abf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 3ad99b40aaf..006720b1cc3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 3ad99b40aaf..006720b1cc3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json index d7dcede10a0..c36f3ade5e0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json index d7dcede10a0..c36f3ade5e0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 7e301b423dd..4741b9cf9e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -12,10 +12,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 7e301b423dd..4741b9cf9e1 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -12,10 +12,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json index 41d79f88b60..ec6313ac50c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json index 41d79f88b60..ec6313ac50c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index 42cc264023d..9a0d0258ca4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index 42cc264023d..9a0d0258ca4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 893995c55db..3ecf4bc4cc4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 893995c55db..3ecf4bc4cc4 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json index 5fad929ea27..d901eb0a790 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json index 5fad929ea27..d901eb0a790 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 4847f63c181..278bc2c86e5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 4847f63c181..278bc2c86e5 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 73905b3b715..2cfc9aebda2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 73905b3b715..2cfc9aebda2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json index b504cf1df62..fc4e8b7c9db 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json index b504cf1df62..fc4e8b7c9db 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index 177d546a171..a20ecf2d6c9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index 177d546a171..a20ecf2d6c9 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index f4086fd4cd1..cfa0ec5cb81 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index f4086fd4cd1..cfa0ec5cb81 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json index 5ce2eb8da34..ddfa8259401 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json index 5ce2eb8da34..ddfa8259401 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json index 76157de568b..6e6c3e73c03 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json index 76157de568b..6e6c3e73c03 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json index 5f507666f42..f6aa3055f76 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json index 5f507666f42..f6aa3055f76 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json index ef4cb8b6c8a..c85db0226a2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json index ef4cb8b6c8a..c85db0226a2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json index 939021ac4a9..ceda4546fce 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json index 939021ac4a9..ceda4546fce 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json index 860db910518..2bdff3a64be 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json index 860db910518..2bdff3a64be 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json index 7d817b3714d..2c66c2dc3a3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json index 7d817b3714d..2c66c2dc3a3 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json index 9cbaf6d7b18..4d7e0f659ef 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json index 9cbaf6d7b18..4d7e0f659ef 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json index 38afdad70d4..f68a658cc8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json index 38afdad70d4..f68a658cc8b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json index 3fc979b31bd..5f6d0ccd74b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json index 3fc979b31bd..5f6d0ccd74b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json index ff04d621a85..9dca1ba6d4b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json index ff04d621a85..9dca1ba6d4b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json index 5b32b0114ef..d3d7588f1ca 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json index 5b32b0114ef..d3d7588f1ca 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.json b/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.json index faad46b4cc6..d936636ac89 100644 --- a/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.json +++ b/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.json @@ -6,9 +6,9 @@ ], "runTest": true, "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.json b/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.json index faad46b4cc6..d936636ac89 100644 --- a/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.json +++ b/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.json @@ -6,9 +6,9 @@ ], "runTest": true, "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.json b/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.json index 3a9b5abf8b0..b0d5abf6c61 100644 --- a/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.json +++ b/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.json @@ -6,9 +6,9 @@ "b.ts" ], "resolvedInputFiles": [ + "lib.d.ts", "a.ts", - "b.ts", - "lib.d.ts" + "b.ts" ], "emittedFiles": [ "a.js", diff --git a/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.json b/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.json index 3a9b5abf8b0..b0d5abf6c61 100644 --- a/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.json +++ b/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.json @@ -6,9 +6,9 @@ "b.ts" ], "resolvedInputFiles": [ + "lib.d.ts", "a.ts", - "b.ts", - "lib.d.ts" + "b.ts" ], "emittedFiles": [ "a.js", diff --git a/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.json b/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.json index 3b537273106..bde7418c37b 100644 --- a/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.json +++ b/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.json @@ -6,9 +6,9 @@ "a.ts" ], "resolvedInputFiles": [ + "lib.d.ts", "b.ts", - "a.ts", - "lib.d.ts" + "a.ts" ], "emittedFiles": [ "b.js", diff --git a/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.json b/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.json index 3b537273106..bde7418c37b 100644 --- a/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.json +++ b/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.json @@ -6,9 +6,9 @@ "a.ts" ], "resolvedInputFiles": [ + "lib.d.ts", "b.ts", - "a.ts", - "lib.d.ts" + "a.ts" ], "emittedFiles": [ "b.js", diff --git a/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.json b/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.json index 5d311932ecd..7d575172af3 100644 --- a/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.json +++ b/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.json @@ -5,11 +5,11 @@ "root.ts" ], "resolvedInputFiles": [ - "root.ts", - "B/B.ts", + "lib.d.ts", "A/A.ts", "A/AA/AA.ts", - "lib.d.ts" + "B/B.ts", + "root.ts" ], "emittedFiles": [ "A/A.js", diff --git a/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.json b/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.json index 5d311932ecd..7d575172af3 100644 --- a/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.json +++ b/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.json @@ -5,11 +5,11 @@ "root.ts" ], "resolvedInputFiles": [ - "root.ts", - "B/B.ts", + "lib.d.ts", "A/A.ts", "A/AA/AA.ts", - "lib.d.ts" + "B/B.ts", + "root.ts" ], "emittedFiles": [ "A/A.js", diff --git a/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.json b/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.json index 8b49ec265f7..94acbbd4162 100644 --- a/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.json +++ b/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.json @@ -5,8 +5,8 @@ "consume.ts" ], "resolvedInputFiles": [ - "consume.ts", - "lib.d.ts" + "lib.d.ts", + "consume.ts" ], "emittedFiles": [ "consume.js" diff --git a/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.json b/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.json index 8b49ec265f7..94acbbd4162 100644 --- a/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.json +++ b/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.json @@ -5,8 +5,8 @@ "consume.ts" ], "resolvedInputFiles": [ - "consume.ts", - "lib.d.ts" + "lib.d.ts", + "consume.ts" ], "emittedFiles": [ "consume.js" diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt index 41a6db7bf0f..64f8d9be095 100644 --- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt @@ -1 +1,13 @@ test1.ts(2,2): Import declarations in an internal module cannot reference an external module. + + +==== test1.ts (1 errors) ==== + export module myModule { + import foo = require("test2"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + //console.log(foo.$); + } + + + \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.json b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.json index aa4aaa0bec7..7dfcd59ac7b 100644 --- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.json +++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.json @@ -5,8 +5,8 @@ "test1.ts" ], "resolvedInputFiles": [ - "test1.ts", - "lib.d.ts" + "lib.d.ts", + "test1.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt index 41a6db7bf0f..64f8d9be095 100644 --- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt @@ -1 +1,13 @@ test1.ts(2,2): Import declarations in an internal module cannot reference an external module. + + +==== test1.ts (1 errors) ==== + export module myModule { + import foo = require("test2"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + //console.log(foo.$); + } + + + \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.json b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.json index aa4aaa0bec7..7dfcd59ac7b 100644 --- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.json +++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.json @@ -5,8 +5,8 @@ "test1.ts" ], "resolvedInputFiles": [ - "test1.ts", - "lib.d.ts" + "lib.d.ts", + "test1.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt index 872145ccbc3..c293fecff5c 100644 --- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt @@ -1 +1,18 @@ test1.ts(3,2): Import declarations in an internal module cannot reference an external module. + + +==== test1.ts (1 errors) ==== + module myModule { + + import foo = require("test2"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + + //console.log(foo.$); + + var z = foo.Yo.y(); + + } + + export var x = 0; + \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.json b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.json index c5cf2740c07..f871a22eae3 100644 --- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.json +++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.json @@ -5,8 +5,8 @@ "test1.ts" ], "resolvedInputFiles": [ - "test1.ts", - "lib.d.ts" + "lib.d.ts", + "test1.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt index 872145ccbc3..c293fecff5c 100644 --- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt +++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt @@ -1 +1,18 @@ test1.ts(3,2): Import declarations in an internal module cannot reference an external module. + + +==== test1.ts (1 errors) ==== + module myModule { + + import foo = require("test2"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + + //console.log(foo.$); + + var z = foo.Yo.y(); + + } + + export var x = 0; + \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.json b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.json index c5cf2740c07..f871a22eae3 100644 --- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.json +++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.json @@ -5,8 +5,8 @@ "test1.ts" ], "resolvedInputFiles": [ - "test1.ts", - "lib.d.ts" + "lib.d.ts", + "test1.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.json b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.json index 2f8b981ff4d..3d4216fe6a6 100644 --- a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.json +++ b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.json @@ -5,10 +5,10 @@ "main.ts" ], "resolvedInputFiles": [ - "main.ts", + "lib.d.ts", "lib/classA.ts", "lib/classB.ts", - "lib.d.ts" + "main.ts" ], "emittedFiles": [ "lib/classA.js", diff --git a/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.json b/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.json index 2f8b981ff4d..3d4216fe6a6 100644 --- a/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.json +++ b/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.json @@ -5,10 +5,10 @@ "main.ts" ], "resolvedInputFiles": [ - "main.ts", + "lib.d.ts", "lib/classA.ts", "lib/classB.ts", - "lib.d.ts" + "main.ts" ], "emittedFiles": [ "lib/classA.js", diff --git a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt index 658a479621c..1bc7dd431f7 100644 --- a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt +++ b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt @@ -7,3 +7,21 @@ Cannot find global type 'Object'. Cannot find global type 'RegExp'. Cannot find global type 'String'. test.ts(3,8): Cannot find name 'Array'. + + +!!! Cannot find global type 'Array'. +!!! Cannot find global type 'Boolean'. +!!! Cannot find global type 'Function'. +!!! Cannot find global type 'IArguments'. +!!! Cannot find global type 'Number'. +!!! Cannot find global type 'Object'. +!!! Cannot find global type 'RegExp'. +!!! Cannot find global type 'String'. +==== test.ts (1 errors) ==== + /// + + var x: Array; + ~~~~~~~~~~~~~ +!!! Cannot find name 'Array'. + + \ No newline at end of file diff --git a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt index 658a479621c..1bc7dd431f7 100644 --- a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt +++ b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt @@ -7,3 +7,21 @@ Cannot find global type 'Object'. Cannot find global type 'RegExp'. Cannot find global type 'String'. test.ts(3,8): Cannot find name 'Array'. + + +!!! Cannot find global type 'Array'. +!!! Cannot find global type 'Boolean'. +!!! Cannot find global type 'Function'. +!!! Cannot find global type 'IArguments'. +!!! Cannot find global type 'Number'. +!!! Cannot find global type 'Object'. +!!! Cannot find global type 'RegExp'. +!!! Cannot find global type 'String'. +==== test.ts (1 errors) ==== + /// + + var x: Array; + ~~~~~~~~~~~~~ +!!! Cannot find name 'Array'. + + \ No newline at end of file diff --git a/tests/baselines/reference/project/nonRelative/amd/nonRelative.json b/tests/baselines/reference/project/nonRelative/amd/nonRelative.json index aea90910be5..5d04a85daca 100644 --- a/tests/baselines/reference/project/nonRelative/amd/nonRelative.json +++ b/tests/baselines/reference/project/nonRelative/amd/nonRelative.json @@ -6,12 +6,12 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib/foo/a.ts", "lib/foo/b.ts", + "lib/foo/a.ts", "lib/bar/a.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/nonRelative/node/nonRelative.json b/tests/baselines/reference/project/nonRelative/node/nonRelative.json index aea90910be5..5d04a85daca 100644 --- a/tests/baselines/reference/project/nonRelative/node/nonRelative.json +++ b/tests/baselines/reference/project/nonRelative/node/nonRelative.json @@ -6,12 +6,12 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib/foo/a.ts", "lib/foo/b.ts", + "lib/foo/a.ts", "lib/bar/a.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json index b817d2281d1..82eaf9fdb38 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json index b817d2281d1..82eaf9fdb38 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json index bc58b333904..9fc077c55ca 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json index bc58b333904..9fc077c55ca 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json index fc1aebc2df1..975fcf59ca9 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json index fc1aebc2df1..975fcf59ca9 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 704395bd09b..2b0a20e739a 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js", diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 704395bd09b..2b0a20e739a 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json index 372b84b2bf8..2cbfa1a6c6e 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json index 372b84b2bf8..2cbfa1a6c6e 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json index 10dcd3db784..a65215b0814 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json index 10dcd3db784..a65215b0814 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json index e536625c43c..66eced5cc01 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json index e536625c43c..66eced5cc01 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json index 44bdd308933..01945c9b970 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js", diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json index 44bdd308933..01945c9b970 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js", diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json index 8e5e21179ae..d285d2f0952 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js", diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json index 8e5e21179ae..d285d2f0952 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js", diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json index d6059283e95..166aaa982e7 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js", diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json index d6059283e95..166aaa982e7 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js", diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json index cd7370bcf13..af995f80965 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json index cd7370bcf13..af995f80965 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json index 5c5da20e23f..2688aeab193 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json index 5c5da20e23f..2688aeab193 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json index ddb82ba580c..f11b95edde9 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json index ddb82ba580c..f11b95edde9 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json index a538cbb3306..2b3760733c7 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json b/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json index a538cbb3306..2b3760733c7 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json @@ -7,10 +7,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json index dd1afacb02f..9e77628b368 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js", diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json index dd1afacb02f..9e77628b368 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js", diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json index 1031549074d..d9e109518b1 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json index 1031549074d..d9e109518b1 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json b/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json index 4950859f404..0e35df542d2 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js", diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json b/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json index 4950859f404..0e35df542d2 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js", diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json index 01dd9a3578d..26795d9489e 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js", diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json index 01dd9a3578d..26795d9489e 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js", diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json index d11bfbcf860..c5db5d7895a 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json index d11bfbcf860..c5db5d7895a 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.json b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.json index 1ac2dcd1c8d..acd419a4280 100644 --- a/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.json @@ -7,8 +7,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.json b/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.json index 1ac2dcd1c8d..acd419a4280 100644 --- a/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.json @@ -7,8 +7,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js", diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.json index 10436ca502f..249967847a3 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.json @@ -8,8 +8,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js", diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.json index 10436ca502f..249967847a3 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.json @@ -8,8 +8,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js", diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json index 02693625187..3810a065492 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json @@ -8,8 +8,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json index 02693625187..3810a065492 100644 --- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json @@ -8,8 +8,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json index 5dc96cfb1ce..33dae01c2e5 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json b/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json index 5dc96cfb1ce..33dae01c2e5 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js", diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json index c827dc4a291..f1deedfb0e5 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js", diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json index c827dc4a291..f1deedfb0e5 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js", diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json index c9dde6e9ec2..f508fb2e3bf 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json index c9dde6e9ec2..f508fb2e3bf 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js", diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt index ff86b0ebeb2..864029e4118 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt @@ -1,2 +1,48 @@ testGlo.ts(2,5): Import declarations in an internal module cannot reference an external module. testGlo.ts(21,5): Import declarations in an internal module cannot reference an external module. + + +==== testGlo.ts (2 errors) ==== + module m2 { + export import mExported = require("mExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + + class class2 extends mExported.me.class1 { + } + + import mNonExported = require("mNonExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.json index 446a05ed7a7..b706c856acf 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.json @@ -6,8 +6,8 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "testGlo.ts", - "lib.d.ts" + "lib.d.ts", + "testGlo.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt index ff86b0ebeb2..864029e4118 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt @@ -1,2 +1,48 @@ testGlo.ts(2,5): Import declarations in an internal module cannot reference an external module. testGlo.ts(21,5): Import declarations in an internal module cannot reference an external module. + + +==== testGlo.ts (2 errors) ==== + module m2 { + export import mExported = require("mExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + + class class2 extends mExported.me.class1 { + } + + import mNonExported = require("mNonExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.json index 446a05ed7a7..b706c856acf 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.json @@ -6,8 +6,8 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "testGlo.ts", - "lib.d.ts" + "lib.d.ts", + "testGlo.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt index 373aaa946e9..a8a97aa9b18 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt @@ -1,2 +1,51 @@ test.ts(5,5): Import declarations in an internal module cannot reference an external module. test.ts(24,5): Import declarations in an internal module cannot reference an external module. + + +==== test.ts (2 errors) ==== + export module m1 { + } + + module m2 { + export import mExported = require("mExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + + class class2 extends mExported.me.class1 { + } + + import mNonExported = require("mNonExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json index a59350e4f3b..a82fe1088ef 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json @@ -5,8 +5,8 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt index 373aaa946e9..a8a97aa9b18 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt @@ -1,2 +1,51 @@ test.ts(5,5): Import declarations in an internal module cannot reference an external module. test.ts(24,5): Import declarations in an internal module cannot reference an external module. + + +==== test.ts (2 errors) ==== + export module m1 { + } + + module m2 { + export import mExported = require("mExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + + class class2 extends mExported.me.class1 { + } + + import mNonExported = require("mNonExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json index a59350e4f3b..a82fe1088ef 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.json @@ -5,8 +5,8 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt index 5a5d1421855..6e14da66ec5 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt @@ -1,2 +1,91 @@ test.ts(2,5): Import declarations in an internal module cannot reference an external module. test.ts(42,5): Import declarations in an internal module cannot reference an external module. + + +==== test.ts (2 errors) ==== + export module m2 { + export import mExported = require("mExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + + module Internal_M1 { + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + class class2 extends mExported.me.class1 { + } + } + + export module Internal_M2 { + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + class class2 extends mExported.me.class1 { + } + } + + import mNonExported = require("mNonExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + module Internal_M3 { + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } + + export module Internal_M4 { + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.json index 6b445d2d381..7da6f764326 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.json @@ -5,8 +5,8 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt index 5a5d1421855..6e14da66ec5 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt @@ -1,2 +1,91 @@ test.ts(2,5): Import declarations in an internal module cannot reference an external module. test.ts(42,5): Import declarations in an internal module cannot reference an external module. + + +==== test.ts (2 errors) ==== + export module m2 { + export import mExported = require("mExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + + module Internal_M1 { + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + class class2 extends mExported.me.class1 { + } + } + + export module Internal_M2 { + export var c1 = new mExported.me.class1; + export function f1() { + return new mExported.me.class1(); + } + export var x1 = mExported.me.x; + + export class class1 extends mExported.me.class1 { + } + + var c2 = new mExported.me.class1; + function f2() { + return new mExported.me.class1(); + } + var x2 = mExported.me.x; + class class2 extends mExported.me.class1 { + } + } + + import mNonExported = require("mNonExported"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! Import declarations in an internal module cannot reference an external module. + module Internal_M3 { + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } + + export module Internal_M4 { + export var c3 = new mNonExported.mne.class1; + export function f3() { + return new mNonExported.mne.class1(); + } + export var x3 = mNonExported.mne.x; + + export class class3 extends mNonExported.mne.class1 { + } + + var c4 = new mNonExported.mne.class1; + function f4() { + return new mNonExported.mne.class1(); + } + var x4 = mNonExported.mne.x; + + class class4 extends mNonExported.mne.class1 { + } + } + } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.json index 6b445d2d381..7da6f764326 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.json @@ -5,8 +5,8 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.json index 473025c416d..5219f373543 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.json @@ -5,10 +5,10 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "mExported.ts", "mNonExported.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "mExported.js", diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.json b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.json index 473025c416d..5219f373543 100644 --- a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.json +++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.json @@ -5,10 +5,10 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "mExported.ts", "mNonExported.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "mExported.js", diff --git a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.json b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.json index cc52060ed50..10b06c58377 100644 --- a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.json +++ b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.json @@ -5,10 +5,10 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", - "externalModule.ts", + "lib.d.ts", "indirectExternalModule.ts", - "lib.d.ts" + "externalModule.ts", + "test.ts" ], "emittedFiles": [ "indirectExternalModule.js", diff --git a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.json b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.json index cc52060ed50..10b06c58377 100644 --- a/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.json +++ b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.json @@ -5,10 +5,10 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", - "externalModule.ts", + "lib.d.ts", "indirectExternalModule.ts", - "lib.d.ts" + "externalModule.ts", + "test.ts" ], "emittedFiles": [ "indirectExternalModule.js", diff --git a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json index f74f4d66816..189c246f7bf 100644 --- a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json +++ b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json @@ -8,9 +8,9 @@ "out": "out.js", "baselineCheck": true, "resolvedInputFiles": [ + "lib.d.ts", "globalThisCapture.ts", - "__extends.ts", - "lib.d.ts" + "__extends.ts" ], "emittedFiles": [ "out.js" diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json index f74f4d66816..189c246f7bf 100644 --- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json +++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json @@ -8,9 +8,9 @@ "out": "out.js", "baselineCheck": true, "resolvedInputFiles": [ + "lib.d.ts", "globalThisCapture.ts", - "__extends.ts", - "lib.d.ts" + "__extends.ts" ], "emittedFiles": [ "out.js" diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.dts.errors.txt b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.dts.errors.txt new file mode 100644 index 00000000000..a49a0810d2f --- /dev/null +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.dts.errors.txt @@ -0,0 +1,17 @@ +m'ain.d.ts(1,1): File 'li.ts' not found. + + +==== li'b/class'A.d.ts (0 errors) ==== + declare module test { + class ClassA { + method(): void; + } + } + +==== m'ain.d.ts (1 errors) ==== + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! File 'li.ts' not found. + declare class ClassC extends test.ClassA { + } + \ No newline at end of file diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.json b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.json index 333ef78ad74..b18b813804d 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.json +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "m'ain.ts", + "lib.d.ts", "li'b/class'A.ts", - "lib.d.ts" + "m'ain.ts" ], "emittedFiles": [ "li'b/class'A.js", diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.dts.errors.txt b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.dts.errors.txt new file mode 100644 index 00000000000..a49a0810d2f --- /dev/null +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.dts.errors.txt @@ -0,0 +1,17 @@ +m'ain.d.ts(1,1): File 'li.ts' not found. + + +==== li'b/class'A.d.ts (0 errors) ==== + declare module test { + class ClassA { + method(): void; + } + } + +==== m'ain.d.ts (1 errors) ==== + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! File 'li.ts' not found. + declare class ClassC extends test.ClassA { + } + \ No newline at end of file diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.json b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.json index 333ef78ad74..b18b813804d 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.json +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.json @@ -7,9 +7,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "m'ain.ts", + "lib.d.ts", "li'b/class'A.ts", - "lib.d.ts" + "m'ain.ts" ], "emittedFiles": [ "li'b/class'A.js", diff --git a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json index 3bdf1f68e6d..975d18eba6b 100644 --- a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json +++ b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.json @@ -5,9 +5,9 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "lib.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "lib.js", diff --git a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json index 3bdf1f68e6d..975d18eba6b 100644 --- a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json +++ b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.json @@ -5,9 +5,9 @@ "test.ts" ], "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "lib.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "lib.js", diff --git a/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.json b/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.json index 7a232d5246e..316374bad4e 100644 --- a/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.json +++ b/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.json @@ -6,9 +6,9 @@ ], "runTest": true, "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.json b/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.json index 7a232d5246e..316374bad4e 100644 --- a/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.json +++ b/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.json @@ -6,9 +6,9 @@ ], "runTest": true, "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.json b/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.json index b1b6f19b6c2..5352f1b4f00 100644 --- a/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.json +++ b/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.json @@ -5,9 +5,9 @@ "consume.ts" ], "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.d.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "consume.js" diff --git a/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.json b/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.json index b1b6f19b6c2..5352f1b4f00 100644 --- a/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.json +++ b/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.json @@ -5,9 +5,9 @@ "consume.ts" ], "resolvedInputFiles": [ - "consume.ts", + "lib.d.ts", "decl.d.ts", - "lib.d.ts" + "consume.ts" ], "emittedFiles": [ "consume.js" diff --git a/tests/baselines/reference/project/relativeNested/amd/relativeNested.json b/tests/baselines/reference/project/relativeNested/amd/relativeNested.json index c1cf91e5060..9211df07763 100644 --- a/tests/baselines/reference/project/relativeNested/amd/relativeNested.json +++ b/tests/baselines/reference/project/relativeNested/amd/relativeNested.json @@ -6,10 +6,10 @@ ], "runTest": true, "resolvedInputFiles": [ - "app.ts", - "main/consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "main/consume.ts", + "app.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/relativeNested/node/relativeNested.json b/tests/baselines/reference/project/relativeNested/node/relativeNested.json index c1cf91e5060..9211df07763 100644 --- a/tests/baselines/reference/project/relativeNested/node/relativeNested.json +++ b/tests/baselines/reference/project/relativeNested/node/relativeNested.json @@ -6,10 +6,10 @@ ], "runTest": true, "resolvedInputFiles": [ - "app.ts", - "main/consume.ts", + "lib.d.ts", "decl.ts", - "lib.d.ts" + "main/consume.ts", + "app.ts" ], "emittedFiles": [ "decl.js", diff --git a/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.json b/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.json index 8dfaf3a3092..465430a8390 100644 --- a/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.json +++ b/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.json @@ -5,9 +5,9 @@ "main/consume.ts" ], "resolvedInputFiles": [ - "main/consume.ts", + "lib.d.ts", "decl.d.ts", - "lib.d.ts" + "main/consume.ts" ], "emittedFiles": [ "main/consume.js" diff --git a/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.json b/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.json index 8dfaf3a3092..465430a8390 100644 --- a/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.json +++ b/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.json @@ -5,9 +5,9 @@ "main/consume.ts" ], "resolvedInputFiles": [ - "main/consume.ts", + "lib.d.ts", "decl.d.ts", - "lib.d.ts" + "main/consume.ts" ], "emittedFiles": [ "main/consume.js" diff --git a/tests/baselines/reference/project/relativePaths/amd/relativePaths.json b/tests/baselines/reference/project/relativePaths/amd/relativePaths.json index a4036a2163d..0f1f4d5b69e 100644 --- a/tests/baselines/reference/project/relativePaths/amd/relativePaths.json +++ b/tests/baselines/reference/project/relativePaths/amd/relativePaths.json @@ -5,10 +5,10 @@ "app.ts" ], "resolvedInputFiles": [ - "app.ts", - "A/a.ts", + "lib.d.ts", "A/b.ts", - "lib.d.ts" + "A/a.ts", + "app.ts" ], "emittedFiles": [ "A/b.js", diff --git a/tests/baselines/reference/project/relativePaths/node/relativePaths.json b/tests/baselines/reference/project/relativePaths/node/relativePaths.json index a4036a2163d..0f1f4d5b69e 100644 --- a/tests/baselines/reference/project/relativePaths/node/relativePaths.json +++ b/tests/baselines/reference/project/relativePaths/node/relativePaths.json @@ -5,10 +5,10 @@ "app.ts" ], "resolvedInputFiles": [ - "app.ts", - "A/a.ts", + "lib.d.ts", "A/b.ts", - "lib.d.ts" + "A/a.ts", + "app.ts" ], "emittedFiles": [ "A/b.js", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json index a987e68b2ba..43059eaa5c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json index a987e68b2ba..43059eaa5c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index 19af8ccca67..6d9cf2998a8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index 19af8ccca67..6d9cf2998a8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index d4a467aff20..09c6092f164 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index d4a467aff20..09c6092f164 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 996a50a99f3..6fb17fa06b8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -12,10 +12,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 996a50a99f3..6fb17fa06b8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -12,10 +12,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json index 0ff48f4e065..9e98d46666f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json index 0ff48f4e065..9e98d46666f 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index 559c5886be2..d96a3e5f832 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index 559c5886be2..d96a3e5f832 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 825fa0246a4..b3e80123c04 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 825fa0246a4..b3e80123c04 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json index a364062ade4..6e1f133ef64 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json index a364062ade4..6e1f133ef64 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index ae5126b66e2..c15e91877ae 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index ae5126b66e2..c15e91877ae 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 0901591ee71..e2621b2fa52 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index 0901591ee71..e2621b2fa52 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json index 01c4b70cebd..b65bed61979 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json index 01c4b70cebd..b65bed61979 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index 84000af31b4..a8662e09bf6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index 84000af31b4..a8662e09bf6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index f568adfaacf..a43e0f69172 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index f568adfaacf..a43e0f69172 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json index 4f0f4e7e3e5..b84ccc2bc23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json index 4f0f4e7e3e5..b84ccc2bc23 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json index e22d59562c8..43d3db291ff 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json index e22d59562c8..43d3db291ff 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json index d6823e0eba8..6bd6db427c4 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json index d6823e0eba8..6bd6db427c4 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json index 2d211a7180c..f57c8110827 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json index 2d211a7180c..f57c8110827 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json index 4a5d8436f01..02981610092 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json index 4a5d8436f01..02981610092 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json index fd9f5e5446c..74add9e8d7b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json index fd9f5e5446c..74add9e8d7b 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json index 3d063f65272..772190b4851 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json index 3d063f65272..772190b4851 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json index 95a16bbc6f3..8a6eb54b789 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json index 95a16bbc6f3..8a6eb54b789 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json index d0c60f2d1ab..ec9d13d68de 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json index d0c60f2d1ab..ec9d13d68de 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json @@ -11,8 +11,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json index b9982d55390..03f06090742 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json index b9982d55390..03f06090742 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 03814b982db..08bdabb1c6e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 03814b982db..08bdabb1c6e 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json index 4563bdc2fb3..a6c034775ce 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json index 4563bdc2fb3..a6c034775ce 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json @@ -11,9 +11,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json index 7ed2fefc624..0e73f218462 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json index 7ed2fefc624..0e73f218462 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 0b841e3e450..99815d52661 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 0b841e3e450..99815d52661 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json index 889d00b36ca..82ef1c7d882 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json index 889d00b36ca..82ef1c7d882 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index e26e9887a57..d5f4fd9c654 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index e26e9887a57..d5f4fd9c654 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json index 46072879874..2acbea1cc8d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json index 46072879874..2acbea1cc8d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 4637b89f1c0..6603e36c281 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 4637b89f1c0..6603e36c281 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index b2a57c0e316..69a577baffd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index b2a57c0e316..69a577baffd 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json index 233e03c02ad..f28c784480f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json index 233e03c02ad..f28c784480f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 3fabf096150..77fa77f5fb0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 3fabf096150..77fa77f5fb0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index c867f08a27b..a4a6698d3ca 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index c867f08a27b..a4a6698d3ca 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json index 841f8e17deb..8a3035f3632 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json index 841f8e17deb..8a3035f3632 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 83035951973..9f10fc5e7e0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 83035951973..9f10fc5e7e0 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 7336b1493f3..71896f202b2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 7336b1493f3..71896f202b2 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json index 41314d25efe..e7dfb0beff3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json index 41314d25efe..e7dfb0beff3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json index 56e89b292b3..bfb74003401 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json index 56e89b292b3..bfb74003401 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json index 4251bd655c5..1f2e577b0b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json index 4251bd655c5..1f2e577b0b3 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json index fc56bd98ee5..4d33e85e2ba 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json index fc56bd98ee5..4d33e85e2ba 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json index a10f853c315..bf86309b59a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json index a10f853c315..bf86309b59a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json index 270b56acab5..4b371bf5924 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json index 270b56acab5..4b371bf5924 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json index 828e6492094..06a55d4a7cc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json index 828e6492094..06a55d4a7cc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json index 5df4278d9d7..d87b6b22829 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json index 5df4278d9d7..d87b6b22829 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json index 9869ad50de5..c80db3f739c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json index 9869ad50de5..c80db3f739c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json index ffed58e93e1..ff189067e67 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json index ffed58e93e1..ff189067e67 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json index 4f273495fc1..8896f911a99 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json index 4f273495fc1..8896f911a99 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json index d231d7bd8d4..ddcfbd2ff9c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json index d231d7bd8d4..ddcfbd2ff9c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt index 9fc5aa1bcb1..3816144f19c 100644 --- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt +++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt @@ -1 +1,25 @@ Option sourceRoot cannot be specified without specifying sourcemap option. + + +!!! Option sourceRoot cannot be specified without specifying sourcemap option. +==== m1.ts (0 errors) ==== + var m1_a1 = 10; + class m1_c1 { + public m1_c1_p1: number; + } + + var m1_instance1 = new m1_c1(); + function m1_f1() { + return m1_instance1; + } +==== test.ts (0 errors) ==== + /// + var a1 = 10; + class c1 { + public p1: number; + } + + var instance1 = new c1(); + function f1() { + return instance1; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.json b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.json index 427c074ca26..7cf066f15c4 100644 --- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.json +++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.json @@ -6,9 +6,9 @@ ], "sourceRoot": "../src", "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt index 9fc5aa1bcb1..3816144f19c 100644 --- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt +++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt @@ -1 +1,25 @@ Option sourceRoot cannot be specified without specifying sourcemap option. + + +!!! Option sourceRoot cannot be specified without specifying sourcemap option. +==== m1.ts (0 errors) ==== + var m1_a1 = 10; + class m1_c1 { + public m1_c1_p1: number; + } + + var m1_instance1 = new m1_c1(); + function m1_f1() { + return m1_instance1; + } +==== test.ts (0 errors) ==== + /// + var a1 = 10; + class c1 { + public p1: number; + } + + var instance1 = new c1(); + function f1() { + return instance1; + } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.json b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.json index 427c074ca26..7cf066f15c4 100644 --- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.json +++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.json @@ -6,9 +6,9 @@ ], "sourceRoot": "../src", "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.json index b7f3a98e324..570d129ce2e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json index b7f3a98e324..570d129ce2e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json index 2dd919e2e64..3d39d4b9bf2 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json index 2dd919e2e64..3d39d4b9bf2 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json index 6b15ed58078..3270fe610aa 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json index 6b15ed58078..3270fe610aa 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4c044f4b10c..3a260af84a0 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4c044f4b10c..3a260af84a0 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json index 4a10056ed63..9dcc6a90da3 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json index 4a10056ed63..9dcc6a90da3 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json index 3f29686a3ac..b63faddd4c7 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json index 3f29686a3ac..b63faddd4c7 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json index 567b7a1e786..3d2df95ad66 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json index 567b7a1e786..3d2df95ad66 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json index bd688f16eb6..348605adb33 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json index bd688f16eb6..348605adb33 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json index ec8c618947e..2316c35bde9 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json index ec8c618947e..2316c35bde9 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json index 9982ec93360..9ff29662d40 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json index 9982ec93360..9ff29662d40 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json index a04d23e9d2d..49ebfda1567 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json index a04d23e9d2d..49ebfda1567 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json index c987c067175..391942643f5 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json index c987c067175..391942643f5 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json index c765d8a704d..9d200ef685d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json index c765d8a704d..9d200ef685d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json index 1b32429f5b5..3d4f5d74f44 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json index 1b32429f5b5..3d4f5d74f44 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json @@ -8,10 +8,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json index fea0549613f..1882477e518 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json index fea0549613f..1882477e518 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json index 67b351dbf5c..83c96776d4e 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json index 67b351dbf5c..83c96776d4e 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json index 0d7ae28a899..ad8ebd06370 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json index 0d7ae28a899..ad8ebd06370 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json index c6ab0f21da2..8f78a5682d6 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json index c6ab0f21da2..8f78a5682d6 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json index 3bd0b02dac3..43e39c57faf 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json index 3bd0b02dac3..43e39c57faf 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.json b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.json index 611577b1366..47617ac2166 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.json @@ -8,8 +8,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.json b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.json index 611577b1366..47617ac2166 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.json @@ -8,8 +8,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.json index 97fd606dd6b..d541a333f81 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.json index 97fd606dd6b..d541a333f81 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json index d032c047394..2f14386bc5a 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json index d032c047394..2f14386bc5a 100644 --- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json index ca46c684c68..2884f385bb5 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json index ca46c684c68..2884f385bb5 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json @@ -8,9 +8,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json index 556e78b25ae..632d7118904 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json index 556e78b25ae..632d7118904 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json index ca647679879..13ef95f1052 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json index ca647679879..13ef95f1052 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json index 535efaaf338..ef5cb2df633 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json index 535efaaf338..ef5cb2df633 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 3a4a85dfc1d..a46fe845710 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 3a4a85dfc1d..a46fe845710 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json index 38a554a4f16..50a4518a1b0 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json index 38a554a4f16..50a4518a1b0 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index de2bb0c94b8..b6ef6b5bd51 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index de2bb0c94b8..b6ef6b5bd51 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -11,10 +11,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json index ea1d9fb4616..c2594c0093c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json index ea1d9fb4616..c2594c0093c 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index da0435180fa..d2c6956bf80 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index da0435180fa..d2c6956bf80 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index 53b5c2cb219..cc2a6c9b1aa 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index 53b5c2cb219..cc2a6c9b1aa 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_module_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts index 6a5ff1574cf..4afd4e69f2d 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,5 @@ +import m1 = require("ref/m1"); +import m2 = require("../outputdir_module_multifolder_ref/m2"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json index 84ed0deab9e..4a7cc668a6a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json index 84ed0deab9e..4a7cc668a6a 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 4ed540f416f..6766f67eab0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 4ed540f416f..6766f67eab0 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json index 01d06957298..5419c5a8225 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json index 01d06957298..5419c5a8225 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts index 8535f388ae7..250d2615a79 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json index 2dd5114c63e..d7f99610bab 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json index 2dd5114c63e..d7f99610bab 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index be3e6d5c38c..1e722cb852e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index be3e6d5c38c..1e722cb852e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index 4dda0858377..d80dacb3444 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index 4dda0858377..d80dacb3444 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts index 8535f388ae7..a61d8541048 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -1,3 +1,4 @@ +import m1 = require("ref/m1"); export declare var a1: number; export declare class c1 { p1: number; diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json index 8df6436f2d6..a68d507bdf3 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json index 8df6436f2d6..a68d507bdf3 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json @@ -9,10 +9,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json index 07f5c5548c5..1641625569c 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json index 07f5c5548c5..1641625569c 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json index 314069f83fb..085ef5e8f19 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json index 314069f83fb..085ef5e8f19 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json @@ -10,10 +10,10 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", "../outputdir_multifolder_ref/m2.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json index 38dc6f36854..9df1fd3922e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json index 38dc6f36854..9df1fd3922e 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json index 4dec5466b57..1a472ca17ee 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json index 4dec5466b57..1a472ca17ee 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json index ccc633991ca..98a2dea2484 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json index ccc633991ca..98a2dea2484 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json index c6ffec7a0de..dbef889efec 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json index c6ffec7a0de..dbef889efec 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.json @@ -9,8 +9,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json index 8d96cfb6729..afc78006729 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json index 8d96cfb6729..afc78006729 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "outdir/simple/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json index 30ed2151ff1..53e86654ad1 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json index 30ed2151ff1..53e86654ad1 100644 --- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json @@ -10,8 +10,8 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", - "lib.d.ts" + "lib.d.ts", + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json index aedbf848742..77912e79790 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json index aedbf848742..77912e79790 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json @@ -9,9 +9,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json index 1ac6f60f7d5..362af3ded05 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json index 1ac6f60f7d5..362af3ded05 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "outdir/simple/ref/m1.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json index 29d344a4801..7c4bb20e942 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json index 29d344a4801..7c4bb20e942 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json @@ -10,9 +10,9 @@ "declaration": true, "baselineCheck": true, "resolvedInputFiles": [ - "test.ts", + "lib.d.ts", "ref/m1.ts", - "lib.d.ts" + "test.ts" ], "emittedFiles": [ "bin/test.js.map", diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json index 5181dc783c0..f59122e9b21 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.json @@ -6,10 +6,10 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "commands.ts", + "lib.d.ts", "fs.ts", "server.ts", - "lib.d.ts" + "commands.ts" ], "emittedFiles": [ "fs.js", diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json index 5181dc783c0..f59122e9b21 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.json @@ -6,10 +6,10 @@ ], "baselineCheck": true, "resolvedInputFiles": [ - "commands.ts", + "lib.d.ts", "fs.ts", "server.ts", - "lib.d.ts" + "commands.ts" ], "emittedFiles": [ "fs.js", diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt index 3883050bdca..147a949d968 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt @@ -1,2 +1,12 @@ main.ts(2,1): File 'nonExistingFile1.ts' not found. main.ts(3,1): File 'nonExistingFile2.ts' not found. + + +==== main.ts (2 errors) ==== + /// + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! File 'nonExistingFile1.ts' not found. + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! File 'nonExistingFile2.ts' not found. \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.json b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.json index 51547244570..5fb6100024f 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.json +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.json @@ -5,8 +5,8 @@ "main.ts" ], "resolvedInputFiles": [ - "main.ts", - "lib.d.ts" + "lib.d.ts", + "main.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt index 3883050bdca..147a949d968 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt @@ -1,2 +1,12 @@ main.ts(2,1): File 'nonExistingFile1.ts' not found. main.ts(3,1): File 'nonExistingFile2.ts' not found. + + +==== main.ts (2 errors) ==== + /// + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! File 'nonExistingFile1.ts' not found. + /// + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! File 'nonExistingFile2.ts' not found. \ No newline at end of file diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.json b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.json index 51547244570..5fb6100024f 100644 --- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.json +++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.json @@ -5,8 +5,8 @@ "main.ts" ], "resolvedInputFiles": [ - "main.ts", - "lib.d.ts" + "lib.d.ts", + "main.ts" ], "emittedFiles": [] } \ No newline at end of file diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js index 1faff01d197..54885f09e36 100644 --- a/tests/baselines/reference/unusedImportDeclaration.js +++ b/tests/baselines/reference/unusedImportDeclaration.js @@ -27,3 +27,11 @@ var thingy = { me: "A" }; foo("IN " + thingy.me + "!"); + + +//// [unusedImportDeclaration_testerB.d.ts] +declare class TesterB { + me: string; +} +export = TesterB; +//// [unusedImportDeclaration_testerA.d.ts] diff --git a/tests/cases/compiler/aliasInaccessibleModule.ts b/tests/cases/compiler/aliasInaccessibleModule.ts index f1037fb7652..91f36d9d118 100644 --- a/tests/cases/compiler/aliasInaccessibleModule.ts +++ b/tests/cases/compiler/aliasInaccessibleModule.ts @@ -1,3 +1,4 @@ +// @declaration: true module M { module N { } diff --git a/tests/cases/compiler/aliasInaccessibleModule2.ts b/tests/cases/compiler/aliasInaccessibleModule2.ts index 7932d775d27..d970db79538 100644 --- a/tests/cases/compiler/aliasInaccessibleModule2.ts +++ b/tests/cases/compiler/aliasInaccessibleModule2.ts @@ -1,3 +1,4 @@ +// @declaration: true module M { module N { class C { diff --git a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts index fc86451358a..2aeddbad947 100644 --- a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts +++ b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts @@ -1,4 +1,5 @@ //@module: commonjs +// @target: ES5 // @Filename: aliasUsage1_backbone.ts export class Model { public someData: string; diff --git a/tests/cases/compiler/cyclicModuleImport.ts b/tests/cases/compiler/cyclicModuleImport.ts index 88cb378c9c9..1a17860805e 100644 --- a/tests/cases/compiler/cyclicModuleImport.ts +++ b/tests/cases/compiler/cyclicModuleImport.ts @@ -1,3 +1,4 @@ +// @declaration: true declare module "SubModule" { import MainModule = require('MainModule'); class SubModule { diff --git a/tests/cases/compiler/declFileImportChainInExportAssignment.ts b/tests/cases/compiler/declFileImportChainInExportAssignment.ts new file mode 100644 index 00000000000..da18e81a6c6 --- /dev/null +++ b/tests/cases/compiler/declFileImportChainInExportAssignment.ts @@ -0,0 +1,11 @@ +// @declaration: true +// @module: commonjs +module m { + export module c { + export class c { + } + } +} +import a = m.c; +import b = a; +export = b; \ No newline at end of file diff --git a/tests/cases/compiler/declarationEmit_nameConflicts.ts b/tests/cases/compiler/declarationEmit_nameConflicts.ts index 49218d2ef1e..66eb732ddae 100644 --- a/tests/cases/compiler/declarationEmit_nameConflicts.ts +++ b/tests/cases/compiler/declarationEmit_nameConflicts.ts @@ -28,7 +28,6 @@ export module M.P { export interface I { } } export import im = M.P.f; - // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope export var a = M.a; // emitted incorrectly as typeof f export var b = M.b; // ok export var c = M.c; // ok diff --git a/tests/cases/compiler/declarationEmit_nameConflicts2.ts b/tests/cases/compiler/declarationEmit_nameConflicts2.ts index d7dd5134e96..f0112fa9501 100644 --- a/tests/cases/compiler/declarationEmit_nameConflicts2.ts +++ b/tests/cases/compiler/declarationEmit_nameConflicts2.ts @@ -9,7 +9,6 @@ module X.Y.base { } module X.Y.base.Z { - // Bug 887180 export var f = X.Y.base.f; // Should be base.f export var C = X.Y.base.C; // Should be base.C export var M = X.Y.base.M; // Should be base.M diff --git a/tests/cases/compiler/declarationEmit_nameConflicts3.ts b/tests/cases/compiler/declarationEmit_nameConflicts3.ts index b854841b4b4..6edc1056fa2 100644 --- a/tests/cases/compiler/declarationEmit_nameConflicts3.ts +++ b/tests/cases/compiler/declarationEmit_nameConflicts3.ts @@ -21,7 +21,6 @@ module M.P { export enum D { f } - // Bug 887180 export var v: M.D; // ok export var w = M.D.f; // error, should be typeof M.D.f export var x = M.C.f; // error, should be typeof M.C.f diff --git a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts index 87cdca3fd41..50fc2484a4a 100644 --- a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts +++ b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts @@ -1,6 +1,5 @@ // @declaration: true // @module: commonjs -// Bug 887180 export module C { export interface I { } } export import v = C; export module M { diff --git a/tests/cases/compiler/importDecl.ts b/tests/cases/compiler/importDecl.ts index 9efbc50f0b2..c28b332eb43 100644 --- a/tests/cases/compiler/importDecl.ts +++ b/tests/cases/compiler/importDecl.ts @@ -55,7 +55,6 @@ export module m1 { //Emit global only usage import glo_m4 = require("importDecl_require1"); -export var useGlo_m4_x4 = glo_m4.x; export var useGlo_m4_d4 = glo_m4.d; export var useGlo_m4_f4 = glo_m4.foo(); diff --git a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts index a906259715c..23192257125 100644 --- a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts +++ b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts @@ -1,3 +1,4 @@ +// @declaration: true module a.b.c { export var d; } diff --git a/tests/cases/compiler/moduleSymbolMerging.ts b/tests/cases/compiler/moduleSymbolMerging.ts new file mode 100644 index 00000000000..03df2c5e596 --- /dev/null +++ b/tests/cases/compiler/moduleSymbolMerging.ts @@ -0,0 +1,12 @@ +// @declaration: true + +// @Filename: A.ts +module A { export interface I {} } + +// @Filename: B.ts +/// +module A { ; } +module B { + export function f(): A.I { return null; } +} + diff --git a/tests/cases/compiler/multiImportExport.ts b/tests/cases/compiler/multiImportExport.ts index 33f0f5eb17f..939a6e1061e 100644 --- a/tests/cases/compiler/multiImportExport.ts +++ b/tests/cases/compiler/multiImportExport.ts @@ -1,3 +1,5 @@ +// @module: commonjs +// @declaration: true // @Filename: consumer.ts import Drawing = require('./Drawing'); var addr = new Drawing.Math.Adder(); diff --git a/tests/cases/compiler/privacyAccessorDeclFile.ts b/tests/cases/compiler/privacyAccessorDeclFile.ts new file mode 100644 index 00000000000..25d590c0d37 --- /dev/null +++ b/tests/cases/compiler/privacyAccessorDeclFile.ts @@ -0,0 +1,1061 @@ +// @target: ES5 +// @module: commonjs +// @declaration: true + +// @Filename:privacyAccessorDeclFile_externalModule.ts +class privateClass { +} + +export class publicClass { +} + +export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } +} + +export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } +} + +class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } +} + +class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } +} + +export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + } + private set myPrivateMethod(param: privateClass) { + } +} + +export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } +} + +class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } +} + +class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } +} + +export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + return new privateModule.publicClass(); + } +} + +export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + set myPublicMethod(param: privateModule.publicClass) { // Error + } +} + +class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } +} + +class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } +} + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + set myPublicMethod(param: privateModule.publicClass) { // Error + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } +} + +// @Filename: privacyAccessorDeclFile_GlobalFile.ts +class publicClassInGlobal { +} + +class publicClassInGlobalWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClassInGlobal { + return null; + } + private static get myPrivateStaticMethod(): publicClassInGlobal { + return null; + } + get myPublicMethod(): publicClassInGlobal { + return null; + } + private get myPrivateMethod(): publicClassInGlobal { + return null; + } + static get myPublicStaticMethod1() { + return new publicClassInGlobal(); + } + private static get myPrivateStaticMethod1() { + return new publicClassInGlobal(); + } + get myPublicMethod1() { + return new publicClassInGlobal(); + } + private get myPrivateMethod1() { + return new publicClassInGlobal(); + } +} + +class publicClassInGlobalWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClassInGlobal) { + } + private static set myPrivateStaticMethod(param: publicClassInGlobal) { + } + set myPublicMethod(param: publicClassInGlobal) { + } + private set myPrivateMethod(param: publicClassInGlobal) { + } +} + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } + } + + export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { // Error + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { // Error + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { // Error + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod(): privateClass { + return null; + } + private static get myPrivateStaticMethod(): privateClass { + return null; + } + get myPublicMethod(): privateClass { + return null; + } + private get myPrivateMethod(): privateClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateClass(); + } + private static get myPrivateStaticMethod1() { + return new privateClass(); + } + get myPublicMethod1() { + return new privateClass(); + } + private get myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicGetAccessorTypes { + static get myPublicStaticMethod(): publicClass { + return null; + } + private static get myPrivateStaticMethod(): publicClass { + return null; + } + get myPublicMethod(): publicClass { + return null; + } + private get myPrivateMethod(): publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new publicClass(); + } + private static get myPrivateStaticMethod1() { + return new publicClass(); + } + get myPublicMethod1() { + return new publicClass(); + } + private get myPrivateMethod1() { + return new publicClass(); + } + } + + export class publicClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { // Error + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { // Error + } + private set myPrivateMethod(param: privateClass) { + } + } + + export class publicClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + class privateClassWithWithPrivateSetAccessorTypes { + static set myPublicStaticMethod(param: privateClass) { + } + private static set myPrivateStaticMethod(param: privateClass) { + } + set myPublicMethod(param: privateClass) { + } + private set myPrivateMethod(param: privateClass) { + } + } + + class privateClassWithWithPublicSetAccessorTypes { + static set myPublicStaticMethod(param: publicClass) { + } + private static set myPrivateStaticMethod(param: publicClass) { + } + set myPublicMethod(param: publicClass) { + } + private set myPrivateMethod(param: publicClass) { + } + } + + export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + get myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static get myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + get myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + + export class publicClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + set myPublicMethod(param: privateModule.publicClass) { // Error + } + } + + class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod(): privateModule.publicClass { + return null; + } + get myPublicMethod(): privateModule.publicClass { + return null; + } + static get myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + get myPublicMethod1() { + return new privateModule.publicClass(); + } + } + + class privateClassWithPrivateModuleSetAccessorTypes { + static set myPublicStaticMethod(param: privateModule.publicClass) { + } + set myPublicMethod(param: privateModule.publicClass) { + } + } +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts new file mode 100644 index 00000000000..1150cf963bf --- /dev/null +++ b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts @@ -0,0 +1,138 @@ +// @target: ES5 +// @module: commonjs +// @declaration: true + +// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts +/// +import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts +import exporter = require("privacyCannotNameAccessorDeclFile_exporter"); +export class publicClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +class privateClassWithWithPrivateGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static get myPrivateStaticMethod() { + return exporter.createExportedWidget1(); + } + get myPublicMethod() { + return exporter.createExportedWidget1(); + } + private get myPrivateMethod() { + return exporter.createExportedWidget1(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static get myPrivateStaticMethod1() { + return exporter.createExportedWidget3(); + } + get myPublicMethod1() { + return exporter.createExportedWidget3(); + } + private get myPrivateMethod1() { + return exporter.createExportedWidget3(); + } +} + +export class publicClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + get myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} + +class privateClassWithPrivateModuleGetAccessorTypes { + static get myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + get myPublicMethod() { + return exporter.createExportedWidget2(); + } + static get myPublicStaticMethod1() { + return exporter.createExportedWidget4(); + } + get myPublicMethod1() { + return exporter.createExportedWidget4(); + } +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts new file mode 100644 index 00000000000..e49d31946c6 --- /dev/null +++ b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts @@ -0,0 +1,101 @@ +// @module: commonjs +// @declaration: true + + +// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts +/// +import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts +import exporter = require("privacyCannotNameVarTypeDeclFile_exporter"); +export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); // Error + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); // Error + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); // Error + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty = exporter.createExportedWidget1(); + private static myPrivateStaticProperty = exporter.createExportedWidget1(); + myPublicProperty = exporter.createExportedWidget1(); + private myPrivateProperty = exporter.createExportedWidget1(); + + static myPublicStaticProperty1 = exporter.createExportedWidget3(); + private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); + myPublicProperty1 = exporter.createExportedWidget3(); + private myPrivateProperty1 = exporter.createExportedWidget3(); +} + +export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error +var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); +export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error +var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); + +export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); // Error + myPublicProperty = exporter.createExportedWidget2(); // Error + static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error + myPublicProperty1 = exporter.createExportedWidget4(); // Error +} +export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error +export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error + +class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty= exporter.createExportedWidget2(); + myPublicProperty= exporter.createExportedWidget2(); + static myPublicStaticProperty1 = exporter.createExportedWidget4(); + myPublicProperty1 = exporter.createExportedWidget4(); +} +var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); +var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); \ No newline at end of file diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts index d4ce6c675f5..c867a664520 100644 --- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts +++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true export var x = 1; // Makes this an external module interface Iterator { } diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts index 6aa0761d8d7..1aea1a17e98 100644 --- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts +++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true export var x = 1; // Makes this an external module interface Iterator { x: T } diff --git a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts index 98e11a37e66..e9fda583a14 100644 --- a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts +++ b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true export interface A { f1(callback: (p: T) => any); } diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts index 6014c8bb041..b2a5e374f48 100644 --- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts +++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true module Foo { export interface A { } diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts index 5d150e2f5e7..42c121ac80e 100644 --- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts +++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true export = Foo; interface Foo { diff --git a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts index e43e4dc6d93..b412622ad40 100644 --- a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts +++ b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true // @Filename: privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts export = Foo; class Foo { diff --git a/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts b/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts index cf73b3626ee..01ecd8c1ebd 100644 --- a/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts +++ b/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true export class A{ constructor(callback: (self: A) => void) { var child = new B(this); diff --git a/tests/cases/compiler/privacyCheckTypeOfFunction.ts b/tests/cases/compiler/privacyCheckTypeOfFunction.ts index a4980fe6229..80bab76dc26 100644 --- a/tests/cases/compiler/privacyCheckTypeOfFunction.ts +++ b/tests/cases/compiler/privacyCheckTypeOfFunction.ts @@ -1,3 +1,5 @@ +//@module: commonjs +//@declaration: true function foo() { } export var x: typeof foo; diff --git a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts index e439cae861e..b37fb72677b 100644 --- a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts +++ b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts @@ -1,3 +1,4 @@ +//@declaration: true module Outer { module Inner { export var m: typeof Inner; diff --git a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts new file mode 100644 index 00000000000..f24ed8ea32b --- /dev/null +++ b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts @@ -0,0 +1,157 @@ +// @module: commonjs +// @declaration: true + + +// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts +/// +import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts +import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error + } +} +export class publicClassWithWithPrivateParmeterTypes1 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { // Error + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param = exporter.createExportedWidget1()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { + } + myPublicMethod(param = exporter.createExportedWidget1()) { + } + private myPrivateMethod(param = exporter.createExportedWidget1()) { + } + constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { + } +} +class privateClassWithWithPrivateParmeterTypes2 { + static myPublicStaticMethod(param = exporter.createExportedWidget3()) { + } + private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { + } + myPublicMethod(param = exporter.createExportedWidget3()) { + } + private myPrivateMethod(param = exporter.createExportedWidget3()) { + } + constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { + } +} + +export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error +} +function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { +} +export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error +} +function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { +} + + +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget2()) { // Error + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error + } +} +export class publicClassWithPrivateModuleParameterTypes2 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error + } + myPublicMethod(param= exporter.createExportedWidget4()) { // Error + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error + } +} +export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error +} +export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error +} + + +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param= exporter.createExportedWidget2()) { + } + myPublicMethod(param= exporter.createExportedWidget2()) { + } + constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { + } +} +class privateClassWithPrivateModuleParameterTypes1 { + static myPublicStaticMethod(param= exporter.createExportedWidget4()) { + } + myPublicMethod(param= exporter.createExportedWidget4()) { + } + constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { + } +} +function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { +} +function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts new file mode 100644 index 00000000000..2eff22327b5 --- /dev/null +++ b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts @@ -0,0 +1,163 @@ +// @module: commonjs +// @declaration: true + + +// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts +declare module "GlobalWidgets" { + export class Widget3 { + name: string; + } + export function createWidget3(): Widget3; + + export module SpecializedGlobalWidget { + export class Widget4 { + name: string; + } + function createWidget4(): Widget4; + } +} + +// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts +export class Widget1 { + name = 'one'; +} +export function createWidget1() { + return new Widget1(); +} + +export module SpecializedWidget { + export class Widget2 { + name = 'one'; + } + export function createWidget2() { + return new Widget2(); + } +} + +// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts +/// +import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets"); +import Widgets1 = require("GlobalWidgets"); +export function createExportedWidget1() { + return Widgets.createWidget1(); +} +export function createExportedWidget2() { + return Widgets.SpecializedWidget.createWidget2(); +} +export function createExportedWidget3() { + return Widgets1.createWidget3(); +} +export function createExportedWidget4() { + return Widgets1.SpecializedGlobalWidget.createWidget4(); +} + +// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts +import exporter = require("privacyFunctionReturnTypeDeclFile_exporter"); +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { // Error + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { // Error + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget1(); + } + private static myPrivateStaticMethod() { + return exporter.createExportedWidget1();; + } + myPublicMethod() { + return exporter.createExportedWidget1();; + } + private myPrivateMethod() { + return exporter.createExportedWidget1();; + } + static myPublicStaticMethod1() { + return exporter.createExportedWidget3(); + } + private static myPrivateStaticMethod1() { + return exporter.createExportedWidget3();; + } + myPublicMethod1() { + return exporter.createExportedWidget3();; + } + private myPrivateMethod1() { + return exporter.createExportedWidget3();; + } +} + +export function publicFunctionWithPrivateParmeterTypes() { // Error + return exporter.createExportedWidget1(); +} +function privateFunctionWithPrivateParmeterTypes() { + return exporter.createExportedWidget1(); +} +export function publicFunctionWithPrivateParmeterTypes1() { // Error + return exporter.createExportedWidget3(); +} +function privateFunctionWithPrivateParmeterTypes1() { + return exporter.createExportedWidget3(); +} + +export class publicClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { // Error + return exporter.createExportedWidget2(); + } + myPublicMethod() { // Error + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +export function publicFunctionWithPrivateModuleReturnTypes() { // Error + return exporter.createExportedWidget2(); +} +export function publicFunctionWithPrivateModuleReturnTypes1() { // Error + return exporter.createExportedWidget4(); +} + +class privateClassWithPrivateModuleReturnTypes { + static myPublicStaticMethod() { + return exporter.createExportedWidget2(); + } + myPublicMethod() { + return exporter.createExportedWidget2(); + } + static myPublicStaticMethod1() { // Error + return exporter.createExportedWidget4(); + } + myPublicMethod1() { // Error + return exporter.createExportedWidget4(); + } +} +function privateFunctionWithPrivateModuleReturnTypes() { + return exporter.createExportedWidget2(); +} +function privateFunctionWithPrivateModuleReturnTypes1() { + return exporter.createExportedWidget4(); +} diff --git a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts new file mode 100644 index 00000000000..baa2ed4bee6 --- /dev/null +++ b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts @@ -0,0 +1,687 @@ +// @module: commonjs +// @declaration: true + +// @Filename:privacyFunctionParameterDeclFile_externalModule.ts +class privateClass { +} + +export class publicClass { +} + +export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + (param: privateClass): publicClass; // Error + myMethod(param: privateClass): void; // Error +} + +export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; +} + +interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; +} + +interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; +} + +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + } +} + +export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } +} + +class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } +} + +export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error +} +export function publicFunctionWithPublicParmeterTypes(param: publicClass) { +} +function privateFunctionWithPrivateParmeterTypes(param: privateClass) { +} +function privateFunctionWithPublicParmeterTypes(param: publicClass) { +} + +export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error +export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; +declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; +declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + +export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + (param: privateModule.publicClass): publicClass; // Error + myMethod(param: privateModule.publicClass): void; // Error +} +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + myPublicMethod(param: privateModule.publicClass) { // Error + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + } +} +export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error +} +export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + +interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; +} +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } +} +function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { +} +declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + (param: privateClass): publicClass; // Error + myMethod(param: privateClass): void; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + (param: privateModule.publicClass): publicClass; // Error + myMethod(param: privateModule.publicClass): void; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + myPublicMethod(param: privateModule.publicClass) { // Error + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; + (param: privateClass): publicClass; + myMethod(param: privateClass): void; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; +} + +// @Filename: privacyFunctionParameterDeclFile_GlobalFile.ts +class publicClassInGlobal { +} +interface publicInterfaceWithPublicParmeterTypesInGlobal { + new (param: publicClassInGlobal): publicClassInGlobal; + (param: publicClassInGlobal): publicClassInGlobal; + myMethod(param: publicClassInGlobal): void; +} +class publicClassWithWithPublicParmeterTypesInGlobal { + static myPublicStaticMethod(param: publicClassInGlobal) { + } + private static myPrivateStaticMethod(param: publicClassInGlobal) { + } + myPublicMethod(param: publicClassInGlobal) { + } + private myPrivateMethod(param: publicClassInGlobal) { + } + constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) { + } +} +function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) { +} +declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void; + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; + (param: privateClass): publicClass; + myMethod(param: privateClass): void; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (param: privateClass): publicClass; // Error + (param: privateClass): publicClass; // Error + myMethod(param: privateClass): void; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (param: privateClass): privateClass; + (param: privateClass): privateClass; + myMethod(param: privateClass): void; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (param: publicClass): publicClass; + (param: publicClass): publicClass; + myMethod(param: publicClass): void; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { // Error + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { // Error + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(param: privateClass) { + } + private static myPrivateStaticMethod(param: privateClass) { + } + myPublicMethod(param: privateClass) { + } + private myPrivateMethod(param: privateClass) { + } + constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(param: publicClass) { + } + private static myPrivateStaticMethod(param: publicClass) { + } + myPublicMethod(param: publicClass) { + } + private myPrivateMethod(param: publicClass) { + } + constructor(param: publicClass, private param1: publicClass, public param2: publicClass) { + } + } + + export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error + } + export function publicFunctionWithPublicParmeterTypes(param: publicClass) { + } + function privateFunctionWithPrivateParmeterTypes(param: privateClass) { + } + function privateFunctionWithPublicParmeterTypes(param: publicClass) { + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; // Error + (param: privateModule.publicClass): publicClass; // Error + myMethod(param: privateModule.publicClass): void; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { // Error + } + myPublicMethod(param: privateModule.publicClass) { // Error + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error + } + } + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (param: privateModule.publicClass): publicClass; + (param: privateModule.publicClass): publicClass; + myMethod(param: privateModule.publicClass): void; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(param: privateModule.publicClass) { + } + myPublicMethod(param: privateModule.publicClass) { + } + constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { + } + } + function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts new file mode 100644 index 00000000000..c09c4b123f2 --- /dev/null +++ b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts @@ -0,0 +1,1194 @@ +// @module: commonjs +// @declaration: true + +// @Filename:privacyFunctionReturnTypeDeclFile_externalModule.ts +class privateClass { +} + +export class publicClass { +} + +export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + (): privateClass; // Error + [x: number]: privateClass; // Error + myMethod(): privateClass; // Error +} + +export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; +} + +interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; +} + +interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; +} + +export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } +} + +export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } +} + +class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } +} + +class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } +} + +export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + return null; +} +export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; +} +function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; +} +function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; +} +export function publicFunctionWithPrivateParmeterTypes1() { // Error + return new privateClass(); +} +export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); +} +function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); +} +function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); +} + +export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error +export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; +declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; +declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + +export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + (): privateModule.publicClass; // Error + [x: number]: privateModule.publicClass // Error + myMethod(): privateModule.publicClass; // Error +} +export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + return new privateModule.publicClass(); + } +} +export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + return null; +} +export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + return new privateModule.publicClass(); +} +export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + +interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass + myMethod(): privateModule.publicClass; +} +class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } +} +function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; +} +function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); +} +declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + (): privateClass; // Error + [x: number]: privateClass; // Error + myMethod(): privateClass; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + (): privateModule.publicClass; // Error + [x: number]: privateModule.publicClass; // Error + myMethod(): privateModule.publicClass; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; +} + +// @Filename: privacyFunctionReturnTypeDeclFile_GlobalFile.ts +class publicClassInGlobal { +} +interface publicInterfaceWithPublicParmeterTypesInGlobal { + new (): publicClassInGlobal; + (): publicClassInGlobal; + [x: number]: publicClassInGlobal; + myMethod(): publicClassInGlobal; +} +class publicClassWithWithPublicParmeterTypesInGlobal { + static myPublicStaticMethod(): publicClassInGlobal { + return null; + } + private static myPrivateStaticMethod(): publicClassInGlobal { + return null; + } + myPublicMethod(): publicClassInGlobal { + return null; + } + private myPrivateMethod(): publicClassInGlobal { + return null; + } + static myPublicStaticMethod1() { + return new publicClassInGlobal(); + } + private static myPrivateStaticMethod1() { + return new publicClassInGlobal(); + } + myPublicMethod1() { + return new publicClassInGlobal(); + } + private myPrivateMethod1() { + return new publicClassInGlobal(); + } +} +function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal { + return null; +} +function publicFunctionWithPublicParmeterTypesInGlobal1() { + return new publicClassInGlobal(); +} +declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal; + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + } + + export interface publicInterfaceWithPrivateParmeterTypes { + new (): privateClass; // Error + (): privateClass; // Error + [x: number]: privateClass; // Error + myMethod(): privateClass; // Error + } + + export interface publicInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + interface privateInterfaceWithPrivateParmeterTypes { + new (): privateClass; + (): privateClass; + [x: number]: privateClass; + myMethod(): privateClass; + } + + interface privateInterfaceWithPublicParmeterTypes { + new (): publicClass; + (): publicClass; + [x: number]: publicClass; + myMethod(): publicClass; + } + + export class publicClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { // Error + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { // Error + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { // Error + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { // Error + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + export class publicClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + class privateClassWithWithPrivateParmeterTypes { + static myPublicStaticMethod(): privateClass { + return null; + } + private static myPrivateStaticMethod(): privateClass { + return null; + } + myPublicMethod(): privateClass { + return null; + } + private myPrivateMethod(): privateClass { + return null; + } + static myPublicStaticMethod1() { + return new privateClass(); + } + private static myPrivateStaticMethod1() { + return new privateClass(); + } + myPublicMethod1() { + return new privateClass(); + } + private myPrivateMethod1() { + return new privateClass(); + } + } + + class privateClassWithWithPublicParmeterTypes { + static myPublicStaticMethod(): publicClass { + return null; + } + private static myPrivateStaticMethod(): publicClass { + return null; + } + myPublicMethod(): publicClass { + return null; + } + private myPrivateMethod(): publicClass { + return null; + } + static myPublicStaticMethod1() { + return new publicClass(); + } + private static myPrivateStaticMethod1() { + return new publicClass(); + } + myPublicMethod1() { + return new publicClass(); + } + private myPrivateMethod1() { + return new publicClass(); + } + } + + export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error + return null; + } + export function publicFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + function privateFunctionWithPrivateParmeterTypes(): privateClass { + return null; + } + function privateFunctionWithPublicParmeterTypes(): publicClass { + return null; + } + export function publicFunctionWithPrivateParmeterTypes1() { // Error + return new privateClass(); + } + export function publicFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + function privateFunctionWithPrivateParmeterTypes1() { + return new privateClass(); + } + function privateFunctionWithPublicParmeterTypes1() { + return new publicClass(); + } + + export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error + export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; + declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; + + export interface publicInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; // Error + (): privateModule.publicClass; // Error + [x: number]: privateModule.publicClass; // Error + myMethod(): privateModule.publicClass; // Error + } + export class publicClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { // Error + return null; + } + myPublicMethod(): privateModule.publicClass { // Error + return null; + } + static myPublicStaticMethod1() { // Error + return new privateModule.publicClass(); + } + myPublicMethod1() { // Error + return new privateModule.publicClass(); + } + } + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error + return null; + } + export function publicFunctionWithPrivateModuleParameterTypes1() { // Error + return new privateModule.publicClass(); + } + export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModuleParameterTypes { + new (): privateModule.publicClass; + (): privateModule.publicClass; + [x: number]: privateModule.publicClass; + myMethod(): privateModule.publicClass; + } + class privateClassWithPrivateModuleParameterTypes { + static myPublicStaticMethod(): privateModule.publicClass { + return null; + } + myPublicMethod(): privateModule.publicClass { + return null; + } + static myPublicStaticMethod1() { + return new privateModule.publicClass(); + } + myPublicMethod1() { + return new privateModule.publicClass(); + } + } + function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { + return null; + } + function privateFunctionWithPrivateModuleParameterTypes1() { + return new privateModule.publicClass(); + } + declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyGetter.ts b/tests/cases/compiler/privacyGetter.ts index 65b6303833c..aab0cb22a0e 100644 --- a/tests/cases/compiler/privacyGetter.ts +++ b/tests/cases/compiler/privacyGetter.ts @@ -1,3 +1,4 @@ +// @target: ES5 //@module: amd export module m1 { export class C1_public { diff --git a/tests/cases/compiler/privacyGloGetter.ts b/tests/cases/compiler/privacyGloGetter.ts index 5ebca909ad9..c892c2e75da 100644 --- a/tests/cases/compiler/privacyGloGetter.ts +++ b/tests/cases/compiler/privacyGloGetter.ts @@ -1,3 +1,4 @@ +// @target: ES5 module m1 { export class C1_public { private f1() { diff --git a/tests/cases/compiler/privacyGloImport.ts b/tests/cases/compiler/privacyGloImport.ts index 68b67f42d89..19bf1009867 100644 --- a/tests/cases/compiler/privacyGloImport.ts +++ b/tests/cases/compiler/privacyGloImport.ts @@ -1,3 +1,4 @@ +//@declaration: true module m1 { export module m1_M1_public { export class c1 { @@ -19,21 +20,21 @@ module m1 { export var v2: c1; } - declare export module "m1_M3_public" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "m1_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} - declare module "m1_M4_private" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //declare module "m1_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import m1_im1_private = m1_M1_public; export var m1_im1_private_v1_public = m1_im1_private.c1; @@ -56,31 +57,30 @@ module m1 { var m1_im2_private_v3_private = m1_im2_private.f1; var m1_im2_private_v4_private = m1_im2_private.f1(); - import m1_im3_private = require("m1_M3_public"); - export var m1_im3_private_v1_public = m1_im3_private.c1; - export var m1_im3_private_v2_public = new m1_im3_private.c1(); - export var m1_im3_private_v3_public = m1_im3_private.f1; - export var m1_im3_private_v4_public = m1_im3_private.f1(); - var m1_im3_private_v1_private = m1_im3_private.c1; - var m1_im3_private_v2_private = new m1_im3_private.c1(); - var m1_im3_private_v3_private = m1_im3_private.f1; - var m1_im3_private_v4_private = m1_im3_private.f1(); + //import m1_im3_private = require("m1_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); - import m1_im4_private = require("m1_M4_private"); - export var m1_im4_private_v1_public = m1_im4_private.c1; - export var m1_im4_private_v2_public = new m1_im4_private.c1(); - export var m1_im4_private_v3_public = m1_im4_private.f1; - export var m1_im4_private_v4_public = m1_im4_private.f1(); - var m1_im4_private_v1_private = m1_im4_private.c1; - var m1_im4_private_v2_private = new m1_im4_private.c1(); - var m1_im4_private_v3_private = m1_im4_private.f1; - var m1_im4_private_v4_private = m1_im4_private.f1(); + //import m1_im4_private = require("m1_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); - // Parse error to export module export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; - export import m1_im3_public = require("m1_M3_public"); - export import m1_im4_public = require("m1_M4_private"); + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); } module glo_M1_public { @@ -104,26 +104,26 @@ declare module "glo_M2_public" { declare module "use_glo_M1_public" { import use_glo_M1_public = glo_M1_public; export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; - export var use_glo_M1_public_v2_public: use_glo_M1_public; + export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; - var use_glo_M1_public_v2_private: use_glo_M1_public; + var use_glo_M1_public_v2_private: typeof use_glo_M1_public; var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; import use_glo_M2_public = require("glo_M2_public"); export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; - export var use_glo_M2_public_v2_public: use_glo_M2_public; + export var use_glo_M2_public_v2_public: typeof use_glo_M2_public; export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; - var use_glo_M2_public_v2_private: use_glo_M2_public; + var use_glo_M2_public_v2_private: typeof use_glo_M2_public; var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; module m2 { - import errorImport = require("glo_M2_public"); + //import errorImport = require("glo_M2_public"); import nonerrorImport = glo_M1_public; module m5 { - import m5_errorImport = require("glo_M2_public"); + //import m5_errorImport = require("glo_M2_public"); import m5_nonerrorImport = glo_M1_public; } } @@ -131,23 +131,23 @@ declare module "use_glo_M1_public" { declare module "anotherParseError" { module m2 { - declare module "abc" { - } + //declare module "abc" { + //} } module m2 { - module "abc2" { - } - } - module "abc3" { + //module "abc2" { + //} } + //module "abc3" { + //} } module m2 { - import m3 = require("use_glo_M1_public"); + //import m3 = require("use_glo_M1_public"); module m4 { var a = 10; - import m2 = require("use_glo_M1_public"); + //import m2 = require("use_glo_M1_public"); } } \ No newline at end of file diff --git a/tests/cases/compiler/privacyGloImportParseErrors.ts b/tests/cases/compiler/privacyGloImportParseErrors.ts new file mode 100644 index 00000000000..8419f6737ea --- /dev/null +++ b/tests/cases/compiler/privacyGloImportParseErrors.ts @@ -0,0 +1,153 @@ +//@declaration: true +module m1 { + export module m1_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m1_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "m1_M3_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "m1_M4_private" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + import m1_im1_private = m1_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m1_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + import m1_im3_private = require("m1_M3_public"); + export var m1_im3_private_v1_public = m1_im3_private.c1; + export var m1_im3_private_v2_public = new m1_im3_private.c1(); + export var m1_im3_private_v3_public = m1_im3_private.f1; + export var m1_im3_private_v4_public = m1_im3_private.f1(); + var m1_im3_private_v1_private = m1_im3_private.c1; + var m1_im3_private_v2_private = new m1_im3_private.c1(); + var m1_im3_private_v3_private = m1_im3_private.f1; + var m1_im3_private_v4_private = m1_im3_private.f1(); + + import m1_im4_private = require("m1_M4_private"); + export var m1_im4_private_v1_public = m1_im4_private.c1; + export var m1_im4_private_v2_public = new m1_im4_private.c1(); + export var m1_im4_private_v3_public = m1_im4_private.f1; + export var m1_im4_private_v4_public = m1_im4_private.f1(); + var m1_im4_private_v1_private = m1_im4_private.c1; + var m1_im4_private_v2_private = new m1_im4_private.c1(); + var m1_im4_private_v3_private = m1_im4_private.f1; + var m1_im4_private_v4_private = m1_im4_private.f1(); + + export import m1_im1_public = m1_M1_public; + export import m1_im2_public = m1_M2_private; + export import m1_im3_public = require("m1_M3_public"); + export import m1_im4_public = require("m1_M4_private"); +} + +module glo_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; +} + +declare module "glo_M2_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; +} + +declare module "use_glo_M1_public" { + import use_glo_M1_public = glo_M1_public; + export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; + export var use_glo_M1_public_v2_public: typeof use_glo_M1_public; + export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1; + var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; + var use_glo_M1_public_v2_private: typeof use_glo_M1_public; + var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + + import use_glo_M2_public = require("glo_M2_public"); + export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; + export var use_glo_M2_public_v2_public: typeof use_glo_M2_public; + export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; + var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; + var use_glo_M2_public_v2_private: typeof use_glo_M2_public; + var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + + module m2 { + import errorImport = require("glo_M2_public"); + import nonerrorImport = glo_M1_public; + + module m5 { + import m5_errorImport = require("glo_M2_public"); + import m5_nonerrorImport = glo_M1_public; + } + } +} + +declare module "anotherParseError" { + module m2 { + declare module "abc" { + } + } + + module m2 { + module "abc2" { + } + } + module "abc3" { + } +} + +module m2 { + import m3 = require("use_glo_M1_public"); + module m4 { + var a = 10; + import m2 = require("use_glo_M1_public"); + } + +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyImport.ts b/tests/cases/compiler/privacyImport.ts index 04d789a3749..dff16781d56 100644 --- a/tests/cases/compiler/privacyImport.ts +++ b/tests/cases/compiler/privacyImport.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true export module m1 { export module m1_M1_public { export class c1 { @@ -20,21 +21,21 @@ export module m1 { export var v2: c1; } - export declare module "m1_M3_public" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "m1_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} - declare module "m1_M4_private" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //declare module "m1_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import m1_im1_private = m1_M1_public; export var m1_im1_private_v1_public = m1_im1_private.c1; @@ -57,30 +58,30 @@ export module m1 { var m1_im2_private_v3_private = m1_im2_private.f1; var m1_im2_private_v4_private = m1_im2_private.f1(); - import m1_im3_private = require("m1_M3_public"); - export var m1_im3_private_v1_public = m1_im3_private.c1; - export var m1_im3_private_v2_public = new m1_im3_private.c1(); - export var m1_im3_private_v3_public = m1_im3_private.f1; - export var m1_im3_private_v4_public = m1_im3_private.f1(); - var m1_im3_private_v1_private = m1_im3_private.c1; - var m1_im3_private_v2_private = new m1_im3_private.c1(); - var m1_im3_private_v3_private = m1_im3_private.f1; - var m1_im3_private_v4_private = m1_im3_private.f1(); + //import m1_im3_private = require("m1_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); - import m1_im4_private = require("m1_M4_private"); - export var m1_im4_private_v1_public = m1_im4_private.c1; - export var m1_im4_private_v2_public = new m1_im4_private.c1(); - export var m1_im4_private_v3_public = m1_im4_private.f1; - export var m1_im4_private_v4_public = m1_im4_private.f1(); - var m1_im4_private_v1_private = m1_im4_private.c1; - var m1_im4_private_v2_private = new m1_im4_private.c1(); - var m1_im4_private_v3_private = m1_im4_private.f1; - var m1_im4_private_v4_private = m1_im4_private.f1(); + //import m1_im4_private = require("m1_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; - export import m1_im3_public = require("m1_M3_public"); - export import m1_im4_public = require("m1_M4_private"); + //export import m1_im3_public = require("m1_M3_public"); + //export import m1_im4_public = require("m1_M4_private"); } module m2 { @@ -104,21 +105,21 @@ module m2 { export var v2: c1; } - export declare module "m2_M3_public" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //export declare module "m2_M3_public" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} - declare module "m2_M4_private" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; - } + //declare module "m2_M4_private" { + // export function f1(); + // export class c1 { + // } + // export var v1: { new (): c1; }; + // export var v2: c1; + //} import m1_im1_private = m2_M1_public; export var m1_im1_private_v1_public = m1_im1_private.c1; @@ -141,31 +142,31 @@ module m2 { var m1_im2_private_v3_private = m1_im2_private.f1; var m1_im2_private_v4_private = m1_im2_private.f1(); - import m1_im3_private = require("m2_M3_public"); - export var m1_im3_private_v1_public = m1_im3_private.c1; - export var m1_im3_private_v2_public = new m1_im3_private.c1(); - export var m1_im3_private_v3_public = m1_im3_private.f1; - export var m1_im3_private_v4_public = m1_im3_private.f1(); - var m1_im3_private_v1_private = m1_im3_private.c1; - var m1_im3_private_v2_private = new m1_im3_private.c1(); - var m1_im3_private_v3_private = m1_im3_private.f1; - var m1_im3_private_v4_private = m1_im3_private.f1(); + //import m1_im3_private = require("m2_M3_public"); + //export var m1_im3_private_v1_public = m1_im3_private.c1; + //export var m1_im3_private_v2_public = new m1_im3_private.c1(); + //export var m1_im3_private_v3_public = m1_im3_private.f1; + //export var m1_im3_private_v4_public = m1_im3_private.f1(); + //var m1_im3_private_v1_private = m1_im3_private.c1; + //var m1_im3_private_v2_private = new m1_im3_private.c1(); + //var m1_im3_private_v3_private = m1_im3_private.f1; + //var m1_im3_private_v4_private = m1_im3_private.f1(); - import m1_im4_private = require("m2_M4_private"); - export var m1_im4_private_v1_public = m1_im4_private.c1; - export var m1_im4_private_v2_public = new m1_im4_private.c1(); - export var m1_im4_private_v3_public = m1_im4_private.f1; - export var m1_im4_private_v4_public = m1_im4_private.f1(); - var m1_im4_private_v1_private = m1_im4_private.c1; - var m1_im4_private_v2_private = new m1_im4_private.c1(); - var m1_im4_private_v3_private = m1_im4_private.f1; - var m1_im4_private_v4_private = m1_im4_private.f1(); + //import m1_im4_private = require("m2_M4_private"); + //export var m1_im4_private_v1_public = m1_im4_private.c1; + //export var m1_im4_private_v2_public = new m1_im4_private.c1(); + //export var m1_im4_private_v3_public = m1_im4_private.f1; + //export var m1_im4_private_v4_public = m1_im4_private.f1(); + //var m1_im4_private_v1_private = m1_im4_private.c1; + //var m1_im4_private_v2_private = new m1_im4_private.c1(); + //var m1_im4_private_v3_private = m1_im4_private.f1; + //var m1_im4_private_v4_private = m1_im4_private.f1(); // Parse error to export module export import m1_im1_public = m2_M1_public; export import m1_im2_public = m2_M2_private; - export import m1_im3_public = require("m2_M3_public"); - export import m1_im4_public = require("m2_M4_private"); + //export import m1_im3_public = require("m2_M3_public"); + //export import m1_im4_public = require("m2_M4_private"); } export module glo_M1_public { @@ -178,13 +179,13 @@ export module glo_M1_public { export var v2: c1; } -export declare module "glo_M2_public" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; -} +//export declare module "glo_M2_public" { +// export function f1(); +// export class c1 { +// } +// export var v1: { new (): c1; }; +// export var v2: c1; +//} export module glo_M3_private { export class c1 { @@ -196,13 +197,13 @@ export module glo_M3_private { export var v2: c1; } -export declare module "glo_M4_private" { - export function f1(); - export class c1 { - } - export var v1: { new (): c1; }; - export var v2: c1; -} +//export declare module "glo_M4_private" { +// export function f1(); +// export class c1 { +// } +// export var v1: { new (): c1; }; +// export var v2: c1; +//} import glo_im1_private = glo_M1_public; @@ -216,15 +217,15 @@ var glo_im1_private_v3_private = glo_im1_private.f1; var glo_im1_private_v4_private = glo_im1_private.f1(); -import glo_im2_private = require("glo_M2_public"); -export var glo_im2_private_v1_public = glo_im2_private.c1; -export var glo_im2_private_v2_public = new glo_im2_private.c1(); -export var glo_im2_private_v3_public = glo_im2_private.f1; -export var glo_im2_private_v4_public = glo_im2_private.f1(); -var glo_im2_private_v1_private = glo_im2_private.c1; -var glo_im2_private_v2_private = new glo_im2_private.c1(); -var glo_im2_private_v3_private = glo_im2_private.f1; -var glo_im2_private_v4_private = glo_im2_private.f1(); +//import glo_im2_private = require("glo_M2_public"); +//export var glo_im2_private_v1_public = glo_im2_private.c1; +//export var glo_im2_private_v2_public = new glo_im2_private.c1(); +//export var glo_im2_private_v3_public = glo_im2_private.f1; +//export var glo_im2_private_v4_public = glo_im2_private.f1(); +//var glo_im2_private_v1_private = glo_im2_private.c1; +//var glo_im2_private_v2_private = new glo_im2_private.c1(); +//var glo_im2_private_v3_private = glo_im2_private.f1; +//var glo_im2_private_v4_private = glo_im2_private.f1(); import glo_im3_private = glo_M3_private; export var glo_im3_private_v1_public = glo_im3_private.c1; @@ -236,122 +237,122 @@ var glo_im3_private_v2_private = new glo_im3_private.c1(); var glo_im3_private_v3_private = glo_im3_private.f1; var glo_im3_private_v4_private = glo_im3_private.f1(); -import glo_im4_private = require("glo_M4_private"); -export var glo_im4_private_v1_public = glo_im4_private.c1; -export var glo_im4_private_v2_public = new glo_im4_private.c1(); -export var glo_im4_private_v3_public = glo_im4_private.f1; -export var glo_im4_private_v4_public = glo_im4_private.f1(); -var glo_im4_private_v1_private = glo_im4_private.c1; -var glo_im4_private_v2_private = new glo_im4_private.c1(); -var glo_im4_private_v3_private = glo_im4_private.f1; -var glo_im4_private_v4_private = glo_im4_private.f1(); +//import glo_im4_private = require("glo_M4_private"); +//export var glo_im4_private_v1_public = glo_im4_private.c1; +//export var glo_im4_private_v2_public = new glo_im4_private.c1(); +//export var glo_im4_private_v3_public = glo_im4_private.f1; +//export var glo_im4_private_v4_public = glo_im4_private.f1(); +//var glo_im4_private_v1_private = glo_im4_private.c1; +//var glo_im4_private_v2_private = new glo_im4_private.c1(); +//var glo_im4_private_v3_private = glo_im4_private.f1; +//var glo_im4_private_v4_private = glo_im4_private.f1(); // Parse error to export module export import glo_im1_public = glo_M1_public; export import glo_im2_public = glo_M3_private; -export import glo_im3_public = require("glo_M2_public"); -export import glo_im4_public = require("glo_M4_private"); +//export import glo_im3_public = require("glo_M2_public"); +//export import glo_im4_public = require("glo_M4_private"); -export declare module "use_glo_M1_public" { - import use_glo_M1_public = glo_M1_public; - export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; - export var use_glo_M1_public_v2_public: use_glo_M1_public; - export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; - var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; - var use_glo_M1_public_v2_private: use_glo_M1_public; - var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; +//export declare module "use_glo_M1_public" { +// import use_glo_M1_public = glo_M1_public; +// export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; +// export var use_glo_M1_public_v2_public: use_glo_M1_public; +// export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; +// var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; +// var use_glo_M1_public_v2_private: use_glo_M1_public; +// var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; - import use_glo_M2_public = require("glo_M2_public"); - export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; - export var use_glo_M2_public_v2_public: use_glo_M2_public; - export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; - var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; - var use_glo_M2_public_v2_private: use_glo_M2_public; - var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; +// import use_glo_M2_public = require("glo_M2_public"); +// export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; +// export var use_glo_M2_public_v2_public: use_glo_M2_public; +// export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; +// var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; +// var use_glo_M2_public_v2_private: use_glo_M2_public; +// var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; - module m2 { - import errorImport = require("glo_M2_public"); - import nonerrorImport = glo_M1_public; +// module m2 { +// import errorImport = require("glo_M2_public"); +// import nonerrorImport = glo_M1_public; - module m5 { - import m5_errorImport = require("glo_M2_public"); - import m5_nonerrorImport = glo_M1_public; - } - } -} +// module m5 { +// import m5_errorImport = require("glo_M2_public"); +// import m5_nonerrorImport = glo_M1_public; +// } +// } +//} -declare module "use_glo_M3_private" { - import use_glo_M3_private = glo_M3_private; - export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; - export var use_glo_M3_private_v2_public: use_glo_M3_private; - export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; - var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; - var use_glo_M3_private_v2_private: use_glo_M3_private; - var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; +//declare module "use_glo_M3_private" { +// import use_glo_M3_private = glo_M3_private; +// export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; +// export var use_glo_M3_private_v2_public: use_glo_M3_private; +// export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; +// var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; +// var use_glo_M3_private_v2_private: use_glo_M3_private; +// var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; - import use_glo_M4_private = require("glo_M4_private"); - export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; - export var use_glo_M4_private_v2_public: use_glo_M4_private; - export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; - var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; - var use_glo_M4_private_v2_private: use_glo_M4_private; - var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; +// import use_glo_M4_private = require("glo_M4_private"); +// export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; +// export var use_glo_M4_private_v2_public: use_glo_M4_private; +// export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; +// var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; +// var use_glo_M4_private_v2_private: use_glo_M4_private; +// var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; - module m2 { - import errorImport = require("glo_M4_private"); - import nonerrorImport = glo_M3_private; +// module m2 { +// import errorImport = require("glo_M4_private"); +// import nonerrorImport = glo_M3_private; - module m5 { - import m5_errorImport = require("glo_M4_private"); - import m5_nonerrorImport = glo_M3_private; - } - } -} +// module m5 { +// import m5_errorImport = require("glo_M4_private"); +// import m5_nonerrorImport = glo_M3_private; +// } +// } +//} -declare module "anotherParseError" { - module m2 { - declare module "abc" { - } - } +//declare module "anotherParseError" { +// module m2 { +// declare module "abc" { +// } +// } - module m2 { - module "abc2" { - } - } - module "abc3" { - } -} +// module m2 { +// module "abc2" { +// } +// } +// module "abc3" { +// } +//} -declare export module "anotherParseError2" { - module m2 { - declare module "abc" { - } - } +//declare export module "anotherParseError2" { +// module m2 { +// declare module "abc" { +// } +// } - module m2 { - module "abc2" { - } - } - module "abc3" { - } -} +// module m2 { +// module "abc2" { +// } +// } +// module "abc3" { +// } +//} module m2 { - import m3 = require("use_glo_M1_public"); + //import m3 = require("use_glo_M1_public"); module m4 { var a = 10; - import m2 = require("use_glo_M1_public"); + //import m2 = require("use_glo_M1_public"); } } export module m3 { - import m3 = require("use_glo_M1_public"); + //import m3 = require("use_glo_M1_public"); module m4 { var a = 10; - import m2 = require("use_glo_M1_public"); + //import m2 = require("use_glo_M1_public"); } } \ No newline at end of file diff --git a/tests/cases/compiler/privacyImportParseErrors.ts b/tests/cases/compiler/privacyImportParseErrors.ts new file mode 100644 index 00000000000..04d789a3749 --- /dev/null +++ b/tests/cases/compiler/privacyImportParseErrors.ts @@ -0,0 +1,357 @@ +//@module: commonjs +export module m1 { + export module m1_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m1_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "m1_M3_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "m1_M4_private" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + import m1_im1_private = m1_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m1_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + import m1_im3_private = require("m1_M3_public"); + export var m1_im3_private_v1_public = m1_im3_private.c1; + export var m1_im3_private_v2_public = new m1_im3_private.c1(); + export var m1_im3_private_v3_public = m1_im3_private.f1; + export var m1_im3_private_v4_public = m1_im3_private.f1(); + var m1_im3_private_v1_private = m1_im3_private.c1; + var m1_im3_private_v2_private = new m1_im3_private.c1(); + var m1_im3_private_v3_private = m1_im3_private.f1; + var m1_im3_private_v4_private = m1_im3_private.f1(); + + import m1_im4_private = require("m1_M4_private"); + export var m1_im4_private_v1_public = m1_im4_private.c1; + export var m1_im4_private_v2_public = new m1_im4_private.c1(); + export var m1_im4_private_v3_public = m1_im4_private.f1; + export var m1_im4_private_v4_public = m1_im4_private.f1(); + var m1_im4_private_v1_private = m1_im4_private.c1; + var m1_im4_private_v2_private = new m1_im4_private.c1(); + var m1_im4_private_v3_private = m1_im4_private.f1; + var m1_im4_private_v4_private = m1_im4_private.f1(); + + export import m1_im1_public = m1_M1_public; + export import m1_im2_public = m1_M2_private; + export import m1_im3_public = require("m1_M3_public"); + export import m1_im4_public = require("m1_M4_private"); +} + +module m2 { + export module m2_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + module m2_M2_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; + } + + export declare module "m2_M3_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + declare module "m2_M4_private" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; + } + + import m1_im1_private = m2_M1_public; + export var m1_im1_private_v1_public = m1_im1_private.c1; + export var m1_im1_private_v2_public = new m1_im1_private.c1(); + export var m1_im1_private_v3_public = m1_im1_private.f1; + export var m1_im1_private_v4_public = m1_im1_private.f1(); + var m1_im1_private_v1_private = m1_im1_private.c1; + var m1_im1_private_v2_private = new m1_im1_private.c1(); + var m1_im1_private_v3_private = m1_im1_private.f1; + var m1_im1_private_v4_private = m1_im1_private.f1(); + + + import m1_im2_private = m2_M2_private; + export var m1_im2_private_v1_public = m1_im2_private.c1; + export var m1_im2_private_v2_public = new m1_im2_private.c1(); + export var m1_im2_private_v3_public = m1_im2_private.f1; + export var m1_im2_private_v4_public = m1_im2_private.f1(); + var m1_im2_private_v1_private = m1_im2_private.c1; + var m1_im2_private_v2_private = new m1_im2_private.c1(); + var m1_im2_private_v3_private = m1_im2_private.f1; + var m1_im2_private_v4_private = m1_im2_private.f1(); + + import m1_im3_private = require("m2_M3_public"); + export var m1_im3_private_v1_public = m1_im3_private.c1; + export var m1_im3_private_v2_public = new m1_im3_private.c1(); + export var m1_im3_private_v3_public = m1_im3_private.f1; + export var m1_im3_private_v4_public = m1_im3_private.f1(); + var m1_im3_private_v1_private = m1_im3_private.c1; + var m1_im3_private_v2_private = new m1_im3_private.c1(); + var m1_im3_private_v3_private = m1_im3_private.f1; + var m1_im3_private_v4_private = m1_im3_private.f1(); + + import m1_im4_private = require("m2_M4_private"); + export var m1_im4_private_v1_public = m1_im4_private.c1; + export var m1_im4_private_v2_public = new m1_im4_private.c1(); + export var m1_im4_private_v3_public = m1_im4_private.f1; + export var m1_im4_private_v4_public = m1_im4_private.f1(); + var m1_im4_private_v1_private = m1_im4_private.c1; + var m1_im4_private_v2_private = new m1_im4_private.c1(); + var m1_im4_private_v3_private = m1_im4_private.f1; + var m1_im4_private_v4_private = m1_im4_private.f1(); + + // Parse error to export module + export import m1_im1_public = m2_M1_public; + export import m1_im2_public = m2_M2_private; + export import m1_im3_public = require("m2_M3_public"); + export import m1_im4_public = require("m2_M4_private"); +} + +export module glo_M1_public { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; +} + +export declare module "glo_M2_public" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; +} + +export module glo_M3_private { + export class c1 { + } + export function f1() { + return new c1; + } + export var v1 = c1; + export var v2: c1; +} + +export declare module "glo_M4_private" { + export function f1(); + export class c1 { + } + export var v1: { new (): c1; }; + export var v2: c1; +} + + +import glo_im1_private = glo_M1_public; +export var glo_im1_private_v1_public = glo_im1_private.c1; +export var glo_im1_private_v2_public = new glo_im1_private.c1(); +export var glo_im1_private_v3_public = glo_im1_private.f1; +export var glo_im1_private_v4_public = glo_im1_private.f1(); +var glo_im1_private_v1_private = glo_im1_private.c1; +var glo_im1_private_v2_private = new glo_im1_private.c1(); +var glo_im1_private_v3_private = glo_im1_private.f1; +var glo_im1_private_v4_private = glo_im1_private.f1(); + + +import glo_im2_private = require("glo_M2_public"); +export var glo_im2_private_v1_public = glo_im2_private.c1; +export var glo_im2_private_v2_public = new glo_im2_private.c1(); +export var glo_im2_private_v3_public = glo_im2_private.f1; +export var glo_im2_private_v4_public = glo_im2_private.f1(); +var glo_im2_private_v1_private = glo_im2_private.c1; +var glo_im2_private_v2_private = new glo_im2_private.c1(); +var glo_im2_private_v3_private = glo_im2_private.f1; +var glo_im2_private_v4_private = glo_im2_private.f1(); + +import glo_im3_private = glo_M3_private; +export var glo_im3_private_v1_public = glo_im3_private.c1; +export var glo_im3_private_v2_public = new glo_im3_private.c1(); +export var glo_im3_private_v3_public = glo_im3_private.f1; +export var glo_im3_private_v4_public = glo_im3_private.f1(); +var glo_im3_private_v1_private = glo_im3_private.c1; +var glo_im3_private_v2_private = new glo_im3_private.c1(); +var glo_im3_private_v3_private = glo_im3_private.f1; +var glo_im3_private_v4_private = glo_im3_private.f1(); + +import glo_im4_private = require("glo_M4_private"); +export var glo_im4_private_v1_public = glo_im4_private.c1; +export var glo_im4_private_v2_public = new glo_im4_private.c1(); +export var glo_im4_private_v3_public = glo_im4_private.f1; +export var glo_im4_private_v4_public = glo_im4_private.f1(); +var glo_im4_private_v1_private = glo_im4_private.c1; +var glo_im4_private_v2_private = new glo_im4_private.c1(); +var glo_im4_private_v3_private = glo_im4_private.f1; +var glo_im4_private_v4_private = glo_im4_private.f1(); + +// Parse error to export module +export import glo_im1_public = glo_M1_public; +export import glo_im2_public = glo_M3_private; +export import glo_im3_public = require("glo_M2_public"); +export import glo_im4_public = require("glo_M4_private"); + + +export declare module "use_glo_M1_public" { + import use_glo_M1_public = glo_M1_public; + export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; }; + export var use_glo_M1_public_v2_public: use_glo_M1_public; + export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1; + var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; }; + var use_glo_M1_public_v2_private: use_glo_M1_public; + var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1; + + import use_glo_M2_public = require("glo_M2_public"); + export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; }; + export var use_glo_M2_public_v2_public: use_glo_M2_public; + export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1; + var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; }; + var use_glo_M2_public_v2_private: use_glo_M2_public; + var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1; + + module m2 { + import errorImport = require("glo_M2_public"); + import nonerrorImport = glo_M1_public; + + module m5 { + import m5_errorImport = require("glo_M2_public"); + import m5_nonerrorImport = glo_M1_public; + } + } +} + + +declare module "use_glo_M3_private" { + import use_glo_M3_private = glo_M3_private; + export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; }; + export var use_glo_M3_private_v2_public: use_glo_M3_private; + export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1; + var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; }; + var use_glo_M3_private_v2_private: use_glo_M3_private; + var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1; + + import use_glo_M4_private = require("glo_M4_private"); + export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; }; + export var use_glo_M4_private_v2_public: use_glo_M4_private; + export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1; + var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; }; + var use_glo_M4_private_v2_private: use_glo_M4_private; + var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1; + + module m2 { + import errorImport = require("glo_M4_private"); + import nonerrorImport = glo_M3_private; + + module m5 { + import m5_errorImport = require("glo_M4_private"); + import m5_nonerrorImport = glo_M3_private; + } + } +} + +declare module "anotherParseError" { + module m2 { + declare module "abc" { + } + } + + module m2 { + module "abc2" { + } + } + module "abc3" { + } +} + +declare export module "anotherParseError2" { + module m2 { + declare module "abc" { + } + } + + module m2 { + module "abc2" { + } + } + module "abc3" { + } +} + +module m2 { + import m3 = require("use_glo_M1_public"); + module m4 { + var a = 10; + import m2 = require("use_glo_M1_public"); + } + +} + +export module m3 { + import m3 = require("use_glo_M1_public"); + module m4 { + var a = 10; + import m2 = require("use_glo_M1_public"); + } + +} \ No newline at end of file diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts index 9219f1ae6a9..89bd95e6a64 100644 --- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts +++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true // private elements module m_private { export class c_private { diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts index fd7cecc01bf..454212f2e31 100644 --- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts +++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true // private elements module m_private { export class c_private { diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts index aa98a1a969b..16c6e19fb59 100644 --- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts +++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_require.ts // Public elements export class c_public { @@ -28,6 +29,8 @@ declare module 'm2' { } // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_core.ts +/// +/// // Privacy errors - importing private elements export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require"); export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1"); @@ -35,11 +38,11 @@ export import im_public_mi_public = require("m"); export import im_public_mu_public = require("m2"); // Usage of privacy error imports -var privateUse_im_public_mi_private = new im_public_mi_private.c_private(); -export var publicUse_im_public_mi_private = new im_public_mi_private.c_private(); -var privateUse_im_public_mu_private = new im_public_mu_private.c_private(); -export var publicUse_im_public_mu_private = new im_public_mu_private.c_private(); -var privateUse_im_public_mi_public = new im_public_mi_public.c_public(); -export var publicUse_im_public_mi_public = new im_public_mi_public.c_public(); -var privateUse_im_public_mi_public = new im_public_mi_public.c_public(); -export var publicUse_im_public_mi_public = new im_public_mi_public.c_public(); +var privateUse_im_public_mi_private = new im_public_mi_private.c_public(); +export var publicUse_im_public_mi_private = new im_public_mi_private.c_public(); +var privateUse_im_public_mu_private = new im_public_mu_private.c_public(); +export var publicUse_im_public_mu_private = new im_public_mu_private.c_public(); +var privateUse_im_public_mi_public = new im_public_mi_public.c_private(); +export var publicUse_im_public_mi_public = new im_public_mi_public.c_private(); +var privateUse_im_public_mi_public = new im_public_mi_public.c_private(); +export var publicUse_im_public_mi_public = new im_public_mi_public.c_private(); diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts index b2d3910a959..f663871cbdb 100644 --- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts +++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts // Public elements @@ -28,6 +29,8 @@ declare module 'm2' { } // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts +/// +/// // Privacy errors - importing private elements import im_private_mi_private = require("m"); import im_private_mu_private = require("m2"); diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts index ada020f4da6..987c35c7325 100644 --- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts +++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts @@ -1,4 +1,5 @@ //@module: amd +//@declaration: true // private elements module m_private { export class c_private { diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts index d703e1ea0d6..8f241c5ab01 100644 --- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts +++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts @@ -1,4 +1,6 @@ //@module: amd +//@declaration: true + // private elements module m_private { export class c_private { diff --git a/tests/cases/compiler/privacyVarDeclFile.ts b/tests/cases/compiler/privacyVarDeclFile.ts new file mode 100644 index 00000000000..46012bc9d9f --- /dev/null +++ b/tests/cases/compiler/privacyVarDeclFile.ts @@ -0,0 +1,426 @@ +// @module: commonjs +// @declaration: true + +// @Filename:privacyVarDeclFile_externalModule.ts +class privateClass { +} + +export class publicClass { +} + +export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error +} + +export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; +} + +interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; +} + +interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; +} + +export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + private myPrivateProperty: privateClass; +} + +export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; +} + +class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; +} + +class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; +} + +export var publicVarWithPrivatePropertyTypes: privateClass; // Error +export var publicVarWithPublicPropertyTypes: publicClass; +var privateVarWithPrivatePropertyTypes: privateClass; +var privateVarWithPublicPropertyTypes: publicClass; + +export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error +export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; +declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; +declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + +export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error +} +export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + myPublicProperty: privateModule.publicClass; // Error +} +export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error +export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + +interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; +} +class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; +} +var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; +declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + +export module publicModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + myPublicProperty: privateModule.publicClass; // Error + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; +} + +module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; +} + +// @Filename: privacyVarDeclFile_GlobalFile.ts +class publicClassInGlobal { +} +interface publicInterfaceWithPublicPropertyTypesInGlobal { + myProperty: publicClassInGlobal; +} +class publicClassWithWithPublicPropertyTypesInGlobal { + static myPublicStaticProperty: publicClassInGlobal; + private static myPrivateStaticProperty: publicClassInGlobal; + myPublicProperty: publicClassInGlobal; + private myPrivateProperty: publicClassInGlobal; +} +var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; +declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal; + +module publicModuleInGlobal { + class privateClass { + } + + export class publicClass { + } + + module privateModule { + class privateClass { + } + + export class publicClass { + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + } + + export interface publicInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; // Error + } + + export interface publicInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + interface privateInterfaceWithPrivatePropertyTypes { + myProperty: privateClass; + } + + interface privateInterfaceWithPublicPropertyTypes { + myProperty: publicClass; + } + + export class publicClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; // Error + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; // Error + private myPrivateProperty: privateClass; + } + + export class publicClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + class privateClassWithWithPrivatePropertyTypes { + static myPublicStaticProperty: privateClass; + private static myPrivateStaticProperty: privateClass; + myPublicProperty: privateClass; + private myPrivateProperty: privateClass; + } + + class privateClassWithWithPublicPropertyTypes { + static myPublicStaticProperty: publicClass; + private static myPrivateStaticProperty: publicClass; + myPublicProperty: publicClass; + private myPrivateProperty: publicClass; + } + + export var publicVarWithPrivatePropertyTypes: privateClass; // Error + export var publicVarWithPublicPropertyTypes: publicClass; + var privateVarWithPrivatePropertyTypes: privateClass; + var privateVarWithPublicPropertyTypes: publicClass; + + export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error + export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; + declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; + declare var privateAmbientVarWithPublicPropertyTypes: publicClass; + + export interface publicInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; // Error + } + export class publicClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; // Error + myPublicProperty: privateModule.publicClass; // Error + } + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error + + interface privateInterfaceWithPrivateModulePropertyTypes { + myProperty: privateModule.publicClass; + } + class privateClassWithPrivateModulePropertyTypes { + static myPublicStaticProperty: privateModule.publicClass; + myPublicProperty: privateModule.publicClass; + } + var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass; + declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; +} \ No newline at end of file diff --git a/tests/cases/compiler/unusedImportDeclaration.ts b/tests/cases/compiler/unusedImportDeclaration.ts index 83cb089acfe..263b355f69c 100644 --- a/tests/cases/compiler/unusedImportDeclaration.ts +++ b/tests/cases/compiler/unusedImportDeclaration.ts @@ -1,4 +1,5 @@ //@module: commonjs +//@declaration: true // @Filename: unusedImportDeclaration_testerB.ts class TesterB { me: string;