@wuchale/astro 0.2.5 → 0.2.6

package/dist/transformer.d.ts

@@ -17,7 +17,7 @@ export declare class AstroTransformer extends Transformer {
     }>;
     constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: UrlMatcher);
     _byteOffsetToIndex: (offset?: number) => number;
-    _saveCorrectedExprRanges: (nodes: Node[], containerEnd: number) => void;
+    _saveCorrectedRanges: (nodes: Node[], containerEnd: number) => void;
     getRange: (node: Node | AttributeNode) => {
         start: number;
         end: number;

package/dist/transformer.js

@@ -9,8 +9,8 @@ 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 {
@@ -36,11 +36,11 @@ export class AstroTransformer extends Transformer {
         }
         return u8decoder.decode(this.byteArray.slice(0, offset)).length;
     };
-    _saveCorrectedExprRanges = (nodes, containerEnd) => {
+    _saveCorrectedRanges = (nodes, containerEnd) => {
         for (const [i, child] of nodes.entries()) {
             const isExpr = child.type === 'expression';
-            const isMeta = child.type === 'element' && child.name === 'meta';
-            if (!(isExpr || isMeta)) {
+            const isTag = tagNodes.includes(child.type);
+            if (!(isExpr || isTag)) {
                 continue;
             }
             let start = this._byteOffsetToIndex(child.position?.start?.offset);
@@ -142,7 +142,7 @@ export class AstroTransformer extends Transformer {
         let expr = '';
         const msgs = [];
         const { start, end } = this.getRange(node);
-        this._saveCorrectedExprRanges(node.children, end);
+        this._saveCorrectedRanges(node.children, end);
         for (const part of node.children) {
             if (part.type === 'text') {
                 expr += part.value;
@@ -150,6 +150,8 @@ 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)}"`;
         }
         msgs.push(...this._parseAndVisitExpr(expr, start + 1));
@@ -172,7 +174,7 @@ export class AstroTransformer extends Transformer {
             msgs.push(...this.visitAs(attrib));
         }
         const { end } = this.getRange(node);
-        this._saveCorrectedExprRanges(node.children, end);
+        this._saveCorrectedRanges(node.children, end);
         msgs.push(...this._visitChildren(node.children));
         this.currentElement = currentElement;
         return msgs;
@@ -231,7 +233,7 @@ export class AstroTransformer extends Transformer {
         return this._parseAndVisitExpr(node.value, this.frontMatterStart, true);
     };
     visitroot = (node) => {
-        this._saveCorrectedExprRanges(node.children, this.content.length);
+        this._saveCorrectedRanges(node.children, this.content.length);
         return this._visitChildren(node.children ?? []); // can be undefined!
     };
     visitAs = (node) => this.visit(node);

package/package.json

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