8000 addressed PR feedback · johnangularjs/TypeScript@297c60e · GitHub
[go: up one dir, main page]
Skip to content

Commit 297c60e

Browse files
vladimavladima
committed
addressed PR feedback
1 parent e0c16b4 commit 297c60e

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎src/compiler/diagnosticInformationMap.generated.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ namespace ts {
428428
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." },
429429
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." },
430430
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}'." },
431-
Proper_external_module_that_carries_external_typings_cannot_contain_tripleslash_references: { code: 2654, category: DiagnosticCategory.Error, key: "Proper external module that carries external typings cannot contain tripleslash references." },
432-
Proper_external_module_that_carries_external_typings_should_be_d_ts_file: { code: 2655, category: DiagnosticCategory.Error, key: "Proper external module that carries external typings should be '.d.ts' file." },
431+
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." },
432+
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." },
433433
Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
434434
Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
435435
Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },

‎src/compiler/diagnosticMessages.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,11 +1701,11 @@
17011701
"category": "Error",
17021702
"code": 2653
17031703
},
1704-
"Proper external module that carries external typings cannot contain tripleslash references.": {
1704+
"Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.": {
17051705
"category": "Error",
17061706
"code": 2654
17071707
},
1708-
"Proper external module that carries external typings should be '.d.ts' file.": {
1708+
"Exported external package typings can only be in '.d.ts' files. Please contact the package author to update the package definition.": {
17091709
"category": "Error",
17101710
"code": 2655
17111711
},

‎src/compiler/program.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ namespace ts {
129129
let candidate = normalizePath(combinePaths(nodeModulesFolder, moduleName));
130130
let result = loadNodeModuleFromFile(candidate, /* loadOnlyDts */ true, failedLookupLocations, host);
131131
if (result) {
132-
return { resolvedModule: { resolvedFileName: result, shouldBeProperExternalModule: true }, failedLookupLocations };
132+
return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations };
133133
}
134134

135135
result = loadNodeModuleFromDirectory(candidate, /* loadOnlyDts */ true, failedLookupLocations, host);
136136
if (result) {
137-
return { resolvedModule: { resolvedFileName: result, shouldBeProperExternalModule: true }, failedLookupLocations };
137+
return { resolvedModule: { resolvedFileName: result, isExternalLibraryImport: true }, failedLookupLocations };
138138
}
139139
}
140140

@@ -472,7 +472,7 @@ namespace ts {
472472
let resolutionChanged = oldResolution
473473
? !newResolution ||
474474
oldResolution.resolvedFileName !== newResolution.resolvedFileName ||
475-
!!oldResolution.shouldBeProperExternalModule !== !!newResolution.shouldBeProperExternalModule
475+
!!oldResolution.isExternalLibraryImport !== !!newResolution.isExternalLibraryImport
476476
: newResolution;
477477

478478
if (resolutionChanged) {
@@ -850,18 +850,18 @@ namespace ts {
850850
setResolvedModule(file, moduleNames[i], resolution);
851851
if (resolution && !options.noResolve) {
852852
const importedFile = findModuleSourceFile(resolution.resolvedFileName, file.imports[i]);
853-
if (importedFile && resolution.shouldBeProperExternalModule) {
853+
if (importedFile && resolution.isExternalLibraryImport) {
854854
if (!isExternalModule(importedFile)) {
855855
let start = getTokenPosOfNode(file.imports[i], file)
856856
diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.File_0_is_not_a_module, importedFile.fileName));
857857
}
858858
else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) {
859859
let start = getTokenPosOfNode(file.imports[i], file)
860-
diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Proper_external_module_that_carries_external_typings_should_be_d_ts_file));
860+
diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
861861
}
862862
else if (importedFile.referencedFiles.length) {
863863
let firstRef = importedFile.referencedFiles[0];
864-
diagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Proper_external_module_that_carries_external_typings_cannot_contain_tripleslash_references));
864+
diagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
865865
}
866866
}
867867
}

‎src/compiler/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2270,12 +2270,12 @@ namespace ts {
22702270
export interface ResolvedModule {
22712271
resolvedFileName: string;
22722272
/*
2273-
* Denotes if 'resolvedFileName' should be proper external module:
2273+
* Denotes if 'resolvedFileName' is isExternalLibraryImport and thus should be proper external module:
22742274
* - be a .d.ts file
22752275
* - use top level imports\exports
22762276
* - don't use tripleslash references
22772277
*/
2278-
shouldBeProperExternalModule?: boolean;
2278+
isExternalLibraryImport?: boolean;
22792279
}
22802280

22812281
export interface ResolvedModuleWithFailedLookupLocations {

0 commit comments

Comments
 (0)
0