Merge pull request #781 from HardyNLee/fix-parser

fix: parser trim behavior

Author: MakinoharaShoko

packages/parser/src/sceneParser.ts

@@ -29,7 +29,7 @@ export const sceneParser = (
   ADD_NEXT_ARG_LIST: commandType[],
   SCRIPT_CONFIG_MAP: ConfigMap,
 ): IScene => {
-  const rawSentenceList = rawScene.split('\n'); // 原始句子列表
+  const rawSentenceList = rawScene.replaceAll('\r', '').split('\n'); // 原始句子列表
 
   // 去分号留到后面去做了，现在注释要单独处理
   const rawSentenceListWithoutEmpty = rawSentenceList;

packages/parser/src/scriptParser/argsParser.ts

@@ -23,10 +23,10 @@ export function argsParser(
   });
   rawArgsList.forEach((e) => {
     const equalSignIndex = e.indexOf('=');
-    let argName = e.slice(0, equalSignIndex);
-    let argValue: string | undefined = e.slice(equalSignIndex + 1);
+    let argName = e.slice(0, equalSignIndex).trim();
+    let argValue: string | undefined = e.slice(equalSignIndex + 1).trim();
     if (equalSignIndex < 0) {
-      argName = e;
+      argName = e.trim();
       argValue = undefined;
     }
     // 判断是不是语音参数

packages/parser/src/scriptParser/scriptParser.ts

@@ -36,14 +36,16 @@ export const scriptParser = (
   // 正式开始解析
 
   // 去分号
-  let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+  const commentSplit = sentenceRaw.split(/(?<!\\);/);
+  let newSentenceRaw = commentSplit[0].trim();
   newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
+  const sentenceComment = commentSplit[1] ?? '';
   if (newSentenceRaw === '') {
     // 注释提前返回
     return {
       command: commandType.comment, // 语句类型
       commandRaw: 'comment', // 命令原始内容，方便调试
-      content: sentenceRaw.split(';')[1] ?? '', // 语句内容
+      content: sentenceComment.trim(), // 语句内容
       args: [{ key: 'next', value: true }], // 参数列表
       sentenceAssets: [], // 语句携带的资源列表
       subScene: [], // 语句携带的子场景