gt-next 1.3.15 → 2.0.2

package/dist/server/rendering/renderTranslatedChildren.js

@@ -1,169 +1,233 @@
 "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];
+/*import React, { ReactElement, ReactNode } from 'react';
+import {
+  TranslatedChildren,
+  TranslatedElement,
+  VariableObject,
+} from 'gt-react/dist/primitives/types';
+import {
+  isVariableObject,
+  getVariableProps,
+  getPluralBranch,
+} from 'gt-react/internal';
+import { libraryDefaultLocale } from 'generaltranslation/internal';
+import getGTProp from '../../utils/getGTProp';
+import renderVariable from './renderVariable';
+
+function renderTranslatedElement({
+  sourceElement,
+  targetElement,
+  variables = {},
+  variablesOptions = {},
+  locales = [libraryDefaultLocale],
+}: {
+  sourceElement: ReactElement;
+  targetElement: TranslatedElement;
+  variables?: Record<string, any>;
+  variablesOptions?: Record<string, any>;
+  locales: string[];
+}) {
+  const {
+    props: { 'data-_gt': generaltranslation, ...props },
+  } = sourceElement;
+
+  const transformation = generaltranslation?.['transformation'];
+
+  if (transformation === 'plural') {
+    const n =
+      typeof variables.n === 'number'
+        ? variables.n
+        : typeof sourceElement.props.n === 'number'
+        ? sourceElement.props.n
+        : sourceElement.props['data-_gt-n'];
+    const sourceBranches = generaltranslation.branches || {};
+    const sourceBranch =
+      getPluralBranch(n, locales, sourceBranches) ||
+      sourceElement.props.children;
+    const targetBranches = targetElement.props['data-_gt'].branches || {};
+    const targetBranch =
+      getPluralBranch(n, locales, targetBranches) ||
+      targetElement.props.children;
+    return renderTranslatedChildren({
+      source: sourceBranch,
+      target: targetBranch,
+      variables,
+      variablesOptions,
+      locales,
+    });
+  }
+
+  if (transformation === 'branch') {
+    let { name, branch, children } = props;
+    name = name || sourceElement.props['data-_gt-name'] || 'branch';
+    branch =
+      variables[name] || branch || sourceElement.props['data-_gt-branch-name'];
+    const sourceBranch =
+      (generaltranslation.branches || {})[branch] || children;
+    const targetBranch =
+      (targetElement.props['data-_gt'].branches || {})[branch] ||
+      targetElement.props.children;
+    return renderTranslatedChildren({
+      source: sourceBranch,
+      target: targetBranch,
+      variables,
+      variablesOptions,
+      locales,
+    });
+  }
+
+  // If there are children, clone the source element with new children that represent the translation
+  if (props?.children && targetElement.props?.children) {
+    return React.cloneElement(sourceElement, {
+      ...props,
+      'data-_gt': undefined,
+      children: renderTranslatedChildren({
+        source: props.children,
+        target: targetElement.props.children,
+        variables,
+        variablesOptions,
+        locales,
+      }),
+    });
+  }
+
+  return sourceElement;
+}
+
+export default function renderTranslatedChildren({
+  source,
+  target,
+  variables = {},
+  variablesOptions = {},
+  locales = [libraryDefaultLocale],
+}: {
+  source: ReactNode;
+  target: TranslatedChildren;
+  variables?: Record<string, any>;
+  variablesOptions?: Record<string, any>;
+  locales: string[];
+}): ReactNode {
+  // Most straightforward case, return a valid React node
+  // If there is an error in the translation or similar, return the default
+  if ((target === null || typeof target === 'undefined') && source)
+    return source;
+  if (typeof target === 'string') return target;
+
+  // Source & target are both arrays, but may be in different orders
+  // Go through the source array & filters the source elements for actual react elements & variables
+  if (Array.isArray(source) && Array.isArray(target)) {
+    const sourceElements: ReactElement[] = source.filter((sourceChild) => {
+      if (React.isValidElement(sourceChild)) {
+        const generaltranslation = getGTProp(sourceChild);
+        if (generaltranslation?.transformation === 'variable') {
+          let { variableName, variableValue, variableOptions } =
+            getVariableProps(sourceChild.props as any);
+          if (typeof variables[variableName] === 'undefined') {
+            variables[variableName] = variableValue;
+          }
+          variablesOptions[variableName] = {
+            ...variablesOptions[variableName],
+            ...variableOptions,
+          };
+        } else {
+          return true;
         }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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]];
+      }
+    });
+
+    // Take a target element & find the matching source element with the same id
+    const findMatchingSourceElement = (
+      targetElement: TranslatedElement
+    ): ReactElement | undefined => {
+      return sourceElements.find((sourceChild) => {
+        const generaltranslation = getGTProp(sourceChild);
+        if (typeof generaltranslation?.id !== 'undefined') {
+          const sourceID = generaltranslation.id;
+          const targetID = targetElement?.props?.['data-_gt']?.id;
+          return sourceID === targetID;
         }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = renderTranslatedChildren;
-var jsx_runtime_1 = require("react/jsx-runtime");
-var react_1 = __importDefault(require("react"));
-var internal_1 = require("gt-react/internal");
-var getGTProp_1 = __importDefault(require("../../utils/getGTProp"));
-var renderVariable_1 = __importDefault(require("./renderVariable"));
-function renderTranslatedElement(_a) {
-    var _b;
-    var sourceElement = _a.sourceElement, targetElement = _a.targetElement, _c = _a.variables, variables = _c === void 0 ? {} : _c, _d = _a.variablesOptions, variablesOptions = _d === void 0 ? {} : _d, _e = _a.locales, locales = _e === void 0 ? [internal_1.primitives.libraryDefaultLocale] : _e;
-    var _f = sourceElement.props, generaltranslation = _f["data-_gt"], props = __rest(_f, ['data-_gt']);
-    var transformation = generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation["transformation"];
-    if (transformation === "plural") {
-        var n = typeof variables.n === 'number' ? variables.n :
-            typeof sourceElement.props.n === 'number' ? sourceElement.props.n :
-                sourceElement.props['data-_gt-n'];
-        var sourceBranches = generaltranslation.branches || {};
-        var sourceBranch = (0, internal_1.getPluralBranch)(n, locales, sourceBranches) || sourceElement.props.children;
-        var targetBranches = targetElement.props["data-_gt"].branches || {};
-        var targetBranch = (0, internal_1.getPluralBranch)(n, locales, targetBranches) || targetElement.props.children;
-        return renderTranslatedChildren({
-            source: sourceBranch,
-            target: targetBranch,
-            variables: variables,
-            variablesOptions: variablesOptions,
-            locales: locales
-        });
-    }
-    if (transformation === "branch") {
-        var name_1 = props.name, branch = props.branch, children = props.children;
-        name_1 = name_1 || sourceElement.props['data-_gt-name'] || "branch";
-        branch = variables[name_1] || branch || sourceElement.props['data-_gt-branch-name'];
-        var sourceBranch = (generaltranslation.branches || {})[branch] || children;
-        var targetBranch = (targetElement.props["data-_gt"].branches || {})[branch] || targetElement.props.children;
-        return renderTranslatedChildren({
-            source: sourceBranch,
-            target: targetBranch,
-            variables: variables,
-            variablesOptions: variablesOptions,
-            locales: locales
-        });
-    }
-    if ((props === null || props === void 0 ? void 0 : props.children) && ((_b = targetElement.props) === null || _b === void 0 ? void 0 : _b.children)) {
-        return react_1.default.cloneElement(sourceElement, __assign(__assign({}, props), { 'data-_gt': undefined, children: renderTranslatedChildren({
-                source: props.children,
-                target: targetElement.props.children,
-                variables: variables,
-                variablesOptions: variablesOptions,
-                locales: locales
-            }) }));
-    }
-    return sourceElement;
-}
-function renderTranslatedChildren(_a) {
-    var source = _a.source, target = _a.target, _b = _a.variables, variables = _b === void 0 ? {} : _b, _c = _a.variablesOptions, variablesOptions = _c === void 0 ? {} : _c, _d = _a.locales, locales = _d === void 0 ? [internal_1.primitives.libraryDefaultLocale] : _d;
-    // Most straightforward case, return a valid React node
-    if ((target === null || typeof target === 'undefined') && source)
-        return source;
-    if (typeof target === 'string')
-        return target;
-    if (Array.isArray(source) && Array.isArray(target)) {
-        var sourceElements_1 = source.filter(function (sourceChild) {
-            if (react_1.default.isValidElement(sourceChild)) {
-                var generaltranslation = (0, getGTProp_1.default)(sourceChild);
-                if ((generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation.transformation) === "variable") {
-                    var _a = (0, internal_1.getVariableProps)(sourceChild.props), variableName = _a.variableName, variableValue = _a.variableValue, variableOptions = _a.variableOptions;
-                    if (typeof variables[variableName] === 'undefined') {
-                        variables[variableName] = variableValue;
-                    }
-                    variablesOptions[variableName] = __assign(__assign({}, variablesOptions[variableName]), variableOptions);
-                }
-                else {
-                    return true;
-                }
-            }
+        return false;
+      });
+    };
+
+    // Iterate through the target array & recursively render the translated children
+    return target.map((targetChild, index) => {
+      if (typeof targetChild === 'string')
+        return (
+          <React.Fragment key={`string_${index}`}>{targetChild}</React.Fragment>
+        );
+      if (isVariableObject(targetChild)) {
+        return (
+          <React.Fragment key={`var_${index}`}>
+            {renderVariable({
+              variableType: targetChild.variable || 'variable',
+              variableName: targetChild.key,
+              variableValue: variables[targetChild.key],
+              variableOptions: variablesOptions[targetChild.key],
+            })}
+          </React.Fragment>
+        );
+      }
+      const matchingSourceElement = findMatchingSourceElement(targetChild);
+      if (matchingSourceElement)
+        return (
+          <React.Fragment key={`element_${index}`}>
+            {renderTranslatedElement({
+              sourceElement: matchingSourceElement,
+              targetElement: targetChild,
+              variables,
+              variablesOptions,
+              locales,
+            })}
+          </React.Fragment>
+        );
+    });
+  }
+
+  if (target && typeof target === 'object' && !Array.isArray(target)) {
+    const targetType: 'variable' | 'element' = isVariableObject(target)
+      ? 'variable'
+      : 'element';
+
+    if (React.isValidElement(source)) {
+      if (targetType === 'element') {
+        return renderTranslatedElement({
+          sourceElement: source,
+          targetElement: target as TranslatedElement,
+          variables,
+          variablesOptions,
+          locales,
         });
-        var findMatchingSourceElement_1 = function (targetElement) {
-            return sourceElements_1.find(function (sourceChild) {
-                var _a, _b;
-                var generaltranslation = (0, getGTProp_1.default)(sourceChild);
-                if (typeof (generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation.id) !== 'undefined') {
-                    var sourceID = generaltranslation.id;
-                    var targetID = (_b = (_a = targetElement === null || targetElement === void 0 ? void 0 : targetElement.props) === null || _a === void 0 ? void 0 : _a['data-_gt']) === null || _b === void 0 ? void 0 : _b.id;
-                    return sourceID === targetID;
-                }
-                return false;
-            });
+      }
+
+      const generaltranslation = getGTProp(source);
+      if (generaltranslation?.transformation === 'variable') {
+        let { variableName, variableValue, variableOptions } = getVariableProps(
+          source.props
+        );
+
+        if (typeof variables[variableName] === 'undefined') {
+          variables[variableName] = variableValue;
+        }
+        variablesOptions[variableName] = {
+          ...variablesOptions[variableName],
+          ...variableOptions,
         };
-        return target.map(function (targetChild, index) {
-            if (typeof targetChild === 'string')
-                return (0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: targetChild }, "string_".concat(index));
-            if ((0, internal_1.isVariableObject)(targetChild)) {
-                return ((0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: (0, renderVariable_1.default)({
-                        variableType: targetChild.variable || "variable",
-                        variableName: targetChild.key,
-                        variableValue: variables[targetChild.key],
-                        variableOptions: variablesOptions[targetChild.key]
-                    }) }, "var_".concat(index)));
-            }
-            var matchingSourceElement = findMatchingSourceElement_1(targetChild);
-            if (matchingSourceElement)
-                return (0, jsx_runtime_1.jsx)(react_1.default.Fragment, { children: renderTranslatedElement({
-                        sourceElement: matchingSourceElement,
-                        targetElement: targetChild,
-                        variables: variables,
-                        variablesOptions: variablesOptions,
-                        locales: locales
-                    }) }, "element_".concat(index));
-        });
+      }
     }
-    if (target && typeof target === 'object' && !Array.isArray(target)) {
-        var targetType = (0, internal_1.isVariableObject)(target) ? "variable" : "element";
-        if (react_1.default.isValidElement(source)) {
-            if (targetType === "element") {
-                return renderTranslatedElement({
-                    sourceElement: source, targetElement: target,
-                    variables: variables,
-                    variablesOptions: variablesOptions,
-                    locales: locales
-                });
-            }
-            var generaltranslation = (0, getGTProp_1.default)(source);
-            if ((generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation.transformation) === "variable") {
-                var _e = (0, internal_1.getVariableProps)(source.props), variableName = _e.variableName, variableValue = _e.variableValue, variableOptions = _e.variableOptions;
-                if (typeof variables[variableName] === 'undefined') {
-                    variables[variableName] = variableValue;
-                }
-                variablesOptions[variableName] = __assign(__assign({}, variablesOptions[variableName]), variableOptions);
-            }
-        }
-        if (targetType === "variable") {
-            var targetVariable = target;
-            return (0, renderVariable_1.default)({
-                variableType: targetVariable.variable || "variable",
-                variableName: targetVariable.key,
-                variableValue: variables[targetVariable.key],
-                variableOptions: variablesOptions[targetVariable.key]
-            });
-        }
+
+    if (targetType === 'variable') {
+      const targetVariable = target as VariableObject;
+      return renderVariable({
+        variableType: targetVariable.variable || 'variable',
+        variableName: targetVariable.key,
+        variableValue: variables[targetVariable.key],
+        variableOptions: variablesOptions[targetVariable.key],
+      });
     }
-    return source;
+  }
+
+  return source;
 }
+*/ 
 //# sourceMappingURL=renderTranslatedChildren.js.map

