gt-next 4.3.0 → 4.3.2-beta

package/dist/server/inline/T.js

@@ -57,6 +57,7 @@ var getMetadata_1 = __importDefault(require("../../request/getMetadata"));
 var react_1 = require("react");
 var internal_1 = require("gt-react/internal");
 var renderVariable_1 = __importDefault(require("../rendering/renderVariable"));
+var generaltranslation_1 = require("generaltranslation");
 function Resolver(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
         var children = _b.children;
@@ -99,10 +100,9 @@ function Resolver(_a) {
  * @param {React.ReactNode} children - The content to be translated or displayed.
  * @param {string} [id] - Optional identifier for the translation string. If not provided, a hash will be generated from the content.
  * @param {Object} [renderSettings] - Optional settings controlling how fallback content is rendered during translation.
- * @param {"skeleton" | "replace" | "subtle" | "default"} [renderSettings.method] - Specifies the rendering method:
+ * @param {"skeleton" | "replace" | "default"} [renderSettings.method] - Specifies the rendering method:
  *  - "skeleton": show a placeholder while translation is loading.
  *  - "replace": show the default content as a fallback while the translation is loading.
- *  - "subtle": display children without a translation initially, with translations being applied later if available.
  *  - "default": behave like skeleton unless language is same (ie en-GB vs en-US), then behave like replace
  * @param {number | null} [renderSettings.timeout] - Optional timeout for translation loading.
  * @param {any} [context] - Additional context for translation key generation.
@@ -113,12 +113,12 @@ function Resolver(_a) {
  */
 function T(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
-        var I18NConfig, locale, defaultLocale, regionalTranslationRequired, translationRequired, translationsPromise, taggedChildren, _c, childrenAsObjects, key, translations, translation, target, renderSettings, translationPromise, _d, _e, _f, renderDefaultLocale, renderLoadingSkeleton, renderLoadingDefault, renderTranslatedChildrenPromise, loadingFallback;
-        var _g;
-        var _this = this;
+        var I18NConfig, locale, defaultLocale, renderSettings, translationRequired, dialectTranslationRequired, taggedChildren, renderDefaultLocale, renderLoadingSkeleton, renderLoadingDefault, translationsPromise, _c, childrenAsObjects, key, translations, _d, translationEntry, translationPromise, _e, _f, _g, loadingFallback;
+        var _h;
+        var _j;
         var children = _b.children, id = _b.id, context = _b.context, variables = _b.variables, variablesOptions = _b.variablesOptions;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        return __generator(this, function (_k) {
+            switch (_k.label) {
                 case 0:
                     if (!children) {
                         return [2 /*return*/];
@@ -126,55 +126,12 @@ function T(_a) {
                     I18NConfig = (0, getI18NConfig_1.default)();
                     return [4 /*yield*/, (0, getLocale_1.default)()];
                 case 1:
-                    locale = _h.sent();
+                    locale = _k.sent();
                     defaultLocale = I18NConfig.getDefaultLocale();
-                    regionalTranslationRequired = I18NConfig.requiresRegionalTranslation(locale);
-                    translationRequired = I18NConfig.requiresTranslation(locale) || regionalTranslationRequired;
-                    if (translationRequired) {
-                        translationsPromise = I18NConfig.getTranslations(locale);
-                    }
-                    taggedChildren = I18NConfig.addGTIdentifier(children, id);
-                    // If no translation is required, render the default children
-                    // The dictionary wraps text in this <T> component
-                    // Thus, we need to also handle variables
-                    if (!translationRequired) {
-                        return [2 /*return*/, (0, internal_1.renderDefaultChildren)({
-                                children: taggedChildren,
-                                variables: variables,
-                                variablesOptions: variablesOptions,
-                                defaultLocale: defaultLocale,
-                                renderVariable: renderVariable_1.default,
-                            })];
-                    }
-                    _c = I18NConfig.serializeAndHash(taggedChildren, context, undefined // id is not provided here, to catch erroneous situations where the same id is being used for different <T> components
-                    ), childrenAsObjects = _c[0], key = _c[1];
-                    return [4 /*yield*/, translationsPromise];
-                case 2:
-                    translations = _h.sent();
-                    translation = id ? translations === null || translations === void 0 ? void 0 : translations[id] : undefined;
-                    // checks if an appropriate translation exists
-                    if (translation && (translation === null || translation === void 0 ? void 0 : translation[key])) {
-                        target = translation[key];
-                        return [2 /*return*/, (0, internal_1.renderTranslatedChildren)({
-                                source: taggedChildren,
-                                target: target,
-                                variables: variables,
-                                variablesOptions: variablesOptions,
-                                locales: [locale, defaultLocale],
-                                renderVariable: renderVariable_1.default,
-                            })];
-                    }
                     renderSettings = I18NConfig.getRenderSettings();
-                    _e = (_d = I18NConfig).translateChildren;
-                    _g = {
-                        source: childrenAsObjects,
-                        targetLocale: locale
-                    };
-                    _f = [__assign(__assign(__assign({}, (id && { id: id })), { hash: key }), (context && { context: context }))];
-                    return [4 /*yield*/, (0, getMetadata_1.default)()];
-                case 3:
-                    translationPromise = _e.apply(_d, [(_g.metadata = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), (renderSettings.timeout && { timeout: renderSettings.timeout })]),
-                            _g)]);
+                    translationRequired = I18NConfig.requiresTranslation(locale);
+                    dialectTranslationRequired = translationRequired && (0, generaltranslation_1.isSameLanguage)(locale, defaultLocale);
+                    taggedChildren = I18NConfig.addGTIdentifier(children);
                     renderDefaultLocale = function () {
                         return (0, internal_1.renderDefaultChildren)({
                             children: taggedChildren,
@@ -193,22 +150,64 @@ function T(_a) {
                         });
                     };
                     renderLoadingDefault = function () {
-                        if (regionalTranslationRequired)
+                        if (dialectTranslationRequired)
                             return renderDefaultLocale();
                         return renderLoadingSkeleton();
                     };
-                    renderTranslatedChildrenPromise = translationPromise.then(function (translation) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            return [2 /*return*/, (0, internal_1.renderTranslatedChildren)({
-                                    source: taggedChildren,
-                                    target: translation,
-                                    variables: variables,
-                                    variablesOptions: variablesOptions,
-                                    locales: [locale, defaultLocale],
-                                    renderVariable: renderVariable_1.default,
-                                })];
+                    // ----- CHECK TRANSLATIONS REQUIRED ----- //
+                    // If no translation is required, render the default children
+                    // The dictionary wraps text in this <T> component
+                    // Thus, we need to also handle variables
+                    if (!translationRequired) {
+                        return [2 /*return*/, renderDefaultLocale()];
+                    }
+                    translationsPromise = translationRequired && I18NConfig.getCachedTranslations(locale);
+                    _c = I18NConfig.serializeAndHashChildren(taggedChildren, context), childrenAsObjects = _c[0], key = _c[1];
+                    if (!(translationsPromise)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, translationsPromise];
+                case 2:
+                    _d = _k.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _d = {};
+                    _k.label = 4;
+                case 4:
+                    translations = _d;
+                    translationEntry = (_j = translations === null || translations === void 0 ? void 0 : translations[id]) === null || _j === void 0 ? void 0 : _j[key];
+                    // ----- CHECK CACHED TRANSLATIONS ----- //
+                    // if we have a cached translation, render it
+                    if ((translationEntry === null || translationEntry === void 0 ? void 0 : translationEntry.state) === 'success') {
+                        return [2 /*return*/, (0, internal_1.renderTranslatedChildren)({
+                                source: taggedChildren,
+                                target: translationEntry.target,
+                                variables: variables,
+                                variablesOptions: variablesOptions,
+                                locales: [locale, defaultLocale],
+                                renderVariable: renderVariable_1.default,
+                            })];
+                    }
+                    else if ((translationEntry === null || translationEntry === void 0 ? void 0 : translationEntry.state) === 'error') {
+                        return [2 /*return*/, renderDefaultLocale()];
+                    }
+                    _f = (_e = I18NConfig).translateChildren;
+                    _h = {
+                        source: childrenAsObjects,
+                        targetLocale: locale
+                    };
+                    _g = [__assign(__assign(__assign({}, (id && { id: id })), { hash: key }), (context && { context: context }))];
+                    return [4 /*yield*/, (0, getMetadata_1.default)()];
+                case 5:
+                    translationPromise = _f.apply(_e, [(_h.metadata = __assign.apply(void 0, [__assign.apply(void 0, _g.concat([(_k.sent())])), (renderSettings.timeout && { timeout: renderSettings.timeout })]),
+                            _h)]).then(function (translation) {
+                        return (0, internal_1.renderTranslatedChildren)({
+                            source: taggedChildren,
+                            target: translation,
+                            variables: variables,
+                            variablesOptions: variablesOptions,
+                            locales: [locale, defaultLocale],
+                            renderVariable: renderVariable_1.default,
                         });
-                    }); }).catch(function () {
+                    }).catch(function () {
                         return renderDefaultLocale();
                     });
                     if (renderSettings.method === 'replace') {
@@ -217,13 +216,10 @@ function T(_a) {
                     else if (renderSettings.method === 'skeleton') {
                         loadingFallback = renderLoadingSkeleton();
                     }
-                    else if (renderSettings.method === 'subtle' && id !== undefined) { // exclude entries with missing ids bc these don't get cached
-                        return [2 /*return*/, renderDefaultLocale()];
-                    }
                     else {
                         loadingFallback = renderLoadingDefault();
                     }
-                    return [2 /*return*/, ((0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: loadingFallback, children: (0, jsx_runtime_1.jsx)(Resolver, { children: renderTranslatedChildrenPromise }) }))];
+                    return [2 /*return*/, ((0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: loadingFallback, children: (0, jsx_runtime_1.jsx)(Resolver, { children: translationPromise }) }))];
             }
         });
     });

package/dist/server/inline/T.js.map

@@ -1 +1 @@
-{"version":3,"file":"T.js","sourceRoot":"","sources":["../../../src/server/inline/T.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"T.js","sourceRoot":"","sources":["../../../src/server/inline/T.tsx"],"names":[],"mappings":"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"}

package/dist/server/strings/tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../../src/server/strings/tx.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAA8B,EAAE,CAC9B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACP,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CACtB,MAAM,EACN,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CACtD,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACf,GACL,OAAO,CAAC,MAAM,CAAC,CAqDjB"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../../src/server/strings/tx.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAA8B,EAAE,CAC9B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACP,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,eAAe,CAAC,EAAE,MAAM,CACtB,MAAM,EACN,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CACtD,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACf,GACL,OAAO,CAAC,MAAM,CAAC,CAqDjB"}

package/dist/server/strings/tx.js

@@ -92,65 +92,64 @@ var createErrors_1 = require("../../errors/createErrors");
  */
 function tx(content_1) {
     return __awaiter(this, arguments, void 0, function (content, options) {
-        var I18NConfig, defaultLocale, locale, _a, contentArray, renderContent, _b, _, hash, translations, target, translationPromise, _c, _d, _e, renderSettings, target, error_1;
+        var I18NConfig, locale, _a, defaultLocale, translationRequired, contentArray, renderContent, hash, translations, target, translationPromise, _b, _c, _d, target, error_1;
+        var _e;
         var _f;
-        var _g;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        return __generator(this, function (_g) {
+            switch (_g.label) {
                 case 0:
+                    // ----- SET UP ----- //
                     if (!content)
-                        return [2 /*return*/, ''];
+                        return [2 /*return*/, '']; // No content to translate
                     I18NConfig = (0, getI18NConfig_1.default)();
-                    defaultLocale = I18NConfig.getDefaultLocale();
                     _a = options.locale;
                     if (_a) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, getLocale_1.default)()];
                 case 1:
-                    _a = (_h.sent());
-                    _h.label = 2;
+                    _a = (_g.sent());
+                    _g.label = 2;
                 case 2:
                     locale = _a;
+                    defaultLocale = I18NConfig.getDefaultLocale();
+                    translationRequired = I18NConfig.requiresTranslation(locale);
                     contentArray = (0, generaltranslation_1.splitStringToContent)(content);
                     renderContent = function (content, locales) {
                         return (0, generaltranslation_1.renderContentToString)(content, locales, options.variables, options.variablesOptions);
                     };
-                    if (!I18NConfig.requiresTranslation(locale))
+                    // ----- RENDER LOGIC ----- //
+                    // translation required
+                    if (translationRequired)
                         return [2 /*return*/, renderContent(contentArray, [defaultLocale])];
-                    _b = I18NConfig.serializeAndHash(contentArray, options.context, undefined // id is not provided here, to catch erroneous situations where the same id is being used for different <T> components
-                    ), _ = _b[0], hash = _b[1];
+                    hash = I18NConfig.hashContent(contentArray, options.context);
                     if (!options.id) return [3 /*break*/, 4];
-                    return [4 /*yield*/, I18NConfig.getTranslations(locale)];
+                    return [4 /*yield*/, I18NConfig.getCachedTranslations(locale)];
                 case 3:
-                    translations = _h.sent();
-                    target = (_g = translations[options.id]) === null || _g === void 0 ? void 0 : _g[hash];
+                    translations = _g.sent();
+                    target = (_f = translations[options.id]) === null || _f === void 0 ? void 0 : _f[hash];
                     if (target)
                         return [2 /*return*/, renderContent(target, [locale, defaultLocale])];
-                    _h.label = 4;
+                    _g.label = 4;
                 case 4:
-                    _d = (_c = I18NConfig).translateContent;
-                    _f = {
+                    _c = (_b = I18NConfig).translateContent;
+                    _e = {
                         source: contentArray,
                         targetLocale: locale
                     };
-                    _e = [__assign({}, options)];
+                    _d = [__assign({}, options)];
                     return [4 /*yield*/, (0, getMetadata_1.default)()];
                 case 5:
-                    translationPromise = _d.apply(_c, [(_f.options = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { hash: hash }]),
-                            _f)]);
-                    renderSettings = I18NConfig.getRenderSettings();
-                    // subtle: wait for CDN to populate or for API to respond, do fallback for now
-                    if (renderSettings.method === 'subtle' || !options.id)
-                        return [2 /*return*/, renderContent(contentArray, [defaultLocale])];
-                    _h.label = 6;
+                    translationPromise = _c.apply(_b, [(_e.options = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_g.sent())])), { hash: hash }]),
+                            _e)]);
+                    _g.label = 6;
                 case 6:
