diff --git a/.gitignore b/.gitignore index d7fdc4a75ee..9589707e25b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ node_modules/ built/ -bin/wrapped_tsc.js tests/cases/*.js tests/cases/*/*.js tests/cases/*/*/*.js @@ -14,14 +13,7 @@ tests/cases/*/*/*/*/*.js.map tests/cases/rwc/* tests/cases/perf/* !tests/cases/webharness/compilerToString.js -tests/runners/*.js -tests/runners/*/*.js -tests/runners/rwc/* -!tests/runners/rwc/rwcRunner.ts -!tests/runners/rwc/loggedIO.ts -diff-*.html test-args.txt -*.suo ~*.docx tests/baselines/local/* tests/baselines/reference/projectOutput/ @@ -32,35 +24,15 @@ tests/services/baselines/prototyping/local/* tests/services/browser/typescriptServices.js scripts/processDiagnosticMessages.d.ts scripts/processDiagnosticMessages.js -src/compiler/*.js -src/compiler/syntax/wrapped_SyntaxGenerator.js -src/compiler/syntax/SyntaxGenerator.js -src/compiler/syntax/SyntaxGenerator.d.ts -src/compiler/prototype/*.js -src/services/*.js -src/services/*/*.js src/harness/*.js -src/prototype/*.js -src/prototype/*/*.js -baseline-report.html -fidelity-report.html rwc-report.html *.swp build.json -monaco.editor.json -samples/win8/encyclopedia/Encyclopedia/js/*.js -samples/win8/encyclopedia/Encyclopedia/js/*.js.map -samples/win8/encyclopedia/Encyclopedia/bin/ -samples/win8/encyclopedia/Encyclopedia/bld/ -samples/win8/encyclopedia/Encyclopedia/Encyclopedia.jsproj.user *.actual -tests/Fidelity/*.d.ts -tests/Fidelity/*.js -tests/cases/webharness/*.d.ts tests/webhost/*.d.ts tests/webhost/webtsc.js tests/*.js tests/*.d.ts *.config scripts/debug.bat -scripts/run.bat \ No newline at end of file +scripts/run.bat diff --git a/.npmignore b/.npmignore index fd2663ae5b4..99b51a2b65c 100644 --- a/.npmignore +++ b/.npmignore @@ -1,12 +1,5 @@ built doc -samples src tests -typings -bin/winjs.d.ts -bin/winrt.d.ts -bin/*.bat -bin/jquery.d.ts -bin/typescriptServices.js Jakefile diff --git a/README.md b/README.md index c7b6844c697..9846b75e144 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ tsc hello.ts ## Building -1. Install Node if you haven't already (http://nodejs.org/) -2. Install Jake, the tool we use to build our compiler (https://github.com/mde/jake). To do this, run "npm install -g jake". +1. Install [node](http://nodejs.org/) if you haven't already +2. Install dependencies ([Jake](https://github.com/mde/jake), [mocha](http://visionmedia.github.io/mocha/), [Chai](http://chaijs.com/) and [browserify](http://browserify.org/) the tool we use to build our compiler. To do this, run `npm install`. 3. To use jake, run one of the following commands: - jake local - This builds the compiler. The output is in built/local in the public directory - jake clean - deletes the build compiler diff --git a/bin/tsc b/bin/tsc index 3c0dab574f2..9c392ee8e3b 100644 --- a/bin/tsc +++ b/bin/tsc @@ -1,2 +1,2 @@ #!/usr/bin/env node -require('./tsc.js') +require('./tc.js') diff --git a/package.json b/package.json index 1add14ef575..809ba9074c4 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "licenses": [ { "type": "Apache License 2.0", - "url": "http://typescript.codeplex.com/license" + "url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt" } ], "description": "TypeScript is a language for application scale JavaScript development", @@ -18,14 +18,14 @@ "javascript" ], "bugs": { - "url" : "http://typescript.codeplex.com/workitem/list/basic" + "url" : "https://github.com/Microsoft/TypeScript/issues" }, "repository" : { "type" : "git", - "url" : "https://git01.codeplex.com/typescript" + "url" : "https://github.com/Microsoft/TypeScript.git" }, "preferGlobal" : true, - "main" : "./bin/typescript.js", + "main" : "./bin/tc.js", "bin" : { "tsc" : "./bin/tsc" }, diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index bb2c9a2d641..10183d47763 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -181,6 +181,10 @@ module ts { return getAncestor(node, SyntaxKind.SourceFile); } + function isGlobalSourceFile(node: Node) { + return node.kind === SyntaxKind.SourceFile && !(node.flags & NodeFlags.ExternalModule); + } + function getSymbol(symbols: SymbolTable, name: string, meaning: SymbolFlags): Symbol { if (meaning && hasProperty(symbols, name)) { var symbol = symbols[name]; @@ -226,7 +230,7 @@ module ts { while (location) { // Locals of a source file are not in scope (because they get merged into the global symbol table) - if (location.locals && (location.kind !== SyntaxKind.SourceFile || location.flags & NodeFlags.ExternalModule)) { + if (location.locals && !isGlobalSourceFile(location)) { if (result = getSymbol(location.locals, name, meaning)) { return returnResolvedSymbol(result); } @@ -594,14 +598,134 @@ module ts { return (propertySymbol.valueDeclaration.flags & NodeFlags.QuestionMark) && propertySymbol.valueDeclaration.kind !== SyntaxKind.Parameter; } - function symbolToString(symbol: Symbol) { - if (symbol.declarations && symbol.declarations.length > 0) { - var declaration = symbol.declarations[0]; - if (declaration.name) { - return identifierToString(declaration.name); + function forEachSymbolTableInScope(enclosingDeclaration: Node, callback: (symbolTable: SymbolTable) => T): T { + var result: T; + for (var location = enclosingDeclaration; location; location = location.parent) { + // Locals of a source file are not in scope (because they get merged into the global symbol table) + if (location.locals && !isGlobalSourceFile(location)) { + if (result = callback(location.locals)) { + return result; + } + } + switch (location.kind) { + case SyntaxKind.SourceFile: + if (!(location.flags & NodeFlags.ExternalModule)) { + break; + } + case SyntaxKind.ModuleDeclaration: + if (result = callback(getSymbolOfNode(location).exports)) { + return result; + } + break; + case SyntaxKind.ClassDeclaration: + case SyntaxKind.InterfaceDeclaration: + if (result = callback(getSymbolOfNode(location).members)) { + return result; + } + break; } } - return symbol.name; + + return callback(globals); + } + + function getAccessibleSymbol(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) { + function getAccessibleSymbolFromSymbolTable(symbols: SymbolTable) { + function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol) { + if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) { + // If the symbol is equivalent and doesnt need futher qualification, this symbol is accessible + if (!needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning)) { + return true; + } + + // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too + var accessibleParent = getAccessibleSymbol(symbolFromSymbolTable.parent, enclosingDeclaration, SymbolFlags.Namespace); + return !!accessibleParent; + } + } + + // If symbol is directly available by its name in the symbol table + if (isAccessible(symbols[symbol.name])) { + return symbol; + } + + // Check if symbol is any of the alias + return forEachValue(symbols, symbolFromSymbolTable => { + if (symbolFromSymbolTable.flags & SymbolFlags.Import) { + if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) { + return symbolFromSymbolTable; + } + } + }); + } + + if (symbol) { + return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolFromSymbolTable); + } + } + + function needsQualification(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) { + var qualify = false; + forEachSymbolTableInScope(enclosingDeclaration, symbolTable => { + // If symbol of this name is not available in the symbol table we are ok + if (!symbolTable[symbol.name]) { + // Continue to the next symbol table + return false; + } + // If the symbol with this name is present it should refer to the symbol + var symbolFromSymbolTable = symbolTable[symbol.name]; + if (symbolFromSymbolTable === symbol) { + // No need to qualify + return true; + } + + // Qualify if the symbol from symbol table has same meaning as expected + symbolFromSymbolTable = (symbolFromSymbolTable.flags & SymbolFlags.Import) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable; + if (symbolFromSymbolTable.flags & meaning) { + qualify = true; + return true; + } + + // Continue to the next symbol table + return false; + }); + + return qualify + } + + // Enclosing declaration is optional when we dont want to get qualified name in the enclosing declaration scope + // Meaning needs to be specified if the enclosing declaration is given + function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) { + function getSymbolName(symbol: Symbol) { + if (symbol.declarations && symbol.declarations.length > 0) { + var declaration = symbol.declarations[0]; + if (declaration.name) { + return identifierToString(declaration.name); + } + } + return symbol.name; + } + + // Get qualified name + if (enclosingDeclaration && + // Properties/methods/Signatures/Constructors/TypeParameters do not need qualification + !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) { + var symbolName: string; + while (symbol) { + var isFirstName = !symbolName; + var meaningToLook = isFirstName ? meaning : SymbolFlags.Namespace; + var accessibleSymbol = getAccessibleSymbol(symbol, enclosingDeclaration, meaningToLook); + symbolName = getSymbolName(accessibleSymbol || symbol) + (isFirstName ? "" : ("." + symbolName)); + if (accessibleSymbol && !needsQualification(accessibleSymbol, enclosingDeclaration, meaningToLook)) { + break; + } + symbol = accessibleSymbol ? accessibleSymbol.parent : symbol.parent; + } + + return symbolName; + } + + return getSymbolName(symbol); } function createSingleLineTextWriter() { @@ -623,7 +747,6 @@ module ts { } function writeTypeToTextWriter(type: Type, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter) { - // TODO(shkamat): usage of enclosingDeclaration var typeStack: Type[]; return writeType(type, /*allowFunctionOrConstructorTypeLiteral*/ true); @@ -635,7 +758,7 @@ module ts { writeTypeReference(type); } else if (type.flags & (TypeFlags.Class | TypeFlags.Interface | TypeFlags.Enum | TypeFlags.TypeParameter)) { - writer.write(symbolToString(type.symbol)); + writer.write(symbolToString(type.symbol, enclosingDeclaration, SymbolFlags.Type)); } else if (type.flags & TypeFlags.Anonymous) { writeAnonymousType(type, allowFunctionOrConstructorTypeLiteral); @@ -657,7 +780,7 @@ module ts { writer.write("[]"); } else { - writer.write(symbolToString(type.target.symbol)); + writer.write(symbolToString(type.target.symbol, enclosingDeclaration, SymbolFlags.Type)); writer.write("<"); for (var i = 0; i < type.typeArguments.length; i++) { if (i > 0) { @@ -691,7 +814,7 @@ module ts { function writeTypeofSymbol(type: ObjectType) { writer.write("typeof "); - writer.write(symbolToString(type.symbol)); + writer.write(symbolToString(type.symbol, enclosingDeclaration, SymbolFlags.Value)); } function writeLiteralType(type: ObjectType, allowFunctionOrConstructorTypeLiteral: boolean) { @@ -809,6 +932,122 @@ module 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 (node.flags & NodeFlags.ExternalModule) ? 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 + var externalModule = getContainingExternalModule(node); + if (externalModule) { + // This is export assigned symbol node + var externalModuleSymbol = getSymbolOfNode(externalModule); + var exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol); + var symbolOfNode = getSymbolOfNode(node); + if (exportAssignmentSymbol === symbolOfNode) { + return true; + } + + if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & SymbolFlags.Import)) { + // if export assigned symbol is import declaration, resolve the import + var resolvedExportSymbol = resolveImport(exportAssignmentSymbol); + if (resolvedExportSymbol === symbolOfNode) { + return true; + } + + // TODO(shkamat): Chained import assignment + // eg. a should be visible too. + //module m { + // export module c { + // export class c { + // } + // } + //} + //import a = m.c; + //import b = a; + //export = b; + + // Container of resolvedExportSymbol is visible + return forEach(resolvedExportSymbol.declarations, declaration => { + while (declaration) { + if (declaration === node) { + return true; + } + declaration = declaration.parent; + } + }); + } + } + } + + function determineIfDeclarationIsVisible() { + switch (node.kind) { + case SyntaxKind.VariableDeclaration: + if (!(node.flags & NodeFlags.Export)) { + // node.parent is variable statement so look at the variable statement's parent + return isGlobalSourceFile(node.parent.parent) || isUsedInExportAssignment(node); + } + // Exported members are visible if parent is visible + return isDeclarationVisible(node.parent.parent); + + case SyntaxKind.ModuleDeclaration: + case SyntaxKind.ClassDeclaration: + case SyntaxKind.InterfaceDeclaration: + case SyntaxKind.FunctionDeclaration: + case SyntaxKind.EnumDeclaration: + case SyntaxKind.ImportDeclaration: + if (!(node.flags & NodeFlags.Export)) { + // TODO(shkamat): non exported aliases can be visible if they are referenced else where for value/type/namespace + return isGlobalSourceFile(node.parent) || isUsedInExportAssignment(node); + } + // Exported members are visible if parent is visible + return isDeclarationVisible(node.parent); + + case SyntaxKind.Property: + case SyntaxKind.Method: + if (node.flags & NodeFlags.Private) { + // Private 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: + return isDeclarationVisible(node.parent); + + // Source file is always visible + case SyntaxKind.SourceFile: + return true; + + default: + Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + SyntaxKind[node.kind]); + } + } + + if (node) { + var links = getNodeLinks(node); + if (links.isVisible === undefined) { + links.isVisible = determineIfDeclarationIsVisible(); + } + return links.isVisible; + } + } + function getApparentType(type: Type): ApparentType { if (type.flags & TypeFlags.TypeParameter) { do { @@ -4788,7 +5027,7 @@ module ts { checkTypeAssignableTo(checkAndMarkExpression(node.initializer, type), type, node, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined); } } - + checkCollisionWithCapturedSuperVariable(node, node.name); if (!useTypeFromValueDeclaration) { // TypeScript 1.0 spec (April 2014): 5.1 @@ -5343,7 +5582,7 @@ module ts { } } if (node.name.kind === SyntaxKind.StringLiteral) { - if (node.parent.kind !== SyntaxKind.SourceFile || node.parent.flags & NodeFlags.ExternalModule) { + if (!isGlobalSourceFile(node.parent)) { error(node.name, Diagnostics.Ambient_external_modules_cannot_be_nested_in_other_modules); } if (isExternalModuleNameRelative(node.name.text)) { @@ -5588,7 +5827,7 @@ module ts { } } while (location) { - if (location.locals && (location.kind !== SyntaxKind.SourceFile || location.flags & NodeFlags.ExternalModule)) { + if (location.locals && !isGlobalSourceFile(location)) { copySymbols(location.locals, meaning); } switch (location.kind) { @@ -5822,22 +6061,6 @@ module ts { return false; } - function isReferencedInExportAssignment(node: Declaration): boolean { - var exportAssignedSymbol = getExportAssignmentSymbol(getSymbolOfNode(getContainerOfModuleElementDeclaration(node))); - if (exportAssignedSymbol) { - var symbol = getSymbolOfNode(node); - if (exportAssignedSymbol === symbol) { - // This symbol was export assigned symbol - return true; - } - - // TODO(shkamat): if export assignment is alias, the alias target would make the node as referenced in export assignment - - } - - return false; - } - function isImplementationOfOverload(node: FunctionDeclaration) { if (node.body) { var symbol = getSymbolOfNode(node); @@ -5879,7 +6102,7 @@ module ts { getEnumMemberValue: getEnumMemberValue, isTopLevelValueImportedViaEntityName: isTopLevelValueImportedViaEntityName, shouldEmitDeclarations: shouldEmitDeclarations, - isReferencedInExportAssignment: isReferencedInExportAssignment, + isDeclarationVisible: isDeclarationVisible, isImplementationOfOverload: isImplementationOfOverload, writeTypeAtLocation: writeTypeAtLocation, writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 38f51e10d8a..91613bd5bff 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1898,34 +1898,6 @@ module ts { writeLine(); } - function isModuleElementExternallyVisible(node: Declaration) { - if (node.flags & NodeFlags.Export) { - // Exported member - emit this declaration - return true; - } - - // If this node is in external module, check if this is export assigned - var moduleDeclaration = getContainerOfModuleElementDeclaration(node); - if ((moduleDeclaration.flags & NodeFlags.ExternalModule) || // Source file with external module flag - // Ambient external module declaration - (moduleDeclaration.kind === SyntaxKind.ModuleDeclaration && (moduleDeclaration).name.kind === SyntaxKind.StringLiteral)) { - return resolver.isReferencedInExportAssignment(node); - } - - return false; - } - - function canEmitModuleElementDeclaration(node: Declaration) { - if (isModuleElementExternallyVisible(node)) { - // Either exported module element or is referenced in export assignment - return true; - } - - // emit the declaration if this is in global scope source file - var moduleDeclaration = getContainerOfModuleElementDeclaration(node); - return moduleDeclaration.kind === SyntaxKind.SourceFile && !(moduleDeclaration.flags & NodeFlags.ExternalModule); - } - function emitDeclarationFlags(node: Declaration) { if (node.flags & NodeFlags.Static) { if (node.flags & NodeFlags.Private) { @@ -1952,8 +1924,7 @@ module ts { } function emitImportDeclaration(node: ImportDeclaration) { - // TODO(shkamat): Emit if import decl is used to declare type in this context - if (isModuleElementExternallyVisible(node)) { + if (resolver.isDeclarationVisible(node)) { if (node.flags & NodeFlags.Export) { write("export "); } @@ -1974,7 +1945,7 @@ module ts { } function emitModuleDeclaration(node: ModuleDeclaration) { - if (canEmitModuleElementDeclaration(node)) { + if (resolver.isDeclarationVisible(node)) { emitDeclarationFlags(node); write("module "); emitSourceTextOfNode(node.name); @@ -1997,7 +1968,7 @@ module ts { } function emitEnumDeclaration(node: EnumDeclaration) { - if (canEmitModuleElementDeclaration(node)) { + if (resolver.isDeclarationVisible(node)) { emitDeclarationFlags(node); write("enum "); emitSourceTextOfNode(node.name); @@ -2060,7 +2031,7 @@ module ts { } } - if (canEmitModuleElementDeclaration(node)) { + if (resolver.isDeclarationVisible(node)) { emitDeclarationFlags(node); write("class "); emitSourceTextOfNode(node.name); @@ -2084,7 +2055,7 @@ module ts { } function emitInterfaceDeclaration(node: InterfaceDeclaration) { - if (canEmitModuleElementDeclaration(node)) { + if (resolver.isDeclarationVisible(node)) { emitDeclarationFlags(node); write("interface "); emitSourceTextOfNode(node.name); @@ -2111,8 +2082,9 @@ module ts { } function emitVariableDeclaration(node: VariableDeclaration) { - // If we are emitting property it isnt moduleElement and doesnt need canEmitModuleElement check - if (node.kind !== SyntaxKind.VariableDeclaration || canEmitModuleElementDeclaration(node)) { + // If we are emitting property it isnt 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)) { emitSourceTextOfNode(node.name); // If optional property emit ? if (node.kind === SyntaxKind.Property && (node.flags & NodeFlags.QuestionMark)) { @@ -2126,7 +2098,7 @@ module ts { } function emitVariableStatement(node: VariableStatement) { - var hasDeclarationWithEmit = forEach(node.declarations, varDeclaration => canEmitModuleElementDeclaration(varDeclaration)); + var hasDeclarationWithEmit = forEach(node.declarations, varDeclaration => resolver.isDeclarationVisible(varDeclaration)); if (hasDeclarationWithEmit) { emitDeclarationFlags(node); write("var "); @@ -2151,8 +2123,9 @@ module ts { } function emitFunctionDeclaration(node: FunctionDeclaration) { - // If we are emitting Method/Constructor it isnt moduleElement and doesnt need canEmitModuleElement check - if ((node.kind !== SyntaxKind.FunctionDeclaration || canEmitModuleElementDeclaration(node)) && + // If we are emitting Method/Constructor it isnt moduleElement and hence already determined to be emitting + // so no need to verify if the declaration is visible + if ((node.kind !== SyntaxKind.FunctionDeclaration || resolver.isDeclarationVisible(node)) && !resolver.isImplementationOfOverload(node)) { emitDeclarationFlags(node); if (node.kind === SyntaxKind.FunctionDeclaration) { diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index f690697cc5c..064246619b3 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -273,12 +273,6 @@ module ts { return s.parameters.length > 0 && (s.parameters[s.parameters.length - 1].flags & NodeFlags.Rest) !== 0; } - export function getContainerOfModuleElementDeclaration(node: Declaration) { - // If the declaration is var declaration, then the parent is variable statement but we actually want the module - var container = node.kind === SyntaxKind.VariableDeclaration ? node.parent.parent : node.parent; - return container.kind == SyntaxKind.ModuleBlock ? container.parent : container; - } - enum ParsingContext { SourceElements, // Elements in source file ModuleElements, // Elements in module declaration @@ -619,14 +613,14 @@ module ts { } // True if positioned at the start of a list element - function isListElement(kind: ParsingContext): boolean { + function isListElement(kind: ParsingContext, inErrorRecovery: boolean): boolean { switch (kind) { case ParsingContext.SourceElements: case ParsingContext.ModuleElements: - return isSourceElement(); + return isSourceElement(inErrorRecovery); case ParsingContext.BlockStatements: case ParsingContext.SwitchClauseStatements: - return isStatement(); + return isStatement(inErrorRecovery); case ParsingContext.SwitchClauses: return token === SyntaxKind.CaseKeyword || token === SyntaxKind.DefaultKeyword; case ParsingContext.TypeMembers: @@ -650,6 +644,8 @@ module ts { case ParsingContext.TypeArguments: return isType(); } + + Debug.fail("Non-exhaustive case in 'isListElement'."); } // True if positioned at a list terminator @@ -717,10 +713,12 @@ module ts { } // True if positioned at element or terminator of the current list or any enclosing list - function isInParsingContext(): boolean { + function isInSomeParsingContext(): boolean { for (var kind = 0; kind < ParsingContext.Count; kind++) { if (parsingContext & (1 << kind)) { - if (isListElement(kind) || isListTerminator(kind)) return true; + if (isListElement(kind, /* inErrorRecovery */ true) || isListTerminator(kind)) { + return true; + } } } @@ -734,12 +732,12 @@ module ts { var result = >[]; result.pos = getNodePos(); while (!isListTerminator(kind)) { - if (isListElement(kind)) { + if (isListElement(kind, /* inErrorRecovery */ false)) { result.push(parseElement()); } else { error(parsingContextErrors(kind)); - if (isInParsingContext()) { + if (isInSomeParsingContext()) { break; } nextToken(); @@ -761,7 +759,7 @@ module ts { var errorCountBeforeParsingList = file.syntacticErrors.length; var commaStart = -1; // Meaning the previous token was not a comma while (true) { - if (isListElement(kind)) { + if (isListElement(kind, /* inErrorRecovery */ false)) { result.push(parseElement()); commaStart = scanner.getTokenPos(); if (parseOptional(SyntaxKind.CommaToken)) { @@ -791,7 +789,7 @@ module ts { } else { error(parsingContextErrors(kind)); - if (token !== SyntaxKind.CommaToken && isInParsingContext()) { + if (isInSomeParsingContext()) { break; } nextToken(); @@ -2066,12 +2064,19 @@ module ts { return finishNode(node); } - function isStatement(): boolean { + function isStatement(inErrorRecovery: boolean): boolean { switch (token) { + case SyntaxKind.SemicolonToken: + // If we're in error recovery, then we don't want to treat ';' as an empty statement. + // The problem is that ';' can show up in far too many contexts, and if we see one + // and assume it's a statement, then we may bail out innapropriately from whatever + // we're parsing. For example, if we have a semicolon in the middle of a class, then + // we really don't want to assume the class is over and we're on a statement in the + // outer module. We just want to consume and move on. + return !inErrorRecovery; case SyntaxKind.OpenBraceToken: case SyntaxKind.VarKeyword: case SyntaxKind.FunctionKeyword: - case SyntaxKind.SemicolonToken: case SyntaxKind.IfKeyword: case SyntaxKind.DoKeyword: case SyntaxKind.WhileKeyword: @@ -2103,8 +2108,8 @@ module ts { } } - function isStatementOrFunction(): boolean { - return token === SyntaxKind.FunctionKeyword || isStatement(); + function isStatementOrFunction(inErrorRecovery: boolean): boolean { + return token === SyntaxKind.FunctionKeyword || isStatement(inErrorRecovery); } function parseStatement(): Statement { @@ -2813,8 +2818,8 @@ module ts { return result; } - function isSourceElement(): boolean { - return isDeclaration() || isStatement(); + function isSourceElement(inErrorRecovery: boolean): boolean { + return isDeclaration() || isStatement(inErrorRecovery); } function parseSourceElement() { diff --git a/src/compiler/tc.ts b/src/compiler/tc.ts index f5958d118f1..0de66b58572 100644 --- a/src/compiler/tc.ts +++ b/src/compiler/tc.ts @@ -79,8 +79,6 @@ module ts { function reportErrors(errors: Diagnostic[]) { for (var i = 0; i < errors.length; i++) { var error = errors[i]; - // TODO(jfreeman): Remove assert - Debug.assert(error.messageText.indexOf("{NL}") < 0); if (error.file) { var loc = error.file.getLineAndCharacterFromPosition(error.start); sys.writeErr(error.file.filename + "(" + loc.line + "," + loc.character + "): " + error.messageText + sys.newLine); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 70efd711ca4..65ca7d01fbd 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -621,7 +621,7 @@ module ts { getNodeCheckFlags(node: Node): NodeCheckFlags; getEnumMemberValue(node: EnumMember): number; shouldEmitDeclarations(): boolean; - isReferencedInExportAssignment(node: Declaration): boolean; + isDeclarationVisible(node: Declaration): boolean; isImplementationOfOverload(node: FunctionDeclaration): boolean; writeTypeAtLocation(location: Node, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void; writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void; @@ -740,6 +740,7 @@ module ts { flags?: NodeCheckFlags; // Set of flags specific to Node enumMemberValue?: number; // Constant value of enum member isIllegalTypeReferenceInConstraint?: boolean; // Is type reference in constraint refers to the type parameter from the same list + isVisible?: boolean; // Is this node visible } export enum TypeFlags { diff --git a/tests/baselines/reference/ambientGetters.errors.txt b/tests/baselines/reference/ambientGetters.errors.txt index a09ef7cf8cf..05c40581074 100644 --- a/tests/baselines/reference/ambientGetters.errors.txt +++ b/tests/baselines/reference/ambientGetters.errors.txt @@ -1,12 +1,10 @@ -==== tests/cases/compiler/ambientGetters.ts (3 errors) ==== +==== tests/cases/compiler/ambientGetters.ts (2 errors) ==== declare class A { get length() : number; ~ !!! '{' expected. } - ~ -!!! Declaration or statement expected. declare class B { get length() { return 0; } diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js index 4d42fa06c41..d59e2d1f235 100644 --- a/tests/baselines/reference/commentsModules.js +++ b/tests/baselines/reference/commentsModules.js @@ -254,7 +254,7 @@ declare module m1 { function foo2Export(a: string): void; function foo3Export(): void; } -declare var myvar: c; +declare var myvar: m1.m2.c; declare module m2.m3 { class c { } diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js index 9e13bf28f6c..3c4ddf366f1 100644 --- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js +++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js @@ -32,4 +32,4 @@ declare module "SubModule" { } //// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts] /// -export declare var x: c; +export declare var x: SubModule.m.m3.c; diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js index 2ead0783eeb..f4cd27e6c01 100644 --- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js +++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js @@ -31,5 +31,21 @@ module.exports = m; //// [declFileExportAssignmentImportInternalModule.d.ts] +declare module m3 { + module m2 { + interface connectModule { + (res: any, req: any, next: any): void; + } + interface connectExport { + use: (mod: connectModule) => connectExport; + listen: (port: number) => void; + } + } + var server: { + (): m2.connectExport; + test1: m2.connectModule; + test2(): m2.connectModule; + }; +} import m = m3; export = m; diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js index c13afd51c38..5f353ffd987 100644 --- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js +++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js @@ -28,4 +28,4 @@ interface Foo { } export = Foo; //// [declFileExportAssignmentOfGenericInterface_1.d.ts] -export declare var x: Foo>; +export declare var x: a>; diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js index aa0fda1073c..9b921345a1e 100644 --- a/tests/baselines/reference/declFileExportImportChain.js +++ b/tests/baselines/reference/declFileExportImportChain.js @@ -74,4 +74,4 @@ export = b; //// [declFileExportImportChain_c.d.ts] export import b1 = require("declFileExportImportChain_b1"); //// [declFileExportImportChain_d.d.ts] -export declare var x: c1; +export declare var x: m1.m2.c1; diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js index 52b470dae2a..3b2e1936c39 100644 --- a/tests/baselines/reference/declFileExportImportChain2.js +++ b/tests/baselines/reference/declFileExportImportChain2.js @@ -65,4 +65,4 @@ export = a; //// [declFileExportImportChain2_c.d.ts] export import b = require("declFileExportImportChain2_b"); //// [declFileExportImportChain2_d.d.ts] -export declare var x: c1; +export declare var x: m1.m2.c1; diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js index 95c5e77a2bb..2be231c1381 100644 --- a/tests/baselines/reference/declFileGenericType.js +++ b/tests/baselines/reference/declFileGenericType.js @@ -130,16 +130,16 @@ export declare module C { constructor(val: T); } } -export declare var a: A; -export declare var b: (x: T) => A; -export declare var c: (x: T) => A; -export declare var d: (x: T) => A[]; -export declare var e: >(x: T) => A[]; -export declare var x: A; -export declare function f>(): void; -export declare var g: A; -export declare class h extends A { +export declare var a: C.A; +export declare var b: (x: T) => C.A; +export declare var c: (x: T) => C.A; +export declare var d: (x: T) => C.A[]; +export declare var e: >(x: T) => C.A[]; +export declare var x: C.A; +export declare function f>(): void; +export declare var g: C.A; +export declare class h extends C.A { } -export interface i extends A { +export interface i extends C.A { } -export declare var j: >(x: T) => T; +export declare var j: >(x: T) => T; diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js index 6ecfbcfadf2..94cdaa32eaa 100644 --- a/tests/baselines/reference/declFileGenericType2.js +++ b/tests/baselines/reference/declFileGenericType2.js @@ -99,17 +99,17 @@ declare module templa.mvc { declare module templa.mvc.composite { } declare module templa.dom.mvc { - interface IElementController extends IController { + interface IElementController extends templa.mvc.IController { } } declare module templa.dom.mvc { - class AbstractElementController extends AbstractController implments IElementController { + class AbstractElementController extends templa.mvc.AbstractController implments IElementController { constructor(); } } declare module templa.dom.mvc.composite { - class AbstractCompositeElementController extends AbstractElementController { - _controllers: IController[]; + class AbstractCompositeElementController extends AbstractElementController { + _controllers: templa.mvc.IController[]; constructor(); } } diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js index d6144cc944f..ccea841ab47 100644 --- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js +++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js @@ -46,14 +46,14 @@ declare module m2 { } } declare var m2: { - (): connectExport; - test1: connectModule; - test2(): connectModule; + (): m2.connectExport; + test1: m2.connectModule; + test2(): m2.connectModule; }; export = m2; //// [declFileImportModuleWithExportAssignment_1.d.ts] export declare var a: { - (): connectExport; - test1: connectModule; - test2(): connectModule; + (): a1.connectExport; + test1: a1.connectModule; + test2(): a1.connectModule; }; diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js index de6e91d110d..8d1e4cd4b2e 100644 --- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js +++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js @@ -27,5 +27,5 @@ declare class List { declare module 'mod1' { } declare module 'moo' { - var p: List; + var p: List; } diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js index c7afbbc4303..5ae14f41487 100644 --- a/tests/baselines/reference/declFileInternalAliases.js +++ b/tests/baselines/reference/declFileInternalAliases.js @@ -40,9 +40,9 @@ declare module m { } } declare module m1 { - var d: c; + var d: x; } declare module m2 { export import x = m.c; - var d: c; + var d: x; } diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js index f3756b3c88b..1b361e9e048 100644 --- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js +++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js @@ -35,6 +35,6 @@ declare var d: { m: typeof m1; }; m2: { - c: typeof c; + c: typeof m1.c; }; }; diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js index de667cbad26..490d599a2d9 100644 --- a/tests/baselines/reference/declFileModuleContinuation.js +++ b/tests/baselines/reference/declFileModuleContinuation.js @@ -33,6 +33,6 @@ declare module A.C { } } declare module A.B.C { - class W implments Z { + class W implments A.C.Z { } } diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js index b9fbc999988..2210f189d16 100644 --- a/tests/baselines/reference/declFileTypeofInAnonymousType.js +++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js @@ -63,10 +63,10 @@ declare module m1 { } } declare var a: { - c: c; + c: m1.c; }; declare var b: { - c: typeof c; + c: typeof m1.c; m1: typeof m1; }; declare var c: { @@ -77,10 +77,10 @@ declare var d: { mod: typeof m1; }; mc: { - cl: typeof c; + cl: typeof m1.c; }; me: { - en: typeof e; + en: typeof m1.e; }; - mh: e; + mh: m1.e; }; diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js index 9566e027b13..ed695e40400 100644 --- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js +++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js @@ -73,12 +73,12 @@ declare module A.B.Base { } } declare module X.Y.base { - class W extends W { + class W extends A.B.Base.W { name: string; } } declare module X.Y.base.Z { - class W extends W { + class W extends base.W { value: boolean; } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js index 62ab7cb52a7..98f3c1df276 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js @@ -38,6 +38,6 @@ declare module X.A.C { } } declare module X.A.B.C { - class W implments Z { + class W implments X.A.C.Z { } } diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js index 0badfa40d75..6646ef907d1 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js @@ -41,7 +41,7 @@ declare module X.A.C { } } declare module X.A.B.C { - class W implments Z { + class W implments A.C.Z { } } declare module X.A.B.C { diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js index 113a9207005..ca74a916fa8 100644 --- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js +++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js @@ -41,7 +41,7 @@ declare module X.A.C { } } declare module X.A.B.C { - class W implments Z { + class W implments X.A.C.Z { } } declare module X.A.B.C { diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt b/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt deleted file mode 100644 index 6a202ec3e60..00000000000 --- a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt +++ /dev/null @@ -1,53 +0,0 @@ -==== tests/cases/compiler/declarationEmit_nameConflicts_0.ts (1 errors) ==== - import im = require('declarationEmit_nameConflicts_1'); - export module M { - export function f() { } - export class C { } - export module N { - export function g() { }; - export interface I { } - } - - export import a = M.f; - export import b = M.C; - export import c = N; - export import d = im; - ~~~~~~~~~~~~~~~~~~~~~ -!!! Cannot find name 'im'. - } - - export module M.P { - export function f() { } - export class C { } - export module N { - export function g() { }; - export interface I { } - } - export import im = M.P.f; - // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope - export var a = M.a; // emitted incorrectly as typeof f - export var b = M.b; // ok - export var c = M.c; // ok - export var g = M.c.g; // ok - export var d = M.d; // emitted incorrectly as typeof im - } - - export module M.Q { - export function f() { } - export class C { } - export module N { - export function g() { }; - export interface I { } - } - export interface b extends M.b { } // ok - export interface I extends M.c.I { } // ok - export module c { - export interface I extends M.c.I { } // ok - } - } -==== tests/cases/compiler/declarationEmit_nameConflicts_1.ts (1 errors) ==== - function f() { } - export = f; - ~~~~~~~~~~~ -!!! Cannot compile external modules unless the '--module' flag is provided. - \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js index 1f9b13b7df6..7fc044a8aa9 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts.js @@ -1,7 +1,7 @@ //// [tests/cases/compiler/declarationEmit_nameConflicts.ts] //// //// [declarationEmit_nameConflicts_1.ts] -function f() { } +module f { export class c { } } export = f; //// [declarationEmit_nameConflicts_0.ts] @@ -51,10 +51,18 @@ export module M.Q { } //// [declarationEmit_nameConflicts_1.js] -function f() { -} +var f; +(function (f) { + var c = (function () { + function c() { + } + return c; + })(); + f.c = c; +})(f || (f = {})); module.exports = f; //// [declarationEmit_nameConflicts_0.js] +var im = require('declarationEmit_nameConflicts_1'); (function (M) { function f() { } @@ -75,6 +83,7 @@ module.exports = f; M.a = M.f; M.b = M.C; M.c = N; + M.d = im; })(exports.M || (exports.M = {})); var M = exports.M; (function (M) { @@ -127,3 +136,60 @@ var M = exports.M; var Q = M.Q; })(exports.M || (exports.M = {})); var M = exports.M; + + +//// [declarationEmit_nameConflicts_1.d.ts] +declare module f { + class c { + } +} +export = f; +//// [declarationEmit_nameConflicts_0.d.ts] +export declare module M { + function f(): void; + class C { + } + module N { + function g(): void; + interface I { + } + } + export import a = M.f; + export import b = M.C; + export import c = N; + export import d = im; +} +export declare module M.P { + function f(): void; + class C { + } + module N { + function g(): void; + interface I { + } + } + export import im = M.P.f; + var a: () => void; + var b: typeof M.C; + var c: typeof M.N; + var g: () => void; + var d: typeof M.d; +} +export declare module M.Q { + function f(): void; + class C { + } + module N { + function g(): void; + interface I { + } + } + interface b extends M.C { + } + interface I extends M.N.I { + } + module c { + interface I extends M.N.I { + } + } +} diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js index 7db130615a7..bc8ba2f63e9 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts2.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js @@ -73,7 +73,7 @@ declare module X.Y.base { } declare module X.Y.base.Z { var f: () => void; - var C: typeof C; - var M: typeof M; - var E: typeof E; + var C: typeof base.C; + var M: typeof base.M; + var E: typeof base.E; } diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js index db5a7ba323b..cfec6264a77 100644 --- a/tests/baselines/reference/declarationEmit_nameConflicts3.js +++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js @@ -110,7 +110,7 @@ declare module M.P { enum D { f = 0, } - var v: D; + var v: M.D; var w: () => void; var x: () => void; var x: () => void; diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt deleted file mode 100644 index 100bf85427e..00000000000 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -==== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts (1 errors) ==== - // Bug 887180 - export module C { export interface I { } } - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Cannot compile external modules unless the '--module' flag is provided. - export import v = C; - export module M { - export module C { export interface I { } } - export var w: v.I; // Gets emitted as C.I, which is the wrong interface - } \ No newline at end of file diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js index eade0352272..72b2a9295f5 100644 --- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js +++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js @@ -12,3 +12,18 @@ export module M { M.w; })(exports.M || (exports.M = {})); var M = exports.M; + + +//// [declarationEmit_nameConflictsWithAlias.d.ts] +export declare module C { + interface I { + } +} +export import v = C; +export declare module M { + module C { + interface I { + } + } + var w: v.I; +} diff --git a/tests/baselines/reference/declareFileExportAssignment.js b/tests/baselines/reference/declareFileExportAssignment.js index 3f05e984139..ff16eee27fc 100644 --- a/tests/baselines/reference/declareFileExportAssignment.js +++ b/tests/baselines/reference/declareFileExportAssignment.js @@ -34,8 +34,8 @@ declare module m2 { } } declare var m2: { - (): connectExport; - test1: connectModule; - test2(): connectModule; + (): m2.connectExport; + test1: m2.connectModule; + test2(): m2.connectModule; }; export = m2; diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js index 35216d0ea18..c4acd795453 100644 --- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js +++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js @@ -34,8 +34,8 @@ declare module m2 { } } declare var m2: { - (): connectExport; - test1: connectModule; - test2(): connectModule; + (): m2.connectExport; + test1: m2.connectModule; + test2(): m2.connectModule; }; export = m2; diff --git a/tests/baselines/reference/es6ClassTest3.errors.txt b/tests/baselines/reference/es6ClassTest3.errors.txt index d16568b7c24..d666351dc9a 100644 --- a/tests/baselines/reference/es6ClassTest3.errors.txt +++ b/tests/baselines/reference/es6ClassTest3.errors.txt @@ -1,45 +1,19 @@ -==== tests/cases/compiler/es6ClassTest3.ts (15 errors) ==== +==== tests/cases/compiler/es6ClassTest3.ts (2 errors) ==== module M { class Visibility { public foo() { }; ~ !!! Unexpected token. A constructor, method, accessor, or property was expected. private bar() { }; - ~~~~~~~ -!!! Declaration or statement expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'bar'. + ~ +!!! Unexpected token. A constructor, method, accessor, or property was expected. private x: number; - ~~~~~~~ -!!! Declaration or statement expected. - ~~~~~~ -!!! Cannot find name 'number'. public y: number; - ~~~~~~ -!!! Declaration or statement expected. - ~~~~~~ -!!! Cannot find name 'number'. public z: number; - ~~~~~~ -!!! Declaration or statement expected. - ~~~~~~ -!!! Cannot find name 'number'. constructor() { - ~ -!!! ';' expected. - ~~~~~~~~~~~ -!!! Cannot find name 'constructor'. this.x = 1; - ~~~~ -!!! 'this' cannot be referenced in a module body. this.y = 2; - ~~~~ -!!! 'this' cannot be referenced in a module body. } } - } - ~ -!!! Declaration or statement expected. \ No newline at end of file + } \ No newline at end of file diff --git a/tests/baselines/reference/exportDeclareClass1.errors.txt b/tests/baselines/reference/exportDeclareClass1.errors.txt index dee40634d35..6ee2bc0e090 100644 --- a/tests/baselines/reference/exportDeclareClass1.errors.txt +++ b/tests/baselines/reference/exportDeclareClass1.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/compiler/exportDeclareClass1.ts (9 errors) ==== +==== tests/cases/compiler/exportDeclareClass1.ts (4 errors) ==== export declare class eaC { static tF() { }; ~ @@ -6,21 +6,11 @@ ~ !!! Unexpected token. A constructor, method, accessor, or property was expected. static tsF(param:any) { }; - ~~~~~~ -!!! Declaration or statement expected. - ~ -!!! ',' expected. ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'tsF'. - ~~~~~ -!!! Cannot find name 'param'. - ~~~ -!!! Cannot find name 'any'. +!!! A function implementation cannot be declared in an ambient context. + ~ +!!! Unexpected token. A constructor, method, accessor, or property was expected. }; - ~ -!!! Declaration or statement expected. export declare class eaC2 { static tF(); diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js index 216bf318ff9..bbfc13f872b 100644 --- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js +++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js @@ -25,6 +25,6 @@ declare module foo { } } declare module bar { - class Foo implments IFoo { + class Foo implments foo.IFoo { } } diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js index c5d142fba04..3f19b1f71f7 100644 --- a/tests/baselines/reference/genericClassesInModule.js +++ b/tests/baselines/reference/genericClassesInModule.js @@ -35,4 +35,4 @@ declare module Foo { class A { } } -declare var a: B; +declare var a: Foo.B; diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js index dff2977ce6c..30493dc8ccf 100644 --- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js +++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js @@ -28,4 +28,4 @@ export declare class B { } //// [importDeclarationUsedAsTypeQuery_1.d.ts] /// -export declare var x: typeof "tests/cases/compiler/importDeclarationUsedAsTypeQuery_require"; +export declare var x: typeof a; diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js index 21c51867f9b..a116df0e2d4 100644 --- a/tests/baselines/reference/internalAliasClass.js +++ b/tests/baselines/reference/internalAliasClass.js @@ -32,5 +32,5 @@ declare module a { } } declare module c { - var x: c; + var x: b; } diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js index c9f02ad9bba..811585cbf4f 100644 --- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js @@ -54,4 +54,4 @@ export declare module m2 { var cProp: c; } } -export declare var d: c; +export declare var d: x.c; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js index c540d590578..eea66559139 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js @@ -36,4 +36,4 @@ export declare module x { } } export import xc = x.c; -export declare var cProp: c; +export declare var cProp: xc; diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js index 362220210d6..9402269ce2e 100644 --- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js @@ -35,4 +35,4 @@ export declare module x { foo(a: number): number; } } -export declare var cProp: c; +export declare var cProp: xc; diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js index 195d4afd2d9..f102762fa0e 100644 --- a/tests/baselines/reference/internalAliasEnum.js +++ b/tests/baselines/reference/internalAliasEnum.js @@ -39,5 +39,5 @@ declare module a { } } declare module c { - var bVal: weekend; + var bVal: b; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js index e13f3031d09..56cac6ad16d 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js @@ -40,5 +40,5 @@ export declare module a { } export declare module c { export import b = a.weekend; - var bVal: weekend; + var bVal: b; } diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js index dad264ff60a..84984523f84 100644 --- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js @@ -39,5 +39,5 @@ export declare module a { } } export declare module c { - var bVal: weekend; + var bVal: b; } diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js index 25659ea0e9f..3ac848b7093 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js @@ -36,4 +36,4 @@ export declare module a { } } export import b = a.weekend; -export declare var bVal: weekend; +export declare var bVal: b; diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js index 05848f91183..cd53972b311 100644 --- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js @@ -35,4 +35,4 @@ export declare module a { Sunday = 2, } } -export declare var bVal: weekend; +export declare var bVal: b; diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js index ed8a729dbd2..c1d3a3c9f3c 100644 --- a/tests/baselines/reference/internalAliasInitializedModule.js +++ b/tests/baselines/reference/internalAliasInitializedModule.js @@ -39,5 +39,5 @@ declare module a { } } declare module c { - var x: c; + var x: b.c; } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js index cebed340aec..b39fd09a73c 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js @@ -42,5 +42,5 @@ export declare module a { } export declare module c { export import b = a.b; - var x: c; + var x: b.c; } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js index 85630fd13c7..f3290369223 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js @@ -39,5 +39,5 @@ export declare module a { } } export declare module c { - var x: c; + var x: b.c; } diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js index 86bc3297ad6..919d1037922 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js @@ -34,4 +34,4 @@ export declare module a { } } export import b = a.b; -export declare var x: c; +export declare var x: b.c; diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js index 742e01d0bf2..308d792bf39 100644 --- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js @@ -35,4 +35,4 @@ export declare module a { } } } -export declare var x: c; +export declare var x: b.c; diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js index 2a1cdd4a33e..1be40a65ea0 100644 --- a/tests/baselines/reference/internalAliasInterface.js +++ b/tests/baselines/reference/internalAliasInterface.js @@ -23,5 +23,5 @@ declare module a { } } declare module c { - var x: I; + var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js index 9c9f6a2da9e..0b8181b88e2 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js @@ -26,5 +26,5 @@ export declare module a { } export declare module c { export import b = a.I; - var x: I; + var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js index f28a2170637..41e9a3dbc8c 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js @@ -25,5 +25,5 @@ export declare module a { } } export declare module c { - var x: I; + var x: b; } diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js index e7e06d2fa3f..a771da2d789 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js @@ -18,4 +18,4 @@ export declare module a { } } export import b = a.I; -export declare var x: I; +export declare var x: b; diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js index 96b524afb10..cc9d21805d8 100644 --- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js @@ -19,4 +19,4 @@ export declare module a { interface I { } } -export declare var x: I; +export declare var x: b; diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js index b436adaadde..509d3711f5a 100644 --- a/tests/baselines/reference/internalAliasUninitializedModule.js +++ b/tests/baselines/reference/internalAliasUninitializedModule.js @@ -30,5 +30,5 @@ declare module a { } } declare module c { - var x: I; + var x: b.I; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js index c4348fde070..c3a6173cb04 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js @@ -31,5 +31,5 @@ export declare module a { } export declare module c { export import b = a.b; - var x: I; + var x: b.I; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js index e51dcc9c2f9..3b4c5d1bd0d 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js @@ -30,5 +30,5 @@ export declare module a { } } export declare module c { - var x: I; + var x: b.I; } diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js index d61e607911d..79bc7c6c874 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js @@ -28,4 +28,4 @@ export declare module a { } } export import b = a.b; -export declare var x: I; +export declare var x: b.I; diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js index 87968329c3b..ff9249b8266 100644 --- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js +++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js @@ -25,4 +25,4 @@ export declare module a { } } } -export declare var x: I; +export declare var x: b.I; diff --git a/tests/baselines/reference/parser0_004152.errors.txt b/tests/baselines/reference/parser0_004152.errors.txt index 81e6d44af87..07c7126d8b5 100644 --- a/tests/baselines/reference/parser0_004152.errors.txt +++ b/tests/baselines/reference/parser0_004152.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (38 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (34 errors) ==== export class Game { ~~~~~~~~~~~~~~~~~~~ private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0); @@ -40,8 +40,7 @@ !!! ';' expected. ~ !!! Unexpected token. A constructor, method, accessor, or property was expected. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! Cannot compile external modules unless the '--module' flag is provided. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ !!! Cannot find name 'DisplayPosition'. ~ @@ -69,14 +68,9 @@ ~ !!! Duplicate identifier '0'. private prevConfig: SeedCoords[][]; - ~~~~~~~ -!!! Declaration or statement expected. - ~ -!!! Expression expected. - ~ -!!! Expression expected. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~ !!! Cannot find name 'SeedCoords'. } ~ -!!! Declaration or statement expected. \ No newline at end of file +!!! Cannot compile external modules unless the '--module' flag is provided. \ No newline at end of file diff --git a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt index e9566b75e13..ef853280daf 100644 --- a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt +++ b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserEqualsGreaterThanAfterFunction2.ts (4 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserEqualsGreaterThanAfterFunction2.ts (5 errors) ==== function (a => b; ~ !!! Identifier expected. @@ -6,5 +6,7 @@ !!! ',' expected. ~ !!! ',' expected. + +!!! ')' expected. ~~~~~~~~~~~~~~~~~ !!! Function implementation expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt b/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt index 70df299aca6..3caf228c1e0 100644 --- a/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt +++ b/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts (56 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts (5 errors) ==== class a { //constructor (); constructor (n: number); @@ -12,137 +12,35 @@ !!! Unexpected token. A constructor, method, accessor, or property was expected. public pv; - ~~~~~~ -!!! Declaration or statement expected. - ~~ -!!! Cannot find name 'pv'. public get d() { - ~~~~~~ -!!! Declaration or statement expected. ~ -!!! ';' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'get'. - ~ -!!! Cannot find name 'd'. +!!! Accessors are only available when targeting ECMAScript 5 and higher. return 30; - ~~~~~~~~~~ -!!! 'return' statement has no containing function. } public set d() { - ~~~~~~ -!!! Declaration or statement expected. ~ -!!! ';' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'set'. - ~ -!!! Cannot find name 'd'. +!!! Accessors are only available when targeting ECMAScript 5 and higher. } public static get p2() { - ~~~~~~ -!!! Declaration or statement expected. - ~~~~~~ -!!! Declaration or statement expected. ~~ -!!! ';' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'get'. - ~~ -!!! Cannot find name 'p2'. +!!! Accessors are only available when targeting ECMAScript 5 and higher. return { x: 30, y: 40 }; - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! 'return' statement has no containing function. } private static d2() { - ~~~~~~~ -!!! Declaration or statement expected. - ~~~~~~ -!!! Declaration or statement expected. - ~ -!!! ';' expected. - ~~ -!!! Cannot find name 'd2'. } private static get p3() { - ~~~~~~~ -!!! Declaration or statement expected. - ~~~~~~ -!!! Declaration or statement expected. ~~ -!!! ';' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'get'. - ~~ -!!! Cannot find name 'p3'. +!!! Accessors are only available when targeting ECMAScript 5 and higher. return "string"; - ~~~~~~~~~~~~~~~~ -!!! 'return' statement has no containing function. } private pv3; - ~~~~~~~ -!!! Declaration or statement expected. - ~~~ -!!! Cannot find name 'pv3'. private foo(n: number): string; - ~~~~~~~ -!!! Declaration or statement expected. - ~ -!!! ',' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'foo'. - ~ -!!! Cannot find name 'n'. - ~~~~~~ -!!! Cannot find name 'number'. - ~~~~~~ -!!! Cannot find name 'string'. private foo(s: string): string; - ~~~~~~~ -!!! Declaration or statement expected. - ~ -!!! ',' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'foo'. - ~ -!!! Cannot find name 's'. - ~~~~~~ -!!! Cannot find name 'string'. - ~~~~~~ -!!! Cannot find name 'string'. private foo(ns: any) { - ~~~~~~~ -!!! Declaration or statement expected. - ~ -!!! ',' expected. - ~ -!!! ';' expected. - ~~~ -!!! Cannot find name 'foo'. - ~~ -!!! Cannot find name 'ns'. - ~~~ -!!! Cannot find name 'any'. return ns.toString(); - ~~~~~~~~~~~~~~~~~~~~~ -!!! 'return' statement has no containing function. } } - ~ -!!! Declaration or statement expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt b/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt index 7db5f08033c..472e7e237a3 100644 --- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt +++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts (10 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts (9 errors) ==== class C { where(filter: Iterator): Query { ~~~~~~~~~~~~~~~~~~~~ @@ -22,8 +22,6 @@ ~ !!! Unexpected token. A constructor, method, accessor, or property was expected. } - ~ -!!! Declaration or statement expected. } ~ !!! Declaration or statement expected. \ No newline at end of file diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt new file mode 100644 index 00000000000..0780b807ead --- /dev/null +++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt @@ -0,0 +1,8 @@ +==== tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts (1 errors) ==== + class C { + public f() { }; + ~ +!!! Unexpected token. A constructor, method, accessor, or property was expected. + private m; + } + \ No newline at end of file diff --git a/tests/baselines/reference/primitiveMembers.errors.txt b/tests/baselines/reference/primitiveMembers.errors.txt index 3134927df80..325dcbd1f6c 100644 --- a/tests/baselines/reference/primitiveMembers.errors.txt +++ b/tests/baselines/reference/primitiveMembers.errors.txt @@ -1,4 +1,4 @@ -==== tests/cases/compiler/primitiveMembers.ts (6 errors) ==== +==== tests/cases/compiler/primitiveMembers.ts (4 errors) ==== var x = 5; var r = /yo/; r.source; @@ -29,13 +29,9 @@ class baz { public bar(): void { }; } ~ !!! Unexpected token. A constructor, method, accessor, or property was expected. - ~ -!!! Declaration or statement expected. class foo extends baz { public bar(){ return undefined}; } ~ !!! Unexpected token. A constructor, method, accessor, or property was expected. - ~ -!!! Declaration or statement expected. diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts index 675eb48a51d..1ffac0d4931 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts @@ -1,8 +1,8 @@ declare module "quotedm1" { class v { - c: d; + c: m4.d; } } declare module "quotedm2" { - var c: v; + var c: m1.v; } diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts index 675eb48a51d..1ffac0d4931 100644 --- a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts @@ -1,8 +1,8 @@ declare module "quotedm1" { class v { - c: d; + c: m4.d; } } declare module "quotedm2" { - var c: v; + var c: m1.v; } diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts index 225cc823cb3..b3f3616bb50 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts @@ -1,3 +1,3 @@ -export declare var useGlo_m4_x4: d; -export declare var useGlo_m4_d4: typeof d; -export declare var useGlo_m4_f4: d; +export declare var useGlo_m4_x4: glo_m4.d; +export declare var useGlo_m4_d4: typeof glo_m4.d; +export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts index 225cc823cb3..b3f3616bb50 100644 --- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts @@ -1,3 +1,3 @@ -export declare var useGlo_m4_x4: d; -export declare var useGlo_m4_d4: typeof d; -export declare var useGlo_m4_f4: d; +export declare var useGlo_m4_x4: glo_m4.d; +export declare var useGlo_m4_d4: typeof glo_m4.d; +export declare var useGlo_m4_f4: glo_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts index b05c7d95224..65fe7458a3e 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts @@ -1 +1 @@ -export declare var useFncOnly_m4_f4: d; +export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts index b05c7d95224..65fe7458a3e 100644 --- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts @@ -1 +1 @@ -export declare var useFncOnly_m4_f4: d; +export declare var useFncOnly_m4_f4: fncOnly_m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts index 919ea95f7de..492616037df 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts @@ -1,11 +1,11 @@ -export declare var x4: d; -export declare var d4: typeof d; -export declare var f4: d; +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; export declare module m1 { - var x2: d; - var d2: typeof d; - var f2: d; + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; } -export declare var useMultiImport_m4_x4: d; -export declare var useMultiImport_m4_d4: typeof d; -export declare var useMultiImport_m4_f4: d; +export declare var useMultiImport_m4_x4: m4.d; +export declare var useMultiImport_m4_d4: typeof m4.d; +export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts index 919ea95f7de..492616037df 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts @@ -1,11 +1,11 @@ -export declare var x4: d; -export declare var d4: typeof d; -export declare var f4: d; +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; export declare module m1 { - var x2: d; - var d2: typeof d; - var f2: d; + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; } -export declare var useMultiImport_m4_x4: d; -export declare var useMultiImport_m4_d4: typeof d; -export declare var useMultiImport_m4_f4: d; +export declare var useMultiImport_m4_x4: m4.d; +export declare var useMultiImport_m4_d4: typeof m4.d; +export declare var useMultiImport_m4_f4: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts index fe04ba82f46..be50f5ad4a3 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts @@ -1 +1 @@ -export declare function foo2(): d; +export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts index 65160982a26..e7c6ad2f836 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts @@ -1,9 +1,9 @@ -export declare var x4: d; -export declare var d4: typeof d; -export declare var f4: d; +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; export declare module m1 { - var x2: d; - var d2: typeof d; - var f2: d; + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; } -export declare var d: d; +export declare var d: m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts index fe04ba82f46..be50f5ad4a3 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts @@ -1 +1 @@ -export declare function foo2(): d; +export declare function foo2(): m4.d; diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts index 65160982a26..e7c6ad2f836 100644 --- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts @@ -1,9 +1,9 @@ -export declare var x4: d; -export declare var d4: typeof d; -export declare var f4: d; +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; export declare module m1 { - var x2: d; - var d2: typeof d; - var f2: d; + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; } -export declare var d: d; +export declare var d: m4.d; diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts index 6408152fa5b..664759ceeef 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts @@ -1,8 +1,8 @@ -export declare var x4: d; -export declare var d4: typeof d; -export declare var f4: d; +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; export declare module m1 { - var x2: d; - var d2: typeof d; - var f2: d; + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; } diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts index 6408152fa5b..664759ceeef 100644 --- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts +++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts @@ -1,8 +1,8 @@ -export declare var x4: d; -export declare var d4: typeof d; -export declare var f4: d; +export declare var x4: m4.d; +export declare var d4: typeof m4.d; +export declare var f4: m4.d; export declare module m1 { - var x2: d; - var d2: typeof d; - var f2: d; + var x2: m4.d; + var d2: typeof m4.d; + var f2: m4.d; } diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts index 99ff5fcf070..cdde109b62b 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts @@ -1,3 +1,3 @@ /// -declare class ClassC extends ClassA { +declare class ClassC extends test.ClassA { } diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts index 99ff5fcf070..cdde109b62b 100644 --- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts +++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts @@ -1,3 +1,3 @@ /// -declare class ClassC extends ClassA { +declare class ClassC extends test.ClassA { } diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts index 5886fb1a02e..6a5ff1574cf 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts @@ -4,5 +4,5 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; -export declare var a3: typeof m2_c1; +export declare var a2: typeof m1.m1_c1; +export declare var a3: typeof m2.m2_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts index 1b358c0f26a..8535f388ae7 100644 --- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts +++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts @@ -4,4 +4,4 @@ export declare class c1 { } export declare var instance1: c1; export declare function f1(): c1; -export declare var a2: typeof m1_c1; +export declare var a2: typeof m1.m1_c1; diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js index 482e30360fe..b514fb088e9 100644 --- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js +++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js @@ -7407,474 +7407,474 @@ var caurinus; //// [resolvingClassDeclarationWhenInBaseTypeResolution.d.ts] declare module rionegrensis { - class caniventer extends nitidus { + class caniventer extends Lanthanum.nitidus { salomonseni(): caniventer; - uchidai(): xanthognathus; - raffrayana(): otion; - Uranium(): inez, falconeri>; - nayaur(): amicus; + uchidai(): lavali.xanthognathus; + raffrayana(): lavali.otion; + Uranium(): minutus.inez, trivirgatus.falconeri>; + nayaur(): gabriellae.amicus; } - class veraecrucis extends mixtus { - naso(): setulosus>; - vancouverensis(): ciliolabrum; - africana(): gilbertii, cinereus>; - palliolata(): jugularis; - nivicola(): pallidus; + class veraecrucis extends trivirgatus.mixtus { + naso(): panamensis.setulosus>; + vancouverensis(): imperfecta.ciliolabrum; + africana(): argurus.gilbertii, sagitta.cinereus>; + palliolata(): Lanthanum.jugularis; + nivicola(): samarensis.pallidus; } } declare module julianae { class steerii { } class nudicaudus { - brandtii(): germaini; - maxwellii(): Praseodymium; - endoi(): abidi; - venezuelae(): marcanoi; - zamicrus(): caniventer; + brandtii(): argurus.germaini; + maxwellii(): ruatanica.Praseodymium; + endoi(): panglima.abidi; + venezuelae(): howi.marcanoi; + zamicrus(): rionegrensis.caniventer; } class galapagoensis { - isabellae(): amphibius; - rueppellii(): americanus; - peregusna(): kaiseri; - gliroides(): coludo; - banakrisi(): daphaenodon; - rozendaali(): foina; - stuhlmanni(): linulus; + isabellae(): panglima.amphibius; + rueppellii(): ruatanica.americanus; + peregusna(): dogramacii.kaiseri; + gliroides(): howi.coludo; + banakrisi(): macrorhinos.daphaenodon; + rozendaali(): lutreolus.foina; + stuhlmanni(): panamensis.linulus; } class albidens { - mattheyi(): fuscus>; + mattheyi(): samarensis.fuscus>; Astatine(): steerii; - vincenti(): dauricus; - hirta(): jugularis; + vincenti(): argurus.dauricus; + hirta(): Lanthanum.jugularis; virginianus(): durangae; - macrophyllum(): marcanoi; - porcellus(): americanus; + macrophyllum(): howi.marcanoi; + porcellus(): ruatanica.americanus; } - class oralis extends psilurus { - cepapi(): psilurus; - porteri(): thaeleri; - bindi(): mahaganus>; - puda(): stolzmanni; - mindorensis(): falconeri; - ignitus(): rosalia, wilsoni>; + class oralis extends caurinus.psilurus { + cepapi(): caurinus.psilurus; + porteri(): lavali.thaeleri; + bindi(): caurinus.mahaganus>; + puda(): sagitta.stolzmanni; + mindorensis(): trivirgatus.falconeri; + ignitus(): petrophilus.rosalia, lavali.wilsoni>; rufus(): nudicaudus; - monax(): subspinosus; - unalascensis(): inez, echinatus>, aurata>; - wuchihensis(): angulatus, minutilla>; - leucippe(): otion; - ordii(): arboreus; - eisentrauti(): zuluensis; + monax(): imperfecta.subspinosus; + unalascensis(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>; + wuchihensis(): howi.angulatus, petrophilus.minutilla>; + leucippe(): lavali.otion; + ordii(): daubentonii.arboreus; + eisentrauti(): rendalli.zuluensis; } - class sumatrana extends jugularis { - wolffsohni(): suillus; - geata(): hector; - awashensis(): minutilla; - sturdeei(): cor; - pachyurus(): angulatus>; - lyelli(): melanoleuca; - neohibernicus(): siberu; + class sumatrana extends Lanthanum.jugularis { + wolffsohni(): Lanthanum.suillus; + geata(): ruatanica.hector; + awashensis(): petrophilus.minutilla; + sturdeei(): lutreolus.cor; + pachyurus(): howi.angulatus>; + lyelli(): provocax.melanoleuca; + neohibernicus(): dammermani.siberu; } class gerbillus { - pundti(): sicarius; - tristrami(): minutilla; - swarthi(): foina; - horsfieldii(): falconeri; - diazi(): lasiurus; - rennelli(): luctuosa; - maulinus(): lepturus; - muscina(): arboreus; - pelengensis(): leptoceros; - abramus(): thaeleri; - reevesi(): melanoleuca; + pundti(): sagitta.sicarius; + tristrami(): petrophilus.minutilla; + swarthi(): lutreolus.foina; + horsfieldii(): trivirgatus.falconeri; + diazi(): imperfecta.lasiurus; + rennelli(): argurus.luctuosa; + maulinus(): lavali.lepturus; + muscina(): daubentonii.arboreus; + pelengensis(): sagitta.leptoceros; + abramus(): lavali.thaeleri; + reevesi(): provocax.melanoleuca; } class acariensis { - levicula(): lepturus; - minous(): dauricus; - cinereiventer(): setulosus; - longicaudatus(): marmosurus>; - baeodon(): netscheri, luctuosa>; - soricoides(): luctuosa; - datae(): arboreus>; - spixii(): subspinosus; - anakuma(): wilsoni; - kihaulei(): amphibius; - gymnura(): carolinensis; - olchonensis(): crenulata; + levicula(): lavali.lepturus; + minous(): argurus.dauricus; + cinereiventer(): panamensis.setulosus; + longicaudatus(): macrorhinos.marmosurus>; + baeodon(): argurus.netscheri, argurus.luctuosa>; + soricoides(): argurus.luctuosa; + datae(): daubentonii.arboreus>; + spixii(): imperfecta.subspinosus; + anakuma(): lavali.wilsoni; + kihaulei(): panglima.amphibius; + gymnura(): quasiater.carolinensis; + olchonensis(): rendalli.crenulata; } - class durangae extends aurata { - Californium(): setulosus; - Flerovium(): angulatus; - phrudus(): stolzmanni; + class durangae extends dogramacii.aurata { + Californium(): panamensis.setulosus; + Flerovium(): howi.angulatus; + phrudus(): sagitta.stolzmanni; } } declare module ruatanica { class hector { - humulis(): steerii; - eurycerus(): linulus, wilsoni>; + humulis(): julianae.steerii; + eurycerus(): panamensis.linulus, lavali.wilsoni>; } } declare module Lanthanum { class suillus { - spilosoma(): carolinensis; - tumbalensis(): megaphyllus; - anatolicus(): steerii; + spilosoma(): quasiater.carolinensis; + tumbalensis(): caurinus.megaphyllus; + anatolicus(): julianae.steerii; } - class nitidus extends gilbertii { - granatensis(): bobrinskoi; - negligens(): inez; - lewisi(): oralis; - arge(): sarasinorum; - dominicensis(): melanops; - taurus(): konganensis; - tonganus(): netscheri; - silvatica(): moojeni; - midas(): xanthognathus; - bicornis(): kaiseri; + class nitidus extends argurus.gilbertii { + granatensis(): quasiater.bobrinskoi; + negligens(): minutus.inez; + lewisi(): julianae.oralis; + arge(): chrysaeolus.sarasinorum; + dominicensis(): dammermani.melanops; + taurus(): macrorhinos.konganensis; + tonganus(): argurus.netscheri; + silvatica(): rendalli.moojeni; + midas(): lavali.xanthognathus; + bicornis(): dogramacii.kaiseri; } - class megalonyx extends johorensis { - phillipsii(): konganensis; - melanogaster(): veraecrucis; - elaphus(): nitidus; - elater(): lepturus; - ourebi(): melanoleuca; - caraccioli(): ciliolabrum>; - parva(): echinatus; - albipes(): wattsi; + class megalonyx extends caurinus.johorensis { + phillipsii(): macrorhinos.konganensis; + melanogaster(): rionegrensis.veraecrucis; + elaphus(): nitidus; + elater(): lavali.lepturus; + ourebi(): provocax.melanoleuca; + caraccioli(): imperfecta.ciliolabrum>; + parva(): gabriellae.echinatus; + albipes(): quasiater.wattsi; } class jugularis { - torrei(): sodyi; - revoili(): wilsoni; - macrobullatus(): daphaenodon; - compactus(): stolzmanni; - talpinus(): nitidus; - stramineus(): amicus; - dartmouthi(): mixtus; - ogilbyi(): dauricus; - incomtus(): nesiotes; - surdaster(): Praseodymium; - melanorhinus(): pelurus; - picticaudata(): inez, kaiseri>; - pomona(): steerii; - ileile(): carolinensis; + torrei(): petrophilus.sodyi; + revoili(): lavali.wilsoni; + macrobullatus(): macrorhinos.daphaenodon; + compactus(): sagitta.stolzmanni; + talpinus(): nitidus; + stramineus(): gabriellae.amicus; + dartmouthi(): trivirgatus.mixtus; + ogilbyi(): argurus.dauricus; + incomtus(): daubentonii.nesiotes; + surdaster(): ruatanica.Praseodymium; + melanorhinus(): samarensis.pelurus; + picticaudata(): minutus.inez, dogramacii.kaiseri>; + pomona(): julianae.steerii; + ileile(): quasiater.carolinensis; } } declare module rendalli { - class zuluensis extends steerii { - telfairi(): wetmorei; - keyensis(): wattsi; - occasius(): gilbertii; - damarensis(): galapagoensis; - Neptunium(): abidi; - griseoflavus(): americanus; - thar(): oreas; - alborufus(): linulus; - fusicaudus(): stolzmanni; - gordonorum(): angulatus; - ruber(): siberu; - desmarestianus(): steerii; - lutillus(): dolichurus; - salocco(): peninsulae; + class zuluensis extends julianae.steerii { + telfairi(): argurus.wetmorei; + keyensis(): quasiater.wattsi; + occasius(): argurus.gilbertii; + damarensis(): julianae.galapagoensis; + Neptunium(): panglima.abidi; + griseoflavus(): ruatanica.americanus; + thar(): argurus.oreas; + alborufus(): panamensis.linulus; + fusicaudus(): sagitta.stolzmanni; + gordonorum(): howi.angulatus; + ruber(): dammermani.siberu; + desmarestianus(): julianae.steerii; + lutillus(): nigra.dolichurus; + salocco(): argurus.peninsulae; } class moojeni { - floweri(): otion; - montosa(): ciliolabrum; - miletus(): sumatrana; + floweri(): lavali.otion; + montosa(): imperfecta.ciliolabrum; + miletus(): julianae.sumatrana; heaneyi(): zuluensis; - marchei(): amphibius>; - budini(): durangae; - maggietaylorae(): mixtus, subspinosus>, stolzmanni>; - poliocephalus(): gerbillus; - zibethicus(): inez; - biacensis(): coludo; + marchei(): panglima.amphibius>; + budini(): julianae.durangae; + maggietaylorae(): trivirgatus.mixtus, imperfecta.subspinosus>, sagitta.stolzmanni>; + poliocephalus(): julianae.gerbillus; + zibethicus(): minutus.inez; + biacensis(): howi.coludo; } - class crenulata extends falconeri { - salvanius(): coludo; - maritimus(): americanus; - edax(): cor>, caniventer>; + class crenulata extends trivirgatus.falconeri { + salvanius(): howi.coludo; + maritimus(): ruatanica.americanus; + edax(): lutreolus.cor>, rionegrensis.caniventer>; } } declare module trivirgatus { class tumidifrons { - nivalis(): kaiseri; - vestitus(): xanthognathus; - aequatorius(): caniventer; + nivalis(): dogramacii.kaiseri; + vestitus(): lavali.xanthognathus; + aequatorius(): rionegrensis.caniventer; scherman(): oconnelli; - improvisum(): peninsulae; - cervinipes(): abidi; - audax(): robustulus; - vallinus(): sicarius; + improvisum(): argurus.peninsulae; + cervinipes(): panglima.abidi; + audax(): dogramacii.robustulus; + vallinus(): sagitta.sicarius; } - class mixtus extends pygmaea> { - ochrogaster(): aurata; - bryophilus(): marmosurus>>; - liechtensteini(): zuluensis; - crawfordi(): coludo>; - hypsibia(): thaeleri; - matacus(): fundatus, beisa>, melanops>; - demidoff(): johorensis; + class mixtus extends argurus.pygmaea> { + ochrogaster(): dogramacii.aurata; + bryophilus(): macrorhinos.marmosurus>>; + liechtensteini(): rendalli.zuluensis; + crawfordi(): howi.coludo>; + hypsibia(): lavali.thaeleri; + matacus(): panglima.fundatus, lavali.beisa>, dammermani.melanops>; + demidoff(): caurinus.johorensis; } class lotor { - balensis(): pallidus; - pullata(): veraecrucis; + balensis(): samarensis.pallidus; + pullata(): rionegrensis.veraecrucis; } class falconeri { - cabrali(): moojeni>, arboreus>; - gouldi(): dolichurus>, uralensis>; - fuscicollis(): pelurus>; - martiensseni(): cinereus>, koepckeae>; - gaoligongensis(): koepckeae; - shawi(): inez>; - gmelini(): caniventer; + cabrali(): rendalli.moojeni>, daubentonii.arboreus>; + gouldi(): nigra.dolichurus>, patas.uralensis>; + fuscicollis(): samarensis.pelurus>; + martiensseni(): sagitta.cinereus>, dogramacii.koepckeae>; + gaoligongensis(): dogramacii.koepckeae; + shawi(): minutus.inez>; + gmelini(): rionegrensis.caniventer; } class oconnelli { - youngsoni(): thalia; - terrestris(): konganensis; - chrysopus(): sicarius>; - fuscomurina(): peninsulae; - hellwaldii(): gracilis, sodyi>; - aenea(): luctuosa; - perrini(): bobrinskoi; - entellus(): melanops; - krebsii(): veraecrucis; - cephalotes(): schlegeli; - molossinus(): nigricans>; - luisi(): robustulus; - ceylonicus(): caniventer; - ralli(): xanthognathus; + youngsoni(): nigra.thalia; + terrestris(): macrorhinos.konganensis; + chrysopus(): sagitta.sicarius>; + fuscomurina(): argurus.peninsulae; + hellwaldii(): nigra.gracilis, petrophilus.sodyi>; + aenea(): argurus.luctuosa; + perrini(): quasiater.bobrinskoi; + entellus(): dammermani.melanops; + krebsii(): rionegrensis.veraecrucis; + cephalotes(): lutreolus.schlegeli; + molossinus(): daubentonii.nigricans>; + luisi(): dogramacii.robustulus; + ceylonicus(): rionegrensis.caniventer; + ralli(): lavali.xanthognathus; } } declare module quasiater { class bobrinskoi { - crassicaudatus(): cahirinus; - mulatta(): oreas; - ansorgei(): moojeni, echinatus>; - Copper(): netscheri; + crassicaudatus(): samarensis.cahirinus; + mulatta(): argurus.oreas; + ansorgei(): rendalli.moojeni, gabriellae.echinatus>; + Copper(): argurus.netscheri; } } declare module ruatanica { - class americanus extends ciliolabrum { - nasoloi(): konganensis; - mystacalis(): angulatus; - fardoulisi(): oconnelli; - tumidus(): amicus; + class americanus extends imperfecta.ciliolabrum { + nasoloi(): macrorhinos.konganensis; + mystacalis(): howi.angulatus; + fardoulisi(): trivirgatus.oconnelli; + tumidus(): gabriellae.amicus; } } declare module lavali { - class wilsoni extends nitidus { - setiger(): thalia; - lorentzii(): subspinosus; - antisensis(): foina; - blossevillii(): siberu; - bontanus(): caniventer; - caligata(): oreas; - franqueti(): amphibius, subspinosus>; - roberti(): acariensis; - degelidus(): sarasinorum; - amoenus(): carolinensis; - kob(): lotor; - csorbai(): johorensis; - dorsata(): echinatus; + class wilsoni extends Lanthanum.nitidus { + setiger(): nigra.thalia; + lorentzii(): imperfecta.subspinosus; + antisensis(): lutreolus.foina; + blossevillii(): dammermani.siberu; + bontanus(): rionegrensis.caniventer; + caligata(): argurus.oreas; + franqueti(): panglima.amphibius, imperfecta.subspinosus>; + roberti(): julianae.acariensis; + degelidus(): chrysaeolus.sarasinorum; + amoenus(): quasiater.carolinensis; + kob(): trivirgatus.lotor; + csorbai(): caurinus.johorensis; + dorsata(): gabriellae.echinatus; } class beisa { } - class otion extends coludo { - bonaerensis(): melanoleuca; - dussumieri(): gracilis; - osvaldoreigi(): albidens; - grevyi(): pallidus; + class otion extends howi.coludo { + bonaerensis(): provocax.melanoleuca; + dussumieri(): nigra.gracilis; + osvaldoreigi(): julianae.albidens; + grevyi(): samarensis.pallidus; hirtula(): lepturus; - cristatus(): luctuosa; - darlingtoni(): leptoceros; - fontanierii(): setulosus>, foina>; - umbrosus(): marcanoi; - chiriquinus(): lasiurus; - orarius(): schlegeli; - ilaeus(): mahaganus; - musschenbroekii(): falconeri; + cristatus(): argurus.luctuosa; + darlingtoni(): sagitta.leptoceros; + fontanierii(): panamensis.setulosus>, lutreolus.foina>; + umbrosus(): howi.marcanoi; + chiriquinus(): imperfecta.lasiurus; + orarius(): lutreolus.schlegeli; + ilaeus(): caurinus.mahaganus; + musschenbroekii(): trivirgatus.falconeri; } class xanthognathus { - nanulus(): nigricans; - albigena(): sarasinorum; - onca(): stolzmanni; - gunnii(): himalayana, thalia>; - apeco(): foina; - variegates(): klossii; - goudotii(): falconeri; - pohlei(): megalonyx; - ineptus(): setulosus; - euryotis(): moojeni>; - maurisca(): suillus; - coyhaiquensis(): mahaganus, abidi>, punicus>; + nanulus(): daubentonii.nigricans; + albigena(): chrysaeolus.sarasinorum; + onca(): sagitta.stolzmanni; + gunnii(): minutus.himalayana, nigra.thalia>; + apeco(): lutreolus.foina; + variegates(): gabriellae.klossii; + goudotii(): trivirgatus.falconeri; + pohlei(): Lanthanum.megalonyx; + ineptus(): panamensis.setulosus; + euryotis(): rendalli.moojeni>; + maurisca(): Lanthanum.suillus; + coyhaiquensis(): caurinus.mahaganus, panglima.abidi>, lutreolus.punicus>; } - class thaeleri extends oreas { - coromandra(): galapagoensis; - parvipes(): dolichurus; - sponsorius(): veraecrucis, steerii>; - vates(): robustulus; - roosmalenorum(): koepckeae; - rubicola(): moojeni, echinatus>>; - ikonnikovi(): luctuosa; - paramicrus(): ciliolabrum>; + class thaeleri extends argurus.oreas { + coromandra(): julianae.galapagoensis; + parvipes(): nigra.dolichurus; + sponsorius(): rionegrensis.veraecrucis, julianae.steerii>; + vates(): dogramacii.robustulus; + roosmalenorum(): dogramacii.koepckeae; + rubicola(): rendalli.moojeni, gabriellae.echinatus>>; + ikonnikovi(): argurus.luctuosa; + paramicrus(): imperfecta.ciliolabrum>; } - class lepturus extends suillus { - ferrumequinum(): netscheri; - aequalis(): cinereus>, minutilla>, jugularis>; + class lepturus extends Lanthanum.suillus { + ferrumequinum(): argurus.netscheri; + aequalis(): sagitta.cinereus>, petrophilus.minutilla>, Lanthanum.jugularis>; } } declare module dogramacii { - class robustulus extends wilsoni { - fossor(): inez; - humboldti(): cinereus; - mexicana(): konganensis; - martini(): oralis; - beatus(): jugularis; - leporina(): falconeri; - pearsonii(): melanops; - keaysi(): angulatus; - hindei(): lasiurus; + class robustulus extends lavali.wilsoni { + fossor(): minutus.inez; + humboldti(): sagitta.cinereus; + mexicana(): macrorhinos.konganensis; + martini(): julianae.oralis; + beatus(): Lanthanum.jugularis; + leporina(): trivirgatus.falconeri; + pearsonii(): dammermani.melanops; + keaysi(): howi.angulatus; + hindei(): imperfecta.lasiurus; } class koepckeae { - culturatus(): pelurus, sumatrana>; + culturatus(): samarensis.pelurus, julianae.sumatrana>; } class kaiseri { - bedfordiae(): carolinensis; - paramorum(): megalonyx; - rubidus(): lotor; - juninensis(): bobrinskoi; - marginata(): wetmorei>>; - Meitnerium(): Praseodymium>; - pinetorum(): caniventer; - hoolock(): pelurus; - poeyi(): echinatus; - Thulium(): durangae; - patrius(): jugularis; - quadraticauda(): nudicaudus; - ater(): americanus; + bedfordiae(): quasiater.carolinensis; + paramorum(): Lanthanum.megalonyx; + rubidus(): trivirgatus.lotor; + juninensis(): quasiater.bobrinskoi; + marginata(): argurus.wetmorei>>; + Meitnerium(): ruatanica.Praseodymium>; + pinetorum(): rionegrensis.caniventer; + hoolock(): samarensis.pelurus; + poeyi(): gabriellae.echinatus; + Thulium(): julianae.durangae; + patrius(): Lanthanum.jugularis; + quadraticauda(): julianae.nudicaudus; + ater(): ruatanica.americanus; } class aurata { - grunniens(): gracilis, sumatrana>, americanus>; - howensis(): americanus; - karlkoopmani(): psilurus; - mirapitanga(): albidens; + grunniens(): nigra.gracilis, julianae.sumatrana>, ruatanica.americanus>; + howensis(): ruatanica.americanus; + karlkoopmani(): caurinus.psilurus; + mirapitanga(): julianae.albidens; ophiodon(): aurata; - landeri(): pelurus; - sonomae(): lotor, koepckeae>; - erythromos(): johorensis, dolichurus>; + landeri(): samarensis.pelurus; + sonomae(): trivirgatus.lotor, koepckeae>; + erythromos(): caurinus.johorensis, nigra.dolichurus>; } } declare module lutreolus { - class schlegeli extends beisa { - mittendorfi(): caniventer; - blicki(): robustulus; - culionensis(): dauricus; - scrofa(): sodyi; - fernandoni(): carolinensis; - Tin(): leptoceros>; - marmorata(): setulosus>; - tavaratra(): nitidus; - peregrina(): nesiotes; - frontalis(): marmosurus>, pallidus>; - cuniculus(): uralensis; - magdalenae(): gerbillus>; - andamanensis(): oralis; - dispar(): linulus; + class schlegeli extends lavali.beisa { + mittendorfi(): rionegrensis.caniventer; + blicki(): dogramacii.robustulus; + culionensis(): argurus.dauricus; + scrofa(): petrophilus.sodyi; + fernandoni(): quasiater.carolinensis; + Tin(): sagitta.leptoceros>; + marmorata(): panamensis.setulosus>; + tavaratra(): Lanthanum.nitidus; + peregrina(): daubentonii.nesiotes; + frontalis(): macrorhinos.marmosurus>, samarensis.pallidus>; + cuniculus(): patas.uralensis; + magdalenae(): julianae.gerbillus>; + andamanensis(): julianae.oralis; + dispar(): panamensis.linulus; } } declare module argurus { class dauricus { - chinensis(): jugularis; - duodecimcostatus(): xanthognathus; - foxi(): nesiotes; - macleayii(): sodyi>, minutilla>; - darienensis(): oconnelli; - hardwickii(): daphaenodon; - albifrons(): veraecrucis; - jacobitus(): johorensis>>; - guentheri(): moojeni; - mahomet(): ciliolabrum; - misionensis(): marmosurus, echinatus>; + chinensis(): Lanthanum.jugularis; + duodecimcostatus(): lavali.xanthognathus; + foxi(): daubentonii.nesiotes; + macleayii(): petrophilus.sodyi>, petrophilus.minutilla>; + darienensis(): trivirgatus.oconnelli; + hardwickii(): macrorhinos.daphaenodon; + albifrons(): rionegrensis.veraecrucis; + jacobitus(): caurinus.johorensis>>; + guentheri(): rendalli.moojeni; + mahomet(): imperfecta.ciliolabrum; + misionensis(): macrorhinos.marmosurus, gabriellae.echinatus>; } } declare module nigra { class dolichurus { - solomonis(): abidi, netscheri, oralis>>>; - alfredi(): psilurus; - morrisi(): hector, wattsi>>>; - lekaguli(): nitidus; - dimissus(): subspinosus; - phaeotis(): sumatrana; - ustus(): acariensis; - sagei(): marcanoi; + solomonis(): panglima.abidi, argurus.netscheri, julianae.oralis>>>; + alfredi(): caurinus.psilurus; + morrisi(): ruatanica.hector, quasiater.wattsi>>>; + lekaguli(): Lanthanum.nitidus; + dimissus(): imperfecta.subspinosus; + phaeotis(): julianae.sumatrana; + ustus(): julianae.acariensis; + sagei(): howi.marcanoi; } } declare module panglima { - class amphibius extends johorensis, jugularis> { - bottegi(): marmosurus, echinatus>, stolzmanni>; - jerdoni(): daphaenodon; - camtschatica(): pallidus; - spadix(): sodyi; - luismanueli(): moojeni; - aceramarcae(): arboreus; + class amphibius extends caurinus.johorensis, Lanthanum.jugularis> { + bottegi(): macrorhinos.marmosurus, gabriellae.echinatus>, sagitta.stolzmanni>; + jerdoni(): macrorhinos.daphaenodon; + camtschatica(): samarensis.pallidus; + spadix(): petrophilus.sodyi; + luismanueli(): rendalli.moojeni; + aceramarcae(): daubentonii.arboreus; } - class fundatus extends schlegeli { - crassulus(): gracilis; - flamarioni(): lasiurus>, leptoceros>>; - mirabilis(): marmosurus, lepturus>; + class fundatus extends lutreolus.schlegeli { + crassulus(): nigra.gracilis; + flamarioni(): imperfecta.lasiurus>, sagitta.leptoceros>>; + mirabilis(): macrorhinos.marmosurus, lavali.lepturus>; } - class abidi extends dauricus { - greyii(): oconnelli; - macedonicus(): minutilla; - galili(): cahirinus; - thierryi(): robustulus; - ega(): lasiurus>; + class abidi extends argurus.dauricus { + greyii(): trivirgatus.oconnelli; + macedonicus(): petrophilus.minutilla; + galili(): samarensis.cahirinus; + thierryi(): dogramacii.robustulus; + ega(): imperfecta.lasiurus>; } } declare module quasiater { class carolinensis { - concinna(): zuluensis; - aeneus(): marcanoi; - aloysiisabaudiae(): netscheri, lepturus>; - tenellus(): nudicaudus; - andium(): beisa; - persephone(): fundatus; - patrizii(): megalonyx; + concinna(): rendalli.zuluensis; + aeneus(): howi.marcanoi; + aloysiisabaudiae(): argurus.netscheri, lavali.lepturus>; + tenellus(): julianae.nudicaudus; + andium(): lavali.beisa; + persephone(): panglima.fundatus; + patrizii(): Lanthanum.megalonyx; } } declare module minutus { - class himalayana extends punicus { - simoni(): netscheri>; - lobata(): pallidus; - rusticus(): aurata; - latona(): nesiotes; - famulus(): uralensis; - flaviceps(): inez>; - paradoxolophus(): dolichurus>; - Osmium(): wilsoni; - vulgaris(): nitidus; - betsileoensis(): amphibius; - vespuccii(): gilbertii, melanoleuca>; - olympus(): megalonyx; + class himalayana extends lutreolus.punicus { + simoni(): argurus.netscheri>; + lobata(): samarensis.pallidus; + rusticus(): dogramacii.aurata; + latona(): daubentonii.nesiotes; + famulus(): patas.uralensis; + flaviceps(): inez>; + paradoxolophus(): nigra.dolichurus>; + Osmium(): lavali.wilsoni; + vulgaris(): Lanthanum.nitidus; + betsileoensis(): panglima.amphibius; + vespuccii(): argurus.gilbertii, provocax.melanoleuca>; + olympus(): Lanthanum.megalonyx; } } declare module caurinus { - class mahaganus extends fundatus { - martiniquensis(): hector>>; - devius(): pelurus, falconeri>>; - masalai(): oreas; - kathleenae(): dolichurus; - simulus(): echinatus; - nigrovittatus(): mahaganus>>; - senegalensis(): klossii, melanops>; - acticola(): luctuosa; + class mahaganus extends panglima.fundatus { + martiniquensis(): ruatanica.hector>>; + devius(): samarensis.pelurus, trivirgatus.falconeri>>; + masalai(): argurus.oreas; + kathleenae(): nigra.dolichurus; + simulus(): gabriellae.echinatus; + nigrovittatus(): mahaganus>>; + senegalensis(): gabriellae.klossii, dammermani.melanops>; + acticola(): argurus.luctuosa; } } declare module macrorhinos { class marmosurus { - tansaniana(): punicus; + tansaniana(): lutreolus.punicus; } } declare module howi { - class angulatus extends stolzmanni { + class angulatus extends sagitta.stolzmanni { pennatus(): marcanoi; } } @@ -7884,118 +7884,118 @@ declare module daubentonii { } declare module nigra { class thalia { - dichotomus(): carolinensis; - arnuxii(): linulus, beisa>; - verheyeni(): xanthognathus; - dauuricus(): amicus; - tristriatus(): veraecrucis>; - lasiura(): abidi>, nitidus>; - gangetica(): luctuosa; - brucei(): sarasinorum; + dichotomus(): quasiater.carolinensis; + arnuxii(): panamensis.linulus, lavali.beisa>; + verheyeni(): lavali.xanthognathus; + dauuricus(): gabriellae.amicus; + tristriatus(): rionegrensis.veraecrucis>; + lasiura(): panglima.abidi>, Lanthanum.nitidus>; + gangetica(): argurus.luctuosa; + brucei(): chrysaeolus.sarasinorum; } } declare module sagitta { - class walkeri extends portoricensis { - maracajuensis(): cahirinus; + class walkeri extends minutus.portoricensis { + maracajuensis(): samarensis.cahirinus; } } declare module minutus { - class inez extends pelurus { - vexillaris(): cahirinus; + class inez extends samarensis.pelurus { + vexillaris(): samarensis.cahirinus; } } declare module macrorhinos { - class konganensis extends lasiurus { + class konganensis extends imperfecta.lasiurus { } } declare module panamensis { - class linulus extends hector> { - goslingi(): arboreus; - taki(): uralensis; - fumosus(): moojeni, beisa>; - rufinus(): konganensis; - lami(): thalia; - regina(): oconnelli; - nanilla(): siberu; - enganus(): sodyi; - gomantongensis(): veraecrucis>; + class linulus extends ruatanica.hector> { + goslingi(): daubentonii.arboreus; + taki(): patas.uralensis; + fumosus(): rendalli.moojeni, lavali.beisa>; + rufinus(): macrorhinos.konganensis; + lami(): nigra.thalia; + regina(): trivirgatus.oconnelli; + nanilla(): dammermani.siberu; + enganus(): petrophilus.sodyi; + gomantongensis(): rionegrensis.veraecrucis>; } } declare module nigra { class gracilis { - weddellii(): dolichurus; - echinothrix(): nitidus, oreas>; - garridoi(): koepckeae; - rouxii(): gracilis, thalia>; - aurita(): stolzmanni; - geoffrensis(): caniventer; - theresa(): marmosurus, luctuosa>, dolichurus>; - melanocarpus(): albidens, sumatrana>; - dubiaquercus(): robustulus; - pectoralis(): sumatrana; - apoensis(): megaphyllus; - grisescens(): jugularis; - ramirohitra(): amphibius; + weddellii(): dolichurus; + echinothrix(): Lanthanum.nitidus, argurus.oreas>; + garridoi(): dogramacii.koepckeae; + rouxii(): gracilis, thalia>; + aurita(): sagitta.stolzmanni; + geoffrensis(): rionegrensis.caniventer; + theresa(): macrorhinos.marmosurus, argurus.luctuosa>, dolichurus>; + melanocarpus(): julianae.albidens, julianae.sumatrana>; + dubiaquercus(): dogramacii.robustulus; + pectoralis(): julianae.sumatrana; + apoensis(): caurinus.megaphyllus; + grisescens(): Lanthanum.jugularis; + ramirohitra(): panglima.amphibius; } } declare module samarensis { - class pelurus extends stolzmanni { - Palladium(): linulus; - castanea(): netscheri, oralis>; - chamek(): pygmaea; - nigriceps(): punicus; - lunatus(): pelurus; - madurae(): caniventer; - chinchilla(): daphaenodon; - eliasi(): rosalia; - proditor(): setulosus; - gambianus(): wattsi>; - petteri(): kaiseri; - nusatenggara(): amphibius; - olitor(): veraecrucis; + class pelurus extends sagitta.stolzmanni { + Palladium(): panamensis.linulus; + castanea(): argurus.netscheri, julianae.oralis>; + chamek(): argurus.pygmaea; + nigriceps(): lutreolus.punicus; + lunatus(): pelurus; + madurae(): rionegrensis.caniventer; + chinchilla(): macrorhinos.daphaenodon; + eliasi(): petrophilus.rosalia; + proditor(): panamensis.setulosus; + gambianus(): quasiater.wattsi>; + petteri(): dogramacii.kaiseri; + nusatenggara(): panglima.amphibius; + olitor(): rionegrensis.veraecrucis; } - class fuscus extends daphaenodon { - planifrons(): gracilis; - badia(): sumatrana; - prymnolopha(): walkeri; - natalensis(): falconeri; - hunteri(): durangae; + class fuscus extends macrorhinos.daphaenodon { + planifrons(): nigra.gracilis; + badia(): julianae.sumatrana; + prymnolopha(): sagitta.walkeri; + natalensis(): trivirgatus.falconeri; + hunteri(): julianae.durangae; sapiens(): pallidus; - macrocercus(): setulosus; - nimbae(): punicus; - suricatta(): nigricans; - jagorii(): galapagoensis; - beecrofti(): stolzmanni; - imaizumii(): inez, echinatus>, aurata>, otion>, konganensis>; - colocolo(): bobrinskoi; - wolfi(): rosalia>; + macrocercus(): panamensis.setulosus; + nimbae(): lutreolus.punicus; + suricatta(): daubentonii.nigricans; + jagorii(): julianae.galapagoensis; + beecrofti(): sagitta.stolzmanni; + imaizumii(): minutus.inez, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; + colocolo(): quasiater.bobrinskoi; + wolfi(): petrophilus.rosalia>; } class pallidus { - oblativa(): falconeri; - watersi(): wilsoni; - glacialis(): cinereus, wattsi>>; - viaria(): sarasinorum; + oblativa(): trivirgatus.falconeri; + watersi(): lavali.wilsoni; + glacialis(): sagitta.cinereus, quasiater.wattsi>>; + viaria(): chrysaeolus.sarasinorum; } class cahirinus { - alashanicus(): caucasica; - flaviventer(): tumidifrons>; - bottai(): schlegeli; - pinetis(): oreas; - saussurei(): crenulata, netscheri, oralis>>; + alashanicus(): nigra.caucasica; + flaviventer(): trivirgatus.tumidifrons>; + bottai(): lutreolus.schlegeli; + pinetis(): argurus.oreas; + saussurei(): rendalli.crenulata, argurus.netscheri, julianae.oralis>>; } } declare module sagitta { - class leptoceros extends johorensis> { - victus(): caniventer; - hoplomyoides(): fundatus, gracilis>; - gratiosus(): lepturus; - rex(): wilsoni; - bolami(): tumidifrons; + class leptoceros extends caurinus.johorensis> { + victus(): rionegrensis.caniventer; + hoplomyoides(): panglima.fundatus, nigra.gracilis>; + gratiosus(): lavali.lepturus; + rex(): lavali.wilsoni; + bolami(): trivirgatus.tumidifrons; } } declare module daubentonii { - class nigricans extends stolzmanni { - woosnami(): robustulus; + class nigricans extends sagitta.stolzmanni { + woosnami(): dogramacii.robustulus; } } declare module dammermani { @@ -8003,123 +8003,123 @@ declare module dammermani { } } declare module argurus { - class pygmaea extends moojeni { - pajeros(): echinatus; - capucinus(): zuluensis; - cuvieri(): caniventer; + class pygmaea extends rendalli.moojeni { + pajeros(): gabriellae.echinatus; + capucinus(): rendalli.zuluensis; + cuvieri(): rionegrensis.caniventer; } } declare module chrysaeolus { - class sarasinorum extends psilurus { - belzebul(): pallidus; - hinpoon(): caucasica; - kandti(): wattsi; - cynosuros(): melanops; - Germanium(): beisa; - Ununoctium(): gracilis; - princeps(): portoricensis; + class sarasinorum extends caurinus.psilurus { + belzebul(): samarensis.pallidus; + hinpoon(): nigra.caucasica; + kandti(): quasiater.wattsi; + cynosuros(): dammermani.melanops; + Germanium(): lavali.beisa; + Ununoctium(): nigra.gracilis; + princeps(): minutus.portoricensis; } } declare module argurus { class wetmorei { - leucoptera(): rosalia; - ochraventer(): walkeri; - tephromelas(): jugularis; - cracens(): gilbertii; - jamaicensis(): thalia>; - gymnocaudus(): aurata; - mayori(): stolzmanni; + leucoptera(): petrophilus.rosalia; + ochraventer(): sagitta.walkeri; + tephromelas(): Lanthanum.jugularis; + cracens(): gilbertii; + jamaicensis(): nigra.thalia>; + gymnocaudus(): dogramacii.aurata; + mayori(): sagitta.stolzmanni; } } declare module argurus { - class oreas extends wilsoni { - salamonis(): xanthognathus; - paniscus(): Praseodymium; - fagani(): oconnelli; - papuanus(): fundatus; - timidus(): melanops; - nghetinhensis(): klossii; - barbei(): cahirinus; + class oreas extends lavali.wilsoni { + salamonis(): lavali.xanthognathus; + paniscus(): ruatanica.Praseodymium; + fagani(): trivirgatus.oconnelli; + papuanus(): panglima.fundatus; + timidus(): dammermani.melanops; + nghetinhensis(): gabriellae.klossii; + barbei(): samarensis.cahirinus; univittatus(): peninsulae; } } declare module daubentonii { class arboreus { - capreolus(): crenulata, wilsoni>; - moreni(): abidi; - hypoleucos(): gracilis; - paedulcus(): portoricensis; - pucheranii(): fuscus; - stella(): oralis; - brasiliensis(): subspinosus; - brevicaudata(): oconnelli; - vitticollis(): koepckeae; - huangensis(): psilurus; - cameroni(): rosalia, ciliolabrum>, psilurus>; - tianshanica(): marcanoi; + capreolus(): rendalli.crenulata, lavali.wilsoni>; + moreni(): panglima.abidi; + hypoleucos(): nigra.gracilis; + paedulcus(): minutus.portoricensis; + pucheranii(): samarensis.fuscus; + stella(): julianae.oralis; + brasiliensis(): imperfecta.subspinosus; + brevicaudata(): trivirgatus.oconnelli; + vitticollis(): dogramacii.koepckeae; + huangensis(): caurinus.psilurus; + cameroni(): petrophilus.rosalia, imperfecta.ciliolabrum>, caurinus.psilurus>; + tianshanica(): howi.marcanoi; } } declare module patas { class uralensis { - cartilagonodus(): nitidus; - pyrrhinus(): beisa; - insulans(): jugularis; - nigricauda(): johorensis, jugularis>; - muricauda(): fundatus>; - albicaudus(): stolzmanni; - fallax(): hector; - attenuata(): marmosurus>; - megalura(): marcanoi; - neblina(): pelurus; - citellus(): arboreus; - tanezumi(): lasiurus; - albiventer(): crenulata; + cartilagonodus(): Lanthanum.nitidus; + pyrrhinus(): lavali.beisa; + insulans(): Lanthanum.jugularis; + nigricauda(): caurinus.johorensis, Lanthanum.jugularis>; + muricauda(): panglima.fundatus>; + albicaudus(): sagitta.stolzmanni; + fallax(): ruatanica.hector; + attenuata(): macrorhinos.marmosurus>; + megalura(): howi.marcanoi; + neblina(): samarensis.pelurus; + citellus(): daubentonii.arboreus; + tanezumi(): imperfecta.lasiurus; + albiventer(): rendalli.crenulata; } } declare module provocax { - class melanoleuca extends wilsoni { - Neodymium(): marmosurus, foina>; - baeri(): lasiurus; + class melanoleuca extends lavali.wilsoni { + Neodymium(): macrorhinos.marmosurus, lutreolus.foina>; + baeri(): imperfecta.lasiurus; } } declare module sagitta { class sicarius { - Chlorine(): cahirinus, robustulus>; - simulator(): marmosurus, marmosurus, echinatus>, stolzmanni>>; + Chlorine(): samarensis.cahirinus, dogramacii.robustulus>; + simulator(): macrorhinos.marmosurus, macrorhinos.marmosurus, gabriellae.echinatus>, stolzmanni>>; } } declare module howi { - class marcanoi extends megalonyx { - formosae(): megalonyx; - dudui(): punicus; - leander(): nesiotes; - martinsi(): aurata; - beatrix(): ciliolabrum, echinatus>, aurata>, ciliolabrum>>; - griseoventer(): oreas; - zerda(): wattsi, coludo>>; - yucatanicus(): nudicaudus; - nigrita(): peninsulae; - jouvenetae(): dauricus; - indefessus(): walkeri; - vuquangensis(): daphaenodon; - Zirconium(): thaeleri; - hyaena(): oralis; + class marcanoi extends Lanthanum.megalonyx { + formosae(): Lanthanum.megalonyx; + dudui(): lutreolus.punicus; + leander(): daubentonii.nesiotes; + martinsi(): dogramacii.aurata; + beatrix(): imperfecta.ciliolabrum, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>>; + griseoventer(): argurus.oreas; + zerda(): quasiater.wattsi, coludo>>; + yucatanicus(): julianae.nudicaudus; + nigrita(): argurus.peninsulae; + jouvenetae(): argurus.dauricus; + indefessus(): sagitta.walkeri; + vuquangensis(): macrorhinos.daphaenodon; + Zirconium(): lavali.thaeleri; + hyaena(): julianae.oralis; } } declare module argurus { class gilbertii { - nasutus(): lepturus; - poecilops(): steerii; - sondaicus(): fuscus; - auriventer(): rosalia; - cherriei(): Praseodymium; - lindberghi(): inez; - pipistrellus(): carolinensis; - paranus(): punicus; - dubosti(): thalia; - opossum(): dolichurus; - oreopolus(): portoricensis; - amurensis(): arboreus; + nasutus(): lavali.lepturus; + poecilops(): julianae.steerii; + sondaicus(): samarensis.fuscus; + auriventer(): petrophilus.rosalia; + cherriei(): ruatanica.Praseodymium; + lindberghi(): minutus.inez; + pipistrellus(): quasiater.carolinensis; + paranus(): lutreolus.punicus; + dubosti(): nigra.thalia; + opossum(): nigra.dolichurus; + oreopolus(): minutus.portoricensis; + amurensis(): daubentonii.arboreus; } } declare module petrophilus { @@ -8128,45 +8128,45 @@ declare module petrophilus { } declare module lutreolus { class punicus { - strandi(): klossii; - lar(): mahaganus; - erica(): koepckeae; - trichura(): konganensis; - lemniscatus(): fundatus; - aspalax(): linulus; - marshalli(): nudicaudus; - Zinc(): galapagoensis; - monochromos(): coludo; - purinus(): hector; - ischyrus(): lepturus; - tenuis(): daphaenodon; - Helium(): acariensis; + strandi(): gabriellae.klossii; + lar(): caurinus.mahaganus; + erica(): dogramacii.koepckeae; + trichura(): macrorhinos.konganensis; + lemniscatus(): panglima.fundatus; + aspalax(): panamensis.linulus; + marshalli(): julianae.nudicaudus; + Zinc(): julianae.galapagoensis; + monochromos(): howi.coludo; + purinus(): ruatanica.hector; + ischyrus(): lavali.lepturus; + tenuis(): macrorhinos.daphaenodon; + Helium(): julianae.acariensis; } } declare module macrorhinos { class daphaenodon { - bredanensis(): sumatrana; - othus(): coludo; - hammondi(): gerbillus, echinatus>, aurata>, otion>; - aureocollaris(): carolinensis; - flavipes(): minutilla; - callosus(): lotor; + bredanensis(): julianae.sumatrana; + othus(): howi.coludo; + hammondi(): julianae.gerbillus, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; + aureocollaris(): quasiater.carolinensis; + flavipes(): petrophilus.minutilla; + callosus(): trivirgatus.lotor; } } declare module sagitta { class cinereus { - zunigae(): crenulata>; - microps(): nigricans>; - guaporensis(): arboreus; - tonkeana(): fundatus; - montensis(): siberu; - sphinx(): portoricensis; - glis(): wetmorei; - dorsalis(): sodyi; - fimbriatus(): melanoleuca; - sara(): gracilis; + zunigae(): rendalli.crenulata>; + microps(): daubentonii.nigricans>; + guaporensis(): daubentonii.arboreus; + tonkeana(): panglima.fundatus; + montensis(): dammermani.siberu; + sphinx(): minutus.portoricensis; + glis(): argurus.wetmorei; + dorsalis(): petrophilus.sodyi; + fimbriatus(): provocax.melanoleuca; + sara(): nigra.gracilis; epimelas(): stolzmanni; - pittieri(): fuscus; + pittieri(): samarensis.fuscus; } } declare module nigra { @@ -8174,253 +8174,253 @@ declare module nigra { } } declare module gabriellae { - class klossii extends lasiurus { + class klossii extends imperfecta.lasiurus { } class amicus { - pirrensis(): luctuosa; - phaeura(): abidi; - voratus(): thaeleri; - satarae(): lotor; - hooperi(): psilurus; - perrensi(): crenulata; - ridei(): hector>; - audeberti(): arboreus; - Lutetium(): marmosurus; - atrox(): fuscus, koepckeae>; + pirrensis(): argurus.luctuosa; + phaeura(): panglima.abidi; + voratus(): lavali.thaeleri; + satarae(): trivirgatus.lotor; + hooperi(): caurinus.psilurus; + perrensi(): rendalli.crenulata; + ridei(): ruatanica.hector>; + audeberti(): daubentonii.arboreus; + Lutetium(): macrorhinos.marmosurus; + atrox(): samarensis.fuscus, dogramacii.koepckeae>; } class echinatus { - tenuipes(): coludo>; + tenuipes(): howi.coludo>; } } declare module imperfecta { class lasiurus { - marisae(): thaeleri; - fulvus(): germaini; - paranaensis(): koepckeae; - didactylus(): abidi>; - schreibersii(): gracilis; - orii(): kaiseri; + marisae(): lavali.thaeleri; + fulvus(): argurus.germaini; + paranaensis(): dogramacii.koepckeae; + didactylus(): panglima.abidi>; + schreibersii(): nigra.gracilis; + orii(): dogramacii.kaiseri; } class subspinosus { - monticularis(): konganensis; - Gadolinium(): caucasica; - oasicus(): johorensis>; - paterculus(): punicus; - punctata(): thaeleri; - invictus(): stolzmanni; - stangeri(): minutilla; - siskiyou(): inez; - welwitschii(): caniventer; - Polonium(): wilsoni; - harpia(): luctuosa; + monticularis(): macrorhinos.konganensis; + Gadolinium(): nigra.caucasica; + oasicus(): caurinus.johorensis>; + paterculus(): lutreolus.punicus; + punctata(): lavali.thaeleri; + invictus(): sagitta.stolzmanni; + stangeri(): petrophilus.minutilla; + siskiyou(): minutus.inez; + welwitschii(): rionegrensis.caniventer; + Polonium(): lavali.wilsoni; + harpia(): argurus.luctuosa; } - class ciliolabrum extends robustulus { - leschenaultii(): dauricus>; - ludia(): johorensis; - sinicus(): marmosurus; + class ciliolabrum extends dogramacii.robustulus { + leschenaultii(): argurus.dauricus>; + ludia(): caurinus.johorensis; + sinicus(): macrorhinos.marmosurus; } } declare module quasiater { class wattsi { - lagotis(): xanthognathus; - hussoni(): wilsoni; - bilarni(): cahirinus>, koepckeae>; - cabrerae(): lepturus; + lagotis(): lavali.xanthognathus; + hussoni(): lavali.wilsoni; + bilarni(): samarensis.cahirinus>, dogramacii.koepckeae>; + cabrerae(): lavali.lepturus; } } declare module butleri { } declare module petrophilus { - class sodyi extends bobrinskoi { - saundersiae(): pallidus; - imberbis(): carolinensis; - cansdalei(): melanops; - Lawrencium(): dolichurus; - catta(): oreas; - breviceps(): dauricus; - transitionalis(): zuluensis; - heptneri(): germaini; - bairdii(): beisa; + class sodyi extends quasiater.bobrinskoi { + saundersiae(): samarensis.pallidus; + imberbis(): quasiater.carolinensis; + cansdalei(): dammermani.melanops; + Lawrencium(): nigra.dolichurus; + catta(): argurus.oreas; + breviceps(): argurus.dauricus; + transitionalis(): rendalli.zuluensis; + heptneri(): argurus.germaini; + bairdii(): lavali.beisa; } } declare module caurinus { - class megaphyllus extends lasiurus> { - montana(): oreas; - amatus(): schlegeli; - bucculentus(): echinatus; - lepida(): crenulata>; - graecus(): kaiseri; - forsteri(): minutilla; - perotensis(): cahirinus; - cirrhosus(): carolinensis; + class megaphyllus extends imperfecta.lasiurus> { + montana(): argurus.oreas; + amatus(): lutreolus.schlegeli; + bucculentus(): gabriellae.echinatus; + lepida(): rendalli.crenulata>; + graecus(): dogramacii.kaiseri; + forsteri(): petrophilus.minutilla; + perotensis(): samarensis.cahirinus; + cirrhosus(): quasiater.carolinensis; } } declare module minutus { class portoricensis { - relictus(): carolinensis; - aequatorianus(): klossii; - rhinogradoides(): cahirinus; + relictus(): quasiater.carolinensis; + aequatorianus(): gabriellae.klossii; + rhinogradoides(): samarensis.cahirinus; } } declare module lutreolus { class foina { tarfayensis(): punicus; - Promethium(): pelurus; - salinae(): klossii; - kerri(): coludo; - scotti(): wattsi; - camerunensis(): gerbillus; - affinis(): germaini; - siebersi(): lotor>; - maquassiensis(): oconnelli; - layardi(): albidens; - bishopi(): aurata; - apodemoides(): psilurus; - argentiventer(): mixtus; + Promethium(): samarensis.pelurus; + salinae(): gabriellae.klossii; + kerri(): howi.coludo; + scotti(): quasiater.wattsi; + camerunensis(): julianae.gerbillus; + affinis(): argurus.germaini; + siebersi(): trivirgatus.lotor>; + maquassiensis(): trivirgatus.oconnelli; + layardi(): julianae.albidens; + bishopi(): dogramacii.aurata; + apodemoides(): caurinus.psilurus; + argentiventer(): trivirgatus.mixtus; } } declare module lutreolus { - class cor extends fundatus, beisa>, melanops> { - antinorii(): sodyi; - voi(): johorensis; - mussoi(): carolinensis; - truncatus(): lotor; - achates(): melanoleuca; - praedatrix(): angulatus; - mzabi(): wattsi, inez>; - xanthinus(): gracilis, marcanoi>; - tapoatafa(): megaphyllus; - castroviejoi(): jugularis; + class cor extends panglima.fundatus, lavali.beisa>, dammermani.melanops> { + antinorii(): petrophilus.sodyi; + voi(): caurinus.johorensis; + mussoi(): quasiater.carolinensis; + truncatus(): trivirgatus.lotor; + achates(): provocax.melanoleuca; + praedatrix(): howi.angulatus; + mzabi(): quasiater.wattsi, minutus.inez>; + xanthinus(): nigra.gracilis, howi.marcanoi>; + tapoatafa(): caurinus.megaphyllus; + castroviejoi(): Lanthanum.jugularis; } } declare module howi { class coludo { - bernhardi(): punicus; - isseli(): germaini; + bernhardi(): lutreolus.punicus; + isseli(): argurus.germaini; } } declare module argurus { - class germaini extends amicus { - sharpei(): wilsoni; - palmarum(): marmosurus; + class germaini extends gabriellae.amicus { + sharpei(): lavali.wilsoni; + palmarum(): macrorhinos.marmosurus; } } declare module sagitta { class stolzmanni { - riparius(): dolichurus; - dhofarensis(): foina; - tricolor(): germaini; - gardneri(): xanthognathus; - walleri(): moojeni, echinatus>; - talpoides(): echinatus; - pallipes(): melanops; - lagurus(): beisa; - hipposideros(): albidens; - griselda(): psilurus; - florium(): zuluensis; + riparius(): nigra.dolichurus; + dhofarensis(): lutreolus.foina; + tricolor(): argurus.germaini; + gardneri(): lavali.xanthognathus; + walleri(): rendalli.moojeni, gabriellae.echinatus>; + talpoides(): gabriellae.echinatus; + pallipes(): dammermani.melanops; + lagurus(): lavali.beisa; + hipposideros(): julianae.albidens; + griselda(): caurinus.psilurus; + florium(): rendalli.zuluensis; } } declare module dammermani { - class melanops extends inez { + class melanops extends minutus.inez { blarina(): melanops; - harwoodi(): veraecrucis, wilsoni>; - ashaninka(): nudicaudus; - wiedii(): steerii; - godmani(): subspinosus; - condorensis(): ciliolabrum; - xerophila(): abidi; - laminatus(): fundatus>>; - archeri(): marcanoi; - hidalgo(): inez; - unicolor(): schlegeli; - philippii(): gracilis; - bocagei(): albidens; + harwoodi(): rionegrensis.veraecrucis, lavali.wilsoni>; + ashaninka(): julianae.nudicaudus; + wiedii(): julianae.steerii; + godmani(): imperfecta.subspinosus; + condorensis(): imperfecta.ciliolabrum; + xerophila(): panglima.abidi; + laminatus(): panglima.fundatus>>; + archeri(): howi.marcanoi; + hidalgo(): minutus.inez; + unicolor(): lutreolus.schlegeli; + philippii(): nigra.gracilis; + bocagei(): julianae.albidens; } } declare module argurus { - class peninsulae extends uralensis { - aitkeni(): mixtus, amphibius>; - novaeangliae(): xanthognathus; - olallae(): sumatrana; - anselli(): aurata; - timminsi(): konganensis; - sordidus(): moojeni; - telfordi(): oconnelli; - cavernarum(): inez; + class peninsulae extends patas.uralensis { + aitkeni(): trivirgatus.mixtus, panglima.amphibius>; + novaeangliae(): lavali.xanthognathus; + olallae(): julianae.sumatrana; + anselli(): dogramacii.aurata; + timminsi(): macrorhinos.konganensis; + sordidus(): rendalli.moojeni; + telfordi(): trivirgatus.oconnelli; + cavernarum(): minutus.inez; } } declare module argurus { class netscheri { - gravis(): caucasica, kaiseri>; - ruschii(): lasiurus>; - tricuspidatus(): wilsoni; - fernandezi(): siberu, abidi>; - colletti(): pallidus; - microbullatus(): schlegeli; - eburneae(): sarasinorum; - tatei(): pygmaea>; - millardi(): walkeri; - pruinosus(): falconeri; - delator(): netscheri; - nyikae(): tumidifrons, minutilla>, acariensis>; - ruemmleri(): amphibius, echinatus>, aurata>, ciliolabrum>; + gravis(): nigra.caucasica, dogramacii.kaiseri>; + ruschii(): imperfecta.lasiurus>; + tricuspidatus(): lavali.wilsoni; + fernandezi(): dammermani.siberu, panglima.abidi>; + colletti(): samarensis.pallidus; + microbullatus(): lutreolus.schlegeli; + eburneae(): chrysaeolus.sarasinorum; + tatei(): pygmaea>; + millardi(): sagitta.walkeri; + pruinosus(): trivirgatus.falconeri; + delator(): netscheri; + nyikae(): trivirgatus.tumidifrons, petrophilus.minutilla>, julianae.acariensis>; + ruemmleri(): panglima.amphibius, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum>; } } declare module ruatanica { - class Praseodymium extends hector { - clara(): amphibius, dauricus>; - spectabilis(): sodyi; - kamensis(): lotor, lepturus>; - ruddi(): foina; - bartelsii(): sumatrana; - yerbabuenae(): siberu, ciliolabrum>; - davidi(): mixtus; - pilirostris(): wetmorei>, leptoceros>>, konganensis>; - catherinae(): lasiurus, sodyi>; - frontata(): oreas; - Terbium(): mahaganus; - thomensis(): inez>; - soricinus(): carolinensis; + class Praseodymium extends hector { + clara(): panglima.amphibius, argurus.dauricus>; + spectabilis(): petrophilus.sodyi; + kamensis(): trivirgatus.lotor, lavali.lepturus>; + ruddi(): lutreolus.foina; + bartelsii(): julianae.sumatrana; + yerbabuenae(): dammermani.siberu, imperfecta.ciliolabrum>; + davidi(): trivirgatus.mixtus; + pilirostris(): argurus.wetmorei>, sagitta.leptoceros>>, macrorhinos.konganensis>; + catherinae(): imperfecta.lasiurus, petrophilus.sodyi>; + frontata(): argurus.oreas; + Terbium(): caurinus.mahaganus; + thomensis(): minutus.inez>; + soricinus(): quasiater.carolinensis; } } declare module caurinus { - class johorensis extends punicus { - maini(): Praseodymium; + class johorensis extends lutreolus.punicus { + maini(): ruatanica.Praseodymium; } } declare module argurus { class luctuosa { - loriae(): moojeni, echinatus>, stolzmanni>, punicus>; + loriae(): rendalli.moojeni, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; } } declare module panamensis { class setulosus { - duthieae(): mahaganus, aurata>; - guereza(): coludo; - buselaphus(): nesiotes, koepckeae>, mixtus>; - nuttalli(): cinereus, sarasinorum>; - pelii(): crenulata, steerii>; - tunneyi(): stolzmanni; - lamula(): uralensis; - vampyrus(): oralis; + duthieae(): caurinus.mahaganus, dogramacii.aurata>; + guereza(): howi.coludo; + buselaphus(): daubentonii.nesiotes, dogramacii.koepckeae>, trivirgatus.mixtus>; + nuttalli(): sagitta.cinereus, chrysaeolus.sarasinorum>; + pelii(): rendalli.crenulata, julianae.steerii>; + tunneyi(): sagitta.stolzmanni; + lamula(): patas.uralensis; + vampyrus(): julianae.oralis; } } declare module petrophilus { class rosalia { - palmeri(): amphibius>, mixtus, amphibius>>; - baeops(): nitidus; - ozensis(): lasiurus, foina>; - creaghi(): luctuosa; - montivaga(): setulosus>; + palmeri(): panglima.amphibius>, trivirgatus.mixtus, panglima.amphibius>>; + baeops(): Lanthanum.nitidus; + ozensis(): imperfecta.lasiurus, lutreolus.foina>; + creaghi(): argurus.luctuosa; + montivaga(): panamensis.setulosus>; } } declare module caurinus { - class psilurus extends punicus { - socialis(): amphibius; - lundi(): sodyi; - araeum(): ciliolabrum; - calamianensis(): gerbillus; - petersoni(): setulosus; - nitela(): linulus; + class psilurus extends lutreolus.punicus { + socialis(): panglima.amphibius; + lundi(): petrophilus.sodyi; + araeum(): imperfecta.ciliolabrum; + calamianensis(): julianae.gerbillus; + petersoni(): panamensis.setulosus; + nitela(): panamensis.linulus; } } diff --git a/tests/cases/compiler/declarationEmit_nameConflicts.ts b/tests/cases/compiler/declarationEmit_nameConflicts.ts index 40ae28d8c14..49218d2ef1e 100644 --- a/tests/cases/compiler/declarationEmit_nameConflicts.ts +++ b/tests/cases/compiler/declarationEmit_nameConflicts.ts @@ -1,6 +1,7 @@ // @declaration: true +// @module: commonjs // @Filename: declarationEmit_nameConflicts_1.ts -function f() { } +module f { export class c { } } export = f; // @Filename: declarationEmit_nameConflicts_0.ts diff --git a/tests/cases/compiler/declarationEmit_nameConflicts3.ts b/tests/cases/compiler/declarationEmit_nameConflicts3.ts index 98f7ce91d5e..b854841b4b4 100644 --- a/tests/cases/compiler/declarationEmit_nameConflicts3.ts +++ b/tests/cases/compiler/declarationEmit_nameConflicts3.ts @@ -1,4 +1,5 @@ // @declaration: true +// @module: commonjs module M { export interface D { } export module D { diff --git a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts index e6771f2d848..87cdca3fd41 100644 --- a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts +++ b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts @@ -1,4 +1,5 @@ // @declaration: true +// @module: commonjs // Bug 887180 export module C { export interface I { } } export import v = C; diff --git a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts new file mode 100644 index 00000000000..4ec21368fb8 --- /dev/null +++ b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts @@ -0,0 +1,4 @@ +class C { + public f() { }; + private m; +}