@koine/i18n 2.0.0-beta.136 → 2.0.0-beta.137

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var t = createAdapter.createGenerator("js", (e)=>{
+var e = createAdapter.createGenerator("js", (e)=>{
     let { options: t } = e;
     return {
         createT: {
@@ -194,4 +194,4 @@ function objectInterpolation(
     };
 });
 
-module.exports = t;
+module.exports = e;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var t = createGenerator("js", (e)=>{
+var e = createGenerator("js", (e)=>{
     let { options: t } = e;
     return {
         createT: {
@@ -192,4 +192,4 @@ function objectInterpolation(
     };
 });
 
-export { t as default };
+export { e as default };

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

@@ -2,7 +2,7 @@
 
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 
-var e = createAdapter.createGenerator("js", (t)=>({
+var t = createAdapter.createGenerator("js", (t)=>({
         defaultI18nMetadata: {
             name: "defaultI18nMetadata",
             ext: "ts",
@@ -21,4 +21,4 @@ export const defaultI18nMetadata: I18n.Metadata = {
         }
     }));
 
-module.exports = e;
+module.exports = t;

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

@@ -1,6 +1,6 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 
-var e = createGenerator("js", (t)=>({
+var t = createGenerator("js", (t)=>({
         defaultI18nMetadata: {
             name: "defaultI18nMetadata",
             ext: "ts",
@@ -19,4 +19,4 @@ export const defaultI18nMetadata: I18n.Metadata = {
         }
     }));
 
-export { e as default };
+export { t as default };

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

@@ -0,0 +1,43 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var createAdapter = require('../../compiler/createAdapter.cjs.js');
+var functions = require('../../compiler/functions.cjs.js');
+
+const setGlobalLocale = (e)=>new functions.FunctionsCompiler({
+        imports: [],
+        name: "setGlobalLocale",
+        args: [
+            {
+                name: "value",
+                type: "string",
+                optional: !1
+            }
+        ],
+        before: ({ format: e })=>"ts" === e ? `
+declare global {
+  var __i18n_locale: I18n.Locale;
+}` : "",
+        body: "global.__i18n_locale = value;"
+    });
+var l = createAdapter.createGenerator("js", (e)=>({
+        setGlobalLocale: {
+            dir: "internal",
+            name: "setGlobalLocale",
+            ext: "ts",
+            index: !1,
+            content: ()=>`
+/**
+ * @internal
+ */
+${setGlobalLocale().$out("ts", {
+                    imports: !1,
+                    exports: "named"
+                })}
+`
+        }
+    }));
+
+exports.default = l;
+exports.setGlobalLocale = setGlobalLocale;

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

@@ -0,0 +1,12 @@
+import { FunctionsCompiler } from "../../compiler/functions";
+export declare const setGlobalLocale: (_options?: never) => FunctionsCompiler;
+declare const _default: (data: import("../../compiler-sync").I18nCompiler.DataCode<"js">) => {
+    setGlobalLocale: {
+        dir: string;
+        name: string;
+        ext: "ts";
+        index: false;
+        content: () => string;
+    };
+};
+export default _default;

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

@@ -0,0 +1,38 @@
+import { createGenerator } from '../../compiler/createAdapter.esm.js';
+import { FunctionsCompiler } from '../../compiler/functions.esm.js';
+
+const setGlobalLocale = (e)=>new FunctionsCompiler({
+        imports: [],
+        name: "setGlobalLocale",
+        args: [
+            {
+                name: "value",
+                type: "string",
+                optional: !1
+            }
+        ],
+        before: ({ format: e })=>"ts" === e ? `
+declare global {
+  var __i18n_locale: I18n.Locale;
+}` : "",
+        body: "global.__i18n_locale = value;"
+    });
+var l = createGenerator("js", (e)=>({
+        setGlobalLocale: {
+            dir: "internal",
+            name: "setGlobalLocale",
+            ext: "ts",
+            index: !1,
+            content: ()=>`
+/**
+ * @internal
+ */
+${setGlobalLocale().$out("ts", {
+                    imports: !1,
+                    exports: "named"
+                })}
+`
+        }
+    }));
+
+export { l as default, setGlobalLocale };

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

@@ -77,7 +77,7 @@ const getTFunctions = (t, e)=>{
         allImports: l
     };
 };
-var l = createAdapter.createGenerator("js", (t)=>{
+var d = createAdapter.createGenerator("js", (t)=>{
     let { config: { defaultLocale: e }, options: { adapter: { modularized: a }, translations: { fnsPrefix: n } }, translations: r } = t, o = n || (a ? "$t_" : ""), { functions: l, allImports: p } = getTFunctions(r, {
         defaultLocale: e,
         fnPrefix: o
@@ -112,7 +112,7 @@ var l = createAdapter.createGenerator("js", (t)=>{
 });
 
 exports.areEqualTranslationsValues = areEqualTranslationsValues;
-exports.default = l;
+exports.default = d;
 exports.getTFunctionBodyWithLocales = getTFunctionBodyWithLocales;
 exports.getTFunctions = getTFunctions;
 exports.getTranslationValueOutput = getTranslationValueOutput;

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

@@ -73,7 +73,7 @@ const getTFunctions = (t, e)=>{
         allImports: l
     };
 };
-var l = createGenerator("js", (t)=>{
+var d = createGenerator("js", (t)=>{
     let { config: { defaultLocale: e }, options: { adapter: { modularized: a }, translations: { fnsPrefix: n } }, translations: r } = t, o = n || (a ? "$t_" : ""), { functions: l, allImports: p } = getTFunctions(r, {
         defaultLocale: e,
         fnPrefix: o
@@ -107,4 +107,4 @@ var l = createGenerator("js", (t)=>{
     };
 });
 
-export { areEqualTranslationsValues, l as default, getTFunctionBodyWithLocales, getTFunctions, getTranslationValueOutput };
+export { areEqualTranslationsValues, d as default, getTFunctionBodyWithLocales, getTFunctions, getTranslationValueOutput };

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

@@ -27,7 +27,7 @@ const tInterpolateParams = ({ start: t, end: r })=>new functions.FunctionsCompil
       params[key.trim()${"ts" === e ? " as keyof typeof params" : ""}] + "",
   ) : value`
     });
-var d = createAdapter.createGenerator("js", (t)=>{
+var c = createAdapter.createGenerator("js", (t)=>{
     let { options: e } = t, { dynamicDelimiters: a } = e.translations.tokens;
     return {
         tInterpolateParams: {
@@ -47,5 +47,5 @@ ${tInterpolateParams(a).$out("ts", {
     };
 });
 
-exports.default = d;
+exports.default = c;
 exports.tInterpolateParams = tInterpolateParams;

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

@@ -23,7 +23,7 @@ const tInterpolateParams = ({ start: t, end: r })=>new FunctionsCompiler({
       params[key.trim()${"ts" === e ? " as keyof typeof params" : ""}] + "",
   ) : value`
     });
-var d = createGenerator("js", (t)=>{
+var c = createGenerator("js", (t)=>{
     let { options: e } = t, { dynamicDelimiters: a } = e.translations.tokens;
     return {
         tInterpolateParams: {
@@ -43,4 +43,4 @@ ${tInterpolateParams(a).$out("ts", {
     };
 });
 
-export { d as default, tInterpolateParams };
+export { c as default, tInterpolateParams };

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

@@ -26,7 +26,7 @@ const tPluralise = ()=>new functions.FunctionsCompiler({
         ],
         body: 'values[count] || values[pluralRules.select(count)] || (count === 0 ? values.zero : values["other"])'
     });
-var c = createAdapter.createGenerator("js", (e)=>({
+var u = createAdapter.createGenerator("js", (e)=>({
         tPluralise: {
             name: "tPluralise",
             ext: "ts",
@@ -41,5 +41,5 @@ ${tPluralise().$out("ts", {
         }
     }));
 
-exports.default = c;
+exports.default = u;
 exports.tPluralise = tPluralise;

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

@@ -22,7 +22,7 @@ const tPluralise = ()=>new FunctionsCompiler({
         ],
         body: 'values[count] || values[pluralRules.select(count)] || (count === 0 ? values.zero : values["other"])'
     });
-var c = createGenerator("js", (e)=>({
+var u = createGenerator("js", (e)=>({
         tPluralise: {
             name: "tPluralise",
             ext: "ts",
@@ -37,4 +37,4 @@ ${tPluralise().$out("ts", {
         }
     }));
 
-export { c as default, tPluralise };
+export { u as default, tPluralise };

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

@@ -92,7 +92,7 @@ let n = {
         }
     };
 };
-var u = createAdapter.createGenerator("js", (t)=>{
+var I = createAdapter.createGenerator("js", (t)=>{
     let { options: { routes: { tokens: { idDelimiter: o } } }, routes: { dynamicRoutes: e, staticRoutes: a } } = t;
     return {
         ...s(t),
@@ -204,5 +204,5 @@ export default toSpa;
     };
 });
 
-exports.default = u;
+exports.default = I;
 exports.getToFunctionBodyWithLocales = getToFunctionBodyWithLocales;

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

@@ -88,7 +88,7 @@ let n = {
         }
     };
 };
-var u = createGenerator("js", (t)=>{
+var I = createGenerator("js", (t)=>{
     let { options: { routes: { tokens: { idDelimiter: o } } }, routes: { dynamicRoutes: e, staticRoutes: a } } = t;
     return {
         ...s(t),
@@ -200,4 +200,4 @@ export default toSpa;
     };
 });
 
-export { u as default, getToFunctionBodyWithLocales };
+export { I as default, getToFunctionBodyWithLocales };

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

@@ -75,7 +75,7 @@ let d = (t, n)=>!utils.isArray(n) && utils.isObject(n) && pluralisation.hasPlura
         TranslationsDictionary: b(h(e))
     };
 };
-var I = createAdapter.createGenerator("js", (e)=>{
+var T$1 = createAdapter.createGenerator("js", (e)=>{
     let { options: { routes: { localeParamName: t, tokens: { idDelimiter: a } } } } = e, n = R(e);
     return {
         types: {
@@ -426,4 +426,4 @@ export namespace I18n {
     };
 });
 
-module.exports = I;
+module.exports = T$1;

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

@@ -73,7 +73,7 @@ let d = (t, n)=>!isArray(n) && isObject(n) && hasPlurals(n) ? hasOnlyPluralKeys(
         TranslationsDictionary: b(h(e))
     };
 };
-var I = createGenerator("js", (e)=>{
+var T$1 = createGenerator("js", (e)=>{
     let { options: { routes: { localeParamName: t, tokens: { idDelimiter: a } } } } = e, n = R(e);
     return {
         types: {
@@ -424,4 +424,4 @@ export namespace I18n {
     };
 });
 
-export { I as default };
+export { T$1 as default };

package/adapter-js/index.cjs.js

@@ -14,6 +14,7 @@ var getT = require('./generators/getT.cjs.js');
 var isLocale = require('./generators/isLocale.cjs.js');
 var pathnameToRouteId = require('./generators/pathnameToRouteId.cjs.js');
 var routes = require('./generators/routes.cjs.js');
+var setLocale = require('./generators/setLocale.cjs.js');
 var t = require('./generators/t.cjs.js');
 var tInterpolateParams = require('./generators/tInterpolateParams.cjs.js');
 var tPluralise = require('./generators/tPluralise.cjs.js');
@@ -38,6 +39,7 @@ const adapterJs = createAdapter.createAdapter({
             isLocale,
             pathnameToRouteId,
             routes,
+            setLocale.default,
             t.default,
             tInterpolateParams.default,
             tPluralise.default,

package/adapter-js/index.d.ts

@@ -160,6 +160,13 @@ export declare const adapterJs: {
                 index: false;
                 content: () => string;
             }) => import("../compiler-sync").I18nCompiler.AdapterFile);
+            setGlobalLocale: false | ((file: {
+                dir: string;
+                name: string;
+                ext: "ts";
+                index: false;
+                content: () => string;
+            }) => import("../compiler-sync").I18nCompiler.AdapterFile);
             $t: false | ((file: {
                 name: string;
                 ext: "ts";
@@ -311,6 +318,14 @@ export declare const adapterJs: {
             index: false;
             content: () => string;
         };
+    }) | ((data: import("../compiler-sync").I18nCompiler.DataCode<"js">) => {
+        setGlobalLocale: {
+            dir: string;
+            name: string;
+            ext: "ts";
+            index: false;
+            content: () => string;
+        };
     }) | ((data: import("../compiler-sync").I18nCompiler.DataCode<"js">) => {
         $t: {
             name: string;

package/adapter-js/index.esm.js

@@ -1,7 +1,7 @@
 import { createAdapter } from '../compiler/createAdapter.esm.js';
 import o from './generators/config.esm.js';
-import t from './generators/createT.esm.js';
-import e from './generators/defaultI18nMetadata.esm.js';
+import e from './generators/createT.esm.js';
+import t from './generators/defaultI18nMetadata.esm.js';
 import a from './generators/formatTo.esm.js';
 import m from './generators/formatUrl.esm.js';
 import s from './generators/getI18nDictionaries.esm.js';
@@ -10,11 +10,12 @@ import i from './generators/getT.esm.js';
 import p from './generators/isLocale.esm.js';
 import f from './generators/pathnameToRouteId.esm.js';
 import g from './generators/routes.esm.js';
-import l from './generators/t.esm.js';
-import d from './generators/tInterpolateParams.esm.js';
-import c from './generators/tPluralise.esm.js';
-import u from './generators/to.esm.js';
-import I from './generators/types.esm.js';
+import l from './generators/setLocale.esm.js';
+import d from './generators/t.esm.js';
+import c from './generators/tInterpolateParams.esm.js';
+import u from './generators/tPluralise.esm.js';
+import I from './generators/to.esm.js';
+import T from './generators/types.esm.js';
 
 const adapterJs = createAdapter({
     name: "js",
@@ -24,8 +25,8 @@ const adapterJs = createAdapter({
     },
     getGenerators: (r)=>[
             o,
-            t,
             e,
+            t,
             a,
             m,
             s,
@@ -38,7 +39,8 @@ const adapterJs = createAdapter({
             d,
             c,
             u,
-            I
+            I,
+            T
         ],
     getTransformers: ()=>({})
 });

package/adapter-next/generators/router-app/I18nPage.cjs.js

@@ -3,8 +3,8 @@
 var getI18nDictionaries_inline = require('../../../adapter-js/generators/getI18nDictionaries_inline.cjs.js');
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 
-var n = createAdapter.createGenerator("next", (t)=>{
-    let { config: { single: o }, options: { routes: { localeParamName: n } } } = t;
+var n = createAdapter.createGenerator("next", (a)=>{
+    let { config: { single: o }, options: { routes: { localeParamName: n } } } = a;
     return {
         I18nPage: {
             dir: createAdapter.createGenerator.dirs.server,
@@ -96,11 +96,6 @@ I18nPage.generateMetadata = getMetadata;
  */
 I18nPage.locale = (props: any) => props.${n};
 
-// declare globalThis {
-declare global {
-  var __i18n_locale: I18n.Locale;
-}
-
 /**
  * This function both sets and return the current locale based on the given
  * _props_ by simply reading the dedicated \`[localeParamName]\` dynamic segment

package/adapter-next/generators/router-app/I18nPage.esm.js

@@ -1,8 +1,8 @@
 import { getI18nDictionaries_inline } from '../../../adapter-js/generators/getI18nDictionaries_inline.esm.js';
 import { createGenerator } from '../../../compiler/createAdapter.esm.js';
 
-var n = createGenerator("next", (t)=>{
-    let { config: { single: o }, options: { routes: { localeParamName: n } } } = t;
+var n = createGenerator("next", (a)=>{
+    let { config: { single: o }, options: { routes: { localeParamName: n } } } = a;
     return {
         I18nPage: {
             dir: createGenerator.dirs.server,
@@ -94,11 +94,6 @@ I18nPage.generateMetadata = getMetadata;
  */
 I18nPage.locale = (props: any) => props.${n};
 
-// declare globalThis {
-declare global {
-  var __i18n_locale: I18n.Locale;
-}
-
 /**
  * This function both sets and return the current locale based on the given
  * _props_ by simply reading the dedicated \`[localeParamName]\` dynamic segment

package/adapter-next/generators/webpack-define.cjs.js

@@ -13,24 +13,24 @@ let p = (e, o)=>{
     for(let o in e.byId){
         let n = "", { pathnames: i, params: p } = e.byId[o], m = [];
         p && m.push("params"), m.push("locale");
-        let u = l ? '""' : "locale", c = p ? ", params" : "";
-        utils.isString(i) ? n += `formatTo(${u}, "${i}"${c})` : n += `formatTo(${u}, ${to.getToFunctionBodyWithLocales(a, i)}${c})`, r.push(`"${o}": (${m.join(", ")}) => ${n}`);
+        let c = l ? '""' : "locale", u = p ? ", params" : "";
+        utils.isString(i) ? n += `formatTo(${c}, "${i}"${u})` : n += `formatTo(${c}, ${to.getToFunctionBodyWithLocales(a, i)}${u})`, r.push(`"${o}": (${m.join(", ")}) => ${n}`);
     }
     return r.join(",\n  ");
 }, m = (t$1, o)=>{
     let { defaultLocale: r, namespaceDelimiter: l } = o, s = [];
     for(let o in t$1){
-        let { namespace: i, path: p, values: m, params: u, plural: c } = t$1[o];
-        c && (u ? u.count = "number" : u = {
+        let { namespace: i, path: p, values: m, params: c, plural: u } = t$1[o];
+        u && (c ? c.count = "number" : c = {
             count: "number"
         });
         let d = [];
-        u && d.push("params");
+        c && d.push("params");
         let $ = "";
-        utils.isPrimitive(m) ? $ += t.getTranslationValueOutput(m) : $ += t.getTFunctionBodyWithLocales(r, m), c && ($ = `tPluralise(${$}, params.count)`), u && ($ = `tInterpolateParams(${$}, params)`), s.push(`"${i}${l}${p}": (${d.join(", ")}) => ${$}`);
+        utils.isPrimitive(m) ? $ += t.getTranslationValueOutput(m) : $ += t.getTFunctionBodyWithLocales(r, m), u && ($ = `tPluralise(${$}, params.count)`), c && ($ = `tInterpolateParams(${$}, params)`), s.push(`"${i}${l}${p}": (${d.join(", ")}) => ${$}`);
     }
     return s.join(",\n  ");
-}, u = (e)=>{
+}, c = (e)=>{
     let { dynamicRoutes: t, staticRoutes: o } = e, a = 'import("../types").I18n', n = `
   /**
    * Global to function (allows to select any of the all available routes)
@@ -54,7 +54,7 @@ let p = (e, o)=>{
   ) => ${a}.RoutePathnames[Id];`, n;
 };
 var I = createAdapter.createGenerator("next", (e)=>{
-    let { config: t, options: a, routes: n, translations: s } = e, { defaultLocale: c, locales: d } = t, { namespaceDelimiter: $, dynamicDelimiters: f } = a.translations.tokens, { globalName: I } = a.adapter, { cwd: b, output: h } = a.write || {
+    let { config: t, options: a, routes: n, translations: s } = e, { defaultLocale: u, locales: d, debug: $ } = t, { namespaceDelimiter: f, dynamicDelimiters: b } = a.translations.tokens, { globalName: I } = a.adapter, { cwd: g, output: h } = a.write || {
         cwd: "",
         output: ""
     };
@@ -72,7 +72,7 @@ declare global {
   /**
    * Global t function (allows to select any of the all available translations)
    *
-   * @param path e.g. \`"myNamespace${$}myPath.nestedKey"\`
+   * @param path e.g. \`"myNamespace${f}myPath.nestedKey"\`
    */
   type GlobalT = <
     TPath extends import("../types").I18n.TranslationsAllPaths,
@@ -81,7 +81,7 @@ declare global {
     path: TPath,
     query?: object,
   ) => TReturn;
-  ${u(n)}
+  ${c(n)}
 
   var ${I}: {
     t: GlobalT;
@@ -102,10 +102,13 @@ const { DefinePlugin } = require("webpack");
 module.exports = {
   ${I}: DefinePlugin.runtimeValue(
     (_ctx) => {
+      ${"internal" === $ ? 'console.log("[@koine/i18n]:webpack-define:ctx.module", _ctx.module);' : ""};
       return {
         to: \`(function(routeId, params) {
           const locale = global.__i18n_locale;
-          const defaultLocale = "${c}";
+          ${"internal" === $ ? 'console.log("[@koine/i18n]:webpack-define:to", { locale });' : ""};
+
+          const defaultLocale = "${u}";
 
           ${formatTo.formatTo(t).$out("cjs", {
                     exports: !1,
@@ -115,7 +118,7 @@ module.exports = {
 
           const lookup = {
             ${p(n, {
-                    defaultLocale: c,
+                    defaultLocale: u,
                     locales: d
                 })}
           };
@@ -127,6 +130,7 @@ module.exports = {
         })\`,
         t: \`(function(i18nKey, params) {
           const locale = global.__i18n_locale;
+          ${"internal" === $ ? 'console.log("[@koine/i18n]:webpack-define:t", { locale });' : ""};
 
           ${tPluralise.tPluralise().$out("cjs", {
                     exports: !1,
@@ -134,7 +138,7 @@ module.exports = {
                     comments: !1
                 })}
 
-          ${tInterpolateParams.tInterpolateParams(f).$out("cjs", {
+          ${tInterpolateParams.tInterpolateParams(b).$out("cjs", {
                     exports: !1,
                     imports: !1,
                     comments: !1
@@ -142,8 +146,8 @@ module.exports = {
 
           const lookup = {
             ${m(s, {
-                    defaultLocale: c,
-                    namespaceDelimiter: $
+                    defaultLocale: u,
+                    namespaceDelimiter: f
                 })}
           };
 
@@ -154,10 +158,9 @@ module.exports = {
         })\`,
       }
     },
-    // _runtimeValueOptions:
     {
       fileDependencies: [
-        join("${b}", "${h}", "internal/webpack-define.js"),
+        join("${g}", "${h}", "internal/webpack-define.js"),
       ],
     },
   ),

package/adapter-next/generators/webpack-define.d.ts

@@ -8,9 +8,19 @@ declare const _default: (data: I18nCompiler.DataCode<"next">) => {
         content: () => string;
     };
     /**
+     * Some useful webpack DefinePlugin context (`ctx`) object properties
+     * - `ctx.module.layer` one of `"ssr"` | `"rsc"` | ?
+     * - `ctx.module.buildInfo.rsc`
+     * - `ctx.module.resourceResolveData.context`
+     *
      * @see
      * - [DefinePlugin / add support for watch mode](https://github.com/webpack/webpack/issues/7717)
      * - [support expressionMemberChain in DefinePlugin](https://github.com/webpack/webpack/pull/15562)
+     *
+     * NOTE: `DefinePlugin.runtimeValue` according to webpack types should return
+     * a `CodeValuePrimitive` (aka a string usually) type but returning an object
+     * also works and allows for a nicer namespaced global api. TODO: Verify that
+     * returning an object here is intentionally supportedas unknown as string;
      */
     webpackDefine: {
         dir: string;