Merge pull request #387 from translate-tools/386-update-translators-p…

…ackage

Update translators package

package.json

@@ -27,7 +27,7 @@
 		"@popperjs/core": "^2.11.5",
 		"@react-aria/interactions": "^3.9.1",
 		"@react-aria/utils": "^3.13.1",
-		"@translate-tools/core": "^0.2.16",
+		"@translate-tools/core": "^1.0.0",
 		"colord": "^2.9.1",
 		"domtranslator": "^0.0.1",
 		"effector": "^22.4.1",

src/app/Background/TranslatorManager/index.ts

@@ -1,9 +1,9 @@
-import { isLanguageCodeISO639v2 } from '@translate-tools/core/util/languages';
+import { isLanguageCodeISO639v1 } from '@translate-tools/core/languages';
 import {
 	IScheduler,
 	Scheduler,
 	SchedulerWithCache,
-} from '@translate-tools/core/util/Scheduler';
+} from '@translate-tools/core/scheduling';
 
 import { AppConfigType } from '../../../types/runtime';
 import { RecordValues } from '../../../types/utils';
@@ -39,7 +39,7 @@ export class TranslatorManager<Translators extends TranslatorsMap = TranslatorsM
 		return {
 			supportedLanguages: translatorClass
 				.getSupportedLanguages()
-				.filter((lang) => isLanguageCodeISO639v2(lang)),
+				.filter((lang) => isLanguageCodeISO639v1(lang)),
 			isSupportAutodetect: translatorClass.isSupportedAutoFrom(),
 		};
 	}

src/app/Background/index.ts

@@ -1,8 +1,8 @@
 import { isEqual } from 'lodash';
 // Translators
 import { GoogleTranslator } from '@translate-tools/core/translators/GoogleTranslator';
+import { TranslatorConstructor } from '@translate-tools/core/translators/Translator';
 import { YandexTranslator } from '@translate-tools/core/translators/YandexTranslator';
-import { TranslatorClass } from '@translate-tools/core/types/Translator';
 
 import { createSelector } from '../../lib/effector/createSelector';
 import { BergamotTranslator } from '../../lib/translators/bergamot/BergamotTranslator';
@@ -27,7 +27,7 @@ export const embeddedTranslators = {
 /**
  * Map where key is identifier of translator and value is translator constructor
  */
-export type TranslatorsMap = Record<string, TranslatorClass>;
+export type TranslatorsMap = Record<string, TranslatorConstructor>;
 
 /**
  * Background features manager

src/lib/language.tsx

@@ -1,6 +1,6 @@
 import React, { ComponentType, ReactNode } from 'react';
 import browser from 'webextension-polyfill';
-import { langCodes } from '@translate-tools/core/util/languages';
+import { isLanguageCodeISO639v1 } from '@translate-tools/core/languages';
 
 import { isMobileBrowser } from './browser';
 
@@ -100,5 +100,4 @@ export const detectLanguage = async (text: string, reliableOnly = false) => {
 	});
 };
 
-export const isValidLanguage = (language: string) =>
-	(langCodes as readonly string[]).includes(language);
+export const isValidLanguage = (language: string) => isLanguageCodeISO639v1(language);

src/pages/dictionary/layout/DictionaryPage.tsx

@@ -2,7 +2,7 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { useImmutableCallback } from 'react-elegant-ui/esm/hooks/useImmutableCallback';
 import Papa from 'papaparse';
 import { cn } from '@bem-react/classname';
-import { langCodes } from '@translate-tools/core/util/languages';
+import { getLanguageCodesISO639 } from '@translate-tools/core/languages';
 
 import { LayoutFlow } from '../../../components/layouts/LayoutFlow/LayoutFlow';
 import { Page } from '../../../components/layouts/Page/Page';
@@ -30,6 +30,8 @@ import './DictionaryPage.css';
 
 export const cnDictionaryPage = cn('DictionaryPage');
 
+const langCodes = getLanguageCodesISO639('v1');
+
 // TODO: implement as option
 export interface IDictionaryPageProps {
 	confirmDelete?: boolean;

src/pages/options/layout/OptionsPage.utils/generateTree.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import { langCodes } from '@translate-tools/core/util/languages';
+import { getLanguageCodesISO639 } from '@translate-tools/core/languages';
 
 import {
 	getLanguageNameByCode,
@@ -11,6 +11,8 @@ import { capitalizeString } from '../../../../lib/utils';
 
 import { OptionsGroup } from '../OptionsTree/OptionsTree';
 
+const langCodes = getLanguageCodesISO639('v1');
+
 type Options = {
 	clearCacheProcess: boolean;
 	translatorModules: Record<string, string>;

src/requests/backend/translate.ts

@@ -1,5 +1,5 @@
-import { langCode, langCodeWithAuto } from '@translate-tools/core/types/Translator';
-import { ITranslateOptions } from '@translate-tools/core/util/Scheduler/IScheduler';
+import { ISchedulerTranslateOptions } from '@translate-tools/core/scheduling';
+import { langCode, langCodeWithAuto } from '@translate-tools/core/translators/Translator';
 
 import { buildBackendRequest } from '../utils/requestBuilder';
 
@@ -8,7 +8,7 @@ export const [translateFactory, translateRequest] = buildBackendRequest<
 		text: string;
 		from: langCodeWithAuto;
 		to: langCode;
-		options?: ITranslateOptions;
+		options?: ISchedulerTranslateOptions;
 	},
 	string
 >('translate', {
@@ -26,7 +26,7 @@ export const translate = (
 	text: string,
 	from: string,
 	to: string,
-	options?: ITranslateOptions,
+	options?: ISchedulerTranslateOptions,
 ) =>
 	translateRequest({
 		text,

src/requests/backend/translators/index.ts

@@ -1,4 +1,4 @@
-import { TranslatorClass } from '@translate-tools/core/types/Translator';
+import { TranslatorConstructor } from '@translate-tools/core/translators/Translator';
 
 import { embeddedTranslators, TranslatorsMap } from '../../../app/Background';
 
@@ -25,7 +25,9 @@ export const isCustomTranslatorId = (id: string) => id.startsWith('#');
  * Return map with all available translators, where keys is translators id
  */
 export const getTranslatorsClasses = async (): Promise<TranslatorsMap> => {
-	const translatorsMap: Record<string, TranslatorClass> = { ...embeddedTranslators };
+	const translatorsMap: Record<string, TranslatorConstructor> = {
+		...embeddedTranslators,
+	};
 
 	// Validate and collect custom translators
 	const customTranslators = await getTranslators({ order: 'asc' });

src/requests/backend/translators/utils.ts

@@ -1,5 +1,5 @@
-import { TranslatorClass } from '@translate-tools/core/types/Translator';
-import { BaseTranslator as ExternalBaseTranslator } from '@translate-tools/core/util/BaseTranslator';
+import { BaseTranslator as ExternalBaseTranslator } from '@translate-tools/core/translators/BaseTranslator';
+import { TranslatorConstructor } from '@translate-tools/core/translators/Translator';
 
 export const loadTranslator = (code: string) => {
 	// TODO: remove `BaseTranslator`
@@ -51,5 +51,5 @@ export const loadTranslator = (code: string) => {
 		}
 	});
 
-	return translatorClass as TranslatorClass;
+	return translatorClass as TranslatorConstructor;
 };

