@wuchale/astro 0.3.0 → 0.3.2

package/dist/index.d.ts

@@ -1,30 +1,10 @@
-import type { Adapter, AdapterArgs, CreateHeuristicOpts, HeuristicFunc, LoaderChoice, RuntimeConf } from 'wuchale';
-/**
- * Create a heuristic function optimized for Astro files
- * Uses the default heuristic which handles translatable vs non-translatable strings
- */
+import type { Adapter, AdapterArgs, CreateHeuristicOpts, DeepPartial, HeuristicFunc, LoaderChoice, RuntimeConf } from 'wuchale';
 export declare function createAstroHeuristic(opts: CreateHeuristicOpts): HeuristicFunc;
-/** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
 export declare const astroDefaultHeuristic: HeuristicFunc;
 type LoadersAvailable = 'default';
 export type AstroArgs = Omit<AdapterArgs<LoadersAvailable>, 'bundleLoad' | 'granularLoad' | 'generateLoadID' | 'runtime'>;
 export declare const defaultRuntime: RuntimeConf;
 export declare const defaultArgs: AstroArgs;
 export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>): string | null;
-/**
- * Create an Astro adapter for wuchale
- *
- * @example
- * ```js
- * // wuchale.config.js
- * import { adapter as astro } from '@wuchale/astro'
- *
- * export default defineConfig({
- *   adapters: {
- *     astro: astro({ files: 'src/pages/**\/*.astro' })
- *   }
- * })
- * ```
- */
-export declare const adapter: (args?: Partial<AstroArgs>) => Adapter;
+export declare const adapter: (args?: DeepPartial<AstroArgs>) => Adapter;
 export {};

package/dist/index.js

@@ -1,11 +1,7 @@
-import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts, pofile } from 'wuchale';
+import { createHeuristic, defaultGenerateLoadID, defaultHeuristicOpts, fillDefaults, pofile } 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 => {
@@ -22,7 +18,6 @@ export function createAstroHeuristic(opts) {
         return defRes;
     };
 }
