webgal-parser 4.3.13-9 → 4.4.3

package/src/scriptParser/assetsScanner.ts

@@ -1,72 +1,72 @@
-import { arg, commandType, IAsset } from '../interface/sceneInterface';
-import { fileType } from '../interface/assets';
-
-/**
- * 根据语句类型、语句内容、参数列表，扫描该语句可能携带的资源
- * @param command 语句类型
- * @param content 语句内容
- * @param args 参数列表
- * @return {Array<IAsset>} 语句携带的参数列表
- */
-export const assetsScanner = (command: commandType, content: string, args: Array<arg>): Array<IAsset> => {
-  let hasVocalArg = false;
-  const returnAssetsList: Array<IAsset> = [];
-  if (command === commandType.say) {
-    args.forEach((e) => {
-      if (e.key === 'vocal') {
-        hasVocalArg = true;
-        returnAssetsList.push({
-          name: e.value as string,
-          url: e.value as string,
-          lineNumber: 0,
-          type: fileType.vocal,
-        });
-      }
-    });
-  }
-  if (content === 'none' || content === '') {
-    return returnAssetsList;
-  }
-  // 处理语句携带的资源
-  if (command === commandType.changeBg) {
-    returnAssetsList.push({
-      name: content,
-      url: content,
-      lineNumber: 0,
-      type: fileType.background,
-    });
-  }
-  if (command === commandType.changeFigure) {
-    returnAssetsList.push({
-      name: content,
-      url: content,
-      lineNumber: 0,
-      type: fileType.figure,
-    });
-  }
-  if (command === commandType.miniAvatar) {
-    returnAssetsList.push({
-      name: content,
-      url: content,
-      lineNumber: 0,
-      type: fileType.figure,
-    });
-  }
-  if (command === commandType.video) {
-    returnAssetsList.push({
-      name: content,
-      url: content,
-      lineNumber: 0,
-      type: fileType.video,
-    });
-  }
-  if (command === commandType.bgm) {
-    returnAssetsList.push({
-      name: content,
-      url: content,
-      lineNumber: 0,
-      type: fileType.bgm,
-    });
-  }
-  return returnAssetsList;
-};
+import { arg, commandType, IAsset } from '../interface/sceneInterface';
+import { fileType } from '../interface/assets';
+
+/**
+ * 根据语句类型、语句内容、参数列表，扫描该语句可能携带的资源
+ * @param command 语句类型
+ * @param content 语句内容
+ * @param args 参数列表
+ * @return {Array<IAsset>} 语句携带的参数列表
+ */
+export const assetsScanner = (command: commandType, content: string, args: Array<arg>): Array<IAsset> => {
+  let hasVocalArg = false;
+  const returnAssetsList: Array<IAsset> = [];
+  if (command === commandType.say) {
+    args.forEach((e) => {
+      if (e.key === 'vocal') {
+        hasVocalArg = true;
+        returnAssetsList.push({
+          name: e.value as string,
+          url: e.value as string,
+          lineNumber: 0,
+          type: fileType.vocal,
+        });
+      }
+    });
+  }
+  if (content === 'none' || content === '') {
+    return returnAssetsList;
+  }
+  // 处理语句携带的资源
+  if (command === commandType.changeBg) {
+    returnAssetsList.push({
+      name: content,
+      url: content,
+      lineNumber: 0,
+      type: fileType.background,
+    });
+  }
+  if (command === commandType.changeFigure) {
+    returnAssetsList.push({
+      name: content,
+      url: content,
+      lineNumber: 0,
+      type: fileType.figure,
+    });
+  }
+  if (command === commandType.miniAvatar) {
+    returnAssetsList.push({
+      name: content,
+      url: content,
+      lineNumber: 0,
+      type: fileType.figure,
+    });
+  }
+  if (command === commandType.video) {
+    returnAssetsList.push({
+      name: content,
+      url: content,
+      lineNumber: 0,
+      type: fileType.video,
+    });
+  }
+  if (command === commandType.bgm) {
+    returnAssetsList.push({
+      name: content,
+      url: content,
+      lineNumber: 0,
+      type: fileType.bgm,
+    });
+  }
+  return returnAssetsList;
+};

package/src/scriptParser/commandParser.ts