package/dist/server/rendering/renderTranslatedChildren.js.map

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

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

@@ -1,5 +1,5 @@
 /**
- * Translates the provided content string based on the specified language and options.
+ * Translates the provided content string based on the specified locale and options.
  * If no translation is required, it renders the content as is. Otherwise, it fetches the
  * required translations or falls back to on-demand translation if enabled.
  *
@@ -11,10 +11,10 @@
  * @param {string} content - The content string that needs to be translated.
  * @param {Object} [options] - Translation options.
  * @param {string} [options.id] - A unique identifier for the content, used for caching and fetching translations.
- * @param {string} [options.language] - The target language for translation. Defaults to the current locale if not provided.
+ * @param {string} [options.locale] - The target locale for translation. Defaults to the current locale if not provided.
  * @param {string} [options.context] - Additional context for the translation process, which may influence the translation's outcome.
- * @param {Object} [variables] - An optional map of variables to be injected into the translated content.
- * @param {Object} [variableOptions] - Options for formatting numbers and dates using `Intl.NumberFormat` or `Intl.DateTimeFormat`.
+ * @param {Object} [options.variables] - An optional map of variables to be injected into the translated content.
+ * @param {Object} [options.variableOptions] - Options for formatting numbers and dates using `Intl.NumberFormat` or `Intl.DateTimeFormat`.
  *
  * @returns {Promise<string>} - A promise that resolves to the translated content string, or the original content if no translation is needed.
  *
@@ -26,16 +26,18 @@
  *
  * @example
  * // Providing specific translation options
- * const translation = await tx("Hello, world!", { language: 'es', context: 'Translate informally' });
+ * const translation = await tx("Hello, world!", { locale: 'es', context: 'Translate informally' });
  *
  * @example
  * // Using variables in the content string
- * const translation = await tx("The price is {price}", { language: 'es' }, { price: 29.99 });
+ * const translation = await tx("The price is {price}", { locale: 'es-MX', variables: { price: 29.99 } });
  */
 export default function tx(content: string, options?: {
     id?: string;
-    language?: string;
+    locale?: string;
     context?: string;
+    variables?: Record<string, any>;
+    variableOptions?: Record<string, Intl.NumberFormatOptions | Intl.DateTimeFormatOptions>;
     [key: string]: any;
-}, variables?: Record<string, any>, variableOptions?: Record<string, Intl.NumberFormatOptions | Intl.DateTimeFormatOptions>): Promise<string>;
+}): Promise<string>;
 //# sourceMappingURL=tx.d.ts.map

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":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAA8B,EAAE,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACL,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAChB,EACN,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC/B,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GACxF,OAAO,CAAC,MAAM,CAAC,CAwCjB"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../../src/server/strings/tx.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,CAAA;IACD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACf,GACL,OAAO,CAAC,MAAM,CAAC,CAqEjB"}

