hevy-shared 1.0.945 → 1.0.946

package/built/filterExercises.d.ts

@@ -1,4 +1,5 @@
-import { EquipmentFilter, Language, LibraryExercise, MuscleGroupFilter, CustomExercise } from './index';
+import { EquipmentFilter, LibraryExercise, MuscleGroupFilter, CustomExercise } from './index';
+import { Language } from './translations';
 export interface SearchableLibraryExercise extends LibraryExercise {
     localized_muscle_group_name: string;
 }

package/built/index.d.ts

@@ -1,5 +1,5 @@
 import { WorkoutDurationMinutes } from './hevyTrainer';
-import { Language } from './translationUtils';
+import { Language } from './translations';
 import { Lookup } from './typeUtils';
 export * from './constants';
 export * from './utils';
@@ -21,7 +21,7 @@ export * from './async';
 export * from './adminPermissions';
 export * from './adjustEventTokens';
 export * from './hevyTrainer';
-export * from './translationUtils';
+export * from './translations';
 export type WeightUnit = 'kg' | 'lbs';
 export declare const isWeightUnit: (x: string) => x is WeightUnit;
 export type DistanceUnit = 'kilometers' | 'miles';

package/built/index.js

@@ -37,7 +37,7 @@ __exportStar(require("./async"), exports);
 __exportStar(require("./adminPermissions"), exports);
 __exportStar(require("./adjustEventTokens"), exports);
 __exportStar(require("./hevyTrainer"), exports);
-__exportStar(require("./translationUtils"), exports);
+__exportStar(require("./translations"), exports);
 const isWeightUnit = (x) => {
     return x === 'kg' || x === 'lbs';
 };

package/built/translations/index.d.ts

@@ -0,0 +1,2 @@
+export * from './translationUtils';
+export * from './types';

package/built/translations/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./translationUtils"), exports);
+__exportStar(require("./types"), exports);

package/built/translations/translationUtils.d.ts

@@ -0,0 +1,2 @@
+import { PositionalTextParams, NamedTextParams, PositionalReactParams, NamedReactParams } from './types';
+export declare function interpolate<T extends string>(str: string, params: PositionalTextParams | NamedTextParams<T> | PositionalReactParams | NamedReactParams<T>): string | (string | number)[];

package/built/translations/translationUtils.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.interpolate = interpolate;
+const hasReact = (params) => Object.values(params).some((v) => v !== null &&
+    v !== undefined &&
+    typeof v !== 'string' &&
+    typeof v !== 'number' &&
+    typeof v !== 'boolean');
+function interpolate(str, params) {
+    if (Array.isArray(params)) {
+        const positionalParams = params;
+        const hasReactParams = hasReact(positionalParams);
+        const re = () => /(%s)/g;
+        let i = 0;
+        if (hasReactParams) {
+            return str
+                .split(/(%s)/g)
+                .filter((w) => !!w)
+                .map((w) => {
+                var _a, _b;
+                const [, key] = (_a = re().exec(w)) !== null && _a !== void 0 ? _a : [];
+                if (!key) {
+                    return w;
+                }
+                else {
+                    return ((_b = positionalParams[i++]) !== null && _b !== void 0 ? _b : (console.error(`Missing param ${i} in the string "${str}"`), w));
+                }
+            });
+        }
+        else {
+            return str.replace(re(), (_) => { var _a; return String((_a = positionalParams[i++]) !== null && _a !== void 0 ? _a : _); });
+        }
+    }
+    else {
+        const namedParams = params;
+        const hasReactParams = hasReact(namedParams);
+        const re = () => /%{([^}]*)}/g;
+        if (hasReactParams) {
+            return str
+                .split(/(%{[^}]*})/g)
+                .filter((w) => !!w)
+                .map((w) => {
+                var _a, _b;
+                const [, key] = (_a = re().exec(w)) !== null && _a !== void 0 ? _a : [];
+                if (!key) {
+                    if (key === '') {
+                        console.error(`Empty param in the string "${str}"`);
+                    }
+                    return w;
+                }
+                else {
+                    return ((_b = namedParams[key]) !== null && _b !== void 0 ? _b : (console.error(`Missing param "${key}" in the string "${str}"`),
+                        w));
+                }
+            });
+        }
+        else {
+            return str.replace(re(), (_, key) => { var _a; return String((_a = namedParams[key]) !== null && _a !== void 0 ? _a : _); });
+        }
+    }
+}

package/built/translations/types.d.ts

@@ -0,0 +1,8 @@
+import { Lookup } from '../typeUtils';
+export declare const supportedLanguages: readonly ["en", "es", "de", "fr", "it", "pt", "tr", "zh_CN", "zh_TW", "ru", "ja", "ko"];
+export type Language = Lookup<typeof supportedLanguages>;
+export declare const isLanguage: (x: string) => x is Language;
+export type PositionalTextParams = (string | number)[];
+export type NamedTextParams<T extends string> = Record<T, string | number>;
+export type PositionalReactParams = (string | number | object)[];
+export type NamedReactParams<T extends string> = Record<T, string | number | object>;

package/built/translations/types.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLanguage = exports.supportedLanguages = void 0;
+const typeUtils_1 = require("../typeUtils");
+exports.supportedLanguages = [
+    'en',
+    'es',
+    'de',
+    'fr',
+    'it',
+    'pt',
+    'tr',
+    'zh_CN',
+    'zh_TW',
+    'ru',
+    'ja',
+    'ko',
+];
+const isLanguage = (x) => (0, typeUtils_1.isInArray)(x, exports.supportedLanguages);
+exports.isLanguage = isLanguage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.945",
+  "version": "1.0.946",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",
@@ -17,12 +17,16 @@
   },
   "exports": {
     ".": "./built/index.js",
-    "./API": "./built/API/index.js"
+    "./API": "./built/API/index.js",
+    "./translations": "./built/translations/index.js"
   },
   "typesVersions": {
     "*": {
       "API": [
         "built/API/index.d.ts"
+      ],
+      "translations": [
+        "built/translations/index.d.ts"
       ]
     }
   },

package/built/translationUtils.d.ts

@@ -1,5 +0,0 @@
-import { Lookup } from './typeUtils';
-export declare const supportedLanguages: readonly ["en", "es", "de", "fr", "it", "pt", "tr", "zh_CN", "zh_TW", "ru", "ja", "ko"];
-export type Language = Lookup<typeof supportedLanguages>;
-export declare const isLanguage: (x: string) => x is Language;
-export declare const interpolate: (str: string, params: any[]) => string;

package/built/translationUtils.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpolate = exports.isLanguage = exports.supportedLanguages = void 0;
-const typeUtils_1 = require("./typeUtils");
-exports.supportedLanguages = [
-    'en',
-    'es',
-    'de',
-    'fr',
-    'it',
-    'pt',
-    'tr',
-    'zh_CN',
-    'zh_TW',
-    'ru',
-    'ja',
-    'ko',
-];
-const isLanguage = (x) => (0, typeUtils_1.isInArray)(x, exports.supportedLanguages);
-exports.isLanguage = isLanguage;
-const interpolate = (str, params) => {
-    let i = 0;
-    return str
-        .replace(/%s/g, () => {
-        i += 1;
-        return params[i - 1];
-    })
-        .replace(/%{([\w-]*)}/g, (__, key) => params[0][key]);
-};
-exports.interpolate = interpolate;