@tolgee/core 5.8.4-prerelease.f5f66c17.0 → 5.8.5

package/lib/helpers.d.ts

@@ -1,7 +1,7 @@
 import { FallbackGeneral, FallbackLanguageOption } from './types';
 export declare function isPromise(value: any): boolean;
 export declare function valueOrPromise<T, R>(value: T | Promise<T>, callback: (value: T) => R): R | Promise<R>;
-export declare function missingOptionError(option: string): string;
+export declare function missingOptionError(option: string | string[]): string;
 export declare function isObject(item: any): boolean;
 export declare function getFallback(value: FallbackGeneral): string[] | undefined;
 export declare function getFallbackArray(value: FallbackGeneral): string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core",
-  "version": "5.8.4-prerelease.f5f66c17.0",
+  "version": "5.8.5",
   "description": "Library providing ability to translate messages directly in context of developed application.",
   "main": "./dist/tolgee.cjs.js",
   "module": "./dist/tolgee.esm.js",
@@ -68,5 +68,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "b11b00213513ce11a24545604dbb597d3f2198ee"
+  "gitHead": "8f1a59fe553947f4df4340286ab2994bce74db12"
 }

package/src/Controller/Controller.ts

@@ -169,9 +169,6 @@ export function Controller({ options }: StateServiceProps) {
     if (existingLanguage) {
       return;
     }
-    if (!state.getInitialOptions().defaultLanguage) {
-      throw new Error(missingOptionError('defaultLanguage'));
-    }
     const languageOrPromise = pluginService.getInitialLanguage();
     return valueOrPromise(languageOrPromise, (lang) => {
       const language =
@@ -191,11 +188,7 @@ export function Controller({ options }: StateServiceProps) {
       }
     }
     if (!state.getLanguage() && !state.getInitialOptions().defaultLanguage) {
-      if (languageComputable) {
-        throw new Error(missingOptionError('defaultLanguage'));
-      } else {
-        throw new Error(missingOptionError('language'));
-      }
+      throw new Error(missingOptionError(['defaultLanguage', 'language']));
     }
   }
 

package/src/helpers.ts

@@ -19,8 +19,16 @@ export function valueOrPromise<T, R>(
   }
 }
 
-export function missingOptionError(option: string) {
-  return `Tolgee: You need to specify '${option}' option`;
+export function missingOptionError(option: string | string[]) {
+  const options = (Array.isArray(option) ? option : [option]).map(
+    (val) => `'${val}'`
+  );
+
+  const lastPart = options.slice(-2).join(' or ');
+  const firstPart = options.slice(0, -2);
+  const stringifiedOptions = [...firstPart, lastPart].join(', ');
+
+  return `Tolgee: You need to specify ${stringifiedOptions} option`;
 }
 
 export function isObject(item: any) {