package/dist/server/strings/tx.js

@@ -64,11 +64,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = tx;
 var generaltranslation_1 = require("generaltranslation");
 var getI18NConfig_1 = __importDefault(require("../../utils/getI18NConfig"));
-var internal_1 = require("gt-react/internal");
 var getLocale_1 = __importDefault(require("../../request/getLocale"));
 var getMetadata_1 = __importDefault(require("../../request/getMetadata"));
 /**
- * Translates the provided content string based on the specified language and options.
+ * Translates the provided content string based on the specified locale and options.
  * If no translation is required, it renders the content as is. Otherwise, it fetches the
  * required translations or falls back to on-demand translation if enabled.
  *
@@ -80,10 +79,10 @@ var getMetadata_1 = __importDefault(require("../../request/getMetadata"));
  * @param {string} content - The content string that needs to be translated.
  * @param {Object} [options] - Translation options.
  * @param {string} [options.id] - A unique identifier for the content, used for caching and fetching translations.
- * @param {string} [options.language] - The target language for translation. Defaults to the current locale if not provided.
+ * @param {string} [options.locale] - The target locale for translation. Defaults to the current locale if not provided.
  * @param {string} [options.context] - Additional context for the translation process, which may influence the translation's outcome.
- * @param {Object} [variables] - An optional map of variables to be injected into the translated content.
- * @param {Object} [variableOptions] - Options for formatting numbers and dates using `Intl.NumberFormat` or `Intl.DateTimeFormat`.
+ * @param {Object} [options.variables] - An optional map of variables to be injected into the translated content.
+ * @param {Object} [options.variableOptions] - Options for formatting numbers and dates using `Intl.NumberFormat` or `Intl.DateTimeFormat`.
  *
  * @returns {Promise<string>} - A promise that resolves to the translated content string, or the original content if no translation is needed.
  *
@@ -95,67 +94,72 @@ var getMetadata_1 = __importDefault(require("../../request/getMetadata"));
  *
  * @example
  * // Providing specific translation options
- * const translation = await tx("Hello, world!", { language: 'es', context: 'Translate informally' });
+ * const translation = await tx("Hello, world!", { locale: 'es', context: 'Translate informally' });
  *
  * @example
  * // Using variables in the content string
- * const translation = await tx("The price is {price}", { language: 'es' }, { price: 29.99 });
+ * const translation = await tx("The price is {price}", { locale: 'es-MX', variables: { price: 29.99 } });
  */
 function tx(content_1) {
-    return __awaiter(this, arguments, void 0, function (content, options, variables, variableOptions) {
-        var I18NConfig, contentAsArray, _a, _b, key, translations, language, others, translationPromise, _c, _d, _e, renderSettings, translation;
-        var _f;
+    return __awaiter(this, arguments, void 0, function (content, options) {
+        var I18NConfig, contentAsArray, _a, _b, _c, _, key, translations, locale, others, translationPromise, _d, _e, _f, renderSettings, translation;
+        var _g;
         if (options === void 0) { options = {}; }
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     if (!content)
                         return [2 /*return*/, ''];
                     I18NConfig = (0, getI18NConfig_1.default)();
                     contentAsArray = (0, generaltranslation_1.splitStringToContent)(content);
                     _a = options;
-                    _b = options.language;
+                    _b = options.locale;
                     if (_b) return [3 /*break*/, 2];
                     return [4 /*yield*/, (0, getLocale_1.default)()];
                 case 1:
-                    _b = (_g.sent());
-                    _g.label = 2;
+                    _b = (_h.sent());
+                    _h.label = 2;
                 case 2:
-                    _a.language = _b;
-                    if (!I18NConfig.requiresTranslation(options.language))
-                        return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(contentAsArray, [options.language, I18NConfig.getDefaultLocale()], variables, variableOptions)];
+                    _a.locale = _b;
+                    if (!I18NConfig.requiresTranslation(options.locale))
+                        return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(contentAsArray, [options.locale, I18NConfig.getDefaultLocale()], options.variables, options.variablesOptions)];
+                    _c = I18NConfig.serializeAndHash(content, options.context, undefined // id is not provided here, to catch erroneous situations where the same id is being used for different <T> components
+                    ), _ = _c[0], key = _c[1];
                     if (!options.id) return [3 /*break*/, 4];
-                    key = (0, internal_1.hashReactChildrenObjects)(options.context ? [content, options.context] : content);
-                    return [4 /*yield*/, I18NConfig.getTranslations(options.language)];
+                    return [4 /*yield*/, I18NConfig.getTranslations(options.locale)];
                 case 3:
-                    translations = _g.sent();
+                    translations = _h.sent();
                     if ((translations === null || translations === void 0 ? void 0 : translations[options.id]) && translations[options.id].k === key)
-                        return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(translations[options.id].t, [options.language, I18NConfig.getDefaultLocale()], variables, variableOptions)];
-                    _g.label = 4;
+                        return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(translations[options.id].t, [options.locale, I18NConfig.getDefaultLocale()], options.variables, options.variablesOptions)];
+                    _h.label = 4;
                 case 4:
-                    language = options.language, others = __rest(options, ["language"]);
-                    _d = (_c = I18NConfig).translate;
-                    _f = { content: content, targetLanguage: options.language };
-                    _e = [__assign({}, others)];
+                    locale = options.locale, others = __rest(options, ["locale"]);
+                    _e = (_d = I18NConfig).translate;
+                    _g = {
+                        content: content,
+                        targetLocale: locale
+                    };
+                    _f = [__assign({}, others)];
                     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([(_g.sent())])), { hash: key }]), _f)]);
