@astroscope/i18n 0.2.1 → 0.2.3

package/dist/{babel-plugin-K2K4ZPM5.js → babel-plugin-GOB6FMZ2.js}

@@ -103,10 +103,11 @@ function i18nExtractPlugin({ types: t }) {
         const meta = args.length >= 2 && t.isExpression(args[1]) ? extractMeta(t, args[1], warn) : { fallback: "" };
         state.opts.onKeyExtracted({ key, meta, file, line });
         if (state.opts.stripFallbacks && args.length >= 2) {
+          const firstArg = args[0];
           if (args.length === 2) {
-            path.node.arguments = [args[0]];
+            path.node.arguments = [firstArg];
           } else {
-            path.node.arguments = [args[0], t.identifier("undefined"), args[2]];
+            path.node.arguments = [firstArg, t.identifier("undefined"), args[2]];
           }
         }
       }

package/dist/{chunk-EO4FUQXR.js → chunk-4IUQAJ6R.js}

@@ -29,31 +29,193 @@ function getManifest() {
 }
 
 // src/extraction/vite-plugin.ts
-import fs from "fs";
+import fs2 from "fs";
 import path2 from "path";
 import MagicString from "magic-string";
+
+// src/extraction/extract.ts
+var TS_EXTENSIONS = [".ts", ".tsx"];
+var JSX_EXTENSIONS = [".jsx", ".tsx"];
+var JS_EXTENSIONS = [".js", ".jsx"];
+var BABEL_EXTENSIONS = [...TS_EXTENSIONS, ...JS_EXTENSIONS];
+var ALL_EXTENSIONS = [...BABEL_EXTENSIONS, ".astro"];
+async function extractKeysFromFile(options) {
+  const { filename, code, logger, stripFallbacks = false, onKeyExtracted } = options;
+  const keys = [];
+  const [{ transformAsync }, { i18nExtractPlugin }] = await Promise.all([
+    import("@babel/core"),
+    import("./babel-plugin-GOB6FMZ2.js")
+  ]);
+  const isTypeScript = TS_EXTENSIONS.some((ext) => filename.endsWith(ext)) || filename.endsWith(".astro");
+  const isJSX = JSX_EXTENSIONS.some((ext) => filename.endsWith(ext));
+  const result = await transformAsync(code, {
+    filename,
+    sourceMaps: stripFallbacks,
+    // only need source maps when transforming
+    babelrc: false,
+    configFile: false,
+    parserOpts: {
+      plugins: [...isTypeScript ? ["typescript"] : [], ...isJSX ? ["jsx"] : []]
+    },
+    plugins: [
+      [
+        i18nExtractPlugin,
+        {
+          stripFallbacks,
+          onKeyExtracted: (key) => {
+            keys.push(key);
+            onKeyExtracted?.(key);
+          },
+          logger
+        }
+      ]
+    ]
+  });
+  return {
+    keys,
+    code: result?.code ?? null,
+    map: result?.map
+  };
+}
+
+// src/extraction/key-store.ts
+var KeyStore = class {
+  constructor(logger) {
+    this.logger = logger;
+  }
+  extractedKeys = [];
+  fileToKeys = /* @__PURE__ */ new Map();
+  filesWithI18n = /* @__PURE__ */ new Set();
+  /**
+   * Add keys for a file, replacing any existing keys for that file.
+   */
+  addFileKeys(filename, keys) {
+    const oldKeys = this.fileToKeys.get(filename);
+    const newKeyStrings = keys.map((k) => k.key);
+    if (oldKeys) {
+      const added = newKeyStrings.filter((k) => !oldKeys.includes(k));
+      const removed = oldKeys.filter((k) => !newKeyStrings.includes(k));
+      const file = filename.split("/").pop();
+      if (added.length > 0 || removed.length > 0) {
+        const parts = [];
+        if (added.length > 0) parts.push(`+${added.length}`);
+        if (removed.length > 0) parts.push(`-${removed.length}`);
+        this.logger.info(`hmr: ${parts.join(" ")} key(s) in ${file}`);
+      }
+    }
+    if (oldKeys) {
+      for (let i = this.extractedKeys.length - 1; i >= 0; i--) {
+        if (this.extractedKeys[i]?.file === filename) {
+          this.extractedKeys.splice(i, 1);
+        }
+      }
+    }
+    this.filesWithI18n.add(filename);
+    if (keys.length > 0) {
+      this.extractedKeys.push(...keys);
+    }
+    this.fileToKeys.set(filename, newKeyStrings);
+  }
+  /**
+   * Get count of unique keys.
+   */
+  get uniqueKeyCount() {
+    return new Set(this.extractedKeys.map((k) => k.key)).size;
+  }
+  /**
+   * Merge another store's data into this one.
+   */
+  merge(other) {
+    for (const [file, keys] of other.fileToKeys) {
+      this.fileToKeys.set(file, keys);
+    }
+    for (const file of other.filesWithI18n) {
+      this.filesWithI18n.add(file);
+    }
+    this.extractedKeys.push(...other.extractedKeys);
+  }
+};
+
+// src/extraction/scan.ts
+import fs from "fs";
+import { glob } from "glob";
+var GLOB_PATTERN = `src/**/*.{${ALL_EXTENSIONS.map((e) => e.slice(1)).join(",")}}`;
+async function compileAstro(code, filename) {
+  try {
+    const { transform } = await import("@astrojs/compiler");
+    const result = await transform(code, { filename });
+    return result.code;
+  } catch {
+    return null;
+  }
+}
+async function scan(projectRoot, logger) {
+  const store = new KeyStore(logger);
+  const files = await glob(GLOB_PATTERN, {
+    cwd: projectRoot,
+    absolute: true,
+    ignore: ["**/node_modules/**"]
+  });
+  const results = await Promise.all(
+    files.map(async (file) => {
+      let code = await fs.promises.readFile(file, "utf-8");
+      if (!code.includes("@astroscope/i18n/t")) {
+        return { file, keys: null };
+      }
+      if (file.endsWith(".astro")) {
+        const compiled = await compileAstro(code, file);
+        if (!compiled) {
+          return { file, keys: null };
+        }
+        code = compiled;
+      }
+      const result = await extractKeysFromFile({
+        filename: file,
+        code,
+        logger,
+        stripFallbacks: false
+      });
+      return { file, keys: result.keys.length > 0 ? result.keys : null };
+    })
+  );
+  for (const { file, keys } of results) {
+    if (keys) {
+      store.addFileKeys(file, keys);
+    }
+  }
+  return store;
+}
+
+// src/extraction/vite-plugin.ts
 var VIRTUAL_MODULE_ID = "virtual:@astroscope/i18n/manifest";
 var isVirtualModuleId = (id) => id === VIRTUAL_MODULE_ID || id.startsWith(`${VIRTUAL_MODULE_ID}?`);
 var RESOLVED_VIRTUAL_MODULE_ID = `\0${VIRTUAL_MODULE_ID}`;
 var isResolvedVirtualModuleId = (id) => id === RESOLVED_VIRTUAL_MODULE_ID || id.startsWith(`\0${VIRTUAL_MODULE_ID}?`);
 var MANIFEST_FILE_NAME = "i18n-manifest.json";
