Package scopes

src/compiler/checker.ts

@@ -123,7 +123,9 @@ namespace ts {
         let anySignature = createSignature(undefined, undefined, emptyArray, anyType, undefined, 0, false, false);
         let unknownSignature = createSignature(undefined, undefined, emptyArray, unknownType, undefined, 0, false, false);
 
-        let globals: SymbolTable = {};
+        let globalScope: Scope = {
+            symbols: {}
+        };
 
         let globalESSymbolConstructorSymbol: Symbol;
 
@@ -423,6 +425,12 @@ namespace ts {
                 }
                 switch (location.kind) {
                     case SyntaxKind.SourceFile:
+                        if ((<SourceFile>location).package) {
+                            if (hasProperty((<SourceFile>location).package.symbols, name)) {
+                                result = (<SourceFile>location).package.symbols[name];
+                                break loop;
+                            }
+                        }
                         if (!isExternalModule(<SourceFile>location)) break;
                     case SyntaxKind.ModuleDeclaration:
                         let moduleExports = getSymbolOfNode(location).exports;
@@ -575,7 +583,7 @@ namespace ts {
             }
 
             if (!result) {
-                result = getSymbol(globals, name, meaning);
+                result = getSymbol(globalScope.symbols, name, meaning);
             }
 
             if (!result) {
@@ -970,7 +978,8 @@ namespace ts {
             }
             let isRelative = isExternalModuleNameRelative(moduleName);
             if (!isRelative) {
-                let symbol = getSymbol(globals, "\"" + moduleName + "\"", SymbolFlags.ValueModule);
+                let file = getSourceFileOfNode(location);
+                let symbol = getSymbol(file.package ? file.package.symbols : globalScope.symbols, "\"" + moduleName + "\"", SymbolFlags.ValueModule);
                 if (symbol) {
                     return symbol;
                 }
@@ -1178,6 +1187,11 @@ namespace ts {
                 }
                 switch (location.kind) {
                     case SyntaxKind.SourceFile:
+                        if ((<SourceFile>location).package) {
+                            if (result = callback((<SourceFile>location).package.symbols)) {
+                                return result;
+                            }
+                        }
                         if (!isExternalModule(<SourceFile>location)) {
                             break;
                         }
@@ -1195,7 +1209,7 @@ namespace ts {
                 }
             }
 
-            return callback(globals);
+            return callback(globalScope.symbols);
         }
 
         function getQualifiedLeftMeaning(rightMeaning: SymbolFlags) {
@@ -13871,6 +13885,9 @@ namespace ts {
 
                     switch (location.kind) {
                         case SyntaxKind.SourceFile:
+                            if ((<SourceFile>location).package) {
+                                copySymbols((<SourceFile>location).package.symbols, meaning);
+                            }
                             if (!isExternalModule(<SourceFile>location)) {
                                 break;
                             }
@@ -13913,7 +13930,7 @@ namespace ts {
                     location = location.parent;
                 }
 
-                copySymbols(globals, meaning);
+                copySymbols(globalScope.symbols, meaning);
             }
 
             /**
@@ -14525,7 +14542,11 @@ namespace ts {
         }
 
         function hasGlobalName(name: string): boolean {
-            return hasProperty(globals, name);
+            return hasProperty(globalScope.symbols, name);
+        }
+
+        function hasPackageInternalName(file: SourceFile, name: string): boolean {
+            return file.package && hasProperty(file.package.symbols, name);
         }
 
         function getReferencedValueSymbol(reference: Identifier): Symbol {
@@ -14587,6 +14608,7 @@ namespace ts {
                 isNestedRedeclaration,
                 isValueAliasDeclaration,
                 hasGlobalName,
+                hasPackageInternalName,
                 isReferencedAliasDeclaration,
                 getNodeCheckFlags,
                 isTopLevelValueImportEqualsWithEntityName,
@@ -14612,18 +14634,28 @@ namespace ts {
                 bindSourceFile(file);
             });
 
-            // Initialize global symbol table
+            let packages: Map<PackageDescriptor> = {};
+
+            // Initialize package/global symbol table(s)
             forEach(host.getSourceFiles(), file => {
                 if (!isExternalModule(file)) {
-                    mergeSymbolTable(globals, file.locals);
+                    if (file.package) {
+                        if (!packages[file.package.packageFile]) {
+                            packages[file.package.packageFile] = file.package;
+                        }
+                        file.package = packages[file.package.packageFile]; // Dedupe packages
+                        mergeSymbolTable(file.package.symbols, file.locals);
+                    } else {
+                        mergeSymbolTable(globalScope.symbols, file.locals);
+                    }
                 }
             });
 
             // Initialize special symbols
             getSymbolLinks(undefinedSymbol).type = undefinedType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments");
             getSymbolLinks(unknownSymbol).type = unknownType;
-            globals[undefinedSymbol.name] = undefinedSymbol;
+            globalScope.symbols[undefinedSymbol.name] = undefinedSymbol;
             // Initialize special types
             globalArrayType = <GenericType>getGlobalType("Array", /*arity*/ 1);
             globalObjectType = getGlobalType("Object");
@@ -14670,6 +14702,10 @@ namespace ts {
             }
 
             anyArrayType = createArrayType(anyType);
+
+            forEachValue(packages, package => { // Once all packages are merged and global scope is setup, merge global scope into each package
+                mergeSymbolTable(package.symbols, globalScope.symbols);
+            });
         }
 
         function createInstantiatedPromiseLikeType(): ObjectType {

src/compiler/diagnosticInformationMap.generated.ts

@@ -429,7 +429,7 @@ namespace ts {
         A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: DiagnosticCategory.Error, key: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: DiagnosticCategory.Error, key: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
         Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: DiagnosticCategory.Error, key: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
-        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: DiagnosticCategory.Error, key: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
+        Exported_external_package_typings_file_cannot_contain_script_file_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: DiagnosticCategory.Error, key: "Exported external package typings file cannot contain script file tripleslash references. Please contact the package author to update the package definition." },
         Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition: { code: 2655, category: DiagnosticCategory.Error, key: "Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition." },
         Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: DiagnosticCategory.Error, key: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
         Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },

src/compiler/diagnosticMessages.json

@@ -1704,7 +1704,7 @@
         "category": "Error",
         "code": 2653
     },
-    "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.": {
+    "Exported external package typings file cannot contain script file tripleslash references. Please contact the package author to update the package definition.": {
         "category": "Error",
         "code": 2654
     },

src/compiler/emitter.ts

@@ -217,6 +217,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function isUniqueName(name: string): boolean {
                 return !resolver.hasGlobalName(name) &&
+                    !resolver.hasPackageInternalName(currentSourceFile, name) &&
                     !hasProperty(currentSourceFile.identifiers, name) &&
                     !hasProperty(generatedNameSet, name);
             }