From bcddc3974ed7b54b8963d5bc646e6173babc3b1b Mon Sep 17 00:00:00 2001 From: BANKA2017 Date: Thu, 21 Nov 2024 01:35:16 +0800 Subject: [PATCH] fix: some import issues fix: rollup plugin issue remove: `lib/*` from package update: move types from `lib/*` to `dist/esm/*` --- .npmignore | 3 +-- package.json | 5 +++-- src/index.browser.ts | 4 ++-- src/index.ts | 6 +++--- src/language.ts | 2 +- src/source/watson.ts | 4 ++-- src/types.ts | 2 +- tsconfig.json | 1 + 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.npmignore b/.npmignore index f4e318d..eaf2987 100644 --- a/.npmignore +++ b/.npmignore @@ -3,5 +3,4 @@ !/dist/** !LICENSE !README.md -!package.json -!/lib/** \ No newline at end of file +!package.json \ No newline at end of file diff --git a/package.json b/package.json index 4b84be8..da457c2 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,11 @@ "bugs": { "url": "https://github.com/BANKA2017/translator-utils/issues" }, - "main": "lib/index.js", + "main": "./dist/esm/index.js", + "types": "./dist/esm/index.d.ts", "exports": { ".": { + "types": "./dist/esm/index.d.ts", "workerd": { "default": "./dist/esm/translator.mod.js" }, @@ -20,7 +22,6 @@ "default": "./dist/esm/index.js" } }, - "./lib/*": "./lib/*", "./package.json": "./package.json" }, "type": "module", diff --git a/src/index.browser.ts b/src/index.browser.ts index 4714b9d..68f3757 100644 --- a/src/index.browser.ts +++ b/src/index.browser.ts @@ -3,8 +3,8 @@ import { GoogleBrowserTranslate, GoogleBrowserTranslateV2 } from './source/googl import { MicrosoftBrowserTranslator } from './source/microsoft.js' import { SogouBrowserTranslator } from './source/sogou.js' -import type { TranslatorFunction } from 'types.js' -import type { BING_LIST, GOOGLE_LIST, SOGOU_LIST, YANDEX_LIST } from 'language.js' +import type { TranslatorFunction } from './types.js' +import type { BING_LIST, GOOGLE_LIST, SOGOU_LIST, YANDEX_LIST } from './language.js' const Translator: TranslatorFunction = async (text = '', platform, source, target, raw, ext = {}) => { let result = { content: '', message: '' } diff --git a/src/index.ts b/src/index.ts index a75ef48..dd1571e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,11 +4,11 @@ import { GoogleTranslate, GoogleBrowserTranslate, GoogleBrowserTranslateV2, Goog import { MicrosoftTranslator, MicrosoftBrowserTranslator, GetMicrosoftBrowserTranslatorAuth, GetMicrosoftTranslatorToken, MicrosoftBrowserPredict, MicrosoftTTS, MicrosoftBrowserTTS } from './source/microsoft.js' import { SogouBrowserTranslator, SogouTTS } from './source/sogou.js' import { YandexDetect, YandexTranslator, YandexBrowserTranslator } from './source/yandex.js' -import { WatsonDetect, WatsonTranslator } from 'source/watson.js' +import { WatsonDetect, WatsonTranslator } from './source/watson.js' import { IsChs, IsCht } from './misc.js' -import type { TranslatorFunction } from 'types.js' -import type { BAIDU_LIST, BING_LIST, DEEPL_LIST, GOOGLE_LIST, SOGOU_LIST, WATSON_LIST, YANDEX_LIST } from 'language.js' +import type { TranslatorFunction } from './types.js' +import type { BAIDU_LIST, BING_LIST, DEEPL_LIST, GOOGLE_LIST, SOGOU_LIST, WATSON_LIST, YANDEX_LIST } from './language.js' const Translator: TranslatorFunction = async (text = '', platform, source, target, raw, ext = {}) => { let result = { content: '', message: '' } diff --git a/src/language.ts b/src/language.ts index 509bca1..ab8532c 100644 --- a/src/language.ts +++ b/src/language.ts @@ -1,4 +1,4 @@ -import type { TargetFilter } from 'types.js' +import type { TargetFilter } from './types.js' export type GOOGLE_LIST = 'aa'|'ab'|'ace'|'ach'|'af'|'ak'|'alz'|'am'|'ar'|'as'|'av'|'awa'|'ay'|'az'|'ba'|'bal'|'ban'|'bbc'|'bci'|'be'|'bem'|'ber'|'ber-latn'|'bew'|'bg'|'bho'|'bik'|'bm'|'bm-nkoo'|'bn'|'bo'|'br'|'bs'|'bts'|'btx'|'bua'|'ca'|'ce'|'ceb'|'cgg'|'ch'|'chk'|'chm'|'ckb'|'cnh'|'co'|'crh'|'crs'|'cs'|'cv'|'cy'|'da'|'de'|'din'|'doi'|'dov'|'dv'|'dyu'|'dz'|'ee'|'el'|'en'|'eo'|'es'|'et'|'eu'|'fa'|'fa-af'|'ff'|'fi'|'fj'|'fo'|'fon'|'fr'|'fur'|'fy'|'ga'|'gaa'|'gd'|'gl'|'gn'|'gom'|'gu'|'gv'|'ha'|'haw'|'hi'|'hil'|'hmn'|'hr'|'hrx'|'ht'|'hu'|'hy'|'iba'|'id'|'ig'|'ilo'|'is'|'it'|'iw'|'ja'|'jam'|'jw'|'ka'|'kac'|'kek'|'kg'|'kha'|'kk'|'kl'|'km'|'kn'|'ko'|'kr'|'kri'|'ktu'|'ku'|'kv'|'ky'|'la'|'lb'|'lg'|'li'|'lij'|'lmo'|'ln'|'lo'|'lt'|'ltg'|'luo'|'lus'|'lv'|'mad'|'mai'|'mak'|'mam'|'mfe'|'mg'|'mh'|'mi'|'min'|'mk'|'ml'|'mn'|'mni-mtei'|'mr'|'ms'|'ms-arab'|'mt'|'mwr'|'my'|'ndc-zw'|'ne'|'new'|'nhe'|'nl'|'no'|'nr'|'nso'|'nus'|'ny'|'oc'|'om'|'or'|'os'|'pa'|'pa-arab'|'pag'|'pam'|'pap'|'pl'|'ps'|'pt'|'pt-pt'|'qu'|'rn'|'ro'|'rom'|'ru'|'rw'|'sa'|'sah'|'sat-latn'|'scn'|'sd'|'se'|'sg'|'shn'|'si'|'sk'|'sl'|'sm'|'sn'|'so'|'sq'|'sr'|'ss'|'st'|'su'|'sus'|'sv'|'sw'|'szl'|'ta'|'tcy'|'te'|'tet'|'tg'|'th'|'ti'|'tiv'|'tk'|'tl'|'tn'|'to'|'tpi'|'tr'|'trp'|'ts'|'tt'|'tum'|'ty'|'tyv'|'udm'|'ug'|'uk'|'ur'|'uz'|'ve'|'vec'|'vi'|'war'|'wo'|'xh'|'yi'|'yo'|'yua'|'yue'|'zap'|'zh-cn'|'zh-tw'|'zu' export const GOOGLE_LANGUAGE: TargetFilter['google'][] = ['aa','ab','ace','ach','af','ak','alz','am','ar','as','av','awa','ay','az','ba','bal','ban','bbc','bci','be','bem','ber','ber-latn','bew','bg','bho','bik','bm','bm-nkoo','bn','bo','br','bs','bts','btx','bua','ca','ce','ceb','cgg','ch','chk','chm','ckb','cnh','co','crh','crs','cs','cv','cy','da','de','din','doi','dov','dv','dyu','dz','ee','el','en','eo','es','et','eu','fa','fa-af','ff','fi','fj','fo','fon','fr','fur','fy','ga','gaa','gd','gl','gn','gom','gu','gv','ha','haw','hi','hil','hmn','hr','hrx','ht','hu','hy','iba','id','ig','ilo','is','it','iw','ja','jam','jw','ka','kac','kek','kg','kha','kk','kl','km','kn','ko','kr','kri','ktu','ku','kv','ky','la','lb','lg','li','lij','lmo','ln','lo','lt','ltg','luo','lus','lv','mad','mai','mak','mam','mfe','mg','mh','mi','min','mk','ml','mn','mni-mtei','mr','ms','ms-arab','mt','mwr','my','ndc-zw','ne','new','nhe','nl','no','nr','nso','nus','ny','oc','om','or','os','pa','pa-arab','pag','pam','pap','pl','ps','pt','pt-pt','qu','rn','ro','rom','ru','rw','sa','sah','sat-latn','scn','sd','se','sg','shn','si','sk','sl','sm','sn','so','sq','sr','ss','st','su','sus','sv','sw','szl','ta','tcy','te','tet','tg','th','ti','tiv','tk','tl','tn','to','tpi','tr','trp','ts','tt','tum','ty','tyv','udm','ug','uk','ur','uz','ve','vec','vi','war','wo','xh','yi','yo','yua','yue','zap','zh-cn','zh-tw','zu'] diff --git a/src/source/watson.ts b/src/source/watson.ts index 393151d..c1ea8af 100644 --- a/src/source/watson.ts +++ b/src/source/watson.ts @@ -1,7 +1,7 @@ import { WATSON_LANGUAGE } from 'language.js' -import { SupportedLanguage } from 'misc.js' +import { SupportedLanguage } from '../misc.js' import axiosFetch from 'translator-utils-axios-helper' -import { TranslatorModuleFunction } from 'types.js' +import type { TranslatorModuleFunction } from '../types.js' const WatsonDetect = async (text: string | string[] = ''): Promise => { if (!text) { diff --git a/src/types.ts b/src/types.ts index 9f22758..5882adb 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,4 @@ -import type { BAIDU_LIST, BAIDU_TTS_LIST, BING_LIST, BING_TTS_LIST, MICROSOFT_EDGE_TTS_TYPE, DEEPL_LIST, GOOGLE_LIST, SOGOU_LIST, SOGOU_TTS_LIST, YANDEX_LIST, WATSON_LIST } from 'language.js' +import type { BAIDU_LIST, BAIDU_TTS_LIST, BING_LIST, BING_TTS_LIST, MICROSOFT_EDGE_TTS_TYPE, DEEPL_LIST, GOOGLE_LIST, SOGOU_LIST, SOGOU_TTS_LIST, YANDEX_LIST, WATSON_LIST } from './language.js' export type TranslatorModuleFunction

= ( text: string | string[], diff --git a/tsconfig.json b/tsconfig.json index 5771d8e..a83a8ad 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "declaration": true, + "declarationDir": "./dist/esm", // https://github.com/rollup/plugins/issues/1814 "module": "NodeNext" }, "extends": "./tsconfig.rollup.json"