-/** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
 export const astroDefaultHeuristic = createAstroHeuristic(defaultHeuristicOpts);
 export const defaultRuntime = {
     // Astro is SSR-only, so we use non-reactive runtime by default
@@ -53,23 +48,8 @@ export function getDefaultLoaderPath(loader) {
     // just 'default', so
     return resolveLoaderPath('astro');
 }
-/**
- * Create an Astro adapter for wuchale
- *
- * @example
- * ```js
- * // wuchale.config.js
- * import { adapter as astro } from '@wuchale/astro'
- *
- * export default defineConfig({
- *   adapters: {
- *     astro: astro({ files: 'src/pages/**\/*.astro' })
- *   }
- * })
- * ```
- */
-export const adapter = (args = {}) => {
-    const { heuristic, patterns, loader, ...rest } = deepMergeObjects(args, defaultArgs);
+export const adapter = (args = defaultArgs) => {
+    const { heuristic, patterns, loader, ...rest } = fillDefaults(args, defaultArgs);
     return {
         transform: async ({ content, filename, index, expr, matchUrl }) => {
             return new AstroTransformer(content, filename, index, heuristic, patterns, expr, defaultRuntime, matchUrl).transformAs();

package/dist/runtime.d.ts

@@ -2,7 +2,7 @@ import type { Composite } from 'wuchale';
 export type WuchaleComponentProps = {
     n?: boolean;
     x: Composite;
-    t: Function[];
+    t: ((...a: any[]) => any)[];
     a?: any[];
 };
 declare const _default: ({ t, n, x, a }: WuchaleComponentProps) => any[];

package/dist/transformer.d.ts

@@ -1,16 +1,16 @@
-import type { AttributeNode, ComponentNode, CustomElementNode, ElementNode, ExpressionNode, FragmentNode, FrontmatterNode, Node, RootNode, TextNode } from '@astrojs/compiler/types';
+import type { AttributeNode, CommentNode, 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';
 export declare function parseExpr(content: string): [Estree.Expression, Estree.Comment[][]];
-type MixedAstroNodes = Node;
+type MixedVisitorAstro = MixedVisitor<Node, TextNode, CommentNode, ExpressionNode>;
 export declare class AstroTransformer extends Transformer {
     byteArray: Uint8Array;
-    currentElement?: string;
+    currentElement?: string | undefined;
     inCompoundText: boolean;
     frontMatterStart?: number;
-    mixedVisitor: MixedVisitor<MixedAstroNodes>;
+    mixedVisitor: MixedVisitorAstro;
     correctedExprRanges: WeakMap<Node | AttributeNode, {
         start: number;
         end: number;
@@ -22,14 +22,14 @@ export declare class AstroTransformer extends Transformer {
         start: number;
         end: number;
     };
-    initMixedVisitor: () => MixedVisitor<Node>;
+    initMixedVisitor: () => MixedVisitorAstro;
     _parseAndVisitExpr: (expr: string, startOffset: number, asScript?: boolean) => Message[];
     visitexpression: (node: ExpressionNode) => Message[];
     _visitChildren: (nodes: Node[]) => Message[];
     visitFragmentNode: (node: FragmentNode) => Message[];
     visitelement: (node: ElementNode) => Message[];
     visitcomponent: (node: ComponentNode) => Message[];
-    ['visitcustom-element']: (node: CustomElementNode) => Message[];
+    'visitcustom-element': (node: CustomElementNode) => Message[];
     visitattribute: (node: AttributeNode) => Message[];
     visittext: (node: TextNode) => Message[];
     visitfrontmatter: (node: FrontmatterNode) => Message[];

package/dist/transformer.js

@@ -1,7 +1,6 @@
 import { parse } from '@astrojs/compiler';
 import { tsPlugin } from '@sveltejs/acorn-typescript';
 import { Parser } from 'acorn';
-import MagicString from 'magic-string';
 import { getKey } from 'wuchale';
 import { MixedVisitor, nonWhitespaceText } from 'wuchale/adapter-utils';
 import { parseScript, scriptParseOptionsWithComments, Transformer } from 'wuchale/adapter-vanilla';
@@ -28,6 +27,7 @@ export class AstroTransformer extends Transformer {
         super(content.trim(), filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl);
         this.byteArray = new Uint8Array(Buffer.from(this.content));
         this.heuristciDetails.insideProgram = false;
+        this.mixedVisitor = this.initMixedVisitor();
     }
     _byteOffsetToIndex = (offset) => {
         // this is necessary because offsets come from astro's go parser, which works with bytes
@@ -82,8 +82,8 @@ export class AstroTransformer extends Transformer {
         isComment: node => node.type === 'comment',
         leaveInPlace: node => [''].includes(node.type),
         isExpression: node => node.type === 'expression',
-        getTextContent: (node) => node.value,
-        getCommentData: (node) => node.value.trim(),
+        getTextContent: node => node.value,
+        getCommentData: node => node.value.trim(),
         canHaveChildren: node => nodesWithChildren.includes(node.type),
         visitFunc: (child, inCompoundText) => {
             const inCompoundTextPrev = this.inCompoundText;
@@ -121,7 +121,7 @@ export class AstroTransformer extends Transformer {
             let end = '\n})}';
             if (hasExprs) {
                 begin += ',\na: [';
-                end = ']' + end;
+                end = `]${end}`;
             }
             this.mstr.appendLeft(lastChildEnd, begin);
             this.mstr.appendRight(lastChildEnd, end);
@@ -151,7 +151,7 @@ export class AstroTransformer extends Transformer {
             }
             msgs.push(...this.visitAs(part));
             const { start, end } = this.getRange(part);
-            if (end == -1)
+            if (end === -1)
                 console.log(part, node);
             expr += `"${' '.repeat(end - start)}"`;
         }
@@ -181,7 +181,7 @@ export class AstroTransformer extends Transformer {
         return msgs;
     };
     visitcomponent = (node) => this.visitelement(node);
-    ['visitcustom-element'] = (node) => this.visitelement(node);
+    'visitcustom-element' = (node) => this.visitelement(node);
     visitattribute = (node) => {
         const heurBase = {
             scope: 'attribute',
@@ -242,8 +242,6 @@ export class AstroTransformer extends Transformer {
     visitAs = (node) => this.visit(node);
     transformAs = async () => {
         const { ast } = await parse(this.content);
-        this.mstr = new MagicString(this.content);
-        this.mixedVisitor = this.initMixedVisitor();
         const msgs = this.visitAs(ast);
         if (this.frontMatterStart == null) {
             this.mstr.appendLeft(0, '---\n');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/astro",
-    "version": "0.3.0",
+    "version": "0.3.2",
     "description": "Wuchale i18n adapter for Astro files",
     "scripts": {
         "dev": "tsc --watch",
@@ -48,15 +48,16 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "@astrojs/compiler": "^2",
+        "@astrojs/compiler": "^3",
         "@sveltejs/acorn-typescript": "^1.0.9",
         "acorn": "^8.16.0",
         "magic-string": "^0.30.21",
-        "wuchale": "^0.21.0"
+        "wuchale": "^0.23.0"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",
-        "typescript": "^5.9.3"
+        "@types/node": "~24.12.2",
+        "typescript": "^6.0.3"
     },
     "type": "module"
 }

package/src/loaders/astro.js

@@ -6,7 +6,7 @@ import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
 
 const key = '${KEY}'
 
-export { loadCatalog, loadIDs, key }
+export { key, loadCatalog, loadIDs }
 
 // For non-reactive server-side rendering
 export const getRuntime = (/** @type {string} */ loadID) => currentRuntime(key, loadID)