diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 80a04129eedc4..9c236c4560094 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -393,7 +393,7 @@ namespace ts { } let sourceFiles = host.getSourceFiles(); - return sourceFiles.indexOf(file1) <= sourceFiles.indexOf(file2); + return indexOf(sourceFiles, file1) <= indexOf(sourceFiles, file2); } // Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and @@ -669,19 +669,6 @@ namespace ts { return false; } - function getAnyImportSyntax(node: Node): AnyImportSyntax { - if (isAliasSymbolDeclaration(node)) { - if (node.kind === SyntaxKind.ImportEqualsDeclaration) { - return node; - } - - while (node && node.kind !== SyntaxKind.ImportDeclaration) { - node = node.parent; - } - return node; - } - } - function getDeclarationOfAliasSymbol(symbol: Symbol): Declaration { return forEach(symbol.declarations, d => isAliasSymbolDeclaration(d) ? d : undefined); } @@ -879,7 +866,7 @@ namespace ts { } // This function is only for imports with entity names - function getSymbolOfPartOfRightHandSideOfImportEquals(entityName: EntityName, importDeclaration?: ImportEqualsDeclaration): Symbol { + function getSymbolOfPartOfRightHandSideOfImportEquals(entityName: EntityName, importDeclaration?: ImportEqualsDeclaration, includeAliases?: boolean): Symbol { if (!importDeclaration) { importDeclaration = getAncestor(entityName, SyntaxKind.ImportEqualsDeclaration); Debug.assert(importDeclaration !== undefined); @@ -895,13 +882,13 @@ namespace ts { } // Check for case 1 and 3 in the above example if (entityName.kind === SyntaxKind.Identifier || entityName.parent.kind === SyntaxKind.QualifiedName) { - return resolveEntityName(entityName, SymbolFlags.Namespace); + return resolveEntityName(entityName, SymbolFlags.Namespace | (includeAliases ? SymbolFlags.Alias : SymbolFlags.None)); } else { - // Case 2 in above example + // Case 2 in above example // entityName.kind could be a QualifiedName or a Missing identifier Debug.assert(entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration); - return resolveEntityName(entityName, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace); + return resolveEntityName(entityName, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | (includeAliases ? SymbolFlags.Alias : SymbolFlags.None)); } } @@ -1290,145 +1277,12 @@ namespace ts { return qualify; } - function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult { - if (symbol && enclosingDeclaration && !(symbol.flags & SymbolFlags.TypeParameter)) { - let initialSymbol = symbol; - let meaningToLook = meaning; - while (symbol) { - // Symbol is accessible if it by itself is accessible - let accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, /*useOnlyExternalAliasing*/ false); - if (accessibleSymbolChain) { - let hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]); - if (!hasAccessibleDeclarations) { - return { - accessibility: SymbolAccessibility.NotAccessible, - errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning), - errorModuleName: symbol !== initialSymbol ? symbolToString(symbol, enclosingDeclaration, SymbolFlags.Namespace) : undefined, - }; - } - return hasAccessibleDeclarations; - } - - // If we haven't got the accessible symbol, it doesn't mean the symbol is actually inaccessible. - // It could be a qualified symbol and hence verify the path - // e.g.: - // module m { - // export class c { - // } - // } - // let x: typeof m.c - // In the above example when we start with checking if typeof m.c symbol is accessible, - // we are going to see if c can be accessed in scope directly. - // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible - // It is accessible if the parent m is accessible because then m.c can be accessed through qualification - meaningToLook = getQualifiedLeftMeaning(meaning); - symbol = getParentOfSymbol(symbol); - } - - // 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 - let symbolExternalModule = forEach(initialSymbol.declarations, getExternalModuleContainer); - if (symbolExternalModule) { - let enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration); - if (symbolExternalModule !== enclosingExternalModule) { - // name from different external module that is not visible - return { - accessibility: SymbolAccessibility.CannotBeNamed, - errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning), - errorModuleName: symbolToString(symbolExternalModule) - }; - } - } - - // Just a local name that is not accessible - return { - accessibility: SymbolAccessibility.NotAccessible, - errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning), - }; - } - - return { accessibility: SymbolAccessibility.Accessible }; - - function getExternalModuleContainer(declaration: Node) { - for (; declaration; declaration = declaration.parent) { - if (hasExternalModuleSymbol(declaration)) { - return getSymbolOfNode(declaration); - } - } - } - } - function hasExternalModuleSymbol(declaration: Node) { return (declaration.kind === SyntaxKind.ModuleDeclaration && (declaration).name.kind === SyntaxKind.StringLiteral) || (declaration.kind === SyntaxKind.SourceFile && isExternalModule(declaration)); } - function hasVisibleDeclarations(symbol: Symbol): SymbolVisibilityResult { - let aliasesToMakeVisible: AnyImportSyntax[]; - if (forEach(symbol.declarations, declaration => !getIsDeclarationVisible(declaration))) { - return undefined; - } - return { accessibility: SymbolAccessibility.Accessible, 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 - - let anyImportSyntax = getAnyImportSyntax(declaration); - if (anyImportSyntax && - !(anyImportSyntax.flags & NodeFlags.Export) && // import clause without export - isDeclarationVisible(anyImportSyntax.parent)) { - getNodeLinks(declaration).isVisible = true; - if (aliasesToMakeVisible) { - if (!contains(aliasesToMakeVisible, anyImportSyntax)) { - aliasesToMakeVisible.push(anyImportSyntax); - } - } - else { - aliasesToMakeVisible = [anyImportSyntax]; - } - return true; - } - - // Declaration is not visible - return false; - } - - return true; - } - } - - function isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult { - // get symbol of the first identifier of the entityName - let meaning: SymbolFlags; - if (entityName.parent.kind === SyntaxKind.TypeQuery) { - // Typeof value - meaning = SymbolFlags.Value | SymbolFlags.ExportValue; - } - else if (entityName.kind === SyntaxKind.QualifiedName || entityName.kind === SyntaxKind.PropertyAccessExpression || - entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration) { - // Left identifier from type reference or TypeAlias - // Entity name of the import declaration - meaning = SymbolFlags.Namespace; - } - else { - // Type Reference or TypeAlias entity = Identifier - meaning = SymbolFlags.Type; - } - - let firstIdentifier = getFirstIdentifier(entityName); - let symbol = resolveName(enclosingDeclaration, (firstIdentifier).text, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined); - - // Verify if the symbol is accessible - return (symbol && hasVisibleDeclarations(symbol)) || { - accessibility: SymbolAccessibility.NotAccessible, - errorSymbolName: getTextOfNode(firstIdentifier), - errorNode: firstIdentifier - }; - } - - function writeKeyword(writer: SymbolWriter, kind: SyntaxKind) { + function writeKeyword(writer: SymbolWriter, kind: SyntaxKind) { writer.writeKeyword(tokenToString(kind)); } @@ -1507,15 +1361,19 @@ namespace ts { * Writes only the name of the symbol out to the writer. Uses the original source text * for the name of the symbol if it is available to match how the user inputted the name. */ - function appendSymbolNameOnly(symbol: Symbol, writer: SymbolWriter): void { + function appendSymbolNameOnly(symbol: Symbol, writer: SymbolWriter, isTypeSymbol: boolean): void { writer.writeSymbol(getNameOfSymbol(symbol), symbol); + + if (isTypeSymbol && writer.trackTypeSymbol) { + writer.trackTypeSymbol(symbol); + } } /** * Enclosing declaration is optional when we don't want to get qualified name in the enclosing declaration scope * Meaning needs to be specified if the enclosing declaration is given */ - function buildSymbolDisplay(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags, typeFlags?: TypeFormatFlags): void { + function buildSymbolDisplay(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags, typeFlags?: TypeFormatFlags, isTypeSymbol?: boolean): void { let parentSymbol: Symbol; function appendParentTypeArgumentsAndSymbolName(symbol: Symbol): void { if (parentSymbol) { @@ -1531,18 +1389,11 @@ namespace ts { } writePunctuation(writer, SyntaxKind.DotToken); } + parentSymbol = symbol; - appendSymbolNameOnly(symbol, writer); + appendSymbolNameOnly(symbol, writer, isTypeSymbol); } - // Let the writer know we just wrote out a symbol. The declaration emitter writer uses - // this to determine if an import it has previously seen (and not written out) needs - // to be written to the file once the walk of the tree is complete. - // - // NOTE(cyrusn): This approach feels somewhat unfortunate. A simple pass over the tree - // up front (for example, during checking) could determine if we need to emit the imports - // and we could then access that data during declaration emit. - writer.trackSymbol(symbol, enclosingDeclaration, meaning); function walkSymbol(symbol: Symbol, meaning: SymbolFlags): void { if (symbol) { let accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & SymbolFormatFlags.UseOnlyExternalAliasing)); @@ -1562,6 +1413,11 @@ namespace ts { } } else { + + if (!parentSymbol && writer.trackInaccesibleSymbol) { + writer.trackInaccesibleSymbol(symbol); + } + // If we didn't find accessible symbol chain for this symbol, break if this is external module if (!parentSymbol && ts.forEach(symbol.declarations, hasExternalModuleSymbol)) { return; @@ -1607,7 +1463,7 @@ namespace ts { } else if (type.flags & (TypeFlags.Class | TypeFlags.Interface | TypeFlags.Enum | TypeFlags.TypeParameter)) { // The specified symbol flags need to be reinterpreted as type flags - buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, flags); + buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, flags, /*isTypeSymbol*/true); } else if (type.flags & TypeFlags.Tuple) { writeTupleType(type); @@ -1649,7 +1505,7 @@ namespace ts { // Unnamed function expressions, arrow functions, and unnamed class expressions have reserved names that // we don't want to display if (!isReservedMemberName(symbol.name)) { - buildSymbolDisplay(symbol, writer, enclosingDeclaration, SymbolFlags.Type); + buildSymbolDisplay(symbol, writer, enclosingDeclaration, SymbolFlags.Type, undefined, undefined, /*isTypeSymbol*/true); } if (pos < end) { writePunctuation(writer, SyntaxKind.LessThanToken); @@ -1728,7 +1584,7 @@ namespace ts { let typeAlias = getTypeAliasForTypeLiteral(type); if (typeAlias) { // The specified symbol flags need to be reinterpreted as type flags - buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, flags); + buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, flags, /*isTypeSymbol*/true); } else { // Recursive usage, use any @@ -1769,7 +1625,7 @@ namespace ts { function writeTypeofSymbol(type: ObjectType, typeFormatFlags?: TypeFormatFlags) { writeKeyword(writer, SyntaxKind.TypeOfKeyword); writeSpace(writer); - buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Value, SymbolFormatFlags.None, typeFormatFlags); + buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, SymbolFlags.Value, SymbolFormatFlags.None, typeFormatFlags, /*isTypeSymbol*/true); } function getIndexerParameterName(type: ObjectType, indexKind: IndexKind, fallbackName: string): string { @@ -1899,7 +1755,7 @@ namespace ts { } function buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags, symbolStack?: Symbol[]) { - appendSymbolNameOnly(tp.symbol, writer); + appendSymbolNameOnly(tp.symbol, writer, false); let constraint = getConstraintOfTypeParameter(tp); if (constraint) { writeSpace(writer); @@ -1914,7 +1770,7 @@ namespace ts { if (isRestParameter(parameterNode)) { writePunctuation(writer, SyntaxKind.DotDotDotToken); } - appendSymbolNameOnly(p, writer); + appendSymbolNameOnly(p, writer, false); if (isOptionalParameter(parameterNode)) { writePunctuation(writer, SyntaxKind.QuestionToken); } @@ -2015,191 +1871,6 @@ namespace ts { }); } - function isDeclarationVisible(node: Declaration): boolean { - function getContainingExternalModule(node: Node) { - for (; node; node = node.parent) { - if (node.kind === SyntaxKind.ModuleDeclaration) { - if ((node).name.kind === SyntaxKind.StringLiteral) { - return node; - } - } - else if (node.kind === SyntaxKind.SourceFile) { - return isExternalModule(node) ? node : undefined; - } - } - Debug.fail("getContainingModule cant reach here"); - } - - function isUsedInExportAssignment(node: Node) { - // Get source File and see if it is external module and has export assigned symbol - let externalModule = getContainingExternalModule(node); - let exportAssignmentSymbol: Symbol; - let resolvedExportSymbol: Symbol; - if (externalModule) { - // This is export assigned symbol node - let externalModuleSymbol = getSymbolOfNode(externalModule); - exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol); - let symbolOfNode = getSymbolOfNode(node); - if (isSymbolUsedInExportAssignment(symbolOfNode)) { - return true; - } - - // if symbolOfNode is alias declaration, resolve the symbol declaration and check - if (symbolOfNode.flags & SymbolFlags.Alias) { - return isSymbolUsedInExportAssignment(resolveAlias(symbolOfNode)); - } - } - - // Check if the symbol is used in export assignment - function isSymbolUsedInExportAssignment(symbol: Symbol) { - if (exportAssignmentSymbol === symbol) { - return true; - } - - if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & SymbolFlags.Alias)) { - // if export assigned symbol is alias declaration, resolve the alias - resolvedExportSymbol = resolvedExportSymbol || resolveAlias(exportAssignmentSymbol); - if (resolvedExportSymbol === symbol) { - return true; - } - - // Container of resolvedExportSymbol is visible - return forEach(resolvedExportSymbol.declarations, (current: Node) => { - while (current) { - if (current === node) { - return true; - } - current = current.parent; - } - }); - } - } - } - - function determineIfDeclarationIsVisible() { - switch (node.kind) { - case SyntaxKind.BindingElement: - return isDeclarationVisible(node.parent.parent); - case SyntaxKind.VariableDeclaration: - if (isBindingPattern(node.name) && - !(node.name).elements.length) { - // If the binding pattern is empty, this variable declaration is not visible - return false; - } - // Otherwise fall through - case SyntaxKind.ModuleDeclaration: - case SyntaxKind.ClassDeclaration: - case SyntaxKind.InterfaceDeclaration: - case SyntaxKind.TypeAliasDeclaration: - case SyntaxKind.FunctionDeclaration: - case SyntaxKind.EnumDeclaration: - case SyntaxKind.ImportEqualsDeclaration: - let parent = getDeclarationContainer(node); - // If the node is not exported or it is not ambient module element (except import declaration) - if (!(getCombinedNodeFlags(node) & NodeFlags.Export) && - !(node.kind !== SyntaxKind.ImportEqualsDeclaration && parent.kind !== SyntaxKind.SourceFile && isInAmbientContext(parent))) { - return isGlobalSourceFile(parent); - } - // Exported members/ambient module elements (exception import declaration) are visible if parent is visible - return isDeclarationVisible(parent); - - case SyntaxKind.PropertyDeclaration: - case SyntaxKind.PropertySignature: - case SyntaxKind.GetAccessor: - case SyntaxKind.SetAccessor: - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - if (node.flags & (NodeFlags.Private | NodeFlags.Protected)) { - // Private/protected properties/methods are not visible - return false; - } - // Public properties/methods are visible if its parents are visible, so let it fall into next case statement - - case SyntaxKind.Constructor: - case SyntaxKind.ConstructSignature: - case SyntaxKind.CallSignature: - case SyntaxKind.IndexSignature: - case SyntaxKind.Parameter: - case SyntaxKind.ModuleBlock: - case SyntaxKind.FunctionType: - case SyntaxKind.ConstructorType: - case SyntaxKind.TypeLiteral: - case SyntaxKind.TypeReference: - case SyntaxKind.ArrayType: - case SyntaxKind.TupleType: - case SyntaxKind.UnionType: - case SyntaxKind.IntersectionType: - case SyntaxKind.ParenthesizedType: - return isDeclarationVisible(node.parent); - - // Default binding, import specifier and namespace import is visible - // only on demand so by default it is not visible - case SyntaxKind.ImportClause: - case SyntaxKind.NamespaceImport: - case SyntaxKind.ImportSpecifier: - return false; - - // Type parameters are always visible - case SyntaxKind.TypeParameter: - // Source file is always visible - case SyntaxKind.SourceFile: - return true; - - // Export assignements do not create name bindings outside the module - case SyntaxKind.ExportAssignment: - return false; - - default: - Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind); - } - } - - if (node) { - let links = getNodeLinks(node); - if (links.isVisible === undefined) { - links.isVisible = !!determineIfDeclarationIsVisible(); - } - return links.isVisible; - } - } - - function collectLinkedAliases(node: Identifier): Node[] { - let exportSymbol: Symbol; - if (node.parent && node.parent.kind === SyntaxKind.ExportAssignment) { - exportSymbol = resolveName(node.parent, node.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias, Diagnostics.Cannot_find_name_0, node); - } - else if (node.parent.kind === SyntaxKind.ExportSpecifier) { - let exportSpecifier = node.parent; - exportSymbol = (exportSpecifier.parent.parent).moduleSpecifier ? - getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) : - resolveEntityName(exportSpecifier.propertyName || exportSpecifier.name, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias); - } - let result: Node[] = []; - if (exportSymbol) { - buildVisibleNodeList(exportSymbol.declarations); - } - return result; - - function buildVisibleNodeList(declarations: Declaration[]) { - forEach(declarations, declaration => { - getNodeLinks(declaration).isVisible = true; - let resultNode = getAnyImportSyntax(declaration) || declaration; - if (!contains(result, resultNode)) { - result.push(resultNode); - } - - if (isInternalModuleImportEqualsDeclaration(declaration)) { - // Add the referenced top container visible - let internalModuleReference = (declaration).moduleReference; - let firstIdentifier = getFirstIdentifier(internalModuleReference); - let importSymbol = resolveName(declaration, firstIdentifier.text, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace, - Diagnostics.Cannot_find_name_0, firstIdentifier); - buildVisibleNodeList(importSymbol.declarations); - } - }); - } - } - /** * Push an entry on the type resolution stack. If an entry with the given target and the given property name * is already on the stack, and no entries in between already have a type, then a circularity has occurred. @@ -14093,7 +13764,7 @@ namespace ts { if (isInRightSideOfImportOrExportAssignment(node)) { return node.parent.kind === SyntaxKind.ExportAssignment ? getSymbolOfEntityNameOrPropertyAccessExpression(node) - : getSymbolOfPartOfRightHandSideOfImportEquals(node); + : getSymbolOfPartOfRightHandSideOfImportEquals(node, /*importDeclaration*/ undefined, /*includeAliases*/ true); } else if (node.parent.kind === SyntaxKind.BindingElement && node.parent.parent.kind === SyntaxKind.ObjectBindingPattern && @@ -14524,6 +14195,14 @@ namespace ts { getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); } + function writeBaseConstructorTypeOfClass(node: ClassLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) { + let classSymbol = getSymbolOfNode(node); + let classType = getDeclaredTypeOfSymbol(classSymbol); + resolveBaseTypesOfClass(classType); + let type = classType.resolvedBaseTypes[0]; + getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags); + } + function hasGlobalName(name: string): boolean { return hasProperty(globals, name); } @@ -14590,18 +14269,17 @@ namespace ts { isReferencedAliasDeclaration, getNodeCheckFlags, isTopLevelValueImportEqualsWithEntityName, - isDeclarationVisible, isImplementationOfOverload, writeTypeOfDeclaration, writeReturnTypeOfSignatureDeclaration, writeTypeOfExpression, - isSymbolAccessible, - isEntityNameVisible, + writeBaseConstructorTypeOfClass, getConstantValue, - collectLinkedAliases, getBlockScopedVariableId, getReferencedValueDeclaration, getTypeReferenceSerializationKind, + getSymbolAtLocation, + getAliasedSymbol: resolveAlias, isOptionalParameter }; } diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts index e5914d1006093..a8b16f0b68ed0 100644 --- a/src/compiler/declarationEmitter.ts +++ b/src/compiler/declarationEmitter.ts @@ -2,156 +2,125 @@ /* @internal */ namespace ts { - interface ModuleElementDeclarationEmitInfo { - node: Node; - outputPos: number; - indent: number; - asynchronousOutput?: string; // If the output for alias was written asynchronously, the corresponding output - subModuleElementDeclarationEmitInfo?: ModuleElementDeclarationEmitInfo[]; - isVisible?: boolean; + interface NodeLinks { + visibleChildren?: Node[]; + visited?: boolean; + collected?: boolean; + hasExportDeclarations?: boolean; + errorReported?: boolean; + isInternal?: boolean; } - interface DeclarationEmit { - reportedDeclarationError: boolean; - moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[]; - synchronousDeclarationOutput: string; - referencePathsOutput: string; + interface PreprocessResults { + sourceFiles: SourceFile[]; + nodeLinks: NodeLinks[]; + resolver: EmitResolver; } - type GetSymbolAccessibilityDiagnostic = (symbolAccesibilityResult: SymbolAccessiblityResult) => SymbolAccessibilityDiagnostic; + const emptyHandler = () => { }; - interface EmitTextWriterWithSymbolWriter extends EmitTextWriter, SymbolWriter { - getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic; - } + function writeDeclarations(outputFileName: string, preprocessResults: PreprocessResults, host: EmitHost, diagnostics: Diagnostic[]): void { + let newLine = host.getNewLine(); + let compilerOptions = host.getCompilerOptions(); + let enclosingDeclaration: Node; + let currentSourceFile: SourceFile; - interface SymbolAccessibilityDiagnostic { - errorNode: Node; - diagnosticMessage: DiagnosticMessage; - typeName?: DeclarationName; - } + let resolver = preprocessResults.resolver; + let nodeLinks = preprocessResults.nodeLinks; - export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] { - let diagnostics: Diagnostic[] = []; - let jsFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".js"); - emitDeclarations(host, resolver, diagnostics, jsFilePath, targetSourceFile); - return diagnostics; - } + // setup the writer + let writer = createNewTextWriterWithSymbolWriter(); + let write = writer.write; + let writeTextOfNode = writer.writeTextOfNode; + let writeLine = writer.writeLine; + let increaseIndent = writer.increaseIndent; + let decreaseIndent = writer.decreaseIndent; - function emitDeclarations(host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[], jsFilePath: string, root?: SourceFile): DeclarationEmit { - let newLine = host.getNewLine(); - let compilerOptions = host.getCompilerOptions(); + // Emit any triple-slash references + emitTripleSlashReferences(preprocessResults.sourceFiles); - let write: (s: string) => void; - let writeLine: () => void; - let increaseIndent: () => void; - let decreaseIndent: () => void; - let writeTextOfNode: (sourceFile: SourceFile, node: Node) => void; + for (let sourceFile of preprocessResults.sourceFiles) { + // emit the declarations from this file + emitSourceFile(sourceFile); + } - let writer = createAndSetNewTextWriterWithSymbolWriter(); + // write the output to disk + writeFile(host, diagnostics, outputFileName, writer.getText(), compilerOptions.emitBOM); - let enclosingDeclaration: Node; - let currentSourceFile: SourceFile; - let reportedDeclarationError = false; - let emitJsDocComments = compilerOptions.removeComments ? function (declaration: Node) { } : writeJsDocComments; - let emit = compilerOptions.stripInternal ? stripInternal : emitNode; - - let moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[] = []; - let asynchronousSubModuleDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[]; - - // Contains the reference paths that needs to go in the declaration file. - // Collecting this separately because reference paths need to be first thing in the declaration file - // and we could be collecting these paths from multiple files into single one with --out option - let referencePathsOutput = ""; - - if (root) { - // Emitting just a single file, so emit references in this file only - if (!compilerOptions.noResolve) { - let addedGlobalFileReference = false; - forEach(root.referencedFiles, fileReference => { - let referencedFile = tryResolveScriptReference(host, root, fileReference); - - // All the references that are not going to be part of same file - if (referencedFile && ((referencedFile.flags & NodeFlags.DeclarationFile) || // This is a declare file reference - shouldEmitToOwnFile(referencedFile, compilerOptions) || // This is referenced file is emitting its own js file - !addedGlobalFileReference)) { // Or the global out file corresponding to this reference was not added - - writeReferencePath(referencedFile); - if (!isExternalModuleOrDeclarationFile(referencedFile)) { - addedGlobalFileReference = true; - } - } - }); - } + return; - emitSourceFile(root); + function getNodeLinks(node: Node): NodeLinks { + let nodeId = getNodeId(node); + return nodeLinks[nodeId] || (nodeLinks[nodeId] = {}); + } - // create asynchronous output for the importDeclarations - if (moduleElementDeclarationEmitInfo.length) { - let oldWriter = writer; - forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => { - if (aliasEmitInfo.isVisible) { - Debug.assert(aliasEmitInfo.node.kind === SyntaxKind.ImportDeclaration); - createAndSetNewTextWriterWithSymbolWriter(); - Debug.assert(aliasEmitInfo.indent === 0); - writeImportDeclaration(aliasEmitInfo.node); - aliasEmitInfo.asynchronousOutput = writer.getText(); - } - }); - setWriter(oldWriter); + function emitTripleSlashReferences(sourceFiles: SourceFile[]) { + if (compilerOptions.noResolve) { + // Nothing to do + return; } - } - else { - // Emit references corresponding to this file + let emittedReferencedFiles: SourceFile[] = []; - forEach(host.getSourceFiles(), sourceFile => { - if (!isExternalModuleOrDeclarationFile(sourceFile)) { - // Check what references need to be added - if (!compilerOptions.noResolve) { - forEach(sourceFile.referencedFiles, fileReference => { - let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); - - // If the reference file is a declaration file or an external module, emit that reference - if (referencedFile && (isExternalModuleOrDeclarationFile(referencedFile) && - !contains(emittedReferencedFiles, referencedFile))) { // If the file reference was not already emitted - - writeReferencePath(referencedFile); - emittedReferencedFiles.push(referencedFile); - } - }); + let addedGlobalFileReference = false; + + // Emit references corresponding to this file + for (let sourceFile of sourceFiles) { + emitTripleSlashReferncesInFile(sourceFile); + } + + return; + + function emitTripleSlashReferncesInFile(sourceFile: SourceFile): void { + forEach(sourceFile.referencedFiles, fileReference => { + let referencedFile = tryResolveScriptReference(host, sourceFile, fileReference); + + // Could not find the file, or has been already emitted + if (!referencedFile || contains(emittedReferencedFiles, referencedFile)) { + return false; } - emitSourceFile(sourceFile); - } - }); - } + let shouldEmitRefrence: boolean - return { - reportedDeclarationError, - moduleElementDeclarationEmitInfo, - synchronousDeclarationOutput: writer.getText(), - referencePathsOutput, - }; + if (isDeclarationFile(referencedFile) || shouldEmitToOwnFile(referencedFile, compilerOptions)) { + // If the reference file is a declaration file or an external module, + // we know there is going to be a .d.ts file matching it. Emit that reference + shouldEmitRefrence = true; + } + else if ((compilerOptions.out || compilerOptions.outFile) && !addedGlobalFileReference && isExternalModule(sourceFile)) { + // This is a reference to a file in the global island, since out is on, all files + // in the global island will be merged into one. so keep only one of these references + addedGlobalFileReference = true; + shouldEmitRefrence = true; + } - function hasInternalAnnotation(range: CommentRange) { - let text = currentSourceFile.text; - let comment = text.substring(range.pos, range.end); - return comment.indexOf("@internal") >= 0; - } + if (shouldEmitRefrence) { + emitReferencePath(referencedFile); + emittedReferencedFiles.push(referencedFile); + } + }); + } - function stripInternal(node: Node) { - if (node) { - let leadingCommentRanges = getLeadingCommentRanges(currentSourceFile.text, node.pos); - if (forEach(leadingCommentRanges, hasInternalAnnotation)) { - return; - } + function emitReferencePath(referencedFile: SourceFile) { + let declFileName = referencedFile.flags & NodeFlags.DeclarationFile + ? referencedFile.fileName // Declaration file, use declaration file name + : shouldEmitToOwnFile(referencedFile, compilerOptions) + ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file + : removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts"; // Global out file - emitNode(node); + declFileName = getRelativePathToDirectoryOrUrl( + getDirectoryPath(normalizeSlashes(outputFileName)), + declFileName, + host.getCurrentDirectory(), + host.getCanonicalFileName, + /*isAbsolutePathAnUrl*/ false); + + write(`/// `); + writeLine(); } } - function createAndSetNewTextWriterWithSymbolWriter(): EmitTextWriterWithSymbolWriter { - let writer = createTextWriter(newLine); - writer.trackSymbol = trackSymbol; + function createNewTextWriterWithSymbolWriter(): EmitTextWriter & SymbolWriter { + let writer = createTextWriter(newLine); writer.writeKeyword = writer.write; writer.writeOperator = writer.write; writer.writePunctuation = writer.write; @@ -159,106 +128,10 @@ namespace ts { writer.writeStringLiteral = writer.writeLiteral; writer.writeParameter = writer.write; writer.writeSymbol = writer.write; - setWriter(writer); return writer; } - function setWriter(newWriter: EmitTextWriterWithSymbolWriter) { - writer = newWriter; - write = newWriter.write; - writeTextOfNode = newWriter.writeTextOfNode; - writeLine = newWriter.writeLine; - increaseIndent = newWriter.increaseIndent; - decreaseIndent = newWriter.decreaseIndent; - } - - function writeAsynchronousModuleElements(nodes: Node[]) { - let oldWriter = writer; - forEach(nodes, declaration => { - let nodeToCheck: Node; - if (declaration.kind === SyntaxKind.VariableDeclaration) { - nodeToCheck = declaration.parent.parent; - } else if (declaration.kind === SyntaxKind.NamedImports || declaration.kind === SyntaxKind.ImportSpecifier || declaration.kind === SyntaxKind.ImportClause) { - Debug.fail("We should be getting ImportDeclaration instead to write"); - } else { - nodeToCheck = declaration; - } - - let moduleElementEmitInfo = forEach(moduleElementDeclarationEmitInfo, declEmitInfo => declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined); - if (!moduleElementEmitInfo && asynchronousSubModuleDeclarationEmitInfo) { - moduleElementEmitInfo = forEach(asynchronousSubModuleDeclarationEmitInfo, declEmitInfo => declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined); - } - - // If the alias was marked as not visible when we saw its declaration, we would have saved the aliasEmitInfo, but if we haven't yet visited the alias declaration - // then we don't need to write it at this point. We will write it when we actually see its declaration - // Eg. - // export function bar(a: foo.Foo) { } - // import foo = require("foo"); - // Writing of function bar would mark alias declaration foo as visible but we haven't yet visited that declaration so do nothing, - // we would write alias foo declaration when we visit it since it would now be marked as visible - if (moduleElementEmitInfo) { - if (moduleElementEmitInfo.node.kind === SyntaxKind.ImportDeclaration) { - // we have to create asynchronous output only after we have collected complete information - // because it is possible to enable multiple bindings as asynchronously visible - moduleElementEmitInfo.isVisible = true; - } - else { - createAndSetNewTextWriterWithSymbolWriter(); - for (let declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) { - increaseIndent(); - } - - if (nodeToCheck.kind === SyntaxKind.ModuleDeclaration) { - Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined); - asynchronousSubModuleDeclarationEmitInfo = []; - } - writeModuleElement(nodeToCheck); - if (nodeToCheck.kind === SyntaxKind.ModuleDeclaration) { - moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo; - asynchronousSubModuleDeclarationEmitInfo = undefined; - } - moduleElementEmitInfo.asynchronousOutput = writer.getText(); - } - } - }); - setWriter(oldWriter); - } - - function handleSymbolAccessibilityError(symbolAccesibilityResult: SymbolAccessiblityResult) { - if (symbolAccesibilityResult.accessibility === SymbolAccessibility.Accessible) { - // write the aliases - if (symbolAccesibilityResult && symbolAccesibilityResult.aliasesToMakeVisible) { - writeAsynchronousModuleElements(symbolAccesibilityResult.aliasesToMakeVisible); - } - } - else { - // Report error - reportedDeclarationError = true; - let errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccesibilityResult); - if (errorInfo) { - if (errorInfo.typeName) { - diagnostics.push(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, - errorInfo.diagnosticMessage, - getSourceTextOfNodeFromSourceFile(currentSourceFile, errorInfo.typeName), - symbolAccesibilityResult.errorSymbolName, - symbolAccesibilityResult.errorModuleName)); - } - else { - diagnostics.push(createDiagnosticForNode(symbolAccesibilityResult.errorNode || errorInfo.errorNode, - errorInfo.diagnosticMessage, - symbolAccesibilityResult.errorSymbolName, - symbolAccesibilityResult.errorModuleName)); - } - } - } - } - - function trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) { - handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning)); - } - - function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { - writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; + function emitTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, type: TypeNode) { write(": "); if (type) { // Write the type @@ -269,8 +142,7 @@ namespace ts { } } - function writeReturnTypeAtSignature(signature: SignatureDeclaration, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { - writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; + function emitReturnTypeAtSignature(signature: SignatureDeclaration) { write(": "); if (signature.type) { // Write the type @@ -281,43 +153,32 @@ namespace ts { } } - function emitLines(nodes: Node[]) { - for (let node of nodes) { - emit(node); - } - } - - function emitSeparatedList(nodes: Node[], separator: string, eachNodeEmitFn: (node: Node) => void, canEmitFn?: (node: Node) => boolean) { + function emitSeparatedList(nodes: Node[], separator: string, eachNodeEmitFn: (node: Node) => void) { let currentWriterPos = writer.getTextPos(); for (let node of nodes) { - if (!canEmitFn || canEmitFn(node)) { - if (currentWriterPos !== writer.getTextPos()) { - write(separator); - } - currentWriterPos = writer.getTextPos(); - eachNodeEmitFn(node); + if (currentWriterPos !== writer.getTextPos()) { + write(separator); } + currentWriterPos = writer.getTextPos(); + eachNodeEmitFn(node); } } - function emitCommaList(nodes: Node[], eachNodeEmitFn: (node: Node) => void, canEmitFn?: (node: Node) => boolean) { - emitSeparatedList(nodes, ", ", eachNodeEmitFn, canEmitFn); + function emitCommaList(nodes: Node[], eachNodeEmitFn: (node: Node) => void) { + emitSeparatedList(nodes, ", ", eachNodeEmitFn); } - function writeJsDocComments(declaration: Node) { - if (declaration) { - let jsDocComments = getJsDocComments(declaration, currentSourceFile); - emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments); - // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space - emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, writeCommentRange); + function emitJsDocComments(declaration: Node) { + if (!compilerOptions.removeComments) { + if (declaration) { + let jsDocComments = getJsDocComments(declaration, currentSourceFile); + emitNewLineBeforeLeadingComments(currentSourceFile, writer, declaration, jsDocComments); + // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space + emitComments(currentSourceFile, writer, jsDocComments, /*trailingSeparator*/ true, newLine, writeCommentRange); + } } } - function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type: TypeNode | EntityName, getSymbolAccessibilityDiagnostic: GetSymbolAccessibilityDiagnostic) { - writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic; - emitType(type); - } - function emitType(type: TypeNode | Identifier | QualifiedName) { switch (type.kind) { case SyntaxKind.AnyKeyword: @@ -370,13 +231,18 @@ namespace ts { } } - function emitEntityName(entityName: EntityName | PropertyAccessExpression) { - let visibilityResult = resolver.isEntityNameVisible(entityName, - // Aliases can be written asynchronously so use correct enclosing declaration - entityName.parent.kind === SyntaxKind.ImportEqualsDeclaration ? entityName.parent : enclosingDeclaration); + function emitEntityName(entityName: EntityName | Expression) { - handleSymbolAccessibilityError(visibilityResult); - writeEntityName(entityName); + if (entityName.kind === SyntaxKind.Identifier) { + writeTextOfNode(currentSourceFile, entityName); + } + else { + let left = entityName.kind === SyntaxKind.QualifiedName ? (entityName).left : (entityName).expression; + let right = entityName.kind === SyntaxKind.QualifiedName ? (entityName).right : (entityName).name; + emitEntityName(left); + write("."); + writeTextOfNode(currentSourceFile, right); + } } function emitExpressionWithTypeArguments(node: ExpressionWithTypeArguments) { @@ -442,19 +308,13 @@ namespace ts { writeLine(); increaseIndent(); // write members - emitLines(type.members); + forEach(type.members, emitNode); decreaseIndent(); } write("}"); } } - - function emitSourceFile(node: SourceFile) { - currentSourceFile = node; - enclosingDeclaration = node; - emitLines(node.statements); - } - + // Return a temp variable name to be used in `export default` statements. // The temp name will be of the form _default_counter. // Note that export default is only allowed at most once in a module, so we @@ -484,7 +344,6 @@ namespace ts { write("declare var "); write(tempVarName); write(": "); - writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic; resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); write(";"); writeLine(); @@ -493,85 +352,6 @@ namespace ts { } write(";"); writeLine(); - - // Make all the declarations visible for the export name - if (node.expression.kind === SyntaxKind.Identifier) { - let nodes = resolver.collectLinkedAliases(node.expression); - - // write each of these declarations asynchronously - writeAsynchronousModuleElements(nodes); - } - - function getDefaultExportAccessibilityDiagnostic(diagnostic: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - return { - diagnosticMessage: Diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0, - errorNode: node - }; - } - } - - function isModuleElementVisible(node: Declaration) { - return resolver.isDeclarationVisible(node); - } - - function emitModuleElement(node: Node, isModuleElementVisible: boolean) { - if (isModuleElementVisible) { - writeModuleElement(node); - } - // Import equals declaration in internal module can become visible as part of any emit so lets make sure we add these irrespective - else if (node.kind === SyntaxKind.ImportEqualsDeclaration || - (node.parent.kind === SyntaxKind.SourceFile && isExternalModule(currentSourceFile))) { - let isVisible: boolean; - if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== SyntaxKind.SourceFile) { - // Import declaration of another module that is visited async so lets put it in right spot - asynchronousSubModuleDeclarationEmitInfo.push({ - node, - outputPos: writer.getTextPos(), - indent: writer.getIndent(), - isVisible - }); - } - else { - if (node.kind === SyntaxKind.ImportDeclaration) { - let importDeclaration = node; - if (importDeclaration.importClause) { - isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) || - isVisibleNamedBinding(importDeclaration.importClause.namedBindings); - } - } - moduleElementDeclarationEmitInfo.push({ - node, - outputPos: writer.getTextPos(), - indent: writer.getIndent(), - isVisible - }); - } - } - } - - function writeModuleElement(node: Node) { - switch (node.kind) { - case SyntaxKind.FunctionDeclaration: - return writeFunctionDeclaration(node); - case SyntaxKind.VariableStatement: - return writeVariableStatement(node); - case SyntaxKind.InterfaceDeclaration: - return writeInterfaceDeclaration(node); - case SyntaxKind.ClassDeclaration: - return writeClassDeclaration(node); - case SyntaxKind.TypeAliasDeclaration: - return writeTypeAliasDeclaration(node); - case SyntaxKind.EnumDeclaration: - return writeEnumDeclaration(node); - case SyntaxKind.ModuleDeclaration: - return writeModuleDeclaration(node); - case SyntaxKind.ImportEqualsDeclaration: - return writeImportEqualsDeclaration(node); - case SyntaxKind.ImportDeclaration: - return writeImportDeclaration(node); - default: - Debug.fail("Unknown symbol kind"); - } } function emitModuleElementDeclarationFlags(node: Node) { @@ -607,8 +387,8 @@ namespace ts { } } - function writeImportEqualsDeclaration(node: ImportEqualsDeclaration) { - // note usage of writer. methods instead of aliases created, just to make sure we are using + function emitImportEqualsDeclaration(node: ImportEqualsDeclaration) { + // note usage of writer. methods instead of aliases created, just to make sure we are using // correct writer especially to handle asynchronous alias writing emitJsDocComments(node); if (node.flags & NodeFlags.Export) { @@ -618,7 +398,7 @@ namespace ts { writeTextOfNode(currentSourceFile, node.name); write(" = "); if (isInternalModuleImportEqualsDeclaration(node)) { - emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError); + emitType(node.moduleReference); write(";"); } else { @@ -627,59 +407,42 @@ namespace ts { write(");"); } writer.writeLine(); - - function getImportEntityNameVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - return { - diagnosticMessage: Diagnostics.Import_declaration_0_is_using_private_name_1, - errorNode: node, - typeName: node.name - }; - } - } - - function isVisibleNamedBinding(namedBindings: NamespaceImport | NamedImports): boolean { - if (namedBindings) { - if (namedBindings.kind === SyntaxKind.NamespaceImport) { - return resolver.isDeclarationVisible(namedBindings); - } - else { - return forEach((namedBindings).elements, namedImport => resolver.isDeclarationVisible(namedImport)); - } - } } - function writeImportDeclaration(node: ImportDeclaration) { - if (!node.importClause && !(node.flags & NodeFlags.Export)) { - // do not write non-exported import declarations that don't have import clauses + function emitImportDeclaration(node: ImportDeclaration) { + var children = sortDeclarations(getNodeLinks(node).visibleChildren); + if (!children) { return; } + emitJsDocComments(node); - if (node.flags & NodeFlags.Export) { - write("export "); - } write("import "); - if (node.importClause) { - let currentWriterPos = writer.getTextPos(); - if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) { - writeTextOfNode(currentSourceFile, node.importClause.name); - } - if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) { - if (currentWriterPos !== writer.getTextPos()) { - // If the default binding was emitted, write the separated - write(", "); - } - if (node.importClause.namedBindings.kind === SyntaxKind.NamespaceImport) { - write("* as "); - writeTextOfNode(currentSourceFile, (node.importClause.namedBindings).name); - } - else { - write("{ "); - emitCommaList((node.importClause.namedBindings).elements, emitImportOrExportSpecifier, resolver.isDeclarationVisible); - write(" }"); - } + + + let index: number; + if ((index = indexOf(children, node.importClause)) === 0) { + children.shift(); // remove it + writeTextOfNode(currentSourceFile, node.importClause.name); + if (children.length) { + // If the default binding was emitted, write the separated + write(", "); + } + } + + if (node.importClause.namedBindings) { + if (node.importClause.namedBindings.kind === SyntaxKind.NamespaceImport && + indexOf(children, node.importClause.namedBindings) >= 0) { + write("* as "); + writeTextOfNode(currentSourceFile, (node.importClause.namedBindings).name); + } + else if (children.length) { + write("{ "); + emitCommaList(children, emitImportOrExportSpecifier); + write(" }"); } - write(" from "); } + + write(" from "); writeTextOfNode(currentSourceFile, node.moduleSpecifier); write(";"); writer.writeLine(); @@ -695,12 +458,6 @@ namespace ts { function emitExportSpecifier(node: ExportSpecifier) { emitImportOrExportSpecifier(node); - - // Make all the declarations visible for the export name - let nodes = resolver.collectLinkedAliases(node.propertyName || node.name); - - // write each of these declarations asynchronously - writeAsynchronousModuleElements(nodes); } function emitExportDeclaration(node: ExportDeclaration) { @@ -722,7 +479,7 @@ namespace ts { writer.writeLine(); } - function writeModuleDeclaration(node: ModuleDeclaration) { + function emitModuleDeclaration(node: ModuleDeclaration) { emitJsDocComments(node); emitModuleElementDeclarationFlags(node); if (node.flags & NodeFlags.Namespace) { @@ -742,14 +499,15 @@ namespace ts { write(" {"); writeLine(); increaseIndent(); - emitLines((node.body).statements); + //emitLines((node.body).statements); + writeChildDeclarations(node); decreaseIndent(); write("}"); writeLine(); enclosingDeclaration = prevEnclosingDeclaration; } - function writeTypeAliasDeclaration(node: TypeAliasDeclaration) { + function emitTypeAliasDeclaration(node: TypeAliasDeclaration) { let prevEnclosingDeclaration = enclosingDeclaration; enclosingDeclaration = node; emitJsDocComments(node); @@ -758,21 +516,13 @@ namespace ts { writeTextOfNode(currentSourceFile, node.name); emitTypeParameters(node.typeParameters); write(" = "); - emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError); + emitType(node.type); write(";"); writeLine(); enclosingDeclaration = prevEnclosingDeclaration; - - function getTypeAliasDeclarationVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - return { - diagnosticMessage: Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1, - errorNode: node.type, - typeName: node.name - }; - } } - function writeEnumDeclaration(node: EnumDeclaration) { + function emitEnumDeclaration(node: EnumDeclaration) { emitJsDocComments(node); emitModuleElementDeclarationFlags(node); if (isConst(node)) { @@ -783,7 +533,8 @@ namespace ts { write(" {"); writeLine(); increaseIndent(); - emitLines(node.members); + //emitLines(node.members); + writeChildDeclarations(node); decreaseIndent(); write("}"); writeLine(); @@ -814,68 +565,7 @@ namespace ts { // If there is constraint present and this is not a type parameter of the private method emit the constraint if (node.constraint && !isPrivateMethodTypeParameter(node)) { write(" extends "); - if (node.parent.kind === SyntaxKind.FunctionType || - node.parent.kind === SyntaxKind.ConstructorType || - (node.parent.parent && node.parent.parent.kind === SyntaxKind.TypeLiteral)) { - Debug.assert(node.parent.kind === SyntaxKind.MethodDeclaration || - node.parent.kind === SyntaxKind.MethodSignature || - node.parent.kind === SyntaxKind.FunctionType || - node.parent.kind === SyntaxKind.ConstructorType || - node.parent.kind === SyntaxKind.CallSignature || - node.parent.kind === SyntaxKind.ConstructSignature); - emitType(node.constraint); - } - else { - emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.constraint, getTypeParameterConstraintVisibilityError); - } - } - - function getTypeParameterConstraintVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - // Type parameter constraints are named by user so we should always be able to name it - let diagnosticMessage: DiagnosticMessage; - switch (node.parent.kind) { - case SyntaxKind.ClassDeclaration: - diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1; - break; - - case SyntaxKind.InterfaceDeclaration: - diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1; - break; - - case SyntaxKind.ConstructSignature: - diagnosticMessage = Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1; - break; - - case SyntaxKind.CallSignature: - diagnosticMessage = Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1; - break; - - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - if (node.parent.flags & NodeFlags.Static) { - diagnosticMessage = Diagnostics.Type_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 = Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1; - } - else { - diagnosticMessage = Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1; - } - break; - - case SyntaxKind.FunctionDeclaration: - diagnosticMessage = Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1; - break; - - default: - Debug.fail("This is unknown parent for type parameter: " + node.parent.kind); - } - - return { - diagnosticMessage, - errorNode: node, - typeName: node.name - }; + emitType(node.constraint); } } @@ -894,36 +584,18 @@ namespace ts { function emitTypeOfTypeReference(node: ExpressionWithTypeArguments) { if (isSupportedExpressionWithTypeArguments(node)) { - emitTypeWithNewGetSymbolAccessibilityDiagnostic(node, getHeritageClauseVisibilityError); + emitType(node); } else if (!isImplementsList && node.expression.kind === SyntaxKind.NullKeyword) { write("null"); } - - function getHeritageClauseVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let diagnosticMessage: DiagnosticMessage; - // Heritage clause is written by user so it can always be named - if (node.parent.parent.kind === SyntaxKind.ClassDeclaration) { - // 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 is inaccessible - diagnosticMessage = Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1; - } - - return { - diagnosticMessage, - errorNode: node, - typeName: (node.parent.parent).name - }; + else { + resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, TypeFormatFlags.UseTypeOfFunction, writer); } } } - function writeClassDeclaration(node: ClassDeclaration) { + function emitClassDeclaration(node: ClassDeclaration) { function emitParameterProperties(constructorDeclaration: ConstructorDeclaration) { if (constructorDeclaration) { forEach(constructorDeclaration.parameters, param => { @@ -954,14 +626,15 @@ namespace ts { writeLine(); increaseIndent(); emitParameterProperties(getFirstConstructorWithBody(node)); - emitLines(node.members); + //emitLines(node.members); + writeChildDeclarations(node); decreaseIndent(); write("}"); writeLine(); enclosingDeclaration = prevEnclosingDeclaration; } - function writeInterfaceDeclaration(node: InterfaceDeclaration) { + function emitInterfaceDeclaration(node: InterfaceDeclaration) { emitJsDocComments(node); emitModuleElementDeclarationFlags(node); write("interface "); @@ -973,7 +646,8 @@ namespace ts { write(" {"); writeLine(); increaseIndent(); - emitLines(node.members); + //emitLines(node.members); + writeChildDeclarations(node); decreaseIndent(); write("}"); writeLine(); @@ -995,70 +669,27 @@ namespace ts { function emitVariableDeclaration(node: VariableDeclaration) { // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted // so there is no check needed to see if declaration is visible - if (node.kind !== SyntaxKind.VariableDeclaration || resolver.isDeclarationVisible(node)) { - if (isBindingPattern(node.name)) { - emitBindingPattern(node.name); + //if (node.kind !== SyntaxKind.VariableDeclaration) { + if (isBindingPattern(node.name)) { + emitBindingPattern(node.name); + } + else { + // If this node is a computed name, it can only be a symbol, because we've already skipped + // it if it's not a well known symbol. In that case, the text of the name will be exactly + // what we want, namely the name expression enclosed in brackets. + writeTextOfNode(currentSourceFile, node.name); + // If optional property emit ? + if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && hasQuestionToken(node)) { + write("?"); } - else { - // If this node is a computed name, it can only be a symbol, because we've already skipped - // it if it's not a well known symbol. In that case, the text of the name will be exactly - // what we want, namely the name expression enclosed in brackets. - writeTextOfNode(currentSourceFile, node.name); - // If optional property emit ? - if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && hasQuestionToken(node)) { - write("?"); - } - if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && node.parent.kind === SyntaxKind.TypeLiteral) { - emitTypeOfVariableDeclarationFromTypeLiteral(node); - } - else if (!(node.flags & NodeFlags.Private)) { - writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError); - } + if ((node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) && node.parent.kind === SyntaxKind.TypeLiteral) { + emitTypeOfVariableDeclarationFromTypeLiteral(node); } - } - - function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult: SymbolAccessiblityResult) { - if (node.kind === SyntaxKind.VariableDeclaration) { - return 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 don't report error on constructor parameter property as that error would be reported during parameter emit - else if (node.kind === SyntaxKind.PropertyDeclaration || node.kind === SyntaxKind.PropertySignature) { - // TODO(jfreeman): Deal with computed properties in error reporting. - if (node.flags & NodeFlags.Static) { - return 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) { - return 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 - return 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; - } + else if (!(node.flags & NodeFlags.Private)) { + emitTypeOfDeclaration(node, node.type); } } - - function getVariableDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult); - return diagnosticMessage !== undefined ? { - diagnosticMessage, - errorNode: node, - typeName: node.name - } : undefined; - } + //} function emitBindingPattern(bindingPattern: BindingPattern) { // Only select non-omitted expression from the bindingPattern's elements. @@ -1068,7 +699,7 @@ namespace ts { // emitted: declare var c: number; // instead of declare var c:number, ; let elements: Node[] = []; for (let element of bindingPattern.elements) { - if (element.kind !== SyntaxKind.OmittedExpression){ + if (element.kind !== SyntaxKind.OmittedExpression) { elements.push(element); } } @@ -1076,22 +707,13 @@ namespace ts { } function emitBindingElement(bindingElement: BindingElement) { - function getBindingElementTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult); - return diagnosticMessage !== undefined ? { - diagnosticMessage, - errorNode: bindingElement, - typeName: bindingElement.name - } : undefined; - } - if (bindingElement.name) { if (isBindingPattern(bindingElement.name)) { emitBindingPattern(bindingElement.name); } else { writeTextOfNode(currentSourceFile, bindingElement.name); - writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError); + emitTypeOfDeclaration(bindingElement, /*type*/ undefined); } } } @@ -1107,25 +729,35 @@ namespace ts { } } - function isVariableStatementVisible(node: VariableStatement) { - return forEach(node.declarationList.declarations, varDeclaration => resolver.isDeclarationVisible(varDeclaration)); + function hasChildDeclaration(node: VariableStatement): boolean { + return forEach(getNodeLinks(node).visibleChildren, child => { + if (isBindingPattern(child.name)) { + return forEach((child.name).elements, e => { + return e.kind !== SyntaxKind.OmittedExpression; + }); + } + return true; + }); } - function writeVariableStatement(node: VariableStatement) { - emitJsDocComments(node); - emitModuleElementDeclarationFlags(node); - if (isLet(node.declarationList)) { - write("let "); - } - else if (isConst(node.declarationList)) { - write("const "); - } - else { - write("var "); + function emitVariableStatement(node: VariableStatement) { + let children = sortDeclarations(getNodeLinks(node).visibleChildren); + if (hasChildDeclaration(node)) { + emitJsDocComments(node); + emitModuleElementDeclarationFlags(node); + if (isLet(node.declarationList)) { + write("let "); + } + else if (isConst(node.declarationList)) { + write("const "); + } + else { + write("var "); + } + emitCommaList(children, emitVariableDeclaration); + write(";"); + writeLine(); } - emitCommaList(node.declarationList.declarations, emitVariableDeclaration, resolver.isDeclarationVisible); - write(";"); - writeLine(); } function emitAccessorDeclaration(node: AccessorDeclaration) { @@ -1134,7 +766,6 @@ namespace ts { } let accessors = getAllAccessorDeclarations((node.parent).members, node); - let accessorWithTypeAnnotation: AccessorDeclaration; if (node === accessors.firstAccessor) { emitJsDocComments(accessors.getAccessor); @@ -1142,78 +773,15 @@ namespace ts { emitClassMemberDeclarationFlags(node); writeTextOfNode(currentSourceFile, node.name); if (!(node.flags & NodeFlags.Private)) { - accessorWithTypeAnnotation = node; - let type = getTypeAnnotationFromAccessor(node); - if (!type) { - // couldn't get type for the first accessor, try the another one - let anotherAccessor = node.kind === SyntaxKind.GetAccessor ? accessors.setAccessor : accessors.getAccessor; - type = getTypeAnnotationFromAccessor(anotherAccessor); - if (type) { - accessorWithTypeAnnotation = anotherAccessor; - } - } - writeTypeOfDeclaration(node, type, getAccessorDeclarationTypeVisibilityError); + let type = getTypeAnnotationFromAccessor(accessors.getAccessor, accessors.setAccessor); + emitTypeOfDeclaration(node, type); } write(";"); writeLine(); } - - function getTypeAnnotationFromAccessor(accessor: AccessorDeclaration): TypeNode { - if (accessor) { - return accessor.kind === SyntaxKind.GetAccessor - ? accessor.type // Getter - return type - : accessor.parameters.length > 0 - ? accessor.parameters[0].type // Setter parameter type - : undefined; - } - } - - function getAccessorDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let diagnosticMessage: DiagnosticMessage; - if (accessorWithTypeAnnotation.kind === SyntaxKind.SetAccessor) { - // Setters have to have type named and cannot infer it so, the type should always be named - if (accessorWithTypeAnnotation.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, - errorNode: accessorWithTypeAnnotation.parameters[0], - // TODO(jfreeman): Investigate why we are passing node.name instead of node.parameters[0].name - typeName: accessorWithTypeAnnotation.name - }; - } - else { - if (accessorWithTypeAnnotation.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, - errorNode: accessorWithTypeAnnotation.name, - typeName: undefined - }; - } - } } - function writeFunctionDeclaration(node: FunctionLikeDeclaration) { + function emitFunctionDeclaration(node: FunctionLikeDeclaration) { if (hasDynamicName(node)) { return; } @@ -1286,7 +854,7 @@ namespace ts { } } else if (node.kind !== SyntaxKind.Constructor && !(node.flags & NodeFlags.Private)) { - writeReturnTypeAtSignature(node, getReturnTypeVisibilityError); + emitReturnTypeAtSignature(node); } enclosingDeclaration = prevEnclosingDeclaration; @@ -1295,93 +863,27 @@ namespace ts { write(";"); writeLine(); } + } - function getReturnTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let 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.MethodDeclaration: - case SyntaxKind.MethodSignature: - 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: " + node.kind); - } - - return { - diagnosticMessage, - errorNode: node.name || node - }; - } - } - - function emitParameterDeclaration(node: ParameterDeclaration) { - increaseIndent(); - emitJsDocComments(node); - if (node.dotDotDotToken) { - write("..."); - } - if (isBindingPattern(node.name)) { - // For bindingPattern, we can't simply writeTextOfNode from the source file - // because we want to omit the initializer and using writeTextOfNode will result in initializer get emitted. - // Therefore, we will have to recursively emit each element in the bindingPattern. - emitBindingPattern(node.name); - } - else { - writeTextOfNode(currentSourceFile, node.name); - } - if (resolver.isOptionalParameter(node)) { - write("?"); - } - decreaseIndent(); + function emitParameterDeclaration(node: ParameterDeclaration) { + increaseIndent(); + emitJsDocComments(node); + if (node.dotDotDotToken) { + write("..."); + } + if (isBindingPattern(node.name)) { + // For bindingPattern, we can't simply writeTextOfNode from the source file + // because we want to omit the initializer and using writeTextOfNode will result in initializer get emitted. + // Therefore, we will have to recursively emit each element in the bindingPattern. + emitBindingPattern(node.name); + } + else { + writeTextOfNode(currentSourceFile, node.name); + } + if (resolver.isOptionalParameter(node)) { + write("?"); + } + decreaseIndent(); if (node.parent.kind === SyntaxKind.FunctionType || node.parent.kind === SyntaxKind.ConstructorType || @@ -1389,72 +891,7 @@ namespace ts { emitTypeOfVariableDeclarationFromTypeLiteral(node); } else if (!(node.parent.flags & NodeFlags.Private)) { - writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError); - } - - function getParameterDeclarationTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let diagnosticMessage: DiagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult); - return diagnosticMessage !== undefined ? { - diagnosticMessage, - errorNode: node, - typeName: node.name - } : undefined; - } - - function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult: SymbolAccessiblityResult): DiagnosticMessage { - switch (node.parent.kind) { - case SyntaxKind.Constructor: - return 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; - - case SyntaxKind.ConstructSignature: - // Interfaces cannot have parameter types that cannot be named - return 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; - - case SyntaxKind.CallSignature: - // Interfaces cannot have parameter types that cannot be named - return 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; - - case SyntaxKind.MethodDeclaration: - case SyntaxKind.MethodSignature: - if (node.parent.flags & NodeFlags.Static) { - return 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) { - return 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 - return 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; - } - - case SyntaxKind.FunctionDeclaration: - return 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; - - default: - Debug.fail("This is unknown parent for parameter: " + node.parent.kind); - } + emitTypeOfDeclaration(node, node.type); } function emitBindingPattern(bindingPattern: BindingPattern) { @@ -1476,15 +913,6 @@ namespace ts { } function emitBindingElement(bindingElement: BindingElement) { - function getBindingElementTypeVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic { - let diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccesibilityResult); - return diagnosticMessage !== undefined ? { - diagnosticMessage, - errorNode: bindingElement, - typeName: bindingElement.name - } : undefined; - } - if (bindingElement.kind === SyntaxKind.OmittedExpression) { // If bindingElement is an omittedExpression (i.e. containing elision), // we will emit blank space (although this may differ from users' original code, @@ -1535,24 +963,29 @@ namespace ts { function emitNode(node: Node) { switch (node.kind) { case SyntaxKind.FunctionDeclaration: - case SyntaxKind.ModuleDeclaration: - case SyntaxKind.ImportEqualsDeclaration: + return emitFunctionDeclaration(node); + case SyntaxKind.VariableStatement: + return emitVariableStatement(node); case SyntaxKind.InterfaceDeclaration: + return emitInterfaceDeclaration(node); case SyntaxKind.ClassDeclaration: + return emitClassDeclaration(node); case SyntaxKind.TypeAliasDeclaration: + return emitTypeAliasDeclaration(node); case SyntaxKind.EnumDeclaration: - return emitModuleElement(node, isModuleElementVisible(node)); - case SyntaxKind.VariableStatement: - return emitModuleElement(node, isVariableStatementVisible(node)); + return emitEnumDeclaration(node); + case SyntaxKind.ModuleDeclaration: + return emitModuleDeclaration(node); + case SyntaxKind.ImportEqualsDeclaration: + return emitImportEqualsDeclaration(node); case SyntaxKind.ImportDeclaration: - // Import declaration without import clause is visible, otherwise it is not visible - return emitModuleElement(node, /*isModuleElementVisible*/!(node).importClause); + return emitImportDeclaration(node); case SyntaxKind.ExportDeclaration: return emitExportDeclaration(node); case SyntaxKind.Constructor: case SyntaxKind.MethodDeclaration: case SyntaxKind.MethodSignature: - return writeFunctionDeclaration(node); + return emitFunctionDeclaration(node); case SyntaxKind.ConstructSignature: case SyntaxKind.CallSignature: case SyntaxKind.IndexSignature: @@ -1569,51 +1002,776 @@ namespace ts { return emitExportAssignment(node); case SyntaxKind.SourceFile: return emitSourceFile(node); + default: + Debug.fail(`unknown SyntaxKind: ${node.kind} (${ (ts).SyntaxKind ? (ts).SyntaxKind[node.kind] : ""})`); } } - function writeReferencePath(referencedFile: SourceFile) { - let declFileName = referencedFile.flags & NodeFlags.DeclarationFile - ? referencedFile.fileName // Declaration file, use declaration file name - : shouldEmitToOwnFile(referencedFile, compilerOptions) - ? getOwnEmitOutputFilePath(referencedFile, host, ".d.ts") // Own output file so get the .d.ts file - : removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts"; // Global out file + function writeChildDeclarations(node: Node): void { + forEach(sortDeclarations(getNodeLinks(node).visibleChildren), emitNode); + } - declFileName = getRelativePathToDirectoryOrUrl( - getDirectoryPath(normalizeSlashes(jsFilePath)), - declFileName, - host.getCurrentDirectory(), - host.getCanonicalFileName, - /*isAbsolutePathAnUrl*/ false); + function emitSourceFile(sourceFile: SourceFile): void { + currentSourceFile = sourceFile; + enclosingDeclaration = sourceFile; + + // write the declarations + writeChildDeclarations(sourceFile); + } - referencePathsOutput += "/// " + newLine; + function compareDeclarations(d1: Node, d2: Node): Comparison { + return compareValues(d1.pos, d2.pos) || Comparison.EqualTo; + } + + function sortDeclarations(nodes: Node[]): Node[] { + return nodes && nodes.sort(compareDeclarations); } } - /* @internal */ - export function writeDeclarationFile(jsFilePath: string, sourceFile: SourceFile, host: EmitHost, resolver: EmitResolver, diagnostics: Diagnostic[]) { - let emitDeclarationResult = emitDeclarations(host, resolver, diagnostics, jsFilePath, sourceFile); - // 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 (!emitDeclarationResult.reportedDeclarationError) { - let declarationOutput = emitDeclarationResult.referencePathsOutput - + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo); - writeFile(host, diagnostics, removeFileExtension(jsFilePath) + ".d.ts", declarationOutput, host.getCompilerOptions().emitBOM); - } - - function getDeclarationOutput(synchronousDeclarationOutput: string, moduleElementDeclarationEmitInfo: ModuleElementDeclarationEmitInfo[]) { - let appliedSyncOutputPos = 0; - let declarationOutput = ""; - // apply asynchronous additions to the synchronous output - forEach(moduleElementDeclarationEmitInfo, aliasEmitInfo => { - if (aliasEmitInfo.asynchronousOutput) { - declarationOutput += synchronousDeclarationOutput.substring(appliedSyncOutputPos, aliasEmitInfo.outputPos); - declarationOutput += getDeclarationOutput(aliasEmitInfo.asynchronousOutput, aliasEmitInfo.subModuleElementDeclarationEmitInfo); - appliedSyncOutputPos = aliasEmitInfo.outputPos; + function preprocessDeclarations(sourceFiles: SourceFile[], resolver: EmitResolver, diagnostics: Diagnostic[], compilerOptions: CompilerOptions): PreprocessResults { + let currentSourceFile: SourceFile; + let nodeLinks: NodeLinks[] = []; + let declarationsToProcess: { declaration: Node; errorNode?: Node }[] = []; + + let typeWriter = createVoidSymbolWriter(undefined, undefined); + + for (let sourceFile of sourceFiles) { + preprocessSourceFile(sourceFile); + } + + return { + sourceFiles, + nodeLinks, + resolver + }; + + function getNodeLinks(node: Node): NodeLinks { + let nodeId = getNodeId(node); + return nodeLinks[nodeId] || (nodeLinks[nodeId] = {}); + } + + function isInternal(node: Node): boolean { + let links = getNodeLinks(node); + if (links.isInternal === undefined) { + let sourceText = getSourceFileOfNode(node).text; + links.isInternal = forEach(getLeadingCommentRanges(sourceText, node.pos), range => { + let comment = sourceText.substring(range.pos, range.end); + return comment.indexOf("@internal") >= 0; + }); + } + return links.isInternal; + } + + function createVoidSymbolWriter(trackTypeSymbol: (s: Symbol) => void, trackInaccesibleSymbol: (s: Symbol) => void): SymbolWriter { + return { + writeLine: emptyHandler, + writeKeyword: emptyHandler, + writeOperator: emptyHandler, + writePunctuation: emptyHandler, + writeSpace: emptyHandler, + writeStringLiteral: emptyHandler, + writeParameter: emptyHandler, + writeSymbol: emptyHandler, + decreaseIndent: emptyHandler, + increaseIndent: emptyHandler, + clear: emptyHandler, + trackTypeSymbol, + trackInaccesibleSymbol + }; + } + + function collectReferencedDeclarations(node: Node): void { + let currentErrorNode: Node; + typeWriter.trackInaccesibleSymbol = trackInaccesibleSymbol; + typeWriter.trackTypeSymbol = trackTypeSymbol; + + visitNode(node); + + typeWriter.trackInaccesibleSymbol = typeWriter.trackTypeSymbol = undefined; + + return; + + function trackTypeSymbol(symbol: Symbol) { + if (currentErrorNode) { + collectDeclarations(symbol, currentErrorNode); + } + } + + function trackInaccesibleSymbol(symbol: Symbol): void { + if (currentErrorNode) { + reportUnamedDeclarationMessage(currentErrorNode); + } + } + + function visitNode(node: Node): void { + if (!node) return; + + switch (node.kind) { + case SyntaxKind.ExportDeclaration: + return visitExportDeclaration(node); + case SyntaxKind.ImportEqualsDeclaration: + return visitImportEqualsDeclaration(node); + case SyntaxKind.ExportAssignment: + return visitExportAssignment(node); + case SyntaxKind.ImportDeclaration: + case SyntaxKind.ImportClause: + case SyntaxKind.ImportSpecifier: + // Nothing to visit, import declarations are only pulled in if referenced + return; + + case SyntaxKind.InterfaceDeclaration: + case SyntaxKind.ClassDeclaration: + return visitNodes((node).typeParameters) || + forEach((node).heritageClauses, visitHeritageClause); + + case SyntaxKind.VariableStatement: + case SyntaxKind.ModuleDeclaration: + case SyntaxKind.EnumDeclaration: + case SyntaxKind.EnumMember: + // Nothing to visit here + return; + + case SyntaxKind.TypeAliasDeclaration: + return visitNodes((node).typeParameters) || + visitNode((node).type); + + case SyntaxKind.TypeParameter: + return visitNode((node).constraint); + + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.Constructor: + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + case SyntaxKind.ConstructSignature: + case SyntaxKind.CallSignature: + case SyntaxKind.IndexSignature: + case SyntaxKind.FunctionType: + case SyntaxKind.ConstructorType: + return visitSignatureDeclaration(node); + + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + return visitAccessorDeclaration(node); + + case SyntaxKind.Parameter: + case SyntaxKind.VariableDeclaration: + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.PropertySignature: + case SyntaxKind.BindingElement: + return visitPropertyDeclaration(node); + + case SyntaxKind.Identifier: + return visitTypeName(node); + + default: + return forEachChild(node, visitNode); + } + + } + + function visitExportDeclaration(node: ExportDeclaration): void { + if (!node.moduleSpecifier) { + forEach(node.exportClause.elements, e => collectAliasDeclaration(e, node)); + } + } + + function visitImportEqualsDeclaration(node: ImportEqualsDeclaration): void { + if (node.moduleReference.kind !== SyntaxKind.ExternalModuleReference) { + collectAliasDeclaration(node, node.moduleReference); + } + } + + function visitExportAssignment(node: ExportAssignment): void { + if (node.expression.kind === SyntaxKind.Identifier) { + collectAliasDeclaration(node, node.expression); + } + else if (!node.isExportEquals) { + // handel expressions + let previousErrorNode = currentErrorNode; + currentErrorNode = node.expression; + resolver.writeTypeOfExpression(node.expression, getEnclosingDeclaration(node), TypeFormatFlags.UseTypeOfFunction, typeWriter); + currentErrorNode = previousErrorNode; + } + } + + function visitSignatureDeclaration(node: SignatureDeclaration): void { + if (hasDynamicName(node) || node.flags & NodeFlags.Private) { + return; + } + + visitNodes(node.typeParameters); + visitNodes(node.parameters); + + if (node.type) { + visitNode(node.type); + } + else if (node.kind !== SyntaxKind.Constructor) { + // handel infered type + let previousErrorNode = currentErrorNode; + currentErrorNode = node.name || node; + resolver.writeReturnTypeOfSignatureDeclaration(node, getEnclosingDeclaration(node), TypeFormatFlags.UseTypeOfFunction, typeWriter); + currentErrorNode = previousErrorNode; } + } + + function visitAccessorDeclaration(node: AccessorDeclaration) { + if (hasDynamicName(node) || node.flags & NodeFlags.Private) { + return; + } + + let accessors = getAllAccessorDeclarations((node.parent).members, node); + + if (accessors.firstAccessor === node) { + let type = getTypeAnnotationFromAccessor(accessors.getAccessor, accessors.setAccessor); + if (type) { + visitNode(type); + } + else { + // handel infered type + let previousErrorNode = currentErrorNode; + currentErrorNode = accessors.getAccessor ? accessors.getAccessor.name : node.name; + resolver.writeTypeOfDeclaration(node, getEnclosingDeclaration(node), TypeFormatFlags.UseTypeOfFunction, typeWriter); + currentErrorNode = previousErrorNode; + } + } + } + + function visitPropertyDeclaration(node: PropertyDeclaration): void { + if (hasDynamicName(node)) { + return; + } + + if (node.flags & NodeFlags.Private && node.parent.kind !== SyntaxKind.Constructor) { + return; + } + + if (isBindingPattern(node.name)) { + return visitNode(node.name); + } + + if (node.type) { + visitNode(node.type); + } + else { + // handel infered type + let previousErrorNode = currentErrorNode; + currentErrorNode = node.name; + resolver.writeTypeOfDeclaration(node, getEnclosingDeclaration(node), TypeFormatFlags.UseTypeOfFunction, typeWriter); + currentErrorNode = previousErrorNode; + } + } + + function visitHeritageClause(node: HeritageClause) { + let firstEntry = node.types && node.types[0]; + if (node.token === SyntaxKind.ExtendsKeyword && + firstEntry && !isSupportedExpressionWithTypeArguments(firstEntry)) { + // An expression in an extends clause + let previousErrorNode = currentErrorNode; + currentErrorNode = firstEntry; + resolver.writeBaseConstructorTypeOfClass((node.parent), getEnclosingDeclaration(node), TypeFormatFlags.UseTypeOfFunction, typeWriter); + currentErrorNode = previousErrorNode; + } + else { + // regular type references + forEach(node.types, visitExpressionWithTypeArguments); + } + } + + function visitExpressionWithTypeArguments(node: ExpressionWithTypeArguments): void { + Debug.assert(node.expression.kind === SyntaxKind.Identifier || node.expression.kind === SyntaxKind.PropertyAccessExpression); + visitNode(node.expression); + visitNodes(node.typeArguments); + } + + function visitTypeName(node: Identifier): void { + let symbol = resolver.getSymbolAtLocation(node); + if (symbol) { + collectDeclarations(symbol, node); + } + } + + function visitNodes(nodes: NodeArray): void { + forEach(nodes, visitNode); + } + + function collectAliasDeclaration(node: ImportOrExportSpecifier|ImportEqualsDeclaration|ExportAssignment, errorNode: Node) { + let target = getLocalTargetOfAliasDeclaration(node); + if (target) { + collectDeclarations(target, errorNode); + } + } + + function getLocalTargetOfAliasDeclaration(node: Declaration): Symbol { + switch (node.kind) { + case SyntaxKind.ImportEqualsDeclaration: + return resolver.getSymbolAtLocation((node).moduleReference); + case SyntaxKind.ExportSpecifier: + let target = ((node).parent.parent).moduleSpecifier ? undefined : + resolver.getSymbolAtLocation((node).propertyName || (node).name); + return target && resolver.getAliasedSymbol(target); + case SyntaxKind.ExportAssignment: + return resolver.getSymbolAtLocation((node).expression); + } + } + } + + function collectDeclarations(symbol: Symbol, errorNode: Node): void { + forEach(symbol.declarations, declaration => { + collectDeclatation(declaration, errorNode); }); - declarationOutput += synchronousDeclarationOutput.substring(appliedSyncOutputPos); - return declarationOutput; } + + function collectDeclatation(declaration:Node, errorNode?: Node) { + declarationsToProcess.push({ declaration, errorNode }); + } + + function isDeclarationExported(node: Node): boolean { + if (compilerOptions.stripInternal && isInternal(node)) { + return false; + } + + switch (node.kind) { + case SyntaxKind.PropertySignature: + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.MethodSignature: + case SyntaxKind.MethodDeclaration: + case SyntaxKind.Constructor: + case SyntaxKind.GetAccessor: + case SyntaxKind.SetAccessor: + case SyntaxKind.CallSignature: + case SyntaxKind.ConstructSignature: + case SyntaxKind.IndexSignature: + case SyntaxKind.EnumMember: + case SyntaxKind.ExportAssignment: + case SyntaxKind.ExportDeclaration: + case SyntaxKind.NamespaceImport: + case SyntaxKind.ImportClause: + case SyntaxKind.ImportSpecifier: + case SyntaxKind.VariableDeclaration: + return true; + + case SyntaxKind.VariableStatement: + case SyntaxKind.ClassDeclaration: + case SyntaxKind.EnumDeclaration: + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.ImportEqualsDeclaration: + case SyntaxKind.InterfaceDeclaration: + case SyntaxKind.ModuleDeclaration: + case SyntaxKind.TypeAliasDeclaration: + if (node.flags & NodeFlags.Export) { + return true; + } + else if (node.parent.kind === SyntaxKind.SourceFile && !isExternalModule(node.parent)) { + return true; + } + else if (node.parent.kind === SyntaxKind.ModuleBlock && isInAmbientContext(node.parent)) { + return !hasExportDeclatations(node.parent.parent); + } + break; + } + + return false; + } + + function forEachTopLevelDeclaration(node: Node, action: (node: Node) => T): T { + switch (node.kind) { + case SyntaxKind.SourceFile: + return forEach((node).statements, action); + case SyntaxKind.InterfaceDeclaration: + case SyntaxKind.EnumDeclaration: + case SyntaxKind.ClassDeclaration: + return forEach((node).members, action); + case SyntaxKind.VariableStatement: + return forEach((node).declarationList.declarations, action); + case SyntaxKind.ModuleDeclaration: + if ((node).body.kind === SyntaxKind.ModuleBlock) { + return forEach(((node).body).statements, action); + } + else { + return action((node).body); + } + } + } + + function getEnclosingDeclaration(node: Node): Node { + while (node.parent) { + switch (node.parent.kind) { + case SyntaxKind.SourceFile: + case SyntaxKind.EnumDeclaration: + case SyntaxKind.ModuleDeclaration: + case SyntaxKind.ClassDeclaration: + case SyntaxKind.InterfaceDeclaration: + case SyntaxKind.ImportDeclaration: + case SyntaxKind.VariableStatement: + return node.parent; + default: + node = node.parent; + } + } + return undefined; + } + + function isExternalModuleDeclaration(node: Node) { + return (node.kind === SyntaxKind.ModuleDeclaration && (node).name.kind === SyntaxKind.StringLiteral) || + (node.kind === SyntaxKind.SourceFile && isExternalModule(node)); + } + + function hasExportDeclatations(node: Node): boolean { + if (!isExternalModuleDeclaration(node)) { + return false; + } + + let links = getNodeLinks(node); + if (links.hasExportDeclarations === undefined) { + links.hasExportDeclarations = !!forEachTopLevelDeclaration(node, n => { + return (n.kind === SyntaxKind.ExportAssignment || n.kind === SyntaxKind.ExportDeclaration); + }); + } + return links.hasExportDeclarations; + } + + /** + * Can the the declaration of this node be emitted without causing it + * to be exported from its parent in the .d.ts where it was not in the .ts + * + * This is caused by the scoping rules withen an ambient module or namespace + * declaration where *all* top-level declarations are considered exported wether + * they have an export modifier or not. + * + */ + function canWriteDeclaration(node: Node): boolean { + if (node.kind === SyntaxKind.SourceFile || + node.kind === SyntaxKind.ImportEqualsDeclaration || node.kind === SyntaxKind.ImportDeclaration) { + return true; + } + + if (node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement) { + node = node.parent.parent; + } + + let parent = getEnclosingDeclaration(node); + + if (!isDeclarationExported(node)) { + // If the parent module has an export declaration or export + // assingment, then the scoping rules change, and only declarations + // with export modifier are visible, so we can safely write + // a declaration of a non-exported entity without exposing it + if (! hasExportDeclatations(parent)) { + return false; + } + } + + // The declaration is exported from its parent, or can be written without + // an export modifier. Now check if the parent is visible as well. + return canWriteDeclaration(parent); + } + + function getNameText(node: ParameterDeclaration|PropertyDeclaration|VariableDeclaration|FunctionDeclaration| AccessorDeclaration| MethodDeclaration): string { + if (node.name.kind === SyntaxKind.Identifier) { + return (node.name).text; + } + else if (node.name.kind === SyntaxKind.ComputedPropertyName) { + return getTextOfNode(node.name); + } + } + + function reportDeclarationAccessiblityMessage(referencedDeclaration: Declaration, errorNode: Node): void { + Debug.assert(referencedDeclaration.name && referencedDeclaration.name.kind === SyntaxKind.Identifier); + + let referencedDeclarationName = (referencedDeclaration.name).text; + let container = errorNode; + + while (container) { + switch (container.kind) { + case SyntaxKind.HeritageClause: + if ((container).token === SyntaxKind.ExtendsKeyword) { + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Extends_clause_references_inaccessible_name_0, referencedDeclarationName)); + } + else { + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Implements_clause_references_inaccessible_name_0, referencedDeclarationName)); + } + return; + case SyntaxKind.BindingElement: + case SyntaxKind.VariableDeclaration: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Type_of_variable_0_references_inaccessible_name_1, + getNameText(container), referencedDeclarationName)); + return; + case SyntaxKind.PropertySignature: + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.SetAccessor: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Type_of_property_0_references_inaccessible_name_1, + getNameText(container), referencedDeclarationName)); + return; + case SyntaxKind.Parameter: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Type_of_parameter_0_references_inaccessible_name_1, + getNameText(container), referencedDeclarationName)); + return; + case SyntaxKind.GetAccessor: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Return_type_of_property_getter_0_references_inaccessible_name_1, + getNameText(container), referencedDeclarationName)); + return; + case SyntaxKind.ConstructSignature: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Return_type_of_construct_signature_references_inaccessible_name_0, + referencedDeclarationName)); + return; + case SyntaxKind.CallSignature: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Return_type_of_call_signature_references_inaccessible_name_0, + referencedDeclarationName)); + return; + case SyntaxKind.IndexSignature: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Return_type_of_index_signature_references_inaccessible_name_0, + referencedDeclarationName)); + return; + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Return_type_of_method_0_references_inaccessible_name_1, + getNameText(container), referencedDeclarationName)); + return; + case SyntaxKind.FunctionDeclaration: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Return_type_of_function_0_references_inaccessible_name_1, + getNameText(container), referencedDeclarationName)); + return; + case SyntaxKind.TypeAliasDeclaration: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Type_alias_0_references_inaccessible_name_1, + (container).name.text, referencedDeclarationName)); + return; + case SyntaxKind.ExportAssignment: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Default_export_of_the_module_references_inaccessible_name_0, + referencedDeclarationName)); + return; + case SyntaxKind.TypeParameter: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Constraint_of_type_parameter_0_references_inaccessible_name_1, + (container).name.text, referencedDeclarationName)); + return; + case SyntaxKind.ImportEqualsDeclaration: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Import_declaration_0_references_inaccessible_name_1, + (container).name.text, referencedDeclarationName)); + return; + } + container = container.parent; + } + + Debug.fail("Could not find container node"); + } + + function reportUnamedDeclarationMessage(errorNode: Node): void { + let container = errorNode; + + while (container) { + switch (container.kind) { + case SyntaxKind.BindingElement: + case SyntaxKind.VariableDeclaration: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Name_of_inferred_type_of_variable_0_could_not_be_written_Consider_adding_an_explicit_type_annotation, + getNameText(container))); + return; + case SyntaxKind.PropertySignature: + case SyntaxKind.PropertyDeclaration: + case SyntaxKind.SetAccessor: + case SyntaxKind.GetAccessor: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Name_of_inferred_type_of_property_0_could_not_be_written_Consider_adding_an_explicit_type_annotation, + getNameText(container))); + return; + case SyntaxKind.Parameter: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Name_of_inferred_type_of_parameter_0_could_not_be_written_Consider_adding_an_explicit_type_annotation, + getNameText(container))); + return; + case SyntaxKind.MethodDeclaration: + case SyntaxKind.MethodSignature: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Name_of_inferred_return_type_of_method_0_could_not_be_written_Consider_adding_an_explicit_type_annotation, + getNameText(container))); + return; + case SyntaxKind.FunctionDeclaration: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Name_of_inferred_return_type_of_function_0_could_not_be_written_Consider_adding_an_explicit_type_annotation, + getNameText(container))); + return; + case SyntaxKind.ExportAssignment: + diagnostics.push(createDiagnosticForNode(errorNode, + Diagnostics.Name_of_inferred_type_of_default_export_could_not_be_written_Consider_exporting_a_declaration_instead)); + return; + } + container = container.parent; + } + + Debug.fail("Could not find container node"); + } + + function preprocessDeclaration(declaration: Node, errorNode?: Node): void { + if (declaration.kind === SyntaxKind.TypeParameter || declaration.kind === SyntaxKind.Parameter) { + return; + } + + // Always report the error, even if the node was visited before, so that + // diffrent references to the same declaration are flagged + if (errorNode && reportDeclarationAccessiblityError(declaration, errorNode)) { + return; + } + + // If this declaration is from a diffrent file, we will get to it later. + // Skip it for now. + if (getSourceFileOfNode(declaration) !== currentSourceFile) { + return; + } + + let links = getNodeLinks(declaration); + if (!links.collected) { + links.collected = true; + + // Make sure this declaration can be emitted, that is it is accessible + // and is connected to its parent, or else report a accessibility error + ensureDeclarationVisible(declaration); + + // Collect any dependencies + collectReferencedDeclarations(declaration); + + // Collect children as well + switch (declaration.kind) { + case SyntaxKind.ModuleDeclaration: + case SyntaxKind.InterfaceDeclaration: + case SyntaxKind.ClassDeclaration: + case SyntaxKind.EnumDeclaration: + case SyntaxKind.VariableStatement: + collectTopLevelChildDeclarations(declaration); + break; + } + } + } + + function reportDeclarationAccessiblityError(declaration: Node, errorNode: Node): boolean { + let node = errorNode; + while (node.parent.kind === SyntaxKind.QualifiedName || node.parent.kind === SyntaxKind.PropertyAccessExpression) { + node = node.parent; + } + let links = getNodeLinks(node); + if (!links.errorReported && !canWriteDeclaration(declaration)) { + links.errorReported = true; + reportDeclarationAccessiblityMessage(declaration, errorNode); + } + return links.errorReported; + } + + function collectTopLevelChildDeclarations(node: Node): void { + forEachTopLevelDeclaration(node, child => { + if (isDeclarationExported(child)) { + collectDeclatation(child); + } + }); + } + + function ensureDeclarationVisible(node: Node): void { + let links = getNodeLinks(node); + if (!links.visited) { + links.visited = true; + + // Make the declaration visble by attaching it to its + // parent's visible declarations. + // also make sure the parent is reachable from a top-level + // declaration + let parent = getEnclosingDeclaration(node); + attachVisibleChild(parent, node); + if (parent.kind !== SyntaxKind.SourceFile) { + ensureDeclarationVisible(parent); + } + } + } + + function attachVisibleChild(node: Node, child: Node): void { + let links = getNodeLinks(node); + if (!links.visibleChildren) { + links.visibleChildren = [child]; + } + else { + links.visibleChildren.push(child); + } + } + + function preprocessSourceFile(sourceFile: SourceFile): void { + currentSourceFile = sourceFile; + + // Collect all visible declarations + collectTopLevelChildDeclarations(sourceFile); + + while (declarationsToProcess.length > 0) { + let {declaration, errorNode} = declarationsToProcess.shift(); + preprocessDeclaration(declaration, errorNode); + } + } + } + + function forEachExpectedOutputFile(host: EmitHost, targetSourceFile: SourceFile, action: (name: string, sources: SourceFile[]) => void) { + let compilerOptions = host.getCompilerOptions(); + + if (targetSourceFile) { + // If we have a targetSourceFile (e.g calling emitter from language service to getEmitOutput) + // only emit the outputs of this file + if (shouldEmitToOwnFile(targetSourceFile, compilerOptions)) { + let outputFilePath = getOwnEmitOutputFilePath(targetSourceFile, host, ".d.ts"); + action(outputFilePath, [targetSourceFile]); + return; + } + // Fall through to the --out case, i.e. shouldEmitToOwnFile()=== false + } + else { + // No targetSourceFile, we need to emit all files + for (let sourceFile of host.getSourceFiles()) { + if (shouldEmitToOwnFile(sourceFile, compilerOptions)) { + let outputFilePath = getOwnEmitOutputFilePath(sourceFile, host, ".d.ts"); + action(outputFilePath, [sourceFile]); + } + } + } + + if (compilerOptions.outFile || compilerOptions.out) { + // Emit any files that did not have their own output file + // all these files will emit to a single output file specified by compiler options.out + let outputFilePath = removeFileExtension(compilerOptions.outFile || compilerOptions.out) + ".d.ts" + let sourceFiles = filter(host.getSourceFiles(), sourceFile => !isExternalModuleOrDeclarationFile(sourceFile)); + action(outputFilePath, sourceFiles); + } + } + + export function getDeclarationDiagnostics(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile): Diagnostic[] { + let diagnostics: Diagnostic[] = []; + forEachExpectedOutputFile(host, targetSourceFile, (outputFileName, sourceFiles) => { + preprocessDeclarations(sourceFiles, resolver, diagnostics, host.getCompilerOptions()); + }); + + if (targetSourceFile) { + return filter(diagnostics, d => d.file === targetSourceFile); + } + else { + return diagnostics; + } + } + + /* @internal */ + export function emitDeclarations(host: EmitHost, resolver: EmitResolver, targetSourceFile: SourceFile, diagnostics: Diagnostic[]): void { + forEachExpectedOutputFile(host, targetSourceFile, (outputFileName, sourceFiles) => { + let fileDiagnostics: Diagnostic[] = []; + let preprocessResult = preprocessDeclarations(sourceFiles, resolver, fileDiagnostics, host.getCompilerOptions()); + if (fileDiagnostics.length === 0) { + writeDeclarations(outputFileName, preprocessResult, host, fileDiagnostics); + } + diagnostics.push.apply(diagnostics, fileDiagnostics); + }); } } diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts index 37989c3433a4b..8f3a35c2287dd 100644 --- a/src/compiler/diagnosticInformationMap.generated.ts +++ b/src/compiler/diagnosticInformationMap.generated.ts @@ -432,76 +432,27 @@ namespace ts { Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: DiagnosticCategory.Error, key: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." }, Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition: { code: 2655, category: DiagnosticCategory.Error, key: "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition." }, Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: DiagnosticCategory.Error, key: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." }, - Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." }, - Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." }, - Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." }, - Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, 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: 4008, 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: 4010, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." }, - Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." }, - Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." }, - Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported function has or is using private name '{1}'." }, - Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: DiagnosticCategory.Error, key: "Implements clause of exported class '{0}' has or is using private name '{1}'." }, - Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: DiagnosticCategory.Error, key: "Extends clause of exported class '{0}' has or is using private name '{1}'." }, - Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: DiagnosticCategory.Error, key: "Extends clause of exported interface '{0}' has or is using private name '{1}'." }, - Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." }, - Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: DiagnosticCategory.Error, key: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." }, - Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, 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_external_module_2_but_cannot_be_named: { code: 4026, 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_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: DiagnosticCategory.Error, key: "Public static property '{0}' of exported class 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: 4028, 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_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: DiagnosticCategory.Error, key: "Public 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_private_module_2: { code: 4030, category: DiagnosticCategory.Error, key: "Public 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_private_name_1: { code: 4031, 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_name_1_from_private_module_2: { code: 4032, category: DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." }, - Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: DiagnosticCategory.Error, key: "Property '{0}' of exported interface has or is using private name '{1}'." }, - Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, 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_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, 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_name_1_from_private_module_2: { code: 4036, 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_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: DiagnosticCategory.Error, key: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." }, - 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: 4038, 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_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, 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_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, 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_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, 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_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, 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_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, 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_name_0_from_private_module_1: { code: 4044, 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_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, 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_name_0_from_private_module_1: { code: 4046, 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_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, 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_name_0_from_private_module_1: { code: 4048, 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_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, 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_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, 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_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, 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_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, 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_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, 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_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, 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_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, 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_name_0_from_private_module_1: { code: 4056, category: DiagnosticCategory.Error, key: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." }, - Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, 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_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: DiagnosticCategory.Error, key: "Return type of exported function 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_private_module_1: { code: 4059, category: DiagnosticCategory.Error, key: "Return type of exported function has or is using name '{0}' from private module '{1}'." }, - Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: DiagnosticCategory.Error, key: "Return type of exported function has or is using private name '{0}'." }, - Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, 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_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class 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: 4063, category: DiagnosticCategory.Error, key: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." }, - Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, 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_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, 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_name_1_from_private_module_2: { code: 4066, 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_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, 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_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, 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_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, 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_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, 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_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, 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_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, 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_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, 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_name_1_from_private_module_2: { code: 4074, category: DiagnosticCategory.Error, key: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." }, - Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, 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_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: DiagnosticCategory.Error, key: "Parameter '{0}' of exported function 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_private_module_2: { code: 4077, category: DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." }, - Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: DiagnosticCategory.Error, key: "Parameter '{0}' of exported function has or is using private name '{1}'." }, - Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: DiagnosticCategory.Error, key: "Exported type alias '{0}' has or is using private name '{1}'." }, - Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: DiagnosticCategory.Error, key: "Default export of the module has or is using private name '{0}'." }, + Import_declaration_0_references_inaccessible_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' references inaccessible name '{1}'." }, + Constraint_of_type_parameter_0_references_inaccessible_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Constraint of type parameter '{0}' references inaccessible name '{1}'." }, + Implements_clause_references_inaccessible_name_0: { code: 4019, category: DiagnosticCategory.Error, key: "Implements clause references inaccessible name '{0}'." }, + Extends_clause_references_inaccessible_name_0: { code: 4020, category: DiagnosticCategory.Error, key: "Extends clause references inaccessible name '{0}'." }, + Type_of_variable_0_references_inaccessible_name_1: { code: 4025, category: DiagnosticCategory.Error, key: "Type of variable '{0}' references inaccessible name '{1}'." }, + Name_of_inferred_type_of_variable_0_could_not_be_written_Consider_adding_an_explicit_type_annotation: { code: 4026, category: DiagnosticCategory.Error, key: "Name of inferred type of variable '{0}' could not be written. Consider adding an explicit type annotation." }, + Type_of_property_0_references_inaccessible_name_1: { code: 4028, category: DiagnosticCategory.Error, key: "Type of property '{0}' references inaccessible name '{1}'." }, + Name_of_inferred_type_of_property_0_could_not_be_written_Consider_adding_an_explicit_type_annotation: { code: 4029, category: DiagnosticCategory.Error, key: "Name of inferred type of property '{0}' could not be written. Consider adding an explicit type annotation." }, + Type_of_parameter_0_references_inaccessible_name_1: { code: 4030, category: DiagnosticCategory.Error, key: "Type of parameter '{0}' references inaccessible name '{1}'." }, + Name_of_inferred_type_of_parameter_0_could_not_be_written_Consider_adding_an_explicit_type_annotation: { code: 4031, category: DiagnosticCategory.Error, key: "Name of inferred type of parameter '{0}' could not be written. Consider adding an explicit type annotation." }, + Return_type_of_method_0_references_inaccessible_name_1: { code: 4038, category: DiagnosticCategory.Error, key: "Return type of method '{0}' references inaccessible name '{1}'." }, + Name_of_inferred_return_type_of_method_0_could_not_be_written_Consider_adding_an_explicit_type_annotation: { code: 4039, category: DiagnosticCategory.Error, key: "Name of inferred return type of method '{0}' could not be written. Consider adding an explicit type annotation." }, + Return_type_of_property_getter_0_references_inaccessible_name_1: { code: 4043, category: DiagnosticCategory.Error, key: "Return type of property getter '{0}' references inaccessible name '{1}'." }, + Return_type_of_construct_signature_references_inaccessible_name_0: { code: 4044, category: DiagnosticCategory.Error, key: "Return type of construct signature references inaccessible name '{0}'." }, + Return_type_of_call_signature_references_inaccessible_name_0: { code: 4047, category: DiagnosticCategory.Error, key: "Return type of call signature references inaccessible name '{0}'." }, + Return_type_of_index_signature_references_inaccessible_name_0: { code: 4049, category: DiagnosticCategory.Error, key: "Return type of index signature references inaccessible name '{0}'." }, + Return_type_of_function_0_references_inaccessible_name_1: { code: 4060, category: DiagnosticCategory.Error, key: "Return type of function '{0}' references inaccessible name '{1}'." }, + Name_of_inferred_return_type_of_function_0_could_not_be_written_Consider_adding_an_explicit_type_annotation: { code: 4061, category: DiagnosticCategory.Error, key: "Name of inferred return type of function '{0}' could not be written. Consider adding an explicit type annotation." }, + Type_alias_0_references_inaccessible_name_1: { code: 4081, category: DiagnosticCategory.Error, key: "Type alias '{0}' references inaccessible name '{1}'." }, + Default_export_of_the_module_references_inaccessible_name_0: { code: 4082, category: DiagnosticCategory.Error, key: "Default export of the module references inaccessible name '{0}'." }, + Name_of_inferred_type_of_default_export_could_not_be_written_Consider_exporting_a_declaration_instead: { code: 4083, category: DiagnosticCategory.Error, key: "Name of inferred type of default export could not be written. Consider exporting a declaration instead." }, Loop_contains_block_scoped_variable_0_referenced_by_a_function_in_the_loop_This_is_only_supported_in_ECMAScript_6_or_higher: { code: 4091, category: DiagnosticCategory.Error, key: "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher." }, The_current_host_does_not_support_the_0_option: { code: 5001, category: DiagnosticCategory.Error, key: "The current host does not support the '{0}' option." }, Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: DiagnosticCategory.Error, key: "Cannot find the common subdirectory path for the input files." }, diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index c1657a81babb5..60fe56a9a3904 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1700,11 +1700,11 @@ "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead.": { "category": "Error", "code": 2652 - }, + }, "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'.": { "category": "Error", "code": 2653 - }, + }, "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.": { "category": "Error", "code": 2654 @@ -1712,295 +1712,103 @@ "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition.": { "category": "Error", "code": 2655 - }, + }, "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition.": { "category": "Error", "code": 2656 - }, - "Import declaration '{0}' is using private name '{1}'.": { + }, + + "Import declaration '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4000 }, - "Type parameter '{0}' of exported class has or is using private name '{1}'.": { + "Constraint of type parameter '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4002 }, - "Type parameter '{0}' of exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4004 - }, - "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4006 - }, - "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4008 - }, - "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4010 - }, - "Type parameter '{0}' of public method from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4012 - }, - "Type parameter '{0}' of method from exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4014 - }, - "Type parameter '{0}' of exported function has or is using private name '{1}'.": { - "category": "Error", - "code": 4016 - }, - "Implements clause of exported class '{0}' has or is using private name '{1}'.": { + "Implements clause references inaccessible name '{0}'.": { "category": "Error", "code": 4019 }, - "Extends clause of exported class '{0}' has or is using private name '{1}'.": { + "Extends clause references inaccessible name '{0}'.": { "category": "Error", "code": 4020 }, - "Extends clause of exported interface '{0}' has or is using private name '{1}'.": { - "category": "Error", - "code": 4022 - }, - "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named.": { - "category": "Error", - "code": 4023 - }, - "Exported variable '{0}' has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4024 - }, - "Exported variable '{0}' has or is using private name '{1}'.": { + "Type of variable '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4025 }, - "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "Name of inferred type of variable '{0}' could not be written. Consider adding an explicit type annotation.": { "category": "Error", "code": 4026 }, - "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4027 - }, - "Public static property '{0}' of exported class has or is using private name '{1}'.": { + "Type of property '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4028 }, - "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "Name of inferred type of property '{0}' could not be written. Consider adding an explicit type annotation.": { "category": "Error", "code": 4029 }, - "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'.": { + "Type of parameter '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4030 }, - "Public property '{0}' of exported class has or is using private name '{1}'.": { + "Name of inferred type of parameter '{0}' could not be written. Consider adding an explicit type annotation.": { "category": "Error", "code": 4031 }, - "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4032 - }, - "Property '{0}' of exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4033 - }, - "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4034 - }, - "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4035 - }, - "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4036 - }, - "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4037 - }, - "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 method '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4038 }, - "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'.": { + "Name of inferred return type of method '{0}' could not be written. Consider adding an explicit type annotation.": { "category": "Error", "code": 4039 }, - "Return type of public static property getter from exported class has or is using private name '{0}'.": { - "category": "Error", - "code": 4040 - }, - "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": 4041 - }, - "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4042 - }, - "Return type of public property getter from exported class has or is using private name '{0}'.": { + "Return type of property getter '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4043 }, - "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'.": { + "Return type of construct signature references inaccessible name '{0}'.": { "category": "Error", "code": 4044 }, - "Return type of constructor signature from exported interface has or is using private name '{0}'.": { - "category": "Error", - "code": 4045 - }, - "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4046 - }, - "Return type of call signature from exported interface has or is using private name '{0}'.": { + "Return type of call signature references inaccessible name '{0}'.": { "category": "Error", "code": 4047 }, - "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4048 - }, - "Return type of index signature from exported interface has or is using private name '{0}'.": { + "Return type of index signature references inaccessible name '{0}'.": { "category": "Error", "code": 4049 }, - "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": 4050 - }, - "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4051 - }, - "Return type of public static method from exported class has or is using private name '{0}'.": { - "category": "Error", - "code": 4052 - }, - "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": 4053 - }, - "Return type of public method from exported class has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4054 - }, - "Return type of public method from exported class has or is using private name '{0}'.": { - "category": "Error", - "code": 4055 - }, - "Return type of method from exported interface has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4056 - }, - "Return type of method from exported interface has or is using private name '{0}'.": { - "category": "Error", - "code": 4057 - }, - "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named.": { - "category": "Error", - "code": 4058 - }, - "Return type of exported function has or is using name '{0}' from private module '{1}'.": { - "category": "Error", - "code": 4059 - }, - "Return type of exported function has or is using private name '{0}'.": { + "Return type of function '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4060 }, - "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named.": { + "Name of inferred return type of function '{0}' could not be written. Consider adding an explicit type annotation.": { "category": "Error", "code": 4061 }, - "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4062 - }, - "Parameter '{0}' of constructor from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4063 - }, - "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4064 - }, - "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4065 - }, - "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4066 - }, - "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4067 - }, - "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": 4068 - }, - "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4069 - }, - "Parameter '{0}' of public static method from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4070 - }, - "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": 4071 - }, - "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4072 - }, - "Parameter '{0}' of public method from exported class has or is using private name '{1}'.": { - "category": "Error", - "code": 4073 - }, - "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4074 - }, - "Parameter '{0}' of method from exported interface has or is using private name '{1}'.": { - "category": "Error", - "code": 4075 - }, - "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named.": { - "category": "Error", - "code": 4076 - }, - "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'.": { - "category": "Error", - "code": 4077 - }, - "Parameter '{0}' of exported function has or is using private name '{1}'.": { - "category": "Error", - "code": 4078 - }, - "Exported type alias '{0}' has or is using private name '{1}'.": { + "Type alias '{0}' references inaccessible name '{1}'.": { "category": "Error", "code": 4081 }, - "Default export of the module has or is using private name '{0}'.": { + "Default export of the module references inaccessible name '{0}'.": { "category": "Error", "code": 4082 }, + "Name of inferred type of default export could not be written. Consider exporting a declaration instead.": { + "category": "Error", + "code": 4083 + }, + + "Loop contains block-scoped variable '{0}' referenced by a function in the loop. This is only supported in ECMAScript 6 or higher.": { "category": "Error", "code": 4091 }, + "The current host does not support the '{0}' option.": { "category": "Error", "code": 5001 diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 44e5a45b0571f..347c23ad876c1 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -93,6 +93,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } + // Emit declarations + if (compilerOptions.declaration) { + emitDeclarations(host, resolver, targetSourceFile, diagnostics); + } + // Sort and make the unique list of diagnostics diagnostics = sortAndDeduplicateDiagnostics(diagnostics); @@ -122,7 +127,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi return true; } - function emitJavaScript(jsFilePath: string, root?: SourceFile) { + function emitFile(jsFilePath: string, root?: SourceFile) { let writer = createTextWriter(newLine); let { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer; @@ -7215,14 +7220,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi } } } - - function emitFile(jsFilePath: string, sourceFile?: SourceFile) { - emitJavaScript(jsFilePath, sourceFile); - - if (compilerOptions.declaration) { - writeDeclarationFile(jsFilePath, sourceFile, host, resolver, diagnostics); - } - } } var entities: Map = { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 330ad05518bb1..d8738d0a36957 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -425,7 +425,7 @@ namespace ts { // Implement the parser as a singleton module. We do this for perf reasons because creating // parser instances can actually be expensive enough to impact us on projects with many source // files. - module Parser { + namespace Parser { // Share a single scanner across all calls to parse a source file. This helps speed things // up by avoiding the cost of creating/compiling scanners over and over again. const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true); @@ -5945,7 +5945,7 @@ namespace ts { } } - module IncrementalParser { + namespace IncrementalParser { export function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks: boolean): SourceFile { aggressiveChecks = aggressiveChecks || Debug.shouldAssert(AssertionLevel.Aggressive); diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json index fd541a8ca80c1..393530bdc663a 100644 --- a/src/compiler/tsconfig.json +++ b/src/compiler/tsconfig.json @@ -16,6 +16,7 @@ "utilities.ts", "binder.ts", "checker.ts", + "declarationEmitter.ts", "emitter.ts", "program.ts", "commandLineParser.ts", diff --git a/src/compiler/types.ts b/src/compiler/types.ts index d2757bb7937ca..55b4601169db4 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -1495,7 +1495,8 @@ namespace ts { // Called when the symbol writer encounters a symbol to write. Currently only used by the // declaration emitter to help determine if it should patch up the final declaration file // with import statements it previously saw (but chose not to emit). - trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void; + trackTypeSymbol?(symbol: Symbol): void; + trackInaccesibleSymbol?(symbol: Symbol): void; } export const enum TypeFormatFlags { @@ -1525,36 +1526,13 @@ namespace ts { UseOnlyExternalAliasing = 0x00000002, } - /* @internal */ - export const enum SymbolAccessibility { - Accessible, - NotAccessible, - CannotBeNamed - } - export interface TypePredicate { parameterName: string; parameterIndex: number; type: Type; } - /* @internal */ - export type AnyImportSyntax = ImportDeclaration | ImportEqualsDeclaration; - - /* @internal */ - export interface SymbolVisibilityResult { - accessibility: SymbolAccessibility; - aliasesToMakeVisible?: AnyImportSyntax[]; // aliases that need to have this symbol visible - errorSymbolName?: string; // Optional symbol name that results in error - errorNode?: Node; // optional node that results in error - } - - /* @internal */ - export interface SymbolAccessiblityResult extends SymbolVisibilityResult { - errorModuleName?: string; // If the symbol is not visible from module, module's name - } - - /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator + /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator * metadata */ /* @internal */ export enum TypeReferenceSerializationKind { @@ -1586,20 +1564,19 @@ namespace ts { isReferencedAliasDeclaration(node: Node, checkChildren?: boolean): boolean; isTopLevelValueImportEqualsWithEntityName(node: ImportEqualsDeclaration): boolean; getNodeCheckFlags(node: Node): NodeCheckFlags; - isDeclarationVisible(node: Declaration): boolean; - collectLinkedAliases(node: Identifier): Node[]; isImplementationOfOverload(node: FunctionLikeDeclaration): boolean; writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; - isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags): SymbolAccessiblityResult; - isEntityNameVisible(entityName: EntityName | Expression, enclosingDeclaration: Node): SymbolVisibilityResult; + writeBaseConstructorTypeOfClass(expr: ClassLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter): void; // Returns the constant value this property access resolves to, or 'undefined' for a non-constant getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number; getBlockScopedVariableId(node: Identifier): number; getReferencedValueDeclaration(reference: Identifier): Declaration; getTypeReferenceSerializationKind(typeName: EntityName): TypeReferenceSerializationKind; isOptionalParameter(node: ParameterDeclaration): boolean; + getSymbolAtLocation(node: Node): Symbol; + getAliasedSymbol(s: Symbol): Symbol; } export const enum SymbolFlags { @@ -1774,8 +1751,11 @@ namespace ts { Void = 0x00000010, Undefined = 0x00000020, Null = 0x00000040, + Enum = 0x00000080, // Enum type + StringLiteral = 0x00000100, // String literal type + TypeParameter = 0x00000200, // Type parameter Class = 0x00000400, // Class Interface = 0x00000800, // Interface diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index ed8b516b7f30c..2411b9938f515 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -64,7 +64,6 @@ namespace ts { increaseIndent: () => { }, decreaseIndent: () => { }, clear: () => str = "", - trackSymbol: () => { } }; } @@ -2394,4 +2393,13 @@ namespace ts { } } } + + export function getTypeAnnotationFromAccessor(getAccessor: AccessorDeclaration, setAccessor: AccessorDeclaration): TypeNode { + if (getAccessor && getAccessor.type) { + return getAccessor.type // Getter - return type + } + if (setAccessor && setAccessor.parameters.length > 0) { + return setAccessor.parameters[0].type; + } + } } diff --git a/src/services/utilities.ts b/src/services/utilities.ts index 8b77dcb953ba5..31b06146f2fcd 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -626,7 +626,6 @@ namespace ts { increaseIndent: () => { indent++; }, decreaseIndent: () => { indent--; }, clear: resetWriter, - trackSymbol: () => { } }; function writeIndent() { diff --git a/tests/baselines/reference/acceptableAlias1.symbols b/tests/baselines/reference/acceptableAlias1.symbols index cffbc70290fe8..31679fb6a525b 100644 --- a/tests/baselines/reference/acceptableAlias1.symbols +++ b/tests/baselines/reference/acceptableAlias1.symbols @@ -13,5 +13,5 @@ module M { import r = M.X; >r : Symbol(r, Decl(acceptableAlias1.ts, 4, 1)) >M : Symbol(M, Decl(acceptableAlias1.ts, 0, 0)) ->X : Symbol(r, Decl(acceptableAlias1.ts, 0, 10)) +>X : Symbol(M.X, Decl(acceptableAlias1.ts, 2, 5)) diff --git a/tests/baselines/reference/aliasInaccessibleModule.errors.txt b/tests/baselines/reference/aliasInaccessibleModule.errors.txt index 3a9c64e50ab46..1f88cca70b5cc 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.errors.txt +++ b/tests/baselines/reference/aliasInaccessibleModule.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/aliasInaccessibleModule.ts(4,23): error TS4000: Import declaration 'X' is using private name 'N'. +tests/cases/compiler/aliasInaccessibleModule.ts(4,23): error TS4000: Import declaration 'X' references inaccessible name 'N'. ==== tests/cases/compiler/aliasInaccessibleModule.ts (1 errors) ==== @@ -7,5 +7,5 @@ tests/cases/compiler/aliasInaccessibleModule.ts(4,23): error TS4000: Import decl } export import X = N; ~ -!!! error TS4000: Import declaration 'X' is using private name 'N'. +!!! error TS4000: Import declaration 'X' references inaccessible name 'N'. } \ No newline at end of file diff --git a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt index 03a37147aba10..709154d3723da 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt +++ b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/aliasInaccessibleModule2.ts(7,16): error TS4000: Import declaration 'R' is using private name 'N'. +tests/cases/compiler/aliasInaccessibleModule2.ts(7,16): error TS4000: Import declaration 'R' references inaccessible name 'N'. ==== tests/cases/compiler/aliasInaccessibleModule2.ts (1 errors) ==== @@ -10,6 +10,6 @@ tests/cases/compiler/aliasInaccessibleModule2.ts(7,16): error TS4000: Import dec } import R = N; ~ -!!! error TS4000: Import declaration 'R' is using private name 'N'. +!!! error TS4000: Import declaration 'R' references inaccessible name 'N'. export import X = R; } \ No newline at end of file diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols b/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols index 68a852c6165aa..ab1e7d14bd98f 100644 --- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols +++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.symbols @@ -5,7 +5,7 @@ import foo = require("./foo_0"); // None of the below should cause a runtime dependency on foo_0 import f = foo.M1; >f : Symbol(f, Decl(foo_1.ts, 0, 32)) ->foo : Symbol(foo, Decl(foo_0.ts, 0, 0)) +>foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) >M1 : Symbol(foo.M1, Decl(foo_0.ts, 8, 1)) var i: f.I2; diff --git a/tests/baselines/reference/chainedImportAlias.symbols b/tests/baselines/reference/chainedImportAlias.symbols index 0f374305aeb61..d10e22af1199f 100644 --- a/tests/baselines/reference/chainedImportAlias.symbols +++ b/tests/baselines/reference/chainedImportAlias.symbols @@ -4,7 +4,7 @@ import x = require('./chainedImportAlias_file0'); import y = x; >y : Symbol(y, Decl(chainedImportAlias_file1.ts, 0, 49)) ->x : Symbol(x, Decl(chainedImportAlias_file0.ts, 0, 0)) +>x : Symbol(x, Decl(chainedImportAlias_file1.ts, 0, 0)) y.m.foo(); >y.m.foo : Symbol(x.m.foo, Decl(chainedImportAlias_file0.ts, 0, 17)) diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols index 68a852c6165aa..ab1e7d14bd98f 100644 --- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols +++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.symbols @@ -5,7 +5,7 @@ import foo = require("./foo_0"); // None of the below should cause a runtime dependency on foo_0 import f = foo.M1; >f : Symbol(f, Decl(foo_1.ts, 0, 32)) ->foo : Symbol(foo, Decl(foo_0.ts, 0, 0)) +>foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) >M1 : Symbol(foo.M1, Decl(foo_0.ts, 8, 1)) var i: f.I2; diff --git a/tests/baselines/reference/declFileForExportedImport.symbols b/tests/baselines/reference/declFileForExportedImport.symbols index fe14836199ca8..c9c3679682648 100644 --- a/tests/baselines/reference/declFileForExportedImport.symbols +++ b/tests/baselines/reference/declFileForExportedImport.symbols @@ -11,7 +11,7 @@ var y = a.x; export import b = a; >b : Symbol(b, Decl(declFileForExportedImport_1.ts, 2, 12)) ->a : Symbol(a, Decl(declFileForExportedImport_0.ts, 0, 0)) +>a : Symbol(a, Decl(declFileForExportedImport_1.ts, 0, 0)) var z = b.x; >z : Symbol(z, Decl(declFileForExportedImport_1.ts, 5, 3)) diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.symbols b/tests/baselines/reference/declFileImportChainInExportAssignment.symbols index 12e05bed75af1..a47db44a02eed 100644 --- a/tests/baselines/reference/declFileImportChainInExportAssignment.symbols +++ b/tests/baselines/reference/declFileImportChainInExportAssignment.symbols @@ -17,7 +17,7 @@ import a = m.c; import b = a; >b : Symbol(b, Decl(declFileImportChainInExportAssignment.ts, 6, 15)) ->a : Symbol(a, Decl(declFileImportChainInExportAssignment.ts, 0, 10)) +>a : Symbol(a, Decl(declFileImportChainInExportAssignment.ts, 5, 1)) export = b; >b : Symbol(b, Decl(declFileImportChainInExportAssignment.ts, 6, 15)) diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt index b6130864d8b6c..8101b25f1a0ee 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.errors.txt @@ -1,13 +1,13 @@ -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(16,21): error TS4043: Return type of public property getter from exported class has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(21,13): error TS4043: Return type of public property getter from exported class has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(26,25): error TS4037: Parameter 'foo3' of public property setter from exported class has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(33,25): error TS4037: Parameter 'foo4' of public property setter from exported class has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(37,21): error TS4043: Return type of public property getter from exported class has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(72,23): error TS4043: Return type of public property getter from exported class has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(77,13): error TS4042: Return type of public property getter from exported class has or is using name 'm2.public2' from private module 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(82,27): error TS4037: Parameter 'foo113' of public property setter from exported class has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(89,27): error TS4037: Parameter 'foo114' of public property setter from exported class has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(93,23): error TS4043: Return type of public property getter from exported class has or is using private name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(16,21): error TS4043: Return type of property getter 'foo1' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(21,13): error TS4043: Return type of property getter 'foo2' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(26,25): error TS4030: Type of parameter 'param' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(33,25): error TS4030: Type of parameter 'param' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(37,21): error TS4043: Return type of property getter 'foo5' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(72,23): error TS4043: Return type of property getter 'foo111' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(77,13): error TS4043: Return type of property getter 'foo112' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(82,27): error TS4030: Type of parameter 'param' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(89,27): error TS4030: Type of parameter 'param' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(93,23): error TS4043: Return type of property getter 'foo115' references inaccessible name 'm2'. ==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts (10 errors) ==== @@ -28,21 +28,21 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(93,23): e // getter with annotation get foo1(): private1 { ~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'private1'. +!!! error TS4043: Return type of property getter 'foo1' references inaccessible name 'private1'. return; } // getter without annotation get foo2() { ~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'private1'. +!!! error TS4043: Return type of property getter 'foo2' references inaccessible name 'private1'. return new private1(); } // setter with annotation set foo3(param: private1) { ~~~~~~~~ -!!! error TS4037: Parameter 'foo3' of public property setter from exported class has or is using private name 'private1'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'private1'. } // Both - getter without annotation, setter with annotation @@ -51,13 +51,13 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(93,23): e } set foo4(param: private1) { ~~~~~~~~ -!!! error TS4037: Parameter 'foo4' of public property setter from exported class has or is using private name 'private1'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'private1'. } // Both - with annotation get foo5(): private1 { ~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'private1'. +!!! error TS4043: Return type of property getter 'foo5' references inaccessible name 'private1'. return; } set foo5(param: private1) { @@ -94,21 +94,21 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(93,23): e // getter with annotation get foo111(): m2.public2 { ~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'm2'. +!!! error TS4043: Return type of property getter 'foo111' references inaccessible name 'm2'. return; } // getter without annotation get foo112() { ~~~~~~ -!!! error TS4042: Return type of public property getter from exported class has or is using name 'm2.public2' from private module 'm2'. +!!! error TS4043: Return type of property getter 'foo112' references inaccessible name 'm2'. return new m2.public2(); } // setter with annotation set foo113(param: m2.public2) { ~~ -!!! error TS4037: Parameter 'foo113' of public property setter from exported class has or is using private name 'm2'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'm2'. } // Both - getter without annotation, setter with annotation @@ -117,13 +117,13 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorAccessors.ts(93,23): e } set foo114(param: m2.public2) { ~~ -!!! error TS4037: Parameter 'foo114' of public property setter from exported class has or is using private name 'm2'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'm2'. } // Both - with annotation get foo115(): m2.public2 { ~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'm2'. +!!! error TS4043: Return type of property getter 'foo115' references inaccessible name 'm2'. return; } set foo115(param: m2.public2) { diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt index 7dbe3617de939..eb7553fdf377c 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(15,34): error TS4078: Parameter 'param' of exported function has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(17,26): error TS4078: Parameter 'param' of exported function has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(40,35): error TS4078: Parameter 'param' of exported function has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(42,28): error TS4077: Parameter 'param' of exported function has or is using name 'm2.public2' from private module 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(15,34): error TS4030: Type of parameter 'param' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(17,26): error TS4030: Type of parameter 'param' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(40,35): error TS4030: Type of parameter 'param' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts(42,28): error TS4030: Type of parameter 'param' references inaccessible name 'm2'. ==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts (4 errors) ==== @@ -21,11 +21,11 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts export function foo3(param : private1) { ~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'private1'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'private1'. } export function foo4(param = new private1()) { - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'private1'. + ~~~~~ +!!! error TS4030: Type of parameter 'param' references inaccessible name 'private1'. } function foo11(param: public1) { @@ -50,11 +50,11 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorParameterOfFunction.ts export function foo113(param: m2.public2) { ~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'm2'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'm2'. } export function foo114(param = new m2.public2()) { - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4077: Parameter 'param' of exported function has or is using name 'm2.public2' from private module 'm2'. + ~~~~~ +!!! error TS4030: Type of parameter 'param' references inaccessible name 'm2'. } } \ No newline at end of file diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt index 449af75bf6153..036cb4e5f6f22 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(17,29): error TS4060: Return type of exported function has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(20,21): error TS4060: Return type of exported function has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(50,31): error TS4060: Return type of exported function has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(53,21): error TS4059: Return type of exported function has or is using name 'm2.public2' from private module 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(17,29): error TS4060: Return type of function 'foo3' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(20,21): error TS4060: Return type of function 'foo4' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(50,31): error TS4060: Return type of function 'foo113' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts(53,21): error TS4060: Return type of function 'foo114' references inaccessible name 'm2'. ==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.ts (4 errors) ==== @@ -23,12 +23,12 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.t export function foo3(): private1 { ~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'private1'. +!!! error TS4060: Return type of function 'foo3' references inaccessible name 'private1'. return; } export function foo4() { ~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'private1'. +!!! error TS4060: Return type of function 'foo4' references inaccessible name 'private1'. return new private1(); } @@ -60,12 +60,12 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.t export function foo113(): m2.public2 { ~~ -!!! error TS4060: Return type of exported function has or is using private name 'm2'. +!!! error TS4060: Return type of function 'foo113' references inaccessible name 'm2'. return; } export function foo114() { ~~~~~~ -!!! error TS4059: Return type of exported function has or is using name 'm2.public2' from private module 'm2'. +!!! error TS4060: Return type of function 'foo114' references inaccessible name 'm2'. return new m2.public2(); } } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt index a9fd72ae569d6..c9a29fcfde254 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(10,23): error TS4025: Exported variable 'p' has or is using private name 'W'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(33,22): error TS4081: Exported type alias 't2' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(36,23): error TS4081: Exported type alias 't12' has or is using private name 'public1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(39,24): error TS4081: Exported type alias 't112' has or is using private name 'm3'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(10,23): error TS4025: Type of variable 'p' references inaccessible name 'W'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(33,22): error TS4081: Type alias 't2' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(36,23): error TS4081: Type alias 't12' references inaccessible name 'public1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(39,24): error TS4081: Type alias 't112' references inaccessible name 'm3'. ==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts (4 errors) ==== @@ -16,7 +16,7 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(39,24): e export class Window { } export var p: W; // Should report error that W is private ~ -!!! error TS4025: Exported variable 'p' has or is using private name 'W'. +!!! error TS4025: Type of variable 'p' references inaccessible name 'W'. } } @@ -41,16 +41,16 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeAlias.ts(39,24): e type t1 = private1; export type t2 = private1; // error ~~~~~~~~ -!!! error TS4081: Exported type alias 't2' has or is using private name 'private1'. +!!! error TS4081: Type alias 't2' references inaccessible name 'private1'. type t11 = public1; export type t12 = public1; ~~~~~~~ -!!! error TS4081: Exported type alias 't12' has or is using private name 'public1'. +!!! error TS4081: Type alias 't12' references inaccessible name 'public1'. type t111 = m3.public1; export type t112 = m3.public1; // error ~~ -!!! error TS4081: Exported type alias 't112' has or is using private name 'm3'. +!!! error TS4081: Type alias 't112' references inaccessible name 'm3'. } \ No newline at end of file diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt index 8cba0d12464d2..a3290c6c8ca3d 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.errors.txt @@ -1,24 +1,20 @@ -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(11,12): error TS4025: Exported variable 'x' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(12,12): error TS4025: Exported variable 'x' has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(13,13): error TS4025: Exported variable 'x' has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(14,19): error TS4025: Exported variable 'x' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(15,22): error TS4025: Exported variable 'x' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(16,22): error TS4025: Exported variable 'x' has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(18,16): error TS4024: Exported variable 'x2' has or is using name 'm2.public1' from private module 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(18,16): error TS4025: Exported variable 'x2' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(25,16): error TS4024: Exported variable 'x3' has or is using name 'm2.public1' from private module 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(25,16): error TS4025: Exported variable 'x3' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(28,23): error TS4025: Exported variable 'y' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(28,36): error TS4025: Exported variable 'y' has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(29,16): error TS4024: Exported variable 'y2' has or is using name 'm2.public1' from private module 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(29,16): error TS4025: Exported variable 'y2' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(32,27): error TS4025: Exported variable 'z' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(32,40): error TS4025: Exported variable 'z' has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(33,16): error TS4024: Exported variable 'z2' has or is using name 'm2.public1' from private module 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(33,16): error TS4025: Exported variable 'z2' has or is using private name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(11,12): error TS4028: Type of property 'x' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(12,12): error TS4028: Type of property 'y' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(13,13): error TS4047: Return type of call signature references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(14,19): error TS4038: Return type of method 'method' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(15,22): error TS4049: Return type of index signature references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(16,22): error TS4049: Return type of index signature references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(18,16): error TS4025: Type of variable 'x2' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(25,16): error TS4025: Type of variable 'x3' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(28,23): error TS4030: Type of parameter 'a' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(28,36): error TS4025: Type of variable 'y' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(29,16): error TS4025: Type of variable 'y2' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(32,27): error TS4030: Type of parameter 'a' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(32,40): error TS4025: Type of variable 'z' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(33,16): error TS4025: Type of variable 'z2' references inaccessible name 'private1'. -==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts (18 errors) ==== +==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts (14 errors) ==== module m { class private1 { @@ -31,28 +27,26 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(33,16): export var x: { x: private1; ~~~~~~~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'private1'. +!!! error TS4028: Type of property 'x' references inaccessible name 'private1'. y: m2.public1; ~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'm2'. +!!! error TS4028: Type of property 'y' references inaccessible name 'm2'. (): m2.public1[]; ~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'm2'. +!!! error TS4047: Return type of call signature references inaccessible name 'm2'. method(): private1; ~~~~~~~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'private1'. +!!! error TS4038: Return type of method 'method' references inaccessible name 'private1'. [n: number]: private1; ~~~~~~~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'private1'. +!!! error TS4049: Return type of index signature references inaccessible name 'private1'. [s: string]: m2.public1; ~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'm2'. +!!! error TS4049: Return type of index signature references inaccessible name 'm2'. }; export var x2 = { ~~ -!!! error TS4024: Exported variable 'x2' has or is using name 'm2.public1' from private module 'm2'. - ~~ -!!! error TS4025: Exported variable 'x2' has or is using private name 'private1'. +!!! error TS4025: Type of variable 'x2' references inaccessible name 'private1'. x: new private1(), y: new m2.public1(), method() { @@ -61,31 +55,25 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorTypeLiteral.ts(33,16): }; export var x3 = x; ~~ -!!! error TS4024: Exported variable 'x3' has or is using name 'm2.public1' from private module 'm2'. - ~~ -!!! error TS4025: Exported variable 'x3' has or is using private name 'private1'. +!!! error TS4025: Type of variable 'x3' references inaccessible name 'm2'. // Function type export var y: (a: private1) => m2.public1; ~~~~~~~~ -!!! error TS4025: Exported variable 'y' has or is using private name 'private1'. +!!! error TS4030: Type of parameter 'a' references inaccessible name 'private1'. ~~ -!!! error TS4025: Exported variable 'y' has or is using private name 'm2'. +!!! error TS4025: Type of variable 'y' references inaccessible name 'm2'. export var y2 = y; ~~ -!!! error TS4024: Exported variable 'y2' has or is using name 'm2.public1' from private module 'm2'. - ~~ -!!! error TS4025: Exported variable 'y2' has or is using private name 'private1'. +!!! error TS4025: Type of variable 'y2' references inaccessible name 'private1'. // constructor type export var z: new (a: private1) => m2.public1; ~~~~~~~~ -!!! error TS4025: Exported variable 'z' has or is using private name 'private1'. +!!! error TS4030: Type of parameter 'a' references inaccessible name 'private1'. ~~ -!!! error TS4025: Exported variable 'z' has or is using private name 'm2'. +!!! error TS4025: Type of variable 'z' references inaccessible name 'm2'. export var z2 = z; ~~ -!!! error TS4024: Exported variable 'z2' has or is using name 'm2.public1' from private module 'm2'. - ~~ -!!! error TS4025: Exported variable 'z2' has or is using private name 'private1'. +!!! error TS4025: Type of variable 'z2' references inaccessible name 'private1'. } \ No newline at end of file diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt index 33771b85dd424..aaaed5350bf78 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(13,19): error TS4025: Exported variable 'k' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(14,16): error TS4025: Exported variable 'l' has or is using private name 'private1'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(30,20): error TS4025: Exported variable 'k3' has or is using private name 'm2'. -tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(31,16): error TS4024: Exported variable 'l3' has or is using name 'm2.public2' from private module 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(13,19): error TS4025: Type of variable 'k' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(14,16): error TS4025: Type of variable 'l' references inaccessible name 'private1'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(30,20): error TS4025: Type of variable 'k3' references inaccessible name 'm2'. +tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts(31,16): error TS4025: Type of variable 'l3' references inaccessible name 'm2'. ==== tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts (4 errors) ==== @@ -19,10 +19,10 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts export var k: private1; ~~~~~~~~ -!!! error TS4025: Exported variable 'k' has or is using private name 'private1'. +!!! error TS4025: Type of variable 'k' references inaccessible name 'private1'. export var l = new private1(); ~ -!!! error TS4025: Exported variable 'l' has or is using private name 'private1'. +!!! error TS4025: Type of variable 'l' references inaccessible name 'private1'. var x2: public1; var y2 = new public1(); @@ -40,9 +40,9 @@ tests/cases/compiler/declFileTypeAnnotationVisibilityErrorVariableDeclaration.ts export var k3: m2.public2; ~~ -!!! error TS4025: Exported variable 'k3' has or is using private name 'm2'. +!!! error TS4025: Type of variable 'k3' references inaccessible name 'm2'. export var l3 = new m2.public2(); ~~ -!!! error TS4024: Exported variable 'l3' has or is using name 'm2.public2' from private module 'm2'. +!!! error TS4025: Type of variable 'l3' references inaccessible name 'm2'. } \ No newline at end of file diff --git a/tests/baselines/reference/declInput-2.errors.txt b/tests/baselines/reference/declInput-2.errors.txt index f151f3e712205..37f8b581a5de2 100644 --- a/tests/baselines/reference/declInput-2.errors.txt +++ b/tests/baselines/reference/declInput-2.errors.txt @@ -1,8 +1,8 @@ -tests/cases/compiler/declInput-2.ts(10,21): error TS4031: Public property 'm22' of exported class has or is using private name 'C'. -tests/cases/compiler/declInput-2.ts(13,21): error TS4031: Public property 'm25' of exported class has or is using private name 'I2'. -tests/cases/compiler/declInput-2.ts(16,24): error TS4055: Return type of public method from exported class has or is using private name 'I2'. -tests/cases/compiler/declInput-2.ts(18,23): error TS4073: Parameter 'i' of public method from exported class has or is using private name 'I2'. -tests/cases/compiler/declInput-2.ts(19,21): error TS4055: Return type of public method from exported class has or is using private name 'C'. +tests/cases/compiler/declInput-2.ts(10,21): error TS4028: Type of property 'm22' references inaccessible name 'C'. +tests/cases/compiler/declInput-2.ts(13,21): error TS4028: Type of property 'm25' references inaccessible name 'I2'. +tests/cases/compiler/declInput-2.ts(16,24): error TS4038: Return type of method 'm252' references inaccessible name 'I2'. +tests/cases/compiler/declInput-2.ts(18,23): error TS4030: Type of parameter 'i' references inaccessible name 'I2'. +tests/cases/compiler/declInput-2.ts(19,21): error TS4038: Return type of method 'm3' references inaccessible name 'C'. ==== tests/cases/compiler/declInput-2.ts (5 errors) ==== @@ -17,23 +17,23 @@ tests/cases/compiler/declInput-2.ts(19,21): error TS4055: Return type of public public m2: string; public m22: C; // don't generate ~ -!!! error TS4031: Public property 'm22' of exported class has or is using private name 'C'. +!!! error TS4028: Type of property 'm22' references inaccessible name 'C'. public m23: E; public m24: I1; public m25: I2; // don't generate ~~ -!!! error TS4031: Public property 'm25' of exported class has or is using private name 'I2'. +!!! error TS4028: Type of property 'm25' references inaccessible name 'I2'. public m232(): E { return null;} public m242(): I1 { return null; } public m252(): I2 { return null; } // don't generate ~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'I2'. +!!! error TS4038: Return type of method 'm252' references inaccessible name 'I2'. public m26(i:I1) {} public m262(i:I2) {} ~~ -!!! error TS4073: Parameter 'i' of public method from exported class has or is using private name 'I2'. +!!! error TS4030: Type of parameter 'i' references inaccessible name 'I2'. public m3():C { return new C(); } ~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'C'. +!!! error TS4038: Return type of method 'm3' references inaccessible name 'C'. } } \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt b/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt deleted file mode 100644 index f19766cbb0093..0000000000000 --- a/tests/baselines/reference/declarationEmitDefaultExport7.errors.txt +++ /dev/null @@ -1,9 +0,0 @@ -tests/cases/compiler/declarationEmitDefaultExport7.ts(2,1): error TS4082: Default export of the module has or is using private name 'A'. - - -==== tests/cases/compiler/declarationEmitDefaultExport7.ts (1 errors) ==== - class A {} - export default new A(); - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4082: Default export of the module has or is using private name 'A'. - \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.js b/tests/baselines/reference/declarationEmitDefaultExport7.js index 99751113dd66d..7ff280a880629 100644 --- a/tests/baselines/reference/declarationEmitDefaultExport7.js +++ b/tests/baselines/reference/declarationEmitDefaultExport7.js @@ -7,3 +7,10 @@ export default new A(); class A { } export default new A(); + + +//// [declarationEmitDefaultExport7.d.ts] +declare class A { +} +declare var _default: A; +export default _default; diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.symbols b/tests/baselines/reference/declarationEmitDefaultExport7.symbols new file mode 100644 index 0000000000000..20ac298eb03d0 --- /dev/null +++ b/tests/baselines/reference/declarationEmitDefaultExport7.symbols @@ -0,0 +1,7 @@ +=== tests/cases/compiler/declarationEmitDefaultExport7.ts === +class A {} +>A : Symbol(A, Decl(declarationEmitDefaultExport7.ts, 0, 0)) + +export default new A(); +>A : Symbol(A, Decl(declarationEmitDefaultExport7.ts, 0, 0)) + diff --git a/tests/baselines/reference/declarationEmitDefaultExport7.types b/tests/baselines/reference/declarationEmitDefaultExport7.types new file mode 100644 index 0000000000000..f3f6698d1396f --- /dev/null +++ b/tests/baselines/reference/declarationEmitDefaultExport7.types @@ -0,0 +1,8 @@ +=== tests/cases/compiler/declarationEmitDefaultExport7.ts === +class A {} +>A : A + +export default new A(); +>new A() : A +>A : typeof A + diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt index e464b96a8bf77..dd9b936e8d510 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts(4,20): error TS4025: Exported variable 'y' has or is using private name 'c'. +tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts(4,20): error TS4025: Type of variable 'y' references inaccessible name 'c'. ==== tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts (1 errors) ==== @@ -7,5 +7,5 @@ tests/cases/compiler/declarationEmitDestructuringPrivacyError.ts(4,20): error TS } export var [x, y, z] = [10, new c(), 30]; ~ -!!! error TS4025: Exported variable 'y' has or is using private name 'c'. +!!! error TS4025: Type of variable 'y' references inaccessible name 'c'. } \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.symbols b/tests/baselines/reference/declarationEmit_nameConflicts.symbols index 1c5bb35b756e0..43657e85baf87 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.symbols +++ b/tests/baselines/reference/declarationEmit_nameConflicts.symbols @@ -37,7 +37,7 @@ export module M { export import d = im; >d : Symbol(d, Decl(declarationEmit_nameConflicts_0.ts, 11, 24)) ->im : Symbol(d, Decl(declarationEmit_nameConflicts_1.ts, 0, 0)) +>im : Symbol(im, Decl(declarationEmit_nameConflicts_0.ts, 0, 0)) } export module M.P { diff --git a/tests/baselines/reference/dependencyViaImportAlias.symbols b/tests/baselines/reference/dependencyViaImportAlias.symbols index 8855b8d64518f..04c0a9a1a132d 100644 --- a/tests/baselines/reference/dependencyViaImportAlias.symbols +++ b/tests/baselines/reference/dependencyViaImportAlias.symbols @@ -4,7 +4,7 @@ import a = require('A'); import A = a.A; >A : Symbol(A, Decl(B.ts, 0, 24)) ->a : Symbol(a, Decl(A.ts, 0, 0)) +>a : Symbol(a, Decl(B.ts, 0, 0)) >A : Symbol(a.A, Decl(A.ts, 0, 0)) export = A; diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols index 24eab96f54be3..77b93c3ef0022 100644 --- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols +++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.symbols @@ -14,7 +14,7 @@ import { a } from "./es6ImportNamedImportInIndirectExportAssignment_0"; import x = a; >x : Symbol(x, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 71)) ->a : Symbol(a, Decl(es6ImportNamedImportInIndirectExportAssignment_0.ts, 0, 0)) +>a : Symbol(a, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 8)) export = x; >x : Symbol(x, Decl(es6ImportNamedImportInIndirectExportAssignment_1.ts, 0, 71)) diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js index 208f71bcbfe9f..e96b755f76dcd 100644 --- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js +++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js @@ -16,4 +16,3 @@ require("server"); //// [server.d.ts] export declare var a: number; //// [client.d.ts] -export import "server"; diff --git a/tests/baselines/reference/expressionInExtendsClause.js b/tests/baselines/reference/expressionInExtendsClause.js new file mode 100644 index 0000000000000..50465bb91e9fa --- /dev/null +++ b/tests/baselines/reference/expressionInExtendsClause.js @@ -0,0 +1,50 @@ +//// [expressionInExtendsClause.ts] + +export class C { + x: T; + y: U; +} + +// Not exported, but not important in declaration generation +function getClass(a) { + return C; +} + +export class MyClass extends getClass(2) { +} + + + +//// [expressionInExtendsClause.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var C = (function () { + function C() { + } + return C; +})(); +exports.C = C; +// Not exported, but not important in declaration generation +function getClass(a) { + return C; +} +var MyClass = (function (_super) { + __extends(MyClass, _super); + function MyClass() { + _super.apply(this, arguments); + } + return MyClass; +})(getClass(2)); +exports.MyClass = MyClass; + + +//// [expressionInExtendsClause.d.ts] +export declare class C { + x: T; + y: U; +} +export declare class MyClass extends C { +} diff --git a/tests/baselines/reference/expressionInExtendsClause.symbols b/tests/baselines/reference/expressionInExtendsClause.symbols new file mode 100644 index 0000000000000..be0b9f97f32fa --- /dev/null +++ b/tests/baselines/reference/expressionInExtendsClause.symbols @@ -0,0 +1,31 @@ +=== tests/cases/compiler/expressionInExtendsClause.ts === + +export class C { +>C : Symbol(C, Decl(expressionInExtendsClause.ts, 0, 0)) +>T : Symbol(T, Decl(expressionInExtendsClause.ts, 1, 15)) +>U : Symbol(U, Decl(expressionInExtendsClause.ts, 1, 17)) + + x: T; +>x : Symbol(x, Decl(expressionInExtendsClause.ts, 1, 22)) +>T : Symbol(T, Decl(expressionInExtendsClause.ts, 1, 15)) + + y: U; +>y : Symbol(y, Decl(expressionInExtendsClause.ts, 2, 9)) +>U : Symbol(U, Decl(expressionInExtendsClause.ts, 1, 17)) +} + +// Not exported, but not important in declaration generation +function getClass(a) { +>getClass : Symbol(getClass, Decl(expressionInExtendsClause.ts, 4, 1)) +>a : Symbol(a, Decl(expressionInExtendsClause.ts, 7, 18)) + + return C; +>C : Symbol(C, Decl(expressionInExtendsClause.ts, 0, 0)) +} + +export class MyClass extends getClass(2) { +>MyClass : Symbol(MyClass, Decl(expressionInExtendsClause.ts, 9, 1)) +>getClass : Symbol(getClass, Decl(expressionInExtendsClause.ts, 4, 1)) +} + + diff --git a/tests/baselines/reference/expressionInExtendsClause.types b/tests/baselines/reference/expressionInExtendsClause.types new file mode 100644 index 0000000000000..83f237e6aae69 --- /dev/null +++ b/tests/baselines/reference/expressionInExtendsClause.types @@ -0,0 +1,33 @@ +=== tests/cases/compiler/expressionInExtendsClause.ts === + +export class C { +>C : C +>T : T +>U : U + + x: T; +>x : T +>T : T + + y: U; +>y : U +>U : U +} + +// Not exported, but not important in declaration generation +function getClass(a) { +>getClass : (a: any) => typeof C +>a : any + + return C; +>C : typeof C +} + +export class MyClass extends getClass(2) { +>MyClass : MyClass +>getClass(2) : C +>getClass : (a: any) => typeof C +>2 : number +} + + diff --git a/tests/baselines/reference/expressionInExtendsClauseWithVisibilityErrors.errors.txt b/tests/baselines/reference/expressionInExtendsClauseWithVisibilityErrors.errors.txt new file mode 100644 index 0000000000000..9326dc1304e41 --- /dev/null +++ b/tests/baselines/reference/expressionInExtendsClauseWithVisibilityErrors.errors.txt @@ -0,0 +1,25 @@ +tests/cases/compiler/expressionInExtendsClauseWithVisibilityErrors.ts(16,30): error TS4020: Extends clause references inaccessible name 'C'. + + +==== tests/cases/compiler/expressionInExtendsClauseWithVisibilityErrors.ts (1 errors) ==== + + interface I { + } + + class C { + x: T; + y: U; + } + + function getClass(a) { + return C; + } + + // Error C is not exported + // Error I is not exported + export class MyClass extends getClass(2) { + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4020: Extends clause references inaccessible name 'C'. + } + + \ No newline at end of file diff --git a/tests/baselines/reference/expressionInExtendsClauseWithVisibilityErrors.js b/tests/baselines/reference/expressionInExtendsClauseWithVisibilityErrors.js new file mode 100644 index 0000000000000..3c6989c795db2 --- /dev/null +++ b/tests/baselines/reference/expressionInExtendsClauseWithVisibilityErrors.js @@ -0,0 +1,45 @@ +//// [expressionInExtendsClauseWithVisibilityErrors.ts] + +interface I { +} + +class C { + x: T; + y: U; +} + +function getClass(a) { + return C; +} + +// Error C is not exported +// Error I is not exported +export class MyClass extends getClass(2) { +} + + + +//// [expressionInExtendsClauseWithVisibilityErrors.js] +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var C = (function () { + function C() { + } + return C; +})(); +function getClass(a) { + return C; +} +// Error C is not exported +// Error I is not exported +var MyClass = (function (_super) { + __extends(MyClass, _super); + function MyClass() { + _super.apply(this, arguments); + } + return MyClass; +})(getClass(2)); +exports.MyClass = MyClass; diff --git a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols index 02e5e6cfc5a44..d4b995af6b2bb 100644 --- a/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols +++ b/tests/baselines/reference/externalModuleReferenceDoubleUnderscore1.symbols @@ -5,7 +5,7 @@ declare module 'timezonecomplete' { export import TimeUnit = basics.TimeUnit; >TimeUnit : Symbol(TimeUnit, Decl(externalModuleReferenceDoubleUnderscore1.ts, 1, 57)) ->basics : Symbol(basics, Decl(externalModuleReferenceDoubleUnderscore1.ts, 3, 1)) +>basics : Symbol(basics, Decl(externalModuleReferenceDoubleUnderscore1.ts, 0, 35)) >TimeUnit : Symbol(basics.TimeUnit, Decl(externalModuleReferenceDoubleUnderscore1.ts, 5, 44)) } diff --git a/tests/baselines/reference/import_reference-exported-alias.symbols b/tests/baselines/reference/import_reference-exported-alias.symbols index 424bb4bc8b4b1..478edb8401279 100644 --- a/tests/baselines/reference/import_reference-exported-alias.symbols +++ b/tests/baselines/reference/import_reference-exported-alias.symbols @@ -4,12 +4,12 @@ import appJs = require("file1"); import Services = appJs.Services; >Services : Symbol(Services, Decl(file2.ts, 0, 32)) ->appJs : Symbol(appJs, Decl(file1.ts, 0, 0)) +>appJs : Symbol(appJs, Decl(file2.ts, 0, 0)) >Services : Symbol(appJs.Services, Decl(file1.ts, 0, 12)) import UserServices = Services.UserServices; >UserServices : Symbol(UserServices, Decl(file2.ts, 1, 33)) ->Services : Symbol(appJs.Services, Decl(file1.ts, 0, 12)) +>Services : Symbol(Services, Decl(file2.ts, 0, 32)) >UserServices : Symbol(Services.UserServices, Decl(file1.ts, 1, 28)) var x = new UserServices().getUserName(); diff --git a/tests/baselines/reference/import_reference-to-type-alias.symbols b/tests/baselines/reference/import_reference-to-type-alias.symbols index 2fef0714a3ad1..118f34d3dc129 100644 --- a/tests/baselines/reference/import_reference-to-type-alias.symbols +++ b/tests/baselines/reference/import_reference-to-type-alias.symbols @@ -4,7 +4,7 @@ import appJs = require("file1"); import Services = appJs.App.Services; >Services : Symbol(Services, Decl(file2.ts, 0, 32)) ->appJs : Symbol(appJs, Decl(file1.ts, 0, 0)) +>appJs : Symbol(appJs, Decl(file2.ts, 0, 0)) >App : Symbol(appJs.App, Decl(file1.ts, 0, 0)) >Services : Symbol(Services, Decl(file1.ts, 0, 19)) diff --git a/tests/baselines/reference/importedAliasesInTypePositions.symbols b/tests/baselines/reference/importedAliasesInTypePositions.symbols index 50a6b582655c3..005487732c847 100644 --- a/tests/baselines/reference/importedAliasesInTypePositions.symbols +++ b/tests/baselines/reference/importedAliasesInTypePositions.symbols @@ -4,7 +4,7 @@ import RT_ALIAS = require("file1"); import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo; >ReferredTo : Symbol(ReferredTo, Decl(file2.ts, 0, 35)) ->RT_ALIAS : Symbol(RT_ALIAS, Decl(file1.ts, 0, 0)) +>RT_ALIAS : Symbol(RT_ALIAS, Decl(file2.ts, 0, 0)) >elaborate : Symbol(RT_ALIAS.elaborate, Decl(file1.ts, 0, 0)) >nested : Symbol(RT_ALIAS.elaborate.nested, Decl(file1.ts, 0, 24)) >mod : Symbol(RT_ALIAS.elaborate.nested.mod, Decl(file1.ts, 0, 31)) diff --git a/tests/baselines/reference/intrinsics.errors.txt b/tests/baselines/reference/intrinsics.errors.txt index 342b84e02b995..e9529d4b9f0eb 100644 --- a/tests/baselines/reference/intrinsics.errors.txt +++ b/tests/baselines/reference/intrinsics.errors.txt @@ -1,15 +1,12 @@ tests/cases/compiler/intrinsics.ts(2,21): error TS2304: Cannot find name 'hasOwnProperty'. -tests/cases/compiler/intrinsics.ts(2,21): error TS4025: Exported variable 'hasOwnProperty' has or is using private name 'hasOwnProperty'. tests/cases/compiler/intrinsics.ts(11,1): error TS2304: Cannot find name '__proto__'. -==== tests/cases/compiler/intrinsics.ts (3 errors) ==== +==== tests/cases/compiler/intrinsics.ts (2 errors) ==== var hasOwnProperty: hasOwnProperty; // Error ~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'hasOwnProperty'. - ~~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'hasOwnProperty' has or is using private name 'hasOwnProperty'. module m1 { export var __proto__; diff --git a/tests/baselines/reference/intrinsics.js b/tests/baselines/reference/intrinsics.js index 736ffa020fa2b..675e10c01d3ac 100644 --- a/tests/baselines/reference/intrinsics.js +++ b/tests/baselines/reference/intrinsics.js @@ -33,3 +33,13 @@ var Foo = (function () { return Foo; })(); var foo; + + +//// [intrinsics.d.ts] +declare var hasOwnProperty: hasOwnProperty; +declare module m1 { + var __proto__: any; +} +declare class Foo<__proto__> { +} +declare var foo: (__proto__: number) => void; diff --git a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt index debb5808493a7..e205ce1627fe3 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt +++ b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt @@ -1,39 +1,39 @@ -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(253,44): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(259,31): error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(265,20): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(271,13): error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(361,48): error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(365,35): error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(405,44): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(408,31): error TS4043: Return type of public property getter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(411,20): error TS4039: Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(414,13): error TS4042: Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(420,48): error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(422,35): error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(9,40): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(15,27): error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(21,16): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(27,9): error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(117,44): error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(121,31): error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(161,40): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(164,27): error TS4043: Return type of public property getter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(167,16): error TS4039: Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(170,9): error TS4042: Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(176,44): error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(178,31): error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(211,44): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(217,31): error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(223,20): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(229,13): error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(319,48): error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(323,35): error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(363,44): error TS4040: Return type of public static property getter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(366,31): error TS4043: Return type of public property getter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(369,20): error TS4039: Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(372,13): error TS4042: Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(378,48): error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(253,44): error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(259,31): error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(265,20): error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(271,13): error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(361,48): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(365,35): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(405,44): error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(408,31): error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(411,20): error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(414,13): error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(420,48): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts(422,35): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(9,40): error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(15,27): error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(21,16): error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(27,9): error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(117,44): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(121,31): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(161,40): error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(164,27): error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(167,16): error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(170,9): error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(176,44): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(178,31): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(211,44): error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(217,31): error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(223,20): error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(229,13): error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(319,48): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(323,35): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(363,44): error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(366,31): error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(369,20): error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(372,13): error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(378,48): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts (24 errors) ==== @@ -47,7 +47,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithWithPrivateGetAccessorTypes { static get myPublicStaticMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateClass'. return null; } private static get myPrivateStaticMethod(): privateClass { @@ -55,7 +55,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } get myPublicMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateClass'. return null; } private get myPrivateMethod(): privateClass { @@ -63,7 +63,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private static get myPrivateStaticMethod1() { @@ -71,7 +71,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private get myPrivateMethod1() { @@ -163,13 +163,13 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithWithPrivateSetAccessorTypes { static set myPublicStaticMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private static set myPrivateStaticMethod(param: privateClass) { } set myPublicMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private set myPrivateMethod(param: privateClass) { } @@ -211,22 +211,22 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithPrivateModuleGetAccessorTypes { static get myPublicStaticMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateModule'. return null; } get myPublicMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateModule'. return null; } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4039: Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4042: Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } } @@ -234,11 +234,11 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithPrivateModuleSetAccessorTypes { static set myPublicStaticMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } set myPublicMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } } @@ -273,7 +273,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithWithPrivateGetAccessorTypes { static get myPublicStaticMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateClass'. return null; } private static get myPrivateStaticMethod(): privateClass { @@ -281,7 +281,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } get myPublicMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateClass'. return null; } private get myPrivateMethod(): privateClass { @@ -289,7 +289,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private static get myPrivateStaticMethod1() { @@ -297,7 +297,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private get myPrivateMethod1() { @@ -389,13 +389,13 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithWithPrivateSetAccessorTypes { static set myPublicStaticMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private static set myPrivateStaticMethod(param: privateClass) { } set myPublicMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private set myPrivateMethod(param: privateClass) { } @@ -437,22 +437,22 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithPrivateModuleGetAccessorTypes { static get myPublicStaticMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateModule'. return null; } get myPublicMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateModule'. return null; } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4039: Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4042: Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } } @@ -460,11 +460,11 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithPrivateModuleSetAccessorTypes { static set myPublicStaticMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } set myPublicMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } } @@ -949,7 +949,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithWithPrivateGetAccessorTypes { static get myPublicStaticMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateClass'. return null; } private static get myPrivateStaticMethod(): privateClass { @@ -957,7 +957,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } get myPublicMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateClass'. return null; } private get myPrivateMethod(): privateClass { @@ -965,7 +965,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private static get myPrivateStaticMethod1() { @@ -973,7 +973,7 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateClass'. +!!! error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private get myPrivateMethod1() { @@ -1065,13 +1065,13 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithWithPrivateSetAccessorTypes { static set myPublicStaticMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private static set myPrivateStaticMethod(param: privateClass) { } set myPublicMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private set myPrivateMethod(param: privateClass) { } @@ -1113,22 +1113,22 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithPrivateModuleGetAccessorTypes { static get myPublicStaticMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4040: Return type of public static property getter from exported class has or is using private name 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod' references inaccessible name 'privateModule'. return null; } get myPublicMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4043: Return type of public property getter from exported class has or is using private name 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicMethod' references inaccessible name 'privateModule'. return null; } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4039: Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicStaticMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4042: Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4043: Return type of property getter 'myPublicMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } } @@ -1136,11 +1136,11 @@ tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts(380,35): error TS export class publicClassWithPrivateModuleSetAccessorTypes { static set myPublicStaticMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } set myPublicMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4037: Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } } diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt index b5d0ea8223ed4..beaefa7d78b7a 100644 --- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt @@ -1,11 +1,11 @@ -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(3,16): error TS4038: 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. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(9,9): error TS4041: 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. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(15,16): error TS4038: Return type of public static property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(21,9): error TS4041: Return type of public property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(57,16): error TS4038: 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. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(60,9): error TS4041: 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. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(63,16): error TS4038: 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. -tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error TS4041: Return type of public property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(3,16): error TS4029: Name of inferred type of property 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(9,9): error TS4029: Name of inferred type of property 'myPublicMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(15,16): error TS4029: Name of inferred type of property 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(21,9): error TS4029: Name of inferred type of property 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(57,16): error TS4029: Name of inferred type of property 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(60,9): error TS4029: Name of inferred type of property 'myPublicMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(63,16): error TS4029: Name of inferred type of property 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error TS4029: Name of inferred type of property 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. ==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts (8 errors) ==== @@ -13,7 +13,7 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error export class publicClassWithWithPrivateGetAccessorTypes { static get myPublicStaticMethod() { // Error ~~~~~~~~~~~~~~~~~~~~ -!!! error TS4038: 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. +!!! error TS4029: Name of inferred type of property 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget1(); } private static get myPrivateStaticMethod() { @@ -21,7 +21,7 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error } get myPublicMethod() { // Error ~~~~~~~~~~~~~~ -!!! error TS4041: 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. +!!! error TS4029: Name of inferred type of property 'myPublicMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget1(); } private get myPrivateMethod() { @@ -29,7 +29,7 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4038: Return type of public static property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. +!!! error TS4029: Name of inferred type of property 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget3(); } private static get myPrivateStaticMethod1() { @@ -37,7 +37,7 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4041: Return type of public property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. +!!! error TS4029: Name of inferred type of property 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget3(); } private get myPrivateMethod1() { @@ -75,22 +75,22 @@ tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts(66,9): error export class publicClassWithPrivateModuleGetAccessorTypes { static get myPublicStaticMethod() { // Error ~~~~~~~~~~~~~~~~~~~~ -!!! error TS4038: 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. +!!! error TS4029: Name of inferred type of property 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget2(); } get myPublicMethod() { // Error ~~~~~~~~~~~~~~ -!!! error TS4041: 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. +!!! error TS4029: Name of inferred type of property 'myPublicMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget2(); } static get myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4038: 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. +!!! error TS4029: Name of inferred type of property 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget4(); } get myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4041: Return type of public property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +!!! error TS4029: Name of inferred type of property 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget4(); } } diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile2.errors.txt b/tests/baselines/reference/privacyCannotNameAccessorDeclFile2.errors.txt new file mode 100644 index 0000000000000..24b8813056778 --- /dev/null +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile2.errors.txt @@ -0,0 +1,29 @@ +tests/cases/compiler/privacyCannotNameAccessorDeclFile2.ts(19,21): error TS4061: Name of inferred return type of function 'getIlocally' could not be written. Consider adding an explicit type annotation. + + +==== tests/cases/compiler/privacyCannotNameAccessorDeclFile2.ts (1 errors) ==== + + namespace M { + export interface I { } + } + + namespace N { + export function getI(): M.I { + return undefined + } + } + + namespace O { + // shadow M with a local namespace declaration + export namespace M { + export var x = 0; + } + + // Error, return type cannot be named + export function getIlocally() { + ~~~~~~~~~~~ +!!! error TS4061: Name of inferred return type of function 'getIlocally' could not be written. Consider adding an explicit type annotation. + return N.getI(); + } + } + \ No newline at end of file diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile2.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile2.js new file mode 100644 index 0000000000000..168bd068aed18 --- /dev/null +++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile2.js @@ -0,0 +1,46 @@ +//// [privacyCannotNameAccessorDeclFile2.ts] + +namespace M { + export interface I { } +} + +namespace N { + export function getI(): M.I { + return undefined + } +} + +namespace O { + // shadow M with a local namespace declaration + export namespace M { + export var x = 0; + } + + // Error, return type cannot be named + export function getIlocally() { + return N.getI(); + } +} + + +//// [privacyCannotNameAccessorDeclFile2.js] +var N; +(function (N) { + function getI() { + return undefined; + } + N.getI = getI; +})(N || (N = {})); +var O; +(function (O) { + // shadow M with a local namespace declaration + var M; + (function (M) { + M.x = 0; + })(M = O.M || (O.M = {})); + // Error, return type cannot be named + function getIlocally() { + return N.getI(); + } + O.getIlocally = getIlocally; +})(O || (O = {})); diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt index e76474d2d33df..4477d879f3c5a 100644 --- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt +++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt @@ -1,36 +1,36 @@ -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(3,5): error TS4026: 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. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(5,5): error TS4029: Public property 'myPublicProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(8,5): error TS4026: Public static property 'myPublicStaticProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(10,5): error TS4029: Public property 'myPublicProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(26,12): error TS4023: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(28,12): error TS4023: Exported variable 'publicVarWithPrivatePropertyTypes1' has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(32,5): error TS4026: 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. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(33,5): error TS4029: 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. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(34,5): error TS4026: Public static property 'myPublicStaticProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(35,5): error TS4029: Public property 'myPublicProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(37,12): error TS4023: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(38,12): error TS4023: Exported variable 'publicVarWithPrivateModulePropertyTypes1' has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(3,12): error TS4029: Name of inferred type of property 'myPublicStaticProperty' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(5,5): error TS4029: Name of inferred type of property 'myPublicProperty' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(8,12): error TS4029: Name of inferred type of property 'myPublicStaticProperty1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(10,5): error TS4029: Name of inferred type of property 'myPublicProperty1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(26,12): error TS4026: Name of inferred type of variable 'publicVarWithPrivatePropertyTypes' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(28,12): error TS4026: Name of inferred type of variable 'publicVarWithPrivatePropertyTypes1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(32,12): error TS4029: Name of inferred type of property 'myPublicStaticProperty' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(33,5): error TS4029: Name of inferred type of property 'myPublicProperty' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(34,12): error TS4029: Name of inferred type of property 'myPublicStaticProperty1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(35,5): error TS4029: Name of inferred type of property 'myPublicProperty1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(37,12): error TS4026: Name of inferred type of variable 'publicVarWithPrivateModulePropertyTypes' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(38,12): error TS4026: Name of inferred type of variable 'publicVarWithPrivateModulePropertyTypes1' could not be written. Consider adding an explicit type annotation. ==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts (12 errors) ==== import exporter = require("./privacyCannotNameVarTypeDeclFile_exporter"); export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty = exporter.createExportedWidget1(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4026: 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. + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicStaticProperty' could not be written. Consider adding an explicit type annotation. private static myPrivateStaticProperty = exporter.createExportedWidget1(); myPublicProperty = exporter.createExportedWidget1(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4029: Public property 'myPublicProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. + ~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicProperty' could not be written. Consider adding an explicit type annotation. private myPrivateProperty = exporter.createExportedWidget1(); static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4026: Public static property 'myPublicStaticProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicStaticProperty1' could not be written. Consider adding an explicit type annotation. private static myPrivateStaticProperty1 = exporter.createExportedWidget3(); myPublicProperty1 = exporter.createExportedWidget3(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4029: Public property 'myPublicProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicProperty1' could not be written. Consider adding an explicit type annotation. private myPrivateProperty1 = exporter.createExportedWidget3(); } @@ -48,33 +48,33 @@ tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts(38,12): error export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4023: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. +!!! error TS4026: Name of inferred type of variable 'publicVarWithPrivatePropertyTypes' could not be written. Consider adding an explicit type annotation. var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4023: Exported variable 'publicVarWithPrivatePropertyTypes1' has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. +!!! error TS4026: Name of inferred type of variable 'publicVarWithPrivatePropertyTypes1' could not be written. Consider adding an explicit type annotation. var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty= exporter.createExportedWidget2(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4026: 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. + ~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicStaticProperty' could not be written. Consider adding an explicit type annotation. myPublicProperty = exporter.createExportedWidget2(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4029: 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. + ~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicProperty' could not be written. Consider adding an explicit type annotation. static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4026: Public static property 'myPublicStaticProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicStaticProperty1' could not be written. Consider adding an explicit type annotation. myPublicProperty1 = exporter.createExportedWidget4(); // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4029: Public property 'myPublicProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~~~~~~~~~~~~~ +!!! error TS4029: Name of inferred type of property 'myPublicProperty1' could not be written. Consider adding an explicit type annotation. } export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4023: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named. +!!! error TS4026: Name of inferred type of variable 'publicVarWithPrivateModulePropertyTypes' could not be written. Consider adding an explicit type annotation. export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4023: Exported variable 'publicVarWithPrivateModulePropertyTypes1' has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +!!! error TS4026: Name of inferred type of variable 'publicVarWithPrivateModulePropertyTypes1' could not be written. Consider adding an explicit type annotation. class privateClassWithPrivateModulePropertyTypes { static myPublicStaticProperty= exporter.createExportedWidget2(); diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt index 88801e06dfd97..d453bfdfc8674 100644 --- a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt +++ b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt @@ -1,5 +1,5 @@ -tests/cases/compiler/privacyCheckTypeOfFunction.ts(3,22): error TS4025: Exported variable 'x' has or is using private name 'foo'. -tests/cases/compiler/privacyCheckTypeOfFunction.ts(4,12): error TS4025: Exported variable 'b' has or is using private name 'foo'. +tests/cases/compiler/privacyCheckTypeOfFunction.ts(3,22): error TS4025: Type of variable 'x' references inaccessible name 'foo'. +tests/cases/compiler/privacyCheckTypeOfFunction.ts(4,12): error TS4025: Type of variable 'b' references inaccessible name 'foo'. ==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (2 errors) ==== @@ -7,8 +7,8 @@ tests/cases/compiler/privacyCheckTypeOfFunction.ts(4,12): error TS4025: Exported } export var x: typeof foo; ~~~ -!!! error TS4025: Exported variable 'x' has or is using private name 'foo'. +!!! error TS4025: Type of variable 'x' references inaccessible name 'foo'. export var b = foo; ~ -!!! error TS4025: Exported variable 'b' has or is using private name 'foo'. +!!! error TS4025: Type of variable 'b' references inaccessible name 'foo'. \ No newline at end of file diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt index e8accf360dc96..2cf65e89a4758 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts(6,26): error TS4025: Exported variable 'f' has or is using private name 'Inner'. +tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts(6,26): error TS4025: Type of variable 'f' references inaccessible name 'Inner'. ==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts (1 errors) ==== @@ -9,6 +9,6 @@ tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts(6,26): error TS40 export var f: typeof Inner; ~~~~~ -!!! error TS4025: Exported variable 'f' has or is using private name 'Inner'. +!!! error TS4025: Type of variable 'f' references inaccessible name 'Inner'. } \ No newline at end of file diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt index bbc8954cff10c..033268fa62edd 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.errors.txt @@ -1,4 +1,4 @@ -tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts(6,26): error TS4025: Exported variable 'f' has or is using private name 'Inner'. +tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts(6,26): error TS4025: Type of variable 'f' references inaccessible name 'Inner'. ==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts (1 errors) ==== @@ -9,6 +9,6 @@ tests/cases/compiler/privacyCheckTypeOfInvisibleModuleNoError.ts(6,26): error TS export var f: typeof Inner; // Since we dont unwind inner any more, it is error here ~~~~~ -!!! error TS4025: Exported variable 'f' has or is using private name 'Inner'. +!!! error TS4025: Type of variable 'f' references inaccessible name 'Inner'. } \ No newline at end of file diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt index f3c21baed3ce9..717540a095367 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt @@ -1,8 +1,8 @@ -tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts(16,67): error TS4020: Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(17,67): error TS4020: Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(22,69): error TS4020: Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'. -tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(64,55): error TS4020: Extends clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'. -tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65): error TS4020: Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'. +tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts(16,67): error TS4020: Extends clause references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(17,67): error TS4020: Extends clause references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(22,69): error TS4020: Extends clause references inaccessible name 'privateModule'. +tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(64,55): error TS4020: Extends clause references inaccessible name 'privateClass'. +tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65): error TS4020: Extends clause references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts (4 errors) ==== @@ -24,14 +24,14 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65): } export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4020: Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateClassInPublicModule'. } class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { } export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error ~~~~~~~~~~~~~ -!!! error TS4020: Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateModule'. } } @@ -75,14 +75,14 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65): } export class publicClassExtendingPrivateClass extends privateClass { // Should error ~~~~~~~~~~~~ -!!! error TS4020: Extends clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'. +!!! error TS4020: Extends clause references inaccessible name 'privateClass'. } class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { } export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error ~~~~~~~~~~~~~ -!!! error TS4020: Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateModule'. } ==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts (1 errors) ==== @@ -103,7 +103,7 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65): } export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4020: Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateClassInPublicModule'. } } class publicClassInGlobal { diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt index 2681ee0e20e4f..6ac85ebf58c27 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts(14,77): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. -tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(15,77): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. -tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(20,79): error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. -tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(23,78): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'. -tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(63,65): error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterface' has or is using private name 'privateInterface'. -tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(68,75): error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. +tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts(14,77): error TS4019: Implements clause references inaccessible name 'privateInterfaceInPublicModule'. +tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(15,77): error TS4019: Implements clause references inaccessible name 'privateInterfaceInPublicModule'. +tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(20,79): error TS4019: Implements clause references inaccessible name 'privateModule'. +tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(23,78): error TS4019: Implements clause references inaccessible name 'privateInterfaceInPublicModule'. +tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(63,65): error TS4019: Implements clause references inaccessible name 'privateInterface'. +tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(68,75): error TS4019: Implements clause references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts (5 errors) ==== @@ -23,19 +23,19 @@ tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(68,7 } export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. +!!! error TS4019: Implements clause references inaccessible name 'privateInterfaceInPublicModule'. } class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { } export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error ~~~~~~~~~~~~~ -!!! error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. +!!! error TS4019: Implements clause references inaccessible name 'privateModule'. } export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'. +!!! error TS4019: Implements clause references inaccessible name 'privateInterfaceInPublicModule'. } } @@ -77,14 +77,14 @@ tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(68,7 } export class publicClassImplementingPrivateInterface implements privateInterface { // Should error ~~~~~~~~~~~~~~~~ -!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterface' has or is using private name 'privateInterface'. +!!! error TS4019: Implements clause references inaccessible name 'privateInterface'. } class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { } export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error ~~~~~~~~~~~~~ -!!! error TS4019: Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. +!!! error TS4019: Implements clause references inaccessible name 'privateModule'. } ==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts (1 errors) ==== @@ -103,7 +103,7 @@ tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts(68,7 } export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4019: Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. +!!! error TS4019: Implements clause references inaccessible name 'privateInterfaceInPublicModule'. } } interface publicInterfaceInGlobal { diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt index 76fd8b4e80aec..9ad18bd051785 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt +++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt @@ -1,73 +1,73 @@ -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(3,33): error TS4068: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(7,20): error TS4071: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(11,17): error TS4061: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(11,59): error TS4061: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(11,110): error TS4061: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(15,33): error TS4068: Parameter 'param' of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(19,20): error TS4071: Parameter 'param' of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(23,17): error TS4061: Parameter 'param' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(23,59): error TS4061: Parameter 'param1' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(23,110): error TS4061: Parameter 'param2' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(52,56): error TS4076: Parameter 'param' of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(56,57): error TS4076: Parameter 'param' of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(63,33): error TS4068: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(65,20): error TS4071: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(67,17): error TS4061: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(67,58): error TS4061: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(67,108): error TS4061: 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. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(71,33): error TS4068: Parameter 'param' of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(73,20): error TS4071: Parameter 'param' of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(75,17): error TS4061: Parameter 'param' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(75,58): error TS4061: Parameter 'param1' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(75,108): error TS4061: Parameter 'param2' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(78,63): error TS4076: Parameter 'param' of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(80,64): error TS4076: Parameter 'param' of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(3,33): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(7,20): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(11,17): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(11,67): error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(11,117): error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(15,33): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(19,20): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(23,17): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(23,67): error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(23,117): error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(52,56): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(56,57): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(63,33): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(65,20): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(67,17): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(67,66): error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(67,115): error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(71,33): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(73,20): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(75,17): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(75,66): error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(75,115): error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(78,63): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts(80,64): error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. ==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts (24 errors) ==== import exporter = require("./privacyFunctionCannotNameParameterTypeDeclFile_exporter"); export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4068: 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. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) { } myPublicMethod(param = exporter.createExportedWidget1()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4071: 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. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } private myPrivateMethod(param = exporter.createExportedWidget1()) { } constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: 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. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: 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. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: 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. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. } } export class publicClassWithWithPrivateParmeterTypes1 { static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4068: Parameter 'param' of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) { } myPublicMethod(param = exporter.createExportedWidget3()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4071: Parameter 'param' of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } private myPrivateMethod(param = exporter.createExportedWidget3()) { } constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: Parameter 'param' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: Parameter 'param1' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: Parameter 'param2' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. } } @@ -97,14 +97,14 @@ tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts( } export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4076: Parameter 'param' of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { } export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4076: Parameter 'param' of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { } @@ -112,47 +112,47 @@ tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts( export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4068: 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. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } myPublicMethod(param= exporter.createExportedWidget2()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4071: 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. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: 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. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: 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. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: 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. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. } } export class publicClassWithPrivateModuleParameterTypes2 { static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4068: Parameter 'param' of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } myPublicMethod(param= exporter.createExportedWidget4()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4071: Parameter 'param' of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: Parameter 'param' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: Parameter 'param1' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4061: Parameter 'param2' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param1' could not be written. Consider adding an explicit type annotation. + ~~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param2' could not be written. Consider adding an explicit type annotation. } } export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4076: Parameter 'param' of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4076: Parameter 'param' of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. + ~~~~~ +!!! error TS4031: Name of inferred type of parameter 'param' could not be written. Consider adding an explicit type annotation. } diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt index bc6229815f5a8..13a3df5cbb730 100644 --- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt +++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt @@ -1,15 +1,15 @@ -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(3,12): error TS4050: 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. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(9,5): error TS4053: 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. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(15,12): error TS4050: Return type of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(21,5): error TS4053: Return type of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(56,17): error TS4058: Return type of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(62,17): error TS4058: Return type of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(70,12): error TS4050: 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. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(73,5): error TS4053: 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. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(76,12): error TS4050: Return type of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(79,5): error TS4053: Return type of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(83,17): error TS4058: Return type of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error TS4058: Return type of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(3,12): error TS4039: Name of inferred return type of method 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(9,5): error TS4039: Name of inferred return type of method 'myPublicMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(15,12): error TS4039: Name of inferred return type of method 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(21,5): error TS4039: Name of inferred return type of method 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(56,17): error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateParmeterTypes' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(62,17): error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateParmeterTypes1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(70,12): error TS4039: Name of inferred return type of method 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(73,5): error TS4039: Name of inferred return type of method 'myPublicMethod' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(76,12): error TS4039: Name of inferred return type of method 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(79,5): error TS4039: Name of inferred return type of method 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(83,17): error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateModuleReturnTypes' could not be written. Consider adding an explicit type annotation. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateModuleReturnTypes1' could not be written. Consider adding an explicit type annotation. ==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts (12 errors) ==== @@ -17,7 +17,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod() { // Error ~~~~~~~~~~~~~~~~~~~~ -!!! error TS4050: 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. +!!! error TS4039: Name of inferred return type of method 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget1(); } private static myPrivateStaticMethod() { @@ -25,7 +25,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error } myPublicMethod() { // Error ~~~~~~~~~~~~~~ -!!! error TS4053: 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. +!!! error TS4039: Name of inferred return type of method 'myPublicMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget1();; } private myPrivateMethod() { @@ -33,7 +33,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4050: Return type of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. +!!! error TS4039: Name of inferred return type of method 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget3(); } private static myPrivateStaticMethod1() { @@ -41,7 +41,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4053: Return type of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. +!!! error TS4039: Name of inferred return type of method 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget3();; } private myPrivateMethod1() { @@ -78,7 +78,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error export function publicFunctionWithPrivateParmeterTypes() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4058: Return type of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. +!!! error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateParmeterTypes' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget1(); } function privateFunctionWithPrivateParmeterTypes() { @@ -86,7 +86,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error } export function publicFunctionWithPrivateParmeterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4058: Return type of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named. +!!! error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateParmeterTypes1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget3(); } function privateFunctionWithPrivateParmeterTypes1() { @@ -96,33 +96,33 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts(86,17): error export class publicClassWithPrivateModuleReturnTypes { static myPublicStaticMethod() { // Error ~~~~~~~~~~~~~~~~~~~~ -!!! error TS4050: 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. +!!! error TS4039: Name of inferred return type of method 'myPublicStaticMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget2(); } myPublicMethod() { // Error ~~~~~~~~~~~~~~ -!!! error TS4053: 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. +!!! error TS4039: Name of inferred return type of method 'myPublicMethod' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget2(); } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4050: Return type of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +!!! error TS4039: Name of inferred return type of method 'myPublicStaticMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget4(); } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4053: Return type of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +!!! error TS4039: Name of inferred return type of method 'myPublicMethod1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget4(); } } export function publicFunctionWithPrivateModuleReturnTypes() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4058: Return type of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named. +!!! error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateModuleReturnTypes' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget2(); } export function publicFunctionWithPrivateModuleReturnTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4058: Return type of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named. +!!! error TS4061: Name of inferred return type of function 'publicFunctionWithPrivateModuleReturnTypes1' could not be written. Consider adding an explicit type annotation. return exporter.createExportedWidget4(); } diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt index 0e88e08e645ae..5a79b67856916 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt @@ -1,63 +1,63 @@ -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(164,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(165,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(166,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(188,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(192,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,58): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,87): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(239,67): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(248,82): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(254,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(255,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(256,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(259,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(261,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,71): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,113): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(266,74): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(268,89): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(9,17): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(10,13): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(11,21): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(33,40): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(37,27): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(41,24): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(41,54): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(41,83): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(84,63): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(93,78): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(99,17): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(100,13): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(101,21): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(104,40): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(106,27): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(108,24): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(108,67): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(108,109): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(111,70): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(113,85): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(141,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(142,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(143,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(165,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(169,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(173,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(173,58): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(173,87): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(216,67): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(225,82): error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(231,21): error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(232,17): error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(233,25): error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(236,44): error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(238,31): error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(240,28): error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(240,71): error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(240,113): error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(243,74): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(164,21): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(165,17): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(166,25): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(188,44): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(192,31): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,28): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,58): error TS4030: Type of parameter 'param1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(196,87): error TS4030: Type of parameter 'param2' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(239,67): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(248,82): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(254,21): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(255,17): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(256,25): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(259,44): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(261,31): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,28): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,71): error TS4030: Type of parameter 'param1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(263,113): error TS4030: Type of parameter 'param2' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(266,74): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts(268,89): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(9,17): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(10,13): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(11,21): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(33,40): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(37,27): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(41,24): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(41,54): error TS4030: Type of parameter 'param1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(41,83): error TS4030: Type of parameter 'param2' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(84,63): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(93,78): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(99,17): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(100,13): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(101,21): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(104,40): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(106,27): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(108,24): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(108,67): error TS4030: Type of parameter 'param1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(108,109): error TS4030: Type of parameter 'param2' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(111,70): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(113,85): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(141,21): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(142,17): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(143,25): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(165,44): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(169,31): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(173,28): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(173,58): error TS4030: Type of parameter 'param1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(173,87): error TS4030: Type of parameter 'param2' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(216,67): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(225,82): error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(231,21): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(232,17): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(233,25): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(236,44): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(238,31): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(240,28): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(240,71): error TS4030: Type of parameter 'param1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(240,113): error TS4030: Type of parameter 'param2' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(243,74): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts (40 errors) ==== @@ -71,13 +71,13 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; // Error ~~~~~~~~~~~~ -!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. (param: privateClass): publicClass; // Error ~~~~~~~~~~~~ -!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. myMethod(param: privateClass): void; // Error ~~~~~~~~~~~~ -!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicParmeterTypes { @@ -101,23 +101,23 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private static myPrivateStaticMethod(param: privateClass) { } myPublicMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private myPrivateMethod(param: privateClass) { } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param1' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param2' references inaccessible name 'privateClass'. } } @@ -162,7 +162,7 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { } @@ -173,7 +173,7 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error ~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; @@ -181,39 +181,39 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. (param: privateModule.publicClass): publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. myMethod(param: privateModule.publicClass): void; // Error ~~~~~~~~~~~~~ -!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } myPublicMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param1' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param2' references inaccessible name 'privateModule'. } } export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error ~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; @@ -243,13 +243,13 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; // Error ~~~~~~~~~~~~ -!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. (param: privateClass): publicClass; // Error ~~~~~~~~~~~~ -!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. myMethod(param: privateClass): void; // Error ~~~~~~~~~~~~ -!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicParmeterTypes { @@ -273,23 +273,23 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private static myPrivateStaticMethod(param: privateClass) { } myPublicMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private myPrivateMethod(param: privateClass) { } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param1' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param2' references inaccessible name 'privateClass'. } } @@ -334,7 +334,7 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { } @@ -345,7 +345,7 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error ~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; @@ -353,39 +353,39 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. (param: privateModule.publicClass): publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. myMethod(param: privateModule.publicClass): void; // Error ~~~~~~~~~~~~~ -!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } myPublicMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param1' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param2' references inaccessible name 'privateModule'. } } export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error ~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; @@ -704,13 +704,13 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; // Error ~~~~~~~~~~~~ -!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. (param: privateClass): publicClass; // Error ~~~~~~~~~~~~ -!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. myMethod(param: privateClass): void; // Error ~~~~~~~~~~~~ -!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicParmeterTypes { @@ -734,23 +734,23 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private static myPrivateStaticMethod(param: privateClass) { } myPublicMethod(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } private myPrivateMethod(param: privateClass) { } constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param1' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param2' references inaccessible name 'privateClass'. } } @@ -795,7 +795,7 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error ~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. } export function publicFunctionWithPublicParmeterTypes(param: publicClass) { } @@ -806,7 +806,7 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error ~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateClass'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateClass'. export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; @@ -814,39 +814,39 @@ tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts(245,89): export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4065: Parameter 'param' of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. (param: privateModule.publicClass): publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4067: Parameter 'param' of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. myMethod(param: privateModule.publicClass): void; // Error ~~~~~~~~~~~~~ -!!! error TS4075: Parameter 'param' of method from exported interface has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4070: Parameter 'param' of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } myPublicMethod(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4073: Parameter 'param' of public method from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param1' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param1' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4063: Parameter 'param2' of constructor from exported class has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param2' references inaccessible name 'privateModule'. } } export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error ~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. } export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error ~~~~~~~~~~~~~ -!!! error TS4078: Parameter 'param' of exported function has or is using private name 'privateModule'. +!!! error TS4030: Type of parameter 'param' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt index 0156c7241f778..a25db670c1df8 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt @@ -1,69 +1,69 @@ -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(281,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(282,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(283,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(284,21): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(309,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(315,27): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(321,16): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(327,9): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(416,63): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(428,21): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(441,78): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(447,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(448,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(449,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(450,21): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(453,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(456,27): error TS4055: Return type of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(459,16): error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(462,9): error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(466,70): error TS4060: Return type of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(469,21): error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(472,85): error TS4060: Return type of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(9,13): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(10,9): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(11,18): error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(12,17): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(37,36): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(43,23): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(49,12): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(55,5): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(144,59): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(156,17): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(169,74): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(175,13): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(176,9): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(177,18): error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(178,17): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(181,36): error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(184,23): error TS4055: Return type of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(187,12): error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(190,5): error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(194,66): error TS4060: Return type of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(197,17): error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(200,81): error TS4060: Return type of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(238,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(239,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(240,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(241,21): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(266,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(272,27): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(278,16): error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(284,9): error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(373,63): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(385,21): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(398,78): error TS4060: Return type of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(404,17): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(405,13): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(406,22): error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(407,21): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(410,40): error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(413,27): error TS4055: Return type of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(416,16): error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(419,9): error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(423,70): error TS4060: Return type of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(426,21): error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. -tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85): error TS4060: Return type of exported function has or is using private name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(281,17): error TS4044: Return type of construct signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(282,13): error TS4047: Return type of call signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(283,22): error TS4049: Return type of index signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(284,21): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(309,40): error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(315,27): error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(321,16): error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(327,9): error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(416,63): error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(428,21): error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(441,78): error TS4060: Return type of function 'publicAmbientFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(447,17): error TS4044: Return type of construct signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(448,13): error TS4047: Return type of call signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(449,22): error TS4049: Return type of index signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(450,21): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(453,40): error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(456,27): error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(459,16): error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(462,9): error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(466,70): error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(469,21): error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts(472,85): error TS4060: Return type of function 'publicAmbientFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(9,13): error TS4044: Return type of construct signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(10,9): error TS4047: Return type of call signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(11,18): error TS4049: Return type of index signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(12,17): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(37,36): error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(43,23): error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(49,12): error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(55,5): error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(144,59): error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(156,17): error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(169,74): error TS4060: Return type of function 'publicAmbientFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(175,13): error TS4044: Return type of construct signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(176,9): error TS4047: Return type of call signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(177,18): error TS4049: Return type of index signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(178,17): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(181,36): error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(184,23): error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(187,12): error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(190,5): error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(194,66): error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(197,17): error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(200,81): error TS4060: Return type of function 'publicAmbientFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(238,17): error TS4044: Return type of construct signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(239,13): error TS4047: Return type of call signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(240,22): error TS4049: Return type of index signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(241,21): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(266,40): error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(272,27): error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(278,16): error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(284,9): error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(373,63): error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(385,21): error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(398,78): error TS4060: Return type of function 'publicAmbientFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(404,17): error TS4044: Return type of construct signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(405,13): error TS4047: Return type of call signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(406,22): error TS4049: Return type of index signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(407,21): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(410,40): error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(413,27): error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(416,16): error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(419,9): error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(423,70): error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(426,21): error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes1' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85): error TS4060: Return type of function 'publicAmbientFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts (44 errors) ==== @@ -77,16 +77,16 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateClass'. (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateClass'. [x: number]: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'. +!!! error TS4049: Return type of index signature references inaccessible name 'privateClass'. myMethod(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicParmeterTypes { @@ -113,7 +113,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateClass'. return null; } private static myPrivateStaticMethod(): privateClass { @@ -121,7 +121,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } myPublicMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateClass'. return null; } private myPrivateMethod(): privateClass { @@ -129,7 +129,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private static myPrivateStaticMethod1() { @@ -137,7 +137,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private myPrivateMethod1() { @@ -228,7 +228,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. return null; } export function publicFunctionWithPublicParmeterTypes(): publicClass { @@ -242,7 +242,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } export function publicFunctionWithPrivateParmeterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes1' references inaccessible name 'privateClass'. return new privateClass(); } export function publicFunctionWithPublicParmeterTypes1() { @@ -257,7 +257,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicAmbientFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; @@ -265,52 +265,52 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateModule'. (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateModule'. [x: number]: privateModule.publicClass // Error ~~~~~~~~~~~~~ -!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'. +!!! error TS4049: Return type of index signature references inaccessible name 'privateModule'. myMethod(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateModule'. return null; } myPublicMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateModule'. return null; } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } } export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateModule'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. return null; } export function publicFunctionWithPrivateModuleParameterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateModule'. +!!! error TS4060: Return type of function 'publicAmbientFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; @@ -350,16 +350,16 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateClass'. (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateClass'. [x: number]: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'. +!!! error TS4049: Return type of index signature references inaccessible name 'privateClass'. myMethod(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicParmeterTypes { @@ -386,7 +386,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateClass'. return null; } private static myPrivateStaticMethod(): privateClass { @@ -394,7 +394,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } myPublicMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateClass'. return null; } private myPrivateMethod(): privateClass { @@ -402,7 +402,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private static myPrivateStaticMethod1() { @@ -410,7 +410,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private myPrivateMethod1() { @@ -501,7 +501,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. return null; } export function publicFunctionWithPublicParmeterTypes(): publicClass { @@ -515,7 +515,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } export function publicFunctionWithPrivateParmeterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes1' references inaccessible name 'privateClass'. return new privateClass(); } export function publicFunctionWithPublicParmeterTypes1() { @@ -530,7 +530,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicAmbientFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; @@ -538,52 +538,52 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateModule'. (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateModule'. [x: number]: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'. +!!! error TS4049: Return type of index signature references inaccessible name 'privateModule'. myMethod(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateModule'. return null; } myPublicMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateModule'. return null; } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } } export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateModule'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. return null; } export function publicFunctionWithPrivateModuleParameterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateModule'. +!!! error TS4060: Return type of function 'publicAmbientFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; @@ -1127,16 +1127,16 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateClass'. (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateClass'. [x: number]: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateClass'. +!!! error TS4049: Return type of index signature references inaccessible name 'privateClass'. myMethod(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicParmeterTypes { @@ -1163,7 +1163,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateClass'. return null; } private static myPrivateStaticMethod(): privateClass { @@ -1171,7 +1171,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } myPublicMethod(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateClass'. return null; } private myPrivateMethod(): privateClass { @@ -1179,7 +1179,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private static myPrivateStaticMethod1() { @@ -1187,7 +1187,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateClass'. return new privateClass(); } private myPrivateMethod1() { @@ -1278,7 +1278,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error ~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. return null; } export function publicFunctionWithPublicParmeterTypes(): publicClass { @@ -1292,7 +1292,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) } export function publicFunctionWithPrivateParmeterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateParmeterTypes1' references inaccessible name 'privateClass'. return new privateClass(); } export function publicFunctionWithPublicParmeterTypes1() { @@ -1307,7 +1307,7 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateClass'. +!!! error TS4060: Return type of function 'publicAmbientFunctionWithPrivateParmeterTypes' references inaccessible name 'privateClass'. export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass; declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass; @@ -1315,52 +1315,52 @@ tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts(429,85) export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateModule'. (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateModule'. [x: number]: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4049: Return type of index signature from exported interface has or is using private name 'privateModule'. +!!! error TS4049: Return type of index signature references inaccessible name 'privateModule'. myMethod(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4052: Return type of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myPublicStaticMethod' references inaccessible name 'privateModule'. return null; } myPublicMethod(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myPublicMethod' references inaccessible name 'privateModule'. return null; } static myPublicStaticMethod1() { // Error ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4051: Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4038: Return type of method 'myPublicStaticMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } myPublicMethod1() { // Error ~~~~~~~~~~~~~~~ -!!! error TS4054: Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4038: Return type of method 'myPublicMethod1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } } export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error ~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateModule'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. return null; } export function publicFunctionWithPrivateModuleParameterTypes1() { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4059: Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'. +!!! error TS4060: Return type of function 'publicFunctionWithPrivateModuleParameterTypes1' references inaccessible name 'privateModule'. return new privateModule.publicClass(); } export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4060: Return type of exported function has or is using private name 'privateModule'. +!!! error TS4060: Return type of function 'publicAmbientFunctionWithPrivateModuleParameterTypes' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; diff --git a/tests/baselines/reference/privacyGloImport.errors.txt b/tests/baselines/reference/privacyGloImport.errors.txt index 933af3315a7af..0db062634859c 100644 --- a/tests/baselines/reference/privacyGloImport.errors.txt +++ b/tests/baselines/reference/privacyGloImport.errors.txt @@ -1,8 +1,12 @@ -tests/cases/compiler/privacyGloImport.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. -tests/cases/compiler/privacyGloImport.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. +tests/cases/compiler/privacyGloImport.ts(49,29): error TS4000: Import declaration 'm1_im2_private' references inaccessible name 'm1_M2_private'. +tests/cases/compiler/privacyGloImport.ts(50,16): error TS4025: Type of variable 'm1_im2_private_v1_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyGloImport.ts(51,16): error TS4025: Type of variable 'm1_im2_private_v2_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyGloImport.ts(52,16): error TS4025: Type of variable 'm1_im2_private_v3_public' references inaccessible name 'f1'. +tests/cases/compiler/privacyGloImport.ts(53,16): error TS4025: Type of variable 'm1_im2_private_v4_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyGloImport.ts(80,35): error TS4000: Import declaration 'm1_im2_public' references inaccessible name 'm1_M2_private'. -==== tests/cases/compiler/privacyGloImport.ts (2 errors) ==== +==== tests/cases/compiler/privacyGloImport.ts (6 errors) ==== module m1 { export module m1_M1_public { export class c1 { @@ -53,11 +57,19 @@ tests/cases/compiler/privacyGloImport.ts(80,35): error TS4000: Import declaratio import m1_im2_private = m1_M2_private; ~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. +!!! error TS4000: Import declaration 'm1_im2_private' references inaccessible name 'm1_M2_private'. export var m1_im2_private_v1_public = m1_im2_private.c1; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v1_public' references inaccessible name 'c1'. export var m1_im2_private_v2_public = new m1_im2_private.c1(); + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v2_public' references inaccessible name 'c1'. export var m1_im2_private_v3_public = m1_im2_private.f1; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v3_public' references inaccessible name 'f1'. export var m1_im2_private_v4_public = m1_im2_private.f1(); + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v4_public' references inaccessible name 'c1'. 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; @@ -86,7 +98,7 @@ tests/cases/compiler/privacyGloImport.ts(80,35): error TS4000: Import declaratio export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; ~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. +!!! error TS4000: Import declaration 'm1_im2_public' references inaccessible name 'm1_M2_private'. //export import m1_im3_public = require("m1_M3_public"); //export import m1_im4_public = require("m1_M4_private"); } diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt index d6d24ebcb308b..a3e6970e0c9ac 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt +++ b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt @@ -1,11 +1,15 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(22,27): error TS2435: Ambient modules cannot be nested in other modules. tests/cases/compiler/privacyGloImportParseErrors.ts(30,20): error TS2435: Ambient modules cannot be nested in other modules. -tests/cases/compiler/privacyGloImportParseErrors.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. +tests/cases/compiler/privacyGloImportParseErrors.ts(49,29): error TS4000: Import declaration 'm1_im2_private' references inaccessible name 'm1_M2_private'. +tests/cases/compiler/privacyGloImportParseErrors.ts(50,16): error TS4025: Type of variable 'm1_im2_private_v1_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyGloImportParseErrors.ts(51,16): error TS4025: Type of variable 'm1_im2_private_v2_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyGloImportParseErrors.ts(52,16): error TS4025: Type of variable 'm1_im2_private_v3_public' references inaccessible name 'f1'. +tests/cases/compiler/privacyGloImportParseErrors.ts(53,16): error TS4025: Type of variable 'm1_im2_private_v4_public' references inaccessible name 'c1'. tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS1147: Import declarations in a namespace cannot reference a module. tests/cases/compiler/privacyGloImportParseErrors.ts(59,37): error TS2307: Cannot find module 'm1_M3_public'. tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS1147: Import declarations in a namespace cannot reference a module. tests/cases/compiler/privacyGloImportParseErrors.ts(69,37): error TS2307: Cannot find module 'm1_M4_private'. -tests/cases/compiler/privacyGloImportParseErrors.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. +tests/cases/compiler/privacyGloImportParseErrors.ts(80,35): error TS4000: Import declaration 'm1_im2_public' references inaccessible name 'm1_M2_private'. tests/cases/compiler/privacyGloImportParseErrors.ts(81,43): error TS1147: Import declarations in a namespace cannot reference a module. tests/cases/compiler/privacyGloImportParseErrors.ts(82,43): error TS1147: Import declarations in a namespace cannot reference a module. tests/cases/compiler/privacyGloImportParseErrors.ts(121,38): error TS1147: Import declarations in a namespace cannot reference a module. @@ -18,7 +22,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(146,25): error TS1147: Impor tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Import declarations in a namespace cannot reference a module. -==== tests/cases/compiler/privacyGloImportParseErrors.ts (18 errors) ==== +==== tests/cases/compiler/privacyGloImportParseErrors.ts (22 errors) ==== module m1 { export module m1_M1_public { export class c1 { @@ -73,11 +77,19 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor import m1_im2_private = m1_M2_private; ~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. +!!! error TS4000: Import declaration 'm1_im2_private' references inaccessible name 'm1_M2_private'. export var m1_im2_private_v1_public = m1_im2_private.c1; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v1_public' references inaccessible name 'c1'. export var m1_im2_private_v2_public = new m1_im2_private.c1(); + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v2_public' references inaccessible name 'c1'. export var m1_im2_private_v3_public = m1_im2_private.f1; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v3_public' references inaccessible name 'f1'. export var m1_im2_private_v4_public = m1_im2_private.f1(); + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v4_public' references inaccessible name 'c1'. 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; @@ -114,7 +126,7 @@ tests/cases/compiler/privacyGloImportParseErrors.ts(149,29): error TS1147: Impor export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; ~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. +!!! error TS4000: Import declaration 'm1_im2_public' references inaccessible name 'm1_M2_private'. export import m1_im3_public = require("m1_M3_public"); ~~~~~~~~~~~~~~ !!! error TS1147: Import declarations in a namespace cannot reference a module. diff --git a/tests/baselines/reference/privacyImport.errors.txt b/tests/baselines/reference/privacyImport.errors.txt index d5cb61d99b5f4..1493a06d92f76 100644 --- a/tests/baselines/reference/privacyImport.errors.txt +++ b/tests/baselines/reference/privacyImport.errors.txt @@ -1,8 +1,12 @@ -tests/cases/compiler/privacyImport.ts(49,29): error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. -tests/cases/compiler/privacyImport.ts(80,35): error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. +tests/cases/compiler/privacyImport.ts(49,29): error TS4000: Import declaration 'm1_im2_private' references inaccessible name 'm1_M2_private'. +tests/cases/compiler/privacyImport.ts(50,16): error TS4025: Type of variable 'm1_im2_private_v1_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyImport.ts(51,16): error TS4025: Type of variable 'm1_im2_private_v2_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyImport.ts(52,16): error TS4025: Type of variable 'm1_im2_private_v3_public' references inaccessible name 'f1'. +tests/cases/compiler/privacyImport.ts(53,16): error TS4025: Type of variable 'm1_im2_private_v4_public' references inaccessible name 'c1'. +tests/cases/compiler/privacyImport.ts(80,35): error TS4000: Import declaration 'm1_im2_public' references inaccessible name 'm1_M2_private'. -==== tests/cases/compiler/privacyImport.ts (2 errors) ==== +==== tests/cases/compiler/privacyImport.ts (6 errors) ==== export module m1 { export module m1_M1_public { export class c1 { @@ -53,11 +57,19 @@ tests/cases/compiler/privacyImport.ts(80,35): error TS4000: Import declaration ' import m1_im2_private = m1_M2_private; ~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'm1_im2_private' is using private name 'm1_M2_private'. +!!! error TS4000: Import declaration 'm1_im2_private' references inaccessible name 'm1_M2_private'. export var m1_im2_private_v1_public = m1_im2_private.c1; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v1_public' references inaccessible name 'c1'. export var m1_im2_private_v2_public = new m1_im2_private.c1(); + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v2_public' references inaccessible name 'c1'. export var m1_im2_private_v3_public = m1_im2_private.f1; + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v3_public' references inaccessible name 'f1'. export var m1_im2_private_v4_public = m1_im2_private.f1(); + ~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'm1_im2_private_v4_public' references inaccessible name 'c1'. 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; @@ -86,7 +98,7 @@ tests/cases/compiler/privacyImport.ts(80,35): error TS4000: Import declaration ' export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; ~~~~~~~~~~~~~ -!!! error TS4000: Import declaration 'm1_im2_public' is using private name 'm1_M2_private'. +!!! error TS4000: Import declaration 'm1_im2_public' references inaccessible name 'm1_M2_private'. //export import m1_im3_public = require("m1_M3_public"); //export import m1_im4_public = require("m1_M4_private"); } diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt index 41c53ffd19b43..9d7fecc93e22c 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt @@ -1,9 +1,9 @@ -tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts(14,82): error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. -tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(15,82): error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. -tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(20,84): error TS4022: Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. -tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(23,83): error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'. -tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(63,70): error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateInterface' has or is using private name 'privateInterface'. -tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(68,80): error TS4022: Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. +tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts(14,82): error TS4020: Extends clause references inaccessible name 'privateInterfaceInPublicModule'. +tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(15,82): error TS4020: Extends clause references inaccessible name 'privateInterfaceInPublicModule'. +tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(20,84): error TS4020: Extends clause references inaccessible name 'privateModule'. +tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(23,83): error TS4020: Extends clause references inaccessible name 'privateInterfaceInPublicModule'. +tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(63,70): error TS4020: Extends clause references inaccessible name 'privateInterface'. +tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(68,80): error TS4020: Extends clause references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts (5 errors) ==== @@ -23,19 +23,19 @@ tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(68, } export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateInterfaceInPublicModule'. } interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { } export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error ~~~~~~~~~~~~~ -!!! error TS4022: Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateModule'. } export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateInterfaceInPublicModule'. } } @@ -77,14 +77,14 @@ tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(68, } export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error ~~~~~~~~~~~~~~~~ -!!! error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateInterface' has or is using private name 'privateInterface'. +!!! error TS4020: Extends clause references inaccessible name 'privateInterface'. } interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { } export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error ~~~~~~~~~~~~~ -!!! error TS4022: Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using private name 'privateModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateModule'. } ==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts (1 errors) ==== @@ -103,7 +103,7 @@ tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts(68, } export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4022: Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'. +!!! error TS4020: Extends clause references inaccessible name 'privateInterfaceInPublicModule'. } } interface publicInterfaceInGlobal { diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt index 45dbc77e7a0a3..befb7533c0630 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt @@ -1,13 +1,15 @@ -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(51,41): error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(52,41): error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(53,41): error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(54,41): error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(55,41): error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(56,42): error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(57,42): error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(51,41): error TS4000: Import declaration 'im_public_c_private' references inaccessible name 'c_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(52,41): error TS4000: Import declaration 'im_public_e_private' references inaccessible name 'e_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(53,41): error TS4000: Import declaration 'im_public_f_private' references inaccessible name 'f_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(54,41): error TS4000: Import declaration 'im_public_v_private' references inaccessible name 'v_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(55,41): error TS4000: Import declaration 'im_public_i_private' references inaccessible name 'i_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(56,42): error TS4000: Import declaration 'im_public_mi_private' references inaccessible name 'mi_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(57,42): error TS4000: Import declaration 'im_public_mu_private' references inaccessible name 'mu_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(71,16): error TS4025: Type of variable 'publicUse_im_public_mi_private' references inaccessible name 'c'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(73,69): error TS4025: Type of variable 'publicUse_im_public_mu_private' references inaccessible name 'i'. -==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts (7 errors) ==== +==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts (9 errors) ==== // private elements module m_private { export class c_private { @@ -59,26 +61,26 @@ tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(57,42): er export module import_public { // Privacy errors - importing private elements export import im_public_c_private = m_private.c_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_c_private' references inaccessible name 'c_private'. export import im_public_e_private = m_private.e_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_e_private' references inaccessible name 'e_private'. export import im_public_f_private = m_private.f_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_f_private' references inaccessible name 'f_private'. export import im_public_v_private = m_private.v_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_v_private' references inaccessible name 'v_private'. export import im_public_i_private = m_private.i_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_i_private' references inaccessible name 'i_private'. export import im_public_mi_private = m_private.mi_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_mi_private' references inaccessible name 'mi_private'. export import im_public_mu_private = m_private.mu_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_mu_private' references inaccessible name 'mu_private'. // Usage of privacy error imports var privateUse_im_public_c_private = new im_public_c_private(); @@ -93,8 +95,12 @@ tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts(57,42): er 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(); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'publicUse_im_public_mi_private' references inaccessible name 'c'. var privateUse_im_public_mu_private: im_public_mu_private.i; export var publicUse_im_public_mu_private: im_public_mu_private.i; + ~ +!!! error TS4025: Type of variable 'publicUse_im_public_mu_private' references inaccessible name 'i'. // No Privacy errors - importing public elements diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt index 12fd1927660fc..eebcb80964ce1 100644 --- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt +++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt @@ -1,11 +1,13 @@ -tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(51,35): error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(52,35): error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(55,35): error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(56,36): error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'. -tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(57,36): error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(51,35): error TS4000: Import declaration 'im_private_c_private' references inaccessible name 'c_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(52,35): error TS4000: Import declaration 'im_private_e_private' references inaccessible name 'e_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(55,35): error TS4000: Import declaration 'im_private_i_private' references inaccessible name 'i_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(56,36): error TS4000: Import declaration 'im_private_mi_private' references inaccessible name 'mi_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(57,36): error TS4000: Import declaration 'im_private_mu_private' references inaccessible name 'mu_private'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(71,16): error TS4025: Type of variable 'publicUse_im_private_mi_private' references inaccessible name 'c'. +tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(73,71): error TS4025: Type of variable 'publicUse_im_private_mu_private' references inaccessible name 'i'. -==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts (5 errors) ==== +==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts (7 errors) ==== // private elements module m_private { export class c_private { @@ -57,22 +59,22 @@ tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(57,36): export module import_public { // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_c_private' references inaccessible name 'c_private'. import im_private_e_private = m_private.e_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_e_private' references inaccessible name '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; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_i_private' references inaccessible name 'i_private'. import im_private_mi_private = m_private.mi_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_mi_private' references inaccessible name 'mi_private'. import im_private_mu_private = m_private.mu_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_mu_private' references inaccessible name 'mu_private'. // Usage of above decls var privateUse_im_private_c_private = new im_private_c_private(); @@ -87,8 +89,12 @@ tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts(57,36): 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(); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'publicUse_im_private_mi_private' references inaccessible name 'c'. var privateUse_im_private_mu_private: im_private_mu_private.i; export var publicUse_im_private_mu_private: im_private_mu_private.i; + ~ +!!! error TS4025: Type of variable 'publicUse_im_private_mu_private' references inaccessible name 'i'. // No Privacy errors - importing public elements diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt index d3715af1d5493..67b299faab820 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt @@ -1,13 +1,15 @@ -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(50,37): error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(51,37): error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(52,37): error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(53,37): error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(54,37): error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(55,38): error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(56,38): error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(50,37): error TS4000: Import declaration 'im_public_c_private' references inaccessible name 'c_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(51,37): error TS4000: Import declaration 'im_public_e_private' references inaccessible name 'e_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(52,37): error TS4000: Import declaration 'im_public_f_private' references inaccessible name 'f_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(53,37): error TS4000: Import declaration 'im_public_v_private' references inaccessible name 'v_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(54,37): error TS4000: Import declaration 'im_public_i_private' references inaccessible name 'i_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(55,38): error TS4000: Import declaration 'im_public_mi_private' references inaccessible name 'mi_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(56,38): error TS4000: Import declaration 'im_public_mu_private' references inaccessible name 'mu_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(70,12): error TS4025: Type of variable 'publicUse_im_public_mi_private' references inaccessible name 'c'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(72,65): error TS4025: Type of variable 'publicUse_im_public_mu_private' references inaccessible name 'i'. -==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts (7 errors) ==== +==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts (9 errors) ==== // private elements module m_private { export class c_private { @@ -58,26 +60,26 @@ tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(56,38): // Privacy errors - importing private elements export import im_public_c_private = m_private.c_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_c_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_c_private' references inaccessible name 'c_private'. export import im_public_e_private = m_private.e_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_e_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_e_private' references inaccessible name 'e_private'. export import im_public_f_private = m_private.f_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_f_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_f_private' references inaccessible name 'f_private'. export import im_public_v_private = m_private.v_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_v_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_v_private' references inaccessible name 'v_private'. export import im_public_i_private = m_private.i_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_i_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_i_private' references inaccessible name 'i_private'. export import im_public_mi_private = m_private.mi_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_mi_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_mi_private' references inaccessible name 'mi_private'. export import im_public_mu_private = m_private.mu_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_public_mu_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_public_mu_private' references inaccessible name 'mu_private'. // Usage of privacy error imports var privateUse_im_public_c_private = new im_public_c_private(); @@ -92,8 +94,12 @@ tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts(56,38): 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(); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'publicUse_im_public_mi_private' references inaccessible name 'c'. var privateUse_im_public_mu_private: im_public_mu_private.i; export var publicUse_im_public_mu_private: im_public_mu_private.i; + ~ +!!! error TS4025: Type of variable 'publicUse_im_public_mu_private' references inaccessible name 'i'. // No Privacy errors - importing public elements diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt index 1fbf8f7bac94b..688cce8b26ad4 100644 --- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt +++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt @@ -1,11 +1,13 @@ -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(51,31): error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(52,31): error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(55,31): error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(56,32): error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'. -tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(57,32): error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(51,31): error TS4000: Import declaration 'im_private_c_private' references inaccessible name 'c_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(52,31): error TS4000: Import declaration 'im_private_e_private' references inaccessible name 'e_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(55,31): error TS4000: Import declaration 'im_private_i_private' references inaccessible name 'i_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(56,32): error TS4000: Import declaration 'im_private_mi_private' references inaccessible name 'mi_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(57,32): error TS4000: Import declaration 'im_private_mu_private' references inaccessible name 'mu_private'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(71,12): error TS4025: Type of variable 'publicUse_im_private_mi_private' references inaccessible name 'c'. +tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(73,67): error TS4025: Type of variable 'publicUse_im_private_mu_private' references inaccessible name 'i'. -==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts (5 errors) ==== +==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts (7 errors) ==== // private elements module m_private { @@ -57,22 +59,22 @@ tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(57,3 // No Privacy errors - importing private elements import im_private_c_private = m_private.c_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_c_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_c_private' references inaccessible name 'c_private'. import im_private_e_private = m_private.e_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_e_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_e_private' references inaccessible name '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; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_i_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_i_private' references inaccessible name 'i_private'. import im_private_mi_private = m_private.mi_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_mi_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_mi_private' references inaccessible name 'mi_private'. import im_private_mu_private = m_private.mu_private; - ~~~~~~~~~ -!!! error TS4000: Import declaration 'im_private_mu_private' is using private name 'm_private'. + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS4000: Import declaration 'im_private_mu_private' references inaccessible name 'mu_private'. // Usage of above decls var privateUse_im_private_c_private = new im_private_c_private(); @@ -87,8 +89,12 @@ tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts(57,3 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(); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS4025: Type of variable 'publicUse_im_private_mi_private' references inaccessible name 'c'. var privateUse_im_private_mu_private: im_private_mu_private.i; export var publicUse_im_private_mu_private: im_private_mu_private.i; + ~ +!!! error TS4025: Type of variable 'publicUse_im_private_mu_private' references inaccessible name 'i'. // No Privacy errors - importing public elements diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt index 663025ee72286..b27fab126b342 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt @@ -1,39 +1,39 @@ -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(8,20): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(8,37): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(9,16): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(9,33): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(10,24): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(10,41): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(32,43): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(36,30): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(75,67): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(127,20): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(127,50): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(128,16): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(128,46): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(129,24): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(129,54): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(132,43): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(134,30): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(137,74): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(164,24): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(164,41): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(165,20): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(165,37): error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(166,28): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(166,45): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(188,47): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(192,34): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(231,71): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(283,24): error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(283,54): error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(284,20): error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(284,50): error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(285,28): error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(285,58): error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(288,47): error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(290,34): error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(8,20): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(8,37): error TS4044: Return type of construct signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(9,16): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(9,33): error TS4047: Return type of call signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(10,24): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(10,41): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(32,43): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(36,30): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(75,67): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(127,20): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(127,50): error TS4044: Return type of construct signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(128,16): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(128,46): error TS4047: Return type of call signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(129,24): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(129,54): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(132,43): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(134,30): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(137,74): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(164,24): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(164,41): error TS4044: Return type of construct signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(165,20): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(165,37): error TS4047: Return type of call signature references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(166,28): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(166,45): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(188,47): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(192,34): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(231,71): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(283,24): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(283,54): error TS4044: Return type of construct signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(284,20): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(284,50): error TS4047: Return type of call signature references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(285,28): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(285,58): error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(288,47): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(290,34): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts (36 errors) ==== @@ -46,19 +46,19 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export interface publicInterfaceWithPrivateTypeParameters { new (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateClass'. (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateClass'. myMethod(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicTypeParameters { @@ -82,13 +82,13 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export class publicClassWithWithPrivateTypeParameters { static myPublicStaticMethod() { // Error ~~~~~~~~~~~~ -!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. } private static myPrivateStaticMethod() { } myPublicMethod() { // Error ~~~~~~~~~~~~ -!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. } private myPrivateMethod() { } @@ -129,7 +129,7 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export function publicFunctionWithPrivateTypeParameters() { // Error ~~~~~~~~~~~~ -!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. } export function publicFunctionWithPublicTypeParameters() { @@ -183,33 +183,33 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export interface publicInterfaceWithPrivatModuleTypeParameters { new (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateModule'. (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateModule'. myMethod(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. } export class publicClassWithWithPrivateModuleTypeParameters { static myPublicStaticMethod() { // Error ~~~~~~~~~~~~~ -!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } myPublicMethod() { // Error ~~~~~~~~~~~~~ -!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } } export function publicFunctionWithPrivateMopduleTypeParameters() { // Error ~~~~~~~~~~~~~ -!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } @@ -238,19 +238,19 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export interface publicInterfaceWithPrivateTypeParameters { new (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateClass'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateClass'. (): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateClass'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateClass'. myMethod(): privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicTypeParameters { @@ -274,13 +274,13 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export class publicClassWithWithPrivateTypeParameters { static myPublicStaticMethod() { // Error ~~~~~~~~~~~~ -!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. } private static myPrivateStaticMethod() { } myPublicMethod() { // Error ~~~~~~~~~~~~ -!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. } private myPrivateMethod() { } @@ -321,7 +321,7 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export function publicFunctionWithPrivateTypeParameters() { // Error ~~~~~~~~~~~~ -!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. } export function publicFunctionWithPublicTypeParameters() { @@ -375,33 +375,33 @@ tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts(293,78): error TS export interface publicInterfaceWithPrivatModuleTypeParameters { new (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4006: Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4045: Return type of constructor signature from exported interface has or is using private name 'privateModule'. +!!! error TS4044: Return type of construct signature references inaccessible name 'privateModule'. (): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4008: Type parameter 'T' of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4047: Return type of call signature from exported interface has or is using private name 'privateModule'. +!!! error TS4047: Return type of call signature references inaccessible name 'privateModule'. myMethod(): privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4014: Type parameter 'T' of method from exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateModule'. +!!! error TS4038: Return type of method 'myMethod' references inaccessible name 'privateModule'. } export class publicClassWithWithPrivateModuleTypeParameters { static myPublicStaticMethod() { // Error ~~~~~~~~~~~~~ -!!! error TS4010: Type parameter 'T' of public static method from exported class has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } myPublicMethod() { // Error ~~~~~~~~~~~~~ -!!! error TS4012: Type parameter 'T' of public method from exported class has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } } export function publicFunctionWithPrivateMopduleTypeParameters() { // Error ~~~~~~~~~~~~~ -!!! error TS4016: Type parameter 'T' of exported function has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt index a6ae0fdcc0148..cf04a8176359b 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt @@ -1,7 +1,7 @@ -tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(7,61): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(43,71): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(62,65): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'. +tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(7,61): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(43,71): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(62,65): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts (4 errors) ==== @@ -13,7 +13,7 @@ tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS400 export class publicClassWithPrivateTypeParameters { // Error ~~~~~~~~~~~~ -!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. myMethod(val: T): T { return val; } @@ -51,7 +51,7 @@ tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS400 export class publicClassWithTypeParametersFromPrivateModule { // Error ~~~~~~~~~~~~~ -!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. myMethod(val: T): T { return val; } @@ -72,7 +72,7 @@ tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS400 export class publicClassWithPrivateTypeParameters { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateClassInPublicModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClassInPublicModule'. myMethod(val: T): T { return val; } @@ -110,7 +110,7 @@ tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts(98,75): error TS400 export class publicClassWithTypeParametersFromPrivateModule { // Error ~~~~~~~~~~~~~ -!!! error TS4002: Type parameter 'T' of exported class has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. myMethod(val: T): T { return val; } diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt index eb6bb3ea73421..54cb4eaad1122 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt @@ -1,23 +1,23 @@ -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(13,69): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(16,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(16,32): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(17,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(18,31): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(25,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(25,32): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(26,18): error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(27,31): error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(60,85): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(79,73): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(82,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(82,50): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(83,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(84,49): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(91,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(91,50): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(92,22): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(93,49): error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. -tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(13,69): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(16,18): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(16,32): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(17,18): error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(18,31): error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(25,18): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(25,32): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(26,18): error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(27,31): error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(60,85): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(79,73): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(82,22): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModuleT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(82,50): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(83,22): error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassInPublicModuleT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(84,49): error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(91,22): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModuleT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(91,50): error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(92,22): error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassInPublicModuleT'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(93,49): error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClassInPublicModule'. +tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts (20 errors) ==== @@ -35,20 +35,20 @@ tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error export interface publicInterfaceWithPrivateTypeParameters { // Error ~~~~~~~~~~~~ -!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClass'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClass'. myMethod(val: T): T; myMethod0(): publicClassT; myMethod1(): privateClassT; ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassT'. ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClass'. myMethod2(): privateClassT; ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. +!!! error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassT'. myMethod3(): publicClassT; ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClass'. myMethod4(): publicClassT; } @@ -57,15 +57,15 @@ tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error myMethod0(): publicClassT myMethod1(): privateClassT; ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassT'. ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClass'. myMethod2(): privateClassT; ~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassT'. +!!! error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassT'. myMethod3(): publicClassT; ~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClass'. +!!! error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClass'. myMethod4(): publicClassT; } @@ -100,7 +100,7 @@ tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error export interface publicInterfaceWithPrivateModuleTypeParameterConstraints { // Error ~~~~~~~~~~~~~ -!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } interface privateInterfaceWithPrivateModuleTypeParameterConstraints { // Error @@ -121,20 +121,20 @@ tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error export interface publicInterfaceWithPrivateTypeParameters { // Error ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateClassInPublicModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateClassInPublicModule'. myMethod(val: T): T; myMethod0(): publicClassInPublicModuleT; myMethod1(): privateClassInPublicModuleT; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModuleT'. ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModule'. myMethod2(): privateClassInPublicModuleT; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. +!!! error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassInPublicModuleT'. myMethod3(): publicClassInPublicModuleT; ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. +!!! error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClassInPublicModule'. myMethod4(): publicClassInPublicModuleT; } @@ -143,15 +143,15 @@ tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error myMethod0(): publicClassInPublicModuleT myMethod1(): privateClassInPublicModuleT; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModuleT'. ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. +!!! error TS4038: Return type of method 'myMethod1' references inaccessible name 'privateClassInPublicModule'. myMethod2(): privateClassInPublicModuleT; ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'. +!!! error TS4038: Return type of method 'myMethod2' references inaccessible name 'privateClassInPublicModuleT'. myMethod3(): publicClassInPublicModuleT; ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS4057: Return type of method from exported interface has or is using private name 'privateClassInPublicModule'. +!!! error TS4038: Return type of method 'myMethod3' references inaccessible name 'privateClassInPublicModule'. myMethod4(): publicClassInPublicModuleT; } @@ -185,7 +185,7 @@ tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts(125,89): error export interface publicInterfaceWithPrivateModuleTypeParameterConstraints { // Error ~~~~~~~~~~~~~ -!!! error TS4004: Type parameter 'T' of exported interface has or is using private name 'privateModule'. +!!! error TS4002: Constraint of type parameter 'T' references inaccessible name 'privateModule'. } interface privateInterfaceWithPrivateModuleTypeParameterConstraints { // Error diff --git a/tests/baselines/reference/privacyVarDeclFile.errors.txt b/tests/baselines/reference/privacyVarDeclFile.errors.txt index 6ae5373e0c7f7..fecca463da296 100644 --- a/tests/baselines/reference/privacyVarDeclFile.errors.txt +++ b/tests/baselines/reference/privacyVarDeclFile.errors.txt @@ -1,33 +1,33 @@ -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(105,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(121,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(123,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(148,51): error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(153,66): error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(159,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(162,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(163,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(165,57): error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(166,72): error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(9,17): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(25,36): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(27,23): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(52,47): error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(57,62): error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(63,17): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(66,36): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(67,23): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(69,53): error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(70,68): error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(90,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(106,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(108,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(133,51): error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(138,66): error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(144,21): error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(147,40): error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(148,27): error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(150,57): error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. -tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(105,21): error TS4028: Type of property 'myProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(121,40): error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(123,27): error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(148,51): error TS4025: Type of variable 'publicVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(153,66): error TS4025: Type of variable 'publicAmbientVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(159,21): error TS4028: Type of property 'myProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(162,40): error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(163,27): error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(165,57): error TS4025: Type of variable 'publicVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts(166,72): error TS4025: Type of variable 'publicAmbientVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(9,17): error TS4028: Type of property 'myProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(25,36): error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(27,23): error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(52,47): error TS4025: Type of variable 'publicVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(57,62): error TS4025: Type of variable 'publicAmbientVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(63,17): error TS4028: Type of property 'myProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(66,36): error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(67,23): error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(69,53): error TS4025: Type of variable 'publicVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(70,68): error TS4025: Type of variable 'publicAmbientVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(90,21): error TS4028: Type of property 'myProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(106,40): error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(108,27): error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(133,51): error TS4025: Type of variable 'publicVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(138,66): error TS4025: Type of variable 'publicAmbientVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(144,21): error TS4028: Type of property 'myProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(147,40): error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(148,27): error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(150,57): error TS4025: Type of variable 'publicVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. +tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: Type of variable 'publicAmbientVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. ==== tests/cases/compiler/privacyVarDeclFile_externalModule.ts (20 errors) ==== @@ -41,7 +41,7 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myProperty' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicPropertyTypes { @@ -59,11 +59,11 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateClass'. private static myPrivateStaticProperty: privateClass; myPublicProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateClass'. private myPrivateProperty: privateClass; } @@ -90,14 +90,14 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export var publicVarWithPrivatePropertyTypes: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. +!!! error TS4025: Type of variable 'publicVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. export var publicVarWithPublicPropertyTypes: publicClass; var privateVarWithPrivatePropertyTypes: privateClass; var privateVarWithPublicPropertyTypes: publicClass; export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. +!!! error TS4025: Type of variable 'publicAmbientVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; declare var privateAmbientVarWithPublicPropertyTypes: publicClass; @@ -105,22 +105,22 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myProperty' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateModule'. myPublicProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateModule'. } export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +!!! error TS4025: Type of variable 'publicVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +!!! error TS4025: Type of variable 'publicAmbientVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; @@ -142,7 +142,7 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myProperty' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicPropertyTypes { @@ -160,11 +160,11 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateClass'. private static myPrivateStaticProperty: privateClass; myPublicProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateClass'. private myPrivateProperty: privateClass; } @@ -191,14 +191,14 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export var publicVarWithPrivatePropertyTypes: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. +!!! error TS4025: Type of variable 'publicVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. export var publicVarWithPublicPropertyTypes: publicClass; var privateVarWithPrivatePropertyTypes: privateClass; var privateVarWithPublicPropertyTypes: publicClass; export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. +!!! error TS4025: Type of variable 'publicAmbientVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; declare var privateAmbientVarWithPublicPropertyTypes: publicClass; @@ -206,22 +206,22 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myProperty' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateModule'. myPublicProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateModule'. } export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +!!! error TS4025: Type of variable 'publicVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +!!! error TS4025: Type of variable 'publicAmbientVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; @@ -423,7 +423,7 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myProperty' references inaccessible name 'privateClass'. } export interface publicInterfaceWithPublicPropertyTypes { @@ -441,11 +441,11 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateClass'. private static myPrivateStaticProperty: privateClass; myPublicProperty: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'. +!!! error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateClass'. private myPrivateProperty: privateClass; } @@ -472,14 +472,14 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export var publicVarWithPrivatePropertyTypes: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. +!!! error TS4025: Type of variable 'publicVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. export var publicVarWithPublicPropertyTypes: publicClass; var privateVarWithPrivatePropertyTypes: privateClass; var privateVarWithPublicPropertyTypes: publicClass; export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error ~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'. +!!! error TS4025: Type of variable 'publicAmbientVarWithPrivatePropertyTypes' references inaccessible name 'privateClass'. export declare var publicAmbientVarWithPublicPropertyTypes: publicClass; declare var privateAmbientVarWithPrivatePropertyTypes: privateClass; declare var privateAmbientVarWithPublicPropertyTypes: publicClass; @@ -487,22 +487,22 @@ tests/cases/compiler/privacyVarDeclFile_externalModule.ts(151,72): error TS4025: export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4033: Property 'myProperty' of exported interface has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myProperty' references inaccessible name 'privateModule'. } export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4028: Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myPublicStaticProperty' references inaccessible name 'privateModule'. myPublicProperty: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4031: Public property 'myPublicProperty' of exported class has or is using private name 'privateModule'. +!!! error TS4028: Type of property 'myPublicProperty' references inaccessible name 'privateModule'. } export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +!!! error TS4025: Type of variable 'publicVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error ~~~~~~~~~~~~~ -!!! error TS4025: Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using private name 'privateModule'. +!!! error TS4025: Type of variable 'publicAmbientVarWithPrivateModulePropertyTypes' references inaccessible name 'privateModule'. interface privateInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json b/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json index 12c70b9ee2c74..a7985c5b24953 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "useModule.js", + "m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json b/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json index 12c70b9ee2c74..a7985c5b24953 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "useModule.js", + "m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json b/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json index 78bf819430eb3..5e8317a90ffbe 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "glo_m4.js", - "glo_m4.d.ts", "useModule.js", + "glo_m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json b/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json index 78bf819430eb3..5e8317a90ffbe 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "glo_m4.js", - "glo_m4.d.ts", "useModule.js", + "glo_m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json index c6e51b9fc3b51..7a93ab4321f30 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "private_m4.js", - "private_m4.d.ts", "useModule.js", + "private_m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json index c6e51b9fc3b51..7a93ab4321f30 100644 --- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json +++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "private_m4.js", - "private_m4.d.ts", "useModule.js", + "private_m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json index 71dc130b83d19..3a9829372169b 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "fncOnly_m4.js", - "fncOnly_m4.d.ts", "useModule.js", + "fncOnly_m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json index 71dc130b83d19..3a9829372169b 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "fncOnly_m4.js", - "fncOnly_m4.d.ts", "useModule.js", + "fncOnly_m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json index 5f5cd70b619fe..0a03d90f3a7f3 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "useModule.js", + "m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json index 5f5cd70b619fe..0a03d90f3a7f3 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "useModule.js", + "m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json index c5f28aeb3c4f6..31cb74c66eedf 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "m5.js", - "m5.d.ts", "useModule.js", + "m4.d.ts", + "m5.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json index c5f28aeb3c4f6..31cb74c66eedf 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "m5.js", - "m5.d.ts", "useModule.js", + "m4.d.ts", + "m5.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json index 41a5dcb845bca..a5aedb2dfbc60 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "useModule.js", + "m4.d.ts", "useModule.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json index 41a5dcb845bca..a5aedb2dfbc60 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m4.js", - "m4.d.ts", "useModule.js", + "m4.d.ts", "useModule.d.ts" ] } \ 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 fa9e0b566a937..287190af76ff9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json index fa9e0b566a937..287190af76ff9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index ebaec46d1e3e9..f1487f4e090e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index ebaec46d1e3e9..f1487f4e090e0 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index ee020b0ff8054..b0a62a683b6c7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -19,9 +19,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index ee020b0ff8054..b0a62a683b6c7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -19,9 +19,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index ed7bcd289e722..fca812016902f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -20,9 +20,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index ed7bcd289e722..fca812016902f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -20,9 +20,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json index 8f512dcc98c55..52e56e8c428b8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json index 8f512dcc98c55..52e56e8c428b8 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index 4f65daf7560a9..56f4bc3a45965 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index 4f65daf7560a9..56f4bc3a45965 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 6432d5ae91e75..9fd644b9b24b9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -19,15 +19,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index 6432d5ae91e75..9fd644b9b24b9 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -19,15 +19,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json index 31a0fb89c5026..be3f5dbe8d7c1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json index 31a0fb89c5026..be3f5dbe8d7c1 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index 355458526bc92..3f7396e180581 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index 355458526bc92..3f7396e180581 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index f703a63b71fba..96725033d93e4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json index f703a63b71fba..96725033d93e4 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json index a6bc71dd664d0..c7b6732d83833 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json index a6bc71dd664d0..c7b6732d83833 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index e873c8fc472e5..3655926e50b3f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index e873c8fc472e5..3655926e50b3f 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index d8f4cc74008a0..34682148522eb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index d8f4cc74008a0..34682148522eb 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json index 49018ee59734b..1c22575071cc6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json index 49018ee59734b..1c22575071cc6 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 097c9bbf2097c..6fb90b9f9296d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 097c9bbf2097c..6fb90b9f9296d 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json index d5914d929503b..9f72eef5ff4d5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json index d5914d929503b..9f72eef5ff4d5 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json index 2c5e1dae38a29..e961add7da7b7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json index 2c5e1dae38a29..e961add7da7b7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json index 1b09decc58d02..6236d59130c6c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json index 1b09decc58d02..6236d59130c6c 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json index a02eb484aa248..a13b299509303 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json index a02eb484aa248..a13b299509303 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json index 5352fd8a988f2..c46a4d9d7e6f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json index 5352fd8a988f2..c46a4d9d7e6f7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 0a0d68e300a05..c915bd08081b7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 0a0d68e300a05..c915bd08081b7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json index 8e87f61b8df1b..d8f1ebca2062a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json index 8e87f61b8df1b..d8f1ebca2062a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4ed441e255240..35ae232af110f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4ed441e255240..35ae232af110f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json index 8ec143b2dce59..2c404cc0b3a57 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json index 8ec143b2dce59..2c404cc0b3a57 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 96777b6f502f6..a11b414f131c2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 96777b6f502f6..a11b414f131c2 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index f3c86f22eb74d..2df5007b7bc58 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json index f3c86f22eb74d..2df5007b7bc58 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json index a4e8c09b004df..8edab343aee8d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json index a4e8c09b004df..8edab343aee8d 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json index f4a8884b58eea..075e031bb4e78 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json index f4a8884b58eea..075e031bb4e78 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index fe0b8045a5c17..ba07cb6a8bfb4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json index fe0b8045a5c17..ba07cb6a8bfb4 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json index a2779060068a2..fb31913e6b108 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json index a2779060068a2..fb31913e6b108 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 120bb5afbb6ea..a28ffcfea2006 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 120bb5afbb6ea..a28ffcfea2006 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index a87c7d36d8ede..afac8a4f153b6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json index a87c7d36d8ede..afac8a4f153b6 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json index 718cfdabf0f08..29c1ef818399f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json index 718cfdabf0f08..29c1ef818399f 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json index f51e53f02f6e7..b64fe05673d43 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json index f51e53f02f6e7..b64fe05673d43 100644 --- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json index d4d500a397e17..a8174fcfa644b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json index d4d500a397e17..a8174fcfa644b 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json index 12801537d2bdf..c97cd8feb865a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json index 12801537d2bdf..c97cd8feb865a 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json index b5b1dfba62eea..f801748956f46 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json index b5b1dfba62eea..f801748956f46 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json index a06e2f34d5ac5..721bb91e48505 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json index a06e2f34d5ac5..721bb91e48505 100644 --- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ 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 c661284121066..bb402d3387bf2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json index c661284121066..bb402d3387bf2 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json index b225c4e408f6b..33beca3b068ca 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json index b225c4e408f6b..33beca3b068ca 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json index f987aa49ffeb3..12c5add488f99 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json index f987aa49ffeb3..12c5add488f99 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 2bb23cdc61028..e8e5ba0856b2c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 2bb23cdc61028..e8e5ba0856b2c 100644 --- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json index 6ecdc26ccd446..088f87dd02e5d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json index 6ecdc26ccd446..088f87dd02e5d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json index 9884550745c4b..50a663abdd75d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json index 9884550745c4b..50a663abdd75d 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json index e061982b32fc3..fbf02ee21f1c1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json index e061982b32fc3..fbf02ee21f1c1 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json index f9f02dcf7894e..46e2831bd729a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json index f9f02dcf7894e..46e2831bd729a 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json index db2995acf6956..e642fe7291330 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json index db2995acf6956..e642fe7291330 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json index e636ce61f7e6e..483d579fa5d87 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json index e636ce61f7e6e..483d579fa5d87 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json index 2c7699ff0faed..9b3be09b60f96 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json index 2c7699ff0faed..9b3be09b60f96 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json index a61a50a760d15..9b8a2e6cdd64e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json index a61a50a760d15..9b8a2e6cdd64e 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json index 05da8c15292e1..5632ef23ce611 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json index 05da8c15292e1..5632ef23ce611 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json index 5ea7aa806651d..b8e04aea77a15 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json index 5ea7aa806651d..b8e04aea77a15 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json index 0d16b53af662f..a4df3caacc4cc 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json index 0d16b53af662f..a4df3caacc4cc 100644 --- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json index 6f141f8151104..06b15f003da4c 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json index 6f141f8151104..06b15f003da4c 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json index 1f73a2a33d6cc..812734f7a8d9e 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json index 1f73a2a33d6cc..812734f7a8d9e 100644 --- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json index edd08fbfe107f..881d3fadbe847 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json index edd08fbfe107f..881d3fadbe847 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json index 0b2ea47302960..dd185336880c6 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json index 0b2ea47302960..dd185336880c6 100644 --- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json index 2f2a4280abf1c..51f78361c1fca 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json index 2f2a4280abf1c..51f78361c1fca 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 006720b1cc3d5..f01a83c4f1948 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index 006720b1cc3d5..f01a83c4f1948 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json index c36f3ade5e08b..86008e58bbc47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -19,9 +19,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json index c36f3ade5e08b..86008e58bbc47 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -19,9 +19,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4741b9cf9e18d..22ef38fb6aa97 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -20,9 +20,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 4741b9cf9e18d..22ef38fb6aa97 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -20,9 +20,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json index ec6313ac50c0c..526eb1522a593 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json index ec6313ac50c0c..526eb1522a593 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index 9a0d0258ca4bd..e73e9f2346f31 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index 9a0d0258ca4bd..e73e9f2346f31 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 3ecf4bc4cc448..e8376879922ef 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -19,15 +19,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json index 3ecf4bc4cc448..e8376879922ef 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -19,15 +19,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json index d901eb0a79073..6fe2de6eca6d2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json index d901eb0a79073..6fe2de6eca6d2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 278bc2c86e5de..72ad20902b450 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 278bc2c86e5de..72ad20902b450 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 2cfc9aebda200..1798c2bf9ca1f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json index 2cfc9aebda200..1798c2bf9ca1f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json index fc4e8b7c9db59..51348c58a5211 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json index fc4e8b7c9db59..51348c58a5211 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index a20ecf2d6c97d..6e1f5e245efd0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index a20ecf2d6c97d..6e1f5e245efd0 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index cfa0ec5cb81b5..bdeb01b773dce 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json index cfa0ec5cb81b5..bdeb01b773dce 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json index ddfa8259401e4..2b823979409de 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json index ddfa8259401e4..2b823979409de 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json index 6e6c3e73c0390..818dd58a0f905 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json index 6e6c3e73c0390..818dd58a0f905 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json index c85db0226a2c0..5d6ff3c6d2b9f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json index c85db0226a2c0..5d6ff3c6d2b9f 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json index ceda4546fcebf..bfcb7c031160b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json index ceda4546fcebf..bfcb7c031160b 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json index 5f6d0ccd74b8d..0faeae128357c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json index 5f6d0ccd74b8d..0faeae128357c 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json index 9dca1ba6d4b78..4aacef680f6a2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json index 9dca1ba6d4b78..4aacef680f6a2 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json index 82eaf9fdb388e..f3f6c757f1880 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js", - "ref/m2.d.ts", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json index 82eaf9fdb388e..f3f6c757f1880 100644 --- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js", - "ref/m2.d.ts", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json index 9fc077c55cae6..b6e1b91e9644f 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.json @@ -15,10 +15,10 @@ ], "emittedFiles": [ "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json index 9fc077c55cae6..b6e1b91e9644f 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.json @@ -15,10 +15,10 @@ ], "emittedFiles": [ "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json index 975fcf59ca98c..b3ec5815c21bf 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json @@ -15,8 +15,8 @@ ], "emittedFiles": [ "ref/m2.js", - "ref/m2.d.ts", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json index 975fcf59ca98c..b3ec5815c21bf 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json @@ -15,8 +15,8 @@ ], "emittedFiles": [ "ref/m2.js", - "ref/m2.d.ts", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 2b0a20e739a44..70537fa2772c0 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -16,8 +16,8 @@ ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 2b0a20e739a44..70537fa2772c0 100644 --- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -16,8 +16,8 @@ ], "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json index 2cbfa1a6c6e3d..3602302b46dbd 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json index 2cbfa1a6c6e3d..3602302b46dbd 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json index a65215b0814da..f4f639eced427 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.json @@ -15,10 +15,10 @@ ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json index a65215b0814da..f4f639eced427 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.json @@ -15,10 +15,10 @@ ], "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json index 66eced5cc015e..bff5ed155e950 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json @@ -15,12 +15,12 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js", - "test.d.ts", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json index 66eced5cc015e..bff5ed155e950 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json @@ -15,12 +15,12 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js", - "test.d.ts", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json index 01945c9b97019..b5944fd4a6ebd 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m1.js", - "m1.d.ts", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json index 01945c9b97019..b5944fd4a6ebd 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m1.js", - "m1.d.ts", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json index d285d2f095232..217a6dcecbbee 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json index d285d2f095232..217a6dcecbbee 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json index 166aaa982e7ea..81d463240c6ec 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "m1.js", - "m1.d.ts", "test.js", - "test.d.ts", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json index 166aaa982e7ea..81d463240c6ec 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "m1.js", - "m1.d.ts", "test.js", - "test.d.ts", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json index af995f809655e..b945df8f1c044 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json index af995f809655e..b945df8f1c044 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json index 2688aeab19328..b4c5749b45146 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json index 2688aeab19328..b4c5749b45146 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json index f11b95edde911..3b134636144cf 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "test.js", - "test.d.ts", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json index f11b95edde911..3b134636144cf 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "test.js", - "test.d.ts", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json index 2b3760733c72c..27ef307f803c6 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json b/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json index 2b3760733c72c..27ef307f803c6 100644 --- a/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.json @@ -14,10 +14,10 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json index 9e77628b36862..dc1c436ce8fa4 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.json @@ -15,10 +15,10 @@ ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json index 9e77628b36862..dc1c436ce8fa4 100644 --- a/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.json @@ -15,10 +15,10 @@ ], "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json b/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json index 0e35df542d2d9..be508edd6b649 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m1.js", - "m1.d.ts", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json b/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json index 0e35df542d2d9..be508edd6b649 100644 --- a/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json +++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "m1.js", - "m1.d.ts", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json index 26795d9489e8c..7ca4b7cf001b0 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json index 26795d9489e8c..7ca4b7cf001b0 100644 --- a/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json index 33dae01c2e5a7..fd415cba71367 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json b/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json index 33dae01c2e5a7..fd415cba71367 100644 --- a/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "ref/m1.js", - "ref/m1.d.ts", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json index f1deedfb0e599..00d46369aeef5 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json index f1deedfb0e599..00d46369aeef5 100644 --- a/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ 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 b18b813804da1..3f3bfc9994525 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.json +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "li'b/class'A.js", - "li'b/class'A.d.ts", "m'ain.js", + "li'b/class'A.d.ts", "m'ain.d.ts" ] } \ 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 b18b813804da1..3f3bfc9994525 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.json +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "li'b/class'A.js", - "li'b/class'A.d.ts", "m'ain.js", + "li'b/class'A.d.ts", "m'ain.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json index fe07bb38b9207..fde5d653c9c55 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "../../../bar/bar.js", - "../../../bar/bar.d.ts", "foo.js", + "../../../bar/bar.d.ts", "foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json index fe07bb38b9207..fde5d653c9c55 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "../../../bar/bar.js", - "../../../bar/bar.d.ts", "foo.js", + "../../../bar/bar.d.ts", "foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json index b24993bcf8fef..2eec71e9b250f 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "bar/bar.js", - "bar/bar.d.ts", "src/ts/foo/foo.js", + "bar/bar.d.ts", "src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json index b24993bcf8fef..2eec71e9b250f 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "bar/bar.js", - "bar/bar.d.ts", "src/ts/foo/foo.js", + "bar/bar.d.ts", "src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json index 16831b328e9c7..2bbae48c4c6e1 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "foo.js", - "foo.d.ts", "../../../bar/bar.js", + "foo.d.ts", "../../../bar/bar.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json index 16831b328e9c7..2bbae48c4c6e1 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json @@ -14,8 +14,8 @@ ], "emittedFiles": [ "foo.js", - "foo.d.ts", "../../../bar/bar.js", + "foo.d.ts", "../../../bar/bar.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json index 79b73ec775b4b..c729c60f4f895 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "../../../bar/bar.js", - "../../../bar/bar.d.ts", "../../../src/ts/foo/foo.js", + "../../../bar/bar.d.ts", "../../../src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json index 79b73ec775b4b..c729c60f4f895 100644 --- a/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json +++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json @@ -13,8 +13,8 @@ ], "emittedFiles": [ "../../../bar/bar.js", - "../../../bar/bar.d.ts", "../../../src/ts/foo/foo.js", + "../../../bar/bar.d.ts", "../../../src/ts/foo/foo.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json index 2ec18b3ac5acf..bed4f12f6563f 100644 --- a/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json +++ b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/FolderB/FolderC/fileC.js.map", "outdir/simple/FolderB/FolderC/fileC.js", - "outdir/simple/FolderB/FolderC/fileC.d.ts", "outdir/simple/FolderB/fileB.js.map", "outdir/simple/FolderB/fileB.js", + "outdir/simple/FolderB/FolderC/fileC.d.ts", "outdir/simple/FolderB/fileB.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json index 2ec18b3ac5acf..bed4f12f6563f 100644 --- a/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json +++ b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/FolderB/FolderC/fileC.js.map", "outdir/simple/FolderB/FolderC/fileC.js", - "outdir/simple/FolderB/FolderC/fileC.d.ts", "outdir/simple/FolderB/fileB.js.map", "outdir/simple/FolderB/fileB.js", + "outdir/simple/FolderB/FolderC/fileC.d.ts", "outdir/simple/FolderB/fileB.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json index fdde42592ca8d..05cb062cfe200 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.json @@ -15,8 +15,8 @@ ], "emittedFiles": [ "outdir/simple/FolderC/fileC.js", - "outdir/simple/FolderC/fileC.d.ts", "outdir/simple/fileB.js", + "outdir/simple/FolderC/fileC.d.ts", "outdir/simple/fileB.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json index fdde42592ca8d..05cb062cfe200 100644 --- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json +++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.json @@ -15,8 +15,8 @@ ], "emittedFiles": [ "outdir/simple/FolderC/fileC.js", - "outdir/simple/FolderC/fileC.d.ts", "outdir/simple/fileB.js", + "outdir/simple/FolderC/fileC.d.ts", "outdir/simple/fileB.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json index 43059eaa5c6bc..cc78623ebc487 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json index 43059eaa5c6bc..cc78623ebc487 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index 6d9cf2998a884..af083b57920ec 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json index 6d9cf2998a884..af083b57920ec 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index 09c6092f16447..85b5f7af64411 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -19,9 +19,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json index 09c6092f16447..85b5f7af64411 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json @@ -19,9 +19,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 6fb17fa06b80c..3594db2685f10 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -20,9 +20,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 6fb17fa06b80c..3594db2685f10 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -20,9 +20,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json index 9e98d46666fa0..7ea0a598a4cb5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json index 9e98d46666fa0..7ea0a598a4cb5 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index d96a3e5f83237..0a51dd1134b34 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json index d96a3e5f83237..0a51dd1134b34 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index b3e80123c047c..65c9c11c72939 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -19,15 +19,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json index b3e80123c047c..65c9c11c72939 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json @@ -19,15 +19,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json index 6e1f133ef6486..a2b183aadc7a8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json index 6e1f133ef6486..a2b183aadc7a8 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index c15e91877ae5c..cf1a67ff03522 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json index c15e91877ae5c..cf1a67ff03522 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index e2621b2fa52f4..c9ef4df0836d2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json index e2621b2fa52f4..c9ef4df0836d2 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json index b65bed6197951..567aadfbfb3b1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json index b65bed6197951..567aadfbfb3b1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index a8662e09bf6ea..08183485db0c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json index a8662e09bf6ea..08183485db0c6 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index a43e0f691728e..804a9ff6543b9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json index a43e0f691728e..804a9ff6543b9 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json index b84ccc2bc2308..75849f9fbcf6c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json index b84ccc2bc2308..75849f9fbcf6c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.json @@ -18,12 +18,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 43d3db291ff91..124a922d348e1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json index 43d3db291ff91..124a922d348e1 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.json @@ -19,12 +19,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json index f57c8110827d0..7d508306f7f51 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json index f57c8110827d0..7d508306f7f51 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json index 02981610092e3..965fd9bfc2410 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json index 02981610092e3..965fd9bfc2410 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json index 03f06090742ea..34aa3d2cc05fa 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json index 03f06090742ea..34aa3d2cc05fa 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 08bdabb1c6e3c..8dac264a5660c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json index 08bdabb1c6e3c..8dac264a5660c 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json index 0e73f218462dd..bc0e7b10aac5c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json index 0e73f218462dd..bc0e7b10aac5c 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 99815d5266195..5146ba9078824 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json index 99815d5266195..5146ba9078824 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json index 82ef1c7d88290..6990ea44d7dfc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json index 82ef1c7d88290..6990ea44d7dfc 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index d5f4fd9c6546e..67d36627750e1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index d5f4fd9c6546e..67d36627750e1 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json index 2acbea1cc8dcc..27ac203009956 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json index 2acbea1cc8dcc..27ac203009956 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 6603e36c2811a..04b89da6c0aea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json index 6603e36c2811a..04b89da6c0aea 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index 69a577baffdf8..a832a3f0c1e17 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json index 69a577baffdf8..a832a3f0c1e17 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json index f28c784480f22..fe7b13a367a03 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json index f28c784480f22..fe7b13a367a03 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 77fa77f5fb05d..6cd3af13e8e99 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json index 77fa77f5fb05d..6cd3af13e8e99 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index a4a6698d3ca97..f59aacac6561b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json index a4a6698d3ca97..f59aacac6561b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json index 8a3035f363273..9c4d60ba840f7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json index 8a3035f363273..9c4d60ba840f7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 9f10fc5e7e05a..0552b112aa9fe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json index 9f10fc5e7e05a..0552b112aa9fe 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 71896f202b298..115c2b8cdb38b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json index 71896f202b298..115c2b8cdb38b 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json index e7dfb0beff37c..a2c697ba1162e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json index e7dfb0beff37c..a2c697ba1162e 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json index bfb740034016f..785783f21efd5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json index bfb740034016f..785783f21efd5 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json index 4d33e85e2ba8d..dd7b973b937b9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json index 4d33e85e2ba8d..dd7b973b937b9 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json index bf86309b59a89..e9949c41bc933 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json index bf86309b59a89..e9949c41bc933 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json index ff189067e6755..e171d7fe24a5f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json index ff189067e6755..e171d7fe24a5f 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json index 8896f911a9998..adcc62b9b4f1a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json index 8896f911a9998..adcc62b9b4f1a 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ 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 570d129ce2e8c..7ee9bd317c03c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json index 570d129ce2e8c..7ee9bd317c03c 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json index 3d39d4b9bf2d0..af995aca00bd9 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.json @@ -17,12 +17,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json index 3d39d4b9bf2d0..af995aca00bd9 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.json @@ -17,12 +17,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json index 3270fe610aa37..e74f25c4dec42 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json index 3270fe610aa37..e74f25c4dec42 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json @@ -17,9 +17,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 3a260af84a077..83a0b065a835e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index 3a260af84a077..83a0b065a835e 100644 --- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -18,9 +18,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json index 9dcc6a90da3ad..cb8f438ff83c1 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json index 9dcc6a90da3ad..cb8f438ff83c1 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json index b63faddd4c721..eb052903c5a21 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.json @@ -17,12 +17,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json index b63faddd4c721..eb052903c5a21 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.json @@ -17,12 +17,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json index 3d2df95ad66d9..223a3b351ff76 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json @@ -17,15 +17,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json index 3d2df95ad66d9..223a3b351ff76 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json @@ -17,15 +17,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json index 348605adb33e9..30bb8a50a7e8c 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json index 348605adb33e9..30bb8a50a7e8c 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json index 2316c35bde9de..3d34cf12dd0ce 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json index 2316c35bde9de..3d34cf12dd0ce 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json index 9ff29662d406a..4e1feaf5b9e56 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json @@ -16,12 +16,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json index 9ff29662d406a..4e1feaf5b9e56 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json @@ -16,12 +16,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json index 49ebfda156718..720bbfb59267d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json index 49ebfda156718..720bbfb59267d 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json index 391942643f563..0c1b3a21d6ada 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json index 391942643f563..0c1b3a21d6ada 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json index 9d200ef685d29..1a47dcbb4e7d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json index 9d200ef685d29..1a47dcbb4e7d8 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json index 3d4f5d74f4406..dd6ff601eda95 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json index 3d4f5d74f4406..dd6ff601eda95 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.json @@ -16,12 +16,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json index 1882477e51816..b0359066b12e8 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.json @@ -17,12 +17,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json index 1882477e51816..b0359066b12e8 100644 --- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.json @@ -17,12 +17,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json index ad8ebd063703b..66ec3f872a195 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json index ad8ebd063703b..66ec3f872a195 100644 --- a/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json index 8f78a5682d6dc..9762e39bef510 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json index 8f78a5682d6dc..9762e39bef510 100644 --- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json index 2884f385bb537..883abf2453c5c 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json index 2884f385bb537..883abf2453c5c 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.json @@ -15,9 +15,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json index 632d71189049b..7aa05fd0970ca 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json index 632d71189049b..7aa05fd0970ca 100644 --- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.json @@ -16,9 +16,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json index ef5cb2df6335d..68d25fa714e4a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json index ef5cb2df6335d..68d25fa714e4a 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index a46fe8457105a..b2b82e57fcc25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json index a46fe8457105a..b2b82e57fcc25 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/ref/m2.js.map", "outdir/simple/ref/m2.js", - "outdir/simple/ref/m2.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", + "outdir/simple/ref/m2.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json index 50a4518a1b08c..bb9835b510f0c 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json index 50a4518a1b08c..bb9835b510f0c 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json @@ -18,9 +18,9 @@ "emittedFiles": [ "ref/m2.js.map", "ref/m2.js", - "ref/m2.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m2.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index b6ef6b5bd517d..54ba2779848a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json index b6ef6b5bd517d..54ba2779848a2 100644 --- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json @@ -19,9 +19,9 @@ "emittedFiles": [ "outdir/outAndOutDirFolder/ref/m2.js.map", "outdir/outAndOutDirFolder/ref/m2.js", - "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.js.map", "bin/outAndOutDirFile.js", + "outdir/outAndOutDirFolder/ref/m2.d.ts", "bin/outAndOutDirFile.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json index c2594c0093cb8..2754c26339f75 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json index c2594c0093cb8..2754c26339f75 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index d2c6956bf8021..d9ecddde98286 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json index d2c6956bf8021..d9ecddde98286 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_module_multifolder/ref/m1.js.map", "outdir/simple/outputdir_module_multifolder/ref/m1.js", - "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_module_multifolder_ref/m2.js.map", "outdir/simple/outputdir_module_multifolder_ref/m2.js", - "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.js.map", "outdir/simple/outputdir_module_multifolder/test.js", + "outdir/simple/outputdir_module_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_module_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_module_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index cc2a6c9b1aa06..b2582dbc0db59 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json index cc2a6c9b1aa06..b2582dbc0db59 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json @@ -18,15 +18,15 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_module_multifolder_ref/m2.js.map", "../outputdir_module_multifolder_ref/m2.js", - "../outputdir_module_multifolder_ref/m2.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "../outputdir_module_multifolder_ref/m2.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json index 4a7cc668a6a86..8f727aef22629 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json index 4a7cc668a6a86..8f727aef22629 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 6766f67eab06d..1c6f2a47b9adb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json index 6766f67eab06d..1c6f2a47b9adb 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json index 5419c5a822564..21fe48877e86e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json index 5419c5a822564..21fe48877e86e 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json index d7f99610babea..0038bbba7c053 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json index d7f99610babea..0038bbba7c053 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index 1e722cb852eb9..4bda53a6479b9 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json index 1e722cb852eb9..4bda53a6479b9 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index d80dacb3444d7..b4a34f6395781 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json index d80dacb3444d7..b4a34f6395781 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", - "test.d.ts", "bin/test.js.map", "bin/test.js", + "ref/m1.d.ts", + "test.d.ts", "bin/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json index a68d507bdf3e0..e56d57e9327d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json index a68d507bdf3e0..e56d57e9327d7 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.json @@ -17,12 +17,12 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "../outputdir_multifolder_ref/m2.js.map", "../outputdir_multifolder_ref/m2.js", - "../outputdir_multifolder_ref/m2.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", + "../outputdir_multifolder_ref/m2.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json index 1641625569c29..764e4f3a8ee16 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json index 1641625569c29..764e4f3a8ee16 100644 --- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.json @@ -18,12 +18,12 @@ "emittedFiles": [ "outdir/simple/outputdir_multifolder/ref/m1.js.map", "outdir/simple/outputdir_multifolder/ref/m1.js", - "outdir/simple/outputdir_multifolder/ref/m1.d.ts", "outdir/simple/outputdir_multifolder_ref/m2.js.map", "outdir/simple/outputdir_multifolder_ref/m2.js", - "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.js.map", "outdir/simple/outputdir_multifolder/test.js", + "outdir/simple/outputdir_multifolder/ref/m1.d.ts", + "outdir/simple/outputdir_multifolder_ref/m2.d.ts", "outdir/simple/outputdir_multifolder/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json index 9df1fd3922ee8..24bfc485b069b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json index 9df1fd3922ee8..24bfc485b069b 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "m1.js.map", "m1.js", - "m1.d.ts", "test.js.map", "test.js", + "m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json index 1a472ca17eedb..6a760640c7339 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json index 1a472ca17eedb..6a760640c7339 100644 --- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/m1.js.map", "outdir/simple/m1.js", - "outdir/simple/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json index 77912e79790f3..167273463aad3 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json index 77912e79790f3..167273463aad3 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.json @@ -16,9 +16,9 @@ "emittedFiles": [ "ref/m1.js.map", "ref/m1.js", - "ref/m1.d.ts", "test.js.map", "test.js", + "ref/m1.d.ts", "test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json index 362af3ded0523..9bb091a6809f2 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json index 362af3ded0523..9bb091a6809f2 100644 --- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json +++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.json @@ -17,9 +17,9 @@ "emittedFiles": [ "outdir/simple/ref/m1.js.map", "outdir/simple/ref/m1.js", - "outdir/simple/ref/m1.d.ts", "outdir/simple/test.js.map", "outdir/simple/test.js", + "outdir/simple/ref/m1.d.ts", "outdir/simple/test.d.ts" ] } \ No newline at end of file diff --git a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt index cdc712f698d06..09df161f12e65 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.errors.txt +++ b/tests/baselines/reference/symbolDeclarationEmit12.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(4,28): error TS4031: Public property '[Symbol.iterator]' of exported class has or is using private name 'I'. +tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(4,28): error TS4028: Type of property '[Symbol.iterator]' references inaccessible name 'I'. tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,9): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'. -tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,33): error TS4073: Parameter 'x' of public method from exported class has or is using private name 'I'. -tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(6,40): error TS4055: Return type of public method from exported class has or is using private name 'I'. +tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(5,33): error TS4030: Type of parameter 'x' references inaccessible name 'I'. +tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(6,40): error TS4038: Return type of method '[Symbol.isConcatSpreadable]' references inaccessible name 'I'. tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(9,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'. tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,13): error TS2300: Duplicate identifier '[Symbol.toPrimitive]'. -tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4037: Parameter '[Symbol.toPrimitive]' of public property setter from exported class has or is using private name 'I'. +tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4030: Type of parameter 'x' references inaccessible name 'I'. ==== tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts (7 errors) ==== @@ -13,15 +13,15 @@ tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4 export class C { [Symbol.iterator]: I; ~ -!!! error TS4031: Public property '[Symbol.iterator]' of exported class has or is using private name 'I'. +!!! error TS4028: Type of property '[Symbol.iterator]' references inaccessible name 'I'. [Symbol.toPrimitive](x: I) { } ~~~~~~~~~~~~~~~~~~~~ !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'. ~ -!!! error TS4073: Parameter 'x' of public method from exported class has or is using private name 'I'. +!!! error TS4030: Type of parameter 'x' references inaccessible name 'I'. [Symbol.isConcatSpreadable](): I { ~ -!!! error TS4055: Return type of public method from exported class has or is using private name 'I'. +!!! error TS4038: Return type of method '[Symbol.isConcatSpreadable]' references inaccessible name 'I'. return undefined } get [Symbol.toPrimitive]() { return undefined; } @@ -31,6 +31,6 @@ tests/cases/conformance/es6/Symbols/symbolDeclarationEmit12.ts(10,37): error TS4 ~~~~~~~~~~~~~~~~~~~~ !!! error TS2300: Duplicate identifier '[Symbol.toPrimitive]'. ~ -!!! error TS4037: Parameter '[Symbol.toPrimitive]' of public property setter from exported class has or is using private name 'I'. +!!! error TS4030: Type of parameter 'x' references inaccessible name 'I'. } } \ No newline at end of file diff --git a/tests/cases/compiler/expressionInExtendsClause.ts b/tests/cases/compiler/expressionInExtendsClause.ts new file mode 100644 index 0000000000000..fffa28fb9de41 --- /dev/null +++ b/tests/cases/compiler/expressionInExtendsClause.ts @@ -0,0 +1,16 @@ +// @module: commonjs +// @declaration: true + +export class C { + x: T; + y: U; +} + +// Not exported, but not important in declaration generation +function getClass(a) { + return C; +} + +export class MyClass extends getClass(2) { +} + diff --git a/tests/cases/compiler/expressionInExtendsClauseWithVisibilityErrors.ts b/tests/cases/compiler/expressionInExtendsClauseWithVisibilityErrors.ts new file mode 100644 index 0000000000000..c5218c241fcc6 --- /dev/null +++ b/tests/cases/compiler/expressionInExtendsClauseWithVisibilityErrors.ts @@ -0,0 +1,20 @@ +// @module: commonjs +// @declaration: true + +interface I { +} + +class C { + x: T; + y: U; +} + +function getClass(a) { + return C; +} + +// Error C is not exported +// Error I is not exported +export class MyClass extends getClass(2) { +} + diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile2.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile2.ts new file mode 100644 index 0000000000000..0cf65b7d4c7e5 --- /dev/null +++ b/tests/cases/compiler/privacyCannotNameAccessorDeclFile2.ts @@ -0,0 +1,24 @@ +// @target: ES5 +// @declaration: true + +namespace M { + export interface I { } +} + +namespace N { + export function getI(): M.I { + return undefined + } +} + +namespace O { + // shadow M with a local namespace declaration + export namespace M { + export var x = 0; + } + + // Error, return type cannot be named + export function getIlocally() { + return N.getI(); + } +}