webgal-parser 4.3.2 → 4.3.3

package/index.ts

@@ -1,17 +1,17 @@
-import { IAsset } from "./interface/sceneInterface";
+import { commandType, IAsset } from "./interface/sceneInterface";
 import { fileType } from "./interface/assets";
 import { sceneParser } from "./sceneParser";
 
 export class SceneParser {
 
-  private assetsPrefetcher;
-  private assetSetter;
-  private ADD_NEXT_ARG_LIST;
-  private SCRIPT_CONFIG;
+  private readonly assetsPrefetcher;
+  private readonly assetSetter;
+  private readonly ADD_NEXT_ARG_LIST;
+  private readonly SCRIPT_CONFIG;
 
   constructor(assetsPrefetcher: ((assetList: Array<IAsset>) => void),
               assetSetter: (fileName: string, assetType: fileType) => string,
-              ADD_NEXT_ARG_LIST, SCRIPT_CONFIG) {
+              ADD_NEXT_ARG_LIST: Array<commandType>, SCRIPT_CONFIG: Array<any>) {
     this.assetsPrefetcher = assetsPrefetcher;
     this.assetSetter = assetSetter;
     this.ADD_NEXT_ARG_LIST = ADD_NEXT_ARG_LIST;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "node test/test.js"

package/sceneParser.ts

@@ -16,7 +16,7 @@ import { fileType } from "./interface/assets";
  */
 export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: string
   , assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string
-  , ADD_NEXT_ARG_LIST, SCRIPT_CONFIG): IScene => {
+  , ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): IScene => {
   const rawSentenceList = rawScene.split("\n"); // 原始句子列表
   // 去除冒号后的内容
   // 去除分号后的内容

package/scriptParser/commandParser.ts

@@ -7,7 +7,7 @@ import { commandType, parsedCommand } from "../interface/sceneInterface";
  * @param SCRIPT_CONFIG
  * @return {parsedCommand} 处理后的命令
  */
-export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG): parsedCommand => {
+export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST:any, SCRIPT_CONFIG:any): parsedCommand => {
   let returnCommand: parsedCommand = {
     type: commandType.say, // 默认是say
     additionalArgs: []
@@ -33,12 +33,12 @@ export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST, SCRIPT_CONF
  * @param SCRIPT_CONFIG
  * @return {commandType} 得到的command类型
  */
-function getCommandType(command: string, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG): commandType {
+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) => {
+  SCRIPT_CONFIG.forEach((e:any) => {
     commandMap.set(e.scriptString, e.scriptType);
   });
   if (commandMap.has(command)) {
@@ -46,7 +46,7 @@ function getCommandType(command: string, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG): comm
   } else return commandType.say;
 }
 
-function addNextArg(commandToParse: parsedCommand, thisCommandType: commandType, ADD_NEXT_ARG_LIST) {
+function addNextArg(commandToParse: parsedCommand, thisCommandType: commandType, ADD_NEXT_ARG_LIST:any) {
   if (ADD_NEXT_ARG_LIST.includes(thisCommandType)) {
     commandToParse.additionalArgs.push({
       key: "next",

package/scriptParser/contentParser.ts

@@ -8,7 +8,7 @@ import { fileType } from "../interface/assets";
  * @param assetSetter
  * @return {string} 解析后的语句内容
  */
-export const contentParser = (contentRaw: string, type: commandType, assetSetter) => {
+export const contentParser = (contentRaw: string, type: commandType, assetSetter:any) => {
   if (contentRaw === "none" || contentRaw === "") {
     return "";
   }
@@ -38,7 +38,7 @@ export const contentParser = (contentRaw: string, type: commandType, assetSetter
   }
 };
 
-function getChooseContent(contentRaw: string, assetSetter): string {
+function getChooseContent(contentRaw: string, assetSetter:any): string {
   const chooseList = contentRaw.split("|");
   const chooseKeyList = [];
   const chooseValueList = [];

package/scriptParser/scriptParser.ts

@@ -12,7 +12,7 @@ import { subSceneScanner } from "./subSceneScanner";
  * @param ADD_NEXT_ARG_LIST
  * @param SCRIPT_CONFIG
  */
-export const scriptParser = (sentenceRaw: string, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG): ISentence => {
+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>; // 语句携带的子场景（可能没有）

package/tsconfig.json

@@ -10,6 +10,7 @@
     "strict": true,
     "forceConsistentCasingInFileNames": true,
     "module": "ESNext",
+    "noImplicitAny": false,
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,