@wuchale/astro 0.2.2 → 0.2.3

package/dist/index.js

@@ -8,7 +8,7 @@ import { AstroTransformer } from './transformer.js';
  */
 export function createAstroHeuristic(opts) {
     const defaultHeuristic = createHeuristic(opts);
-    return (msg) => {
+    return msg => {
         const defRes = defaultHeuristic(msg);
         if (!defRes) {
             return false;
@@ -30,12 +30,12 @@ const defaultRuntime = {
     // Astro is SSR - always use non-reactive
     useReactive: () => false,
     reactive: {
-        wrapInit: (expr) => expr,
-        wrapUse: (expr) => expr,
+        wrapInit: expr => expr,
+        wrapUse: expr => expr,
     },
     plain: {
-        wrapInit: (expr) => expr,
-        wrapUse: (expr) => expr,
+        wrapInit: expr => expr,
+        wrapUse: expr => expr,
     },
 };
 const defaultArgs = {

package/dist/transformer.d.ts

@@ -3,6 +3,7 @@ import type * as Estree from 'acorn';
 import type { CatalogExpr, CodePattern, HeuristicFunc, IndexTracker, Message, RuntimeConf, TransformOutput, UrlMatcher } from 'wuchale';
 import { MixedVisitor } from 'wuchale/adapter-utils';
 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 {
     currentElement?: string;
@@ -20,7 +21,7 @@ export declare class AstroTransformer extends Transformer {
         end: number;
     };
     initMixedVisitor: () => MixedVisitor<Node>;
-    _parseAndVisitExpr: (expr: string, startOffset: number, startFromProgram?: boolean) => Message[];
+    _parseAndVisitExpr: (expr: string, startOffset: number, asScript?: boolean) => Message[];
     visitexpression: (node: ExpressionNode) => Message[];
     _visitChildren: (nodes: Node[]) => Message[];
     visitFragmentNode: (node: FragmentNode) => Message[];

package/dist/transformer.js

@@ -1,7 +1,14 @@
 import { parse } from '@astrojs/compiler';
+import { tsPlugin } from '@sveltejs/acorn-typescript';
+import { Parser } from 'acorn';
 import MagicString from 'magic-string';
 import { MixedVisitor, nonWhitespaceText } from 'wuchale/adapter-utils';
-import { parseScript, Transformer } from 'wuchale/adapter-vanilla';
+import { parseScript, scriptParseOptionsWithComments, Transformer } from 'wuchale/adapter-vanilla';
+const ExprParser = Parser.extend(tsPlugin());
+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 rtRenderFunc = '_w_Tx_';
@@ -54,13 +61,13 @@ export class AstroTransformer extends Transformer {
         mstr: this.mstr,
         vars: this.vars,
         getRange: this.getRange,
-        isText: (node) => node.type === 'text',
-        isComment: (node) => node.type === 'comment',
-        leaveInPlace: (node) => [''].includes(node.type),
-        isExpression: (node) => node.type === 'expression',
+        isText: node => node.type === 'text',
+        isComment: node => node.type === 'comment',
+        leaveInPlace: node => [''].includes(node.type),
+        isExpression: node => node.type === 'expression',
         getTextContent: (node) => node.value,
         getCommentData: (node) => node.value.trim(),
-        canHaveChildren: (node) => nodesWithChildren.includes(node.type),
+        canHaveChildren: node => nodesWithChildren.includes(node.type),
         visitFunc: (child, inCompoundText) => {
             const inCompoundTextPrev = this.inCompoundText;
             this.inCompoundText = inCompoundText;
@@ -103,18 +110,11 @@ export class AstroTransformer extends Transformer {
             this.mstr.appendRight(lastChildEnd, end);
         },
     });
-    _parseAndVisitExpr = (expr, startOffset, startFromProgram = false) => {
-        const [ast, comments] = parseScript(expr);
+    _parseAndVisitExpr = (expr, startOffset, asScript = false) => {
+        const [ast, comments] = (asScript ? parseScript : parseExpr)(expr);
         this.comments = comments;
         this.mstr.offset = startOffset;
-        // not just visit Program because visitProgram sets insideProgram to true
-        let msgs;
-        if (startFromProgram) {
-            msgs = this.visit(ast);
-        }
-        else {
-            msgs = ast.body.flatMap(this.visit);
-        }
+        const msgs = this.visit(ast);
         this.mstr.offset = 0; // restore
         return msgs;
     };
@@ -164,6 +164,9 @@ export class AstroTransformer extends Transformer {
             attribute: node.name,
         };
         let { start } = this.getRange(node);
+        if (node.kind === 'spread') {
+            return this._parseAndVisitExpr(node.name, start);
+        }
         if (node.kind !== 'empty') {
             start = this.content.indexOf('=', start) + 1;
         }

package/package.json

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