@@ -1,57 +1,57 @@
-import { commandType, parsedCommand } from "../interface/sceneInterface";
-
-/**
- * 处理命令
- * @param commandRaw
- * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
- * @return {parsedCommand} 处理后的命令
- */
-export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): parsedCommand => {
-  let returnCommand: parsedCommand = {
-    type: commandType.say, // 默认是say
-    additionalArgs: []
-  };
-  // 开始处理命令内容
-  const type: commandType = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
-  returnCommand.type = type;
-  // 如果是对话，加上额外的参数
-  if (type === commandType.say) {
-    returnCommand.additionalArgs.push({
-      key: "speaker",
-      value: commandRaw
-    });
-  }
-  returnCommand = addNextArg(returnCommand, type, ADD_NEXT_ARG_LIST);
-  return returnCommand;
-};
-
-/**
- * 根据command原始值判断是什么命令
- * @param command command原始值
- * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
- * @return {commandType} 得到的command类型
- */
-function getCommandType(command: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): commandType {
-  // if (command.match(/if/)) {
-  //   return commandType.if;
-  // }
-  const commandMap = new Map();
-  SCRIPT_CONFIG.forEach((e:any) => {
-    commandMap.set(e.scriptString, e.scriptType);
-  });
-  if (commandMap.has(command)) {
-    return commandMap.get(command);
-  } else return commandType.say;
-}
-
-function addNextArg(commandToParse: parsedCommand, thisCommandType: commandType, ADD_NEXT_ARG_LIST:any) {
-  if (ADD_NEXT_ARG_LIST.includes(thisCommandType)) {
-    commandToParse.additionalArgs.push({
-      key: "next",
-      value: true
-    });
-  }
-  return commandToParse;
-}
+import { commandType, parsedCommand } from "../interface/sceneInterface";
+
+/**
+ * 处理命令
+ * @param commandRaw
+ * @param ADD_NEXT_ARG_LIST
+ * @param SCRIPT_CONFIG
+ * @return {parsedCommand} 处理后的命令
+ */
+export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): parsedCommand => {
+  let returnCommand: parsedCommand = {
+    type: commandType.say, // 默认是say
+    additionalArgs: []
+  };
+  // 开始处理命令内容
+  const type: commandType = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+  returnCommand.type = type;
+  // 如果是对话，加上额外的参数
+  if (type === commandType.say) {
+    returnCommand.additionalArgs.push({
+      key: "speaker",
+      value: commandRaw
+    });
+  }
+  returnCommand = addNextArg(returnCommand, type, ADD_NEXT_ARG_LIST);
+  return returnCommand;
+};
+
+/**
+ * 根据command原始值判断是什么命令
+ * @param command command原始值
+ * @param ADD_NEXT_ARG_LIST
+ * @param SCRIPT_CONFIG
+ * @return {commandType} 得到的command类型
+ */
+function getCommandType(command: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): commandType {
+  // if (command.match(/if/)) {
+  //   return commandType.if;
+  // }
+  const commandMap = new Map();
+  SCRIPT_CONFIG.forEach((e:any) => {
+    commandMap.set(e.scriptString, e.scriptType);
+  });
+  if (commandMap.has(command)) {
+    return commandMap.get(command);
+  } else return commandType.say;
+}
+
+function addNextArg(commandToParse: parsedCommand, thisCommandType: commandType, ADD_NEXT_ARG_LIST:any) {
+  if (ADD_NEXT_ARG_LIST.includes(thisCommandType)) {
+    commandToParse.additionalArgs.push({
+      key: "next",
+      value: true
+    });
+  }
+  return commandToParse;
+}

package/src/scriptParser/contentParser.ts

