From 759539c39ce1b92e202d5dea68cbd70af581caa2 Mon Sep 17 00:00:00 2001 From: yaoyun8 Date: Thu, 6 Jun 2024 01:07:33 -0700 Subject: [PATCH 1/4] fix: translate log --- scripts/buildMaterials.mjs | 22 +++++++++++----------- scripts/connection.mjs | 24 ++++++++++++------------ scripts/splitMaterials.mjs | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/buildMaterials.mjs b/scripts/buildMaterials.mjs index 01e768b195..65e451df0c 100644 --- a/scripts/buildMaterials.mjs +++ b/scripts/buildMaterials.mjs @@ -36,13 +36,13 @@ const validateComponent = (file, component) => { const requiredList = requiredFields.filter((field) => !fields.includes(field)) if (requiredList.length) { - logger.error(`组件文件 ${file} 缺少必要字段：${requiredList.join('、')}。`) + logger.error(`missing required fields: ${requiredList.join(',')} at ${file}.`) return false } if (!component.npm) { - logger.warn(`组件文件 ${file} 缺少 npm 字段，出码时将不能通过import语句导入组件。`) + logger.warn(`missing the \`npm\` field, and it cannot be imported when coding at ${file}.`) return false } @@ -62,7 +62,7 @@ const validateBlock = (file, block) => { const requiredList = requiredFields.filter((field) => !fields.includes(field)) if (requiredList.length) { - logger.error(`区块文件 ${file} 缺少必要字段：${requiredList.join('、')}。`) + logger.error(`missing required fields: ${requiredList.join(',')} at ${file}.`) return false } @@ -80,7 +80,7 @@ const generateComponents = () => { try { fg([`${materialsDir}/**/*.json`]).then((files) => { if (!files.length) { - logger.warn('物料文件夹为空，请先执行`pnpm splitMaterials`命令拆分物料资产包') + logger.warn('please execute `pnpm splitMaterials` first to split the materials.') } const bundle = { @@ -103,7 +103,7 @@ const generateComponents = () => { if (!material) { const fileFullPath = path.join(process.cwd(), file) - logger.error(`文件格式有误 (${fileFullPath})`) + logger.error(`incorrect file format at ${fileFullPath}.`) return } @@ -155,9 +155,9 @@ const generateComponents = () => { }) }) - logger.success('物料资产包构建成功') + logger.success('materials built.') } catch (error) { - logger.error(`物料资产包构建失败：${error}`) + logger.error(`failed to build materials: ${error}.`) } } @@ -166,13 +166,13 @@ const watcher = chokidar.watch(`${materialsDir}/**/*.json`, { ignoreInitial: tru watcher.on('all', (event, file) => { const eventMap = { - add: '新增', - change: '更新', - unlink: '删除' + add: 'added', + change: 'changed', + unlink: 'deleted' } const fileFullPath = path.join(process.cwd(), file) - logger.info(`${eventMap[event]}组件文件 (${fileFullPath})`) + logger.info(`${fileFullPath} ${eventMap[event]}, rebuilding materials...`) // 监听物料文件变化，更新物料资产包 generateComponents() diff --git a/scripts/connection.mjs b/scripts/connection.mjs index 016f856895..5e921d8a7a 100644 --- a/scripts/connection.mjs +++ b/scripts/connection.mjs @@ -38,10 +38,10 @@ class MysqlConnection { return new Promise((resolve, reject) => { this.connection.connect((error) => { if (error) { - logger.warn('未能连接到数据库，请查看数据库配置是否正确') + logger.warn('unable to connect to the database, please check the database configuration is correct.') reject() } else { - logger.success('数据库连接成功') + logger.success('database connected.') this.connected = true resolve() } @@ -100,11 +100,11 @@ class MysqlConnection { * @returns boolean 校验组件字段是否失败，false-有字段出错 */ isValid(component, file) { - const longtextFields = ['name', 'npm', 'snippets', 'schema_fragment', 'configure', 'component_metadata'] + const longTextFields = ['name', 'npm', 'snippets', 'schema_fragment', 'configure', 'component_metadata'] return Object.entries(component).every(([key, value]) => { - if (longtextFields.includes(key) && value !== null && typeof value !== 'object') { - logger.error(`"${key}" 的值不是有效的JSON (${file})`) + if (longTextFields.includes(key) && value !== null && typeof value !== 'object') { + logger.error(`the value of "${key}" is not valid JSON at ${file}.`) return false } @@ -193,10 +193,10 @@ class MysqlConnection { this.query(sqlContent, component.component) .then(() => { - logger.success(`组件 ${component.component} 数据更新成功`) + logger.success(`${component.component} updated.`) }) .catch((error) => { - logger.error(`组件 ${component.component} 数据更新失败 ${error}`) + logger.error(`failed to update ${component.component}: ${error}.`) }) } @@ -322,11 +322,11 @@ class MysqlConnection { .then((result) => { const id = result.insertId - logger.success(`组件 ${component.component} 数据新增成功`) + logger.success(`${component.component} added.`) this.relationMaterialHistory(id) }) .catch((error) => { - logger.success(`组件 ${component.component} 数据新增失败：${error}`) + logger.success(`add ${component.component} failed：${error}.`) }) } @@ -344,7 +344,7 @@ class MysqlConnection { } }) .catch((error) => { - logger.success(`查询组件 ${component.component} 失败：${error}`) + logger.success(`query ${component.component} failed：${error}.`) }) } @@ -395,11 +395,11 @@ class MysqlConnection { return new Promise((resolve, reject) => { this.query(sqlContent) .then((result) => { - logger.success(`表 ${componentsTableName} 创建成功`) + logger.success(`table ${componentsTableName} created.`) resolve(result) }) .catch((error) => { - logger.success(`表 ${componentsTableName} 创建失败：${error}`) + logger.success(`create table ${componentsTableName} failed：${error}.`) reject(error) }) }) diff --git a/scripts/splitMaterials.mjs b/scripts/splitMaterials.mjs index e81143c0b1..867fb73d73 100644 --- a/scripts/splitMaterials.mjs +++ b/scripts/splitMaterials.mjs @@ -51,9 +51,9 @@ const splitMaterials = () => { fs.outputJsonSync(blockPath, block, { spaces: 2 }) }) - logger.success('拆分物料资产包完成') + logger.success('materials splitted.') } catch (error) { - logger.error(`拆分物料资产包失败： ${error}`) + logger.error(`failed to split materials: ${error}.`) } } From 3b673a92a91978f4fe7772e32f4b4e7b4502ea8c Mon Sep 17 00:00:00 2001 From: yaoyun8 <142570291+yaoyun8@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:27:23 +0800 Subject: [PATCH 2/4] Update scripts/connection.mjs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/connection.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/connection.mjs b/scripts/connection.mjs index 5e921d8a7a..1ca64452d2 100644 --- a/scripts/connection.mjs +++ b/scripts/connection.mjs @@ -344,7 +344,7 @@ class MysqlConnection { } }) .catch((error) => { - logger.success(`query ${component.component} failed：${error}.`) + logger.error(`query ${component.component} failed：${error}.`) }) } From ca000ebb4fb33a4ac5ecf632067eb8aaf6c89608 Mon Sep 17 00:00:00 2001 From: yaoyun8 <142570291+yaoyun8@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:27:39 +0800 Subject: [PATCH 3/4] Update scripts/connection.mjs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/connection.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/connection.mjs b/scripts/connection.mjs index 1ca64452d2..0463a181f4 100644 --- a/scripts/connection.mjs +++ b/scripts/connection.mjs @@ -326,7 +326,7 @@ class MysqlConnection { this.relationMaterialHistory(id) }) .catch((error) => { - logger.success(`add ${component.component} failed：${error}.`) + logger.error(`add ${component.component} failed：${error}.`) }) } From d6ab09db9d20a2c5c8b6d7d6ab0dbf3c661485d4 Mon Sep 17 00:00:00 2001 From: yaoyun8 <142570291+yaoyun8@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:27:46 +0800 Subject: [PATCH 4/4] Update scripts/connection.mjs Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/connection.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/connection.mjs b/scripts/connection.mjs index 0463a181f4..a06c5623ee 100644 --- a/scripts/connection.mjs +++ b/scripts/connection.mjs @@ -399,7 +399,7 @@ class MysqlConnection { resolve(result) }) .catch((error) => { - logger.success(`create table ${componentsTableName} failed：${error}.`) + logger.error(`create table ${componentsTableName} failed：${error}.`) reject(error) }) })