@nimpl/i18n 1.2.0 → 2.0.0-canary.0

package/dist/I18nProvider.js

@@ -6,10 +6,8 @@ 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 getDictionary_1 = __importDefault(require("./lib/getDictionary"));
-const I18nProvider = async ({ children, lang, clientTerms = [] }) => {
-    const dictionary = await (0, getDictionary_1.default)(lang);
-    return (react_1.default.createElement(I18nContext_1.I18nContext.Provider, { value: { lang, dictionary } },
+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/I18nTransmitter.js

@@ -5,10 +5,11 @@ 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("next-impl-getters/get-server-context"));
+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 formatServerTranslates = (result, targetKey, translates, opts = {}) => {
     if (!translates)
         return;
@@ -27,7 +28,8 @@ const I18nTransmitter = async ({ terms, children, cleanThread }) => {
     if (!context) {
         throw new Error("Please, Init I18nProvider - https://github.com/vordgi/nimpl-i18n#server-components");
     }
-    const { dictionary, lang } = context;
+    const { lang } = context;
+    const dictionary = await (0, getDictionary_1.default)(lang);
     const result = {};
     terms.forEach((term) => {
         if (Array.isArray(term)) {

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 = ({ term, components, query, removeUnusedQueries }) => {
-    const { t } = (0, getTranslation_1.default)();
+const ServerTranslation = async ({ term, components, query, removeUnusedQueries, }) => {
+    const { t } = await (0, getTranslation_1.default)();
     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

@@ -15,10 +15,10 @@ const getConfig = async () => {
             const config = await dynamicImport((0, url_1.pathToFileURL)(CONFIG_PATH).href);
             const { load, languages } = config.default;
             if (!load) {
-                throw new Error(`Can't find loaderProvider - https://github.com/vordgi/nimpl-i18n#configuration`);
+                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 loaderProvider - https://github.com/vordgi/nimpl-i18n#configuration`);
+                throw new Error(`Can't find languages list in configuration file - https://github.com/vordgi/nimpl-i18n#configuration`);
             }
             return config.default;
         }

package/dist/getTranslation.js

@@ -4,15 +4,17 @@ 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("next-impl-getters/get-server-context"));
+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 getTranslation = (namespace) => {
+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 { dictionary, lang } = context;
+    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;

package/dist/lib/I18nContext.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18nContext = void 0;
-const create_server_context_1 = __importDefault(require("next-impl-getters/create-server-context"));
+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,10 +1,15 @@
 "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) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const origFetch = globalThis._nextOriginalFetch || fetch;
-    const dataResp = await origFetch(`http://localhost:${process.env.I18N_CACHE_PORT}/?secret=${process.env.I18N_CACHE_SECRET}&lang=${lang}`, { cache: "no-cache" });
-    const data = await dataResp.json();
+    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;

package/getTranslation.d.ts

@@ -3,5 +3,5 @@ type GetTranslationReturnType = {
     t: (term: string, opts?: I18nOptions) => string;
     lang: string;
 };
-declare const getTranslation: (namespace?: string) => GetTranslationReturnType;
+declare const getTranslation: (namespace?: string) => Promise<GetTranslationReturnType>;
 export default getTranslation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimpl/i18n",
-  "version": "1.2.0",
+  "version": "2.0.0-canary.0",
   "description": "i18n library for working with translations in server and client components",
   "exports": {
     "./ClientTranslation": {
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "html-entities": "2.4.0",
-    "next-impl-getters": "0.3.1",
+    "@nimpl/getters": "1.3.4",
     "object-path": "0.11.8"
   }
 }

package/dist/configuration/CacheHandler.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheHandler = void 0;
-class CacheHandler {
-    cache;
-    constructor() {
-        this.cache = new Map();
-    }
-    async get(key) {
-        return this.cache.get(key);
-    }
-    async set(key, data) {
-        this.cache.set(key, data);
-    }
-    async has(key) {
-        return this.cache.has(key);
-    }
-}
-exports.CacheHandler = CacheHandler;

package/dist/configuration/DataLoader.js

@@ -1,108 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const isPromise_1 = require("../helpers/isPromise");
-const CacheHandler_1 = require("./CacheHandler");
-class DataLoader {
-    cache = {};
-    loadTranslates;
-    revalidate;
-    cacheHandler = new CacheHandler_1.CacheHandler();
-    checkIsActual;
-    retryAttempts;
-    languages;
-    constructor(opts) {
-        this.loadTranslates = opts.load;
-        this.revalidate = opts.revalidate;
-        this.checkIsActual = opts.checkIsActual;
-        this.retryAttempts = opts.retryAttempts || 3;
-        this.languages = opts.languages || [];
-    }
-    async prolongCache(lang) {
-        const prevMeta = this.cache[lang];
-        if (prevMeta && !(0, isPromise_1.isPromise)(prevMeta)) {
-            prevMeta.lastUpdated = Date.now();
-        }
-    }
-    async actualizeData(lang, lastLoadMeta) {
-        const isOutdatedCache = !lastLoadMeta ||
-            (this.revalidate !== undefined &&
-                this.revalidate !== false &&
-                lastLoadMeta.lastUpdated + 1000 * this.revalidate < Date.now());
-        if (isOutdatedCache) {
-            this.cache[lang] = new Promise(async (resolve) => {
-                if (this.checkIsActual) {
-                    const isActual = await this.callWithRetries(() => this.checkIsActual(lang, lastLoadMeta));
-                    if (isActual) {
-                        this.prolongCache(lang);
-                        resolve(undefined);
-                    }
-                }
-                const fullData = await this.callWithRetries(() => this.loadTranslates(lang));
-                if (!fullData?.data) {
-                    throw new Error(`No data key in load response for lang: ${lang}`);
-                }
-                this.cacheHandler.set(lang, fullData.data);
-                this.cache[lang] = {
-                    ...fullData.meta,
-                    lastUpdated: Date.now(),
-                    isRevalidated: false,
-                };
-                resolve(fullData.data);
-            });
-            const data = await this.cache[lang];
-            return data;
-        }
-    }
-    async load(lang) {
-        if (!this.languages.includes(lang)) {
-            console.error(`Unknown language: ${lang}`);
-            return {};
-        }
-        const cache = this.cache;
-        try {
-            const lastLoadResult = cache[lang];
-            /** We are still loading */
-            if ((0, isPromise_1.isPromise)(lastLoadResult)) {
-                const data = await cache[lang];
-                return data;
-            }
-            /** Cache doesn't exist or it's outdated */
-            const actualData = await this.actualizeData(lang, lastLoadResult);
-            if (actualData)
-                return actualData;
-        }
-        catch (e) {
-            console.error(`Can\'t load actual data for lang ${lang}: `, e);
-        }
-        const isCacheExist = await this.cacheHandler.has(lang);
-        if (isCacheExist) {
-            return this.cacheHandler.get(lang);
-        }
-        throw new Error("Can't load data or read from cache");
-    }
-    async revalidateTag(lang) {
-        const prevMeta = this.cache[lang];
-        if (prevMeta && !(0, isPromise_1.isPromise)(prevMeta)) {
-            prevMeta.isRevalidated = true;
-            await this.load(lang);
-        }
-    }
-    async callWithRetries(cb) {
-        let attempts = 0;
-        const call = async () => {
-            try {
-                attempts += 1;
-                return await cb();
-            }
-            catch {
-                if (attempts === this.retryAttempts) {
-                    throw new Error("Can't load data");
-                }
-                console.warn("Can't load data, trying again...");
-                call();
-            }
-        };
-        return call();
-    }
-}
-exports.default = DataLoader;

package/dist/configuration/createCacheServer.js

@@ -1,51 +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 crypto_1 = __importDefault(require("crypto"));
-const getConfig_1 = __importDefault(require("./getConfig"));
-const http_1 = __importDefault(require("http"));
-const DataLoader_1 = __importDefault(require("./DataLoader"));
-async function createCacheServer(port) {
-    const serverSecret = crypto_1.default.randomBytes(32).toString("hex");
-    const config = await (0, getConfig_1.default)();
-    const dataLoader = new DataLoader_1.default(config);
-    const server = http_1.default.createServer(async (req, res) => {
-        try {
-            const url = new URL(req.url || "/", "http://n");
-            const secret = url.searchParams.get("secret");
-            const lang = url.searchParams.get("lang");
-            const type = url.searchParams.get("type");
-            if (type === "dev" && process.env.NODE_ENV === "development") {
-                return res.end(JSON.stringify({ secret: serverSecret }));
-            }
-            if (secret !== serverSecret || !lang) {
-                return res.end();
-            }
-            const data = await dataLoader.load(lang);
-            res.end(JSON.stringify(data));
-        }
-        catch (e) {
-            console.log("error on data loading", e);
-        }
-    });
-    await new Promise((resolve) => {
-        server.listen(+port, "localhost", () => {
-            resolve(1);
-        });
-    });
-    process.on("SIGINT", () => {
-        server.close();
-    });
-    process.on("SIGQUIT", () => {
-        server.close();
-    });
-    process.on("SIGTERM", () => {
-        server.close();
-    });
-    return {
-        secret: serverSecret,
-    };
-}
-exports.default = createCacheServer;

package/dist/withI18n.js

@@ -1,32 +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 createCacheServer_1 = __importDefault(require("./configuration/createCacheServer"));
-const PORT = "24";
-let cacheSecret = process.env.I18N_CACHE_SECRET;
-const withI18n = async () => {
-    if (!cacheSecret) {
-        try {
-            const devResp = await fetch(`http://localhost:${PORT}/?type=dev`);
-            const data = await devResp.json();
-            if (data) {
-                cacheSecret = data.secret;
-            }
-        }
-        catch {
-            //
-        }
-    }
-    if (!cacheSecret) {
-        const { secret } = await (0, createCacheServer_1.default)(PORT);
-        cacheSecret = secret;
-    }
-    process.env.I18N_CACHE_PORT = PORT;
-    if (cacheSecret)
-        process.env.I18N_CACHE_SECRET = cacheSecret;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return (nextConfig) => nextConfig;
-};
-exports.default = withI18n;

package/withI18n.d.ts

@@ -1,2 +0,0 @@
-declare const withI18n: () => Promise<(nextConfig: any) => any>;
-export default withI18n;