webgal-parser 4.4.4 → 4.4.5-fix2

package/build/cjs/configParser/configParser.d.ts

@@ -1 +1,12 @@
-export declare function configParser(configText: string): string;
+interface IOptionItem {
+    key: string;
+    value: string | number | boolean;
+}
+interface IConfigItem {
+    command: string;
+    args: string[];
+    options: IOptionItem[];
+}
+export type WebgalConfig = IConfigItem[];
+export declare function configParser(configText: string): WebgalConfig;
+export {};

package/build/cjs/index.d.ts

@@ -1,6 +1,7 @@
 import { IAsset } from "./interface/sceneInterface";
 import { fileType } from "./interface/assets";
 import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG } from "./config/scriptConfig";
+import { WebgalConfig } from "./configParser/configParser";
 export default class SceneParser {
     private readonly assetsPrefetcher;
     private readonly assetSetter;
@@ -8,6 +9,7 @@ export default class SceneParser {
     private readonly SCRIPT_CONFIG;
     constructor(assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string, ADD_NEXT_ARG_LIST: Array<number>, SCRIPT_CONFIG: Array<any>);
     parse(rawScene: string, sceneName: string, sceneUrl: string): import("./interface/sceneInterface").IScene;
-    parseConfig(configText: string): string;
+    parseConfig(configText: string): WebgalConfig;
+    stringifyConfig(config: WebgalConfig): string;
 }
 export { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG };

package/build/cjs/index.js

@@ -53,7 +53,7 @@ const commandParser = (commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG) => {
     const type = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
     returnCommand.type = type;
     // 如果是对话，加上额外的参数
-    if (type === commandType.say) {
+    if (type === commandType.say && commandRaw !== 'say') {
         returnCommand.additionalArgs.push({
             key: "speaker",
             value: commandRaw
@@ -133,7 +133,7 @@ function argsParser(argsRaw, assetSetter) {
             argValue = undefined;
         }
         // 判断是不是语音参数
-        if (e.match(/.ogg|.mp3|.wav/)) {
+        if (argName.match(/.ogg|.mp3|.wav/)) {
             returnArrayList.push({
                 key: "vocal",
                 value: assetSetter(e, fileType.vocal)
@@ -1742,9 +1742,48 @@ const ADD_NEXT_ARG_LIST = [
     commandType.playEffect,
 ];
 
+function configLineParser(inputLine) {
+    const options = [];
+    let command;
+    let newSentenceRaw = inputLine.split(";")[0];
+    if (newSentenceRaw === "") {
+        // 注释提前返回
+        return {
+            command: '',
+            args: [],
+            options: []
+        };
+    }
+    // 截取命令
+    const getCommandResult = /:/.exec(newSentenceRaw);
+    // 没有command
+    if (getCommandResult === null) {
+        command = '';
+    }
+    else {
+        command = newSentenceRaw.substring(0, getCommandResult.index);
+        // 划分命令区域和content区域
+        newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
+    }
+    // 截取 Options 区域
+    const getOptionsResult = / -/.exec(newSentenceRaw);
+    // 获取到参数
+    if (getOptionsResult) {
+        const optionsRaw = newSentenceRaw.substring(getOptionsResult.index, newSentenceRaw.length);
+        newSentenceRaw = newSentenceRaw.substring(0, getOptionsResult.index);
+        for (const e of argsParser(optionsRaw, (name, _) => { return name; })) {
+            options.push(e);
+        }
+    }
+    return {
+        command,
+        args: newSentenceRaw.split('|').map(e => e.trim()).filter(e => e !== ''),
+        options
+    };
+}
 function configParser(configText) {
-    // TODO
-    return configText;
+    const configLines = configText.replaceAll(`\r`, '').split('\n');
+    return configLines.map(e => configLineParser(e)).filter(e => e.command !== '');
 }
 
 class SceneParser {
@@ -1764,6 +1803,10 @@ class SceneParser {
     parseConfig(configText) {
         return configParser(configText);
     }
+    stringifyConfig(config) {
+        return config
+            .reduce((previousValue, curr) => (previousValue + `${curr.command}:${curr.args.join('|')}${curr.options.length <= 0 ? '' : curr.options.reduce((p, c) => (p + ' -' + c.key + '=' + c.value), '')};\n`), '');
+    }
 }
 
 exports.ADD_NEXT_ARG_LIST = ADD_NEXT_ARG_LIST;

package/build/es/configParser/configParser.d.ts

@@ -1 +1,12 @@
-export declare function configParser(configText: string): string;
+interface IOptionItem {
+    key: string;
+    value: string | number | boolean;
+}
+interface IConfigItem {
+    command: string;
+    args: string[];
+    options: IOptionItem[];
+}
+export type WebgalConfig = IConfigItem[];
+export declare function configParser(configText: string): WebgalConfig;
+export {};

package/build/es/index.d.ts

@@ -1,6 +1,7 @@
 import { IAsset } from "./interface/sceneInterface";
 import { fileType } from "./interface/assets";
 import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG } from "./config/scriptConfig";
+import { WebgalConfig } from "./configParser/configParser";
 export default class SceneParser {
     private readonly assetsPrefetcher;
     private readonly assetSetter;
@@ -8,6 +9,7 @@ export default class SceneParser {
     private readonly SCRIPT_CONFIG;
     constructor(assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string, ADD_NEXT_ARG_LIST: Array<number>, SCRIPT_CONFIG: Array<any>);
     parse(rawScene: string, sceneName: string, sceneUrl: string): import("./interface/sceneInterface").IScene;
-    parseConfig(configText: string): string;
+    parseConfig(configText: string): WebgalConfig;
+    stringifyConfig(config: WebgalConfig): string;
 }
 export { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG };

package/build/es/index.js

@@ -49,7 +49,7 @@ const commandParser = (commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG) => {
     const type = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
     returnCommand.type = type;
     // 如果是对话，加上额外的参数
-    if (type === commandType.say) {
+    if (type === commandType.say && commandRaw !== 'say') {
         returnCommand.additionalArgs.push({
             key: "speaker",
             value: commandRaw
@@ -129,7 +129,7 @@ function argsParser(argsRaw, assetSetter) {
             argValue = undefined;
         }
         // 判断是不是语音参数
-        if (e.match(/.ogg|.mp3|.wav/)) {
+        if (argName.match(/.ogg|.mp3|.wav/)) {
             returnArrayList.push({
                 key: "vocal",
                 value: assetSetter(e, fileType.vocal)
@@ -1738,9 +1738,48 @@ const ADD_NEXT_ARG_LIST = [
     commandType.playEffect,
 ];
 
+function configLineParser(inputLine) {
+    const options = [];
+    let command;
+    let newSentenceRaw = inputLine.split(";")[0];
+    if (newSentenceRaw === "") {
+        // 注释提前返回
+        return {
+            command: '',
+            args: [],
+            options: []
+        };
+    }
+    // 截取命令
+    const getCommandResult = /:/.exec(newSentenceRaw);
+    // 没有command
+    if (getCommandResult === null) {
+        command = '';
+    }
+    else {
+        command = newSentenceRaw.substring(0, getCommandResult.index);
+        // 划分命令区域和content区域
+        newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
+    }
+    // 截取 Options 区域
+    const getOptionsResult = / -/.exec(newSentenceRaw);
+    // 获取到参数
+    if (getOptionsResult) {
+        const optionsRaw = newSentenceRaw.substring(getOptionsResult.index, newSentenceRaw.length);
+        newSentenceRaw = newSentenceRaw.substring(0, getOptionsResult.index);
+        for (const e of argsParser(optionsRaw, (name, _) => { return name; })) {
+            options.push(e);
+        }
+    }
+    return {
+        command,
+        args: newSentenceRaw.split('|').map(e => e.trim()).filter(e => e !== ''),
+        options
+    };
+}
 function configParser(configText) {
-    // TODO
-    return configText;
+    const configLines = configText.replaceAll(`\r`, '').split('\n');
+    return configLines.map(e => configLineParser(e)).filter(e => e.command !== '');
 }
 
 class SceneParser {
@@ -1760,6 +1799,10 @@ class SceneParser {
     parseConfig(configText) {
         return configParser(configText);
     }
+    stringifyConfig(config) {
+        return config
+            .reduce((previousValue, curr) => (previousValue + `${curr.command}:${curr.args.join('|')}${curr.options.length <= 0 ? '' : curr.options.reduce((p, c) => (p + ' -' + c.key + '=' + c.value), '')};\n`), '');
+    }
 }
 
 export { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG, SceneParser as default };

package/build/types/configParser/configParser.d.ts

@@ -1 +1,12 @@
-export declare function configParser(configText: string): string;
+interface IOptionItem {
+    key: string;
+    value: string | number | boolean;
+}
+interface IConfigItem {
+    command: string;
+    args: string[];
+    options: IOptionItem[];
+}
+export type WebgalConfig = IConfigItem[];
+export declare function configParser(configText: string): WebgalConfig;
+export {};

package/build/types/index.d.ts

@@ -1,6 +1,7 @@
 import { IAsset } from "./interface/sceneInterface";
 import { fileType } from "./interface/assets";
 import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG } from "./config/scriptConfig";
+import { WebgalConfig } from "./configParser/configParser";
 export default class SceneParser {
     private readonly assetsPrefetcher;
     private readonly assetSetter;
@@ -8,6 +9,7 @@ export default class SceneParser {
     private readonly SCRIPT_CONFIG;
     constructor(assetsPrefetcher: ((assetList: Array<IAsset>) => void), assetSetter: (fileName: string, assetType: fileType) => string, ADD_NEXT_ARG_LIST: Array<number>, SCRIPT_CONFIG: Array<any>);
     parse(rawScene: string, sceneName: string, sceneUrl: string): import("./interface/sceneInterface").IScene;
-    parseConfig(configText: string): string;
+    parseConfig(configText: string): WebgalConfig;
+    stringifyConfig(config: WebgalConfig): string;
 }
 export { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG };

package/build/umd/index.global.js

@@ -52,7 +52,7 @@ var webgalParser = (function (exports) {
       const type = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
       returnCommand.type = type;
       // 如果是对话，加上额外的参数
-      if (type === commandType.say) {
+      if (type === commandType.say && commandRaw !== 'say') {
           returnCommand.additionalArgs.push({
               key: "speaker",
               value: commandRaw
@@ -132,7 +132,7 @@ var webgalParser = (function (exports) {
               argValue = undefined;
           }
           // 判断是不是语音参数
-          if (e.match(/.ogg|.mp3|.wav/)) {
+          if (argName.match(/.ogg|.mp3|.wav/)) {
               returnArrayList.push({
                   key: "vocal",
                   value: assetSetter(e, fileType.vocal)
@@ -1741,9 +1741,48 @@ var webgalParser = (function (exports) {
       commandType.playEffect,
   ];
 
+  function configLineParser(inputLine) {
+      const options = [];
+      let command;
+      let newSentenceRaw = inputLine.split(";")[0];
+      if (newSentenceRaw === "") {
+          // 注释提前返回
+          return {
+              command: '',
+              args: [],
+              options: []
+          };
+      }
+      // 截取命令
+      const getCommandResult = /:/.exec(newSentenceRaw);
+      // 没有command
+      if (getCommandResult === null) {
+          command = '';
+      }
+      else {
+          command = newSentenceRaw.substring(0, getCommandResult.index);
+          // 划分命令区域和content区域
+          newSentenceRaw = newSentenceRaw.substring(getCommandResult.index + 1, newSentenceRaw.length);
+      }
+      // 截取 Options 区域
+      const getOptionsResult = / -/.exec(newSentenceRaw);
+      // 获取到参数
+      if (getOptionsResult) {
+          const optionsRaw = newSentenceRaw.substring(getOptionsResult.index, newSentenceRaw.length);
+          newSentenceRaw = newSentenceRaw.substring(0, getOptionsResult.index);
+          for (const e of argsParser(optionsRaw, (name, _) => { return name; })) {
+              options.push(e);
+          }
+      }
+      return {
+          command,
+          args: newSentenceRaw.split('|').map(e => e.trim()).filter(e => e !== ''),
+          options
+      };
+  }
   function configParser(configText) {
-      // TODO
-      return configText;
+      const configLines = configText.replaceAll(`\r`, '').split('\n');
+      return configLines.map(e => configLineParser(e)).filter(e => e.command !== '');
   }
 
   class SceneParser {
@@ -1763,6 +1802,10 @@ var webgalParser = (function (exports) {
       parseConfig(configText) {
           return configParser(configText);
       }
+      stringifyConfig(config) {
+          return config
+              .reduce((previousValue, curr) => (previousValue + `${curr.command}:${curr.args.join('|')}${curr.options.length <= 0 ? '' : curr.options.reduce((p, c) => (p + ' -' + c.key + '=' + c.value), '')};\n`), '');
+      }
   }
 
   exports.ADD_NEXT_ARG_LIST = ADD_NEXT_ARG_LIST;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webgal-parser",
-  "version": "4.4.4",
+  "version": "4.4.5-fix2",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",

package/src/scriptParser/argsParser.ts

@@ -27,7 +27,7 @@ export function argsParser(argsRaw: string, assetSetter: (fileName: string, asse
       argValue = undefined;
     }
     // 判断是不是语音参数
-    if (e.match(/.ogg|.mp3|.wav/)) {
+    if (argName.match(/.ogg|.mp3|.wav/)) {
       returnArrayList.push({
         key: "vocal",
         value: assetSetter(e, fileType.vocal)

package/src/scriptParser/commandParser.ts

@@ -16,7 +16,7 @@ export const commandParser = (commandRaw: string, ADD_NEXT_ARG_LIST:any, SCRIPT_
   const type: commandType = getCommandType(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
   returnCommand.type = type;
   // 如果是对话，加上额外的参数
-  if (type === commandType.say) {
+  if (type === commandType.say && commandRaw!== 'say') {
     returnCommand.additionalArgs.push({
       key: "speaker",
       value: commandRaw