Oak-Team
/
oak-cli
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 19 Wiki Activity

更改了locale的处理文件

This commit is contained in:
Xu Chang 2023-08-16 10:16:35 +08:00
parent 9720cfe290
commit 523a897f37
3 changed files with 99 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
config/babel-plugin/oakI18n.js
View File

@ -97,6 +97,9 @@ function parseFileModuleAndNs(cwd, filename) {
}
}
const oakNsPropName = '#oakNamespace';
const oakModulePropName = '#oakModule';
module.exports = (babel) => {
return {
visitor: {
@ -104,9 +107,7 @@ module.exports = (babel) => {
const { cwd, filename } = state;
const res = resolve(cwd, filename).replace(/\\/g, '/');
// this.props.t/this.t/t
// t('common:detail') 不需要处理 t('detail') 需要处理;
// t(`${common}:${cc}`) 不需要处理 t(`${common}cc`) 需要处理
// 只支持t的参数为字符串或模版字符串
// 处理策略为给第二个参数中加上'#oakNameSpace, #oakModule两个参数，告知t模块此文件相应的位置，再加以处理寻找
if (
/(pages|components)[\w|\W]+(.tsx|.ts|.jsx|.js)$/.test(res)
) {
@ -122,7 +123,57 @@ module.exports = (babel) => {
) {
const { moduleName, ns } = parseFileModuleAndNs(cwd, filename);
const arguments = node.arguments;
const argu0 = arguments && arguments[0];
const [arg0, arg1] = arguments;
assert(arg0);
if (arg1) {
// 一般是对象，也可能是变量，表达式不予考虑
if (t.isObjectExpression(arg1)) {
const { properties } = arg1;
const oakNsProp = properties.find(
ele => t.isStringLiteral(ele.key) && ele.key.value === oakNsPropName
);
if (!oakNsProp) {
properties.push(
t.objectProperty(t.stringLiteral(oakNsPropName), t.stringLiteral(ns)),
t.objectProperty(t.stringLiteral(oakModulePropName), t.stringLiteral(module))
);
}
}
else if (t.isIdentifier(arg1)) {
arguments.splice(1, 1, t.callExpression(
t.memberExpression(
t.identifier('Object'),
t.identifier('assign')
),
[
arg1,
t.objectExpression(
[
t.objectProperty(t.stringLiteral(oakNsPropName), t.stringLiteral(ns)),
t.objectProperty(t.stringLiteral(oakModulePropName), t.stringLiteral(moduleName))
]
)
]
));
}
else {
// 不处理，这里似乎会反复调用，不知道为什么
}
}
else {
// 如果无参数就构造一个对象传入
arguments.push(
t.objectExpression(
[
t.objectProperty(t.stringLiteral(oakNsPropName), t.stringLiteral(ns)),
t.objectProperty(t.stringLiteral(oakModulePropName), t.stringLiteral(moduleName))
]
)
)
}
/* const argu0 = arguments && arguments[0];
if (t.isStringLiteral(argu0)) {
const { value } = argu0;
if (!value.includes(':')) {
@ -197,7 +248,7 @@ module.exports = (babel) => {
}
else {
assert(false, 't函数调用的第一个参数只能是字符串、模板或表达式');
}
} */
}
}
},

26
lib/makeLocale.js
View File

@ -10,17 +10,25 @@ async function make(cmd, watch) {
if (watch) {
args.push('true');
}
const result = cross_spawn_1.default.sync('ts-node', args, {
stdio: 'inherit',
shell: true,
});
// const result2 = spawn.sync('npm -v', [], { stdio: 'inherit', shell: true });
if (result.status === 0) {
(0, tip_style_1.Success)(`${(0, tip_style_1.success)(`make 执行完成`)}`);
if (!watch) {
const result = cross_spawn_1.default.sync('ts-node', args, {
stdio: 'inherit',
shell: true,
});
// const result2 = spawn.sync('npm -v', [], { stdio: 'inherit', shell: true });
if (result.status === 0) {
(0, tip_style_1.Success)(`${(0, tip_style_1.success)(`make 执行完成`)}`);
}
else {
(0, tip_style_1.Error)(`${(0, tip_style_1.error)(`make 执行失败`)}`);
process.exit(1);
}
}
else {
(0, tip_style_1.Error)(`${(0, tip_style_1.error)(`make 执行失败`)}`);
process.exit(1);
(0, cross_spawn_1.default)('ts-node', args, {
stdio: 'inherit',
shell: true,
});
}
}
exports.default = make;

40
src/makeLocale.ts
View File

@ -16,20 +16,32 @@ export default async function make(cmd: any, watch?: boolean) {
if (watch) {
args.push('true');
}
const result = spawn.sync(
'ts-node',
args,
{
stdio: 'inherit',
shell: true,
if (!watch) {
const result = spawn.sync(
'ts-node',
args,
{
stdio: 'inherit',
shell: true,
}
);
// const result2 = spawn.sync('npm -v', [], { stdio: 'inherit', shell: true });
if (result.status === 0) {
Success(`${success(`make 执行完成`)}`);
} else {
Error(`${error(`make 执行失败`)}`);
process.exit(1);
}
);
// const result2 = spawn.sync('npm -v', [], { stdio: 'inherit', shell: true });
if (result.status === 0) {
Success(`${success(`make 执行完成`)}`);
} else {
Error(`${error(`make 执行失败`)}`);
process.exit(1);
}
else {
spawn(
'ts-node',
args,
{
stdio: 'inherit',
shell: true,
}
);
}
}