webgal-parser 4.5.18 → 4.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.5.18",
+  "version": "4.6.2",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",
@@ -17,26 +17,16 @@
   "main": "./build/cjs/index.cjs",
   "author": "Mahiru <Mahiru_@outlook.com>",
   "license": "MPL-2.0",
-  "dependencies": {
-    "chevrotain": "^10.5.0",
-    "cloudlogjs": "^1.0.11",
-    "lodash": "^4.17.21",
-    "tsx": "^3.12.7"
-  },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^23.0.2",
-    "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-typescript": "^9.0.2",
-    "@types/lodash": "^4.14.189",
     "@types/node": "^18.14.0",
     "@vitest/coverage-c8": "^0.28.5",
+    "rimraf": "^3.0.2",
     "rollup": "^3.29.5",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.34.1",
-    "ts-node": "^10.9.1",
     "tslib": "^2.4.1",
+    "tsx": "^3.12.7",
     "typescript": "^4.9.3",
     "vitest": "^0.28.5"
   },

package/src/sceneParser.ts

@@ -5,7 +5,6 @@ import {
   ISentence,
 } from './interface/sceneInterface';
 import { scriptParser } from './scriptParser/scriptParser';
-import uniqWith from 'lodash/uniqWith';
 import { fileType } from './interface/assets';
 import { ConfigMap } from './config/scriptConfig';
 
@@ -38,12 +37,13 @@ export const sceneParser = (
   let assetsList: Array<IAsset> = []; // 场景资源列表
   let subSceneList: Array<string> = []; // 子场景列表
   const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map(
-    (sentence) => {
+    (sentence, index) => {
       const returnSentence: ISentence = scriptParser(
         sentence,
         assetSetter,
         ADD_NEXT_ARG_LIST,
         SCRIPT_CONFIG_MAP,
+        index,
       );
       // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
       assetsList = [...assetsList, ...returnSentence.sentenceAssets];
@@ -53,7 +53,7 @@ export const sceneParser = (
   );
 
   // 开始资源的预加载
-  assetsList = uniqWith(assetsList); // 去重
+  assetsList = deduplicateAssets(assetsList);
   assetsPrefetcher(assetsList);
 
   return {
@@ -64,3 +64,18 @@ export const sceneParser = (
     subSceneList: subSceneList, // 子场景列表
   };
 };
+
+const deduplicateAssets = (assetsList: IAsset[]): IAsset[] => {
+  const seenAssets = new Set<string>();
+  return assetsList.filter((asset) => {
+    if (!asset || typeof asset.url !== 'string' || asset.url === '') {
+      return false;
+    }
+    const assetKey = `${asset.type}:${asset.url}`;
+    if (seenAssets.has(assetKey)) {
+      return false;
+    }
+    seenAssets.add(assetKey);
+    return true;
+  });
+};

package/src/scriptParser/argsParser.ts

@@ -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;

package/src/scriptParser/assetsScanner.ts

@@ -12,6 +12,7 @@ export const assetsScanner = (
   command: commandType,
   content: string,
   args: Array<arg>,
+  lineNumber: number,
 ): Array<IAsset> => {
   let hasVocalArg = false;
   const returnAssetsList: Array<IAsset> = [];
@@ -22,7 +23,7 @@ export const assetsScanner = (
         returnAssetsList.push({
           name: e.value as string,
           url: e.value as string,
-          lineNumber: 0,
+          lineNumber,
           type: fileType.vocal,
         });
       }
@@ -36,7 +37,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.background,
     });
   }
@@ -44,7 +45,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.figure,
     });
   }
@@ -52,7 +53,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.figure,
     });
   }
@@ -60,7 +61,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.video,
     });
   }
@@ -68,7 +69,7 @@ export const assetsScanner = (
     returnAssetsList.push({
       name: content,
       url: content,
-      lineNumber: 0,
+      lineNumber,
       type: fileType.bgm,
     });
   }

package/src/scriptParser/scriptParser.ts

@@ -24,6 +24,7 @@ export const scriptParser = (
   assetSetter: any,
   ADD_NEXT_ARG_LIST: commandType[],
   SCRIPT_CONFIG_MAP: ConfigMap,
+  lineNumber = 0,
 ): ISentence => {
   let command: commandType; // 默认为对话
   let content: string; // 语句内容
@@ -39,7 +40,7 @@ export const scriptParser = (
   const commentSplit = sentenceRaw.split(/(?<!\\);/);
   let newSentenceRaw = commentSplit[0];
   newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
-  const sentenceComment = commentSplit[1] ?? '';
+  const sentenceComment = commentSplit.slice(1).join(';');
   if (newSentenceRaw.trim() === '') {
     // 注释提前返回
     return {
@@ -105,7 +106,7 @@ export const scriptParser = (
   }
 
   content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
-  sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
+  sentenceAssets = assetsScanner(command, content, args, lineNumber); // 扫描语句携带资源
   subScene = subSceneScanner(command, content); // 扫描语句携带子场景
   return {
     command: command, // 语句类型