webgal-parser 4.3.13 → 4.4.4

package/src/parser4/index.ts

@@ -0,0 +1,158 @@
+// (function jsonGrammarOnlyExample() {
+//   // ----------------- Lexer -----------------
+//   const createToken = chevrotain.createToken;
+//   const Lexer = chevrotain.Lexer;
+//
+//   const True = createToken({ name: "True", pattern: /true/ });
+//   const False = createToken({ name: "False", pattern: /false/ });
+//   const LCurly = createToken({ name: "LCurly", pattern: /{/ });
+//   const RCurly = createToken({ name: "RCurly", pattern: /}/ });
+//   const LSquare = createToken({ name: "LSquare", pattern: /\[/ });
+//   const RSquare = createToken({ name: "RSquare", pattern: /]/ });
+//   const Comma = createToken({ name: "Comma", pattern: /,/ });
+//   const Colon = createToken({ name: "Colon", pattern: /:/ });
+//   const Lf = createToken({ name: "LF", pattern: /\n/ });
+//   const Semi = createToken({ name: ";", pattern: /;/ });
+//   const Command = createToken({ name: "Command", pattern: /Command/ });
+//   const ArgS = createToken({ name: " -", pattern: / -/ });
+//   const StringLiteral = createToken({
+//     name: "StringLiteral", pattern: /(?!(?:true|false|Command)\b)\w+/
+//   });
+//   const NumberLiteral = createToken({
+//     name: "NumberLiteral", pattern: /-?(0|[1-9]\d*)(\.\d+)?([eE][+-]?\d+)?/
+//   });
+//
+//   const Equal = createToken({
+//     name: "=",
+//     pattern: /=/
+//   });
+//
+//   const webgalTokens = [NumberLiteral, StringLiteral, RCurly, LCurly,
+//     LSquare, RSquare, Comma, Colon, True, False, Equal, Command, ArgS, Lf, Semi];
+//
+//   const WebGalLexer = new Lexer(webgalTokens, {
+//     // Less position info tracked, reduces verbosity of the playground output.
+//     positionTracking: "onlyStart"
+//   });
+//
+//   // Labels only affect error messages and Diagrams.
+//   LCurly.LABEL = "'{'";
+//   RCurly.LABEL = "'}'";
+//   LSquare.LABEL = "'['";
+//   RSquare.LABEL = "']'";
+//   Comma.LABEL = "','";
+//   Colon.LABEL = "':'";
+//
+//
+//   // ----------------- parser -----------------
+//   const CstParser = chevrotain.CstParser;
+//
+//   class webgalScriptParser extends CstParser {
+//     constructor() {
+//       super(webgalTokens, {
+//         recoveryEnabled: true
+//       });
+//
+//       const $ = this;
+//
+//       $.RULE("scene", () => {
+//         $.MANY_SEP({
+//           SEP: Lf, DEF: () => {
+//             $.SUBRULE($.sentence);
+//           }
+//         });
+//       });
+//
+//       $.RULE("sentence", () => {
+//         $.OR([
+//           { ALT: () => $.SUBRULE($.commonSentence) },
+//           { ALT: () => $.SUBRULE($.comment) }
+//         ]);
+//       });
+//
+//       $.RULE("commonSentence", () => {
+//         $.OR([
+//           { ALT: () => $.SUBRULE($.commandSentence) },
+//           { ALT: () => $.SUBRULE($.dialog) }
+//         ]);
+//         $.OPTION(() => {
+//           $.CONSUME(Semi);
+//         });
+//       });
+//
+//       $.RULE("comment", () => {
+//         $.CONSUME(Semi);
+//         $.CONSUME(StringLiteral);
+//       });
+//
+//       $.RULE("dialog", () => {
+//         $.CONSUME(StringLiteral);
+//
+//       });
+//
+//
+//       $.RULE("commandSentence", () => {
+//         $.CONSUME(Command);
+//         $.CONSUME(Colon);
+//         $.CONSUME(StringLiteral);
+//         $.OPTION(() => {
+//           $.SUBRULE($.args);
+//         });
+//       });
+//
+//       $.RULE("args", () => {
+//         $.CONSUME(ArgS);
+//         $.MANY_SEP({
+//           SEP: ArgS, DEF: () => {
+//             $.SUBRULE($.arg);
+//           }
+//         });
+//       });
+//
+//       $.RULE("arg", () => {
+//         $.CONSUME(StringLiteral);
+//         $.CONSUME(Equal);
+//         $.SUBRULE($.argv);
+//       });
+//
+//       $.RULE("argv", () => {
+//         $.OR([
+//           {
+//             ALT: () => {
+//               this.CONSUME(StringLiteral);
+//             }
+//           },
+//           {
+//             ALT: () => {
+//               this.CONSUME(NumberLiteral);
+//             }
+//           },
+//           {
+//             ALT: () => {
+//               this.CONSUME(True);
+//             }
+//           },
+//           {
+//             ALT: () => {
+//               this.CONSUME(False);
+//             }
+//           }]);
+//       });
+//
+//       // very important to call this after all the rules have been setup.
+//       // otherwise the parser may not work correctly as it will lack information
+//       // derived from the self analysis.
+//       this.performSelfAnalysis();
+//     }
+//
+//   }
+//
+//
+//   // for the playground to work the returned object must contain these fields
+//   return {
+//     lexer: WebGalLexer,
+//     parser: webgalScriptParser,
+//     defaultRule: "scene"
+//   };
+// }());
+export const parser4 = 'unreleased'

