webgal-parser 4.6.3-beta.1 → 4.6.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # WebGAL Parser Changelog
 
+## [4.6.3] - 2026-08-01
+
+正式发布 4.6.3-beta.1 / beta.2 的多行语句支持，另含以下改动。
+
+### Added
+- 新增 `return` 命令，用于从被 `callScene` 调用的场景提前返回
+- `sceneEntry` 新增 `locals` / `writeReturnTo`，承载 `callScene` 传入的局部变量与返回值写回目标
+- 语音参数识别 `.opus` 扩展名
+
+## [4.6.3-beta.2] - 2026-07-31
+
+### Fixed
+- `sceneTextPreProcess`：折叠序列的首行是空行时（例如空行后面紧跟一条续行），整条序列会被静默丢弃，导致预处理后行数变少。这会击穿「解析后语句 index == 文件行号」，进而让存档进度错位。改用 `null` 哨兵区分「不在折叠序列中」与「首行内容为空串」
+
 ## [4.6.3-beta.1] - 2026-07-31
 
 ### Added

package/build/cjs/index.cjs

@@ -607,7 +607,10 @@ function isEmptyLine(line) {
  */
 function sceneTextPreProcessPassTwo(lines) {
     const processedLines = [];
-    let currentMultilineContent = "";
+    // null 表示当前不在多行序列里。这里不能用空串来判断：
+    // 序列的首行本身可能就是空行（比如空行后面紧跟着一条续行），
+    // 那样整条序列会被静默丢弃，破坏「预处理前后行数一致」这个前提。
+    let currentMultilineContent = null;
     let placeHolderLines = [];
     function concat(line) {
         let trimmed = line.trim();
@@ -617,10 +620,16 @@ function sceneTextPreProcessPassTwo(lines) {
         currentMultilineContent = currentMultilineContent + trimmed;
         placeHolderLines.push(placeholderLine(line));
     }
+    /** 把折叠好的整条语句连同补齐行数的占位行一起输出 */
+    function flushMultiline() {
+        processedLines.push(currentMultilineContent, ...placeHolderLines);
+        placeHolderLines = [];
+        currentMultilineContent = null;
+    }
     for (const line of lines) {
         if (line.endsWith('\\')) {
             const trueLine = line.slice(0, -1);
-            if (currentMultilineContent === "") {
+            if (currentMultilineContent === null) {
                 // first line
                 currentMultilineContent = trueLine;
             }
@@ -630,20 +639,17 @@ function sceneTextPreProcessPassTwo(lines) {
             }
             continue;
         }
-        if (currentMultilineContent !== "") {
+        if (currentMultilineContent !== null) {
             // end line
             concat(line);
-            processedLines.push(currentMultilineContent);
-            processedLines.push(...placeHolderLines);
-            placeHolderLines = [];
-            currentMultilineContent = "";
+            flushMultiline();
             continue;
         }
         processedLines.push(line);
     }
     // 场景末行仍以 \ 结尾时循环里没有机会收尾，在这里把累积的内容补出去。
-    if (currentMultilineContent !== "") {
-        processedLines.push(currentMultilineContent, ...placeHolderLines);
+    if (currentMultilineContent !== null) {
+        flushMultiline();
     }
     return processedLines;
 }

package/build/es/index.js

@@ -603,7 +603,10 @@ function isEmptyLine(line) {
  */
 function sceneTextPreProcessPassTwo(lines) {
     const processedLines = [];
-    let currentMultilineContent = "";
+    // null 表示当前不在多行序列里。这里不能用空串来判断：
+    // 序列的首行本身可能就是空行（比如空行后面紧跟着一条续行），
+    // 那样整条序列会被静默丢弃，破坏「预处理前后行数一致」这个前提。
+    let currentMultilineContent = null;
     let placeHolderLines = [];
     function concat(line) {
         let trimmed = line.trim();
@@ -613,10 +616,16 @@ function sceneTextPreProcessPassTwo(lines) {
         currentMultilineContent = currentMultilineContent + trimmed;
         placeHolderLines.push(placeholderLine(line));
     }
+    /** 把折叠好的整条语句连同补齐行数的占位行一起输出 */
+    function flushMultiline() {
+        processedLines.push(currentMultilineContent, ...placeHolderLines);
+        placeHolderLines = [];
+        currentMultilineContent = null;
+    }
     for (const line of lines) {
         if (line.endsWith('\\')) {
             const trueLine = line.slice(0, -1);
-            if (currentMultilineContent === "") {
+            if (currentMultilineContent === null) {
                 // first line
                 currentMultilineContent = trueLine;
             }
@@ -626,20 +635,17 @@ function sceneTextPreProcessPassTwo(lines) {
             }
             continue;
         }
-        if (currentMultilineContent !== "") {
+        if (currentMultilineContent !== null) {
             // end line
             concat(line);
-            processedLines.push(currentMultilineContent);
-            processedLines.push(...placeHolderLines);
-            placeHolderLines = [];
-            currentMultilineContent = "";
+            flushMultiline();
             continue;
         }
         processedLines.push(line);
     }
     // 场景末行仍以 \ 结尾时循环里没有机会收尾，在这里把累积的内容补出去。
-    if (currentMultilineContent !== "") {
-        processedLines.push(currentMultilineContent, ...placeHolderLines);
+    if (currentMultilineContent !== null) {
+        flushMultiline();
     }
     return processedLines;
 }

package/build/umd/index.global.js

@@ -606,7 +606,10 @@ var webgalParser = (function (exports) {
    */
   function sceneTextPreProcessPassTwo(lines) {
       const processedLines = [];
-      let currentMultilineContent = "";
+      // null 表示当前不在多行序列里。这里不能用空串来判断：
+      // 序列的首行本身可能就是空行（比如空行后面紧跟着一条续行），
+      // 那样整条序列会被静默丢弃，破坏「预处理前后行数一致」这个前提。
+      let currentMultilineContent = null;
       let placeHolderLines = [];
       function concat(line) {
           let trimmed = line.trim();
@@ -616,10 +619,16 @@ var webgalParser = (function (exports) {
           currentMultilineContent = currentMultilineContent + trimmed;
           placeHolderLines.push(placeholderLine(line));
       }
+      /** 把折叠好的整条语句连同补齐行数的占位行一起输出 */
+      function flushMultiline() {
+          processedLines.push(currentMultilineContent, ...placeHolderLines);
+          placeHolderLines = [];
+          currentMultilineContent = null;
+      }
       for (const line of lines) {
           if (line.endsWith('\\')) {
               const trueLine = line.slice(0, -1);
-              if (currentMultilineContent === "") {
+              if (currentMultilineContent === null) {
                   // first line
                   currentMultilineContent = trueLine;
               }
@@ -629,20 +638,17 @@ var webgalParser = (function (exports) {
               }
               continue;
           }
-          if (currentMultilineContent !== "") {
+          if (currentMultilineContent !== null) {
               // end line
               concat(line);
-              processedLines.push(currentMultilineContent);
-              processedLines.push(...placeHolderLines);
-              placeHolderLines = [];
-              currentMultilineContent = "";
+              flushMultiline();
               continue;
           }
           processedLines.push(line);
       }
       // 场景末行仍以 \ 结尾时循环里没有机会收尾，在这里把累积的内容补出去。
-      if (currentMultilineContent !== "") {
-          processedLines.push(currentMultilineContent, ...placeHolderLines);
+      if (currentMultilineContent !== null) {
+          flushMultiline();
       }
       return processedLines;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.6.3-beta.1",
+  "version": "4.6.3",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",

package/src/sceneTextPreProcessor.ts

@@ -94,7 +94,10 @@ function isEmptyLine(line: string): boolean {
  */
 function sceneTextPreProcessPassTwo(lines: string[]): string[] {
   const processedLines: string[] = [];
-  let currentMultilineContent = "";
+  // null 表示当前不在多行序列里。这里不能用空串来判断：
+  // 序列的首行本身可能就是空行（比如空行后面紧跟着一条续行），
+  // 那样整条序列会被静默丢弃，破坏「预处理前后行数一致」这个前提。
+  let currentMultilineContent: string | null = null;
   let placeHolderLines: string[] = [];
 
   function concat(line: string) {
@@ -106,11 +109,18 @@ function sceneTextPreProcessPassTwo(lines: string[]): string[] {
     placeHolderLines.push(placeholderLine(line));
   }
 
+  /** 把折叠好的整条语句连同补齐行数的占位行一起输出 */
+  function flushMultiline() {
+    processedLines.push(currentMultilineContent as string, ...placeHolderLines);
+    placeHolderLines = [];
+    currentMultilineContent = null;
+  }
+
   for (const line of lines) {
     if (line.endsWith('\\')) {
       const trueLine = line.slice(0, -1);
 
-      if (currentMultilineContent === "") {
+      if (currentMultilineContent === null) {
         // first line
         currentMultilineContent = trueLine;
       } else {
@@ -120,14 +130,10 @@ function sceneTextPreProcessPassTwo(lines: string[]): string[] {
       continue;
     }
 
-    if (currentMultilineContent !== "") {
+    if (currentMultilineContent !== null) {
       // end line
       concat(line);
-      processedLines.push(currentMultilineContent);
-      processedLines.push(...placeHolderLines);
-
-      placeHolderLines = [];
-      currentMultilineContent = "";
+      flushMultiline();
       continue;
     }
 
@@ -135,8 +141,8 @@ function sceneTextPreProcessPassTwo(lines: string[]): string[] {
   }
 
   // 场景末行仍以 \ 结尾时循环里没有机会收尾，在这里把累积的内容补出去。
-  if (currentMultilineContent !== "") {
-    processedLines.push(currentMultilineContent, ...placeHolderLines);
+  if (currentMultilineContent !== null) {
+    flushMultiline();
   }
 
   return processedLines;