@nimpl/i18n 2.0.0-canary.0 → 2.0.0-canary.1

package/I18nTransmitter.d.ts

@@ -4,6 +4,7 @@ export type I18nTransmitterProps = {
     terms: (string | [string, I18nOptions])[];
     children: React.ReactNode;
     cleanThread?: boolean;
+    language?: string;
 };
 declare const I18nTransmitter: React.FC<I18nTransmitterProps>;
 export default I18nTransmitter;

package/ServerTranslation.d.ts

@@ -7,6 +7,7 @@ type ServerTranslationProps = {
     };
     query?: I18nOptions["query"];
     removeUnusedQueries?: I18nOptions["removeUnusedQueries"];
+    language?: string;
 };
 declare const ServerTranslation: React.FC<ServerTranslationProps>;
 export default ServerTranslation;

package/dist/I18nTransmitter.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const object_path_1 = __importDefault(require("object-path"));
-const get_server_context_1 = __importDefault(require("@nimpl/getters/get-server-context"));
-const I18nContext_1 = require("./lib/I18nContext");
 const ClientI18nProvider_1 = __importDefault(require("./lib/ClientI18nProvider"));
 const formatServerTranslate_1 = __importDefault(require("./lib/formatServerTranslate"));
-const getDictionary_1 = __importDefault(require("./lib/getDictionary"));
+const loadI18nData_1 = __importDefault(require("./lib/loadI18nData"));
 const formatServerTranslates = (result, targetKey, translates, opts = {}) => {
     if (!translates)
         return;
@@ -23,13 +21,12 @@ const formatServerTranslates = (result, targetKey, translates, opts = {}) => {
         });
     }
 };
