From 73eb7ca503ec5f61b5d935f6e7f7b80106a72795 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Fri, 3 Feb 2023 14:42:25 -0800 Subject: [PATCH 1/2] Make `emitModuleKindIsNonNodeESM` internal --- src/compiler/utilities.ts | 1 + tests/baselines/reference/api/tsserverlibrary.d.ts | 1 - tests/baselines/reference/api/typescript.d.ts | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index a6aa9c29b38fa..1cce8699e2cb8 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -7989,6 +7989,7 @@ export function getEmitModuleKind(compilerOptions: {module?: CompilerOptions["mo getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS; } +/** @internal */ export function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind) { return moduleKind >= ModuleKind.ES2015 && moduleKind <= ModuleKind.ESNext; } diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 035abc4d7ff10..a59a0988d504f 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -8689,7 +8689,6 @@ declare namespace ts { parent: ConstructorDeclaration; name: Identifier; }; - function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind): boolean; /** @deprecated */ function createUnparsedSourceFile(text: string): UnparsedSource; /** @deprecated */ diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index a8a5c3bb97f1b..e126e3b22c84a 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4714,7 +4714,6 @@ declare namespace ts { parent: ConstructorDeclaration; name: Identifier; }; - function emitModuleKindIsNonNodeESM(moduleKind: ModuleKind): boolean; /** @deprecated */ function createUnparsedSourceFile(text: string): UnparsedSource; /** @deprecated */ From 3c0199b7baf5e60baa88908dbd739d7a383f02f9 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Fri, 3 Feb 2023 16:42:16 -0800 Subject: [PATCH 2/2] Make `shouldAllowImportingTsExtension` internal --- src/compiler/moduleNameResolver.ts | 1 + tests/baselines/reference/api/tsserverlibrary.d.ts | 1 - tests/baselines/reference/api/typescript.d.ts | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts index 8263abea028ad..37d4c0de9e348 100644 --- a/src/compiler/moduleNameResolver.ts +++ b/src/compiler/moduleNameResolver.ts @@ -3066,6 +3066,7 @@ export function classicNameResolver(moduleName: string, containingFile: string, // Program errors validate that `noEmit` or `emitDeclarationOnly` is also set, // so this function doesn't check them to avoid propagating errors. +/** @internal */ export function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions, fromFileName?: string) { return !!compilerOptions.allowImportingTsExtensions || fromFileName && isDeclarationFileName(fromFileName); } diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index a59a0988d504f..3d9b6ecf6e418 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -9143,7 +9143,6 @@ declare namespace ts { function bundlerModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; - function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions, fromFileName?: string): boolean | "" | undefined; interface TypeReferenceDirectiveResolutionCache extends PerDirectoryResolutionCache, NonRelativeNameResolutionCache, PackageJsonInfoCache { } interface ModeAwareCache { diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index e126e3b22c84a..d6b2e9f807435 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -5168,7 +5168,6 @@ declare namespace ts { function bundlerModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations; - function shouldAllowImportingTsExtension(compilerOptions: CompilerOptions, fromFileName?: string): boolean | "" | undefined; interface TypeReferenceDirectiveResolutionCache extends PerDirectoryResolutionCache, NonRelativeNameResolutionCache, PackageJsonInfoCache { } interface ModeAwareCache {