-var INCLUDE_EXTENSIONS = [".ts", ".tsx", ".js", ".jsx", ".astro"];
 function i18nVitePlugin(options) {
   const { logger } = options;
-  const extractedKeys = [];
-  const fileToKeys = /* @__PURE__ */ new Map();
-  const filesWithI18n = /* @__PURE__ */ new Set();
+  const store = new KeyStore(logger);
   let isBuild = false;
   let isSSR = false;
+  let projectRoot = "";
   return {
     name: "@astroscope/i18n/extract",
     enforce: "pre",
     configResolved(config) {
       const state = getGlobalState();
       state.projectRoot = config.root;
-      state.extractedKeys = extractedKeys;
+      state.extractedKeys = store.extractedKeys;
       isBuild = config.command === "build";
       isSSR = !!config.build.ssr;
+      projectRoot = config.root;
+    },
+    async configureServer(server) {
+      if (server.config.isProduction || isBuild) {
+        return;
+      }
+      const result = await scan(projectRoot, logger);
+      store.merge(result);
+      logger.info(`dev mode: scanned ${result.fileToKeys.size} files, found ${result.uniqueKeyCount} keys`);
     },
     resolveId(id) {
       if (isVirtualModuleId(id)) {
@@ -83,7 +245,7 @@ export function getManifest() { return _getManifest(); }
       }
     },
     async transform(code, filename) {
-      if (!INCLUDE_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
+      if (!ALL_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
         return null;
       }
       if (filename.includes("node_modules")) {
@@ -92,43 +254,14 @@ export function getManifest() { return _getManifest(); }
       if (!code.includes("@astroscope/i18n/t")) {
         return null;
       }
-      filesWithI18n.add(filename);
-      const fileKeys = [];
-      const [{ transformAsync }, { i18nExtractPlugin }] = await Promise.all([
-        import("@babel/core"),
-        import("./babel-plugin-K2K4ZPM5.js")
-      ]);
-      const result = await transformAsync(code, {
+      const result = await extractKeysFromFile({
         filename,
-        sourceMaps: true,
-        babelrc: false,
-        configFile: false,
-        parserOpts: {
-          plugins: [
-            ...filename.endsWith(".ts") || filename.endsWith(".tsx") ? ["typescript"] : [],
-            ...filename.endsWith(".jsx") || filename.endsWith(".tsx") ? ["jsx"] : []
-          ]
-        },
-        plugins: [
-          [
-            i18nExtractPlugin,
-            {
-              stripFallbacks: isBuild,
-              // only strip in production
-              onKeyExtracted: (key) => fileKeys.push(key),
-              logger
-            }
-          ]
-        ]
+        code,
+        logger,
+        stripFallbacks: isBuild
       });
-      if (fileKeys.length > 0) {
-        extractedKeys.push(...fileKeys);
-        fileToKeys.set(
-          filename,
-          fileKeys.map((k) => k.key)
-        );
-      }
-      if (isBuild && result?.code) {
+      store.addFileKeys(filename, result.keys);
+      if (isBuild && result.code) {
         return { code: result.code, map: result.map };
       }
       return null;
@@ -145,9 +278,9 @@ export function getManifest() { return _getManifest(); }
           const keys = /* @__PURE__ */ new Set();
           let hasI18nModule = false;
           for (const moduleId of chunk.moduleIds) {
-            const moduleKeys = fileToKeys.get(moduleId);
+            const moduleKeys = store.fileToKeys.get(moduleId);
             moduleKeys?.forEach((k) => keys.add(k));
-            if (filesWithI18n.has(moduleId)) {
+            if (store.filesWithI18n.has(moduleId)) {
               hasI18nModule = true;
             }
           }
@@ -202,14 +335,14 @@ export function getManifest() { return _getManifest(); }
           chunk.map = s.generateMap({ hires: true });
         }
       }
-      logger.info(`manifest: ${Object.keys(state.chunkManifest).length} chunks, ${extractedKeys.length} keys`);
+      logger.info(`manifest: ${Object.keys(state.chunkManifest).length} chunks, ${store.uniqueKeyCount} keys`);
     },
     writeBundle(outputOptions) {
       if (!isSSR && outputOptions.dir) {
         const chunksDir = path2.resolve(outputOptions.dir, "..", "server", "chunks");
         const manifestPath = path2.join(chunksDir, MANIFEST_FILE_NAME);
-        if (fs.existsSync(chunksDir)) {
-          fs.writeFileSync(manifestPath, JSON.stringify(getManifest()));
+        if (fs2.existsSync(chunksDir)) {
+          fs2.writeFileSync(manifestPath, JSON.stringify(getManifest()));
         } else {
           logger.error(`server chunks directory not found, cannot write manifest to ${manifestPath}`);
         }

package/dist/{chunk-RHWEV4L2.js → chunk-ZKXMIGSF.js}

@@ -53,6 +53,8 @@ var I18nSingleton = class {
   hashCache = /* @__PURE__ */ new Map();
   // locale -> inline script for I18nScript component
   scriptCache = /* @__PURE__ */ new Map();
+  // "locale:chunkName" -> encoded chunk response body
+  chunkCache = /* @__PURE__ */ new Map();
   // manifest getter (set by init module, provides live data in dev mode)
   manifestGetter = null;
   async configure(config) {
@@ -153,6 +155,38 @@ var I18nSingleton = class {
   getHashes(locale) {
     return this.hashCache.get(locale) ?? {};
   }
+  /**
+   * Get the encoded chunk response body for a locale/chunk combination.
+   * Cached to avoid repeated JSON.stringify and encoding on each request.
+   * Returns undefined if chunk not found in manifest.
+   */
+  getChunkBody(locale, chunkName) {
+    const keys = this.getManifest().chunks[chunkName];
+    if (!keys) {
+      return void 0;
+    }
+    const cacheKey = `${locale}:${chunkName}`;
+    const cached = this.chunkCache.get(cacheKey);
+    if (cached) {
+      return cached;
+    }
+    const translations = this.getTranslations(locale);
+    const chunkTranslations = {};
+    for (const key of keys) {
+      if (translations[key]) {
+        chunkTranslations[key] = translations[key];
+      }
+    }
+    const js = `/* @astroscope/i18n chunk: ${chunkName} */
+(function() {
+  var i = window.__i18n__;
+  if (i) Object.assign(i.translations, ${JSON.stringify(chunkTranslations)});
+})();
+`;
+    const body = new TextEncoder().encode(js);
+    this.chunkCache.set(cacheKey, body);
+    return body;
+  }
   /**
    * Get the inline script for I18nScript component.
    * Cached per locale, invalidated when translations change.
@@ -203,6 +237,11 @@ var I18nSingleton = class {
       this.compiledCache.delete(locale);
       this.hashCache.delete(locale);
       this.scriptCache.delete(locale);
+      for (const key of this.chunkCache.keys()) {
+        if (key.startsWith(`${locale}:`)) {
+          this.chunkCache.delete(key);
+        }
+      }
     }
   }
   resolveLocales(locales) {

package/dist/client/directives/visible.js

@@ -11,9 +11,7 @@ var visibleDirective = (load, options, el) => {
     await hydrate();
   };
   const rawOptions = typeof options.value === "object" ? options.value : void 0;
-  const ioOptions = {
-    rootMargin: rawOptions?.rootMargin
-  };
+  const ioOptions = rawOptions?.rootMargin ? { rootMargin: rawOptions.rootMargin } : {};
   const io = new IntersectionObserver((entries) => {
     for (const entry of entries) {
       if (!entry.isIntersecting) continue;

package/dist/extraction/index.js

@@ -1,7 +1,7 @@
 import {
   getManifest,
   i18nVitePlugin
-} from "../chunk-EO4FUQXR.js";
+} from "../chunk-4IUQAJ6R.js";
 import "../chunk-4A5BKHFN.js";
 export {
   getManifest,

package/dist/{i18n-mTHTcD8K.d.ts → i18n-BBAAVYz_.d.ts}

@@ -31,6 +31,7 @@ declare class I18nSingleton {
     private compiledCache;
     private hashCache;
     private scriptCache;
+    private chunkCache;
     private manifestGetter;
     configure(config: I18nConfig): Promise<void>;
     isConfigured(): boolean;
@@ -45,6 +46,12 @@ declare class I18nSingleton {
      */
     getManifest(): ExtractionManifest;
     getHashes(locale: string): Record<string, string>;
+    /**
+     * Get the encoded chunk response body for a locale/chunk combination.
+     * Cached to avoid repeated JSON.stringify and encoding on each request.
+     * Returns undefined if chunk not found in manifest.
+     */
+    getChunkBody(locale: string, chunkName: string): Uint8Array | undefined;
     /**
      * Get the inline script for I18nScript component.
      * Cached per locale, invalidated when translations change.

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AstroIntegration, MiddlewareHandler, APIContext } from 'astro';
-export { F as FallbackBehavior, I as I18nConfig, i as i18n } from './i18n-mTHTcD8K.js';
+export { F as FallbackBehavior, I as I18nConfig, i as i18n } from './i18n-BBAAVYz_.js';
 import { ExcludePattern } from '@astroscope/excludes';
 export { R as RawTranslations, T as TranslationMeta } from './types-DNRFj1XA.js';
 export { E as ExtractedKey, a as ExtractionManifest } from './types-DTUho6gi.js';

package/dist/index.js

@@ -1,10 +1,10 @@
 import {
   i18nVitePlugin
-} from "./chunk-EO4FUQXR.js";
+} from "./chunk-4IUQAJ6R.js";
 import {
   i18n,
   runWithContext
-} from "./chunk-RHWEV4L2.js";
+} from "./chunk-ZKXMIGSF.js";
 import "./chunk-KNDYKTHE.js";
 import "./chunk-4A5BKHFN.js";
 
@@ -69,6 +69,13 @@ function createI18nChunkMiddleware() {
       return next();
     }
     const locale = path.slice(0, slashIdx);
+    const config = i18n.getConfig();
+    if (!config.locales.includes(locale)) {
+      return new Response("/* unknown locale */", {
+        status: 404,
+        headers: { "Content-Type": "application/javascript" }
+      });
+    }
     const rest = path.slice(slashIdx + 1);
     if (!rest.endsWith(".js")) {
       return next();
@@ -79,27 +86,13 @@ function createI18nChunkMiddleware() {
       return next();
     }
     const chunkName = withoutJs.slice(0, lastDotIdx);
-    const keys = i18n.getManifest().chunks[chunkName];
-    if (!keys) {
+    const body = i18n.getChunkBody(locale, chunkName);
+    if (!body) {
       return new Response(`/* chunk not found: ${chunkName} */`, {
         status: 404,
         headers: { "Content-Type": "application/javascript" }
       });
     }
-    const translations = i18n.getTranslations(locale);
-    const chunkTranslations = {};
-    for (const key of keys) {
-      if (translations[key]) {
-        chunkTranslations[key] = translations[key];
-      }
-    }
-    const js = `/* @astroscope/i18n chunk: ${chunkName} */
-(function() {
-  var i = window.__i18n__;
-  if (i) Object.assign(i.translations, ${JSON.stringify(chunkTranslations)});
-})();
-`;
-    const body = new TextEncoder().encode(js);
     return new Response(body, {
       status: 200,
       headers: {
@@ -134,11 +127,12 @@ function detectLocale(request) {
   if (!acceptLanguage) return void 0;
   const preferred = acceptLanguage.split(",").map((part) => {
     const [lang, q = "q=1"] = part.trim().split(";");
+    const baseLang = lang?.split("-")[0]?.toLowerCase();
     return {
-      lang: lang.split("-")[0].toLowerCase(),
+      lang: baseLang,
       q: parseFloat(q.replace("q=", ""))
     };
-  }).sort((a, b) => b.q - a.q);
+  }).filter((p) => !!p.lang).sort((a, b) => b.q - a.q);
   for (const { lang } of preferred) {
     if (locales.includes(lang)) {
       return lang;

package/dist/internal.d.ts

@@ -1,5 +1,5 @@
-import { a as I18nContext } from './i18n-mTHTcD8K.js';
-export { i as i18n } from './i18n-mTHTcD8K.js';
+import { a as I18nContext } from './i18n-BBAAVYz_.js';
+export { i as i18n } from './i18n-BBAAVYz_.js';
 export { I as I18nClientState } from './types-DNRFj1XA.js';
 import './types-DTUho6gi.js';
 

package/dist/internal.js

@@ -1,7 +1,7 @@
 import {
   getContext,
   i18n
-} from "./chunk-RHWEV4L2.js";
+} from "./chunk-ZKXMIGSF.js";
 import "./chunk-KNDYKTHE.js";
 export {
   getContext,

package/dist/server/t.js

@@ -1,7 +1,7 @@
 import {
   getContext,
   i18n
-} from "../chunk-RHWEV4L2.js";
+} from "../chunk-ZKXMIGSF.js";
 import {
   normalizeMeta
 } from "../chunk-EMM6LRO2.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroscope/i18n",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "i18n for Astro + React islands — automatic tree-shaking, parallel loading, any translation source",
   "type": "module",
   "main": "./dist/index.js",
@@ -86,9 +86,11 @@
     "lint:fix": "eslint 'src/**/*.ts' --fix"
   },
   "dependencies": {
+    "@astrojs/compiler": "^2.12.2",
     "@babel/core": "^7.28.6",
     "@babel/preset-typescript": "^7.28.5",
     "@messageformat/core": "^3.4.0",
+    "glob": "^11.0.0",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {