i18nya 0.1.3 → 0.2.1

package/astro-i18nya/README.md

@@ -36,13 +36,13 @@ export default defineConfig({
 });
 ```
 
-Then for all pages in `src/pages/[lang]/*.astro`:
+Then for all pages in `src/pages/[...lang]/*.astro`:
 
 ```ts
 import i18nya, { makeT } from "../../i18n.ts";
 import { makeGetStaticPaths } from "astro-i18nya";
 const t = makeT(Astro.params.lang);
-// generate paths only for languages in your `langs/` folder!
+// generate paths only for languages in your `[...langs]/` folder!
 export const getStaticPaths = makeGetStaticPaths(i18nya);
 ```
 

package/astro-i18nya/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-i18nya",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "description": "Astro integration for i18nya: i18n as small as a cat's paw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/astro-i18nya/src/util.ts

@@ -7,7 +7,10 @@ import type { I18Nya } from "i18nya";
  * @returns language name
  */
 export const getLangName = (lang: string, displayLang?: string) =>
-  new Intl.DisplayNames([displayLang ?? lang], { type: "language", style: "narrow" }).of(lang);
+  new Intl.DisplayNames([displayLang ?? lang], {
+    type: "language",
+    style: "narrow",
+  }).of(lang);
 
 /**
  * List out available languages.
@@ -29,6 +32,8 @@ export const listLang = <T extends string | number | symbol>(
 export const makeGetStaticPaths =
   <T extends string | number | symbol>(i18nya: I18Nya<T>) =>
   async () =>
-    Object.keys(i18nya.translations)
-      .filter((lang) => lang !== i18nya.config.defaultLang)
-      .map((lang) => ({ params: { lang: lang } }));
+    Object.keys(i18nya.translations).map((lang) =>
+      lang === i18nya.config.defaultLang
+        ? { params: { lang: undefined } }
+        : { params: { lang: lang } },
+    );

package/bun.lock

@@ -0,0 +1,20 @@
+{
+  "lockfileVersion": 1,
+  "configVersion": 0,
+  "workspaces": {
+    "": {
+      "name": "i18nya",
+      "devDependencies": {
+        "@types/node": "^24.10.1",
+        "typescript": "^5.9.3",
+      },
+    },
+  },
+  "packages": {
+    "@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="],
+
+    "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
+
+    "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
+  }
+}

package/dist/index.d.ts

@@ -0,0 +1,23 @@
+export type I18NyaKey = string | number | symbol;
+export type I18NyaConfig<T extends I18NyaKey> = {
+    /** Path to directory containing language files */
+    langDir: string;
+    /** Locale ID for default language */
+    defaultLang: string;
+    fallbackLangs?: Record<string, string>;
+    /** Feed in `import.meta.glob("./langs/*.json", { eager: true })` */
+    viteImports?: Record<string, {
+        default: Record<T, string>;
+    }>;
+};
+export type I18Nya<T extends I18NyaKey> = {
+    translations: Record<string, Record<T, string>>;
+    makeT: (lang?: string) => (key: T, its?: Interpolations) => string;
+    config: I18NyaConfig<T>;
+};
+export type Interpolations = Record<string, string | {
+    toString(): string;
+}>;
+export declare const init: <T extends string | number | symbol = string>(config: I18NyaConfig<T>) => Promise<I18Nya<T>>;
+export default init;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,SAAS,IAAI;IAC9C,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;CAC9D,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,SAAS,IAAI;IACxC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC;IACnE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,QAAQ,IAAI,MAAM,CAAA;CAAE,CAAC,CAAC;AAG7E,eAAO,MAAM,IAAI,GAAU,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EACpE,QAAQ,YAAY,CAAC,CAAC,CAAC,uBAwCxB,CAAC;AACF,eAAe,IAAI,CAAC"}

package/dist/index.js

@@ -0,0 +1,34 @@
+const opts = { with: { type: "json" } };
+export const init = async (config) => {
+    const { langDir, defaultLang: rootLang = "en", fallbackLangs = {}, viteImports = undefined, } = config;
+    let i18nya = {
+        translations: {},
+        makeT: (lang = rootLang) => (key, its = {}) => {
+            let s;
+            for (; !(s = i18nya.translations[lang]?.[key]); lang = fallbackLangs[lang] ?? rootLang)
+                if (lang === rootLang)
+                    return String(key);
+            for (const [k, v] of Object.entries(its))
+                s = s.replace(`{{${k}}}`, `${v}`);
+            return s;
+        },
+        config,
+    };
+    if (viteImports) {
+        for (const [k, v] of Object.entries(viteImports))
+            i18nya.translations[k.slice(langDir.length + 1, -5)] = v.default;
+    }
+    else {
+        const { readdirSync } = await import("fs");
+        const { resolve } = await import("path");
+        for (const entry of readdirSync(langDir, { withFileTypes: true })) {
+            if (entry.isFile() && entry.name.endsWith(".json")) {
+                const imp = await import(resolve(langDir, entry.name), opts);
+                i18nya.translations[entry.name.slice(0, -5)] = imp.default;
+            }
+        }
+    }
+    return i18nya;
+};
+export default init;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;AAExC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EACvB,MAAuB,EACvB,EAAE;IACF,MAAM,EACJ,OAAO,EACP,WAAW,EAAE,QAAQ,GAAG,IAAI,EAC5B,aAAa,GAAG,EAAE,EAClB,WAAW,GAAG,SAAS,GACxB,GAAG,MAAM,CAAC;IACX,IAAI,MAAM,GAAc;QACtB,YAAY,EAAE,EAAE;QAChB,KAAK,EACH,CAAC,IAAI,GAAG,QAAQ,EAAE,EAAE,CACpB,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,EAAE;YAChB,IAAI,CAAqB,CAAC;YAC1B,OAEE,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EACvC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,QAAQ;gBAEtC,IAAI,IAAI,KAAK,QAAQ;oBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5C,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;gBACtC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC;QACX,CAAC;QACH,MAAM;KACP,CAAC;IACF,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;YAC9C,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;IACrE,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YAClE,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;gBAC7D,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;YAC7D,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AACF,eAAe,IAAI,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18nya",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "description": "i18n as small as a cat's paw",
   "main": "dist/index.js",
   "type": "module",

package/src/index.ts

@@ -12,7 +12,7 @@ export type I18NyaConfig<T extends I18NyaKey> = {
 
 export type I18Nya<T extends I18NyaKey> = {
   translations: Record<string, Record<T, string>>;
-  makeT: (lang: string) => (key: T, its?: Interpolations) => string;
+  makeT: (lang?: string) => (key: T, its?: Interpolations) => string;
   config: I18NyaConfig<T>;
 };
 
@@ -25,17 +25,21 @@ export const init = async <T extends string | number | symbol = string>(
   const {
     langDir,
     defaultLang: rootLang = "en",
-    fallbackLangs: fb = {},
+    fallbackLangs = {},
     viteImports = undefined,
   } = config;
   let i18nya: I18Nya<T> = {
     translations: {},
     makeT:
-      (l) =>
-      (k, its = {}) => {
+      (lang = rootLang) =>
+      (key, its = {}) => {
         let s: string | undefined;
-        for (; !(s = i18nya.translations[l]?.[k]); l = fb[l] ?? rootLang)
-          if (l === rootLang) return String(k);
+        for (
+          ;
+          !(s = i18nya.translations[lang]?.[key]);
+          lang = fallbackLangs[lang] ?? rootLang
+        )
+          if (lang === rootLang) return String(key);
         for (const [k, v] of Object.entries(its))
           s = s.replace(`{{${k}}}`, `${v}`);
         return s;