gt-next 4.2.5 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/I18NConfiguration.d.ts +4 -4
- package/dist/config/I18NConfiguration.d.ts.map +1 -1
- package/dist/config/I18NConfiguration.js +12 -4
- package/dist/config/I18NConfiguration.js.map +1 -1
- package/dist/config/props/InitGTProps.d.ts +1 -1
- package/dist/config/props/InitGTProps.d.ts.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +6 -1
- package/dist/config.js.map +1 -1
- package/dist/errors/createErrors.d.ts +1 -0
- package/dist/errors/createErrors.d.ts.map +1 -1
- package/dist/errors/createErrors.js +3 -1
- package/dist/errors/createErrors.js.map +1 -1
- package/dist/provider/ClientProvider.d.ts +1 -1
- package/dist/provider/ClientProvider.d.ts.map +1 -1
- package/dist/provider/ClientProvider.js +2 -10
- package/dist/provider/ClientProvider.js.map +1 -1
- package/dist/provider/GTProvider.d.ts.map +1 -1
- package/dist/provider/GTProvider.js +45 -107
- package/dist/provider/GTProvider.js.map +1 -1
- package/dist/server/getGT.d.ts.map +1 -1
- package/dist/server/getGT.js +20 -7
- package/dist/server/getGT.js.map +1 -1
- package/dist/server/inline/T.d.ts +1 -2
- package/dist/server/inline/T.d.ts.map +1 -1
- package/dist/server/inline/T.js +29 -22
- package/dist/server/inline/T.js.map +1 -1
- package/dist/server/strings/tx.d.ts.map +1 -1
- package/dist/server/strings/tx.js +10 -10
- package/dist/server/strings/tx.js.map +1 -1
- package/dist/utils/checkTypes.d.ts.map +1 -1
- package/dist/utils/checkTypes.js +1 -3
- package/dist/utils/checkTypes.js.map +1 -1
- package/package.json +2 -3
|
@@ -12,7 +12,7 @@ type I18NConfigurationParams = {
|
|
|
12
12
|
locales: string[];
|
|
13
13
|
renderSettings: {
|
|
14
14
|
method: RenderMethod;
|
|
15
|
-
timeout
|
|
15
|
+
timeout?: number;
|
|
16
16
|
};
|
|
17
17
|
maxConcurrentRequests: number;
|
|
18
18
|
maxBatchSize: number;
|
|
@@ -30,7 +30,7 @@ export default class I18NConfiguration {
|
|
|
30
30
|
locales: string[];
|
|
31
31
|
renderSettings: {
|
|
32
32
|
method: RenderMethod;
|
|
33
|
-
timeout
|
|
33
|
+
timeout?: number;
|
|
34
34
|
};
|
|
35
35
|
private _remoteTranslationsManager;
|
|
36
36
|
metadata: Record<string, any>;
|
|
@@ -68,12 +68,12 @@ export default class I18NConfiguration {
|
|
|
68
68
|
/**
|
|
69
69
|
* Get the rendering instructions
|
|
70
70
|
* @returns An object containing the current method and timeout.
|
|
71
|
-
* As of 1/
|
|
71
|
+
* As of 1/17/25: method is "skeleton", "replace", "subtle", "default".
|
|
72
72
|
* Timeout is a number or null, representing no assigned timeout.
|
|
73
73
|
*/
|
|
74
74
|
getRenderSettings(): {
|
|
75
75
|
method: RenderMethod;
|
|
76
|
-
timeout
|
|
76
|
+
timeout?: number;
|
|
77
77
|
};
|
|
78
78
|
/**
|
|
79
79
|
* Checks if regional translation is required (ie en-US -> en-GB)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18NConfiguration.d.ts","sourceRoot":"","sources":["../../src/config/I18NConfiguration.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,YAAY,EACZ,kBAAkB,
|
|
1
|
+
{"version":3,"file":"I18NConfiguration.d.ts","sourceRoot":"","sources":["../../src/config/I18NConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,14 +93,18 @@ var I18NConfiguration = /** @class */ (function () {
|
|
|
93
93
|
// Locales
|
|
94
94
|
this.defaultLocale = defaultLocale;
|
|
95
95
|
this.locales = locales;
|
|
96
|
-
// Render method
|
|
97
|
-
this.renderSettings = renderSettings;
|
|
98
96
|
// Default env is production
|
|
99
97
|
if (process.env.NODE_ENV !== 'development' &&
|
|
100
98
|
process.env.NODE_ENV !== 'test' &&
|
|
101
99
|
this.devApiKey) {
|
|
102
100
|
throw new Error(createErrors_1.devApiKeyIncludedInProductionError);
|
|
103
101
|
}
|
|
102
|
+
// Render method
|
|
103
|
+
this.renderSettings = renderSettings;
|
|
104
|
+
if (this.devApiKey && this.renderSettings.method === 'subtle') { // disable subtle if in dev
|
|
105
|
+
console.warn('Subtle render method cannot be used in dev environments, falling back to default.');
|
|
106
|
+
this.renderSettings.method = 'default';
|
|
107
|
+
}
|
|
104
108
|
// Other metadata
|
|
105
109
|
this.metadata = __assign(__assign(__assign({ sourceLocale: this.defaultLocale }, (this.renderSettings.timeout && {
|
|
106
110
|
timeout: this.renderSettings.timeout - batchInterval,
|
|
@@ -164,7 +168,7 @@ var I18NConfiguration = /** @class */ (function () {
|
|
|
164
168
|
/**
|
|
165
169
|
* Get the rendering instructions
|
|
166
170
|
* @returns An object containing the current method and timeout.
|
|
167
|
-
* As of 1/
|
|
171
|
+
* As of 1/17/25: method is "skeleton", "replace", "subtle", "default".
|
|
168
172
|
* Timeout is a number or null, representing no assigned timeout.
|
|
169
173
|
*/
|
|
170
174
|
I18NConfiguration.prototype.getRenderSettings = function () {
|
|
@@ -327,6 +331,7 @@ var I18NConfiguration = /** @class */ (function () {
|
|
|
327
331
|
case 5:
|
|
328
332
|
results_1 = _b.sent();
|
|
329
333
|
batch.forEach(function (item, index) {
|
|
334
|
+
var _a, _b, _c;
|
|
330
335
|
// check if entry is missing
|
|
331
336
|
var result = results_1[index];
|
|
332
337
|
if (!result)
|
|
@@ -334,7 +339,10 @@ var I18NConfiguration = /** @class */ (function () {
|
|
|
334
339
|
if (result && typeof result === 'object') {
|
|
335
340
|
if ('translation' in result) {
|
|
336
341
|
if (_this._remoteTranslationsManager) {
|
|
337
|
-
_this._remoteTranslationsManager.setTranslations(result.locale, result.reference.key, result.reference.id, result.translation);
|
|
342
|
+
_this._remoteTranslationsManager.setTranslations(result.locale, ((_a = item.metadata) === null || _a === void 0 ? void 0 : _a.hash) || result.reference.key, result.reference.id, result.translation);
|
|
343
|
+
}
|
|
344
|
+
if (((_b = item.metadata) === null || _b === void 0 ? void 0 : _b.hash) !== result.reference.key) {
|
|
345
|
+
console.warn("Mismatching ids or hashes! Expected hash: ".concat((_c = item.metadata) === null || _c === void 0 ? void 0 : _c.hash, ", but got id: ").concat(result.reference.id, " hash: ").concat(result.reference.key, ". We will still render your translation, but make sure to update to the newest version: www.generaltranslation.com/docs"));
|
|
338
346
|
}
|
|
339
347
|
return item.resolve(result.translation);
|
|
340
348
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18NConfiguration.js","sourceRoot":"","sources":["../../src/config/I18NConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAG4B;AAC5B,0FAEqC;AACrC,
|
|
1
|
+
{"version":3,"file":"I18NConfiguration.js","sourceRoot":"","sources":["../../src/config/I18NConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InitGTProps.d.ts","sourceRoot":"","sources":["../../../src/config/props/InitGTProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,KAAK,WAAW,GAAG;IAEf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC,cAAc,CAAC,EAAE;QACb,MAAM,EAAE,YAAY,CAAC;QACrB,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"InitGTProps.d.ts","sourceRoot":"","sources":["../../../src/config/props/InitGTProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,KAAK,WAAW,GAAG;IAEf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC,cAAc,CAAC,EAAE;QACb,MAAM,EAAE,YAAY,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAA;KACnB,CAAA;IAED,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAA;IAEhD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB,CAAA;AAED,eAAe,WAAW,CAAC"}
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,4BAA4B,CAAC;AAKrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,MAAM,CAAC,EACrB,MAA2B,EAC3B,IAAI,EACJ,UAAU,EACV,kBAA0D,EAC1D,WAA4C,EAC5C,MAAkC,EAClC,SAAS,EACT,SAAwC,EACxC,UAA0C,EAC1C,QAAsC,EACtC,eAAoD,EACpD,OAAoC,EACpC,aAAgD,EAChD,cAAc,EACd,qBAAgE,EAChE,YAA8C,EAC9C,aAAgD,EAChD,GAAG,QAAQ,EACZ,GAAE,WAAgC,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,4BAA4B,CAAC;AAKrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,MAAM,CAAC,EACrB,MAA2B,EAC3B,IAAI,EACJ,UAAU,EACV,kBAA0D,EAC1D,WAA4C,EAC5C,MAAkC,EAClC,SAAS,EACT,SAAwC,EACxC,UAA0C,EAC1C,QAAsC,EACtC,eAAoD,EACpD,OAAoC,EACpC,aAAgD,EAChD,cAAc,EACd,qBAAgE,EAChE,YAA8C,EAC9C,aAAgD,EAChD,GAAG,QAAQ,EACZ,GAAE,WAAgC,iBA6Hb,GAAG,KAAQ,GAAG,CA+BnC"}
|
package/dist/config.js
CHANGED
|
@@ -100,8 +100,13 @@ function initGT(_a) {
|
|
|
100
100
|
catch (error) {
|
|
101
101
|
console.error('Error reading GT config file:', error);
|
|
102
102
|
}
|
|
103
|
+
var _renderSettings = renderSettings || internal_1.defaultRenderSettings;
|
|
104
|
+
if ((renderSettings === null || renderSettings === void 0 ? void 0 : renderSettings.method) === "subtle" && devApiKey) {
|
|
105
|
+
console.warn('Subtle render method cannot be used in dev environments, falling back to default.');
|
|
106
|
+
_renderSettings.method = "default";
|
|
107
|
+
}
|
|
103
108
|
// Merge loaded file config, default props, and function args
|
|
104
|
-
var mergedConfig = __assign(__assign(__assign({}, defaultInitGTProps_1.default), loadedConfig), __assign({ i18n: i18n, dictionary: dictionary, runtimeTranslation: runtimeTranslation, remoteCache: remoteCache, apiKey: apiKey, devApiKey: devApiKey, projectId: projectId, runtimeUrl: runtimeUrl, cacheUrl: cacheUrl, cacheExpiryTime: cacheExpiryTime, locales: locales, defaultLocale: defaultLocale, renderSettings:
|
|
109
|
+
var mergedConfig = __assign(__assign(__assign({}, defaultInitGTProps_1.default), loadedConfig), __assign({ i18n: i18n, dictionary: dictionary, runtimeTranslation: runtimeTranslation, remoteCache: remoteCache, apiKey: apiKey, devApiKey: devApiKey, projectId: projectId, runtimeUrl: runtimeUrl, cacheUrl: cacheUrl, cacheExpiryTime: cacheExpiryTime, locales: locales, defaultLocale: defaultLocale, renderSettings: _renderSettings, maxConcurrentRequests: maxConcurrentRequests, maxBatchSize: maxBatchSize, batchInterval: batchInterval }, metadata));
|
|
105
110
|
// Destructure final config
|
|
106
111
|
var finalI18n = mergedConfig.i18n, finalDictionary = mergedConfig.dictionary, finalRuntimeTranslation = mergedConfig.runtimeTranslation, finalRemoteCache = mergedConfig.remoteCache, finalApiKey = mergedConfig.apiKey, finalDevApiKey = mergedConfig.devApiKey, finalProjectId = mergedConfig.projectId, finalRuntimeUrl = mergedConfig.runtimeUrl, finalCacheUrl = mergedConfig.cacheUrl, finalCacheExpiryTime = mergedConfig.cacheExpiryTime, finalLocales = mergedConfig.locales, finalDefaultLocale = mergedConfig.defaultLocale, finalRenderSettings = mergedConfig.renderSettings, finalMaxConcurrentRequests = mergedConfig.maxConcurrentRequests, finalMaxBatchSize = mergedConfig.maxBatchSize, finalBatchInterval = mergedConfig.batchInterval, restMetadata = __rest(mergedConfig, ["i18n", "dictionary", "runtimeTranslation", "remoteCache", "apiKey", "devApiKey", "projectId", "runtimeUrl", "cacheUrl", "cacheExpiryTime", "locales", "defaultLocale", "renderSettings", "maxConcurrentRequests", "maxBatchSize", "batchInterval"]);
|
|
107
112
|
// ----- ERROR CHECKS ----- //
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export declare const APIKeyMissingError = "General Translation: API key is requi
|
|
|
3
3
|
export declare const remoteTranslationsError = "General Translation: Error fetching remote translation.";
|
|
4
4
|
export declare const renderingError = "General Translation: Rendering error.";
|
|
5
5
|
export declare const createStringTranslationError: (content: string, id?: string) => string;
|
|
6
|
+
export declare const createDictionaryStringTranslationError: (id: string) => string;
|
|
6
7
|
export declare const createRequiredPrefixError: (id: string, requiredPrefix: string) => string;
|
|
7
8
|
export declare const devApiKeyIncludedInProductionError = "General Translation: You are attempting a production build of your app with a developer API key (beginning \"gtx-dev-\"). Replace this API key with a production API key (beginning \"gtx-api-\") when you build your app for production.";
|
|
8
9
|
export declare const createDictionarySubsetError: (id: string, functionName: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createErrors.d.ts","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,8MAA8M,CAAA;AAEhP,eAAO,MAAM,kBAAkB,qNAAqN,CAAA;AAEpP,eAAO,MAAM,uBAAuB,4DAA4D,CAAA;AAEhG,eAAO,MAAM,cAAc,0CAA0C,CAAA;AAErE,eAAO,MAAM,4BAA4B,YAAa,MAAM,OAAO,MAAM,WAAiG,CAAA;AAE1K,eAAO,MAAM,yBAAyB,OAAQ,MAAM,kBAAkB,MAAM,WACyI,CAAA;AAErN,eAAO,MAAM,kCAAkC,8OAA0O,CAAA;AAEzR,eAAO,MAAM,2BAA2B,OAAQ,MAAM,gBAAgB,MAAM,WACmH,CAAA;AAI/L,eAAO,MAAM,oBAAoB,iFAAiF,CAAC;AAEnH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,WAAyD,CAAA;AAExG,eAAO,MAAM,+BAA+B,YAAa,MAAM,EAAE,WAGlD,CAAA"}
|
|
1
|
+
{"version":3,"file":"createErrors.d.ts","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,8MAA8M,CAAA;AAEhP,eAAO,MAAM,kBAAkB,qNAAqN,CAAA;AAEpP,eAAO,MAAM,uBAAuB,4DAA4D,CAAA;AAEhG,eAAO,MAAM,cAAc,0CAA0C,CAAA;AAErE,eAAO,MAAM,4BAA4B,YAAa,MAAM,OAAO,MAAM,WAAiG,CAAA;AAE1K,eAAO,MAAM,sCAAsC,OAAQ,MAAM,WAA2F,CAAA;AAE5J,eAAO,MAAM,yBAAyB,OAAQ,MAAM,kBAAkB,MAAM,WACyI,CAAA;AAErN,eAAO,MAAM,kCAAkC,8OAA0O,CAAA;AAEzR,eAAO,MAAM,2BAA2B,OAAQ,MAAM,gBAAgB,MAAM,WACmH,CAAA;AAI/L,eAAO,MAAM,oBAAoB,iFAAiF,CAAC;AAEnH,eAAO,MAAM,oBAAoB,OAAQ,MAAM,WAAyD,CAAA;AAExG,eAAO,MAAM,+BAA+B,YAAa,MAAM,EAAE,WAGlD,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
// ---- ERRORS ---- //
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.createUnsupportedLocalesWarning = exports.createNoEntryWarning = exports.usingDefaultsWarning = exports.createDictionarySubsetError = exports.devApiKeyIncludedInProductionError = exports.createRequiredPrefixError = exports.createStringTranslationError = exports.renderingError = exports.remoteTranslationsError = exports.APIKeyMissingError = exports.projectIdMissingError = void 0;
|
|
4
|
+
exports.createUnsupportedLocalesWarning = exports.createNoEntryWarning = exports.usingDefaultsWarning = exports.createDictionarySubsetError = exports.devApiKeyIncludedInProductionError = exports.createRequiredPrefixError = exports.createDictionaryStringTranslationError = exports.createStringTranslationError = exports.renderingError = exports.remoteTranslationsError = exports.APIKeyMissingError = exports.projectIdMissingError = void 0;
|
|
5
5
|
var generaltranslation_1 = require("generaltranslation");
|
|
6
6
|
exports.projectIdMissingError = 'General Translation: Project ID missing! Set projectId as GT_PROJECT_ID in the environment or by passing the projectId parameter to initGT(). Find your project ID: www.generaltranslation.com/dashboard.';
|
|
7
7
|
exports.APIKeyMissingError = 'General Translation: API key is required for runtime translation! Create an API key: www.generaltranslation.com/dashboard/api-keys. (Or, turn off runtime translation by setting runtimeUrl to an empty string.)';
|
|
@@ -9,6 +9,8 @@ exports.remoteTranslationsError = 'General Translation: Error fetching remote tr
|
|
|
9
9
|
exports.renderingError = 'General Translation: Rendering error.';
|
|
10
10
|
var createStringTranslationError = function (content, id) { return "gt-next string translation error. tx(\"".concat(content, "\")").concat(id ? " with id \"".concat(id, "\"") : '', " failed."); };
|
|
11
11
|
exports.createStringTranslationError = createStringTranslationError;
|
|
12
|
+
var createDictionaryStringTranslationError = function (id) { return "gt-next string translation error. Translation from dictionary with id: ".concat(id, " failed."); };
|
|
13
|
+
exports.createDictionaryStringTranslationError = createDictionaryStringTranslationError;
|
|
12
14
|
var createRequiredPrefixError = function (id, requiredPrefix) {
|
|
13
15
|
return "You are using <GTProvider> with a provided prefix id: \"".concat(requiredPrefix, "\", but one of the children of <GTProvider> has the id \"").concat(id, "\". Change the <GTProvider> id prop or your dictionary structure to proceed.");
|
|
14
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createErrors.js","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":";AAAA,sBAAsB;;;AAEtB,yDAAwD;AAE3C,QAAA,qBAAqB,GAAG,2MAA2M,CAAA;AAEnO,QAAA,kBAAkB,GAAG,kNAAkN,CAAA;AAEvO,QAAA,uBAAuB,GAAG,yDAAyD,CAAA;AAEnF,QAAA,cAAc,GAAG,uCAAuC,CAAA;AAE9D,IAAM,4BAA4B,GAAG,UAAC,OAAe,EAAE,EAAW,IAAK,OAAA,iDAAyC,OAAO,gBAAK,EAAE,CAAC,CAAC,CAAC,qBAAa,EAAE,OAAG,CAAC,CAAC,CAAC,EAAE,aAAW,EAA5F,CAA4F,CAAA;AAA7J,QAAA,4BAA4B,gCAAiI;AAEnK,IAAM,yBAAyB,GAAG,UAAC,EAAU,EAAE,cAAsB;IACxE,OAAA,kEAA0D,cAAc,sEAA0D,EAAE,iFAA6E;AAAjN,CAAiN,CAAA;AADxM,QAAA,yBAAyB,6BAC+K;AAExM,QAAA,kCAAkC,GAAG,2OAAuO,CAAA;AAElR,IAAM,2BAA2B,GAAG,UAAC,EAAU,EAAE,YAAoB;IACxE,OAAA,+BAAwB,YAAY,yBAAc,EAAE,2IAAuI;AAA3L,CAA2L,CAAA;AADlL,QAAA,2BAA2B,+BACuJ;AAE/L,wBAAwB;AAEX,QAAA,oBAAoB,GAAG,8EAA8E,CAAC;AAE5G,IAAM,oBAAoB,GAAG,UAAC,EAAU,IAAK,OAAA,uDAA+C,EAAE,OAAG,EAApD,CAAoD,CAAA;AAA3F,QAAA,oBAAoB,wBAAuE;AAEjG,IAAM,+BAA+B,GAAG,UAAC,OAAiB,IAAK,OAAA,+FAAwF,OAAO,CAAC,GAAG,CAAC,UAAA,MAAM;IACpK,IAAA,IAAI,GAAK,IAAA,wCAAmB,EAAC,MAAM,CAAC,KAAhC,CAAiC;IAC7C,OAAO,UAAG,MAAM,eAAK,IAAI,MAAG,CAAA;AAChC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE,EAHuD,CAGvD,CAAA;AAHF,QAAA,+BAA+B,mCAG7B"}
|
|
1
|
+
{"version":3,"file":"createErrors.js","sourceRoot":"","sources":["../../src/errors/createErrors.ts"],"names":[],"mappings":";AAAA,sBAAsB;;;AAEtB,yDAAwD;AAE3C,QAAA,qBAAqB,GAAG,2MAA2M,CAAA;AAEnO,QAAA,kBAAkB,GAAG,kNAAkN,CAAA;AAEvO,QAAA,uBAAuB,GAAG,yDAAyD,CAAA;AAEnF,QAAA,cAAc,GAAG,uCAAuC,CAAA;AAE9D,IAAM,4BAA4B,GAAG,UAAC,OAAe,EAAE,EAAW,IAAK,OAAA,iDAAyC,OAAO,gBAAK,EAAE,CAAC,CAAC,CAAC,qBAAa,EAAE,OAAG,CAAC,CAAC,CAAC,EAAE,aAAW,EAA5F,CAA4F,CAAA;AAA7J,QAAA,4BAA4B,gCAAiI;AAEnK,IAAM,sCAAsC,GAAG,UAAC,EAAU,IAAK,OAAA,iFAA0E,EAAE,aAAU,EAAtF,CAAsF,CAAA;AAA/I,QAAA,sCAAsC,0CAAyG;AAErJ,IAAM,yBAAyB,GAAG,UAAC,EAAU,EAAE,cAAsB;IACxE,OAAA,kEAA0D,cAAc,sEAA0D,EAAE,iFAA6E;AAAjN,CAAiN,CAAA;AADxM,QAAA,yBAAyB,6BAC+K;AAExM,QAAA,kCAAkC,GAAG,2OAAuO,CAAA;AAElR,IAAM,2BAA2B,GAAG,UAAC,EAAU,EAAE,YAAoB;IACxE,OAAA,+BAAwB,YAAY,yBAAc,EAAE,2IAAuI;AAA3L,CAA2L,CAAA;AADlL,QAAA,2BAA2B,+BACuJ;AAE/L,wBAAwB;AAEX,QAAA,oBAAoB,GAAG,8EAA8E,CAAC;AAE5G,IAAM,oBAAoB,GAAG,UAAC,EAAU,IAAK,OAAA,uDAA+C,EAAE,OAAG,EAApD,CAAoD,CAAA;AAA3F,QAAA,oBAAoB,wBAAuE;AAEjG,IAAM,+BAA+B,GAAG,UAAC,OAAiB,IAAK,OAAA,+FAAwF,OAAO,CAAC,GAAG,CAAC,UAAA,MAAM;IACpK,IAAA,IAAI,GAAK,IAAA,wCAAmB,EAAC,MAAM,CAAC,KAAhC,CAAiC;IAC7C,OAAO,UAAG,MAAM,eAAK,IAAI,MAAG,CAAA;AAChC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE,EAHuD,CAGvD,CAAA;AAHF,QAAA,+BAA+B,mCAG7B"}
|
|
@@ -11,7 +11,7 @@ export default function ClientProvider({ children, dictionary, initialTranslatio
|
|
|
11
11
|
requiredPrefix: string | undefined;
|
|
12
12
|
renderSettings: {
|
|
13
13
|
method: RenderMethod;
|
|
14
|
-
timeout
|
|
14
|
+
timeout?: number;
|
|
15
15
|
};
|
|
16
16
|
projectId?: string;
|
|
17
17
|
devApiKey?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientProvider.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProvider.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAmD,UAAU,EAAE,YAAY,EAA0D,MAAM,mBAAmB,CAAC;AAKtK,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,2BAA2B,EAC3B,cAAc,EACd,cAAc,EACd,SAAS,EACT,SAAS,EACT,UAAU,EACX,EAAE;IACD,QAAQ,EAAE,GAAG,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;IACvB,mBAAmB,EAAE,YAAY,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,2BAA2B,EAAE,OAAO,CAAC;IACrC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE;QACd,MAAM,EAAE,YAAY,CAAC;QACrB,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ClientProvider.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProvider.tsx"],"names":[],"mappings":"AAUA,OAAO,EAAmD,UAAU,EAAE,YAAY,EAA0D,MAAM,mBAAmB,CAAC;AAKtK,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,QAAQ,EACR,UAAU,EACV,mBAAmB,EACnB,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,2BAA2B,EAC3B,cAAc,EACd,cAAc,EACd,SAAS,EACT,SAAS,EACT,UAAU,EACX,EAAE;IACD,QAAQ,EAAE,GAAG,CAAC;IACd,UAAU,EAAE,UAAU,CAAC;IACvB,mBAAmB,EAAE,YAAY,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,2BAA2B,EAAE,OAAO,CAAC;IACrC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,cAAc,EAAE;QACd,MAAM,EAAE,YAAY,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,2CAwJA"}
|
|
@@ -145,7 +145,7 @@ function ClientProvider(_a) {
|
|
|
145
145
|
};
|
|
146
146
|
var renderLoadingSkeleton = function () {
|
|
147
147
|
if (typeof entry === 'string')
|
|
148
|
-
return renderString(
|
|
148
|
+
return renderString(entry);
|
|
149
149
|
return (0, internal_1.renderSkeleton)({
|
|
150
150
|
children: entry,
|
|
151
151
|
variables: variables,
|
|
@@ -153,12 +153,6 @@ function ClientProvider(_a) {
|
|
|
153
153
|
renderVariable: renderVariable_1.default
|
|
154
154
|
});
|
|
155
155
|
};
|
|
156
|
-
var renderLoadingHang = function () {
|
|
157
|
-
// TODO: double check that this has the desired behavior
|
|
158
|
-
if (typeof entry === 'string')
|
|
159
|
-
return renderString('');
|
|
160
|
-
return undefined;
|
|
161
|
-
};
|
|
162
156
|
var renderLoadingDefault = function () {
|
|
163
157
|
if (regionalTranslationRequired)
|
|
164
158
|
return renderDefaultLocale();
|
|
@@ -193,12 +187,10 @@ function ClientProvider(_a) {
|
|
|
193
187
|
if (renderSettings.method === 'replace') {
|
|
194
188
|
return renderDefaultLocale();
|
|
195
189
|
}
|
|
196
|
-
if (renderSettings.method === 'hang') {
|
|
197
|
-
return renderLoadingHang();
|
|
198
|
-
}
|
|
199
190
|
if (renderSettings.method === 'subtle') {
|
|
200
191
|
return renderDefaultLocale();
|
|
201
192
|
}
|
|
193
|
+
// default behavior
|
|
202
194
|
return renderLoadingDefault();
|
|
203
195
|
}
|
|
204
196
|
var translation = translations === null || translations === void 0 ? void 0 : translations[id];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientProvider.js","sourceRoot":"","sources":["../../src/provider/ClientProvider.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBb,
|
|
1
|
+
{"version":3,"file":"ClientProvider.js","sourceRoot":"","sources":["../../src/provider/ClientProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTProvider.d.ts","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAalC;;;;;;;GAOG;AACH,wBAA8B,UAAU,CAAC,EACvC,QAAQ,EACR,EAAE,GACH,EAAE;IACD,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,
|
|
1
|
+
{"version":3,"file":"GTProvider.d.ts","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAalC;;;;;;;GAOG;AACH,wBAA8B,UAAU,CAAC,EACvC,QAAQ,EACR,EAAE,GACH,EAAE;IACD,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,oDAuIA"}
|
|
@@ -85,7 +85,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
85
85
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
86
86
|
exports.default = GTProvider;
|
|
87
87
|
var jsx_runtime_1 = require("react/jsx-runtime");
|
|
88
|
-
var react_1 = __importDefault(require("react"));
|
|
89
88
|
var internal_1 = require("gt-react/internal");
|
|
90
89
|
var getI18NConfig_1 = __importDefault(require("../config/getI18NConfig"));
|
|
91
90
|
var getLocale_1 = __importDefault(require("../request/getLocale"));
|
|
@@ -94,7 +93,6 @@ var generaltranslation_1 = require("generaltranslation");
|
|
|
94
93
|
var getDictionary_1 = __importStar(require("../dictionary/getDictionary"));
|
|
95
94
|
var ClientProvider_1 = __importDefault(require("./ClientProvider"));
|
|
96
95
|
var createErrors_1 = require("../errors/createErrors");
|
|
97
|
-
var types_1 = require("../types/types");
|
|
98
96
|
/**
|
|
99
97
|
* Provides General Translation context to its children, which can then access `useGT`, `useLocale`, and `useDefaultLocale`.
|
|
100
98
|
*
|
|
@@ -145,113 +143,53 @@ function GTProvider(_a) {
|
|
|
145
143
|
existingTranslations = _c;
|
|
146
144
|
// Check and standardize flattened dictionary entries before passing them to the client
|
|
147
145
|
return [4 /*yield*/, Promise.all(Object.entries(dictionaryEntries !== null && dictionaryEntries !== void 0 ? dictionaryEntries : {}).map(function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
|
|
148
|
-
var entryId, _c, entry, metadata, taggedEntry, contentArray, _d, _, hash_1, translation_1, translationPromise_1, _e,
|
|
149
|
-
var
|
|
146
|
+
var entryId, _c, entry, metadata, taggedEntry, contentArray, _d, _, hash_1, translation_1, translationPromise_1, _e, entryAsObjects, hash, translation, translationPromise;
|
|
147
|
+
var _f, _g;
|
|
150
148
|
var suffix = _b[0], dictionaryEntry = _b[1];
|
|
151
|
-
return __generator(this, function (
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
}];
|
|
180
|
-
}
|
|
181
|
-
if (renderSettings.method === "replace") {
|
|
182
|
-
return [2 /*return*/, translations[entryId] = {
|
|
183
|
-
promise: translationPromise_1,
|
|
184
|
-
hash: hash_1,
|
|
185
|
-
type: 'content'
|
|
186
|
-
}];
|
|
187
|
-
}
|
|
188
|
-
if (renderSettings.method === "default") {
|
|
189
|
-
return [2 /*return*/, translations[entryId] = {
|
|
190
|
-
promise: translationPromise_1,
|
|
191
|
-
hash: hash_1,
|
|
192
|
-
type: 'content'
|
|
193
|
-
}];
|
|
194
|
-
}
|
|
195
|
-
if (!(renderSettings.method === "hang")) return [3 /*break*/, 4];
|
|
196
|
-
_r.label = 1;
|
|
197
|
-
case 1:
|
|
198
|
-
_r.trys.push([1, 3, , 4]);
|
|
199
|
-
_e = translations;
|
|
200
|
-
_f = entryId;
|
|
201
|
-
_o = {};
|
|
202
|
-
_g = hash_1;
|
|
203
|
-
return [4 /*yield*/, translationPromise_1];
|
|
204
|
-
case 2:
|
|
205
|
-
_e[_f] = (_o[_g] = _r.sent(),
|
|
206
|
-
_o);
|
|
207
|
-
return [3 /*break*/, 4];
|
|
208
|
-
case 3:
|
|
209
|
-
error_1 = _r.sent();
|
|
210
|
-
result = void 0;
|
|
211
|
-
if (error_1 instanceof types_1.GTTranslationError) {
|
|
212
|
-
result = error_1.toTranslationError();
|
|
213
|
-
}
|
|
214
|
-
else {
|
|
215
|
-
result = {
|
|
216
|
-
error: "An unknonwn error occured",
|
|
217
|
-
code: 500
|
|
218
|
-
};
|
|
219
|
-
}
|
|
220
|
-
translations[entryId] = result;
|
|
221
|
-
return [3 /*break*/, 4];
|
|
222
|
-
case 4:
|
|
223
|
-
// Subtle rendering
|
|
224
|
-
return [2 /*return*/, undefined];
|
|
225
|
-
case 5:
|
|
226
|
-
_h = I18NConfig.serializeAndHash(taggedEntry, metadata === null || metadata === void 0 ? void 0 : metadata.context, entryId), entryAsObjects = _h[0], hash = _h[1];
|
|
227
|
-
dictionary[entryId] = [taggedEntry, __assign(__assign({}, metadata), { hash: hash })];
|
|
228
|
-
translation = existingTranslations === null || existingTranslations === void 0 ? void 0 : existingTranslations[entryId];
|
|
229
|
-
if (translation === null || translation === void 0 ? void 0 : translation[hash])
|
|
230
|
-
return [2 /*return*/, (translations[entryId] = (_p = {}, _p[hash] = translation[hash], _p))];
|
|
231
|
-
translationPromise = I18NConfig.translateChildren({
|
|
232
|
-
source: entryAsObjects,
|
|
233
|
-
targetLocale: locale,
|
|
234
|
-
metadata: __assign(__assign({ id: entryId, hash: hash }, additionalMetadata), (renderSettings.timeout && { timeout: renderSettings.timeout })),
|
|
235
|
-
});
|
|
236
|
-
if (renderSettings.method === "subtle")
|
|
237
|
-
return [2 /*return*/, undefined];
|
|
238
|
-
if (!(renderSettings.method === "hang")) return [3 /*break*/, 7];
|
|
239
|
-
_j = translations;
|
|
240
|
-
_k = entryId;
|
|
241
|
-
_q = {};
|
|
242
|
-
_l = hash;
|
|
243
|
-
return [4 /*yield*/, translationPromise];
|
|
244
|
-
case 6: return [2 /*return*/, (_j[_k] = (_q[_l] = _r.sent(), _q))];
|
|
245
|
-
case 7:
|
|
246
|
-
if (renderSettings.method === 'skeleton') {
|
|
247
|
-
loadingFallback = (0, jsx_runtime_1.jsx)(react_1.default.Fragment, {}, "skeleton_".concat(entryId));
|
|
248
|
-
}
|
|
249
|
-
return [2 /*return*/, (translations[entryId] = {
|
|
250
|
-
promise: translationPromise,
|
|
251
|
-
hash: hash,
|
|
252
|
-
type: 'jsx',
|
|
253
|
-
})];
|
|
149
|
+
return __generator(this, function (_h) {
|
|
150
|
+
entryId = getId(suffix);
|
|
151
|
+
_c = (0, internal_1.extractEntryMetadata)(dictionaryEntry), entry = _c.entry, metadata = _c.metadata;
|
|
152
|
+
if (typeof entry === 'undefined')
|
|
153
|
+
return [2 /*return*/];
|
|
154
|
+
taggedEntry = I18NConfig.addGTIdentifier(entry, entryId);
|
|
155
|
+
// If no translation is required, return
|
|
156
|
+
if (!translationRequired)
|
|
157
|
+
return [2 /*return*/, dictionary[entryId] = [taggedEntry, __assign({}, metadata)]];
|
|
158
|
+
// ---- POPULATING TRANSLATIONS ---- //
|
|
159
|
+
// STRINGS
|
|
160
|
+
if (typeof taggedEntry === 'string') {
|
|
161
|
+
contentArray = (0, generaltranslation_1.splitStringToContent)(taggedEntry);
|
|
162
|
+
_d = I18NConfig.serializeAndHash(contentArray, metadata === null || metadata === void 0 ? void 0 : metadata.context, entryId), _ = _d[0], hash_1 = _d[1];
|
|
163
|
+
dictionary[entryId] = [taggedEntry, __assign(__assign({}, metadata), { hash: hash_1 })];
|
|
164
|
+
translation_1 = existingTranslations === null || existingTranslations === void 0 ? void 0 : existingTranslations[entryId];
|
|
165
|
+
if (translation_1 === null || translation_1 === void 0 ? void 0 : translation_1[hash_1])
|
|
166
|
+
return [2 /*return*/, (translations[entryId] = (_f = {}, _f[hash_1] = translation_1[hash_1], _f))];
|
|
167
|
+
translationPromise_1 = I18NConfig.translateContent({
|
|
168
|
+
source: contentArray,
|
|
169
|
+
targetLocale: locale,
|
|
170
|
+
options: __assign(__assign({ id: entryId, hash: hash_1 }, additionalMetadata), ((metadata === null || metadata === void 0 ? void 0 : metadata.context) && { context: metadata.context })),
|
|
171
|
+
});
|
|
172
|
+
return [2 /*return*/, translations[entryId] = {
|
|
173
|
+
promise: translationPromise_1,
|
|
174
|
+
hash: hash_1,
|
|
175
|
+
type: 'content'
|
|
176
|
+
}];
|
|
254
177
|
}
|
|
178
|
+
_e = I18NConfig.serializeAndHash(taggedEntry, metadata === null || metadata === void 0 ? void 0 : metadata.context, entryId), entryAsObjects = _e[0], hash = _e[1];
|
|
179
|
+
dictionary[entryId] = [taggedEntry, __assign(__assign({}, metadata), { hash: hash })];
|
|
180
|
+
translation = existingTranslations === null || existingTranslations === void 0 ? void 0 : existingTranslations[entryId];
|
|
181
|
+
if (translation === null || translation === void 0 ? void 0 : translation[hash])
|
|
182
|
+
return [2 /*return*/, (translations[entryId] = (_g = {}, _g[hash] = translation[hash], _g))];
|
|
183
|
+
translationPromise = I18NConfig.translateChildren({
|
|
184
|
+
source: entryAsObjects,
|
|
185
|
+
targetLocale: locale,
|
|
186
|
+
metadata: __assign(__assign(__assign({ id: entryId, hash: hash }, ((metadata === null || metadata === void 0 ? void 0 : metadata.context) && { context: metadata.context })), additionalMetadata), (renderSettings.timeout && { timeout: renderSettings.timeout })),
|
|
187
|
+
});
|
|
188
|
+
return [2 /*return*/, (translations[entryId] = {
|
|
189
|
+
promise: translationPromise,
|
|
190
|
+
hash: hash,
|
|
191
|
+
type: 'jsx',
|
|
192
|
+
})];
|
|
255
193
|
});
|
|
256
194
|
}); }))];
|
|
257
195
|
case 6:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTProvider.js","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0BA,
|
|
1
|
+
{"version":3,"file":"GTProvider.js","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getGT.d.ts","sourceRoot":"","sources":["../../src/server/getGT.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAyB,MAAM,OAAO,CAAC;AAC9C;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CACzB,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,KAAK,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"getGT.d.ts","sourceRoot":"","sources":["../../src/server/getGT.tsx"],"names":[],"mappings":"AAmBA,OAAO,KAAyB,MAAM,OAAO,CAAC;AAC9C;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CACzB,EAAE,CAAC,EAAE,MAAM,GACV,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,KAAK,CAAC,SAAS,CAAC,CAuHzE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,UAAU,CACxB,EAAE,CAAC,EAAE,MAAM,GACV,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,OAAO,CAmDlE"}
|
package/dist/server/getGT.js
CHANGED
|
@@ -110,7 +110,7 @@ var react_1 = __importStar(require("react"));
|
|
|
110
110
|
*/
|
|
111
111
|
function getGT(id) {
|
|
112
112
|
return __awaiter(this, void 0, void 0, function () {
|
|
113
|
-
var getId, I18NConfig, defaultLocale, locale, translationRequired, filteredTranslations, translationsPromise, additionalMetadata_1, renderSettings_1, dictionarySubset, dictionaryEntries, translations_1;
|
|
113
|
+
var getId, I18NConfig, defaultLocale, locale, regionalTranslationRequired, translationRequired, filteredTranslations, translationsPromise, additionalMetadata_1, renderSettings_1, dictionarySubset, dictionaryEntries, translations_1;
|
|
114
114
|
var _this = this;
|
|
115
115
|
return __generator(this, function (_a) {
|
|
116
116
|
switch (_a.label) {
|
|
@@ -123,7 +123,8 @@ function getGT(id) {
|
|
|
123
123
|
return [4 /*yield*/, (0, server_1.getLocale)()];
|
|
124
124
|
case 1:
|
|
125
125
|
locale = _a.sent();
|
|
126
|
-
|
|
126
|
+
regionalTranslationRequired = I18NConfig.requiresRegionalTranslation(locale);
|
|
127
|
+
translationRequired = I18NConfig.requiresTranslation(locale) || regionalTranslationRequired;
|
|
127
128
|
filteredTranslations = {};
|
|
128
129
|
if (!translationRequired) return [3 /*break*/, 5];
|
|
129
130
|
translationsPromise = I18NConfig.getTranslations(locale);
|
|
@@ -140,7 +141,7 @@ function getGT(id) {
|
|
|
140
141
|
translations_1 = _a.sent();
|
|
141
142
|
// Translate all strings in advance
|
|
142
143
|
return [4 /*yield*/, Promise.all(Object.entries(dictionaryEntries !== null && dictionaryEntries !== void 0 ? dictionaryEntries : {}).map(function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
|
|
143
|
-
var _c, entry, metadata, contentArray, entryId, _d, _, hash, translation, translationPromise, _e, _f;
|
|
144
|
+
var _c, entry, metadata, contentArray, entryId, _d, _, hash, translation, translationPromise, _e, _f, error_1;
|
|
144
145
|
var _g;
|
|
145
146
|
var suffix = _b[0], dictionaryEntry = _b[1];
|
|
146
147
|
return __generator(this, function (_h) {
|
|
@@ -160,12 +161,24 @@ function getGT(id) {
|
|
|
160
161
|
targetLocale: locale,
|
|
161
162
|
options: __assign({ id: entryId, hash: hash }, additionalMetadata_1),
|
|
162
163
|
});
|
|
163
|
-
|
|
164
|
+
// subtle: wait for CDN to populate or for API to respond, do fallback for now
|
|
165
|
+
if (renderSettings_1.method == 'subtle')
|
|
166
|
+
return [2 /*return*/, filteredTranslations[entryId] = contentArray];
|
|
167
|
+
_h.label = 1;
|
|
168
|
+
case 1:
|
|
169
|
+
_h.trys.push([1, 3, , 4]);
|
|
164
170
|
_e = filteredTranslations;
|
|
165
171
|
_f = entryId;
|
|
166
172
|
return [4 /*yield*/, translationPromise];
|
|
167
|
-
case
|
|
168
|
-
|
|
173
|
+
case 2:
|
|
174
|
+
_e[_f] = _h.sent();
|
|
175
|
+
return [3 /*break*/, 4];
|
|
176
|
+
case 3:
|
|
177
|
+
error_1 = _h.sent();
|
|
178
|
+
console.error((0, createErrors_1.createDictionaryStringTranslationError)(entryId), error_1);
|
|
179
|
+
filteredTranslations[entryId] = contentArray;
|
|
180
|
+
return [3 /*break*/, 4];
|
|
181
|
+
case 4: return [2 /*return*/];
|
|
169
182
|
}
|
|
170
183
|
});
|
|
171
184
|
}); }))];
|
|
@@ -175,7 +188,7 @@ function getGT(id) {
|
|
|
175
188
|
_a.label = 5;
|
|
176
189
|
case 5: return [2 /*return*/, function (id, options) {
|
|
177
190
|
id = getId(id);
|
|
178
|
-
// Get entry
|
|
191
|
+
// Get entry
|
|
179
192
|
var dictionaryEntry = (0, getDictionary_1.getDictionaryEntry)(id);
|
|
180
193
|
if (dictionaryEntry === undefined ||
|
|
181
194
|
dictionaryEntry === null ||
|
package/dist/server/getGT.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getGT.js","sourceRoot":"","sources":["../../src/server/getGT.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCA,
|
|
1
|
+
{"version":3,"file":"getGT.js","sourceRoot":"","sources":["../../src/server/getGT.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,10 +29,9 @@
|
|
|
29
29
|
* @param {React.ReactNode} children - The content to be translated or displayed.
|
|
30
30
|
* @param {string} [id] - Optional identifier for the translation string. If not provided, a hash will be generated from the content.
|
|
31
31
|
* @param {Object} [renderSettings] - Optional settings controlling how fallback content is rendered during translation.
|
|
32
|
-
* @param {"skeleton" | "replace" | "
|
|
32
|
+
* @param {"skeleton" | "replace" | "subtle" | "default"} [renderSettings.method] - Specifies the rendering method:
|
|
33
33
|
* - "skeleton": show a placeholder while translation is loading.
|
|
34
34
|
* - "replace": show the default content as a fallback while the translation is loading.
|
|
35
|
-
* - "hang": wait until the translation is fully loaded before rendering anything.
|
|
36
35
|
* - "subtle": display children without a translation initially, with translations being applied later if available.
|
|
37
36
|
* - "default": behave like skeleton unless language is same (ie en-GB vs en-US), then behave like replace
|
|
38
37
|
* @param {number | null} [renderSettings.timeout] - Optional timeout for translation loading.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"T.d.ts","sourceRoot":"","sources":["../../../src/server/inline/T.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"T.d.ts","sourceRoot":"","sources":["../../../src/server/inline/T.tsx"],"names":[],"mappings":"AAgBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,iBAAe,CAAC,CAAC,EACf,QAAQ,EACR,EAAE,EACF,OAAO,EACP,SAAS,EACT,gBAAgB,GACjB,EAAE;IACD,QAAQ,EAAE,GAAG,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,GAAG,OAAO,CAAC,GAAG,CAAC,CAwIf;kBAnJc,CAAC;;;AAuJhB,eAAe,CAAC,CAAC"}
|
package/dist/server/inline/T.js
CHANGED
|
@@ -55,9 +55,19 @@ var getI18NConfig_1 = __importDefault(require("../../config/getI18NConfig"));
|
|
|
55
55
|
var getLocale_1 = __importDefault(require("../../request/getLocale"));
|
|
56
56
|
var getMetadata_1 = __importDefault(require("../../request/getMetadata"));
|
|
57
57
|
var react_1 = require("react");
|
|
58
|
-
var Resolver_1 = __importDefault(require("./Resolver"));
|
|
59
58
|
var internal_1 = require("gt-react/internal");
|
|
60
59
|
var renderVariable_1 = __importDefault(require("../rendering/renderVariable"));
|
|
60
|
+
function Resolver(_a) {
|
|
61
|
+
return __awaiter(this, arguments, void 0, function (_b) {
|
|
62
|
+
var children = _b.children;
|
|
63
|
+
return __generator(this, function (_c) {
|
|
64
|
+
switch (_c.label) {
|
|
65
|
+
case 0: return [4 /*yield*/, children];
|
|
66
|
+
case 1: return [2 /*return*/, _c.sent()];
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
}
|
|
61
71
|
/**
|
|
62
72
|
* Translation component that renders its children translated into the user's given locale.
|
|
63
73
|
*
|
|
@@ -89,10 +99,9 @@ var renderVariable_1 = __importDefault(require("../rendering/renderVariable"));
|
|
|
89
99
|
* @param {React.ReactNode} children - The content to be translated or displayed.
|
|
90
100
|
* @param {string} [id] - Optional identifier for the translation string. If not provided, a hash will be generated from the content.
|
|
91
101
|
* @param {Object} [renderSettings] - Optional settings controlling how fallback content is rendered during translation.
|
|
92
|
-
* @param {"skeleton" | "replace" | "
|
|
102
|
+
* @param {"skeleton" | "replace" | "subtle" | "default"} [renderSettings.method] - Specifies the rendering method:
|
|
93
103
|
* - "skeleton": show a placeholder while translation is loading.
|
|
94
104
|
* - "replace": show the default content as a fallback while the translation is loading.
|
|
95
|
-
* - "hang": wait until the translation is fully loaded before rendering anything.
|
|
96
105
|
* - "subtle": display children without a translation initially, with translations being applied later if available.
|
|
97
106
|
* - "default": behave like skeleton unless language is same (ie en-GB vs en-US), then behave like replace
|
|
98
107
|
* @param {number | null} [renderSettings.timeout] - Optional timeout for translation loading.
|
|
@@ -104,8 +113,9 @@ var renderVariable_1 = __importDefault(require("../rendering/renderVariable"));
|
|
|
104
113
|
*/
|
|
105
114
|
function T(_a) {
|
|
106
115
|
return __awaiter(this, arguments, void 0, function (_b) {
|
|
107
|
-
var I18NConfig, locale, defaultLocale, regionalTranslationRequired, translationRequired, translationsPromise, taggedChildren, _c, childrenAsObjects, key, translations, translation, target, renderSettings, translationPromise, _d, _e, _f,
|
|
116
|
+
var I18NConfig, locale, defaultLocale, regionalTranslationRequired, translationRequired, translationsPromise, taggedChildren, _c, childrenAsObjects, key, translations, translation, target, renderSettings, translationPromise, _d, _e, _f, renderDefaultLocale, renderLoadingSkeleton, renderLoadingDefault, renderTranslatedChildrenPromise, loadingFallback;
|
|
108
117
|
var _g;
|
|
118
|
+
var _this = this;
|
|
109
119
|
var children = _b.children, id = _b.id, context = _b.context, variables = _b.variables, variablesOptions = _b.variablesOptions;
|
|
110
120
|
return __generator(this, function (_h) {
|
|
111
121
|
switch (_h.label) {
|
|
@@ -160,7 +170,7 @@ function T(_a) {
|
|
|
160
170
|
source: childrenAsObjects,
|
|
161
171
|
targetLocale: locale
|
|
162
172
|
};
|
|
163
|
-
_f = [__assign(__assign({}, (id && { id: id })), { hash: key })];
|
|
173
|
+
_f = [__assign(__assign(__assign({}, (id && { id: id })), { hash: key }), (context && { context: context }))];
|
|
164
174
|
return [4 /*yield*/, (0, getMetadata_1.default)()];
|
|
165
175
|
case 3:
|
|
166
176
|
translationPromise = _e.apply(_d, [(_g.metadata = __assign.apply(void 0, [__assign.apply(void 0, _f.concat([(_h.sent())])), (renderSettings.timeout && { timeout: renderSettings.timeout })]),
|
|
@@ -187,16 +197,18 @@ function T(_a) {
|
|
|
187
197
|
return renderDefaultLocale();
|
|
188
198
|
return renderLoadingSkeleton();
|
|
189
199
|
};
|
|
190
|
-
renderTranslatedChildrenPromise = translationPromise.then(function (translation) {
|
|
191
|
-
return (
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
200
|
+
renderTranslatedChildrenPromise = translationPromise.then(function (translation) { return __awaiter(_this, void 0, void 0, function () {
|
|
201
|
+
return __generator(this, function (_a) {
|
|
202
|
+
return [2 /*return*/, (0, internal_1.renderTranslatedChildren)({
|
|
203
|
+
source: taggedChildren,
|
|
204
|
+
target: translation,
|
|
205
|
+
variables: variables,
|
|
206
|
+
variablesOptions: variablesOptions,
|
|
207
|
+
locales: [locale, defaultLocale],
|
|
208
|
+
renderVariable: renderVariable_1.default,
|
|
209
|
+
})];
|
|
198
210
|
});
|
|
199
|
-
}).catch(function () {
|
|
211
|
+
}); }).catch(function () {
|
|
200
212
|
return renderDefaultLocale();
|
|
201
213
|
});
|
|
202
214
|
if (renderSettings.method === 'replace') {
|
|
@@ -205,18 +217,13 @@ function T(_a) {
|
|
|
205
217
|
else if (renderSettings.method === 'skeleton') {
|
|
206
218
|
loadingFallback = renderLoadingSkeleton();
|
|
207
219
|
}
|
|
208
|
-
else if (renderSettings.method === '
|
|
209
|
-
return [2 /*return*/, (
|
|
210
|
-
}
|
|
211
|
-
else if (renderSettings.method === 'subtle') {
|
|
212
|
-
return [2 /*return*/, undefined]; // TODO: implement subtle rendering
|
|
220
|
+
else if (renderSettings.method === 'subtle' && id !== undefined) { // exclude entries with missing ids bc these don't get cached
|
|
221
|
+
return [2 /*return*/, renderDefaultLocale()];
|
|
213
222
|
}
|
|
214
223
|
else {
|
|
215
224
|
loadingFallback = renderLoadingDefault();
|
|
216
225
|
}
|
|
217
|
-
|
|
218
|
-
// something is shown while waiting for the translation
|
|
219
|
-
return [2 /*return*/, ((0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: loadingFallback, children: (0, jsx_runtime_1.jsx)(Resolver_1.default, { children: renderTranslatedChildrenPromise }) }))];
|
|
226
|
+
return [2 /*return*/, ((0, jsx_runtime_1.jsx)(react_1.Suspense, { fallback: loadingFallback, children: (0, jsx_runtime_1.jsx)(Resolver, { children: renderTranslatedChildrenPromise }) }))];
|
|
220
227
|
}
|
|
221
228
|
});
|
|
222
229
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"T.js","sourceRoot":"","sources":["../../../src/server/inline/T.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAAuD;AACvD,sEAAgD;AAChD,0EAAoD;AACpD,+BAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"T.js","sourceRoot":"","sources":["../../../src/server/inline/T.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -92,7 +92,7 @@ var createErrors_1 = require("../../errors/createErrors");
|
|
|
92
92
|
*/
|
|
93
93
|
function tx(content_1) {
|
|
94
94
|
return __awaiter(this, arguments, void 0, function (content, options) {
|
|
95
|
-
var I18NConfig, defaultLocale, locale, _a, contentArray,
|
|
95
|
+
var I18NConfig, defaultLocale, locale, _a, contentArray, renderContent, _b, _, hash, translations, target, translationPromise, _c, _d, _e, renderSettings, target, error_1;
|
|
96
96
|
var _f;
|
|
97
97
|
var _g;
|
|
98
98
|
if (options === void 0) { options = {}; }
|
|
@@ -112,11 +112,11 @@ function tx(content_1) {
|
|
|
112
112
|
case 2:
|
|
113
113
|
locale = _a;
|
|
114
114
|
contentArray = (0, generaltranslation_1.splitStringToContent)(content);
|
|
115
|
-
|
|
115
|
+
renderContent = function (content, locales) {
|
|
116
116
|
return (0, generaltranslation_1.renderContentToString)(content, locales, options.variables, options.variablesOptions);
|
|
117
117
|
};
|
|
118
118
|
if (!I18NConfig.requiresTranslation(locale))
|
|
119
|
-
return [2 /*return*/,
|
|
119
|
+
return [2 /*return*/, renderContent(contentArray, [defaultLocale])];
|
|
120
120
|
_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
|
|
121
121
|
), _ = _b[0], hash = _b[1];
|
|
122
122
|
if (!options.id) return [3 /*break*/, 4];
|
|
@@ -125,7 +125,7 @@ function tx(content_1) {
|
|
|
125
125
|
translations = _h.sent();
|
|
126
126
|
target = (_g = translations[options.id]) === null || _g === void 0 ? void 0 : _g[hash];
|
|
127
127
|
if (target)
|
|
128
|
-
return [2 /*return*/,
|
|
128
|
+
return [2 /*return*/, renderContent(target, [locale, defaultLocale])];
|
|
129
129
|
_h.label = 4;
|
|
130
130
|
case 4:
|
|
131
131
|
_d = (_c = I18NConfig).translateContent;
|
|
@@ -139,21 +139,21 @@ function tx(content_1) {
|
|
|
139
139
|
translationPromise = _d.apply(_c, [(_f.options = __assign.apply(void 0, [__assign.apply(void 0, _e.concat([(_h.sent())])), { hash: hash }]),
|
|
140
140
|
_f)]);
|
|
141
141
|
renderSettings = I18NConfig.getRenderSettings();
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
142
|
+
// subtle: wait for CDN to populate or for API to respond, do fallback for now
|
|
143
|
+
if (renderSettings.method === 'subtle' || !options.id)
|
|
144
|
+
return [2 /*return*/, renderContent(contentArray, [defaultLocale])];
|
|
145
145
|
_h.label = 6;
|
|
146
146
|
case 6:
|
|
147
147
|
_h.trys.push([6, 8, , 9]);
|
|
148
148
|
return [4 /*yield*/, translationPromise];
|
|
149
149
|
case 7:
|
|
150
150
|
target = _h.sent();
|
|
151
|
-
return [2 /*return*/,
|
|
151
|
+
return [2 /*return*/, renderContent(target, [locale, defaultLocale])];
|
|
152
152
|
case 8:
|
|
153
153
|
error_1 = _h.sent();
|
|
154
154
|
console.error((0, createErrors_1.createStringTranslationError)(content, options.id), error_1);
|
|
155
|
-
return [2 /*return*/,
|
|
156
|
-
case 9: return [2 /*return
|
|
155
|
+
return [2 /*return*/, renderContent(contentArray, [defaultLocale])];
|
|
156
|
+
case 9: return [2 /*return*/];
|
|
157
157
|
}
|
|
158
158
|
});
|
|
159
159
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx.js","sourceRoot":"","sources":["../../../src/server/strings/tx.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkTypes.d.ts","sourceRoot":"","sources":["../../src/utils/checkTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAG,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIrD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,kBAAkB,
|
|
1
|
+
{"version":3,"file":"checkTypes.d.ts","sourceRoot":"","sources":["../../src/utils/checkTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAG,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIrD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,kBAAkB,CASlF"}
|
package/dist/utils/checkTypes.js
CHANGED
|
@@ -7,10 +7,8 @@ function isTranslationPromise(target) {
|
|
|
7
7
|
return false;
|
|
8
8
|
}
|
|
9
9
|
var hasPromise = 'promise' in target && target.promise instanceof Promise;
|
|
10
|
-
var hasErrorFallback = 'errorFallback' in target;
|
|
11
|
-
var hasLoadingFallback = 'loadingFallback' in target;
|
|
12
10
|
var hasHash = 'hash' in target && typeof target.hash === 'string';
|
|
13
11
|
var hasType = 'type' in target && (target.type === 'jsx' || target.type === 'content');
|
|
14
|
-
return hasPromise &&
|
|
12
|
+
return hasPromise && hasHash && hasType;
|
|
15
13
|
}
|
|
16
14
|
//# sourceMappingURL=checkTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkTypes.js","sourceRoot":"","sources":["../../src/utils/checkTypes.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"checkTypes.js","sourceRoot":"","sources":["../../src/utils/checkTypes.ts"],"names":[],"mappings":";;AAIA,oDASC;AAVD,8CAA8C;AAC9C,SAAgB,oBAAoB,CAAC,MAAe;IAClD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAM,UAAU,GAAG,SAAS,IAAI,MAAM,IAAI,MAAM,CAAC,OAAO,YAAY,OAAO,CAAC;IAC5E,IAAM,OAAO,GAAG,MAAM,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;IACpE,IAAM,OAAO,GAAG,MAAM,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAEzF,OAAO,UAAU,IAAI,OAAO,IAAI,OAAO,CAAC;AAC1C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.0",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
7
|
-
"generaltranslation": "^6.1.3",
|
|
8
7
|
"next": ">=13.0.0 <16.0.0",
|
|
9
8
|
"react": ">=16.8.0 <20.0.0",
|
|
10
9
|
"react-dom": ">=16.8.0 <20.0.0"
|
|
@@ -122,6 +121,6 @@
|
|
|
122
121
|
"dependencies": {
|
|
123
122
|
"@generaltranslation/supported-locales": "^1.1.2",
|
|
124
123
|
"generaltranslation": "^6.1.3",
|
|
125
|
-
"gt-react": "^8.2.
|
|
124
|
+
"gt-react": "^8.2.11"
|
|
126
125
|
}
|
|
127
126
|
}
|