@wuchale/astro 0.2.8 → 0.3.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { Adapter, AdapterArgs, CreateHeuristicOpts, HeuristicFunc, LoaderChoice } from 'wuchale';
+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
@@ -7,9 +7,10 @@ export declare function createAstroHeuristic(opts: CreateHeuristicOpts): Heurist
 /** 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 = AdapterArgs<LoadersAvailable>;
+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>, bundle: boolean): string | null;
+export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>): string | null;
 /**
  * Create an Astro adapter for wuchale
  *

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts } from 'wuchale';
+import { createHeuristic, deepMergeObjects, defaultGenerateLoadID, defaultHeuristicOpts, pofile } from 'wuchale';
 import { loaderPathResolver } from 'wuchale/adapter-utils';
 import { pluralPattern } from 'wuchale/adapter-vanilla';
 import { AstroTransformer } from './transformer.js';
@@ -24,7 +24,7 @@ export function createAstroHeuristic(opts) {
 }
 /** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
 export const astroDefaultHeuristic = createAstroHeuristic(defaultHeuristicOpts);
-const defaultRuntime = {
+export 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
     // Astro is SSR - always use non-reactive
@@ -40,26 +40,18 @@ const defaultRuntime = {
 };
 export const defaultArgs = {
     files: 'src/**/*.astro',
-    localesDir: './src/locales',
+    storage: pofile(),
     patterns: [pluralPattern],
     heuristic: astroDefaultHeuristic,
-    granularLoad: false,
-    bundleLoad: false,
     loader: 'default',
-    generateLoadID: defaultGenerateLoadID,
-    runtime: defaultRuntime,
 };
 const resolveLoaderPath = loaderPathResolver(import.meta.url, '../src/loaders', 'js');
-export function getDefaultLoaderPath(loader, bundle) {
+export function getDefaultLoaderPath(loader) {
     if (loader === 'custom') {
         return null;
     }
     // just 'default', so
-    let loaderName = 'astro';
-    if (bundle) {
-        loaderName += '.bundle';
-    }
-    return resolveLoaderPath(loaderName);
+    return resolveLoaderPath('astro');
 }
 /**
  * Create an Astro adapter for wuchale
@@ -77,14 +69,17 @@ export function getDefaultLoaderPath(loader, bundle) {
  * ```
  */
 export const adapter = (args = {}) => {
-    const { heuristic, patterns, runtime, loader, ...rest } = deepMergeObjects(args, defaultArgs);
+    const { heuristic, patterns, loader, ...rest } = deepMergeObjects(args, defaultArgs);
     return {
         transform: async ({ content, filename, index, expr, matchUrl }) => {
-            return new AstroTransformer(content, filename, index, heuristic, patterns, expr, runtime, matchUrl).transformAs();
+            return new AstroTransformer(content, filename, index, heuristic, patterns, expr, defaultRuntime, matchUrl).transformAs();
         },
         loaderExts: ['.js', '.ts'],
-        defaultLoaderPath: getDefaultLoaderPath(loader, rest.bundleLoad),
-        runtime,
+        defaultLoaderPath: getDefaultLoaderPath(loader),
+        granularLoad: false,
+        bundleLoad: false,
+        generateLoadID: defaultGenerateLoadID,
+        runtime: defaultRuntime,
         ...rest,
     };
 };

package/dist/transformer.js

@@ -2,6 +2,7 @@ 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';
 const ExprParser = Parser.extend(tsPlugin());
@@ -101,7 +102,7 @@ export class AstroTransformer extends Transformer {
                 begin += `${this.vars().nestCtx},\nn: true`;
             }
             else {
-                const index = this.index.get(msgInfo.toKey());
+                const index = this.index.get(getKey(msgInfo.msgStr, msgInfo.context));
                 begin += `${this.vars().rtCtx}(${index})`;
             }
             if (nestedRanges.length > 0) {
@@ -199,7 +200,7 @@ export class AstroTransformer extends Transformer {
             if (!pass) {
                 return [];
             }
-            this.mstr.update(start, start + node.value.length + 2, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+            this.mstr.update(start, start + node.value.length + 2, `{${this.literalRepl(msgInfo)}}`);
             return [msgInfo];
         }
         if (node.kind === 'expression') {
@@ -224,7 +225,7 @@ export class AstroTransformer extends Transformer {
             return [];
         }
         const { start, end } = this.getRange(node);
-        this.mstr.update(start + startWh, end - endWh, `{${this.vars().rtTrans}(${this.index.get(msgInfo.toKey())})}`);
+        this.mstr.update(start + startWh, end - endWh, `{${this.literalRepl(msgInfo)}}`);
         return [msgInfo];
     };
     visitfrontmatter = (node) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/astro",
-    "version": "0.2.8",
+    "version": "0.3.1",
     "description": "Wuchale i18n adapter for Astro files",
     "scripts": {
         "dev": "tsc --watch",
@@ -48,11 +48,11 @@
     "author": "K1DV5",
     "license": "MIT",
     "dependencies": {
-        "@astrojs/compiler": "^2.13.1",
+        "@astrojs/compiler": "^3",
         "@sveltejs/acorn-typescript": "^1.0.9",
-        "acorn": "^8.15.0",
+        "acorn": "^8.16.0",
         "magic-string": "^0.30.21",
-        "wuchale": "^0.20.0"
+        "wuchale": "^0.22.0"
     },
     "devDependencies": {
         "@types/estree-jsx": "^1.0.5",

package/src/loaders/astro.bundle.js

@@ -1,21 +0,0 @@
-// Astro bundle loader template (server-side, synchronous, all locales bundled)
-import { toRuntime } from 'wuchale/runtime'
-
-const catalogs = __CATALOGS__
-const locales = Object.keys(catalogs)
-
-const store = {}
-for (const locale of locales) {
-    store[locale] = toRuntime(catalogs[locale], locale)
-}
-
-// Get current locale from global context (set by middleware)
-function getCurrentLocale() {
-    return globalThis.__wuchale_locale__ || locales[0]
-}
-
-export const getRuntime = (/** @type {string} */ _loadID) => {
-    return store[getCurrentLocale()]
-}
-
-export const getRuntimeRx = getRuntime