@@ -1,66 +1,66 @@
-import { commandType } from "../interface/sceneInterface";
-import { fileType } from "../interface/assets";
-
-/**
- * 解析语句内容的函数，主要作用是把文件名改为绝对地址或相对地址（根据使用情况而定）
- * @param contentRaw 原始语句内容
- * @param type 语句类型
- * @param assetSetter
- * @return {string} 解析后的语句内容
- */
-export const contentParser = (contentRaw: string, type: commandType, assetSetter: any) => {
-  if (contentRaw === "none" || contentRaw === "") {
-    return "";
-  }
-  switch (type) {
-    case commandType.playEffect:
-      return assetSetter(contentRaw, fileType.vocal);
-    case commandType.changeBg:
-      return assetSetter(contentRaw, fileType.background);
-    case commandType.changeFigure:
-      return assetSetter(contentRaw, fileType.figure);
-    case commandType.bgm:
-      return assetSetter(contentRaw, fileType.bgm);
-    case commandType.callScene:
-      return assetSetter(contentRaw, fileType.scene);
-    case commandType.changeScene:
-      return assetSetter(contentRaw, fileType.scene);
-    case commandType.miniAvatar:
-      return assetSetter(contentRaw, fileType.figure);
-    case commandType.video:
-      return assetSetter(contentRaw, fileType.video);
-    case commandType.choose:
-      return getChooseContent(contentRaw, assetSetter);
-    case commandType.unlockBgm:
-      return assetSetter(contentRaw, fileType.bgm);
-    case commandType.unlockCg:
-      return assetSetter(contentRaw, fileType.background);
-    default:
-      return contentRaw;
-  }
-};
-
-function getChooseContent(contentRaw: string, assetSetter: any): string {
-  const chooseList = contentRaw.split("|");
-  const chooseKeyList: Array<string> = [];
-  const chooseValueList: Array<string> = [];
-  for (const e of chooseList) {
-    chooseKeyList.push(e.split(":")[0] ?? "");
-    chooseValueList.push(e.split(":")[1] ?? "");
-  }
-  const parsedChooseList = chooseValueList.map((e) => {
-    if (e.match(/\./)) {
-      return assetSetter(e, fileType.scene);
-    } else {
-      return e;
-    }
-  });
-  let ret = "";
-  for (let i = 0; i < chooseKeyList.length; i++) {
-    if (i !== 0) {
-      ret = ret + "|";
-    }
-    ret = ret + `${chooseKeyList[i]}:${parsedChooseList[i]}`;
-  }
-  return ret;
-}
+import { commandType } from "../interface/sceneInterface";
+import { fileType } from "../interface/assets";
+
+/**
+ * 解析语句内容的函数，主要作用是把文件名改为绝对地址或相对地址（根据使用情况而定）
+ * @param contentRaw 原始语句内容
+ * @param type 语句类型
+ * @param assetSetter
+ * @return {string} 解析后的语句内容
+ */
+export const contentParser = (contentRaw: string, type: commandType, assetSetter: any) => {
+  if (contentRaw === "none" || contentRaw === "") {
+    return "";
+  }
+  switch (type) {
+    case commandType.playEffect:
+      return assetSetter(contentRaw, fileType.vocal);
+    case commandType.changeBg:
+      return assetSetter(contentRaw, fileType.background);
+    case commandType.changeFigure:
+      return assetSetter(contentRaw, fileType.figure);
+    case commandType.bgm:
+      return assetSetter(contentRaw, fileType.bgm);
+    case commandType.callScene:
+      return assetSetter(contentRaw, fileType.scene);
+    case commandType.changeScene:
+      return assetSetter(contentRaw, fileType.scene);
+    case commandType.miniAvatar:
+      return assetSetter(contentRaw, fileType.figure);
+    case commandType.video:
+      return assetSetter(contentRaw, fileType.video);
+    case commandType.choose:
+      return getChooseContent(contentRaw, assetSetter);
+    case commandType.unlockBgm:
+      return assetSetter(contentRaw, fileType.bgm);
+    case commandType.unlockCg:
+      return assetSetter(contentRaw, fileType.background);
+    default:
+      return contentRaw;
+  }
+};
+
+function getChooseContent(contentRaw: string, assetSetter: any): string {
+  const chooseList = contentRaw.split("|");
+  const chooseKeyList: Array<string> = [];
+  const chooseValueList: Array<string> = [];
+  for (const e of chooseList) {
+    chooseKeyList.push(e.split(":")[0] ?? "");
+    chooseValueList.push(e.split(":")[1] ?? "");
+  }
+  const parsedChooseList = chooseValueList.map((e) => {
+    if (e.match(/\./)) {
+      return assetSetter(e, fileType.scene);
+    } else {
+      return e;
+    }
+  });
+  let ret = "";
+  for (let i = 0; i < chooseKeyList.length; i++) {
+    if (i !== 0) {
+      ret = ret + "|";
+    }
+    ret = ret + `${chooseKeyList[i]}:${parsedChooseList[i]}`;
+  }
+  return ret;
+}

