Skip to content

Commit 0bf9991

Browse files
authored
Make emitModuleKindIsNonNodeESM internal (#52599)
1 parent 1ed0a5a commit 0bf9991

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

src/compiler/moduleNameResolver.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,6 +3066,7 @@ export function classicNameResolver(moduleName: string, containingFile: string,
30663066

30673067
// Program errors validate that `noEmit` or `emitDeclarationOnly` is also set,
30683068
// so this function doesn't check them to avoid propagating errors.
3069+
/** @internal */
30693070
export function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions, fromFileName?: string) {
30703071
return !!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName);
30713072
}

src/compiler/utilities.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7989,6 +7989,7 @@ export function getEmitModuleKind(compilerOptions: {module?: CompilerOptions["mo
79897989
getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
79907990
}
79917991

7992+
/** @internal */
79927993
export function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind) {
79937994
return moduleKind >= ModuleKind.ES2015 && moduleKind <= ModuleKind.ESNext;
79947995
}

tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8689,7 +8689,6 @@ declare namespace ts {
86898689
parent: ConstructorDeclaration;
86908690
name: Identifier;
86918691
};
8692-
function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind): boolean;
86938692
/** @deprecated */
86948693
function createUnparsedSourceFile(text: string): UnparsedSource;
86958694
/** @deprecated */
@@ -9144,7 +9143,6 @@ declare namespace ts {
91449143
function bundlerModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
91459144
function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
91469145
function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
9147-
function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions, fromFileName?: string): boolean | "" | undefined;
91489146
interface TypeReferenceDirectiveResolutionCache extends PerDirectoryResolutionCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>, NonRelativeNameResolutionCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>, PackageJsonInfoCache {
91499147
}
91509148
interface ModeAwareCache<T> {

tests/baselines/reference/api/typescript.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4714,7 +4714,6 @@ declare namespace ts {
47144714
parent: ConstructorDeclaration;
47154715
name: Identifier;
47164716
};
4717-
function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind): boolean;
47184717
/** @deprecated */
47194718
function createUnparsedSourceFile(text: string): UnparsedSource;
47204719
/** @deprecated */
@@ -5169,7 +5168,6 @@ declare namespace ts {
51695168
function bundlerModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
51705169
function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
51715170
function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
5172-
function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions, fromFileName?: string): boolean | "" | undefined;
51735171
interface TypeReferenceDirectiveResolutionCache extends PerDirectoryResolutionCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>, NonRelativeNameResolutionCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>, PackageJsonInfoCache {
51745172
}
51755173
interface ModeAwareCache<T> {

0 commit comments

Comments
 (0)