@wuchale/astro 0.2.4 → 0.2.6

package/dist/transformer.d.ts

@@ -6,16 +6,18 @@ import { Transformer } from 'wuchale/adapter-vanilla';
 export declare function parseExpr(content: string): [Estree.Expression, Estree.Comment[][]];
 type MixedAstroNodes = Node;
 export declare class AstroTransformer extends Transformer {
+    byteArray: Uint8Array;
     currentElement?: string;
     inCompoundText: boolean;
     frontMatterStart?: number;
     mixedVisitor: MixedVisitor<MixedAstroNodes>;
-    correctedExprRanges: WeakMap<Node, {
+    correctedExprRanges: WeakMap<Node | AttributeNode, {
         start: number;
         end: number;
     }>;
     constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher);
-    _saveCorrectedExprRanges: (nodes: Node[], containerEnd: number) => void;
+    _byteOffsetToIndex: (offset?: number) => number;
+    _saveCorrectedRanges: (nodes: Node[], containerEnd: number) => void;
     getRange: (node: Node | AttributeNode) => {
         start: number;
         end: number;

package/dist/transformer.js

@@ -9,10 +9,12 @@ export function parseExpr(content) {
     const [opts, comments] = scriptParseOptionsWithComments();
     return [ExprParser.parseExpressionAt(content, 0, opts), comments];
 }
-// Astro nodes that can have children
-const nodesWithChildren = ['element', 'component', 'custom-element', 'fragment'];
+const tagNodes = ['element', 'component', 'custom-element'];
+const nodesWithChildren = [...tagNodes, 'fragment'];
 const rtRenderFunc = '_w_Tx_';
+const u8decoder = new TextDecoder();
 export class AstroTransformer extends Transformer {
+    byteArray;
     // state
     currentElement;
     inCompoundText = false;
@@ -23,38 +25,52 @@ export class AstroTransformer extends Transformer {
     constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl) {
         // trim() is VERY important, without it offset positions become wrong due to astro's parser
         super(content.trim(), filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl);
+        this.byteArray = new Uint8Array(Buffer.from(this.content));
         this.heuristciDetails.insideProgram = false;
     }
-    _saveCorrectedExprRanges = (nodes, containerEnd) => {
+    _byteOffsetToIndex = (offset) => {
+        // this is necessary because offsets come from astro's go parser, which works with bytes
+        // and that can cause misalignments when there are unicode characters
+        if (offset === undefined) {
+            return -1;
+        }
+        return u8decoder.decode(this.byteArray.slice(0, offset)).length;
+    };
+    _saveCorrectedRanges = (nodes, containerEnd) => {
         for (const [i, child] of nodes.entries()) {
-            if (child.type !== 'expression') {
+            const isExpr = child.type === 'expression';
+            const isTag = tagNodes.includes(child.type);
+            if (!(isExpr || isTag)) {
                 continue;
             }
+            let start = this._byteOffsetToIndex(child.position?.start?.offset);
+            if (isExpr) {
+                start = this.content.indexOf('{', start);
+            }
             const nextChild = nodes[i + 1];
-            let actualEnd;
+            let end = this._byteOffsetToIndex(child.position?.end?.offset);
             if (nextChild != null) {
-                actualEnd = nextChild.position?.start?.offset ?? 0;
+                end = this._byteOffsetToIndex(nextChild.position?.start?.offset);
                 if (nextChild.type === 'expression') {
-                    actualEnd = this.content.indexOf('{', actualEnd);
+                    end = this.content.indexOf('{', end);
                 }
             }
             else {
-                actualEnd = this.content.lastIndexOf('}', containerEnd) + 1;
+                const lookFor = isExpr ? '}' : '>';
+                end = this.content.lastIndexOf(lookFor, containerEnd) + lookFor.length;
             }
-            this.correctedExprRanges.set(child, {
-                start: this.content.indexOf('{', child.position?.start?.offset ?? 0),
-                end: actualEnd,
-            });
+            this.correctedExprRanges.set(child, { start, end });
         }
     };
     getRange = (node) => {
-        if (node.type === 'expression') {
-            return this.correctedExprRanges.get(node) ?? { start: -1, end: -1 };
+        const corrected = this.correctedExprRanges.get(node);
+        if (corrected) {
+            return corrected;
         }
         const { start, end } = node.position ?? {};
         return {
-            start: start?.offset ?? -1,
-            end: end?.offset ?? -1,
+            start: this._byteOffsetToIndex(start?.offset),
+            end: this._byteOffsetToIndex(end?.offset),
         };
     };
     initMixedVisitor = () => new MixedVisitor({
@@ -119,8 +135,14 @@ export class AstroTransformer extends Transformer {
         return msgs;
     };
     visitexpression = (node) => {
+        if (!node.children?.length) {
+            // can be undefined!
+            return [];
+        }
         let expr = '';
         const msgs = [];
+        const { start, end } = this.getRange(node);
+        this._saveCorrectedRanges(node.children, end);
         for (const part of node.children) {
             if (part.type === 'text') {
                 expr += part.value;
@@ -128,9 +150,10 @@ export class AstroTransformer extends Transformer {
             }
             msgs.push(...this.visitAs(part));
             const { start, end } = this.getRange(part);
+            if (end == -1)
+                console.log(part, node);
             expr += `"${' '.repeat(end - start)}"`;
         }
-        const { start } = this.getRange(node);
         msgs.push(...this._parseAndVisitExpr(expr, start + 1));
         return msgs;
     };
@@ -150,7 +173,8 @@ export class AstroTransformer extends Transformer {
         for (const attrib of node.attributes) {
             msgs.push(...this.visitAs(attrib));
         }
-        this._saveCorrectedExprRanges(node.children, node.position?.end?.offset ?? 0);
+        const { end } = this.getRange(node);
+        this._saveCorrectedRanges(node.children, end);
         msgs.push(...this._visitChildren(node.children));
         this.currentElement = currentElement;
         return msgs;
@@ -208,7 +232,10 @@ export class AstroTransformer extends Transformer {
         this.frontMatterStart = this.content.indexOf('---', start) + 3;
         return this._parseAndVisitExpr(node.value, this.frontMatterStart, true);
     };
-    visitroot = (node) => this._visitChildren(node.children ?? []); // can be undefined!
+    visitroot = (node) => {
+        this._saveCorrectedRanges(node.children, this.content.length);
+        return this._visitChildren(node.children ?? []); // can be undefined!
+    };
     visitAs = (node) => this.visit(node);
     transformAs = async () => {
         const { ast } = await parse(this.content);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/astro",
-    "version": "0.2.4",
+    "version": "0.2.6",
     "description": "Wuchale i18n adapter for Astro files",
     "scripts": {
         "dev": "tsc --watch",