astro-i18nya 0.2.3 → 0.2.5

package/README.md

@@ -4,8 +4,8 @@ I18n support for astro.
 
 ## Features
 
-- Integration with `i18nya` and `astro`
-- A `<Trans />` component that works better than the one in `react-i18next`!
+- Integration with [`i18nya`](https://www.npmjs.com/package/i18nya) and [`astro`](https://astro.build/)
+- A `<Trans />` component that works better than the one in [`react-i18next`](https://react.i18next.com/latest/trans-component)!
 
 ## Installation
 
@@ -42,12 +42,26 @@ Then for all pages in `src/pages/[...lang]/*.astro`:
 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);
 ```
 
+## Examples
+
+See [`hello-astro`](https://github.com/FyraLabs/i18nya/tree/main/examples/hello-astro).
+
 ## Trans
 
+This requires `experimentalReactChildren` in `astro.config.mjs`:
+```
+export default defineConfig({
+  integrations: [
+    react({ experimentalReactChildren: true }),
+    astro_i18nya(i18nya),
+  ],
+});
+```
+
 ```tsx
 <Trans t={t("test", { user: "John" })}>
   <b />
@@ -58,6 +72,10 @@ export const getStaticPaths = makeGetStaticPaths(i18nya);
 With `"test": "Hello <1>{{user}}</1>, welcome to <2><1>my site</1></2>."`, the above element will become:
 
 ```html
-<b>Hello John</b>, welcome to <a href="https://example.com"><b>my site</b></a
->.
+Hello <b>John</b>, welcome to <a href="https://example.com"><b>my site</b></a>.
 ```
+
+## `prefixDefaultLocale`
+
+Pass `prefixDefaultLocale: true` to `astro_i18nya()` and `makeGetStaticPaths()`. See their respective JSDoc for more info.
+

package/dist/Trans.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Trans.d.ts","sourceRoot":"","sources":["../src/Trans.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAqB,SAAS,EAAE,MAAM,OAAO,CAAC;AAE1D,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,SAAS,CAAC;IACpB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;0CAC+B,KAAK;AAAvC,wBAsDsC"}
+{"version":3,"file":"Trans.d.ts","sourceRoot":"","sources":["../src/Trans.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAqB,SAAS,EAAE,MAAM,OAAO,CAAC;AAE1D,KAAK,KAAK,GAAG;IACX,QAAQ,EAAE,SAAS,CAAC;IACpB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;GAsBG;0CAC+B,KAAK;AAAvC,wBAyDsC"}

package/dist/Trans.js

@@ -36,7 +36,10 @@ export default (({ children, t }) => {
     const tagStack = [];
     for (let ch_idx = 0; ch_idx < t.length;) {
         if (t.substring(ch_idx, ch_idx + 2) == "\\<") {
-            elms.push("<");
+            if (typeof elms[elms.length - 1] === "string")
+                elms[elms.length - 1] += "<";
+            else
+                elms.push("<");
             ch_idx += 2;
             continue;
         }

package/dist/Trans.js.map

@@ -1 +1 @@
-{"version":3,"file":"Trans.js","sourceRoot":"","sources":["../src/Trans.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Trans.js","sourceRoot":"","sources":["../src/Trans.tsx"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -3,5 +3,14 @@ import type { AstroIntegration } from "astro";
 import Trans from "./Trans.js";
 import { listLang, getLangName, makeGetStaticPaths } from "./util.js";
 export { Trans, listLang, getLangName, makeGetStaticPaths };
-export default function astroI18nya<T extends string | number | symbol>(i18nya: I18Nya<T>): AstroIntegration;
+export type AstroI18nyaConfig = {
+    prefixDefaultLocale?: boolean;
+    redirectToDefaultLocale?: boolean;
+};
+/**
+ * Astro integration for i18nya.
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param config routing behavior overrides
+ */
+export default function astro_i18nya<T extends string | number | symbol>(i18nya: I18Nya<T>, { prefixDefaultLocale, redirectToDefaultLocale }?: AstroI18nyaConfig): AstroIntegration;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;AAE5D,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EACpE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,gBAAgB,CAqBlB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;AAE5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EACrE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EACjB,EAAE,mBAA2B,EAAE,uBAA+B,EAAE,GAAE,iBAAsB,GACvF,gBAAgB,CAqBlB"}

package/dist/index.js

@@ -1,7 +1,12 @@
 import Trans from "./Trans.js";
 import { listLang, getLangName, makeGetStaticPaths } from "./util.js";
 export { Trans, listLang, getLangName, makeGetStaticPaths };
-export default function astroI18nya(i18nya) {
+/**
+ * Astro integration for i18nya.
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param config routing behavior overrides
+ */
+export default function astro_i18nya(i18nya, { prefixDefaultLocale = false, redirectToDefaultLocale = false } = {}) {
     return {
         name: "astro-i18nya",
         hooks: {
@@ -11,8 +16,8 @@ export default function astroI18nya(i18nya) {
                         defaultLocale: i18nya.config.defaultLang,
                         locales: Object.keys(i18nya.translations),
                         routing: {
-                            prefixDefaultLocale: false,
-                            redirectToDefaultLocale: true,
+                            prefixDefaultLocale,
+                            redirectToDefaultLocale,
                             fallbackType: "redirect",
                         },
                     },

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;AAE5D,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,MAAiB;IAEjB,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE;YACL,oBAAoB,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;gBACzC,YAAY,CAAC;oBACX,IAAI,EAAE;wBACJ,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;wBACxC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;wBACzC,OAAO,EAAE;4BACP,mBAAmB,EAAE,KAAK;4BAC1B,uBAAuB,EAAE,IAAI;4BAC7B,YAAY,EAAE,UAAU;yBACzB;qBACF;oBACD,uBAAuB;oBACvB,8DAA8D;iBAC/D,CAAC,CAAC;YACL,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;AAO5D;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,MAAiB,EACjB,EAAE,mBAAmB,GAAG,KAAK,EAAE,uBAAuB,GAAG,KAAK,KAAwB,EAAE;IAExF,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,KAAK,EAAE;YACL,oBAAoB,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;gBACzC,YAAY,CAAC;oBACX,IAAI,EAAE;wBACJ,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;wBACxC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;wBACzC,OAAO,EAAE;4BACP,mBAAmB;4BACnB,uBAAuB;4BACvB,YAAY,EAAE,UAAU;yBACzB;qBACF;oBACD,uBAAuB;oBACvB,8DAA8D;iBAC/D,CAAC,CAAC;YACL,CAAC;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/util.d.ts

@@ -1,3 +1,4 @@
+import type { GetStaticPathsResult } from "astro";
 import type { I18Nya } from "i18nya";
 /**
  * Obtain the language name.
@@ -13,9 +14,20 @@ export declare const getLangName: (lang: string, displayLang?: string) => string
  * @returns a map of language locale → language name
  */
 export declare const listLang: <T extends string | number | symbol>(i18nya: I18Nya<T>, displayLang?: string) => Map<string, string>;
-export declare const makeGetStaticPaths: <T extends string | number | symbol>(i18nya: I18Nya<T>) => () => Promise<{
-    params: {
-        lang: string;
-    };
-}[]>;
+/**
+ * Build a `getStaticPaths` factory for Astro i18n routes.
+ *
+ * Returns a function that expands the provided `staticPaths` for every
+ * language in `i18nya.translations`. By default, the default language uses
+ * `{ params: { lang: undefined } }` so its route is not prefixed, while
+ * other languages use `{ params: { lang } }`. When `prefixDefaultLocale`
+ * is true, the default language also uses `{ params: { lang } }`.
+ *
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param staticPaths original `getStaticPaths` array to be localized
+ * @returns a `getStaticPaths` function for Astro
+ */
+export declare const makeGetStaticPaths: <T extends string | number | symbol>(i18nya: I18Nya<T>, staticPaths?: GetStaticPathsResult, { prefixDefaultLocale }?: {
+    prefixDefaultLocale?: boolean;
+}) => (() => GetStaticPathsResult);
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,cAAc,MAAM,WAIjD,CAAC;AAEd;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EACzD,QAAQ,MAAM,CAAC,CAAC,CAAC,EACjB,cAAc,MAAM,wBAOnB,CAAC;AAEJ,eAAO,MAAM,kBAAkB,GAC5B,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,QAAQ,MAAM,CAAC,CAAC,CAAC;;;;IAMnD,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,oBAAoB,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,MAAM,MAAM,EAAE,cAAc,MAAM,WAIjD,CAAC;AAEd;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EACzD,QAAQ,MAAM,CAAC,CAAC,CAAC,EACjB,cAAc,MAAM,wBAOnB,CAAC;AAEJ;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,GAC5B,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EACjC,QAAQ,MAAM,CAAC,CAAC,CAAC,EACjB,cAAa,oBAAuC,EACpD,0BAAiC;IAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAAO,KACtE,CAAC,MAAM,oBAAoB,CAczB,CAAC"}

package/dist/util.js

@@ -18,7 +18,27 @@ export const listLang = (i18nya, displayLang) => new Map(Object.keys(i18nya.tran
     l,
     getLangName(l.replace("_", "-"), displayLang),
 ]));
-export const makeGetStaticPaths = (i18nya) => async () => Object.keys(i18nya.translations).map((lang) => lang === i18nya.config.defaultLang
-    ? { params: { lang: undefined } }
-    : { params: { lang: lang } });
+/**
+ * Build a `getStaticPaths` factory for Astro i18n routes.
+ *
+ * Returns a function that expands the provided `staticPaths` for every
+ * language in `i18nya.translations`. By default, the default language uses
+ * `{ params: { lang: undefined } }` so its route is not prefixed, while
+ * other languages use `{ params: { lang } }`. When `prefixDefaultLocale`
+ * is true, the default language also uses `{ params: { lang } }`.
+ *
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param staticPaths original `getStaticPaths` array to be localized
+ * @returns a `getStaticPaths` function for Astro
+ */
+export const makeGetStaticPaths = (i18nya, staticPaths = [{ params: {} }], { prefixDefaultLocale = false } = {}) => () => staticPaths.flatMap(({ params, props }) => Object.keys(i18nya.translations)
+    .map((lang) => ({
+    props,
+    params: {
+        ...params,
+        lang: lang === i18nya.config.defaultLang && !prefixDefaultLocale
+            ? undefined
+            : lang,
+    },
+})));
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,WAAoB,EAAE,EAAE,CAChE,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE;IAC3C,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,QAAQ;CAChB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;AAEd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAAiB,EACjB,WAAoB,EACpB,EAAE,CACF,IAAI,GAAG,CACL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAC1C,CAAC;IACD,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC;CAC9C,CAAC,CACH,CAAC;AAEJ,MAAM,CAAC,MAAM,kBAAkB,GAC7B,CAAqC,MAAiB,EAAE,EAAE,CAC1D,KAAK,IAAI,EAAE,CACT,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5C,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,WAAW;IAChC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;IACjC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAC/B,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,WAAoB,EAAE,EAAE,CAChE,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE;IAC3C,IAAI,EAAE,UAAU;IAChB,KAAK,EAAE,QAAQ;CAChB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;AAEd;;;;;GAKG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAAiB,EACjB,WAAoB,EACpB,EAAE,CACF,IAAI,GAAG,CACL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAC1C,CAAC;IACD,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC;CAC9C,CAAC,CACH,CAAC;AAEJ;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAC7B,CACE,MAAiB,EACjB,cAAoC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EACpD,EAAE,mBAAmB,GAAG,KAAK,KAAwC,EAAE,EACzC,EAAE,CAChC,GAAyB,EAAE,CACzB,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAwB,EAAE,CAC9D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;KAC7B,GAAG,CAAC,CAAC,IAAI,EAAsB,EAAE,CAAC,CAAC;IAClC,KAAK;IACL,MAAM,EAAE;QACN,GAAG,MAAM;QACT,IAAI,EACF,IAAI,KAAK,MAAM,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,mBAAmB;YACxD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI;KACX;CACF,CAAC,CAAC,CACN,CAAC"}

package/jest.config.ts

@@ -1,7 +1,14 @@
-import type {Config} from 'jest';
+import type { Config } from 'jest';
 
 const config: Config = {
-  "testEnvironment": "jsdom"
+  preset: "ts-jest",
+  testEnvironment: "jsdom",
+  testPathIgnorePatterns: [
+    "<rootDir>/dist"
+  ],
+  transform: {
+    '^.+\\.(ts|tsx)$': 'ts-jest',
+  },
 };
 
-export default config;
+export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-i18nya",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Astro integration for i18nya: i18n as small as a cat's paw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,11 +13,6 @@
     "type": "git",
     "url": "git+https://github.com/FyraLabs/i18nya.git"
   },
-  "jest": {
-    "testPathIgnorePatterns": [
-      "<rootDir>/dist"
-    ]
-  },
   "keywords": [
     "astro",
     "astro-integration",
@@ -35,25 +30,22 @@
   },
   "homepage": "https://github.com/FyraLabs/i18nya#readme",
   "devDependencies": {
-    "@babel/core": "^7.28.5",
-    "@babel/preset-env": "^7.28.5",
-    "@babel/preset-react": "^7.28.5",
-    "@babel/preset-typescript": "^7.28.5",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^24.10.1",
-    "babel-jest": "^30.2.0",
+    "@types/react": "^19.2.14",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "react-test-renderer": "^19.2.0",
+    "ts-jest": "^29.4.9",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "typescript": "^5"
   },
   "dependencies": {
-    "astro": "^5.16.0",
+    "astro": "^6.2.2",
     "i18nya": "^0.2.0",
     "react": "^19.2.0"
   }

package/src/Trans.tsx

@@ -44,9 +44,12 @@ export default (({ children, t }: Props) => {
 
   const elms: ReactNode[] = []; // resulting list of elements
   const tagStack = [];
-  for (let ch_idx = 0; ch_idx < t.length; ) {
+  for (let ch_idx = 0; ch_idx < t.length;) {
     if (t.substring(ch_idx, ch_idx + 2) == "\\<") {
-      elms.push("<");
+      if (typeof elms[elms.length - 1] === "string")
+        elms[elms.length - 1] += "<";
+      else
+        elms.push("<");
       ch_idx += 2;
       continue;
     }

package/src/index.ts

@@ -4,8 +4,19 @@ import Trans from "./Trans.js";
 import { listLang, getLangName, makeGetStaticPaths } from "./util.js";
 export { Trans, listLang, getLangName, makeGetStaticPaths };
 
-export default function astroI18nya<T extends string | number | symbol>(
+export type AstroI18nyaConfig = {
+  prefixDefaultLocale?: boolean;
+  redirectToDefaultLocale?: boolean;
+};
+
+/**
+ * Astro integration for i18nya.
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param config routing behavior overrides
+ */
+export default function astro_i18nya<T extends string | number | symbol>(
   i18nya: I18Nya<T>,
+  { prefixDefaultLocale = false, redirectToDefaultLocale = false }: AstroI18nyaConfig = {},
 ): AstroIntegration {
   return {
     name: "astro-i18nya",
@@ -16,8 +27,8 @@ export default function astroI18nya<T extends string | number | symbol>(
             defaultLocale: i18nya.config.defaultLang,
             locales: Object.keys(i18nya.translations),
             routing: {
-              prefixDefaultLocale: false,
-              redirectToDefaultLocale: true,
+              prefixDefaultLocale,
+              redirectToDefaultLocale,
               fallbackType: "redirect",
             },
           },

package/src/util.test.ts

@@ -0,0 +1,61 @@
+import type { GetStaticPathsResult } from "astro";
+import type { I18Nya } from "i18nya";
+import { makeGetStaticPaths } from "./util";
+
+const makeI18nya = (defaultLang: string, langs: string[]): I18Nya<string> =>
+  ({
+    config: { defaultLang },
+    translations: Object.fromEntries(langs.map((lang) => [lang, {}])),
+  }) as I18Nya<string>;
+
+describe("makeGetStaticPaths", () => {
+  it("expands static paths for each language", () => {
+    const i18nya = makeI18nya("en", ["en", "fr"]);
+    const staticPaths: GetStaticPathsResult = [
+      { params: { slug: "hello" }, props: { id: 1 } },
+      { params: { slug: "about" }, props: { id: 2 } },
+    ];
+
+    const getStaticPaths = makeGetStaticPaths(i18nya, staticPaths);
+    const result = getStaticPaths();
+
+    expect(result).toEqual([
+      { params: { slug: "hello", lang: undefined }, props: { id: 1 } },
+      { params: { slug: "hello", lang: "fr" }, props: { id: 1 } },
+      { params: { slug: "about", lang: undefined }, props: { id: 2 } },
+      { params: { slug: "about", lang: "fr" }, props: { id: 2 } },
+    ]);
+  });
+
+  it("uses undefined for default language", () => {
+    const i18nya = makeI18nya("en", ["en", "ja"]);
+    const staticPaths: GetStaticPathsResult = [{ params: { slug: "home" } }];
+
+    const result = makeGetStaticPaths(i18nya, staticPaths)();
+
+    expect(result[0].params.lang).toBeUndefined();
+    expect(result[0].params.slug).toBe("home");
+    expect(result[1].params.lang).toBe("ja");
+    expect(result[1].params.slug).toBe("home");
+  });
+
+  it("includes default language when prefixDefaultLocale is true", () => {
+    const i18nya = makeI18nya("en", ["en", "ja"]);
+    const staticPaths: GetStaticPathsResult = [{ params: { slug: "home" } }];
+
+    const result = makeGetStaticPaths(i18nya, staticPaths, { prefixDefaultLocale: true })();
+
+    expect(result[0].params.lang).toBe("en");
+    expect(result[0].params.slug).toBe("home");
+    expect(result[1].params.lang).toBe("ja");
+    expect(result[1].params.slug).toBe("home");
+  });
+
+  it("returns static paths even when no static paths are provided", () => {
+    const i18nya = makeI18nya("en", ["en", "fr"]);
+    const result = makeGetStaticPaths(i18nya)();
+
+    expect(result[0].params.lang).toBe(undefined);
+    expect(result[1].params.lang).toBe("fr");
+  });
+});

package/src/util.ts

@@ -1,3 +1,4 @@
+import type { GetStaticPathsItem, GetStaticPathsResult } from "astro";
 import type { I18Nya } from "i18nya";
 
 /**
@@ -29,11 +30,36 @@ export const listLang = <T extends string | number | symbol>(
     ]),
   );
 
+/**
+ * Build a `getStaticPaths` factory for Astro i18n routes.
+ *
+ * Returns a function that expands the provided `staticPaths` for every
+ * language in `i18nya.translations`. By default, the default language uses
+ * `{ params: { lang: undefined } }` so its route is not prefixed, while
+ * other languages use `{ params: { lang } }`. When `prefixDefaultLocale`
+ * is true, the default language also uses `{ params: { lang } }`.
+ *
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param staticPaths original `getStaticPaths` array to be localized
+ * @returns a `getStaticPaths` function for Astro
+ */
 export const makeGetStaticPaths =
-  <T extends string | number | symbol>(i18nya: I18Nya<T>) =>
-  async () =>
-    Object.keys(i18nya.translations).map((lang) =>
-      lang === i18nya.config.defaultLang
-        ? { params: { lang: undefined } }
-        : { params: { lang: lang } },
-    );
+  <T extends string | number | symbol>(
+    i18nya: I18Nya<T>,
+    staticPaths: GetStaticPathsResult = [{ params: {} }],
+    { prefixDefaultLocale = false }: { prefixDefaultLocale?: boolean } = {},
+  ): (() => GetStaticPathsResult) =>
+    (): GetStaticPathsResult =>
+      staticPaths.flatMap(({ params, props }): GetStaticPathsResult =>
+        Object.keys(i18nya.translations)
+          .map((lang): GetStaticPathsItem => ({
+            props,
+            params: {
+              ...params,
+              lang:
+                lang === i18nya.config.defaultLang && !prefixDefaultLocale
+                  ? undefined
+                  : lang,
+            },
+          })),
+      );

package/babel.config.js

@@ -1,8 +0,0 @@
-module.exports = {
-  presets: [
-    ['@babel/preset-env', {targets: {node: 'current'}}],
-    '@babel/preset-typescript',
-
-    ['@babel/preset-react', {runtime: 'automatic'}],
-  ],
-};