feat: voerkai18n extract 支持指定提取目录

docs/zh/guide/intro/history.md

@@ -1,5 +1,15 @@
 # 更新日志<!-- {docsify-ignore-all} -->
 
+## V2.1.10
+
+- **[特性]**  `@voerkai18n/cli`的`extract`原来总是从src中提取文本，现在支持指定从哪个文件夹中提取文本。
+
+```shell
+# 从public文件夹中提取文本
+voerkai18n extract public          
+```
+
+
 ## V2.1.9
 
 - **[Build]** 将`@voerkai18n/react`对`react`的版本依赖降低到`16.9.0`，以支持低版本的`react`。

examples/vue3-ts/src/components/china.vue

@@ -20,6 +20,7 @@ export default {
         <h3>{{ t("成立于{}年",1949)}} </h3>
         <h3>{{ t("首都：北京")}} </h3>
         <h3>{{ t("首都：{city}",{city:"北京"})}} </h3>
+        <h3>{{ t("{count}人在等你聊天哦",{count:100}) }} </h3>
     </div>
 </template>
 

examples/vue3-ts/src/languages/cht.ts

@@ -22,5 +22,6 @@ export default {
     "21": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2})}",
     "22": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2,precision:4})}",
     "23": "hello",
-    "24": "首都：{city}"
+    "24": "首都：{city}",
+    "25": "{count}人在等你聊天哦"
 }

examples/vue3-ts/src/languages/en.ts

@@ -22,5 +22,6 @@ export default {
     "21": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2})}",
     "22": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2,precision:4})}",
     "23": "Hello",
-    "24": "English：{city}"
+    "24": "English：{city}",
+    "25": "{count} people are waiting for you to chat"
 }

examples/vue3-ts/src/languages/idMap.ts

@@ -22,5 +22,6 @@ export default {
     "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2})}": 21,
     "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2,precision:4})}": 22,
     "hello": 23,
-    "首都：{city}": 24
+    "首都：{city}": 24,
+    "{count}人在等你聊天哦": 25
 }

examples/vue3-ts/src/languages/jp.ts

@@ -22,5 +22,6 @@ export default {
     "21": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2})}",
     "22": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2,precision:4})}",
     "23": "hello",
-    "24": "首都：{city}"
+    "24": "首都：{city}",
+    "25": "{count}人在等你聊天哦"
 }

examples/vue3-ts/src/languages/translates/default.json

@@ -191,5 +191,13 @@
         "$files": [
             "components\\china.vue"
         ]
+    },
+    "{count}人在等你聊天哦": {
+        "en": "{count} people are waiting for you to chat",
+        "jp": "{count}人在等你聊天哦",
+        "cht": "{count}人在等你聊天哦",
+        "$files": [
+            "components\\china.vue"
+        ]
     }
 }

examples/vue3-ts/src/languages/zh.ts

@@ -22,5 +22,6 @@ export default {
     "21": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2})}",
     "22": "{ value | currency({symbol:'￥￥',prefix:'人民币:',suffix:'元整',unit:2,precision:4})}",
     "23": "hello",
-    "24": "首都：{city}"
+    "24": "首都：{city}",
+    "25": "{count}人在等你聊天哦"
 }

package.json

@@ -35,6 +35,7 @@
         "prettier": "^2.7.1",
         "semver": "^7.5.4",
         "shelljs": "^0.8.5",
+        "turbo": "^2.1.2",
         "vinyl": "^2.2.1",
         "yalc": "1.0.0-pre.53",
         "yorkie": "^2.0.0"
@@ -43,11 +44,12 @@
         "tips": "请安装JsonComments插件,详见https://github.com/zhangfisher/json_comments_extension",
         "package.json": {
             "scripts.test:runtime": "运行@voerkai18n/runtime单元测试",
-            "scripts.build:all": "构建所有包", 
+            "scripts.build:all": "构建所有包",
             "scripts.version:patch:all": "升级所有包的Patch版本号",
             "scripts.changeset": "当更新后执行以更新变更历史",
             "scripts.sync": "同步淘宝镜像",
             "scripts.release:all": "一健自动化发布所有包"
         }
-    }
+    }, 
+    "packageManager": "[email protected]"
 }

packages/cli/extract.command.js

@@ -86,8 +86,8 @@ program
     .option('-e, --exclude <folders>', t('排除要扫描的文件夹，多个用逗号分隔'))
     .option('-u, --updateMode <value>', t('本次提取内容与已存在内容的数据合并策略,默认取值sync=同步,overwrite=覆盖,merge=合并'), 'sync')
     .option('-f, --filetypes <values...> ', t('要扫描的文件类型'),[])
-    .argument('[location]', t('工程项目所在目录'),"./")
-    .hook("preAction",async function(location){
+    .argument('[location]', t('指定从该目录提取'))
+    .hook("preAction",async function(){
         await i18nScope.change(getCliLanguage())
     })
     .action(async (location,options) => {
@@ -99,7 +99,8 @@ program
 
         logger.log(t("工程目录：{}"), options.srcPath)
         logger.log(t("语言目录：{}"),options.entry)
-        extract(options.srcPath,options)
+        const extractFrom =location==undefined ? location : (path.isAbsolute(location) ? location : path.join(process.cwd(),location))
+        extract(extractFrom || options.srcPath,options)
     });
 
 

packages/cli/languages/cht.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "創建語言包資料夾",
     "87": "生成語言設定檔settings.json",
     "88": "初始化語言上下文",
-    "89": "調用翻譯API時出錯：{}"
+    "89": "調用翻譯API時出錯：{}",
+    "90": "指定從該目錄選取"
 }

packages/cli/languages/de.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Ordner für Sprachpakete erstellen",
     "87": "Sprachkonfigurationsdatei settings.json generieren",
     "88": "Sprachkontext initialisieren",
-    "89": "Fehler beim Aufruf der Übersetzungs-API: {}"
+    "89": "Fehler beim Aufruf der Übersetzungs-API: {}",
+    "90": "Geben Sie an, aus diesem Verzeichnis zu extrahieren"
 }

