Skip to content

fix: Fix parser vocal named-argument asset resolution #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A-kirami wants to merge 2 commits into
base: dev
Choose a base branch
from
+54 −30
Open

fix: Fix parser vocal named-argument asset resolution #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2d392a
fix(parser): resolve vocal named argument with assetSetter
A-kirami May 6, 2026
63c055d
format code
A-kirami May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 33 additions & 30 deletions packages/parser/src/scriptParser/argsParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,36 +35,39 @@ export function argsParser(
key: 'vocal',
value: assetSetter(e, fileType.vocal),
});
} else {
// 判断是不是省略参数
if (argValue === undefined) {
returnArrayList.push({
key: argName,
value: true,
});
} else {
// 是字符串描述的布尔值
if (argValue === 'true' || argValue === 'false') {
returnArrayList.push({
key: argName,
value: argValue === 'true',
});
} else {
// 是数字
if (!isNaN(Number(argValue))) {
returnArrayList.push({
key: argName,
value: Number(argValue),
});
} else {
// 是普通参数
returnArrayList.push({
key: argName,
value: argValue,
});
}
}
}
} else if (argName === 'vocal' && argValue !== undefined) {
returnArrayList.push({
key: argName,
value: assetSetter(argValue, fileType.vocal),
});
}
// 判断是不是省略参数
else if (argValue === undefined) {
returnArrayList.push({
key: argName,
value: true,
});
}
// 是字符串描述的布尔值
else if (argValue === 'true' || argValue === 'false') {
returnArrayList.push({
key: argName,
value: argValue === 'true',
});
}
// 是数字
else if (!isNaN(Number(argValue))) {
returnArrayList.push({
key: argName,
value: Number(argValue),
});
}
// 是普通参数
else {
returnArrayList.push({
key: argName,
value: argValue,
});
}
});
return returnArrayList;
Expand Down
21 changes: 21 additions & 0 deletions packages/parser/test/parser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,27 @@ test("say statement", async () => {
expect(result.sentenceList).toContainEqual(expectSentenceItem);
});

test("say statement applies asset setter to vocal named argument", async () => {
const parser = new SceneParser((assetList) => {
}, (fileName, assetType) => {
if (assetType === fileType.vocal) {
return `./game/vocal/${fileName}`;
}
return fileName;
}, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);

const result = parser.parse(`say:123 -speaker=xx -vocal=a.mp3;`, 'test', 'test');
const sentence = result.sentenceList[0];

expect(sentence.args).toContainEqual({ key: 'vocal', value: './game/vocal/a.mp3' });
expect(sentence.sentenceAssets).toContainEqual({
name: './game/vocal/a.mp3',
url: './game/vocal/a.mp3',
type: fileType.vocal,
lineNumber: 0,
});
});

test("wait command", async () => {
const parser = new SceneParser((assetList) => {
}, (fileName, assetType) => {
Expand Down
Loading