@wuchale/astro 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { HeuristicFunc, Adapter, AdapterArgs, LoaderChoice, CreateHeuristicOpts } from "wuchale";
+import type { Adapter, AdapterArgs, CreateHeuristicOpts, HeuristicFunc, LoaderChoice } from 'wuchale';
 /**
  * Create a heuristic function optimized for Astro files
  * Uses the default heuristic which handles translatable vs non-translatable strings

package/dist/index.js

@@ -1,14 +1,14 @@
-import { defaultGenerateLoadID, deepMergeObjects, createHeuristic, defaultHeuristicOpts, } from "wuchale";
-import { pluralPattern } from "wuchale/adapter-vanilla";
-import { AstroTransformer, } from "./transformer.js";
-import { loaderPathResolver } from "wuchale/adapter-utils";
+import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts } from 'wuchale';
+import { loaderPathResolver } from 'wuchale/adapter-utils';
+import { pluralPattern } from 'wuchale/adapter-vanilla';
+import { AstroTransformer } from './transformer.js';
 /**
  * Create a heuristic function optimized for Astro files
  * Uses the default heuristic which handles translatable vs non-translatable strings
  */
 export function createAstroHeuristic(opts) {
     const defaultHeuristic = createHeuristic(opts);
-    return msg => {
+    return (msg) => {
         const defRes = defaultHeuristic(msg);
         if (!defRes) {
             return false;
@@ -26,7 +26,7 @@ export function createAstroHeuristic(opts) {
 export const astroDefaultHeuristic = createAstroHeuristic(defaultHeuristicOpts);
 const defaultRuntime = {
     // Astro is SSR-only, so we use non-reactive runtime by default
-    initReactive: ({ funcName }) => funcName == null ? false : null, // Only init in top-level functions
+    initReactive: ({ funcName }) => (funcName == null ? false : null), // Only init in top-level functions
     // Astro is SSR - always use non-reactive
     useReactive: () => false,
     reactive: {

package/dist/runtime.js

@@ -6,7 +6,7 @@ export default ({ t, n, x, a }) => x.map((x, i) => {
         if (!n || i > 0) {
             return a[x];
         }
-        return;
+        return null;
     }
     const tag = t[x[0]];
     if (tag == null) {

package/dist/transformer.d.ts

@@ -1,15 +1,12 @@
-import { Message } from "wuchale";
-import type * as Estree from "acorn";
-import { Transformer } from "wuchale/adapter-vanilla";
-import type { IndexTracker, HeuristicFunc, TransformOutput, RuntimeConf, CatalogExpr, CodePattern, UrlMatcher } from "wuchale";
-import { MixedVisitor, type CommentDirectives } from "wuchale/adapter-utils";
-import type { ElementNode, TextNode, FragmentNode, Node, RootNode, ExpressionNode, AttributeNode, FrontmatterNode, ComponentNode, CustomElementNode } from "@astrojs/compiler/types";
+import type { AttributeNode, ComponentNode, CustomElementNode, ElementNode, ExpressionNode, FragmentNode, FrontmatterNode, Node, RootNode, TextNode } from '@astrojs/compiler/types';
+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';
 type MixedAstroNodes = Node;
 export declare class AstroTransformer extends Transformer {
     currentElement?: string;
     inCompoundText: boolean;
-    commentDirectivesStack: CommentDirectives[];
-    lastVisitIsComment: boolean;
     frontMatterStart?: number;
     mixedVisitor: MixedVisitor<MixedAstroNodes>;
     correctedExprRanges: WeakMap<Node, {

package/dist/transformer.js

@@ -1,22 +1,14 @@
-import MagicString from "magic-string";
-import { Message } from "wuchale";
-import { parseScript, Transformer } from "wuchale/adapter-vanilla";
-import { nonWhitespaceText, MixedVisitor, processCommentDirectives, } from "wuchale/adapter-utils";
-import { parse } from "@astrojs/compiler";
+import { parse } from '@astrojs/compiler';
+import MagicString from 'magic-string';
+import { MixedVisitor, nonWhitespaceText } from 'wuchale/adapter-utils';
+import { parseScript, Transformer } from 'wuchale/adapter-vanilla';
 // Astro nodes that can have children
-const nodesWithChildren = [
-    "element",
-    "component",
-    "custom-element",
-    "fragment",
-];
-const rtRenderFunc = "_w_Tx_";
+const nodesWithChildren = ['element', 'component', 'custom-element', 'fragment'];
+const rtRenderFunc = '_w_Tx_';
 export class AstroTransformer extends Transformer {
     // state
     currentElement;
     inCompoundText = false;
-    commentDirectivesStack = [];
-    lastVisitIsComment = false;
     frontMatterStart;
     mixedVisitor;
     // astro's compiler gives wrong offsets for expressions
@@ -44,7 +36,7 @@ export class AstroTransformer extends Transformer {
             }
             this.correctedExprRanges.set(child, {
                 start: this.content.indexOf('{', child.position?.start?.offset ?? 0),
-                end: actualEnd
+                end: actualEnd,
             });
         }
     };
@@ -52,7 +44,7 @@ export class AstroTransformer extends Transformer {
         if (node.type === 'expression') {
             return this.correctedExprRanges.get(node) ?? { start: -1, end: -1 };
         }
-        let { start, end } = node.position ?? {};
+        const { start, end } = node.position ?? {};
         return {
             start: start?.offset ?? -1,
             end: end?.offset ?? -1,
@@ -62,12 +54,12 @@ 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,
+        getCommentData: (node) => node.value.trim(),
         canHaveChildren: (node) => nodesWithChildren.includes(node.type),
         visitFunc: (child, inCompoundText) => {
             const inCompoundTextPrev = this.inCompoundText;
@@ -121,7 +113,7 @@ export class AstroTransformer extends Transformer {
             msgs = this.visit(ast);
         }
         else {
-            msgs = ast.body.map(this.visit).flat();
+            msgs = ast.body.flatMap(this.visit);
         }
         this.mstr.offset = 0; // restore
         return msgs;
@@ -148,7 +140,7 @@ export class AstroTransformer extends Transformer {
         inCompoundText: this.inCompoundText,
         scope: 'markup',
         element: this.currentElement,
-        useComponent: this.currentElement !== 'title'
+        useComponent: this.currentElement !== 'title',
     });
     visitFragmentNode = (node) => this._visitChildren(node.children);
     visitelement = (node) => {
@@ -213,44 +205,8 @@ export class AstroTransformer extends Transformer {
         this.frontMatterStart = this.content.indexOf('---', start) + 3;
         return this._parseAndVisitExpr(node.value, this.frontMatterStart, true);
     };
-    visitroot = (node) => {
-        const msgs = [];
-        // ?? [] because it's undefined on an empty file
-        for (const rootChild of node.children ?? []) {
-            msgs.push(...this.visitAs(rootChild));
-        }
-        return msgs;
-    };
-    visitAs = (node) => {
-        if (node.type === 'comment') {
-            this.commentDirectives = processCommentDirectives(node.value.trim(), this.commentDirectives);
-            if (this.lastVisitIsComment) {
-                this.commentDirectivesStack[this.commentDirectivesStack.length - 1] = this.commentDirectives;
-            }
-            else {
-                this.commentDirectivesStack.push(this.commentDirectives);
-            }
-            this.lastVisitIsComment = true;
-            return [];
-        }
-        if (node.type === 'text' && !node.value.trim()) {
-            return [];
-        }
-        let msgs = [];
-        const commentDirectivesPrev = this.commentDirectives;
-        if (this.lastVisitIsComment) {
-            this.commentDirectives = this.commentDirectivesStack.pop();
-            this.lastVisitIsComment = false;
-        }
-        if (this.commentDirectives.ignoreFile) {
-            return [];
-        }
-        if (this.commentDirectives.forceType !== false) {
-            msgs = this.visit(node);
-        }
-        this.commentDirectives = commentDirectivesPrev;
-        return msgs;
-    };
+    visitroot = (node) => this._visitChildren(node.children ?? []); // can be undefined!
+    visitAs = (node) => this.visit(node);
     transformAs = async () => {
         const { ast } = await parse(this.content);
         this.mstr = new MagicString(this.content);
@@ -260,10 +216,7 @@ export class AstroTransformer extends Transformer {
             this.mstr.appendLeft(0, '---\n');
             this.mstr.appendRight(0, '---\n');
         }
-        const header = [
-            `import ${rtRenderFunc} from "@wuchale/astro/runtime.js"`,
-            this.initRuntime(),
-        ].join('\n');
+        const header = [`import ${rtRenderFunc} from "@wuchale/astro/runtime.js"`, this.initRuntime()].join('\n');
         return this.finalize(msgs, this.frontMatterStart ?? 0, header);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/astro",
-    "version": "0.2.0",
+    "version": "0.2.2",
     "description": "Wuchale i18n adapter for Astro files",
     "scripts": {
         "dev": "tsc --watch",
@@ -13,6 +13,7 @@
         "translation",
         "gettext",
         "astro",
+        "withastro",
         "vite",
         "po",
         "vite-plugin",
@@ -51,7 +52,7 @@
         "@sveltejs/acorn-typescript": "^1.0.8",
         "acorn": "^8.15.0",
         "magic-string": "^0.30.21",
-        "wuchale": "^0.19.0"
+        "wuchale": "^0.19.1"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",

package/src/loaders/astro.js

@@ -1,7 +1,8 @@
 // Astro loader template (server-side, synchronous)
 // This is a template file that wuchale will use to generate the actual loader
-import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
+
 import { currentRuntime } from 'wuchale/load-utils/server'
+import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
 
 const key = '${KEY}'