src/requests/contentscript/pageTranslation/enableTranslatePage.ts

@@ -1,4 +1,4 @@
-import { langCode, langCodeWithAuto } from '@translate-tools/core/types/Translator';
+import { langCode, langCodeWithAuto } from '@translate-tools/core/translators/Translator';
 
 import { type } from '../../../lib/types';
 import { LangCode, LangCodeWithAuto } from '../../../types/runtime';

src/types/runtime.ts

@@ -1,6 +1,6 @@
 import { TypeOf } from 'io-ts';
-import { langCode, langCodeWithAuto } from '@translate-tools/core/types/Translator';
-import { langCodes } from '@translate-tools/core/util/languages';
+import { isLanguageCodeISO639v1 } from '@translate-tools/core/languages';
+import { langCode, langCodeWithAuto } from '@translate-tools/core/translators/Translator';
 
 import { StringLiteralType, type } from '../lib/types';
 
@@ -18,9 +18,9 @@ export const ArrayOfStrings = new type.Type<string[], string[], unknown>(
 export const LangCode = new type.Type<langCode, langCode, unknown>(
 	'LangCode',
 	(input: unknown): input is langCode =>
-		typeof input === 'string' && langCodes.findIndex((i) => i === input) > -1,
+		typeof input === 'string' && isLanguageCodeISO639v1(input),
 	(input, context) =>
-		typeof input === 'string' && langCodes.findIndex((i) => i === input) > -1
+		typeof input === 'string' && isLanguageCodeISO639v1(input)
 			? type.success(input as langCode)
 			: type.failure(input, context),
 	type.identity,
@@ -33,11 +33,9 @@ export const LangCodeWithAuto = new type.Type<
 >(
 	'LangCodeWithAuto',
 	(input: unknown): input is langCodeWithAuto =>
-		input === 'auto' ||
-		(typeof input === 'string' && langCodes.findIndex((i) => i === input) > -1),
+		input === 'auto' || (typeof input === 'string' && isLanguageCodeISO639v1(input)),
 	(input, context) =>
-		input === 'auto' ||
-		(typeof input === 'string' && langCodes.findIndex((i) => i === input) > -1)
+		input === 'auto' || (typeof input === 'string' && isLanguageCodeISO639v1(input))
 			? type.success(input as langCodeWithAuto)
 			: type.failure(input, context),
 	type.identity,