packages/cli/languages/en.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Create Language Pack Folder",
     "87": "Generate language configuration file settings.json",
     "88": "Initialize Language Context",
-    "89": "Error calling translation API: {}"
+    "89": "Error calling translation API: {}",
+    "90": "Specify to extract from this directory"
 }

packages/cli/languages/fra.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Créer un dossier Language Pack",
     "87": "Générer le profil de langue settings.json",
     "88": "Initialiser le contexte linguistique",
-    "89": "Erreur lors de l'appel de l'API de traduction: {variable}"
+    "89": "Erreur lors de l'appel de l'API de traduction: {variable}",
+    "90": "Spécifie l'extraction à partir de ce répertoire"
 }

packages/cli/languages/idMap.js

@@ -87,5 +87,6 @@ module.exports = {
     "创建语言包文件夹": 86,
     "生成语言配置文件settings.json": 87,
     "初始化语言上下文": 88,
-    "调用翻译API时出错:{}": 89
+    "调用翻译API时出错:{}": 89,
+    "指定从该目录提取": 90
 }

packages/cli/languages/index.js

@@ -2,7 +2,7 @@
  * 注意：执行compile命令会重新生成本文件，所以请不要修改本文件
  */
 const idMap = require("./idMap")
-const { translate,VoerkaI18nScope  } =  require("../../runtime/dist")
+const { translate,VoerkaI18nScope  } =  require("@voerkai18n/runtime")
 const defaultFormatters = require("./formatters/zh.js")
 const defaultMessages =  require("./zh.js")      
 const storage = require("./storage.js")

packages/cli/languages/it.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Crea cartella Language Pack",
     "87": "Genera impostazioni del file di configurazione della lingua.json",
     "88": "Inizializza contesto linguistico",
-    "89": "Errore nel chiamare API di traduzione: {}"
+    "89": "Errore nel chiamare API di traduzione: {}",
+    "90": "Specifica da estrarre da questa directory"
 }

packages/cli/languages/jp.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Language Packフォルダの作成",
     "87": "言語プロファイルsettings.jsonを生成する",
     "88": "言語コンテキストの初期化",
-    "89": "翻訳APIの呼び出し中にエラーが発生しました:{}"
+    "89": "翻訳APIの呼び出し中にエラーが発生しました:{}",
+    "90": "ディレクトリからの抽出の指定"
 }

packages/cli/languages/kor.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "언어 팩 폴더 만들기",
     "87": "언어 구성 파일 생성 settings.json",
     "88": "언어 컨텍스트 초기화",
-    "89": "번역 API를 호출하는 중 오류 발생: {}"
+    "89": "번역 API를 호출하는 중 오류 발생: {}",
+    "90": "디렉토리에서 추출 지정"
 }

packages/cli/languages/ru.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Создание папки языковых пакетов",
     "87": "Создание языкового профиля settings.json",
     "88": "Контекст языка инициализации",
-    "89": "Ошибка вызова интерфейса перевода: {Variable}"
+    "89": "Ошибка вызова интерфейса перевода: {Variable}",
+    "90": "Назначить извлечение из каталога"
 }

packages/cli/languages/spa.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "Crear una carpeta de paquetes de idiomas",
     "87": "Generar el archivo de configuración del lenguaje settings.json",
     "88": "Iniciar el contexto del lenguaje",
-    "89": "Se produjo un error al llamar a la API de traducción: @ variable.."
+    "89": "Se produjo un error al llamar a la API de traducción: @ variable..",
+    "90": "Especifica la extracción de este catálogo"
 }

packages/cli/languages/translates/default.json

@@ -1250,5 +1250,19 @@
         "$files": [
             "translate.command.js"
         ]
+    },
+    "指定从该目录提取": {
+        "cht": "指定從該目錄選取",
+        "en": "Specify to extract from this directory",
+        "de": "Geben Sie an, aus diesem Verzeichnis zu extrahieren",
+        "jp": "ディレクトリからの抽出の指定",
+        "fra": "Spécifie l'extraction à partir de ce répertoire",
+        "spa": "Especifica la extracción de este catálogo",
+        "kor": "디렉토리에서 추출 지정",
+        "ru": "Назначить извлечение из каталога",
+        "it": "Specifica da estrarre da questa directory",
+        "$files": [
+            "extract.command.js"
+        ]
     }
 }

packages/cli/languages/zh.js

@@ -87,5 +87,6 @@ module.exports = {
     "86": "创建语言包文件夹",
     "87": "生成语言配置文件settings.json",
     "88": "初始化语言上下文",
-    "89": "调用翻译API时出错:{}"
+    "89": "调用翻译API时出错:{}",
+    "90": "指定从该目录提取"
 }

packages/cli/translate.command.js

@@ -112,6 +112,7 @@ async function translateMessages(messages={},from="zh",to="en",options={}){
     try{
         translatedMessages =await provider.translate(replacedMessages,from,to)
     }catch(e){
+        console.error(e)
         throw new Error(t('调用翻译API时出错:{}',e.message))
     }