-const I18nTransmitter = async ({ terms, children, cleanThread }) => {
-    const context = (0, get_server_context_1.default)(I18nContext_1.I18nContext);
-    if (!context) {
-        throw new Error("Please, Init I18nProvider - https://github.com/vordgi/nimpl-i18n#server-components");
+const I18nTransmitter = async ({ language: argLanguage, terms, children, cleanThread, }) => {
+    const { dictionary, language: configLanguage } = await (0, loadI18nData_1.default)();
+    const language = argLanguage || configLanguage;
+    if (!language) {
+        throw new Error("Unable to get the language in the createTranslation function. Please check the getLanguage method in the configuration file or pass the language as an argument.");
     }
-    const { lang } = context;
-    const dictionary = await (0, getDictionary_1.default)(lang);
     const result = {};
     terms.forEach((term) => {
         if (Array.isArray(term)) {
@@ -42,6 +39,6 @@ const I18nTransmitter = async ({ terms, children, cleanThread }) => {
             formatServerTranslates(result, term, translates);
         }
     });
-    return (react_1.default.createElement(ClientI18nProvider_1.default, { lang: lang, translates: result, cleanThread: cleanThread }, children));
+    return (react_1.default.createElement(ClientI18nProvider_1.default, { language: language, translates: result, cleanThread: cleanThread }, children));
 };
 exports.default = I18nTransmitter;

package/dist/ServerTranslation.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const Translation_1 = __importDefault(require("./lib/Translation"));
 const getTranslation_1 = __importDefault(require("./getTranslation"));
-const ServerTranslation = async ({ term, components, query, removeUnusedQueries, }) => {
-    const { t } = await (0, getTranslation_1.default)();
+const ServerTranslation = async ({ term, components, query, removeUnusedQueries, language, }) => {
+    const { t } = await (0, getTranslation_1.default)({ language });
     const text = t(term, { query, removeUnusedQueries });
     return react_1.default.createElement(Translation_1.default, { term: term, text: text, components: components });
 };

package/dist/configuration/getConfig.js

@@ -13,18 +13,21 @@ const getConfig = async () => {
     try {
         if (fs_1.default.existsSync(CONFIG_PATH)) {
             const config = await dynamicImport((0, url_1.pathToFileURL)(CONFIG_PATH).href);
-            const { load, languages } = config.default;
+            const { load, getLanguage, languages } = config.default;
             if (!load) {
                 throw new Error(`Can't find load method in configuration file - https://github.com/vordgi/nimpl-i18n#configuration`);
             }
             if (!languages) {
                 throw new Error(`Can't find languages list in configuration file - https://github.com/vordgi/nimpl-i18n#configuration`);
             }
+            if (!getLanguage) {
+                throw new Error(`Can't find getLanguage method in configuration file - https://github.com/vordgi/nimpl-i18n#configuration`);
+            }
             return config.default;
         }
     }
-    catch {
-        //
+    catch (err) {
+        console.error(err);
     }
     throw new Error("Can't load config - https://github.com/vordgi/nimpl-i18n#configuration");
 };

package/dist/getTranslation.js

@@ -4,17 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const object_path_1 = __importDefault(require("object-path"));
-const get_server_context_1 = __importDefault(require("@nimpl/getters/get-server-context"));
-const I18nContext_1 = require("./lib/I18nContext");
 const formatServerTranslate_1 = __importDefault(require("./lib/formatServerTranslate"));
-const getDictionary_1 = __importDefault(require("./lib/getDictionary"));
-const getTranslation = async (namespace) => {
-    const context = (0, get_server_context_1.default)(I18nContext_1.I18nContext);
-    if (!context) {
-        throw new Error("Please, Init I18nProvider - https://nimpl.tech/i18n/usage#i18nprovider");
+const loadI18nData_1 = __importDefault(require("./lib/loadI18nData"));
+const getTranslation = async (options) => {
+    const { language: argLanguage, namespace } = options || {};
+    const { dictionary, language: configLanguage } = await (0, loadI18nData_1.default)();
+    const language = argLanguage || configLanguage;
+    if (!language) {
+        throw new Error("Unable to get the language in the createTranslation function. Please check the getLanguage method in the configuration file or pass the language as an argument.");
     }
-    const dictionary = await (0, getDictionary_1.default)(context.lang);
-    const { lang } = context;
     const namespaceDictionary = namespace ? object_path_1.default.get(dictionary, namespace) : dictionary;
     const t = (term, opts) => {
         let termDictionary = namespaceDictionary;
@@ -30,6 +28,6 @@ const getTranslation = async (namespace) => {
             return fullTerm;
         return (0, formatServerTranslate_1.default)({ term: fullTerm, text: translation, parseEntities: true, ...opts });
     };
-    return { t, lang };
+    return { t, language };
 };
 exports.default = getTranslation;

package/dist/lib/ClientI18nProvider.js

@@ -26,11 +26,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const ClientI18nContext_1 = require("./ClientI18nContext");
-const ClientI18nProvider = ({ translates, children, lang, cleanThread }) => {
+const ClientI18nProvider = ({ translates, children, language, cleanThread }) => {
     const prevTranslates = (0, react_1.useContext)(ClientI18nContext_1.ClientI18nContext);
     if (cleanThread) {
         Object.assign(translates, prevTranslates?.translates);
     }
-    return react_1.default.createElement(ClientI18nContext_1.ClientI18nContext.Provider, { value: { lang, translates } }, children);
+    return react_1.default.createElement(ClientI18nContext_1.ClientI18nContext.Provider, { value: { language, translates } }, children);
 };
 exports.default = ClientI18nProvider;

package/dist/lib/loadI18nData.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const getConfig_1 = __importDefault(require("../configuration/getConfig"));
+const get_pathname_1 = require("@nimpl/getters/get-pathname");
+const get_params_1 = require("@nimpl/getters/get-params");
+const loadI18nData = async () => {
+    const config = await (0, getConfig_1.default)();
+    const language = await config.getLanguage({ pathname: (0, get_pathname_1.getPathname)(), params: (0, get_params_1.getParams)() });
+    if (!language || !config.languages.includes(language)) {
+        throw new Error(`Can\' load data for language "${language}", valid languages are: ${config.languages.join(", ")}`);
+    }
+    const { data } = await config.load(language);
+    return { dictionary: data, language };
+};
+exports.default = loadI18nData;

package/dist/useTranslation.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
 const ClientI18nContext_1 = require("./lib/ClientI18nContext");
 const injectQuery_1 = __importDefault(require("./lib/injectQuery"));
-const useTranslation = (namespace) => {
+const useTranslation = ({ namespace } = {}) => {
     const context = (0, react_1.useContext)(ClientI18nContext_1.ClientI18nContext);
     if (!context) {
         throw new Error("Please, Init I18nTransmitter for client components - https://nimpl.tech/i18n/usage#client-components");
     }
-    const { lang, translates } = context;
+    const { language, translates } = context;
     const t = (term, opts) => {
         let termKey;
         if (term.includes(":")) {
@@ -33,6 +33,6 @@ const useTranslation = (namespace) => {
         }
         return translation;
     };
-    return { t, lang };
+    return { t, language };
 };
 exports.default = useTranslation;

package/getTranslation.d.ts

@@ -1,7 +1,10 @@
 import { type I18nOptions } from "./types";
 type GetTranslationReturnType = {
     t: (term: string, opts?: I18nOptions) => string;
-    lang: string;
+    language: string;
 };
-declare const getTranslation: (namespace?: string) => Promise<GetTranslationReturnType>;
+declare const getTranslation: (options?: {
+    language?: string;
+    namespace?: string;
+}) => Promise<GetTranslationReturnType>;
 export default getTranslation;

package/package.json

@@ -1,20 +1,14 @@
 {
   "name": "@nimpl/i18n",
-  "version": "2.0.0-canary.0",
+  "version": "2.0.0-canary.1",
   "description": "i18n library for working with translations in server and client components",
   "exports": {
     "./ClientTranslation": {
       "default": "./dist/ClientTranslation.js"
     },
-    "./createTranslation": {
-      "default": "./dist/createTranslation.js"
-    },
     "./getTranslation": {
       "default": "./dist/getTranslation.js"
     },
-    "./I18nProvider": {
-      "default": "./dist/I18nProvider.js"
-    },
     "./I18nTransmitter": {
       "default": "./dist/I18nTransmitter.js"
     },
@@ -26,9 +20,6 @@
     },
     "./useTranslation": {
       "default": "./dist/useTranslation.js"
-    },
-    "./withI18n": {
-      "default": "./dist/withI18n.js"
     }
   },
   "files": [
@@ -70,8 +61,8 @@
     "react": ">= 18.2.0"
   },
   "dependencies": {
-    "html-entities": "2.4.0",
     "@nimpl/getters": "1.3.4",
+    "html-entities": "2.4.0",
     "object-path": "0.11.8"
   }
 }

package/useTranslation.d.ts

@@ -1,7 +1,9 @@
 import { type I18nOptions } from "./types";
 type GetTranslationReturnType = {
     t: (term: string, opts?: I18nOptions) => string;
-    lang: string;
+    language: string;
 };
-declare const useTranslation: (namespace?: string) => GetTranslationReturnType;
+declare const useTranslation: ({ namespace }?: {
+    namespace?: string | undefined;
+}) => GetTranslationReturnType;
 export default useTranslation;

package/I18nProvider.d.ts

@@ -1,9 +0,0 @@
-import React from "react";
-import { type I18nTransmitterProps } from "./I18nTransmitter";
-type I18nProviderProps = {
-    lang: string;
-    children: React.ReactNode;
-    clientTerms?: I18nTransmitterProps["terms"];
-};
-declare const I18nProvider: React.FC<I18nProviderProps>;
-export default I18nProvider;

package/createTranslation.d.ts

@@ -1,7 +0,0 @@
-import { type I18nOptions } from "./types";
-type CreateTranslationReturnType = {
-    t: (term: string, opts?: I18nOptions) => string;
-    lang: string;
-};
-declare const createTranslation: (lang: string, namespace?: string) => Promise<CreateTranslationReturnType>;
-export default createTranslation;

package/dist/I18nProvider.js

@@ -1,13 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const I18nContext_1 = require("./lib/I18nContext");
-const I18nTransmitter_1 = __importDefault(require("./I18nTransmitter"));
-const I18nProvider = ({ children, lang, clientTerms = [] }) => {
-    return (react_1.default.createElement(I18nContext_1.I18nContext.Provider, { value: { lang } },
-        react_1.default.createElement(I18nTransmitter_1.default, { terms: clientTerms, cleanThread: true }, children)));
-};
-exports.default = I18nProvider;

package/dist/createTranslation.js

@@ -1,28 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const object_path_1 = __importDefault(require("object-path"));
-const formatServerTranslate_1 = __importDefault(require("./lib/formatServerTranslate"));
-const getDictionary_1 = __importDefault(require("./lib/getDictionary"));
-const createTranslation = async (lang, namespace) => {
-    const dictionary = await (0, getDictionary_1.default)(lang);
-    const namespaceDictionary = namespace ? object_path_1.default.get(dictionary, namespace) : dictionary;
-    const t = (term, opts) => {
-        let termDictionary = namespaceDictionary;
-        let termNamespace = namespace;
-        let termKey = term;
-        if (term.includes(":")) {
-            [termNamespace, termKey] = term.split(":");
-            termDictionary = object_path_1.default.get(dictionary, termNamespace);
-        }
-        const translation = object_path_1.default.get(termDictionary, termKey);
-        const fullTerm = `${termNamespace ? `${termNamespace}.` : ""}${termKey}`;
-        if (typeof translation !== "string" || !translation)
-            return fullTerm;
-        return (0, formatServerTranslate_1.default)({ term: fullTerm, text: translation, parseEntities: true, ...opts });
-    };
-    return { t, lang };
-};
-exports.default = createTranslation;

package/dist/lib/I18nContext.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.I18nContext = void 0;
-const create_server_context_1 = __importDefault(require("@nimpl/getters/create-server-context"));
-exports.I18nContext = (0, create_server_context_1.default)(null);

package/dist/lib/getDictionary.js

@@ -1,15 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const getConfig_1 = __importDefault(require("../configuration/getConfig"));
-const getDictionary = async (lang) => {
-    const config = await (0, getConfig_1.default)();
-    if (!lang || !config.languages.includes(lang)) {
-        throw new Error(`Can\' load data for language "${lang}", valid languages are: ${config.languages.join(", ")}`);
-    }
-    const { data } = await config.load(lang);
-    return data;
-};
-exports.default = getDictionary;