@awsless/i18n 0.0.14 → 0.0.16

package/README.MD

@@ -57,9 +57,9 @@ import { lang } from '@awsless/i18n/svelte'
 
 const count = 1
 
-lang.t.get(`${count} count`, {
-  es: `${count} contar`,
-  jp: `${count} カウント`,
+lang.t.get(lang.s`${count} count`, {
+	es: lang.s`${count} contar`,
+	jp: lang.s`${count} カウント`,
 })
 ```
 
@@ -73,15 +73,15 @@ lang.locale = 'jp'
 
 ## Changing the AI-generated text
 
-A `i18n.json` file with all the translations will be generated in the root of your project the first time you run a build. We use this file as a cache to not translate any text that has already been translated before.
+A `i18n.generated.json` file with the auto-generated translations will be created in the root of your project the first time you run a build. We use this file as a cache to not translate any text that has already been translated before.
 
-If you don't like the auto-generated translations by AI, you can safely change any of the ai generated translations here.
+If you want to overwrite an AI-generated translation, create or edit `i18n.json`. Any translation in `i18n.json` takes precedence over the generated cache during build time.
 
 ```json
 {
-  "${count} count": {
-    "es": "${count} contar",
-    "jp": "${count} カウント"
-  }
+	"${count} count": {
+		"es": "${count} contar",
+		"jp": "${count} カウント"
+	}
 }
 ```

package/dist/index.js

@@ -4,8 +4,10 @@ import MagicString from "magic-string";
 // src/cache.ts
 import { readFile, stat, writeFile } from "fs/promises";
 import { join } from "path";
-var loadCache = async (cwd) => {
-  const file = join(cwd, "i18n.json");
+var GENERATED_CACHE_FILE = "i18n.generated.json";
+var OVERRIDE_CACHE_FILE = "i18n.json";
+var loadFile = async (cwd, fileName) => {
+  const file = join(cwd, fileName);
   try {
     await stat(file);
   } catch (error) {
@@ -14,13 +16,29 @@ var loadCache = async (cwd) => {
   const data = await readFile(file, "utf8");
   return new Cache(JSON.parse(data));
 };
+var loadGeneratedCache = async (cwd) => {
+  return loadFile(cwd, GENERATED_CACHE_FILE);
+};
+var loadOverrideCache = async (cwd) => {
+  return loadFile(cwd, OVERRIDE_CACHE_FILE);
+};
 var saveCache = async (cwd, cache) => {
-  await writeFile(join(cwd, "i18n.json"), JSON.stringify(cache, void 0, 2));
+  await writeFile(join(cwd, GENERATED_CACHE_FILE), JSON.stringify(cache.toJSON(), void 0, 2) + "\n");
+};
+var mergeCaches = (...caches) => {
+  const merged = new Cache();
+  for (const cache of caches) {
+    for (const item of cache.entries()) {
+      merged.replace(item.source, item.locale, item.translation);
+    }
+  }
+  return merged;
 };
 var Cache = class {
   constructor(data = {}) {
     this.data = data;
   }
+  data;
   set(source, locale, translation) {
     if (!this.data[source]) {
       this.data[source] = {};
@@ -29,6 +47,12 @@ var Cache = class {
       this.data[source][locale] = translation;
     }
   }
+  replace(source, locale, translation) {
+    if (!this.data[source]) {
+      this.data[source] = {};
+    }
+    this.data[source][locale] = translation;
+  }
   get(source, locale) {
     return this.data[source]?.[locale];
   }
@@ -51,7 +75,16 @@ var Cache = class {
     }
   }
   toJSON() {
-    return this.data;
+    return Object.fromEntries(
+      Object.entries(this.data).sort(([left], [right]) => left.localeCompare(right)).map(([source, locales]) => {
+        return [
+          source,
+          Object.fromEntries(
+            Object.entries(locales).sort(([left], [right]) => left.localeCompare(right))
+          )
+        ];
+      })
+    );
   }
 };
 
@@ -116,16 +149,15 @@ import { parse } from "@swc/core";
 import { simple } from "swc-walk";
 var findTypescriptTranslatable = async (code) => {
   const found = [];
-  const ast = await parse(code, {
-    syntax: "typescript"
-  });
+  const ast = await parse(code, { syntax: "typescript" });
+  const bytes = Buffer.from(code, "utf8");
   simple(ast, {
     TaggedTemplateExpression(node) {
       if (node.tag.type === "MemberExpression" && node.tag.object.type === "Identifier" && node.tag.object.value === "lang" && node.tag.property.type === "Identifier" && node.tag.property.value === "t") {
-        const content = code.substring(
+        const content = bytes.subarray(
           node.template.span.start - ast.span.start + 1,
           node.template.span.end - ast.span.start - 1
-        );
+        ).toString("utf8");
         found.push(content);
       }
     }
@@ -162,6 +194,7 @@ var findTranslatable = async (cwd) => {
 // src/vite.ts
 var i18n = (props) => {
   let cache;
+  let generatedCache;
   return {
     name: "awsless/i18n",
     enforce: "pre",
@@ -169,18 +202,21 @@ var i18n = (props) => {
       const cwd = process.cwd();
       this.info("Finding all translatable text...");
       const sourceTexts = await findTranslatable(cwd);
-      cache = await loadCache(cwd);
-      removeUnusedTranslations(cache, sourceTexts, props.locales);
+      generatedCache = await loadGeneratedCache(cwd);
+      const overrideCache = await loadOverrideCache(cwd);
+      removeUnusedTranslations(generatedCache, sourceTexts, props.locales);
+      cache = mergeCaches(generatedCache, overrideCache);
       const newSourceTexts = findNewTranslations(cache, sourceTexts, props.locales);
       if (newSourceTexts.length > 0) {
         this.info(`Translating ${newSourceTexts.length} new texts.`);
         const translations = await props.translate(props.default ?? "en", newSourceTexts);
         this.info(`Translated ${translations.length} texts.`);
         for (const item of translations) {
-          cache.set(item.source, item.locale, item.translation);
+          generatedCache.set(item.source, item.locale, item.translation);
         }
       }
-      await saveCache(cwd, cache);
+      cache = mergeCaches(generatedCache, overrideCache);
+      await saveCache(cwd, generatedCache);
       this.info(`Translating done.`);
     },
     transform(code) {

package/dist/svelte-5.svelte.d.ts

@@ -1,3 +1,9 @@
+type StringArgs = Array<string | number | {
+    toString(): string;
+}>;
+type Translate = {
+    (template: TemplateStringsArray, ...args: StringArgs): string;
+};
 declare const lang: {
     /** Get the current locale.
      *
@@ -12,9 +18,7 @@ declare const lang: {
      * @example
      * lang.t`Hello world!`
      */
-    readonly t: (template: TemplateStringsArray, ...args: Array<string | number | {
-        toString(): string;
-    }>) => string;
+    readonly t: Translate;
 };
 
 export { lang };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/i18n",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "license": "MIT",
   "type": "module",
   "keywords": [
@@ -42,12 +42,12 @@
   "devDependencies": {
     "@ai-sdk/openai": "^2.0.42",
     "@sveltejs/vite-plugin-svelte": "^3.1.2",
-    "svelte": "^4.2.19",
+    "svelte": "^5.46.0",
     "svelte-preprocess": "^6.0.2",
     "vite": "^7.1.9"
   },
   "peerDependencies": {
-    "svelte": "^4.2.19",
+    "svelte": "^5.46.0",
     "vite": "^7.1.9"
   },
   "dependencies": {