@koine/i18n 2.0.0-beta.192 → 2.0.0-beta.193

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

@@ -72,7 +72,7 @@ module.exports = config;
             name: "i18nSwcTransforms",
             ext: "js",
             index: !1,
-            disabled: !o.options.adapter.modularize,
+            disabled: !o.options.adapter.options.modularize,
             content: ()=>{
                 let { tsconfig: a } = o.options.write || {};
                 if (!a) return "";

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

@@ -70,7 +70,7 @@ module.exports = config;
             name: "i18nSwcTransforms",
             ext: "js",
             index: !1,
-            disabled: !o.options.adapter.modularize,
+            disabled: !o.options.adapter.options.modularize,
             content: ()=>{
                 let { tsconfig: a } = o.options.write || {};
                 if (!a) return "";

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

@@ -11,11 +11,11 @@ var types = require('./types.cjs.js');
 
 let c = "count";
 function getTFunction(t, n) {
-    let { params: r, plural: o } = t, { single: i } = n, { body: l, imports: m } = function(t, n) {
-        let { values: r, params: o, plural: i, typeValue: l, equalValues: p } = t, { defaultLocale: m, single: u } = n, y = !u && !p, h = [
+    let { params: r, plural: o } = t, { single: i } = n, { body: s, imports: m } = function(t, n) {
+        let { values: r, params: o, plural: i, typeValue: s, equalValues: p } = t, { defaultLocale: m, single: u } = n, y = !u && !p, h = [
             d.types
         ];
-        return i && h.push(d.i18nPluralise), o && ("Primitive" === l ? h.push(d.i18nInterpolateParams) : ("Array" === l || "Object" === l) && h.push(d.i18nInterpolateParamsDeep)), {
+        return i && h.push(d.i18nPluralise), o && ("Primitive" === s ? h.push(d.i18nInterpolateParams) : ("Array" === s || "Object" === s) && h.push(d.i18nInterpolateParamsDeep)), {
             imports: h,
             body: (t)=>{
                 let n = y ? "locale = locale || globalThis." + helpers.GLOBAL_I18N_IDENTIFIER + "; " : "";
@@ -28,7 +28,7 @@ function getTFunction(t, n) {
                         r === t || utils.areEqual(i, n[t]) || (o += `locale === "${r}" ? ${f(i, a)} : `);
                     }
                     return o + f(n[t], a);
-                }(m, r, y, t), i && (p = `i18nPluralise(${p}, params.${c})`), o && ("Primitive" === l ? p = `i18nInterpolateParams(${p}, params)` : ("Array" === l || "Object" === l) && (p = `i18nInterpolateParamsDeep(${p}, params)`)), n + p;
+                }(m, r, y, t), i && (p = `i18nPluralise(${p}, params.${c})`), o && ("Primitive" === s ? p = `i18nInterpolateParams(${p}, params)` : ("Array" === s || "Object" === s) && (p = `i18nInterpolateParamsDeep(${p}, params)`)), n + p;
             }
         };
     }(t, n), u = [], y = r ? o ? {
@@ -49,7 +49,7 @@ function getTFunction(t, n) {
         description: "Use this to override the current locale" + (i ? " (in case you add other locales to your project)" : ""),
         defaults: "current locale"
     }), {
-        body: l,
+        body: s,
         args: u,
         imports: m
     };
@@ -87,11 +87,11 @@ let d = {
 }, y = (e, t)=>{
     let n = [], r = new Set();
     for(let a in r.add(d.types), e){
-        let o = e[a], { imports: i, args: s, body: p } = getTFunction(o, t);
+        let o = e[a], { imports: i, args: l, body: p } = getTFunction(o, t);
         i.forEach((e)=>r.add(e)), n.push(new functions.FunctionsCompiler({
             imports: i,
             name: o.fnName,
-            args: s,
+            args: l,
             body: p,
             comment: {
                 tags: [
@@ -109,7 +109,7 @@ let d = {
     };
 };
 var u = createAdapter.createGenerator("js", (e)=>{
-    let { config: t, options: { translations: n, adapter: { modularize: r } }, translations: a } = e, { dir: o } = n.functions, { functions: i, allImports: s } = y(a, t);
+    let { config: t, options: { translations: n, adapter: { options: { modularize: r } } }, translations: a } = e, { dir: o } = n.functions, { functions: i, allImports: l } = y(a, t);
     return r ? i.reduce((e, t)=>(e[t.name] = {
             dir: o,
             name: t.name,
@@ -129,7 +129,7 @@ var u = createAdapter.createGenerator("js", (e)=>{
             name: o,
             ext: "ts",
             index: !1,
-            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", s) + functions.FunctionsCompiler.outMany("ts", i, {
+            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", l) + functions.FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named",
                     style: "function",

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

@@ -7,11 +7,11 @@ import { getImportTypes } from './types.esm.js';
 
 let c = "count";
 function getTFunction(t, n) {
-    let { params: r, plural: o } = t, { single: i } = n, { body: l, imports: m } = function(t, n) {
-        let { values: r, params: o, plural: i, typeValue: l, equalValues: p } = t, { defaultLocale: m, single: u } = n, y = !u && !p, h = [
+    let { params: r, plural: o } = t, { single: i } = n, { body: s, imports: m } = function(t, n) {
+        let { values: r, params: o, plural: i, typeValue: s, equalValues: p } = t, { defaultLocale: m, single: u } = n, y = !u && !p, h = [
             d.types
         ];
-        return i && h.push(d.i18nPluralise), o && ("Primitive" === l ? h.push(d.i18nInterpolateParams) : ("Array" === l || "Object" === l) && h.push(d.i18nInterpolateParamsDeep)), {
+        return i && h.push(d.i18nPluralise), o && ("Primitive" === s ? h.push(d.i18nInterpolateParams) : ("Array" === s || "Object" === s) && h.push(d.i18nInterpolateParamsDeep)), {
             imports: h,
             body: (t)=>{
                 let n = y ? "locale = locale || globalThis." + GLOBAL_I18N_IDENTIFIER + "; " : "";
@@ -24,7 +24,7 @@ function getTFunction(t, n) {
                         r === t || areEqual(i, n[t]) || (o += `locale === "${r}" ? ${f(i, a)} : `);
                     }
                     return o + f(n[t], a);
-                }(m, r, y, t), i && (p = `i18nPluralise(${p}, params.${c})`), o && ("Primitive" === l ? p = `i18nInterpolateParams(${p}, params)` : ("Array" === l || "Object" === l) && (p = `i18nInterpolateParamsDeep(${p}, params)`)), n + p;
+                }(m, r, y, t), i && (p = `i18nPluralise(${p}, params.${c})`), o && ("Primitive" === s ? p = `i18nInterpolateParams(${p}, params)` : ("Array" === s || "Object" === s) && (p = `i18nInterpolateParamsDeep(${p}, params)`)), n + p;
             }
         };
     }(t, n), u = [], y = r ? o ? {
@@ -45,7 +45,7 @@ function getTFunction(t, n) {
         description: "Use this to override the current locale" + (i ? " (in case you add other locales to your project)" : ""),
         defaults: "current locale"
     }), {
-        body: l,
+        body: s,
         args: u,
         imports: m
     };
@@ -83,11 +83,11 @@ let d = {
 }, y = (e, t)=>{
     let n = [], r = new Set();
     for(let a in r.add(d.types), e){
-        let o = e[a], { imports: i, args: s, body: p } = getTFunction(o, t);
+        let o = e[a], { imports: i, args: l, body: p } = getTFunction(o, t);
         i.forEach((e)=>r.add(e)), n.push(new FunctionsCompiler({
             imports: i,
             name: o.fnName,
-            args: s,
+            args: l,
             body: p,
             comment: {
                 tags: [
@@ -105,7 +105,7 @@ let d = {
     };
 };
 var u = createGenerator("js", (e)=>{
-    let { config: t, options: { translations: n, adapter: { modularize: r } }, translations: a } = e, { dir: o } = n.functions, { functions: i, allImports: s } = y(a, t);
+    let { config: t, options: { translations: n, adapter: { options: { modularize: r } } }, translations: a } = e, { dir: o } = n.functions, { functions: i, allImports: l } = y(a, t);
     return r ? i.reduce((e, t)=>(e[t.name] = {
             dir: o,
             name: t.name,
@@ -125,7 +125,7 @@ var u = createGenerator("js", (e)=>{
             name: o,
             ext: "ts",
             index: !1,
-            content: ()=>"" + (ImportsCompiler.outMany("ts", s) + FunctionsCompiler.outMany("ts", i, {
+            content: ()=>"" + (ImportsCompiler.outMany("ts", l) + FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named",
                     style: "function",

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

@@ -10,8 +10,8 @@ var imports = require('../../compiler/imports.cjs.js');
 var types = require('./types.cjs.js');
 
 function getToFunction(e, o) {
-    let { id: r, params: n } = e, l = function(e, o) {
-        let { params: r, pathnames: n, equalValues: l } = e, { defaultLocale: s, single: i } = o, u = !i && !l, d = i ? '""' : "locale", m = r ? ", params" : "";
+    let { id: r, params: n } = e, s = function(e, o) {
+        let { params: r, pathnames: n, equalValues: s } = e, { defaultLocale: l, single: i } = o, u = !i && !s, d = i ? '""' : "locale", m = r ? ", params" : "";
         return (e)=>{
             let o = u ? "locale = locale || globalThis." + helpers.GLOBAL_I18N_IDENTIFIER + "; " : "";
             o += "return ";
@@ -23,26 +23,26 @@ function getToFunction(e, o) {
                     o !== t && n !== e[t] && (r += `locale === "${o}" ? "${n}"${a} : `);
                 }
                 return r + ('"' + e[t] + '"') + a;
-            }(s, n, e)}${m})`, o + r;
+            }(l, n, e)}${m})`, o + r;
         };
-    }(e, o), s = [];
-    return n && s.push({
+    }(e, o), l = [];
+    return n && l.push({
         name: "params",
         type: `I18n.RouteParams["${r}"]`,
         optional: !1,
         description: "Dynamic values to interpolate in the output URL pathname"
-    }), s.push({
+    }), l.push({
         name: "locale",
         type: "I18n.Locale",
         optional: !0,
         description: "Use this to override the current locale",
         defaults: "current locale"
     }), {
-        body: l,
-        args: s
+        body: s,
+        args: l
     };
 }
-let l = {
+let s = {
     formatTo: new imports.ImportsCompiler({
         path: "internal/formatTo",
         named: [
@@ -57,17 +57,17 @@ var I = createAdapter.createGenerator("js", (t)=>{
     let { options: { routes: { tokens: { idDelimiter: e } } }, routes: { dynamicRoutes: a, staticRoutes: n } } = t;
     return {
         ...function(t) {
-            let { config: e, routes: a, options: { routes: n, adapter: { modularize: s } } } = t, { dir: i } = n.functions, { functions: u, allImports: d } = function(t, e) {
+            let { config: e, routes: a, options: { routes: n, adapter: { options: { modularize: l } } } } = t, { dir: i } = n.functions, { functions: u, allImports: d } = function(t, e) {
                 let a = [], r = new Set();
-                for(let n in r.add(l.formatTo), r.add(l.types), t.byId){
-                    let r = t.byId[n], { args: s, body: i } = getToFunction(r, e);
+                for(let n in r.add(s.formatTo), r.add(s.types), t.byId){
+                    let r = t.byId[n], { args: l, body: i } = getToFunction(r, e);
                     a.push(new functions.FunctionsCompiler({
                         imports: [
-                            l.formatTo,
-                            l.types
+                            s.formatTo,
+                            s.types
                         ],
                         name: r.fnName,
-                        args: s,
+                        args: l,
                         body: i,
                         comment: {
                             tags: [
@@ -84,7 +84,7 @@ var I = createAdapter.createGenerator("js", (t)=>{
                     allImports: r
                 };
             }(a, e);
-            return s ? u.reduce((t, e)=>(t[e.name] = {
+            return l ? u.reduce((t, e)=>(t[e.name] = {
                     dir: i,
                     name: e.name,
                     ext: "ts",

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

@@ -6,8 +6,8 @@ import { ImportsCompiler } from '../../compiler/imports.esm.js';
 import { getImportTypes } from './types.esm.js';
 
 function getToFunction(e, o) {
-    let { id: r, params: n } = e, l = function(e, o) {
-        let { params: r, pathnames: n, equalValues: l } = e, { defaultLocale: s, single: i } = o, u = !i && !l, d = i ? '""' : "locale", m = r ? ", params" : "";
+    let { id: r, params: n } = e, s = function(e, o) {
+        let { params: r, pathnames: n, equalValues: s } = e, { defaultLocale: l, single: i } = o, u = !i && !s, d = i ? '""' : "locale", m = r ? ", params" : "";
         return (e)=>{
             let o = u ? "locale = locale || globalThis." + GLOBAL_I18N_IDENTIFIER + "; " : "";
             o += "return ";
@@ -19,26 +19,26 @@ function getToFunction(e, o) {
                     o !== t && n !== e[t] && (r += `locale === "${o}" ? "${n}"${a} : `);
                 }
                 return r + ('"' + e[t] + '"') + a;
-            }(s, n, e)}${m})`, o + r;
+            }(l, n, e)}${m})`, o + r;
         };
-    }(e, o), s = [];
-    return n && s.push({
+    }(e, o), l = [];
+    return n && l.push({
         name: "params",
         type: `I18n.RouteParams["${r}"]`,
         optional: !1,
         description: "Dynamic values to interpolate in the output URL pathname"
-    }), s.push({
+    }), l.push({
         name: "locale",
         type: "I18n.Locale",
         optional: !0,
         description: "Use this to override the current locale",
         defaults: "current locale"
     }), {
-        body: l,
-        args: s
+        body: s,
+        args: l
     };
 }
-let l = {
+let s = {
     formatTo: new ImportsCompiler({
         path: "internal/formatTo",
         named: [
@@ -53,17 +53,17 @@ var I = createGenerator("js", (t)=>{
     let { options: { routes: { tokens: { idDelimiter: e } } }, routes: { dynamicRoutes: a, staticRoutes: n } } = t;
     return {
         ...function(t) {
-            let { config: e, routes: a, options: { routes: n, adapter: { modularize: s } } } = t, { dir: i } = n.functions, { functions: u, allImports: d } = function(t, e) {
+            let { config: e, routes: a, options: { routes: n, adapter: { options: { modularize: l } } } } = t, { dir: i } = n.functions, { functions: u, allImports: d } = function(t, e) {
                 let a = [], r = new Set();
-                for(let n in r.add(l.formatTo), r.add(l.types), t.byId){
-                    let r = t.byId[n], { args: s, body: i } = getToFunction(r, e);
+                for(let n in r.add(s.formatTo), r.add(s.types), t.byId){
+                    let r = t.byId[n], { args: l, body: i } = getToFunction(r, e);
                     a.push(new FunctionsCompiler({
                         imports: [
-                            l.formatTo,
-                            l.types
+                            s.formatTo,
+                            s.types
                         ],
                         name: r.fnName,
-                        args: s,
+                        args: l,
                         body: i,
                         comment: {
                             tags: [
@@ -80,7 +80,7 @@ var I = createGenerator("js", (t)=>{
                     allImports: r
                 };
             }(a, e);
-            return s ? u.reduce((t, e)=>(t[e.name] = {
+            return l ? u.reduce((t, e)=>(t[e.name] = {
                     dir: i,
                     name: e.name,
                     ext: "ts",

package/adapter-js/index.cjs.js

@@ -27,6 +27,7 @@ const adapterJs = createAdapter.createAdapter({
     defaultOptions: {
         modularize: !0
     },
+    getMeta: (r)=>({}),
     getGenerators: (r)=>[
             config,
             createT,

package/adapter-js/index.d.ts

@@ -33,6 +33,7 @@ export type Options = {
      */
     modularize: boolean;
 };
+export type Meta = {};
 export declare const adapterJs: {
     (data: import("../compiler").I18nCompiler.DataCode<"js">): {
         generators: import("../compiler").I18nCompiler.AdapterGenerator<import("../compiler").I18nCompiler.AdapterName>[];
@@ -230,6 +231,7 @@ export declare const adapterJs: {
         }>;
     };
     getGenerators: <TAdapterName extends import("../compiler").I18nCompiler.AdapterName>(data: import("../compiler").I18nCompiler.DataCode<TAdapterName>) => import("../compiler").I18nCompiler.AdapterGenerator<import("../compiler").I18nCompiler.AdapterName>[];
+    getMeta: <TAdapterName extends import("../compiler").I18nCompiler.AdapterName>(options: import("../compiler").I18nCompiler.AdapterConfigurationResolved<TAdapterName>["options"]) => import("../compiler").I18nCompiler.AdapterConfigurationResolved<import("../compiler").I18nCompiler.AdapterName>["meta"];
     defaultOptions: {
         modularize: true;
     };

package/adapter-js/index.esm.js

@@ -23,6 +23,7 @@ const adapterJs = createAdapter({
     defaultOptions: {
         modularize: !0
     },
+    getMeta: (r)=>({}),
     getGenerators: (r)=>[
             o,
             t,

package/adapter-next/generators/next-redirects.cjs.js

@@ -3,7 +3,7 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var redirects = require('../plugin/redirects.cjs.js');
 
-var t = createAdapter.createGenerator("next", (r)=>{
+var o = createAdapter.createGenerator("next", (r)=>{
     let { config: i, options: n, routes: d } = r, o = JSON.stringify(redirects.generateRedirects(i, n.routes, d.byId), null, 2);
     return {
         nextRedirects: {
@@ -22,4 +22,4 @@ module.exports = ${o}
     };
 });
 
-module.exports = t;
+module.exports = o;

package/adapter-next/generators/next-redirects.esm.js

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { generateRedirects } from '../plugin/redirects.esm.js';
 
-var t = createGenerator("next", (r)=>{
+var o = createGenerator("next", (r)=>{
     let { config: i, options: n, routes: d } = r, o = JSON.stringify(generateRedirects(i, n.routes, d.byId), null, 2);
     return {
         nextRedirects: {
@@ -20,4 +20,4 @@ module.exports = ${o}
     };
 });
 
-export { t as default };
+export { o as default };

package/adapter-next/generators/next-rewrites.cjs.js

@@ -3,7 +3,7 @@
 var createAdapter = require('../../compiler/createAdapter.cjs.js');
 var rewrites = require('../plugin/rewrites.cjs.js');
 
-var o = createAdapter.createGenerator("next", (r)=>{
+var a = createAdapter.createGenerator("next", (r)=>{
     let { config: i, routes: n, options: o } = r, d = JSON.stringify(rewrites.generateRewrites(i, o.routes, n.byId), null, 2);
     return {
         nextRewrites: {
@@ -22,4 +22,4 @@ module.exports = ${d}
     };
 });
 
-module.exports = o;
+module.exports = a;

package/adapter-next/generators/next-rewrites.esm.js

@@ -1,7 +1,7 @@
 import { createGenerator } from '../../compiler/createAdapter.esm.js';
 import { generateRewrites } from '../plugin/rewrites.esm.js';
 
-var o = createGenerator("next", (r)=>{
+var a = createGenerator("next", (r)=>{
     let { config: i, routes: n, options: o } = r, d = JSON.stringify(generateRewrites(i, o.routes, n.byId), null, 2);
     return {
         nextRewrites: {
@@ -20,4 +20,4 @@ module.exports = ${d}
     };
 });
 
-export { o as default };
+export { a as default };

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

@@ -3,8 +3,8 @@
 var createAdapter = require('../../../compiler/createAdapter.cjs.js');
 var helpers = require('../../../compiler/helpers.cjs.js');
 
-var a = createAdapter.createGenerator("next", (e)=>{
-    let { options: { routes: { localeParamName: a } } } = e;
+var p = createAdapter.createGenerator("next", (a)=>{
+    let { options: { routes: { localeParamName: e } } } = a;
     return {
         I18nLayout: {
             dir: createAdapter.createGenerator.dirs.server,
@@ -22,9 +22,10 @@ import type { I18n } from "../types";
 import { I18nLayoutRoot } from "./I18nLayoutRoot";
 import {
   type NextProps,
+  type I18nNextPropsLayout,
   type I18nProps,
   type I18nServerConfigurator,
-  resolveConfigurator
+  resolveConfigurator,
 } from "./i18nServerHelpers";
 
 type Config = {
@@ -58,7 +59,9 @@ export const I18nLayout = async ({
   // }
 
   // locale = locale || getLocale();
-  const dictionaries = namespaces.length ? (await getI18nDictionaries({ locale, namespaces })) : {};
+  const dictionaries = namespaces.length
+    ? await getI18nDictionaries({ locale, namespaces })
+    : {};
 
   return (
     <I18nTranslateProvider
@@ -91,7 +94,7 @@ export const I18nLayout = async ({
  *   };
  * });
  * 
- * // 2) export the metadata (maybe only in /app/[${a}]/layout.tsx)
+ * // 2) export the metadata (maybe only in /app/[${e}]/layout.tsx)
  * 
  * // with a sync function
  * export const generateMetadata = layout.generateMetadata((props) => {
@@ -105,7 +108,7 @@ export const I18nLayout = async ({
  * 
  * // 3) export the default component
  * 
- * // 3a) in /app/[${a}]/layout.tsx and /app/not-found.tsx
+ * // 3a) in /app/[${e}]/layout.tsx and /app/not-found.tsx
  * 
  * // first spread the i18nHtmlAttrs prop on the <html> element, then render
  * // the {I18nScript} node in the <body>
@@ -123,7 +126,7 @@ export const I18nLayout = async ({
  *   );
  * });
  * 
- * // 3b) in /app/[${a}]/ ...folders... /layout.tsx)
+ * // 3b) in /app/[${e}]/ ...folders... /layout.tsx)
  * 
  * // with a sync function (if you do not need to await)
  * export default layout.default((props) => {
@@ -138,42 +141,44 @@ export const I18nLayout = async ({
  * \`\`\`
  */
 export const createI18nLayout =
-  <TProps extends NextProps>() =>
+  <TProps extends I18nNextPropsLayout>() =>
   <TConfigurator extends I18nServerConfigurator<Config, TProps>>(
     configurator?: TConfigurator,
   ) => ({
-    generateStaticParams: () => locales.map((l) => ({ ${a}: l })),
+    generateStaticParams: () => locales.map((l) => ({ ${e}: l })),
     generateMetadata: (
-      impl: <TRawProps extends NextProps>(
-        props: I18nProps<TProps, TRawProps, Config, TConfigurator>,
+      impl: (
+        props: I18nProps<TProps, Config, TConfigurator>,
       ) => Metadata | Promise<Metadata>,
     ) => {
-      return async <TRawProps extends NextProps>(rawProps: TRawProps) => {
-        const { namespaces, ...restConfig } = await resolveConfigurator<
-          TProps,
-          TRawProps,
-          Config,
-          TConfigurator
-        >(rawProps, configurator);
-        const metadata = await impl(
-          restConfig as I18nProps<TProps, TRawProps, Config, TConfigurator>
+      return async (rawProps: NextProps<TProps>) => {
+        const { params: _rawParams, ...rawPropsWithoutParams } = rawProps;
+        const config = await resolveConfigurator<TProps, Config, TConfigurator>(
+          rawProps as unknown as TProps,
+          configurator,
         );
+        const { locale, params } = config;
+        const metadata = await impl({
+          ...rawPropsWithoutParams,
+          locale,
+          params,
+        } as unknown as I18nProps<TProps, Config, TConfigurator>);
         return metadata;
       };
     },
     default: (
-      impl: <TRawProps extends NextProps>(
-        props: I18nProps<TProps, TRawProps, Config, TConfigurator> &
+      impl: (
+        props: I18nProps<TProps, Config, TConfigurator> &
           React.PropsWithChildren<{
             /**
              * Render this in
-             * - \`/app/[${a}]/layout.tsx\`
+             * - \`/app/[${e}]/layout.tsx\`
              * - \`/app/not-found.tsx\`
              */
             I18nScript: React.ReactNode;
             /**
              * Spread this prop on the \`<html {...i18nHtmlAttrs}>\` element in:
-             * - \`app/[${a}]/layout.tsx\`
+             * - \`app/[${e}]/layout.tsx\`
              * - \`app/not-found.tsx\`
              */
             i18nHtmlAttrs: Pick<
@@ -183,26 +188,28 @@ export const createI18nLayout =
           }>,
       ) => React.ReactNode | Promise<React.ReactNode>,
     ) => {
-      return async <TRawProps extends NextProps>(rawProps: TRawProps) => {
+      return async (rawProps: NextProps<TProps>) => {
         const { params: _rawParams, ...rawPropsWithoutParams } = rawProps;
-        const config = await resolveConfigurator<
-          TProps,
-          TRawProps,
-          Config,
-          TConfigurator
-        >(rawProps, configurator);
-        const { locale, namespaces, params } = config;${createAdapter.createGenerator.log(e, "layout.default", "resolveConfigurator", "locale")}
+        const config = await resolveConfigurator<TProps, Config, TConfigurator>(
+          rawProps as unknown as TProps,
+          configurator,
+        );
+        const { locale, namespaces, params } = config;${createAdapter.createGenerator.log(a, "layout.default", "resolveConfigurator", "locale")}
         const dir = i18nRtlLocales.includes(locale) ? "rtl" : "ltr";
         const i18nHtmlAttrs = { lang: locale, dir };
         const I18nScript = (
-          <script dangerouslySetInnerHTML={{ __html: \`globalThis.${helpers.GLOBAL_I18N_IDENTIFIER} = "\${locale}";\`}}></script>
+          <script
+            dangerouslySetInnerHTML={{
+              __html: \`globalThis.${helpers.GLOBAL_I18N_IDENTIFIER} = "\${locale}";\`
+            }}
+          ></script>
         );
         const render = await impl({
           ...({
             ...rawPropsWithoutParams,
             locale,
             params,
-          } as I18nProps<TProps, TRawProps, Config, TConfigurator>),
+          } as unknown as I18nProps<TProps, Config, TConfigurator>),
           I18nScript,
           i18nHtmlAttrs,
         });
@@ -224,4 +231,4 @@ createI18nLayout.Root = I18nLayoutRoot;
     };
 });
 
-module.exports = a;
+module.exports = p;