+                    translationPromise = _e.apply(_d, [(_g.options = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), { hash: key }]),
+                            _g)]);
                     renderSettings = I18NConfig.getRenderSettings();
-                    if (!(renderSettings.method !== "subtle" ||
+                    if (!(renderSettings.method !== 'subtle' ||
                         !options.id) // because it is only saved if an id is present
                     ) return [3 /*break*/, 7]; // because it is only saved if an id is present
                     return [4 /*yield*/, translationPromise];
                 case 6:
-                    translation = _g.sent();
+                    translation = _h.sent();
                     try {
-                        return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(translation, [options.targetLanguage, I18NConfig.getDefaultLocale()], variables, variableOptions)];
+                        return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(translation, [options.targetLocale, I18NConfig.getDefaultLocale()], options.variables, options.variableOptions)];
                     }
                     catch (error) {
                         console.error("gt-next string translation error. tx(\"".concat(content, "\")").concat(options.id ? " with id \"".concat(options.id, "\"") : '', " failed."), error);
                         return [2 /*return*/, ''];
                     }
-                    _g.label = 7;
-                case 7: return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(contentAsArray, [options.targetLanguage, I18NConfig.getDefaultLocale()], variables, variableOptions)];
+                    _h.label = 7;
+                case 7: return [2 /*return*/, (0, generaltranslation_1.renderContentToString)(contentAsArray, [options.targetLocale, I18NConfig.getDefaultLocale()], options.variables, options.variableOptions)];
             }
         });
     });

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

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

