Start emitting qualified path if the current symbol is not visible in enclosing declaration

Note that this doesnt handle aliases yet.

src/compiler/checker.ts

@@ -586,14 +586,74 @@ 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 isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node) {
+            function containsSymbol(symbols: SymbolTable) {
+                if (hasProperty(symbols, symbol.name)) {
+                    var symbolFromSymbolTable = symbols[symbol.name];
+                    if (symbol === symbolFromSymbolTable) {
+                        return true;
+                    }
+                    // TODO check if symbolFromSymbolTable is alias : and work appropriately if (symbolFromSymbolTable.flags & SymbolFlags.Import)
+                }
+           }
+
+            while (enclosingDeclaration) {
+                // Locals of a source file are not in scope (because they get merged into the global symbol table)
+                if (enclosingDeclaration.locals && (enclosingDeclaration.kind !== SyntaxKind.SourceFile || enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
+                    if (containsSymbol(enclosingDeclaration.locals)) {
+                        return true;
+                    }
+                }
+                switch (enclosingDeclaration.kind) {
+                    case SyntaxKind.SourceFile:
+                        if (!(enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
+                            break;
+                        }
+                    case SyntaxKind.ModuleDeclaration:
+                        if (containsSymbol(getSymbolOfNode(enclosingDeclaration).exports)) {
+                            return true;
+                        }
+                        break;
+                    case SyntaxKind.ClassDeclaration:
+                    case SyntaxKind.InterfaceDeclaration:
+                        if (containsSymbol(getSymbolOfNode(enclosingDeclaration).members)) {
+                            return true;
+                        }
+                        break;
+                }
+                enclosingDeclaration = enclosingDeclaration.parent;
+            }
+
+            return containsSymbol(globals);
+        }
+
+        function symbolToString(symbol: Symbol, enclosingDeclaration?: Node) {
+            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 
+            var symbolName = getSymbolName(symbol);
+            if (enclosingDeclaration &&
+                !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) {
+                // TODO if !symbol.parent it could be in globals or it is non exported
+                if (!isSymbolAccessible(symbol, enclosingDeclaration)) {
+                    for (var parent = symbol.parent; parent; parent = parent.parent) {
+                        symbolName = getSymbolName(parent) + "." + symbolName;
+                        if (isSymbolAccessible(parent, enclosingDeclaration)) {
+                            break;
+                        }
+                    }
                 }
             }
-            return symbol.name;
+
+            return symbolName
         }
 
         function createSingleLineTextWriter() {
@@ -615,7 +675,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);
 
@@ -627,7 +686,7 @@ module ts {
                     writeTypeReference(<TypeReference>type);
                 }
                 else if (type.flags & (TypeFlags.Class | TypeFlags.Interface | TypeFlags.Enum | TypeFlags.TypeParameter)) {
-                    writer.write(symbolToString(type.symbol));
+                    writer.write(symbolToString(type.symbol, enclosingDeclaration));
                 }
                 else if (type.flags & TypeFlags.Anonymous) {
                     writeAnonymousType(<ObjectType>type, allowFunctionOrConstructorTypeLiteral);
@@ -649,7 +708,7 @@ module ts {
                     writer.write("[]");
                 }
                 else {
-                    writer.write(symbolToString(type.target.symbol));
+                    writer.write(symbolToString(type.target.symbol, enclosingDeclaration));
                     writer.write("<");
                     for (var i = 0; i < type.typeArguments.length; i++) {
                         if (i > 0) {
@@ -683,7 +742,7 @@ module ts {
 
             function writeTypeofSymbol(type: ObjectType) {
                 writer.write("typeof ");
-                writer.write(symbolToString(type.symbol));
+                writer.write(symbolToString(type.symbol, enclosingDeclaration));
             }
 
             function writeLiteralType(type: ObjectType, allowFunctionOrConstructorTypeLiteral: boolean) {

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 {
     }

tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js

@@ -32,4 +32,4 @@ declare module "SubModule" {
 }
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts]
 /// <reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts' />
-export declare var x: c;
+export declare var x: "SubModule".m.m3.c;

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;

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;

tests/baselines/reference/declFileGenericType.js

@@ -130,16 +130,16 @@ export declare module C {
         constructor(val: T);
     }
 }
-export declare var a: A<B>;
-export declare var b: <T>(x: T) => A<B>;
-export declare var c: <T>(x: T) => A<B>;
-export declare var d: <T>(x: T) => A<B>[];
-export declare var e: <T extends A<B>>(x: T) => A<B>[];
-export declare var x: A<B>;
-export declare function f<T extends A<B>>(): void;
-export declare var g: A<B>;
-export declare class h extends A<B> {
+export declare var a: C.A<C.B>;
+export declare var b: <T>(x: T) => C.A<C.B>;
+export declare var c: <T>(x: T) => C.A<C.B>;
+export declare var d: <T>(x: T) => C.A<C.B>[];
+export declare var e: <T extends C.A<C.B>>(x: T) => C.A<C.B>[];
+export declare var x: C.A<C.B>;
+export declare function f<T extends C.A<C.B>>(): void;
+export declare var g: C.A<C.B>;
+export declare class h extends C.A<C.B> {
 }
-export interface i extends A<B> {
+export interface i extends C.A<C.B> {
 }
-export declare var j: <T extends A<B>>(x: T) => T;
+export declare var j: <T extends C.A<C.B>>(x: T) => T;

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<ModelType extends IModel> extends IController<ModelType> {
+    interface IElementController<ModelType extends mvc.IModel> extends mvc.IController<ModelType> {
     }
 }
 declare module templa.dom.mvc {
-    class AbstractElementController<ModelType extends IModel> extends AbstractController<ModelType> implments IElementController<ModelType> {
+    class AbstractElementController<ModelType extends mvc.IModel> extends mvc.AbstractController<ModelType> implments IElementController<ModelType> {
         constructor();
     }
 }
 declare module templa.dom.mvc.composite {
-    class AbstractCompositeElementController<ModelType extends ICompositeControllerModel> extends AbstractElementController<ModelType> {
-        _controllers: IController<IModel>[];
+    class AbstractCompositeElementController<ModelType extends mvc.composite.ICompositeControllerModel> extends AbstractElementController<ModelType> {
+        _controllers: mvc.IController<mvc.IModel>[];
         constructor();
     }
 }

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;
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
 };

tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js

@@ -27,5 +27,5 @@ declare class List<T> {
 declare module 'mod1' {
 }
 declare module 'moo' {
-    var p: List<Foo>;
+    var p: List<'mod1'.Foo>;
 }

tests/baselines/reference/declFileInternalAliases.js

@@ -40,9 +40,9 @@ declare module m {
     }
 }
 declare module m1 {
-    var d: c;
+    var d: m.c;
 }
 declare module m2 {
     export import x = m.c;
-    var d: c;
+    var d: m.c;
 }

tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js

@@ -35,6 +35,6 @@ declare var d: {
         m: typeof m1;
     };
     m2: {
-        c: typeof c;
+        c: typeof m1.c;
     };
 };

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 C.Z {
     }
 }

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;
 };

tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js

@@ -73,7 +73,7 @@ declare module A.B.Base {
     }
 }
 declare module X.Y.base {
-    class W extends W {
+    class W extends A.B.Base.W {
         name: string;
     }
 }

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 C.Z {
     }
 }

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 C.Z {
     }
 }
 declare module X.A.B.C {

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 C.Z {
     }
 }
 declare module X.A.B.C {

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;

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;

tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js

@@ -25,6 +25,6 @@ declare module foo {
     }
 }
 declare module bar {
-    class Foo<T> implments IFoo<T> {
+    class Foo<T> implments foo.IFoo<T> {
     }
 }

tests/baselines/reference/genericClassesInModule.js

@@ -35,4 +35,4 @@ declare module Foo {
     class A {
     }
 }
-declare var a: B<A>;
+declare var a: Foo.B<Foo.A>;

tests/baselines/reference/internalAliasClass.js

@@ -32,5 +32,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: c;
+    var x: a.c;
 }

tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js

@@ -51,7 +51,7 @@ export declare module x {
 export declare module m2 {
     module m3 {
         export import c = x.c;
-        var cProp: c;
+        var cProp: x.c;
     }
 }
-export declare var d: c;
+export declare var d: x.c;

tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js

@@ -47,6 +47,6 @@ export declare module x {
 }
 export declare module m2 {
     module m3 {
-        var cProp: c;
+        var cProp: x.c;
     }
 }

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: x.c;

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: x.c;

tests/baselines/reference/internalAliasEnum.js

@@ -39,5 +39,5 @@ declare module a {
     }
 }
 declare module c {
-    var bVal: weekend;
+    var bVal: a.weekend;
 }

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: a.weekend;
 }

tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js

@@ -39,5 +39,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var bVal: weekend;
+    var bVal: a.weekend;
 }

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: a.weekend;

tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js

@@ -35,4 +35,4 @@ export declare module a {
         Sunday = 2,
     }
 }
-export declare var bVal: weekend;
+export declare var bVal: a.weekend;

tests/baselines/reference/internalAliasInitializedModule.js

@@ -39,5 +39,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: c;
+    var x: a.b.c;
 }

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: a.b.c;
 }

tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js

@@ -39,5 +39,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: c;
+    var x: a.b.c;
 }

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: a.b.c;

tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js

@@ -35,4 +35,4 @@ export declare module a {
         }
     }
 }
-export declare var x: c;
+export declare var x: a.b.c;

tests/baselines/reference/internalAliasInterface.js

@@ -23,5 +23,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: I;
+    var x: a.I;
 }

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: a.I;
 }

tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js

@@ -25,5 +25,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: I;
+    var x: a.I;
 }

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: a.I;

tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js

@@ -19,4 +19,4 @@ export declare module a {
     interface I {
     }
 }
-export declare var x: I;
+export declare var x: a.I;

tests/baselines/reference/internalAliasUninitializedModule.js

@@ -30,5 +30,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: I;
+    var x: a.b.I;
 }

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: a.b.I;
 }

tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js

@@ -30,5 +30,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: I;
+    var x: a.b.I;
 }

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: a.b.I;

tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js

@@ -25,4 +25,4 @@ export declare module a {
         }
     }
 }
-export declare var x: I;
+export declare var x: a.b.I;

tests/baselines/reference/missingImportAfterModuleImport.js

@@ -45,7 +45,7 @@ declare module "SubModule" {
 //// [missingImportAfterModuleImport_1.d.ts]
 /// <reference path='missingImportAfterModuleImport_0.d.ts' />
 declare class MainModule {
-    SubModule: SubModule;
+    SubModule: "SubModule".SubModule;
     constructor();
 }
 export = MainModule;

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: "quotedm1".v;
 }

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: "quotedm1".v;
 }

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;

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;

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;

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;

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;

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;

tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts

@@ -1 +1 @@
-export declare function foo2(): d;
+export declare function foo2(): "m4".d;

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;

tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts

@@ -1 +1 @@
-export declare function foo2(): d;
+export declare function foo2(): "m4".d;

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;

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;
 }

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;
 }

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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;

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;

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;

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;

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;

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;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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;

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;

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;

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;

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;

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;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;

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 "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;