package/src/scriptParser/scriptParser.ts

@@ -1,87 +1,87 @@
-import { arg, commandType, IAsset, ISentence, parsedCommand } from "../interface/sceneInterface";
-import { commandParser } from "./commandParser";
-import { argsParser } from "./argsParser";
-import { contentParser } from "./contentParser";
-import { assetsScanner } from "./assetsScanner";
-import { subSceneScanner } from "./subSceneScanner";
-
-/**
- * 语句解析器
- * @param sentenceRaw 原始语句
- * @param assetSetter
- * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
- */
-export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any): ISentence => {
-  let command: commandType; // 默认为对话
-  let content: string; // 语句内容
-  let subScene: Array<string>; // 语句携带的子场景（可能没有）
-  const args: Array<arg> = []; // 语句参数列表
-  let sentenceAssets: Array<IAsset>; // 语句携带的资源列表
-  let parsedCommand: parsedCommand; // 解析后的命令
-  let commandRaw: string;
-
-  // 正式开始解析
-
-  // 去分号，前面已做，这里不再需要
-  let newSentenceRaw = sentenceRaw.split(";")[0];
-  if (newSentenceRaw === "") {
-    // 注释提前返回
-    return {
-      command: commandType.comment, // 语句类型
-      commandRaw: "comment", // 命令原始内容，方便调试
-      content: sentenceRaw.split(";")[1] ?? "", // 语句内容
-      args: [{ key: "next", value: true }], // 参数列表
-      sentenceAssets: [], // 语句携带的资源列表
-      subScene: [] // 语句携带的子场景
-    };
-  }
-  // 截取命令
-  const getCommandResult = /:/.exec(newSentenceRaw);
-  /**
-   * 拆分命令和语句，同时处理连续对话。
-   */
-  // 没有command，说明这是一条连续对话或单条语句
-  if (getCommandResult === null) {
-    commandRaw = newSentenceRaw;
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
-    command = parsedCommand.type;
-    for (const e of parsedCommand.additionalArgs) {
-      // 由于是连续对话，所以我们去除 speaker 参数。
-      if (command === commandType.say && e.key === "speaker") {
-        continue;
-      }
-      args.push(e);
-    }
-  } else {
-    commandRaw = newSentenceRaw.substring(0, getCommandResult.index);
-    // 划分命令区域和content区域
-    newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
-    command = parsedCommand.type;
-    for (const e of parsedCommand.additionalArgs) {
-      args.push(e);
-    }
-  }
-  // 截取参数区域
-  const getArgsResult = / -/.exec(newSentenceRaw);
-  // 获取到参数
-  if (getArgsResult) {
-    const argsRaw = newSentenceRaw.substring(getArgsResult.index, sentenceRaw.length);
-    newSentenceRaw = newSentenceRaw.substring(0, getArgsResult.index);
-    for (const e of argsParser(argsRaw, assetSetter)) {
-      args.push(e);
-    }
-  }
-  content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
-  sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
-  subScene = subSceneScanner(command, content); // 扫描语句携带子场景
-  return {
-    command: command, // 语句类型
-    commandRaw: commandRaw, // 命令原始内容，方便调试
-    content: content, // 语句内容
-    args: args, // 参数列表
-    sentenceAssets: sentenceAssets, // 语句携带的资源列表
-    subScene: subScene // 语句携带的子场景
-  };
-};
+import { arg, commandType, IAsset, ISentence, parsedCommand } from "../interface/sceneInterface";
+import { commandParser } from "./commandParser";
+import { argsParser } from "./argsParser";
+import { contentParser } from "./contentParser";
+import { assetsScanner } from "./assetsScanner";
+import { subSceneScanner } from "./subSceneScanner";
+
+/**
+ * 语句解析器
+ * @param sentenceRaw 原始语句
+ * @param assetSetter
+ * @param ADD_NEXT_ARG_LIST
+ * @param SCRIPT_CONFIG
+ */
+export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any): ISentence => {
+  let command: commandType; // 默认为对话
+  let content: string; // 语句内容
+  let subScene: Array<string>; // 语句携带的子场景（可能没有）
+  const args: Array<arg> = []; // 语句参数列表
+  let sentenceAssets: Array<IAsset>; // 语句携带的资源列表
+  let parsedCommand: parsedCommand; // 解析后的命令
+  let commandRaw: string;
+
+  // 正式开始解析
+
+  // 去分号，前面已做，这里不再需要
+  let newSentenceRaw = sentenceRaw.split(";")[0];
+  if (newSentenceRaw === "") {
+    // 注释提前返回
+    return {
+      command: commandType.comment, // 语句类型
+      commandRaw: "comment", // 命令原始内容，方便调试
+      content: sentenceRaw.split(";")[1] ?? "", // 语句内容
+      args: [{ key: "next", value: true }], // 参数列表
+      sentenceAssets: [], // 语句携带的资源列表
+      subScene: [] // 语句携带的子场景
+    };
+  }
+  // 截取命令
+  const getCommandResult = /:/.exec(newSentenceRaw);
+  /**
+   * 拆分命令和语句，同时处理连续对话。
+   */
+  // 没有command，说明这是一条连续对话或单条语句
+  if (getCommandResult === null) {
+    commandRaw = newSentenceRaw;
+    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+    command = parsedCommand.type;
+    for (const e of parsedCommand.additionalArgs) {
+      // 由于是连续对话，所以我们去除 speaker 参数。
+      if (command === commandType.say && e.key === "speaker") {
+        continue;
+      }
+      args.push(e);
+    }
+  } else {
+    commandRaw = newSentenceRaw.substring(0, getCommandResult.index);
+    // 划分命令区域和content区域
+    newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
+    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+    command = parsedCommand.type;
+    for (const e of parsedCommand.additionalArgs) {
+      args.push(e);
+    }
+  }
+  // 截取参数区域
+  const getArgsResult = / -/.exec(newSentenceRaw);
+  // 获取到参数
+  if (getArgsResult) {
+    const argsRaw = newSentenceRaw.substring(getArgsResult.index, sentenceRaw.length);
+    newSentenceRaw = newSentenceRaw.substring(0, getArgsResult.index);
+    for (const e of argsParser(argsRaw, assetSetter)) {
+      args.push(e);
+    }
+  }
+  content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+  sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
+  subScene = subSceneScanner(command, content); // 扫描语句携带子场景
+  return {
+    command: command, // 语句类型
+    commandRaw: commandRaw, // 命令原始内容，方便调试
+    content: content, // 语句内容
+    args: args, // 参数列表
+    sentenceAssets: sentenceAssets, // 语句携带的资源列表
+    subScene: subScene // 语句携带的子场景
+  };
+};