-                    _h.trys.push([6, 8, , 9]);
+                    _g.trys.push([6, 8, , 9]);
                     return [4 /*yield*/, translationPromise];
                 case 7:
-                    target = _h.sent();
+                    target = _g.sent();
                     return [2 /*return*/, renderContent(target, [locale, defaultLocale])];
                 case 8:
-                    error_1 = _h.sent();
+                    error_1 = _g.sent();
                     console.error((0, createErrors_1.createStringTranslationError)(content, options.id), error_1);
                     return [2 /*return*/, renderContent(contentArray, [defaultLocale])];
                 case 9: return [2 /*return*/];

package/dist/server/strings/tx.js.map

@@ -1 +1 @@
-{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../../src/server/strings/tx.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,qBAkEC;AA7GD,yDAG4B;AAC5B,6EAAuD;AACvD,sEAAgD;AAChD,0EAAoD;AACpD,0DAAyE;AAEzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAA8B,EAAE;wDAC9B,OAAe,EACf,OAUM;;;;QAVN,wBAAA,EAAA,YAUM;;;;oBAEN,IAAI,CAAC,OAAO;wBAAE,sBAAO,EAAE,EAAC;oBAElB,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBAC7B,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;oBACrC,KAAA,OAAO,CAAC,MAAM,CAAA;4BAAd,wBAAc;oBAAK,qBAAM,IAAA,mBAAS,GAAE,EAAA;;oBAAlB,KAAA,CAAC,SAAiB,CAAC,CAAA;;;oBAA9C,MAAM,KAAwC;oBAE9C,YAAY,GAAG,IAAA,yCAAoB,EAAC,OAAO,CAAC,CAAC;oBAE7C,aAAa,GAAG,UAAC,OAAY,EAAE,OAAiB;wBACpD,OAAO,IAAA,0CAAqB,EAC1B,OAAO,EACP,OAAO,EACP,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,gBAAgB,CACzB,CAAC;oBACJ,CAAC,CAAC;oBAEF,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC;wBACzC,sBAAO,aAAa,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,EAAC;oBAEhD,KAAY,UAAU,CAAC,gBAAgB,CAC3C,YAAY,EACZ,OAAO,CAAC,OAAO,EACf,SAAS,CAAC,sHAAsH;qBACjI,EAJM,CAAC,QAAA,EAAE,IAAI,QAAA,CAIZ;yBAGE,OAAO,CAAC,EAAE,EAAV,wBAAU;oBACS,qBAAM,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAAvD,YAAY,GAAG,SAAwC;oBACvD,MAAM,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,0CAAG,IAAI,CAAC,CAAC;oBAChD,IAAI,MAAM;wBAAE,sBAAO,aAAa,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAC;;;oBAIzC,KAAA,CAAA,KAAA,UAAU,CAAA,CAAC,gBAAgB,CAAA;;wBACpD,MAAM,EAAE,YAAY;wBACpB,YAAY,EAAE,MAAM;;uCACN,OAAO;oBAAM,qBAAM,IAAA,qBAAW,GAAE,EAAA;;oBAH1C,kBAAkB,GAAG,eAGzB,UAAO,6DAAmB,CAAC,SAAmB,CAAC,OAAE,IAAI,MAAA,IAAE;iCACvD;oBAEI,cAAc,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;oBAEtD,8EAA8E;oBAC9E,IAAI,cAAc,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE;wBAAE,sBAAO,aAAa,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,EAAC;;;;oBAG1F,qBAAM,kBAAkB,EAAA;;oBAAjC,MAAM,GAAG,SAAwB;oBACvC,sBAAO,aAAa,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAC;;;oBAEtD,OAAO,CAAC,KAAK,CAAC,IAAA,2CAA4B,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,OAAK,CAAC,CAAC;oBACxE,sBAAO,aAAa,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,EAAC;;;;;CAEvD"}
+{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../../src/server/strings/tx.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4CA,qBAkEC;AA9GD,yDAI4B;AAC5B,6EAAuD;AACvD,sEAAgD;AAChD,0EAAoD;AACpD,0DAAyE;AAEzE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAA8B,EAAE;wDAC9B,OAAe,EACf,OAUM;;;;QAVN,wBAAA,EAAA,YAUM;;;;oBAGN,wBAAwB;oBAExB,IAAI,CAAC,OAAO;wBAAE,sBAAO,EAAE,EAAC,CAAE,0BAA0B;oBAE9C,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBACpB,KAAA,OAAO,CAAC,MAAM,CAAA;4BAAd,wBAAc;oBAAK,qBAAM,IAAA,mBAAS,GAAE,EAAA;;oBAAlB,KAAA,CAAC,SAAiB,CAAC,CAAA;;;oBAA9C,MAAM,KAAwC;oBAC9C,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;oBAC9C,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;oBAC7D,YAAY,GAAG,IAAA,yCAAoB,EAAC,OAAO,CAAC,CAAC;oBAI7C,aAAa,GAAG,UAAC,OAAY,EAAE,OAAiB;wBACpD,OAAO,IAAA,0CAAqB,EAC1B,OAAO,EACP,OAAO,EACP,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,gBAAgB,CACzB,CAAC;oBACJ,CAAC,CAAC;oBAGF,8BAA8B;oBAE9B,uBAAuB;oBACvB,IAAI,mBAAmB;wBAAE,sBAAO,aAAa,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,EAAC;oBAGvE,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;yBAG/D,OAAO,CAAC,EAAE,EAAV,wBAAU;oBACS,qBAAM,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAA;;oBAA7D,YAAY,GAAG,SAA8C;oBAC7D,MAAM,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,0CAAG,IAAI,CAAC,CAAC;oBAChD,IAAI,MAAM;wBAAE,sBAAO,aAAa,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAC;;;oBAIzC,KAAA,CAAA,KAAA,UAAU,CAAA,CAAC,gBAAgB,CAAA;;wBACpD,MAAM,EAAE,YAAY;wBACpB,YAAY,EAAE,MAAM;;uCACN,OAAO;oBAAM,qBAAM,IAAA,qBAAW,GAAE,EAAA;;oBAH1C,kBAAkB,GAAG,eAGzB,UAAO,6DAAmB,CAAC,SAAmB,CAAC,OAAE,IAAI,MAAA,IAAE;iCACvD;;;;oBAGe,qBAAM,kBAAkB,EAAA;;oBAAjC,MAAM,GAAG,SAAwB;oBACvC,sBAAO,aAAa,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAC;;;oBAEtD,OAAO,CAAC,KAAK,CAAC,IAAA,2CAA4B,EAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,OAAK,CAAC,CAAC;oBACxE,sBAAO,aAAa,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,EAAC;;;;;CAEvD"}

package/dist/types/types.d.ts

@@ -1,13 +1,11 @@
-import { TranslatedChildren, TranslatedContent, TranslationError } from "gt-react/internal";
-export type TranslationPromise = {
-    promise: Promise<TranslatedChildren> | Promise<TranslatedContent>;
-    hash: string;
-    type: 'jsx' | 'content';
+import { TaggedChildren, TranslationError, Metadata } from "gt-react/internal";
+export type TaggedEntry = string | TaggedChildren;
+export type TaggedDictionaryEntry = TaggedEntry | [TaggedEntry] | [TaggedEntry, Metadata];
+export type TaggedDictionary = {
+    [key: string]: TaggedDictionary | TaggedDictionaryEntry;
 };
-export type Translations = {
-    [id: string]: {
-        [hash: string]: TranslatedChildren | TranslatedContent;
-    } | TranslationError | TranslationPromise;
+export type FlattenedTaggedDictionary = {
+    [key: string]: TaggedDictionaryEntry;
 };
 export declare class GTTranslationError extends Error {
     error: string;

package/dist/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE5F,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAClE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,GAAG,SAAS,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,EAAE,EAAE,MAAM,GACT;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,iBAAiB,CAAA;KAAE,GACxD,gBAAgB,GAChB,kBAAkB,CAAA;CACvB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,KAAK,EAAE,MAAM;IAAS,IAAI,EAAE,MAAM;gBAAlC,KAAK,EAAE,MAAM,EAAS,IAAI,EAAE,MAAM;IAKrD,kBAAkB,IAAI,gBAAgB;CAMvC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE/E,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,cAAc,CAAC;AAClD,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,CAAE,WAAW,CAAE,GAAG,CAAE,WAAW,EAAE,QAAQ,CAAE,CAAC;AAC9F,MAAM,MAAM,gBAAgB,GAAG;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,GAAG,qBAAqB,CAAC;CAC3D,CAAA;AACD,MAAM,MAAM,yBAAyB,GAAG;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CACvC,CAAA;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IACxB,KAAK,EAAE,MAAM;IAAS,IAAI,EAAE,MAAM;gBAAlC,KAAK,EAAE,MAAM,EAAS,IAAI,EAAE,MAAM;IAKrD,kBAAkB,IAAI,gBAAgB;CAOvC"}

package/dist/types/types.js

@@ -27,6 +27,7 @@ var GTTranslationError = /** @class */ (function (_super) {
     }
     GTTranslationError.prototype.toTranslationError = function () {
         return {
+            state: 'error',
             error: this.error,
             code: this.code
         };

package/dist/types/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAeA;IAAwC,sCAAK;IAC3C,4BAAmB,KAAa,EAAS,IAAY;QACnD,YAAA,MAAK,YAAC,KAAK,CAAC,SAAC;QADI,WAAK,GAAL,KAAK,CAAQ;QAAS,UAAI,GAAJ,IAAI,CAAQ;QAEnD,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC;;IACnB,CAAC;IAED,+CAAkB,GAAlB;QACE,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;IACH,CAAC;IACH,yBAAC;AAAD,CAAC,AAZD,CAAwC,KAAK,GAY5C;AAZY,gDAAkB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAWA;IAAwC,sCAAK;IAC3C,4BAAmB,KAAa,EAAS,IAAY;QACnD,YAAA,MAAK,YAAC,KAAK,CAAC,SAAC;QADI,WAAK,GAAL,KAAK,CAAQ;QAAS,UAAI,GAAJ,IAAI,CAAQ;QAEnD,KAAI,CAAC,IAAI,GAAG,IAAI,CAAC;;IACnB,CAAC;IAED,+CAAkB,GAAlB;QACE,OAAO;YACL,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;IACH,CAAC;IACH,yBAAC;AAAD,CAAC,AAbD,CAAwC,KAAK,GAa5C;AAbY,gDAAkB"}

package/dist/utils/extractTaggedEntryMetadata.d.ts

@@ -0,0 +1,7 @@
+import { Metadata } from "gt-react/internal";
+import { TaggedDictionaryEntry, TaggedEntry } from "../types/types";
+export default function extractEntryMetadata(value: TaggedDictionaryEntry): {
+    entry: TaggedEntry;
+    metadata?: Metadata;
+};
+//# sourceMappingURL=extractTaggedEntryMetadata.d.ts.map

package/dist/utils/extractTaggedEntryMetadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractTaggedEntryMetadata.d.ts","sourceRoot":"","sources":["../../src/utils/extractTaggedEntryMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpE,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,KAAK,EAAE,qBAAqB,GAAG;IACxE,KAAK,EAAE,WAAW,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACtB,CAUA"}

package/dist/utils/extractTaggedEntryMetadata.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = extractEntryMetadata;
+function extractEntryMetadata(value) {
+    if (Array.isArray(value)) {
+        if (value.length === 1) {
+            return { entry: value[0] };
+        }
+        if (value.length === 2) {
+            return { entry: value[0], metadata: value[1] };
+        }
+    }
+    return { entry: value };
+}
+//# sourceMappingURL=extractTaggedEntryMetadata.js.map

package/dist/utils/extractTaggedEntryMetadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extractTaggedEntryMetadata.js","sourceRoot":"","sources":["../../src/utils/extractTaggedEntryMetadata.ts"],"names":[],"mappings":";;AAGA,uCAaC;AAbD,SAAwB,oBAAoB,CAAC,KAA4B;IAIrE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;QAC9B,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAa,EAAE,CAAA;QAC9D,CAAC;IACL,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAoB,EAAE,CAAC;AAC3C,CAAC"}

package/dist/utils/serializeJsx.d.ts

@@ -0,0 +1,9 @@
+import { Children } from 'gt-react/internal';
+/**
+ * Replaces fragment tags with spans. This is because they get serialized as strings when passed to client as a dictionary entry.
+ * @param children
+ * @param startingIndex
+ * @returns
+ */
+export default function serializeJsx(children: Children, startingIndex?: number): Children;
+//# sourceMappingURL=serializeJsx.d.ts.map

package/dist/utils/serializeJsx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serializeJsx.d.ts","sourceRoot":"","sources":["../../src/utils/serializeJsx.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAG5D;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,GAAE,MAAU,GAAG,QAAQ,CAwF5F"}

package/dist/utils/serializeJsx.js

@@ -0,0 +1,156 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = serializeJsx;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = __importStar(require("react"));
+var internal_1 = require("generaltranslation/internal");
+/**
+ * Replaces fragment tags with spans. This is because they get serialized as strings when passed to client as a dictionary entry.
+ * @param children
+ * @param startingIndex
+ * @returns
+ */
+function serializeJsx(children, startingIndex) {
+    if (startingIndex === void 0) { startingIndex = 0; }
+    // Object to keep track of the current index for GT IDs
+    var index = startingIndex;
+    /**
+     * Function to create a GTProp object for a ReactElement
+     * @param child - The ReactElement for which the GTProp is created
+     * @returns - The GTProp object
+     */
+    var createGTProp = function (child) {
+        var type = child.type, props = child.props;
+        index += 1;
+        var result = { id: index };
+        var transformation;
+        try {
+            transformation = typeof type === 'function' ? (type.gtTransformation || '') : '';
+        }
+        catch (error) {
+            transformation = '';
+        }
+        if (transformation) {
+            var transformationParts = transformation.split('-');
+            if (transformationParts[0] === "translate") {
+                // throw new Error(createNestedTError(child))
+                // console.log
+                // TODO: get a better error:
+                throw new Error('Nested T error');
+            }
+            if (transformationParts[0] === "variable") {
+                result.variableType = (transformationParts === null || transformationParts === void 0 ? void 0 : transformationParts[1]) || "variable";
+            }
+            if (transformationParts[0] === "plural") {
+                var pluralBranches = Object.entries(props).reduce(function (acc, _a) {
+                    var branchName = _a[0], branch = _a[1];
+                    if ((0, internal_1.isAcceptedPluralForm)(branchName)) {
+                        acc[branchName] = serializeJsx(branch, index);
+                    }
+                    return acc;
+                }, {});
+                if (Object.keys(pluralBranches).length)
+                    result.branches = pluralBranches;
+            }
+            if (transformationParts[0] === "branch") {
+                var children_1 = props.children, branch = props.branch, branches = __rest(props, ["children", "branch"]);
+                var resultBranches = Object.entries(branches).reduce(function (acc, _a) {
+                    var branchName = _a[0], branch = _a[1];
+                    acc[branchName] = serializeJsx(branch, index);
+                    return acc;
+                }, {});
+                if (Object.keys(resultBranches).length)
+                    result.branches = resultBranches;
+            }
+            result.transformation = transformationParts[0];
+        }
+        return result;
+    };
+    function handleSingleChildElement(child) {
+        var props = child.props;
+        // if (props['data-_gt']) throw new Error(createNestedDataGTError(child));
+        // Create new props for the element, including the GT identifier and a key
+        var generaltranslation = createGTProp(child);
+        var newProps = __assign({}, props);
+        if (props.children && !generaltranslation.variableType) {
+            newProps.children = handleChildren(props.children);
+        }
+        if (child.type === react_1.default.Fragment) {
+            var fragment = (0, jsx_runtime_1.jsx)("span", __assign({ style: { all: 'unset', display: 'contents' } }, newProps));
+            return fragment;
+        }
+        return react_1.default.cloneElement(child, newProps);
+    }
+    function handleSingleChild(child) {
+        if ((0, react_1.isValidElement)(child)) {
+            return handleSingleChildElement(child);
+        }
+        return child;
+    }
+    function handleChildren(children) {
+        if (Array.isArray(children)) {
+            return react_1.default.Children.map(children, handleSingleChild);
+        }
+        else {
+            return handleSingleChild(children);
+        }
+    }
+    return handleChildren(children);
+}
+;
+//# sourceMappingURL=serializeJsx.js.map

package/dist/utils/serializeJsx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serializeJsx.js","sourceRoot":"","sources":["../../src/utils/serializeJsx.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,+BAwFC;;AAnGD,6CAA2D;AAC3D,wDAAkE;AAIlE;;;;;GAKG;AACH,SAAwB,YAAY,CAAC,QAAkB,EAAE,aAAyB;IAAzB,8BAAA,EAAA,iBAAyB;IAE9E,uDAAuD;IACvD,IAAI,KAAK,GAAG,aAAa,CAAC;IAE1B;;;;OAIG;IACH,IAAM,YAAY,GAAG,UAAC,KAAwB;QAClC,IAAA,IAAI,GAAY,KAAK,KAAjB,EAAE,KAAK,GAAK,KAAK,MAAV,CAAW;QAC9B,KAAK,IAAI,CAAC,CAAC;QACX,IAAI,MAAM,GAAW,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QACnC,IAAI,cAAsB,CAAC;QAC3B,IAAI,CAAC;YACD,cAAc,GAAG,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAE,IAAY,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,cAAc,GAAG,EAAE,CAAA;QACvB,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACjB,IAAM,mBAAmB,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtD,IAAI,mBAAmB,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE,CAAC;gBACzC,6CAA6C;gBAC7C,cAAc;gBACd,4BAA4B;gBAC5B,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;YACrC,CAAC;YACD,IAAI,mBAAmB,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,CAAC;gBACxC,MAAM,CAAC,YAAY,GAAG,CAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,CAAC,CAAC,KAAI,UAAU,CAAC;YACjE,CAAC;YACD,IAAI,mBAAmB,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACtC,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,EAAoB;wBAAnB,UAAU,QAAA,EAAE,MAAM,QAAA;oBACzE,IAAI,IAAA,+BAAoB,EAAC,UAAU,CAAC,EAAE,CAAC;wBAClC,GAA2B,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,MAAkB,EAAE,KAAK,CAAC,CAAC;oBACvF,CAAC;oBACD,OAAO,GAAG,CAAC;gBACf,CAAC,EAAE,EAAE,CAAC,CAAC;gBACP,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM;oBAAE,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;YAC7E,CAAC;YACD,IAAI,mBAAmB,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC9B,IAAA,UAAQ,GAA0B,KAAK,SAA/B,EAAE,MAAM,GAAkB,KAAK,OAAvB,EAAK,QAAQ,UAAK,KAAK,EAAzC,sBAAiC,CAAF,CAAW;gBAChD,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,EAAoB;wBAAnB,UAAU,QAAA,EAAE,MAAM,QAAA;oBAC3E,GAA2B,CAAC,UAAU,CAAC,GAAG,YAAY,CAAC,MAAkB,EAAE,KAAK,CAAC,CAAC;oBACnF,OAAO,GAAG,CAAC;gBACf,CAAC,EAAE,EAAE,CAAC,CAAA;gBACN,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM;oBAAE,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;YAC7E,CAAC;YACD,MAAM,CAAC,cAAc,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAA;IAED,SAAS,wBAAwB,CAAC,KAAwB;QAC9C,IAAA,KAAK,GAAK,KAAK,MAAV,CAAW;QACxB,0EAA0E;QAC1E,0EAA0E;QAC1E,IAAI,kBAAkB,GAAW,YAAY,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,QAAQ,gBACL,KAAK,CAEX,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;YACrD,QAAQ,CAAC,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,QAAoB,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,eAAK,CAAC,QAAQ,EAAE,CAAC;YAChC,IAAM,QAAQ,GAAG,0CAAM,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAM,QAAQ,EAAI,CAAC;YACtF,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,eAAK,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS,iBAAiB,CAAC,KAAY;QACnC,IAAI,IAAA,sBAAc,EAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,SAAS,cAAc,CAAC,QAAkB;QACtC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,eAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;QAC1D,CAAC;aAAM,CAAC;YACJ,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;IACL,CAAC;IAED,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;AACpC,CAAC;AAAA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt-next",
-  "version": "4.3.0",
+  "version": "4.3.2-beta",
   "description": "A Next.js library for automatic internationalization.",
   "main": "dist/index.server.js",
   "peerDependencies": {
@@ -120,7 +120,6 @@
   ],
   "dependencies": {
     "@generaltranslation/supported-locales": "^1.1.2",
-    "generaltranslation": "^6.1.3",
-    "gt-react": "^8.2.11"
+    "gt-react": "^8.2.17-beta"
   }
 }