next-translate 2.0.1 → 2.0.3

package/README.md

@@ -973,6 +973,7 @@ import i18n from './i18n'
 export function middleware(request: NextRequest) {
   const locale = request.nextUrl.locale || i18n.defaultLocale
   request.nextUrl.searchParams.set('lang', locale)
+  request.nextUrl.href = request.nextUrl.href.replace(`/${locale}`, "")
   return NextResponse.rewrite(request.nextUrl)
 }
 ```
@@ -1113,6 +1114,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/wuifdesign"><img src="https://avatars.githubusercontent.com/u/5678318?v=4?s=100" width="100px;" alt="Wuif"/><br /><sub><b>Wuif</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=wuifdesign" title="Code">💻</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/marcesengel"><img src="https://avatars.githubusercontent.com/u/6208890?v=4?s=100" width="100px;" alt="Marces Engel"/><br /><sub><b>Marces Engel</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=marcesengel" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://michal.bar"><img src="https://avatars.githubusercontent.com/u/9134970?v=4?s=100" width="100px;" alt="Michał Bar"/><br /><sub><b>Michał Bar</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=MrPumpking" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Dragate"><img src="https://avatars.githubusercontent.com/u/28112929?v=4?s=100" width="100px;" alt="Dragate"/><br /><sub><b>Dragate</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=Dragate" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/marcesengel"><img src="https://avatars.githubusercontent.com/u/6208890?v=4?s=100" width="100px;" alt="Marces Engel"/><br /><sub><b>Marces Engel</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=marcesengel" title="Code">💻</a></td>
@@ -1120,6 +1122,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/StLyn4"><img src="https://avatars.githubusercontent.com/u/73965070?v=4?s=100" width="100px;" alt="Vsevolod Volkov"/><br /><sub><b>Vsevolod Volkov</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=StLyn4" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/felixonmars"><img src="https://avatars.githubusercontent.com/u/1006477?v=4?s=100" width="100px;" alt="Felix Yan"/><br /><sub><b>Felix Yan</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=felixonmars" title="Documentation">📖</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/alziqziq"><img src="https://avatars.githubusercontent.com/u/29282122?v=4?s=100" width="100px;" alt="Muhammad Al Ziqri"/><br /><sub><b>Muhammad Al Ziqri</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=alziqziq" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://teka.dev"><img src="https://avatars.githubusercontent.com/u/4443094?v=4?s=100" width="100px;" alt="Marcelo Oliveira"/><br /><sub><b>Marcelo Oliveira</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=marcelotk15" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SimplyComplexable"><img src="https://avatars.githubusercontent.com/u/8563846?v=4?s=100" width="100px;" alt="Zack Sunderland"/><br /><sub><b>Zack Sunderland</b></sub></a><br /><a href="https://github.com/aralroca/next-translate/commits?author=SimplyComplexable" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

package/index.d.ts

@@ -3,10 +3,16 @@ import type { NextConfig } from 'next';
 export interface TranslationQuery {
     [name: string]: any;
 }
-export type Translate = <T = string>(i18nKey: string | TemplateStringsArray, query?: TranslationQuery | null, options?: {
+export interface NestedStringObject {
+    [key: string]: string | NestedStringObject | NestedStringArray;
+}
+type ValueOrArray<T> = T | ValueOrArray<T>[];
+type NestedStringArray = ValueOrArray<string | NestedStringObject>;
+export type TranslateValue = string | NestedStringObject | NestedStringArray;
+export type Translate = <T extends TranslateValue = string>(i18nKey: string | TemplateStringsArray, query?: TranslationQuery | null, options?: {
     returnObjects?: boolean;
     fallback?: string | string[];
-    default?: string;
+    default?: T | string;
     ns?: string;
 }) => T;
 export interface I18n {

package/lib/cjs/loadNamespaces.js

@@ -53,10 +53,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.log = void 0;
 var getConfig_1 = __importDefault(require("./getConfig"));
 var getPageNamespaces_1 = __importDefault(require("./getPageNamespaces"));
-var colorEnabled = process.env.NODE_DISABLE_COLORS == null &&
-    process.env.NO_COLOR == null &&
-    process.env.TERM !== 'dumb' &&
-    process.env.FORCE_COLOR !== '0';
 function loadNamespaces(config) {
     var _a, _b;
     if (config === void 0) { config = {}; }
@@ -113,7 +109,11 @@ function removeTrailingSlash(path) {
 function log(conf, _a) {
     var page = _a.page, lang = _a.lang, namespaces = _a.namespaces;
     if (conf.logBuild !== false && typeof window === 'undefined') {
-        var color = function (c) { return (colorEnabled ? "\u001B[36m".concat(c, "\u001B[0m") : c); };
+        var colorEnabled_1 = process.env.NODE_DISABLE_COLORS == null &&
+            process.env.NO_COLOR == null &&
+            process.env.TERM !== 'dumb' &&
+            process.env.FORCE_COLOR !== '0';
+        var color = function (c) { return (colorEnabled_1 ? "\u001B[36m".concat(c, "\u001B[0m") : c); };
         console.log(color('next-translate'), "- compiled page:", color(page), '- locale:', color(lang), '- namespaces:', color(namespaces.join(', ')), '- used loader:', color(conf.loaderName || '-'));
     }
 }

package/lib/cjs/transCore.js

@@ -25,6 +25,20 @@ function splitNsKey(key, nsSeparator) {
 function transCore(_a) {
     var config = _a.config, allNamespaces = _a.allNamespaces, pluralRules = _a.pluralRules, lang = _a.lang;
     var _b = config.logger, logger = _b === void 0 ? missingKeyLogger : _b, _c = config.allowEmptyStrings, allowEmptyStrings = _c === void 0 ? true : _c;
+    var interpolateUnknown = function (value, query) {
+        if (Array.isArray(value)) {
+            return value.map(function (val) { return interpolateUnknown(val, query); });
+        }
+        if (value instanceof Object) {
+            return objectInterpolation({
+                obj: value,
+                query: query,
+                config: config,
+                lang: lang,
+            });
+        }
+        return interpolation({ text: value, query: query, config: config, lang: lang });
+    };
     var t = function (key, query, options) {
         var _a;
         if (key === void 0) { key = ''; }
@@ -33,7 +47,10 @@ function transCore(_a) {
         var _d = splitNsKey(k, nsSeparator), i18nKey = _d.i18nKey, _e = _d.namespace, namespace = _e === void 0 ? (_a = options === null || options === void 0 ? void 0 : options.ns) !== null && _a !== void 0 ? _a : config.defaultNS : _e;
         var dic = (namespace && allNamespaces[namespace]) || {};
         var keyWithPlural = plural(pluralRules, dic, i18nKey, config, query);
-        var value = getDicValue(dic, keyWithPlural, config, options);
+        var dicValue = getDicValue(dic, keyWithPlural, config, options);
+        var value = typeof dicValue === 'object'
+            ? JSON.parse(JSON.stringify(dicValue))
+            : dicValue;
         var empty = typeof value === 'undefined' ||
             (typeof value === 'object' && !Object.keys(value).length) ||
             (value === '' && !allowEmptyStrings);
@@ -52,21 +69,13 @@ function transCore(_a) {
                 return t(firstFallback, query, __assign(__assign({}, options), { fallback: restFallbacks }));
             }
         }
-        if (empty && (options === null || options === void 0 ? void 0 : options.default) && (fallbacks === null || fallbacks === void 0 ? void 0 : fallbacks.length) == 0) {
-            return interpolation({ text: options === null || options === void 0 ? void 0 : options.default, query: query, config: config, lang: lang });
+        if (empty && (options === null || options === void 0 ? void 0 : options.default) && !(fallbacks === null || fallbacks === void 0 ? void 0 : fallbacks.length)) {
+            return interpolateUnknown(options.default, query);
         }
         if (empty) {
             return k;
         }
-        if (value instanceof Object) {
-            return objectInterpolation({
-                obj: value,
-                query: query,
-                config: config,
-                lang: lang,
-            });
-        }
-        return interpolation({ text: value, query: query, config: config, lang: lang });
+        return interpolateUnknown(value, query);
     };
     return t;
 }
@@ -121,8 +130,6 @@ function interpolation(_a) {
     var _b = config.interpolation || {}, _c = _b.format, format = _c === void 0 ? null : _c, _d = _b.prefix, prefix = _d === void 0 ? '{{' : _d, _e = _b.suffix, suffix = _e === void 0 ? '}}' : _e;
     var regexEnd = suffix === '' ? '' : "(?:[\\s,]+([\\w-]*))?\\s*".concat(escapeRegex(suffix));
     return Object.keys(query).reduce(function (all, varKey) {
-        if (typeof all !== 'string')
-            return all;
         var regex = new RegExp("".concat(escapeRegex(prefix), "\\s*").concat(varKey).concat(regexEnd), 'gm');
         return all.replace(regex, function (_match, $1) {
             return $1 && format

package/lib/esm/loadNamespaces.js

@@ -47,10 +47,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import getConfig from './getConfig';
 import getPageNamespaces from './getPageNamespaces';
-var colorEnabled = process.env.NODE_DISABLE_COLORS == null &&
-    process.env.NO_COLOR == null &&
-    process.env.TERM !== 'dumb' &&
-    process.env.FORCE_COLOR !== '0';
 export default function loadNamespaces(config) {
     var _a, _b;
     if (config === void 0) { config = {}; }
@@ -106,7 +102,11 @@ function removeTrailingSlash(path) {
 export function log(conf, _a) {
     var page = _a.page, lang = _a.lang, namespaces = _a.namespaces;
     if (conf.logBuild !== false && typeof window === 'undefined') {
-        var color = function (c) { return (colorEnabled ? "\u001B[36m".concat(c, "\u001B[0m") : c); };
+        var colorEnabled_1 = process.env.NODE_DISABLE_COLORS == null &&
+            process.env.NO_COLOR == null &&
+            process.env.TERM !== 'dumb' &&
+            process.env.FORCE_COLOR !== '0';
+        var color = function (c) { return (colorEnabled_1 ? "\u001B[36m".concat(c, "\u001B[0m") : c); };
         console.log(color('next-translate'), "- compiled page:", color(page), '- locale:', color(lang), '- namespaces:', color(namespaces.join(', ')), '- used loader:', color(conf.loaderName || '-'));
     }
 }

package/lib/esm/transCore.js

@@ -23,6 +23,20 @@ function splitNsKey(key, nsSeparator) {
 export default function transCore(_a) {
     var config = _a.config, allNamespaces = _a.allNamespaces, pluralRules = _a.pluralRules, lang = _a.lang;
     var _b = config.logger, logger = _b === void 0 ? missingKeyLogger : _b, _c = config.allowEmptyStrings, allowEmptyStrings = _c === void 0 ? true : _c;
+    var interpolateUnknown = function (value, query) {
+        if (Array.isArray(value)) {
+            return value.map(function (val) { return interpolateUnknown(val, query); });
+        }
+        if (value instanceof Object) {
+            return objectInterpolation({
+                obj: value,
+                query: query,
+                config: config,
+                lang: lang,
+            });
+        }
+        return interpolation({ text: value, query: query, config: config, lang: lang });
+    };
     var t = function (key, query, options) {
         var _a;
         if (key === void 0) { key = ''; }
@@ -31,7 +45,10 @@ export default function transCore(_a) {
         var _d = splitNsKey(k, nsSeparator), i18nKey = _d.i18nKey, _e = _d.namespace, namespace = _e === void 0 ? (_a = options === null || options === void 0 ? void 0 : options.ns) !== null && _a !== void 0 ? _a : config.defaultNS : _e;
         var dic = (namespace && allNamespaces[namespace]) || {};
         var keyWithPlural = plural(pluralRules, dic, i18nKey, config, query);
-        var value = getDicValue(dic, keyWithPlural, config, options);
+        var dicValue = getDicValue(dic, keyWithPlural, config, options);
+        var value = typeof dicValue === 'object'
+            ? JSON.parse(JSON.stringify(dicValue))
+            : dicValue;
         var empty = typeof value === 'undefined' ||
             (typeof value === 'object' && !Object.keys(value).length) ||
             (value === '' && !allowEmptyStrings);
@@ -50,21 +67,13 @@ export default function transCore(_a) {
                 return t(firstFallback, query, __assign(__assign({}, options), { fallback: restFallbacks }));
             }
         }
-        if (empty && (options === null || options === void 0 ? void 0 : options.default) && (fallbacks === null || fallbacks === void 0 ? void 0 : fallbacks.length) == 0) {
-            return interpolation({ text: options === null || options === void 0 ? void 0 : options.default, query: query, config: config, lang: lang });
+        if (empty && (options === null || options === void 0 ? void 0 : options.default) && !(fallbacks === null || fallbacks === void 0 ? void 0 : fallbacks.length)) {
+            return interpolateUnknown(options.default, query);
         }
         if (empty) {
             return k;
         }
-        if (value instanceof Object) {
-            return objectInterpolation({
-                obj: value,
-                query: query,
-                config: config,
-                lang: lang,
-            });
-        }
-        return interpolation({ text: value, query: query, config: config, lang: lang });
+        return interpolateUnknown(value, query);
     };
     return t;
 }
@@ -118,8 +127,6 @@ function interpolation(_a) {
     var _b = config.interpolation || {}, _c = _b.format, format = _c === void 0 ? null : _c, _d = _b.prefix, prefix = _d === void 0 ? '{{' : _d, _e = _b.suffix, suffix = _e === void 0 ? '}}' : _e;
     var regexEnd = suffix === '' ? '' : "(?:[\\s,]+([\\w-]*))?\\s*".concat(escapeRegex(suffix));
     return Object.keys(query).reduce(function (all, varKey) {
-        if (typeof all !== 'string')
-            return all;
         var regex = new RegExp("".concat(escapeRegex(prefix), "\\s*").concat(varKey).concat(regexEnd), 'gm');
         return all.replace(regex, function (_match, $1) {
             return $1 && format

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-translate",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Tiny and powerful i18n tools (Next plugin + API) to translate your Next.js pages.",
   "license": "MIT",
   "keywords": [