gt-next 1.3.15 → 2.0.2

package/dist/server/inline/T.js

@@ -52,16 +52,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = T;
 var jsx_runtime_1 = require("react/jsx-runtime");
-var internal_1 = require("gt-react/internal");
 var getI18NConfig_1 = __importDefault(require("../../utils/getI18NConfig"));
 var getLocale_1 = __importDefault(require("../../request/getLocale"));
 var getMetadata_1 = __importDefault(require("../../request/getMetadata"));
 var react_1 = require("react");
-var renderTranslatedChildren_1 = __importDefault(require("../rendering/renderTranslatedChildren"));
-var renderDefaultChildren_1 = __importDefault(require("../rendering/renderDefaultChildren"));
 var Resolver_1 = __importDefault(require("./Resolver"));
+var internal_1 = require("gt-react/internal");
+var renderVariable_1 = __importDefault(require("../rendering/renderVariable"));
 /**
- * Translation component that renders its children translated into the user's language.
+ * Translation component that renders its children translated into the user's given locale.
  *
  * @example
  * ```jsx
@@ -75,7 +74,7 @@ var Resolver_1 = __importDefault(require("./Resolver"));
  * ```jsx
  * // Translating a plural
  * <T id="item_count">
- *  <Plural n={3} singular={<>You have <Num value={n}/> item.}>
+ *  <Plural n={3} singular={<>You have <Num value={n}/> item.</>}>
  *      You have <Num value={n}/> items.
  *  </Plural>
  * </T>
@@ -105,11 +104,11 @@ var Resolver_1 = __importDefault(require("./Resolver"));
  */
 function T(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
-        var I18NConfig, locale, defaultLocale, translationRequired, translationsPromise, taggedChildren, childrenAsObjects, key, translations, translation, target, translationPromise, _c, _d, _e, promise, loadingFallback, errorFallback, error_1;
-        var _f;
+        var I18NConfig, locale, defaultLocale, translationRequired, translationsPromise, taggedChildren, _c, childrenAsObjects, key, translations, translation, target, translationPromise, _d, _e, _f, promise, loadingFallback, errorFallback, error_1;
+        var _g;
         var children = _b.children, id = _b.id, context = _b.context, renderSettings = _b.renderSettings, variables = _b.variables, variablesOptions = _b.variablesOptions;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     if (!children) {
                         return [2 /*return*/];
@@ -117,87 +116,97 @@ function T(_a) {
                     I18NConfig = (0, getI18NConfig_1.default)();
                     return [4 /*yield*/, (0, getLocale_1.default)()];
                 case 1:
-                    locale = _g.sent();
+                    locale = _h.sent();
                     defaultLocale = I18NConfig.getDefaultLocale();
                     translationRequired = I18NConfig.requiresTranslation(locale);
                     if (translationRequired) {
                         translationsPromise = I18NConfig.getTranslations(locale);
                     }
-                    taggedChildren = (0, internal_1.addGTIdentifier)(children);
-                    childrenAsObjects = (0, internal_1.writeChildrenAsObjects)(taggedChildren);
+                    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, renderDefaultChildren_1.default)({
+                        return [2 /*return*/, (0, internal_1.renderDefaultChildren)({
                                 children: taggedChildren,
                                 variables: variables,
                                 variablesOptions: variablesOptions,
-                                defaultLocale: defaultLocale
+                                defaultLocale: defaultLocale,
+                                renderVariable: renderVariable_1.default
                             })];
                     }
-                    key = (0, internal_1.hashReactChildrenObjects)(context ? [childrenAsObjects, context] : childrenAsObjects);
+                    _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 = _g.sent();
-                    translation = translations === null || translations === void 0 ? void 0 : translations[id || key];
+                    translations = _h.sent();
+                    translation = id ? translations === null || translations === void 0 ? void 0 : translations[id] : undefined;
+                    // checks if an appropriate translation exists
                     if ((translation === null || translation === void 0 ? void 0 : translation.k) === key) {
                         target = translation.t;
-                        return [2 /*return*/, (0, renderTranslatedChildren_1.default)({
+                        return [2 /*return*/, (0, internal_1.renderTranslatedChildren)({
                                 source: taggedChildren,
                                 target: target,
                                 variables: variables,
                                 variablesOptions: variablesOptions,
-                                locales: [locale, defaultLocale]
+                                locales: [locale, defaultLocale],
+                                renderVariable: renderVariable_1.default
                             })];
                     }
                     renderSettings || (renderSettings = I18NConfig.getRenderSettings());
-                    _d = (_c = I18NConfig).translateChildren;
-                    _f = {
+                    _e = (_d = I18NConfig).translateChildren;
+                    _g = {
                         children: childrenAsObjects,
-                        targetLanguage: locale
+                        targetLocale: locale
                     };
-                    _e = [__assign(__assign({}, (id && { id: id })), { hash: key })];
+                    _f = [__assign(__assign({}, (id && { id: id })), { hash: key })];
                     return [4 /*yield*/, (0, getMetadata_1.default)()];
                 case 3:
-                    translationPromise = _d.apply(_c, [(_f.metadata = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_g.sent())])), (renderSettings.timeout && { timeout: renderSettings.timeout })]),
-                            _f)]);
+                    translationPromise = _e.apply(_d, [(_g.metadata = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), (renderSettings.timeout && { timeout: renderSettings.timeout })]),
+                            _g)]);
                     promise = translationPromise.then(function (translation) {
                         var target = translation;
-                        return (0, renderTranslatedChildren_1.default)({
+                        return (0, internal_1.renderTranslatedChildren)({
                             source: taggedChildren,
                             target: target,
                             variables: variables,
                             variablesOptions: variablesOptions,
-                            locales: [locale, defaultLocale]
+                            locales: [locale, defaultLocale],
+                            renderVariable: renderVariable_1.default
                         });
                     });
-                    errorFallback = (0, renderDefaultChildren_1.default)({
+                    errorFallback = (0, internal_1.renderDefaultChildren)({
                         children: taggedChildren,
                         variables: variables,
                         variablesOptions: variablesOptions,
-                        defaultLocale: defaultLocale
+                        defaultLocale: defaultLocale,
+                        renderVariable: renderVariable_1.default
                     });
-                    if (renderSettings.method === "replace") {
+                    if (renderSettings.method === 'replace') {
                         loadingFallback = errorFallback;
                     }
-                    else if (renderSettings.method === "skeleton") {
-                        loadingFallback = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
+                    else if (renderSettings.method === 'skeleton') {
+                        loadingFallback = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {}); // blank
                     }
-                    if (!(renderSettings.method === "hang")) return [3 /*break*/, 7];
-                    _g.label = 4;
+                    if (!(renderSettings.method === 'hang')) return [3 /*break*/, 7];
+                    _h.label = 4;
                 case 4:
-                    _g.trys.push([4, 6, , 7]);
+                    _h.trys.push([4, 6, , 7]);
                     return [4 /*yield*/, promise];
-                case 5: return [2 /*return*/, _g.sent()];
+                case 5: return [2 /*return*/, _h.sent()];
                 case 6:
-                    error_1 = _g.sent();
+                    error_1 = _h.sent();
                     console.error(error_1);
                     return [2 /*return*/, errorFallback];
                 case 7:
-                    if (!["skeleton", "replace"].includes(renderSettings.method) && !id) {
-                        // If none of those, i.e. "subtle" 
+                    if (!['skeleton', 'replace'].includes(renderSettings.method) && !id) {
+                        // If none of those, i.e. "subtle"
                         // return the children, with no special rendering
                         // a translation may be available from a cached translation dictionary next time the component is loaded
                         return [2 /*return*/, errorFallback];
                     }
+                    // For skeleton & replace, return a suspense component so that
+                    // something is shown while waiting for the translation
                     return [2 /*return*/, ((0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: loadingFallback, children: (0, jsx_runtime_1.jsx)(Resolver_1.default, { children: promise, fallback: errorFallback }) }))];
             }
         });

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/rendering/renderDefaultChildren.d.ts

@@ -1,8 +1 @@
-import React, { ReactElement } from "react";
-export default function renderDefaultChildren({ children, variables, variablesOptions, defaultLocale }: {
-    children: ReactElement;
-    variables?: Record<string, any>;
-    variablesOptions?: Record<string, any>;
-    defaultLocale: string;
-}): React.ReactNode;
 //# sourceMappingURL=renderDefaultChildren.d.ts.map

package/dist/server/rendering/renderDefaultChildren.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderDefaultChildren.d.ts","sourceRoot":"","sources":["../../../src/server/rendering/renderDefaultChildren.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,YAAY,EAAa,MAAM,OAAO,CAAA;AAKtD,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,EAC1C,QAAQ,EACR,SAAc,EACd,gBAAqB,EACrB,aAA+C,EAClD,EAAE;IACC,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC/B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,aAAa,EAAE,MAAM,CAAA;CACxB,mBAsDA"}
+{"version":3,"file":"renderDefaultChildren.d.ts","sourceRoot":"","sources":["../../../src/server/rendering/renderDefaultChildren.tsx"],"names":[],"mappings":""}

package/dist/server/rendering/renderDefaultChildren.js

@@ -1,75 +1,91 @@
 "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 __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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = renderDefaultChildren;
-var react_1 = __importDefault(require("react"));
-var renderVariable_1 = __importDefault(require("./renderVariable"));
-var internal_1 = require("gt-react/internal");
-var internal_2 = require("gt-react/internal");
-function renderDefaultChildren(_a) {
-    var children = _a.children, _b = _a.variables, variables = _b === void 0 ? {} : _b, _c = _a.variablesOptions, variablesOptions = _c === void 0 ? {} : _c, _d = _a.defaultLocale, defaultLocale = _d === void 0 ? internal_2.primitives.libraryDefaultLocale : _d;
-    var handleSingleChild = function (child) {
-        if (react_1.default.isValidElement(child)) {
-            var _a = child.props, generaltranslation = _a["data-_gt"], props = __rest(_a, ['data-_gt']);
-            if ((generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation.transformation) === "variable") {
-                var _b = (0, internal_1.getVariableProps)(child.props), variableName = _b.variableName, variableType = _b.variableType, variableValue = _b.variableValue, variableOptions = _b.variableOptions; // needs both regular props and data-_gt
-                variableValue = (typeof variables[variableName] !== 'undefined') ?
-                    variables[variableName] : variableValue;
-                return (0, renderVariable_1.default)({
-                    variableName: variableName,
-                    variableType: variableType,
-                    variableValue: variableValue,
-                    variableOptions: __assign(__assign({}, variablesOptions[variableName]), variableOptions)
-                });
-            }
-            if ((generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation.transformation) === "plural") {
-                var n = typeof variables.n === 'number' ? variables.n :
-                    typeof props.n === 'number' ? props.n :
-                        props['data-_gt-n'];
-                var branches = generaltranslation.branches || {};
-                return handleChildren((0, internal_1.getPluralBranch)(n, [defaultLocale], branches) || child.props.children);
-            }
-            if ((generaltranslation === null || generaltranslation === void 0 ? void 0 : generaltranslation.transformation) === "branch") {
-                var children_1 = props.children, name_1 = props.name, branch = props.branch, _gt = props["data-_gt"], branches = __rest(props, ["children", "name", "branch", 'data-_gt']);
-                name_1 = name_1 || props['data-_gt-name'] || "branch";
-                branch = variables[name_1] || branch || child.props['data-_gt-branch-name'];
-                branches = generaltranslation.branches || {};
-                return handleChildren(branches[branch] !== undefined ? branches[branch] : children_1);
-            }
-            if (child.props.children) {
-                return react_1.default.cloneElement(child, __assign(__assign({}, props), { 'data-_gt': undefined, children: handleChildren(child.props.children) }));
-            }
-            return react_1.default.cloneElement(child, __assign(__assign({}, props), { 'data-_gt': undefined }));
-        }
-        return child;
-    };
-    var handleChildren = function (children) {
-        return Array.isArray(children) ? react_1.default.Children.map(children, handleSingleChild) : handleSingleChild(children);
-    };
-    return handleChildren(children);
+/*import React, { ReactElement, ReactNode } from 'react';
+import renderVariable from './renderVariable';
+import { getFallbackVariableName, getPluralBranch, getVariableProps } from 'gt-react/internal';
+import { libraryDefaultLocale } from 'generaltranslation/internal';
+
+// Renders the children in the default locale, as they are supplied
+// with variables substituted (for use by the dictionary)
+export default function renderDefaultChildren({
+  children,
+  variables = {},
+  variablesOptions = {},
+  defaultLocale = libraryDefaultLocale,
+}: {
+  children: ReactElement;
+  variables?: Record<string, any>;
+  variablesOptions?: Record<string, any>;
+  defaultLocale: string;
+}) {
+  const handleSingleChild = (child: ReactNode) => {
+    if (React.isValidElement(child)) {
+      const { 'data-_gt': generaltranslation, ...props } = child.props;
+      if (generaltranslation?.transformation === 'variable') {
+        let {
+          variableName,
+          variableType,
+          variableValue,
+          variableOptions
+        } = getVariableProps(child.props);
+        variableValue = (() => {
+          if (typeof variables[variableName] !== 'undefined') {
+              return variables[variableName]
+          }
+          const fallbackVariableName = getFallbackVariableName(variableType);
+          if (typeof variables[fallbackVariableName] !== 'undefined') {
+              return variables[fallbackVariableName];
+          }
+          return undefined;
+        })();
+        variableOptions = {
+          ...variablesOptions[variableName],
+          ...variableOptions
+        } as Intl.NumberFormatOptions | Intl.DateTimeFormatOptions;
+        return renderVariable({
+          variableName, variableType, variableValue, variableOptions
+        })
+      }
+      if (generaltranslation?.transformation === 'plural') {
+        const n =
+          typeof variables.n === 'number'
+            ? variables.n
+            : typeof props.n === 'number'
+            ? props.n
+            : props['data-_gt-n'];
+        const branches = generaltranslation.branches || {};
+        return handleChildren(
+          getPluralBranch(n, [defaultLocale], branches) || child.props.children
+        );
+      }
+      if (generaltranslation?.transformation === 'branch') {
+        let { children, name, branch, 'data-_gt': _gt, ...branches } = props;
+        name = name || props['data-_gt-name'] || 'branch';
+        branch =
+          variables[name] || branch || child.props['data-_gt-branch-name'];
+        branches = generaltranslation.branches || {};
+        return handleChildren(
+          branches[branch] !== undefined ? branches[branch] : children
+        );
+      }
+      if (child.props.children) {
+        return React.cloneElement(child, {
+          ...props,
+          'data-_gt': undefined,
+          children: handleChildren(child.props.children),
+        });
+      }
+      return React.cloneElement(child, { ...props, 'data-_gt': undefined });
+    }
+    return child;
+  };
+
+  const handleChildren = (children: ReactNode): ReactNode => {
+    return Array.isArray(children)
+      ? React.Children.map(children, handleSingleChild)
+      : handleSingleChild(children);
+  };
+
+  return handleChildren(children);
 }
+*/ 
 //# sourceMappingURL=renderDefaultChildren.js.map

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

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

package/dist/server/rendering/renderTranslatedChildren.d.ts

@@ -1,10 +1 @@
-import { ReactNode } from "react";
-import { TranslatedChildren } from "gt-react/dist/primitives/types";
-export default function renderTranslatedChildren({ source, target, variables, variablesOptions, locales }: {
-    source: ReactNode;
-    target: TranslatedChildren;
-    variables?: Record<string, any>;
-    variablesOptions?: Record<string, any>;
-    locales: string[];
-}): ReactNode;
 //# sourceMappingURL=renderTranslatedChildren.d.ts.map

package/dist/server/rendering/renderTranslatedChildren.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderTranslatedChildren.d.ts","sourceRoot":"","sources":["../../../src/server/rendering/renderTranslatedChildren.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAgB,SAAS,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAqC,MAAM,gCAAgC,CAAC;AAqEvG,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAC7C,MAAM,EAAE,MAAM,EACd,SAAc,EAAE,gBAAqB,EACrC,OAA2C,EAC9C,EAAE;IACC,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,EAAE,CAAA;CACpB,GAAG,SAAS,CA2GZ"}
+{"version":3,"file":"renderTranslatedChildren.d.ts","sourceRoot":"","sources":["../../../src/server/rendering/renderTranslatedChildren.tsx"],"names":[],"mappings":""}