astro-i18nya 0.1.3 → 0.2.1

package/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/dist/Trans.d.ts

@@ -0,0 +1,31 @@
+import type { ReactNode } from "react";
+type Props = {
+    children: ReactNode;
+    t: string;
+};
+/**
+ * A fake version of `<Trans>` in `react-i18next` with *very different* behaviour.
+ *
+ * You feed in a list of empty elements in `<Trans>`. The structure will follow the translation strings.
+ *
+ * IMPORTANT: It is **HIGHLY RECOMMENDED** to use `experimentalReactChildren: true` for `@astrojs/react` in your astro config,
+ * otherwise this will not work correctly outside of `.tsx` files.
+ *
+ * @example ```tsx
+ * <Trans t={t("test", { user: "John" })}>
+ *   <b />
+ *   <a href="https://example.com" />
+ * </Trans>
+ * ```
+ * With `"test": "Hello <1>{{user}}</1>, welcome to <2><1>my site</1></2>."`, the above element will become:
+ * ```tsx
+ * <b>Hello John</b>, welcome to <a href="https://example.com"><b>my site</b></a>.
+ * ```
+ *
+ * @param children the list of tags.
+ * @param t return value of t()
+ * @returns ReactNode
+ */
+declare const _default: ({ children, t }: Props) => string | import("react/jsx-runtime").JSX.Element;
+export default _default;
+//# sourceMappingURL=Trans.d.ts.map

package/dist/Trans.d.ts.map

@@ -0,0 +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"}

package/dist/Trans.js

@@ -0,0 +1,81 @@
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+//? https://react.i18next.com/latest/trans-component
+// do something similar to ↑
+import { Children, cloneElement, isValidElement } from "react";
+/**
+ * A fake version of `<Trans>` in `react-i18next` with *very different* behaviour.
+ *
+ * You feed in a list of empty elements in `<Trans>`. The structure will follow the translation strings.
+ *
+ * IMPORTANT: It is **HIGHLY RECOMMENDED** to use `experimentalReactChildren: true` for `@astrojs/react` in your astro config,
+ * otherwise this will not work correctly outside of `.tsx` files.
+ *
+ * @example ```tsx
+ * <Trans t={t("test", { user: "John" })}>
+ *   <b />
+ *   <a href="https://example.com" />
+ * </Trans>
+ * ```
+ * With `"test": "Hello <1>{{user}}</1>, welcome to <2><1>my site</1></2>."`, the above element will become:
+ * ```tsx
+ * <b>Hello John</b>, welcome to <a href="https://example.com"><b>my site</b></a>.
+ * ```
+ *
+ * @param children the list of tags.
+ * @param t return value of t()
+ * @returns ReactNode
+ */
+export default (({ children, t }) => {
+    // find /<\/(\d+)>/g, where group 1 parse to int is largest
+    const maxTagId = Math.max(...t.match(/<\/(\d+)>/g).map((i) => parseInt(i.slice(2, -1))));
+    const inputs = Children.toArray(children).filter((c) => isValidElement(c));
+    if ((maxTagId ?? 0) > inputs.length) {
+        return t; // syntax error
+    }
+    const elms = []; // resulting list of elements
+    const tagStack = [];
+    for (let ch_idx = 0; ch_idx < t.length;) {
+        if (t.substring(ch_idx, ch_idx + 2) == "\\<") {
+            elms.push("<");
+            ch_idx += 2;
+            continue;
+        }
+        if (t.substring(ch_idx, ch_idx + 2) == "</") {
+            let j = 0;
+            while (t[++j + ch_idx] != ">" && j + ch_idx < t.length)
+                ;
+            const tag = Number.parseInt(t.substring(++ch_idx + 1, (ch_idx += j)));
+            if (Number.isNaN(tag)) {
+                elms.push(t.substring(ch_idx - j - 1, ch_idx));
+                continue;
+            }
+            let { p, l } = tagStack.pop();
+            if (tag != p) {
+                return t; // syntax error
+            }
+            elms.push(cloneElement(inputs[p - 1], {}, ...elms.splice(l, elms.length - l)));
+            continue;
+        }
+        if (t[ch_idx] == "<") {
+            let j = 0;
+            while (t[++j + ch_idx] != ">" && j + ch_idx < t.length)
+                ;
+            const tag = Number.parseInt(t.substring(++ch_idx, (ch_idx += j)));
+            if (Number.isNaN(tag)) {
+                elms.push(t.substring(ch_idx - j - 1, ch_idx));
+                continue;
+            }
+            tagStack.push({ p: tag, l: elms.length });
+            elms.push(""); // in order to splice later, contents inside a new tag element must start fresh
+            continue;
+        }
+        if (typeof elms[elms.length - 1] === "string") {
+            elms[elms.length - 1] += t[ch_idx++];
+        }
+        else {
+            elms.push(t[ch_idx++]);
+        }
+    }
+    return _jsx(_Fragment, { children: elms });
+});
+//# sourceMappingURL=Trans.js.map

package/dist/Trans.js.map

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

package/dist/index.d.ts

@@ -0,0 +1,7 @@
+import type { I18Nya } from "i18nya";
+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;
+//# 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,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"}

package/dist/index.js

@@ -0,0 +1,26 @@
+import Trans from "./Trans.js";
+import { listLang, getLangName, makeGetStaticPaths } from "./util.js";
+export { Trans, listLang, getLangName, makeGetStaticPaths };
+export default function astroI18nya(i18nya) {
+    return {
+        name: "astro-i18nya",
+        hooks: {
+            "astro:config:setup": ({ updateConfig }) => {
+                updateConfig({
+                    i18n: {
+                        defaultLocale: i18nya.config.defaultLang,
+                        locales: Object.keys(i18nya.translations),
+                        routing: {
+                            prefixDefaultLocale: false,
+                            redirectToDefaultLocale: true,
+                            fallbackType: "redirect",
+                        },
+                    },
+                    // required for <Trans>
+                    // integrations: [react({ experimentalReactChildren: true })],
+                });
+            },
+        },
+    };
+}
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +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"}

package/dist/util.d.ts

@@ -0,0 +1,21 @@
+import type { I18Nya } from "i18nya";
+/**
+ * Obtain the language name.
+ * @param lang the language locale
+ * @param displayLang in what language should the name of the language be shown. By default, use native language names.
+ * @returns language name
+ */
+export declare const getLangName: (lang: string, displayLang?: string) => string;
+/**
+ * List out available languages.
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param displayLang in what language should the name of the language be shown. By default, use native language names.
+ * @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;
+    };
+}[]>;
+//# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -0,0 +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"}

package/dist/util.js

@@ -0,0 +1,24 @@
+/**
+ * Obtain the language name.
+ * @param lang the language locale
+ * @param displayLang in what language should the name of the language be shown. By default, use native language names.
+ * @returns language name
+ */
+export const getLangName = (lang, displayLang) => new Intl.DisplayNames([displayLang ?? lang], {
+    type: "language",
+    style: "narrow",
+}).of(lang);
+/**
+ * List out available languages.
+ * @param i18nya return value of `init()` from `i18nya`
+ * @param displayLang in what language should the name of the language be shown. By default, use native language names.
+ * @returns a map of language locale → language name
+ */
+export const listLang = (i18nya, displayLang) => new Map(Object.keys(i18nya.translations).map((l) => [
+    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 } });
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +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"}

package/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/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 } },
+    );