package/src/sceneParser.ts

@@ -1,47 +1,47 @@
-import { IAsset, IScene, ISentence } from "./interface/sceneInterface";
-import { scriptParser } from "./scriptParser/scriptParser";
-import * as __ from "lodash";
-import { fileType } from "./interface/assets";
-
-/**
- * 场景解析器
- * @param rawScene 原始场景
- * @param sceneName 场景名称
- * @param sceneUrl 场景url
- * @param assetsPrefetcher
- * @param assetSetter
- * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
- * @return {IScene} 解析后的场景
- */
-export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: string
-  , assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string
-  , ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): IScene => {
-  const rawSentenceList = rawScene.split("\n"); // 原始句子列表
-
-  // 去分号留到后面去做了，现在注释要单独处理
-  const rawSentenceListWithoutEmpty = rawSentenceList;
-    // .map((sentence) => sentence.split(";")[0])
-    // .filter((sentence) => sentence.trim() !== "");
-  let assetsList: Array<IAsset> = []; // 场景资源列表
-  let subSceneList: Array<string> = []; // 子场景列表
-  const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map((sentence) => {
-    const returnSentence: ISentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
-    // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
-    assetsList = [...assetsList, ...returnSentence.sentenceAssets];
-    subSceneList = [...subSceneList, ...returnSentence.subScene];
-    return returnSentence;
-  });
-
-  // 开始资源的预加载
-  assetsList = __.uniqWith(assetsList); // 去重
-  assetsPrefetcher(assetsList);
-
-  return {
-    sceneName: sceneName, // 场景名称
-    sceneUrl: sceneUrl,
-    sentenceList: sentenceList, // 语句列表
-    assetsList: assetsList, // 资源列表
-    subSceneList: subSceneList // 子场景列表
-  };
-};
+import { IAsset, IScene, ISentence } from "./interface/sceneInterface";
+import { scriptParser } from "./scriptParser/scriptParser";
+import uniqWith from "lodash/uniqWith";
+import { fileType } from "./interface/assets";
+
+/**
+ * 场景解析器
+ * @param rawScene 原始场景
+ * @param sceneName 场景名称
+ * @param sceneUrl 场景url
+ * @param assetsPrefetcher
+ * @param assetSetter
+ * @param ADD_NEXT_ARG_LIST
+ * @param SCRIPT_CONFIG
+ * @return {IScene} 解析后的场景
+ */
+export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: string
+  , assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string
+  , ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any): IScene => {
+  const rawSentenceList = rawScene.split("\n"); // 原始句子列表
+
+  // 去分号留到后面去做了，现在注释要单独处理
+  const rawSentenceListWithoutEmpty = rawSentenceList;
+  // .map((sentence) => sentence.split(";")[0])
+  // .filter((sentence) => sentence.trim() !== "");
+  let assetsList: Array<IAsset> = []; // 场景资源列表
+  let subSceneList: Array<string> = []; // 子场景列表
+  const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map((sentence) => {
+    const returnSentence: ISentence = scriptParser(sentence, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+    // 在这里解析出语句可能携带的资源和场景，合并到 assetsList 和 subSceneList
+    assetsList = [...assetsList, ...returnSentence.sentenceAssets];
+    subSceneList = [...subSceneList, ...returnSentence.subScene];
+    return returnSentence;
+  });
+
+  // 开始资源的预加载
+  assetsList = uniqWith(assetsList); // 去重
+  assetsPrefetcher(assetsList);
+
+  return {
+    sceneName: sceneName, // 场景名称
+    sceneUrl: sceneUrl,
+    sentenceList: sentenceList, // 语句列表
+    assetsList: assetsList, // 资源列表
+    subSceneList: subSceneList // 子场景列表
+  };
+};

package/src/scriptParser/argsParser.ts

@@ -1,62 +1,68 @@
-import { arg } from "../interface/sceneInterface";
-import { fileType } from "../interface/assets";
-/**
- * 参数解析器
- * @param argsRaw 原始参数字符串
- * @param assetSetter
- * @return {Array<arg>} 解析后的参数列表
- */
-export function argsParser(argsRaw: string, assetSetter: (fileName: string, assetType: fileType) => string): Array<arg> {
-  const returnArrayList: Array<arg> = [];
-  // 处理参数
-  // 不要去空格
-  let newArgsRaw = argsRaw.replace(/ /g, " ");
-  // 分割参数列表
-  let rawArgsList: Array<string> = newArgsRaw.split(" -");
-  // 去除空字符串
-  rawArgsList = rawArgsList.filter((e) => {
-    return e !== "";
-  });
-  rawArgsList.forEach((e) => {
-    const argName = e.split("=")[0];
-    const argValue = e.split("=")[1];
-    // 判断是不是语音参数
-    if (e.match(/.ogg|.mp3|.wav/)) {
-      returnArrayList.push({
-        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
-            });
-          }
-        }
-      }
-    }
-  });
-  return returnArrayList;
-};
+import {arg} from "../interface/sceneInterface";
+import {fileType} from "../interface/assets";
+
+/**
+ * 参数解析器
+ * @param argsRaw 原始参数字符串
+ * @param assetSetter
+ * @return {Array<arg>} 解析后的参数列表
+ */
+export function argsParser(argsRaw: string, assetSetter: (fileName: string, assetType: fileType) => string): Array<arg> {
+  const returnArrayList: Array<arg> = [];
+  // 处理参数
+  // 不要去空格
+  let newArgsRaw = argsRaw.replace(/ /g, " ");
+  // 分割参数列表
+  let rawArgsList: Array<string> = newArgsRaw.split(" -");
+  // 去除空字符串
+  rawArgsList = rawArgsList.filter((e) => {
+    return e !== "";
+  });
+  rawArgsList.forEach((e) => {
+    const equalSignIndex = e.indexOf('=');
+    let argName = e.slice(0, equalSignIndex);
+    let argValue: string | undefined = e.slice(equalSignIndex + 1);
+    if (equalSignIndex < 0) {
+      argName = e;
+      argValue = undefined;
+    }
+    // 判断是不是语音参数
+    if (e.match(/.ogg|.mp3|.wav/)) {
+      returnArrayList.push({
+        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
+            });
+          }
+        }
+      }
+    }
+  });
+  return returnArrayList;
+};

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;
+}