webgal-parser 4.4.15 → 4.5.2

package/build/cjs/index.cjs

@@ -436,8 +436,9 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
     let parsedCommand; // 解析后的命令
     let commandRaw;
     // 正式开始解析
-    // 去分号，前面已做，这里不再需要
-    let newSentenceRaw = sentenceRaw.split(';')[0];
+    // 去分号
+    let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+    newSentenceRaw = newSentenceRaw.replaceAll('\\;', ';');
     if (newSentenceRaw === '') {
         // 注释提前返回
         return {
@@ -487,12 +488,12 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
             args.push(e);
         }
     }
-    content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+    content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
     sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
     subScene = subSceneScanner(command, content); // 扫描语句携带子场景
     return {
         command: command,
-        commandRaw: commandRaw,
+        commandRaw: commandRaw.trim(),
         content: content,
         args: args,
         sentenceAssets: sentenceAssets,

package/build/es/index.js

@@ -432,8 +432,9 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
     let parsedCommand; // 解析后的命令
     let commandRaw;
     // 正式开始解析
-    // 去分号，前面已做，这里不再需要
-    let newSentenceRaw = sentenceRaw.split(';')[0];
+    // 去分号
+    let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+    newSentenceRaw = newSentenceRaw.replaceAll('\\;', ';');
     if (newSentenceRaw === '') {
         // 注释提前返回
         return {
@@ -483,12 +484,12 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
             args.push(e);
         }
     }
-    content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+    content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
     sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
     subScene = subSceneScanner(command, content); // 扫描语句携带子场景
     return {
         command: command,
-        commandRaw: commandRaw,
+        commandRaw: commandRaw.trim(),
         content: content,
         args: args,
         sentenceAssets: sentenceAssets,

package/build/umd/index.global.js

@@ -435,8 +435,9 @@ var webgalParser = (function (exports) {
       let parsedCommand; // 解析后的命令
       let commandRaw;
       // 正式开始解析
-      // 去分号，前面已做，这里不再需要
-      let newSentenceRaw = sentenceRaw.split(';')[0];
+      // 去分号
+      let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+      newSentenceRaw = newSentenceRaw.replaceAll('\\;', ';');
       if (newSentenceRaw === '') {
           // 注释提前返回
           return {
@@ -486,12 +487,12 @@ var webgalParser = (function (exports) {
               args.push(e);
           }
       }
-      content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+      content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
       sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
       subScene = subSceneScanner(command, content); // 扫描语句携带子场景
       return {
           command: command,
-          commandRaw: commandRaw,
+          commandRaw: commandRaw.trim(),
           content: content,
           args: args,
           sentenceAssets: sentenceAssets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.4.15",
+  "version": "4.5.2",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",

package/src/scriptParser/scriptParser.ts

@@ -35,8 +35,9 @@ export const scriptParser = (
 
   // 正式开始解析
 
-  // 去分号，前面已做，这里不再需要
-  let newSentenceRaw = sentenceRaw.split(';')[0];
+  // 去分号
+  let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+  newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
   if (newSentenceRaw === '') {
     // 注释提前返回
     return {
@@ -56,7 +57,11 @@ export const scriptParser = (
   // 没有command，说明这是一条连续对话或单条语句
   if (getCommandResult === null) {
     commandRaw = newSentenceRaw;
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+    parsedCommand = commandParser(
+      commandRaw,
+      ADD_NEXT_ARG_LIST,
+      SCRIPT_CONFIG_MAP,
+    );
     command = parsedCommand.type;
     for (const e of parsedCommand.additionalArgs) {
       // 由于是连续对话，所以我们去除 speaker 参数。
@@ -72,7 +77,11 @@ export const scriptParser = (
       getCommandResult.index + 1,
       newSentenceRaw.length,
     );
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+    parsedCommand = commandParser(
+      commandRaw,
+      ADD_NEXT_ARG_LIST,
+      SCRIPT_CONFIG_MAP,
+    );
     command = parsedCommand.type;
     for (const e of parsedCommand.additionalArgs) {
       args.push(e);
@@ -91,12 +100,12 @@ export const scriptParser = (
       args.push(e);
     }
   }
-  content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+  content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
   sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
   subScene = subSceneScanner(command, content); // 扫描语句携带子场景
   return {
     command: command, // 语句类型
-    commandRaw: commandRaw, // 命令原始内容，方便调试
+    commandRaw: commandRaw.trim(), // 命令原始内容，方便调试
     content: content, // 语句内容
     args: args, // 参数列表
     sentenceAssets: sentenceAssets, // 语句携带的资源列表