@astroscope/i18n 0.2.0 → 0.2.2

package/README.md

@@ -1,5 +1,7 @@
 # @astroscope/i18n
 
+> **Note:** This package is in active development. APIs may change between versions.
+
 i18n for Astro + React islands — automatic tree-shaking, parallel loading, any translation source.
 
 ## Why this library?

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-FAKBSLNW.js → chunk-7MSGHEST.js}

@@ -4,21 +4,28 @@ import {
 } from "./chunk-4A5BKHFN.js";
 
 // src/client/directives/utils.ts
-async function loadI18nForChunk(el) {
-  const componentUrl = el.getAttribute("component-url");
-  if (!componentUrl) return;
-  const chunkName = componentUrlToChunkName(componentUrl);
-  const i18n = window.__i18n__;
+function prefetchTranslation(chunkName, i18n) {
   const hash = i18n.hashes[chunkName];
   if (hash) {
     const url = buildI18nChunkUrl(i18n.locale, chunkName, hash);
-    await import(
+    import(
       /* @vite-ignore */
       url
     );
   }
 }
+function warmUpI18nForChunk(el) {
+  const componentUrl = el.getAttribute("component-url");
+  if (!componentUrl) return;
+  const chunkName = componentUrlToChunkName(componentUrl);
+  const i18n = window.__i18n__;
+  prefetchTranslation(chunkName, i18n);
+  const deps = i18n.imports[chunkName] ?? [];
+  for (const dep of deps) {
+    prefetchTranslation(dep, i18n);
+  }
+}
 
 export {
-  loadI18nForChunk
+  warmUpI18nForChunk
 };

package/dist/chunk-FW6TPWMT.js

@@ -0,0 +1,358 @@
+import {
+  chunkIdToName
+} from "./chunk-4A5BKHFN.js";
+
+// src/extraction/manifest.ts
+import path from "path";
+var I18N_MANIFEST_GLOBAL_KEY = "__astroscope_i18n_manifest__";
+function getGlobalState() {
+  const g = globalThis;
+  if (!g[I18N_MANIFEST_GLOBAL_KEY]) {
+    g[I18N_MANIFEST_GLOBAL_KEY] = {
+      extractedKeys: [],
+      chunkManifest: {},
+      importsManifest: {},
+      projectRoot: ""
+    };
+  }
+  return g[I18N_MANIFEST_GLOBAL_KEY];
+}
+function getManifest() {
+  const state = getGlobalState();
+  const keys = state.extractedKeys.map((key) => ({
+    ...key,
+    // make file paths relative to project root for better readability
+    // and avoiding leaking absolute paths from dev or ci environments
+    file: state.projectRoot ? path.relative(state.projectRoot, key.file) : key.file
+  }));
+  return { keys, chunks: state.chunkManifest, imports: state.importsManifest };
+}
+
+// src/extraction/vite-plugin.ts
+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 result = await transformAsync(code, {
+    filename,
+    sourceMaps: stripFallbacks,
+    // only need source maps when transforming
+    babelrc: false,
+    configFile: false,
+    parserOpts: {
+      plugins: [
+        ...TS_EXTENSIONS.some((ext) => filename.endsWith(ext)) ? ["typescript"] : [],
+        ...JSX_EXTENSIONS.some((ext) => filename.endsWith(ext)) ? ["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";
+function i18nVitePlugin(options) {
+  const { logger } = options;
+  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 = 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)) {
+        return `\0${id}`;
+      }
+    },
+    load(id) {
+      if (isResolvedVirtualModuleId(id)) {
+        if (isBuild) {
+          return `
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const manifestJson = JSON.parse(readFileSync(join(__dirname, '${MANIFEST_FILE_NAME}'), 'utf-8'));
+
+export const manifest = manifestJson;
+export function getManifest() { return manifestJson; }
+`;
+        }
+        return `
+import { getManifest as _getManifest } from '@astroscope/i18n/extraction';
+export const manifest = { keys: [], chunks: {} };
+export function getManifest() { return _getManifest(); }
+`;
+      }
+    },
+    async transform(code, filename) {
+      if (!ALL_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
+        return null;
+      }
+      if (filename.includes("node_modules")) {
+        return null;
+      }
+      if (!code.includes("@astroscope/i18n/t")) {
+        return null;
+      }
+      const result = await extractKeysFromFile({
+        filename,
+        code,
+        logger,
+        stripFallbacks: isBuild
+      });
+      store.addFileKeys(filename, result.keys);
+      if (isBuild && result.code) {
+        return { code: result.code, map: result.map };
+      }
+      return null;
+    },
+    generateBundle(_, bundle) {
+      const state = getGlobalState();
+      state.chunkManifest = {};
+      state.importsManifest = {};
+      const chunksWithI18n = /* @__PURE__ */ new Set();
+      const chunkNameToFileName = /* @__PURE__ */ new Map();
+      const directImports = /* @__PURE__ */ new Map();
+      for (const [fileName, chunk] of Object.entries(bundle)) {
+        if (chunk.type === "chunk" && chunk.moduleIds) {
+          const keys = /* @__PURE__ */ new Set();
+          let hasI18nModule = false;
+          for (const moduleId of chunk.moduleIds) {
+            const moduleKeys = store.fileToKeys.get(moduleId);
+            moduleKeys?.forEach((k) => keys.add(k));
+            if (store.filesWithI18n.has(moduleId)) {
+              hasI18nModule = true;
+            }
+          }
+          const chunkName = chunkIdToName(fileName.replace(/\.js$/, ""));
+          if (keys.size) {
+            state.chunkManifest[chunkName] = Array.from(keys);
+          }
+          if (hasI18nModule) {
+            chunksWithI18n.add(chunkName);
+          }
+          chunkNameToFileName.set(chunkName, fileName);
+          const imports = [];
+          for (const importedFile of chunk.imports) {
+            const baseName = importedFile.replace(/^.*\//, "").replace(/\.js$/, "");
+            const importedChunkName = chunkIdToName(baseName);
+            imports.push(importedChunkName);
+          }
+          directImports.set(chunkName, imports);
+        }
+      }
+      const flattenImports = (chunkName, visited) => {
+        if (visited.has(chunkName)) return [];
+        visited.add(chunkName);
+        const result = /* @__PURE__ */ new Set();
+        const imports = directImports.get(chunkName) ?? [];
+        for (const imported of imports) {
+          if (state.chunkManifest[imported]) {
+            result.add(imported);
+          }
+          for (const descendant of flattenImports(imported, visited)) {
+            result.add(descendant);
+          }
+        }
+        visited.delete(chunkName);
+        return Array.from(result);
+      };
+      for (const chunkName of directImports.keys()) {
+        const flattened = flattenImports(chunkName, /* @__PURE__ */ new Set());
+        if (flattened.length > 0) {
+          state.importsManifest[chunkName] = flattened;
+        }
+      }
+      for (const [fileName, chunk] of Object.entries(bundle)) {
+        if (chunk.type !== "chunk") continue;
+        const chunkName = chunkIdToName(fileName.replace(/\.js$/, ""));
+        if (!chunksWithI18n.has(chunkName)) continue;
+        const loaderCode = `if(typeof window!=='undefined'&&window.__i18n__){const _=window.__i18n__,h=_.hashes[${JSON.stringify(chunkName)}];if(h)await import(\`/_i18n/\${_.locale}/${chunkName}.\${h}.js\`);}`;
+        const s = new MagicString(chunk.code);
+        s.prepend(loaderCode);
+        chunk.code = s.toString();
+        if (chunk.map) {
+          chunk.map = s.generateMap({ hires: true });
+        }
+      }
+      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 (fs2.existsSync(chunksDir)) {
+          fs2.writeFileSync(manifestPath, JSON.stringify(getManifest()));
+        } else {
+          logger.error(`server chunks directory not found, cannot write manifest to ${manifestPath}`);
+        }
+      }
+    }
+  };
+}
+
+export {
+  getManifest,
+  i18nVitePlugin
+};

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

@@ -24,6 +24,21 @@ function computeAllChunkHashes(translations, manifest) {
   return hashes;
 }
 
+// src/server/utils.ts
+var LOWERCASE_A = 97;
+function indexToLetter(index) {
+  return String.fromCharCode(LOWERCASE_A + index);
+}
+function generateBB26(index) {
+  let name = "";
+  let remaining = index;
+  do {
+    name = indexToLetter(remaining % 26) + name;
+    remaining = Math.floor(remaining / 26) - 1;
+  } while (remaining >= 0);
+  return name;
+}
+
 // src/server/i18n.ts
 var I18nSingleton = class {
   // normalized user config with defaults applied
@@ -36,6 +51,10 @@ var I18nSingleton = class {
   compiledCache = /* @__PURE__ */ new Map();
   // locale -> chunk name -> content hash (for cache busting)
   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) {
@@ -88,6 +107,7 @@ var I18nSingleton = class {
     this.mergedCache.delete(locale);
     this.compiledCache.delete(locale);
     this.hashCache.delete(locale);
+    this.scriptCache.delete(locale);
     const { chunks } = this.getManifest();
     if (Object.keys(chunks).length > 0) {
       this.hashCache.set(locale, computeAllChunkHashes(raw, chunks));
@@ -99,7 +119,7 @@ var I18nSingleton = class {
       return cached;
     }
     const raw = this.rawCache.get(locale) ?? {};
-    const manifest = this.manifestGetter?.() ?? { keys: [], chunks: {} };
+    const manifest = this.manifestGetter?.() ?? { keys: [], chunks: {}, imports: {} };
     if (manifest.keys.length === 0) {
       return raw;
     }
@@ -135,6 +155,76 @@ 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.
+   */
+  getClientScript(locale) {
+    const cached = this.scriptCache.get(locale);
+    if (cached) {
+      return cached;
+    }
+    const script = this.createClientScript(locale);
+    this.scriptCache.set(locale, script);
+    return script;
+  }
+  createClientScript(locale) {
+    const { chunks, imports } = this.getManifest();
+    const hasChunks = Object.keys(chunks).length > 0;
+    if (!hasChunks) {
+      const raw = this.getTranslations(locale);
+      return `window.__i18n__=${JSON.stringify({ locale, hashes: {}, imports: {}, translations: raw })};`;
+    }
+    const hashes = this.getHashes(locale);
+    const allChunks = new Set(Object.keys(hashes));
+    for (const deps of Object.values(imports)) {
+      deps.forEach((d) => allChunks.add(d));
+    }
+    const chunkToVar = /* @__PURE__ */ new Map();
+    let varIndex = 0;
+    for (const chunk of allChunks) {
+      chunkToVar.set(chunk, generateBB26(varIndex++));
+    }
+    const varDecls = [...chunkToVar.entries()].map(([chunk, v]) => `${v}=${JSON.stringify(chunk)}`).join(",");
+    const hashesObj = Object.entries(hashes).map(([chunk, hash]) => `[${chunkToVar.get(chunk)}]:${JSON.stringify(hash)}`).join(",");
+    const importsObj = Object.entries(imports).filter(([chunk]) => chunkToVar.has(chunk)).map(([chunk, deps]) => {
+      const validDeps = deps.filter((d) => chunkToVar.has(d));
+      return validDeps.length > 0 ? `[${chunkToVar.get(chunk)}]:[${validDeps.map((d) => chunkToVar.get(d)).join(",")}]` : null;
+    }).filter(Boolean).join(",");
+    return `(()=>{var ${varDecls};window.__i18n__={locale:${JSON.stringify(locale)},hashes:{${hashesObj}},imports:{${importsObj}},translations:{}};})();`;
+  }
   /**
    * Clear translations for specified locale(s).
    * @param locales - Locale(s) to clear, or all if not specified
@@ -146,6 +236,12 @@ var I18nSingleton = class {
       this.mergedCache.delete(locale);
       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/idle.d.ts

@@ -2,8 +2,11 @@ import { ClientDirective } from 'astro';
 
 /**
  * i18n-aware client:idle directive
- * Loads translations in parallel before delegating to Astro's original idle directive
+ *
+ * Based on Astro's idle directive (MIT License)
+ * https://github.com/withastro/astro/blob/main/packages/astro/src/runtime/client/idle.ts
  */
+
 declare const idleDirective: ClientDirective;
 
 export { idleDirective as default };

package/dist/client/directives/idle.js

@@ -1,13 +1,20 @@
 import {
-  loadI18nForChunk
-} from "../../chunk-FAKBSLNW.js";
+  warmUpI18nForChunk
+} from "../../chunk-7MSGHEST.js";
 import "../../chunk-4A5BKHFN.js";
 
 // src/client/directives/idle.ts
-import originalIdle from "astro/client/idle.js";
-var idleDirective = async (load, options, el) => {
-  await loadI18nForChunk(el);
-  return originalIdle(load, options, el);
+var idleDirective = (load, _options, el) => {
+  const cb = async () => {
+    warmUpI18nForChunk(el);
+    const hydrate = await load();
+    await hydrate();
+  };
+  if ("requestIdleCallback" in window) {
+    window.requestIdleCallback(cb);
+  } else {
+    setTimeout(cb, 200);
+  }
 };
 var idle_default = idleDirective;
 export {

package/dist/client/directives/load.d.ts

@@ -2,8 +2,11 @@ import { ClientDirective } from 'astro';
 
 /**
  * i18n-aware client:load directive
- * Loads translations in parallel before delegating to Astro's original load directive
+ *
+ * Based on Astro's load directive (MIT License)
+ * https://github.com/withastro/astro/blob/main/packages/astro/src/runtime/client/load.ts
  */
+
 declare const loadDirective: ClientDirective;
 
 export { loadDirective as default };

package/dist/client/directives/load.js

@@ -1,13 +1,13 @@
 import {
-  loadI18nForChunk
-} from "../../chunk-FAKBSLNW.js";
+  warmUpI18nForChunk
+} from "../../chunk-7MSGHEST.js";
 import "../../chunk-4A5BKHFN.js";
 
 // src/client/directives/load.ts
-import originalLoad from "astro/client/load.js";
-var loadDirective = async (load, options, el) => {
-  await loadI18nForChunk(el);
-  return originalLoad(load, options, el);
+var loadDirective = async (load, _options, el) => {
+  warmUpI18nForChunk(el);
+  const hydrate = await load();
+  await hydrate();
 };
 var load_default = loadDirective;
 export {

package/dist/client/directives/media.d.ts

@@ -2,8 +2,11 @@ import { ClientDirective } from 'astro';
 
 /**
  * i18n-aware client:media directive
- * Loads translations in parallel before delegating to Astro's original media directive
+ *
+ * Based on Astro's media directive (MIT License)
+ * https://github.com/withastro/astro/blob/main/packages/astro/src/runtime/client/media.ts
  */
+
 declare const mediaDirective: ClientDirective;
 
 export { mediaDirective as default };

package/dist/client/directives/media.js

@@ -1,13 +1,23 @@
 import {
-  loadI18nForChunk
-} from "../../chunk-FAKBSLNW.js";
+  warmUpI18nForChunk
+} from "../../chunk-7MSGHEST.js";
 import "../../chunk-4A5BKHFN.js";
 
 // src/client/directives/media.ts
-import originalMedia from "astro/client/media.js";
-var mediaDirective = async (load, options, el) => {
-  await loadI18nForChunk(el);
-  return originalMedia(load, options, el);
+var mediaDirective = (load, options, el) => {
+  const cb = async () => {
+    warmUpI18nForChunk(el);
+    const hydrate = await load();
+    await hydrate();
+  };
+  if (options.value) {
+    const mql = matchMedia(options.value);
+    if (mql.matches) {
+      cb();
+    } else {
+      mql.addEventListener("change", cb, { once: true });
+    }
+  }
 };
 var media_default = mediaDirective;
 export {

package/dist/client/directives/only.d.ts

@@ -2,8 +2,13 @@ import { ClientDirective } from 'astro';
 
 /**
  * i18n-aware client:only directive
- * Loads translations in parallel before delegating to Astro's original only directive
+ *
+ * Based on Astro's load directive (MIT License)
+ * https://github.com/withastro/astro/blob/main/packages/astro/src/runtime/client/load.ts
+ *
+ * client:only works the same as client:load - immediate hydration
  */
+
 declare const onlyDirective: ClientDirective;
 
 export { onlyDirective as default };

package/dist/client/directives/only.js

@@ -1,13 +1,13 @@
 import {
-  loadI18nForChunk
-} from "../../chunk-FAKBSLNW.js";
+  warmUpI18nForChunk
+} from "../../chunk-7MSGHEST.js";
 import "../../chunk-4A5BKHFN.js";
 
 // src/client/directives/only.ts
-import originalOnly from "astro/client/only.js";
-var onlyDirective = async (load, options, el) => {
-  await loadI18nForChunk(el);
-  return originalOnly(load, options, el);
+var onlyDirective = async (load, _options, el) => {
+  warmUpI18nForChunk(el);
+  const hydrate = await load();
+  await hydrate();
 };
 var only_default = onlyDirective;
 export {

package/dist/client/directives/utils.d.ts

@@ -1,10 +1,11 @@
-import '../../types-B_-RxW4A.js';
-import '../../types-Bzp6KxsI.js';
+import '../../types-BeDFfFIL.js';
+import '../../types-DNRFj1XA.js';
 
 /**
- * Load translations for a chunk before hydration
+ * Warm up translation cache for a chunk and all its descendants (fire and forget)
  * Extracts chunk name from astro-island's component-url attribute
+ * Uses flattened imports map from window.__i18n__ to prefetch all nested translations
  */
-declare function loadI18nForChunk(el: HTMLElement): Promise<void>;
+declare function warmUpI18nForChunk(el: HTMLElement): void;
 
-export { loadI18nForChunk };
+export { warmUpI18nForChunk };

package/dist/client/directives/utils.js

@@ -1,7 +1,7 @@
 import {
-  loadI18nForChunk
-} from "../../chunk-FAKBSLNW.js";
+  warmUpI18nForChunk
+} from "../../chunk-7MSGHEST.js";
 import "../../chunk-4A5BKHFN.js";
 export {
-  loadI18nForChunk
+  warmUpI18nForChunk
 };

package/dist/client/directives/visible.d.ts

@@ -2,8 +2,11 @@ import { ClientDirective } from 'astro';
 
 /**
  * i18n-aware client:visible directive
- * Loads translations in parallel before delegating to Astro's original visible directive
+ *
+ * Based on Astro's visible directive (MIT License)
+ * https://github.com/withastro/astro/blob/main/packages/astro/src/runtime/client/visible.ts
  */
+
 declare const visibleDirective: ClientDirective;
 
 export { visibleDirective as default };

package/dist/client/directives/visible.js

@@ -1,13 +1,28 @@
 import {
-  loadI18nForChunk
-} from "../../chunk-FAKBSLNW.js";
+  warmUpI18nForChunk
+} from "../../chunk-7MSGHEST.js";
 import "../../chunk-4A5BKHFN.js";
 
 // src/client/directives/visible.ts
-import originalVisible from "astro/client/visible.js";
-var visibleDirective = async (load, options, el) => {
-  await loadI18nForChunk(el);
-  return originalVisible(load, options, el);
+var visibleDirective = (load, options, el) => {
+  const cb = async () => {
+    warmUpI18nForChunk(el);
+    const hydrate = await load();
+    await hydrate();
+  };
+  const rawOptions = typeof options.value === "object" ? options.value : void 0;
+  const ioOptions = rawOptions?.rootMargin ? { rootMargin: rawOptions.rootMargin } : {};
+  const io = new IntersectionObserver((entries) => {
+    for (const entry of entries) {
+      if (!entry.isIntersecting) continue;
+      io.disconnect();
+      cb();
+      break;
+    }
+  }, ioOptions);
+  for (const child of el.children) {
+    io.observe(child);
+  }
 };
 var visible_default = visibleDirective;
 export {

package/dist/client/t.d.ts

@@ -1,5 +1,5 @@
-import { a as TranslateFunction } from '../types-Bzp6KxsI.js';
-import '../types-B_-RxW4A.js';
+import { a as TranslateFunction } from '../types-DNRFj1XA.js';
+import '../types-BeDFfFIL.js';
 
 declare function getLocale(): string;
 /**

package/dist/extraction/index.d.ts

@@ -1,8 +1,8 @@
-import { a as ExtractionManifest } from '../types-8uKCwFda.js';
-export { C as ChunkManifest, E as ExtractedKey } from '../types-8uKCwFda.js';
+import { a as ExtractionManifest } from '../types-DTUho6gi.js';
+export { C as ChunkManifest, E as ExtractedKey } from '../types-DTUho6gi.js';
 import { AstroIntegrationLogger } from 'astro';
 import { Plugin } from 'vite';
-import '../types-Bzp6KxsI.js';
+import '../types-DNRFj1XA.js';
 
 /**
  * Manifest state management for i18n extraction

package/dist/extraction/index.js

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

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

@@ -1,5 +1,5 @@
-import { a as ExtractionManifest } from './types-8uKCwFda.js';
-import { T as TranslationMeta, C as CompiledTranslations, R as RawTranslations } from './types-Bzp6KxsI.js';
+import { a as ExtractionManifest } from './types-DTUho6gi.js';
+import { T as TranslationMeta, C as CompiledTranslations, R as RawTranslations } from './types-DNRFj1XA.js';
 
 /**
  * Fallback behavior when translation is missing
@@ -30,6 +30,8 @@ declare class I18nSingleton {
     private mergedCache;
     private compiledCache;
     private hashCache;
+    private scriptCache;
+    private chunkCache;
     private manifestGetter;
     configure(config: I18nConfig): Promise<void>;
     isConfigured(): boolean;
@@ -44,6 +46,18 @@ 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.
+     */
+    getClientScript(locale: string): string;
+    private createClientScript;
     /**
      * Clear translations for specified locale(s).
      * @param locales - Locale(s) to clear, or all if not specified

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { AstroIntegration, MiddlewareHandler, APIContext } from 'astro';
-export { F as FallbackBehavior, I as I18nConfig, i as i18n } from './i18n-BGfrSNM8.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-Bzp6KxsI.js';
-export { E as ExtractedKey, a as ExtractionManifest } from './types-8uKCwFda.js';
+export { R as RawTranslations, T as TranslationMeta } from './types-DNRFj1XA.js';
+export { E as ExtractedKey, a as ExtractionManifest } from './types-DTUho6gi.js';
 
 interface I18nOptions {
 }

package/dist/index.js

@@ -1,10 +1,10 @@
 import {
   i18nVitePlugin
-} from "./chunk-JJEDOJBR.js";
+} from "./chunk-FW6TPWMT.js";
 import {
   i18n,
   runWithContext
-} from "./chunk-QFAAGCP5.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,7 +1,7 @@
-import { a as I18nContext } from './i18n-BGfrSNM8.js';
-export { i as i18n } from './i18n-BGfrSNM8.js';
-export { I as I18nClientState } from './types-Bzp6KxsI.js';
-import './types-8uKCwFda.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';
 
 /**
  * Get the current i18n context

package/dist/internal.js

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

package/dist/server/t.d.ts

@@ -1,4 +1,4 @@
-import { a as TranslateFunction } from '../types-Bzp6KxsI.js';
+import { a as TranslateFunction } from '../types-DNRFj1XA.js';
 
 /**
  * Get the current locale from request context.

package/dist/server/t.js

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

package/dist/{types-B_-RxW4A.d.ts → types-BeDFfFIL.d.ts}

@@ -1,4 +1,4 @@
-import { I as I18nClientState } from './types-Bzp6KxsI.js';
+import { I as I18nClientState } from './types-DNRFj1XA.js';
 
 declare global {
     interface Window {

package/dist/{types-Bzp6KxsI.d.ts → types-DNRFj1XA.d.ts}

@@ -32,6 +32,7 @@ type I18nClientState = {
     locale: string;
     hashes: Record<string, string>;
     translations: Record<string, string>;
+    imports: Record<string, string[]>;
 };
 /**
  * Translate function

package/dist/{types-8uKCwFda.d.ts → types-DTUho6gi.d.ts}

@@ -1,4 +1,4 @@
-import { T as TranslationMeta } from './types-Bzp6KxsI.js';
+import { T as TranslationMeta } from './types-DNRFj1XA.js';
 
 /**
  * Extracted metadata for a single translation key
@@ -13,12 +13,18 @@ type ExtractedKey = {
  * Chunk-to-keys mapping produced by Vite plugin
  */
 type ChunkManifest = Record<string, string[]>;
+/**
+ * Chunk imports mapping: chunk name → array of imported chunk names that have i18n
+ * All direct and indirect descendants are flattened into a single array
+ */
+type ImportsManifest = Record<string, string[]>;
 /**
  * Full extraction manifest
  */
 type ExtractionManifest = {
     keys: ExtractedKey[];
     chunks: ChunkManifest;
+    imports: ImportsManifest;
 };
 
 export type { ChunkManifest as C, ExtractedKey as E, ExtractionManifest as a };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astroscope/i18n",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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": {
@@ -100,7 +102,7 @@
     "vite": "^6.4.1"
   },
   "peerDependencies": {
-    "@astroscope/excludes": "^0.1.2",
+    "@astroscope/excludes": "^0.1.3",
     "astro": "^5.0.0"
   }
 }

package/src/components/I18nScript.astro

@@ -1,29 +1,8 @@
 ---
-import { type I18nClientState, getContext, i18n } from '@astroscope/i18n/internal';
+import { getContext, i18n } from '@astroscope/i18n/internal';
 
 const context = getContext();
-
-let script: string | null = null;
-
-if (context) {
-  const { locale } = context;
-  const { chunks } = i18n.getManifest();
-  const hasChunks = Object.keys(chunks).length > 0;
-
-  let state: I18nClientState;
-
-  if (hasChunks) {
-    const hashes = i18n.getHashes(locale) ?? {};
-
-    state = { locale, hashes, translations: {} };
-  } else {
-    const raw = i18n.getTranslations(locale) ?? {};
-
-    state = { locale, hashes: {}, translations: raw };
-  }
-
-  script = `window.__i18n__=${JSON.stringify(state)};`;
-}
+const script = context ? i18n.getClientScript(context.locale) : null;
 ---
 
 {

package/dist/chunk-JJEDOJBR.js

@@ -1,193 +0,0 @@
-import {
-  chunkIdToName
-} from "./chunk-4A5BKHFN.js";
-
-// src/extraction/manifest.ts
-import path from "path";
-var I18N_MANIFEST_GLOBAL_KEY = "__astroscope_i18n_manifest__";
-function getGlobalState() {
-  const g = globalThis;
-  if (!g[I18N_MANIFEST_GLOBAL_KEY]) {
-    g[I18N_MANIFEST_GLOBAL_KEY] = {
-      extractedKeys: [],
-      chunkManifest: {},
-      projectRoot: ""
-    };
-  }
-  return g[I18N_MANIFEST_GLOBAL_KEY];
-}
-function getManifest() {
-  const state = getGlobalState();
-  const keys = state.extractedKeys.map((key) => ({
-    ...key,
-    // make file paths relative to project root for better readability
-    // and avoiding leaking absolute paths from dev or ci environments
-    file: state.projectRoot ? path.relative(state.projectRoot, key.file) : key.file
-  }));
-  return { keys, chunks: state.chunkManifest };
-}
-
-// src/extraction/vite-plugin.ts
-import fs from "fs";
-import path2 from "path";
-import MagicString from "magic-string";
-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();
-  let isBuild = false;
-  let isSSR = false;
-  return {
-    name: "@astroscope/i18n/extract",
-    enforce: "pre",
-    configResolved(config) {
-      const state = getGlobalState();
-      state.projectRoot = config.root;
-      state.extractedKeys = extractedKeys;
-      isBuild = config.command === "build";
-      isSSR = !!config.build.ssr;
-    },
-    resolveId(id) {
-      if (isVirtualModuleId(id)) {
-        return `\0${id}`;
-      }
-    },
-    load(id) {
-      if (isResolvedVirtualModuleId(id)) {
-        if (isBuild) {
-          return `
-import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, join } from 'node:path';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const manifestJson = JSON.parse(readFileSync(join(__dirname, '${MANIFEST_FILE_NAME}'), 'utf-8'));
-
-export const manifest = manifestJson;
-export function getManifest() { return manifestJson; }
-`;
-        }
-        return `
-import { getManifest as _getManifest } from '@astroscope/i18n/extraction';
-export const manifest = { keys: [], chunks: {} };
-export function getManifest() { return _getManifest(); }
-`;
-      }
-    },
-    async transform(code, filename) {
-      if (!INCLUDE_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
-        return null;
-      }
-      if (filename.includes("node_modules")) {
-        return null;
-      }
-      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, {
-        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
-            }
-          ]
-        ]
-      });
-      if (fileKeys.length > 0) {
-        extractedKeys.push(...fileKeys);
-        fileToKeys.set(
-          filename,
-          fileKeys.map((k) => k.key)
-        );
-      }
-      if (isBuild && result?.code) {
-        return { code: result.code, map: result.map };
-      }
-      return null;
-    },
-    generateBundle(_, bundle) {
-      const state = getGlobalState();
-      state.chunkManifest = {};
-      for (const [fileName, chunk] of Object.entries(bundle)) {
-        if (chunk.type === "chunk" && chunk.moduleIds) {
-          const keys = /* @__PURE__ */ new Set();
-          let hasI18nModule = false;
-          for (const moduleId of chunk.moduleIds) {
-            const moduleKeys = fileToKeys.get(moduleId);
-            moduleKeys?.forEach((k) => keys.add(k));
-            if (filesWithI18n.has(moduleId)) {
-              hasI18nModule = true;
-            }
-          }
-          const chunkName = chunkIdToName(fileName.replace(/\.js$/, ""));
-          if (keys.size) {
-            state.chunkManifest[chunkName] = Array.from(keys);
-          }
-          if (hasI18nModule) {
-            const loaderCode = `
-/* @astroscope/i18n loader */
-if (typeof window !== 'undefined' && window.__i18n__) {
-  const __i18n__ = window.__i18n__;
-  const __i18n_hash__ = __i18n__.hashes[${JSON.stringify(chunkName)}];
-  if (__i18n_hash__) {
-    await import(\`/_i18n/\${__i18n__.locale}/${chunkName}.\${__i18n_hash__}.js\`);
-  }
-}
-/* end @astroscope/i18n loader */
-`;
-            const s = new MagicString(chunk.code);
-            s.prepend(loaderCode);
-            chunk.code = s.toString();
-            if (chunk.map) {
-              chunk.map = s.generateMap({ hires: true });
-            }
-          }
-        }
-      }
-      logger.info(`manifest: ${Object.keys(state.chunkManifest).length} chunks, ${extractedKeys.length} 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()));
-        } else {
-          logger.error(`server chunks directory not found, cannot write manifest to ${manifestPath}`);
-        }
-      }
-    }
-  };
-}
-
-export {
-  getManifest,
-  i18nVitePlugin
-};