Factor out repeated code and call one from another #125
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dragomirtitian
requested changes
Nov 29, 2023
src/compiler/emitter.ts
Outdated
| @@ -721,6 +722,62 @@ export function getOutputFileNames(commandLine: ParsedCommandLine, inputFileName | |||
| return getOutputs(); | |||
| } | |||
|
|
|||
| /** @internal */ | |||
| export function getSourceMapDirectory(host: EmitHost, mapOptions: SourceMapOptions, filePath: string, sourceFile: SourceFile | undefined) { | |||
There was a problem hiding this comment.
I am currently trying to get rid of the emit host as much as possible since that has a lot of functionality that is not available in the DTE. Could we maybe find a way to subset the methods of EmitHost that actually used here? In #124 I manage to get rid of most of the unimplemented parts of emitHost and just keep the core functionality used in source maps:
const emitHost = {
getCurrentDirectory: () => transpileOptions.currentDirectory ?? ".",
getCanonicalFileName: createGetCanonicalFileName(!!compilerOptions.useCaseSensitiveFileNames),
useCaseSensitiveFileNames: () => !!compilerOptions.useCaseSensitiveFileNames,
getCompilerOptions: () => compilerOptions.compilerOptions,
getCommonSourceDirectory: () => ensureTrailingDirectorySeparator(transpileOptions.commonSourceDirectory ?? "."),
};Maybe we can do something similar? I seem to remember I used Pick in some place to pick out just the actually used methods. Not sure if Pick is the best option, but maybe another type with just our methods of interest (or if we find an existing one taht does not grow the API surface too much that would also be great)
There was a problem hiding this comment.
How about this? I made EmitHost -> CoreEmitHost
h-joo
force-pushed
the
refactorSourceMaps
branch
from
8e86481
to
87e30cc
Compare
h-joo
changed the base branch from
isolated-declarations
to
isolated-declarations-safety-improvements
h-joo
force-pushed
the
refactorSourceMaps
branch
from
87e30cc
to
66783a3
Compare
|
Should be merged after #124 is merged in. |
dragomirtitian
force-pushed
the
isolated-declarations-safety-improvements
branch
3 times, most recently
from
1ea970e
to
f9aa1b6
Compare
h-joo
force-pushed
the
refactorSourceMaps
branch
from
66783a3
to
7362d4b
Compare
dragomirtitian
force-pushed
the
isolated-declarations-safety-improvements
branch
2 times, most recently
from
b7d3c82
to
211b056
Compare
dragomirtitian
force-pushed
the
isolated-declarations-safety-improvements
branch
2 times, most recently
from
a2fab36
to
c45ffaf
Compare
h-joo
force-pushed
the
refactorSourceMaps
branch
from
7362d4b
to
2bc4a1d
Compare
h-joo
changed the base branch from
isolated-declarations-safety-improvements
to
isolated-declarations
Also make the functions use the new type CoreEmitHost to take into account of methods that are not available from DTE mode. Signed-off-by: Hana Joo <hanajoo@google.com>
Signed-off-by: Hana Joo <hanajoo@google.com>
h-joo
force-pushed
the
refactorSourceMaps
branch
from
2bc4a1d
to
a97dfbc
Compare
dragomirtitian
merged commit 04097f6
into
bloomberg:isolated-declarations
1 check passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is totally a non-functional change. No code modification, just moving around.