Skip to content

Commit 2ca8702

Browse files
Copilotandrewbranch
andcommitted
Refactor: move shouldRewriteModuleSpecifier to core package
Co-authored-by: andrewbranch <3277153+andrewbranch@users.noreply.github.com>
1 parent 08d918e commit 2ca8702

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

internal/checker/checker.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14503,7 +14503,7 @@ func (c *Checker) resolveExternalModule(location *ast.Node, moduleReference stri
1450314503
!tspath.IsDeclarationFileName(moduleReference) &&
1450414504
!ast.IsLiteralImportTypeNode(location) &&
1450514505
!ast.IsPartOfTypeOnlyImportOrExportDeclaration(location) {
14506-
shouldRewrite := c.shouldRewriteModuleSpecifier(moduleReference)
14506+
shouldRewrite := core.ShouldRewriteModuleSpecifier(moduleReference, c.compilerOptions)
1450714507
if !resolvedModule.ResolvedUsingTsExtension && shouldRewrite {
1450814508
relativeToSourceFile := tspath.GetRelativePathFromFile(
1450914509
tspath.GetNormalizedAbsolutePath(importingSourceFile.FileName(), c.program.GetCurrentDirectory()),
@@ -30408,10 +30408,3 @@ func (c *Checker) GetEmitResolver(file *ast.SourceFile, skipDiagnostics bool) *e
3040830408
func (c *Checker) GetAliasedSymbol(symbol *ast.Symbol) *ast.Symbol {
3040930409
return c.resolveAlias(symbol)
3041030410
}
30411-
30412-
func (c *Checker) shouldRewriteModuleSpecifier(specifier string) bool {
30413-
return c.compilerOptions.RewriteRelativeImportExtensions.IsTrue() &&
30414-
tspath.PathIsRelative(specifier) &&
30415-
!tspath.IsDeclarationFileName(specifier) &&
30416-
tspath.HasTSFileExtension(specifier)
30417-
}

internal/core/core.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,3 +559,7 @@ func IndexAfter(s string, pattern string, startIndex int) int {
559559
return matched + startIndex
560560
}
561561
}
562+
563+
func ShouldRewriteModuleSpecifier(specifier string, compilerOptions *CompilerOptions) bool {
564+
return compilerOptions.RewriteRelativeImportExtensions.IsTrue() && tspath.PathIsRelative(specifier) && !tspath.IsDeclarationFileName(specifier) && tspath.HasTSFileExtension(specifier)
565+
}

internal/transformers/utilities.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func tryRenameExternalModule(factory *printer.NodeFactory, moduleName *ast.Liter
336336
}
337337

338338
func rewriteModuleSpecifier(emitContext *printer.EmitContext, node *ast.Expression, compilerOptions *core.CompilerOptions) *ast.Expression {
339-
if node == nil || !ast.IsStringLiteral(node) || !shouldRewriteModuleSpecifier(node.Text(), compilerOptions) {
339+
if node == nil || !ast.IsStringLiteral(node) || !core.ShouldRewriteModuleSpecifier(node.Text(), compilerOptions) {
340340
return node
341341
}
342342
updatedText := tspath.ChangeExtension(node.Text(), outputpaths.GetOutputExtension(node.Text(), compilerOptions.Jsx))
@@ -350,10 +350,6 @@ func rewriteModuleSpecifier(emitContext *printer.EmitContext, node *ast.Expressi
350350
return node
351351
}
352352

353-
func shouldRewriteModuleSpecifier(specifier string, compilerOptions *core.CompilerOptions) bool {
354-
return compilerOptions.RewriteRelativeImportExtensions.IsTrue() && tspath.PathIsRelative(specifier) && !tspath.IsDeclarationFileName(specifier) && tspath.HasTSFileExtension(specifier)
355-
}
356-
357353
func singleOrMany(nodes []*ast.Node, factory *printer.NodeFactory) *ast.Node {
358354
if len(nodes) == 1 {
359355
return nodes[0]

0 commit comments

Comments
 (0)