fix: count printed bytes so that we can skip over them later

withastro · Jul 12, 2024 · d5ffa2c · d5ffa2c
1 parent 71636d1
commit d5ffa2c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/internal/printer/print-to-tsx.go b/internal/printer/print-to-tsx.go
@@ -238,7 +238,7 @@ const (
 func getTextType(n *astro.Node) TextType {
 	if script := n.Closest(isScript); script != nil {
 		attr := astro.GetAttribute(script, "type")
-		if attr == nil || (attr != nil && ScriptMimeTypes[strings.ToLower(attr.Val)]) {
+		if attr == nil || ScriptMimeTypes[strings.ToLower(attr.Val)] {
 			return ScriptText
 		}
 	}
@@ -513,10 +513,10 @@ declare const Astro: Readonly<import('astro').AstroGlobal<%s, typeof %s`, propsI
 				endLoc = a.ValLoc.Start
 			}
 			if _, ok := htmlEvents[a.Key]; ok {
-				p.addTSXScript(a.ValLoc.Start, endLoc, a.Val, "event-attribute")
+				p.addTSXScript(a.ValLoc.Start-p.bytesToSkip, endLoc-p.bytesToSkip, a.Val, "event-attribute")
 			}
 			if a.Key == "style" {
-				p.addTSXStyle(a.ValLoc.Start, endLoc, a.Val, "style-attribute")
+				p.addTSXStyle(a.ValLoc.Start-p.bytesToSkip, endLoc-p.bytesToSkip, a.Val, "style-attribute")
 			}
 		case astro.EmptyAttribute:
 			p.print(a.Key)
@@ -679,7 +679,7 @@ declare const Astro: Readonly<import('astro').AstroGlobal<%s, typeof %s`, propsI
 	}
 	p.print(">")
 
-	startTagEnd := endLoc
+	startTagEnd := endLoc - p.bytesToSkip
 
 	// Render any child nodes
 	for c := n.FirstChild; c != nil; c = c.NextSibling {
@@ -693,10 +693,10 @@ declare const Astro: Readonly<import('astro').AstroGlobal<%s, typeof %s`, propsI
 
 	if n.FirstChild != nil && (n.DataAtom == atom.Script || n.DataAtom == atom.Style) {
 		if n.DataAtom == atom.Script {
-			p.addTSXScript(startTagEnd, endLoc, n.FirstChild.Data, getScriptTypeForNode(*n))
+			p.addTSXScript(startTagEnd, endLoc-p.bytesToSkip, n.FirstChild.Data, getScriptTypeForNode(*n))
 		}
 		if n.DataAtom == atom.Style {
-			p.addTSXStyle(startTagEnd, endLoc, n.FirstChild.Data, "tag")
+			p.addTSXStyle(startTagEnd, endLoc-p.bytesToSkip, n.FirstChild.Data, "tag")
 		}
 	}
 

diff --git a/internal/printer/printer.go b/internal/printer/printer.go
@@ -36,6 +36,9 @@ type printer struct {
 
 	// Optional, used only for TSX output
 	ranges TSXRanges
+	// Keep track of how many multi-byte characters we've printed so that they can be skipped whenever we need a character-based index
+	// This could be directly in the token / node information, however this would require a fairly large refactor
+	bytesToSkip int
 }
 
 var TEMPLATE_TAG = "$$render"
@@ -115,6 +118,9 @@ func (p *printer) printTextWithSourcemap(text string, l loc.Loc) {
 			continue
 		}
 		_, nextCharByteSize := utf8.DecodeRuneInString(text[pos:])
+		if nextCharByteSize > 1 {
+			p.bytesToSkip += nextCharByteSize - 1
+		}
 		p.addSourceMapping(loc.Loc{Start: start})
 		p.print(string(c))
 		start += nextCharByteSize