@koine/i18n 2.0.0-beta.141 → 2.0.0-beta.143

package/adapter-js/generators/createT.cjs.js

@@ -2,16 +2,17 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var e = createAdapter.createGenerator("js", (e)=>{
-    let { options: t } = e;
+var e = createAdapter.createGenerator("js", (t)=>{
+    let { options: n } = t;
     return {
         createT: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "createT",
             ext: "ts",
-            index: !0,
+            index: !1,
             content: ()=>`
-import type { I18n } from "./types";
-import { defaultLocale } from "./defaultLocale";
+import type { I18n } from "../types";
+import { defaultLocale } from "../defaultLocale";
 import { tInterpolateParams } from "./tInterpolateParams";
 
 // An optional parameter allowEmptyStrings - true as default.
@@ -53,7 +54,7 @@ export function createT(
     query?: I18n.TranslationQuery,
     options?: I18n.TranslationOptions,
   ): TReturn => {
-    const [namespace, key] = path.split("${t.translations.tokens.namespaceDelimiter}");
+    const [namespace, key] = path.split("${n.translations.tokens.namespaceDelimiter}");
     const dic = (namespace && dictionaries[namespace]) || {};
     const pluralisedKey = getPluralisedKey(pluralRules, dic, key, query, options);
     const dicValue = getDicValue(dic, pluralisedKey, query, options);

package/adapter-js/generators/createT.d.ts

@@ -1,8 +1,9 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
     createT: {
+        dir: string;
         name: string;
         ext: "ts";
-        index: true;
+        index: false;
         content: () => string;
     };
 };

package/adapter-js/generators/createT.esm.js

@@ -1,15 +1,16 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var e = createGenerator("js", (e)=>{
-    let { options: t } = e;
+var e = createGenerator("js", (t)=>{
+    let { options: n } = t;
     return {
         createT: {
+            dir: createGenerator.dirs.internal,
             name: "createT",
             ext: "ts",
-            index: !0,
+            index: !1,
             content: ()=>`
-import type { I18n } from "./types";
-import { defaultLocale } from "./defaultLocale";
+import type { I18n } from "../types";
+import { defaultLocale } from "../defaultLocale";
 import { tInterpolateParams } from "./tInterpolateParams";
 
 // An optional parameter allowEmptyStrings - true as default.
@@ -51,7 +52,7 @@ export function createT(
     query?: I18n.TranslationQuery,
     options?: I18n.TranslationOptions,
   ): TReturn => {
-    const [namespace, key] = path.split("${t.translations.tokens.namespaceDelimiter}");
+    const [namespace, key] = path.split("${n.translations.tokens.namespaceDelimiter}");
     const dic = (namespace && dictionaries[namespace]) || {};
     const pluralisedKey = getPluralisedKey(pluralRules, dic, key, query, options);
     const dicValue = getDicValue(dic, pluralisedKey, query, options);

package/adapter-js/generators/defaultI18nMetadata.cjs.js

@@ -2,13 +2,14 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var t = createAdapter.createGenerator("js", (t)=>({
+var t = createAdapter.createGenerator("js", (a)=>({
         defaultI18nMetadata: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "defaultI18nMetadata",
             ext: "ts",
             index: !1,
             content: ()=>`
-import type { I18n } from "./types";
+import type { I18n } from "../types";
 
 /**
  * @internal

package/adapter-js/generators/defaultI18nMetadata.d.ts

@@ -1,5 +1,6 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
     defaultI18nMetadata: {
+        dir: string;
         name: string;
         ext: "ts";
         index: false;

package/adapter-js/generators/defaultI18nMetadata.esm.js

@@ -1,12 +1,13 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var t = createGenerator("js", (t)=>({
+var t = createGenerator("js", (a)=>({
         defaultI18nMetadata: {
+            dir: createGenerator.dirs.internal,
             name: "defaultI18nMetadata",
             ext: "ts",
             index: !1,
             content: ()=>`
-import type { I18n } from "./types";
+import type { I18n } from "../types";
 
 /**
  * @internal

package/adapter-js/generators/formatTo.cjs.js

@@ -74,14 +74,15 @@ const formatTo = ({ defaultLocale: e, hideDefaultLocaleInUrl: t }, o)=>new funct
   return pathname;
 `
     });
-var a = createAdapter.createGenerator("js", (e)=>{
-    let { config: a } = e;
+var a = createAdapter.createGenerator("js", (a)=>{
+    let { config: t } = a;
     return {
         formatTo: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "formatTo",
             ext: "ts",
             index: !1,
-            content: ()=>formatTo(a, !0).$out("ts", {
+            content: ()=>formatTo(t, !0).$out("ts", {
                     imports: {
                         folderUp: 0
                     },

package/adapter-js/generators/formatTo.d.ts

@@ -3,6 +3,7 @@ import type { I18nCompiler } from "../../compiler/types";
 export declare const formatTo: ({ defaultLocale, hideDefaultLocaleInUrl, }: Pick<I18nCompiler.Config, "defaultLocale" | "hideDefaultLocaleInUrl" | "trailingSlash">, devDebug?: boolean) => FunctionsCompiler;
 declare const _default: (data: I18nCompiler.DataCode<"js">) => {
     formatTo: {
+        dir: string;
         name: string;
         ext: "ts";
         index: false;

package/adapter-js/generators/formatTo.esm.js

@@ -70,14 +70,15 @@ const formatTo = ({ defaultLocale: e, hideDefaultLocaleInUrl: t }, o)=>new Funct
   return pathname;
 `
     });
-var a = createGenerator("js", (e)=>{
-    let { config: a } = e;
+var a = createGenerator("js", (a)=>{
+    let { config: t } = a;
     return {
         formatTo: {
+            dir: createGenerator.dirs.internal,
             name: "formatTo",
             ext: "ts",
             index: !1,
-            content: ()=>formatTo(a, !0).$out("ts", {
+            content: ()=>formatTo(t, !0).$out("ts", {
                     imports: {
                         folderUp: 0
                     },

package/adapter-js/generators/formatUrl.cjs.js

@@ -3,7 +3,7 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
 var m = createAdapter.createGenerator("js", (e)=>{
-    let { config: { baseUrl: a, trailingSlash: t } } = e;
+    let { config: { baseUrl: t, trailingSlash: a } } = e;
     return {
         formatUrl: {
             name: "formatUrl",
@@ -14,10 +14,11 @@ var m = createAdapter.createGenerator("js", (e)=>{
  * Returns an absolute normalised URL prepending the \`baseUrl\` i18n option to
  * the given pathname. It respects the \`trailingSlash\` option.
  * 
- * @internal
  * @param pathname Normalised, always prepended with a locale (if needed) and a slash
  */
-export const formatUrl = (pathname: string) => "${a}" + ${t ? "pathname" : '(pathname === "/" ? "" : pathname)'};
+export const formatUrl = (pathname: string) => "${t}" + ${a ? "pathname" : '(pathname === "/" ? "" : pathname)'};
+
+export default formatUrl;
 `
         }
     };

package/adapter-js/generators/formatUrl.esm.js

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
 var m = createGenerator("js", (e)=>{
-    let { config: { baseUrl: a, trailingSlash: t } } = e;
+    let { config: { baseUrl: t, trailingSlash: a } } = e;
     return {
         formatUrl: {
             name: "formatUrl",
@@ -12,10 +12,11 @@ var m = createGenerator("js", (e)=>{
  * Returns an absolute normalised URL prepending the \`baseUrl\` i18n option to
  * the given pathname. It respects the \`trailingSlash\` option.
  * 
- * @internal
  * @param pathname Normalised, always prepended with a locale (if needed) and a slash
  */
-export const formatUrl = (pathname: string) => "${a}" + ${t ? "pathname" : '(pathname === "/" ? "" : pathname)'};
+export const formatUrl = (pathname: string) => "${t}" + ${a ? "pathname" : '(pathname === "/" ? "" : pathname)'};
+
+export default formatUrl;
 `
         }
     };

package/adapter-js/generators/getI18nDictionaries.cjs.js

@@ -1,18 +1,41 @@
 'use strict';
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
-var getI18nDictionaries_inline = require('./getI18nDictionaries_inline.cjs.js');
 
 var s = createAdapter.createGenerator("js", (e)=>({
         getI18nDictionaries: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "getI18nDictionaries",
             ext: "ts",
             index: !1,
             content: ()=>`
-import { defaultLocale } from "./defaultLocale";
-import type { I18n } from "./types";
+import { defaultLocale } from "../defaultLocale";
+import type { I18n } from "../types";
+import { loadTranslations } from "./loadTranslations";
 
-${getI18nDictionaries_inline.getI18nDictionaries_inline(0, !0)}
+type GetI18nDictionariesOptions = {
+  locale?: I18n.Locale;
+  namespaces?: I18n.TranslateNamespace[];
+};
+
+export async function getI18nDictionaries({
+  locale = defaultLocale,
+  namespaces = [],
+}: GetI18nDictionariesOptions) {
+  const translations =
+    (await Promise.all(
+      namespaces.map((namespace) => loadTranslations(locale, namespace)
+        .catch(() => ({}))
+      ),
+    )) || [];
+
+  return namespaces.reduce((dictionaries, ns, idx) => {
+    dictionaries[ns] =
+      translations[idx] ||
+      (null as unknown as I18n.TranslationsDictionaryLoose);
+    return dictionaries;
+  }, {} as I18n.Dictionaries);
+}
 `
         }
     }));

package/adapter-js/generators/getI18nDictionaries.d.ts

@@ -1,5 +1,6 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
     getI18nDictionaries: {
+        dir: string;
         name: string;
         ext: "ts";
         index: false;

package/adapter-js/generators/getI18nDictionaries.esm.js

@@ -1,16 +1,39 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
-import { getI18nDictionaries_inline } from './getI18nDictionaries_inline.esm.js';
 
 var s = createGenerator("js", (e)=>({
         getI18nDictionaries: {
+            dir: createGenerator.dirs.internal,
             name: "getI18nDictionaries",
             ext: "ts",
             index: !1,
             content: ()=>`
-import { defaultLocale } from "./defaultLocale";
-import type { I18n } from "./types";
+import { defaultLocale } from "../defaultLocale";
+import type { I18n } from "../types";
+import { loadTranslations } from "./loadTranslations";
 
-${getI18nDictionaries_inline(0, !0)}
+type GetI18nDictionariesOptions = {
+  locale?: I18n.Locale;
+  namespaces?: I18n.TranslateNamespace[];
+};
+
+export async function getI18nDictionaries({
+  locale = defaultLocale,
+  namespaces = [],
+}: GetI18nDictionariesOptions) {
+  const translations =
+    (await Promise.all(
+      namespaces.map((namespace) => loadTranslations(locale, namespace)
+        .catch(() => ({}))
+      ),
+    )) || [];
+
+  return namespaces.reduce((dictionaries, ns, idx) => {
+    dictionaries[ns] =
+      translations[idx] ||
+      (null as unknown as I18n.TranslationsDictionaryLoose);
+    return dictionaries;
+  }, {} as I18n.Dictionaries);
+}
 `
         }
     }));

package/adapter-js/generators/getI18nMetadata.cjs.js

@@ -2,21 +2,22 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var n = createAdapter.createGenerator("js", (t)=>{
-    let { routes: { dynamicRoutes: e, staticRoutes: a } } = t;
+var n = createAdapter.createGenerator("js", (e)=>{
+    let { routes: { dynamicRoutes: a, staticRoutes: o } } = e;
     return {
         getI18nMetadata: {
+            dir: createAdapter.createGenerator.dirs.internal,
             name: "getI18nMetadata",
             ext: "ts",
             index: !1,
             content: ()=>`
+import { defaultLocale } from "../defaultLocale";
+import { formatUrl } from "../formatUrl";
+import { locales } from "../locales";
+import { to } from "../to";
+import type { I18n } from "../types";
 import { defaultI18nMetadata } from "./defaultI18nMetadata";
-import { defaultLocale } from "./defaultLocale";
-import { formatUrl } from "./formatUrl";
-import { locales } from "./locales";
 import { type RouteIdError, isErrorRoute } from "./routesError";
-import { to } from "./to";
-import type { I18n } from "./types";
 
 type GetI18nMetadataOptions<TRouteId extends I18n.RouteId | RouteIdError> = {
   locale: I18n.Locale;
@@ -31,30 +32,30 @@ type GetI18nMetadataOptions<TRouteId extends I18n.RouteId | RouteIdError> = {
  */
 export function getI18nMetadata<TRouteId extends I18n.RouteId | RouteIdError>({
   locale: currentLocale,
-  id,${e.length ? `
+  id,${a.length ? `
   params,` : ""}
 }: GetI18nMetadataOptions<TRouteId>) {
-  if (isErrorRoute(id)) return defaultI18nMetadata;${e.length && !a.length ? `
+  if (isErrorRoute(id)) return defaultI18nMetadata;${a.length && !o.length ? `
   params = params as NonNullable<typeof params>;` : ""}
   const alternates: I18n.Alternates = {
-    "x-default": formatUrl(${e.length && a.length ? `
+    "x-default": formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
       params ? to(id, params, defaultLocale) : to(id, defaultLocale),
-    ),` : e.length ? "to(id, params, defaultLocale))," : "to(id, defaultLocale)),"}
+    ),` : a.length ? "to(id, params, defaultLocale))," : "to(id, defaultLocale)),"}
   };
   locales.forEach((locale) => {
-    alternates[locale] = formatUrl(${e.length && a.length ? `
+    alternates[locale] = formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
       params ? to(id, params, locale) : to(id, locale),
-    );` : e.length ? "to(id, params, locale));" : "to(id, locale));"}
+    );` : a.length ? "to(id, params, locale));" : "to(id, locale));"}
   });
 
   return {
     alternates,
-    canonical: formatUrl(${e.length && a.length ? `
+    canonical: formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
       params ? to(id, params, currentLocale) : to(id, currentLocale),
-    ),` : e.length ? "to(id, params, currentLocale))," : "to(id, currentLocale)),"}
+    ),` : a.length ? "to(id, params, currentLocale))," : "to(id, currentLocale)),"}
   };
 }
 `

package/adapter-js/generators/getI18nMetadata.d.ts

@@ -1,5 +1,6 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
     getI18nMetadata: {
+        dir: string;
         name: string;
         ext: "ts";
         index: false;

package/adapter-js/generators/getI18nMetadata.esm.js

@@ -1,20 +1,21 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var n = createGenerator("js", (t)=>{
-    let { routes: { dynamicRoutes: e, staticRoutes: a } } = t;
+var n = createGenerator("js", (e)=>{
+    let { routes: { dynamicRoutes: a, staticRoutes: o } } = e;
     return {
         getI18nMetadata: {
+            dir: createGenerator.dirs.internal,
             name: "getI18nMetadata",
             ext: "ts",
             index: !1,
             content: ()=>`
+import { defaultLocale } from "../defaultLocale";
+import { formatUrl } from "../formatUrl";
+import { locales } from "../locales";
+import { to } from "../to";
+import type { I18n } from "../types";
 import { defaultI18nMetadata } from "./defaultI18nMetadata";
-import { defaultLocale } from "./defaultLocale";
-import { formatUrl } from "./formatUrl";
-import { locales } from "./locales";
 import { type RouteIdError, isErrorRoute } from "./routesError";
-import { to } from "./to";
-import type { I18n } from "./types";
 
 type GetI18nMetadataOptions<TRouteId extends I18n.RouteId | RouteIdError> = {
   locale: I18n.Locale;
@@ -29,30 +30,30 @@ type GetI18nMetadataOptions<TRouteId extends I18n.RouteId | RouteIdError> = {
  */
 export function getI18nMetadata<TRouteId extends I18n.RouteId | RouteIdError>({
   locale: currentLocale,
-  id,${e.length ? `
+  id,${a.length ? `
   params,` : ""}
 }: GetI18nMetadataOptions<TRouteId>) {
-  if (isErrorRoute(id)) return defaultI18nMetadata;${e.length && !a.length ? `
+  if (isErrorRoute(id)) return defaultI18nMetadata;${a.length && !o.length ? `
   params = params as NonNullable<typeof params>;` : ""}
   const alternates: I18n.Alternates = {
-    "x-default": formatUrl(${e.length && a.length ? `
+    "x-default": formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
       params ? to(id, params, defaultLocale) : to(id, defaultLocale),
-    ),` : e.length ? "to(id, params, defaultLocale))," : "to(id, defaultLocale)),"}
+    ),` : a.length ? "to(id, params, defaultLocale))," : "to(id, defaultLocale)),"}
   };
   locales.forEach((locale) => {
-    alternates[locale] = formatUrl(${e.length && a.length ? `
+    alternates[locale] = formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
       params ? to(id, params, locale) : to(id, locale),
-    );` : e.length ? "to(id, params, locale));" : "to(id, locale));"}
+    );` : a.length ? "to(id, params, locale));" : "to(id, locale));"}
   });
 
   return {
     alternates,
-    canonical: formatUrl(${e.length && a.length ? `
+    canonical: formatUrl(${a.length && o.length ? `
       // @ ts-ignore dynamic to fn typing
       params ? to(id, params, currentLocale) : to(id, currentLocale),
-    ),` : e.length ? "to(id, params, currentLocale))," : "to(id, currentLocale)),"}
+    ),` : a.length ? "to(id, params, currentLocale))," : "to(id, currentLocale)),"}
   };
 }
 `

package/adapter-js/generators/getT.cjs.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
-var loadTranslations_inline = require('./loadTranslations_inline.cjs.js');
 
 var p = createAdapter.createGenerator("js", (a)=>({
         getT: {
@@ -9,12 +8,10 @@ var p = createAdapter.createGenerator("js", (a)=>({
             ext: "ts",
             index: !0,
             content: ()=>`
-import { createT } from "./createT";
-// import { loadTranslations } from "./loadTranslations";
+import { createT } from "./internal/createT";
+import { loadTranslations } from "./internal/loadTranslations";
 import type { I18n } from "./types";
 
-${loadTranslations_inline.loadTranslations_inline()}
-
 export async function getT<TNamespace extends I18n.TranslateNamespace>(
   locale: I18n.Locale,
   namespace: TNamespace,

package/adapter-js/generators/getT.esm.js

@@ -1,5 +1,4 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
-import { loadTranslations_inline } from './loadTranslations_inline.esm.js';
 
 var p = createGenerator("js", (a)=>({
         getT: {
@@ -7,12 +6,10 @@ var p = createGenerator("js", (a)=>({
             ext: "ts",
             index: !0,
             content: ()=>`
-import { createT } from "./createT";
-// import { loadTranslations } from "./loadTranslations";
+import { createT } from "./internal/createT";
+import { loadTranslations } from "./internal/loadTranslations";
 import type { I18n } from "./types";
 
-${loadTranslations_inline()}
-
 export async function getT<TNamespace extends I18n.TranslateNamespace>(
   locale: I18n.Locale,
   namespace: TNamespace,

package/adapter-js/generators/loadTranslations.cjs.js

@@ -0,0 +1,29 @@
+'use strict';
+
+var createAdapter = require('../../compiler/createAdapter.cjs.js');
+var helpers = require('../../compiler/helpers.cjs.js');
+
+var f = createAdapter.createGenerator("js", (t)=>({
+        loadTranslations: {
+            dir: createAdapter.createGenerator.dirs.internal,
+            name: "loadTranslations",
+            ext: "ts",
+            index: !1,
+            content: ()=>`
+import type { I18n } from "../types";
+
+/**
+ * @internal
+ */
+export const loadTranslations = (
+  locale: I18n.Locale,
+  namespace: I18n.TranslateNamespace,
+) =>
+  import(\`${helpers.getTranslationsDir(1)}/\${locale}/\${namespace}.json\`).then(
+    (m) => m.default,
+  );
+`
+        }
+    }));
+
+module.exports = f;

package/adapter-js/generators/loadTranslations.d.ts

@@ -1,5 +1,6 @@
 declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
     loadTranslations: {
+        dir: string;
         name: string;
         ext: "ts";
         index: false;

package/adapter-js/generators/loadTranslations.esm.js

@@ -0,0 +1,27 @@
+import { createGenerator } from '../../compiler/createAdapter.esm.js';
+import { getTranslationsDir } from '../../compiler/helpers.esm.js';
+
+var f = createGenerator("js", (t)=>({
+        loadTranslations: {
+            dir: createGenerator.dirs.internal,
+            name: "loadTranslations",
+            ext: "ts",
+            index: !1,
+            content: ()=>`
+import type { I18n } from "../types";
+
+/**
+ * @internal
+ */
+export const loadTranslations = (
+  locale: I18n.Locale,
+  namespace: I18n.TranslateNamespace,
+) =>
+  import(\`${getTranslationsDir(1)}/\${locale}/\${namespace}.json\`).then(
+    (m) => m.default,
+  );
+`
+        }
+    }));
+
+export { f as default };

package/adapter-js/generators/pathnameToRouteId.cjs.js

@@ -3,7 +3,7 @@
 var utils = require('@koine/utils');
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var f = createAdapter.createGenerator("js", (t)=>{
+var g = createAdapter.createGenerator("js", (t)=>{
     let { options: a } = t, { idDelimiter: r, optionalCatchAll: o, catchAll: n } = a.routes.tokens;
     return {
         pathnameToRouteId: {
@@ -30,4 +30,4 @@ export default pathnameToRouteId;
     };
 });
 
-module.exports = f;
+module.exports = g;

package/adapter-js/generators/pathnameToRouteId.esm.js

@@ -1,7 +1,7 @@
 import { escapeRegExp } from '@koine/utils';
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var f = createGenerator("js", (t)=>{
+var g = createGenerator("js", (t)=>{
     let { options: a } = t, { idDelimiter: r, optionalCatchAll: o, catchAll: n } = a.routes.tokens;
     return {
         pathnameToRouteId: {
@@ -28,4 +28,4 @@ export default pathnameToRouteId;
     };
 });
 
-export { f as default };
+export { g as default };