package/src/scriptParser/subSceneScanner.ts

@@ -1,23 +1,23 @@
-/**
- * 扫描子场景
- * @param content 语句内容
- * @return {Array<string>} 子场景列表
- */
-import { commandType } from "../interface/sceneInterface";
-
-export const subSceneScanner = (command: commandType, content: string): Array<string> => {
-  const subSceneList: Array<string> = [];
-  if (command === commandType.changeScene || command === commandType.callScene) {
-    subSceneList.push(content);
-  }
-  if (command === commandType.choose) {
-    const chooseList = content.split("|");
-    const chooseValue = chooseList.map((e) => e.split(":")[1] ?? "");
-    chooseValue.forEach((e) => {
-      if (e.match(/\./)) {
-        subSceneList.push(e);
-      }
-    });
-  }
-  return subSceneList;
-};
+/**
+ * 扫描子场景
+ * @param content 语句内容
+ * @return {Array<string>} 子场景列表
+ */
+import { commandType } from "../interface/sceneInterface";
+
+export const subSceneScanner = (command: commandType, content: string): Array<string> => {
+  const subSceneList: Array<string> = [];
+  if (command === commandType.changeScene || command === commandType.callScene) {
+    subSceneList.push(content);
+  }
+  if (command === commandType.choose) {
+    const chooseList = content.split("|");
+    const chooseValue = chooseList.map((e) => e.split(":")[1] ?? "");
+    chooseValue.forEach((e) => {
+      if (e.match(/\./)) {
+        subSceneList.push(e);
+      }
+    });
+  }
+  return subSceneList;
+};