package/dist/variables/Currency.js

@@ -100,7 +100,7 @@ function Currency(_a) {
                     renderedValue = (typeof children !== 'undefined' && typeof value === 'undefined') ? children : value;
                     renderedValue = (typeof renderedValue === 'string') ? parseFloat(renderedValue) : renderedValue;
                     formattedValue = (typeof renderedValue === 'number')
-                        ? (0, generaltranslation_1.formatCurrency)({ value: renderedValue, currency: currency, languages: locales, options: options })
+                        ? (0, generaltranslation_1.formatCurrency)({ value: renderedValue, currency: currency, locales: locales, options: options })
                         : renderedValue;
                     return [2 /*return*/, ((0, jsx_runtime_1.jsx)("span", { "data-_gt": generaltranslation, "data-_gt-variable-name": name, "data-_gt-variable-type": "currency", "data-_gt-variable-options": JSON.stringify(__assign({ style: 'currency', currency: currency }, options)), "data-_gt-unformatted-value": (typeof renderedValue === 'number' && !isNaN(renderedValue)) ? renderedValue : undefined, style: { display: 'contents' }, children: typeof formattedValue === 'string' ? formattedValue : undefined }))];
             }

package/dist/variables/Currency.js.map

@@ -1 +1 @@
-{"version":3,"file":"Currency.js","sourceRoot":"","sources":["../../src/variables/Currency.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAoD;AACpD,yEAAmD;AACnD,mEAA6C;AAE7C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAe,QAAQ,CAAC,EASvB;;;QARG,IAAA,QAAQ,cAAA,EAAE,YAAa,EAAb,IAAI,mBAAG,MAAM,KAAA,EAAE,KAAK,WAAA,EAAE,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAAE,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EAAK,KAAK,cADpD,oDAEvB,CAD2E;;;;oBAUlE,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBAClB,qBAAM,IAAA,mBAAS,GAAE,EAAA;;oBAA5B,OAAO,IAAI,SAAiB,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAE;oBAE/C,kBAAkB,GAAK,KAAK,YAAV,CAAW;oBAG7C,aAAa,GAAG,CAAC,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;oBACzG,aAAa,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;oBAG1F,cAAc,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC;wBACtD,CAAC,CAAC,IAAA,mCAAc,EAAC,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,UAAA,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,SAAA,EAAE,CAAC;wBACjF,CAAC,CAAC,aAAa,CAAC;oBAEpB,sBAAO,CACH,6CACc,kBAAkB,4BACJ,IAAI,4BACJ,UAAU,+BACP,IAAI,CAAC,SAAS,YAAG,KAAK,EAAE,UAAU,EAAE,QAAQ,UAAA,IAAK,OAAO,EAAG,gCAC1D,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,EACpH,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,YAE7B,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,GAC7D,CACV,EAAC;;;;CACL;AAAA,CAAC;AAEF,QAAQ,CAAC,gBAAgB,GAAG,mBAAmB,CAAC;AAEhD,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"Currency.js","sourceRoot":"","sources":["../../src/variables/Currency.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAoD;AACpD,yEAAmD;AACnD,mEAA6C;AAE7C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAe,QAAQ,CAAC,EASvB;;;QARG,IAAA,QAAQ,cAAA,EAAE,YAAa,EAAb,IAAI,mBAAG,MAAM,KAAA,EAAE,KAAK,WAAA,EAAE,gBAAgB,EAAhB,QAAQ,mBAAG,KAAK,KAAA,EAAE,eAAY,EAAZ,OAAO,mBAAG,EAAE,KAAA,EAAK,KAAK,cADpD,oDAEvB,CAD2E;;;;oBAUlE,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBAClB,qBAAM,IAAA,mBAAS,GAAE,EAAA;;oBAA5B,OAAO,IAAI,SAAiB,EAAE,UAAU,CAAC,gBAAgB,EAAE,CAAE;oBAE/C,kBAAkB,GAAK,KAAK,YAAV,CAAW;oBAG7C,aAAa,GAAG,CAAC,OAAO,QAAQ,KAAK,WAAW,IAAI,OAAO,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;oBACzG,aAAa,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;oBAG1F,cAAc,GAAG,CAAC,OAAO,aAAa,KAAK,QAAQ,CAAC;wBACtD,CAAC,CAAC,IAAA,mCAAc,EAAC,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,UAAA,EAAE,OAAO,SAAA,EAAE,OAAO,SAAA,EAAE,CAAC;wBACtE,CAAC,CAAC,aAAa,CAAC;oBAEpB,sBAAO,CACH,6CACc,kBAAkB,4BACJ,IAAI,4BACJ,UAAU,+BACP,IAAI,CAAC,SAAS,YAAG,KAAK,EAAE,UAAU,EAAE,QAAQ,UAAA,IAAK,OAAO,EAAG,gCAC1D,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,EACpH,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,YAE7B,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,GAC7D,CACV,EAAC;;;;CACL;AAAA,CAAC;AAEF,QAAQ,CAAC,gBAAgB,GAAG,mBAAmB,CAAC;AAEhD,kBAAe,QAAQ,CAAC"}