webgal-parser 4.3.11 → 4.3.13

package/{interface → build/es/interface}/assets.d.ts

@@ -1,12 +1,12 @@
-/**
- * 内置资源类型的枚举
- */
-export declare enum fileType {
-    background = 0,
-    bgm = 1,
-    figure = 2,
-    scene = 3,
-    tex = 4,
-    vocal = 5,
-    video = 6
-}
+/**
+ * 内置资源类型的枚举
+ */
+export declare enum fileType {
+    background = 0,
+    bgm = 1,
+    figure = 2,
+    scene = 3,
+    tex = 4,
+    vocal = 5,
+    video = 6
+}

package/{interface → build/es/interface}/runtimeInterface.d.ts

@@ -1,9 +1,9 @@
-/**
- * 子场景结束后回到父场景的入口
- * @interface sceneEntry
- */
-export interface sceneEntry {
-    sceneName: string;
-    sceneUrl: string;
-    continueLine: number;
-}
+/**
+ * 子场景结束后回到父场景的入口
+ * @interface sceneEntry
+ */
+export interface sceneEntry {
+    sceneName: string;
+    sceneUrl: string;
+    continueLine: number;
+}

package/{interface → build/es/interface}/sceneInterface.d.ts

@@ -1,91 +1,94 @@
-/**
- * 语句类型
- */
-import { sceneEntry } from "./runtimeInterface";
-import { fileType } from "./assets";
-export declare enum commandType {
-    say = 0,
-    changeBg = 1,
-    changeFigure = 2,
-    bgm = 3,
-    video = 4,
-    pixi = 5,
-    pixiInit = 6,
-    intro = 7,
-    miniAvatar = 8,
-    changeScene = 9,
-    choose = 10,
-    end = 11,
-    setComplexAnimation = 12,
-    setFilter = 13,
-    label = 14,
-    jumpLabel = 15,
-    chooseLabel = 16,
-    setVar = 17,
-    if = 18,
-    callScene = 19,
-    showVars = 20,
-    unlockCg = 21,
-    unlockBgm = 22,
-    filmMode = 23,
-    setTextbox = 24,
-    setAnimation = 25
-}
-/**
- * 单个参数接口
- * @interface arg
- */
-export interface arg {
-    key: string;
-    value: string | boolean | number;
-}
-/**
- * 资源接口
- * @interface IAsset
- */
-export interface IAsset {
-    name: string;
-    type: fileType;
-    url: string;
-    lineNumber: number;
-}
-/**
- * 单条语句接口
- * @interface ISentence
- */
-export interface ISentence {
-    command: commandType;
-    commandRaw: string;
-    content: string;
-    args: Array<arg>;
-    sentenceAssets: Array<IAsset>;
-    subScene: Array<string>;
-}
-/**
- * 场景接口
- * @interface IScene
- */
-export interface IScene {
-    sceneName: string;
-    sceneUrl: string;
-    sentenceList: Array<ISentence>;
-    assetsList: Array<IAsset>;
-    subSceneList: Array<string>;
-}
-/**
- * 当前的场景数据
- * @interface ISceneData
- */
-export interface ISceneData {
-    currentSentenceId: number;
-    sceneStack: Array<sceneEntry>;
-    currentScene: IScene;
-}
-/**
- * 处理后的命令接口
- * @interface parsedCommand
- */
-export interface parsedCommand {
-    type: commandType;
-    additionalArgs: Array<arg>;
-}
+/**
+ * 语句类型
+ */
+import { sceneEntry } from "./runtimeInterface";
+import { fileType } from "./assets";
+export declare enum commandType {
+    say = 0,
+    changeBg = 1,
+    changeFigure = 2,
+    bgm = 3,
+    video = 4,
+    pixi = 5,
+    pixiInit = 6,
+    intro = 7,
+    miniAvatar = 8,
+    changeScene = 9,
+    choose = 10,
+    end = 11,
+    setComplexAnimation = 12,
+    setFilter = 13,
+    label = 14,
+    jumpLabel = 15,
+    chooseLabel = 16,
+    setVar = 17,
+    if = 18,
+    callScene = 19,
+    showVars = 20,
+    unlockCg = 21,
+    unlockBgm = 22,
+    filmMode = 23,
+    setTextbox = 24,
+    setAnimation = 25,
+    playEffect = 26,
+    setTempAnimation = 27,
+    comment = 28
+}
+/**
+ * 单个参数接口
+ * @interface arg
+ */
+export interface arg {
+    key: string;
+    value: string | boolean | number;
+}
+/**
+ * 资源接口
+ * @interface IAsset
+ */
+export interface IAsset {
+    name: string;
+    type: fileType;
+    url: string;
+    lineNumber: number;
+}
+/**
+ * 单条语句接口
+ * @interface ISentence
+ */
+export interface ISentence {
+    command: commandType;
+    commandRaw: string;
+    content: string;
+    args: Array<arg>;
+    sentenceAssets: Array<IAsset>;
+    subScene: Array<string>;
+}
+/**
+ * 场景接口
+ * @interface IScene
+ */
+export interface IScene {
+    sceneName: string;
+    sceneUrl: string;
+    sentenceList: Array<ISentence>;
+    assetsList: Array<IAsset>;
+    subSceneList: Array<string>;
+}
+/**
+ * 当前的场景数据
+ * @interface ISceneData
+ */
+export interface ISceneData {
+    currentSentenceId: number;
+    sceneStack: Array<sceneEntry>;
+    currentScene: IScene;
+}
+/**
+ * 处理后的命令接口
+ * @interface parsedCommand
+ */
+export interface parsedCommand {
+    type: commandType;
+    additionalArgs: Array<arg>;
+}

package/{sceneParser.d.ts → build/es/sceneParser.d.ts}

@@ -1,14 +1,14 @@
-import { IAsset, IScene } from "./interface/sceneInterface";
-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 declare 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;
+import { IAsset, IScene } from "./interface/sceneInterface";
+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 declare 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;

package/{scriptParser → build/es/scriptParser}/argsParser.d.ts

@@ -1,9 +1,9 @@
-import { arg } from "../interface/sceneInterface";
-import { fileType } from "../interface/assets";
-/**
- * 参数解析器
- * @param argsRaw 原始参数字符串
- * @param assetSetter
- * @return {Array<arg>} 解析后的参数列表
- */
-export declare function argsParser(argsRaw: string, assetSetter: (fileName: string, assetType: fileType) => string): Array<arg>;
+import { arg } from "../interface/sceneInterface";
+import { fileType } from "../interface/assets";
+/**
+ * 参数解析器
+ * @param argsRaw 原始参数字符串
+ * @param assetSetter
+ * @return {Array<arg>} 解析后的参数列表
+ */
+export declare function argsParser(argsRaw: string, assetSetter: (fileName: string, assetType: fileType) => string): Array<arg>;

package/{scriptParser → build/es/scriptParser}/assetsScanner.d.ts

@@ -1,9 +1,9 @@
-import { arg, commandType, IAsset } from '../interface/sceneInterface';
-/**
- * 根据语句类型、语句内容、参数列表，扫描该语句可能携带的资源
- * @param command 语句类型
- * @param content 语句内容
- * @param args 参数列表
- * @return {Array<IAsset>} 语句携带的参数列表
- */
-export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>) => Array<IAsset>;
+import { arg, commandType, IAsset } from '../interface/sceneInterface';
+/**
+ * 根据语句类型、语句内容、参数列表，扫描该语句可能携带的资源
+ * @param command 语句类型
+ * @param content 语句内容
+ * @param args 参数列表
+ * @return {Array<IAsset>} 语句携带的参数列表
+ */
+export declare const assetsScanner: (command: commandType, content: string, args: Array<arg>) => Array<IAsset>;

package/{scriptParser → build/es/scriptParser}/commandParser.d.ts

@@ -1,9 +1,9 @@
-import { parsedCommand } from "../interface/sceneInterface";
-/**
- * 处理命令
- * @param commandRaw
- * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
- * @return {parsedCommand} 处理后的命令
- */
-export declare const commandParser: (commandRaw: string, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any) => parsedCommand;
+import { parsedCommand } from "../interface/sceneInterface";
+/**
+ * 处理命令
+ * @param commandRaw
+ * @param ADD_NEXT_ARG_LIST
+ * @param SCRIPT_CONFIG
+ * @return {parsedCommand} 处理后的命令
+ */
+export declare const commandParser: (commandRaw: string, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any) => parsedCommand;

package/{scriptParser → build/es/scriptParser}/contentParser.d.ts

@@ -1,9 +1,9 @@
-import { commandType } from "../interface/sceneInterface";
-/**
- * 解析语句内容的函数，主要作用是把文件名改为绝对地址或相对地址（根据使用情况而定）
- * @param contentRaw 原始语句内容
- * @param type 语句类型
- * @param assetSetter
- * @return {string} 解析后的语句内容
- */
-export declare const contentParser: (contentRaw: string, type: commandType, assetSetter: any) => any;
+import { commandType } from "../interface/sceneInterface";
+/**
+ * 解析语句内容的函数，主要作用是把文件名改为绝对地址或相对地址（根据使用情况而定）
+ * @param contentRaw 原始语句内容
+ * @param type 语句类型
+ * @param assetSetter
+ * @return {string} 解析后的语句内容
+ */
+export declare const contentParser: (contentRaw: string, type: commandType, assetSetter: any) => any;

package/{scriptParser → build/es/scriptParser}/scriptParser.d.ts

@@ -1,9 +1,9 @@
-import { ISentence } from "../interface/sceneInterface";
-/**
- * 语句解析器
- * @param sentenceRaw 原始语句
- * @param assetSetter
- * @param ADD_NEXT_ARG_LIST
- * @param SCRIPT_CONFIG
- */
-export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any) => ISentence;
+import { ISentence } from "../interface/sceneInterface";
+/**
+ * 语句解析器
+ * @param sentenceRaw 原始语句
+ * @param assetSetter
+ * @param ADD_NEXT_ARG_LIST
+ * @param SCRIPT_CONFIG
+ */
+export declare const scriptParser: (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG_LIST: any, SCRIPT_CONFIG: any) => ISentence;

package/{scriptParser → build/es/scriptParser}/subSceneScanner.d.ts

@@ -1,7 +1,7 @@
-/**
- * 扫描子场景
- * @param content 语句内容
- * @return {Array<string>} 子场景列表
- */
-import { commandType } from '../interface/sceneInterface';
-export declare const subSceneScanner: (command: commandType, content: string) => Array<string>;
+/**
+ * 扫描子场景
+ * @param content 语句内容
+ * @return {Array<string>} 子场景列表
+ */
+import { commandType } from '../interface/sceneInterface';
+export declare const subSceneScanner: (command: commandType, content: string) => Array<string>;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "webgal-parser",
-  "version": "4.3.11",
+  "version": "4.3.13",
   "description": "WebGAL script parser",
   "scripts": {
-    "test": "node test/test.js",
+    "test": "vitest",
     "build": "rimraf -rf ./build && rollup --config"
   },
-  "module": "./build/index.js",
-  "main": "index.js",
+  "module": "./build/es/index.js",
+  "main": "./build/cjs/index.js",
   "author": "Mahiru <Mahiru_@outlook.com>",
   "license": "MPL-2.0",
   "dependencies": {
@@ -20,6 +20,7 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-typescript": "^9.0.2",
     "@types/lodash": "^4.14.189",
+    "@types/node": "^18.14.0",
     "rollup": "^3.3.0",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-dts": "^5.0.0",
@@ -27,7 +28,8 @@
     "rollup-plugin-typescript2": "^0.34.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.1",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.3",
+    "vitest": "^0.28.5"
   },
   "type": "module"
 }

package/rollup.config.js

@@ -1,32 +1,48 @@
-import typescript from 'rollup-plugin-typescript2';
+import typescript from "rollup-plugin-typescript2";
+import resolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
 
 const mode = process.env.MODE;
-const isProd = mode === 'prod';
-import pkg from './package.json' assert { type: "json" };
+const isProd = mode === "prod";
 
-export default {
-  input: `index.ts`,
-  output: [
-    {
-      file: pkg.main,
-      exports: 'named',
-      format: 'cjs',
-      sourcemap: !isProd
-    },
-    {
-      file: pkg.module,
-      format: 'es',
-      sourcemap: !isProd
-    },
-    {
-      file: 'build/index.global.js',
-      name: 'webgalparser',
-      format: 'iife',
-      sourcemap: !isProd
-    },
-  ],
-  plugins: [typescript({
-    useTsconfigDeclarationDir: true,
-    tsconfigOverride: { compilerOptions: { sourceMap: !isProd } }
-  })],
-};
+export default [
+  {
+    input: `./src/index.ts`,
+    output:
+      {
+        file: "./build/es/index.js",
+        format: "es",
+        sourcemap: !isProd
+      },
+    plugins: [
+      resolve(), commonjs(), typescript({
+        useTsconfigDeclarationDir: true,
+        tsconfigOverride: {
+          compilerOptions: {
+            sourceMap: !isProd,
+            declarationDir: "build/es"
+          }, include: ["src"]
+        }
+      })]
+  }, {
+    input: `./src/index.ts`,
+    output: [
+      {
+        file: "./build/cjs/index.js",
+        exports: "named",
+        format: "cjs",
+        sourcemap: !isProd
+      },
+    ],
+    plugins: [
+      resolve(), commonjs(), typescript({
+        useTsconfigDeclarationDir: true,
+        tsconfigOverride: {
+          compilerOptions: {
+            sourceMap: !isProd,
+            declarationDir: "build/cjs"
+          }, include: ["src"]
+        }
+      })],
+  }
+];

package/{scriptParser → src/scriptParser}/scriptParser.ts

@@ -31,7 +31,7 @@ export const scriptParser = (sentenceRaw: string, assetSetter: any, ADD_NEXT_ARG
       command: commandType.comment, // 语句类型
       commandRaw: "comment", // 命令原始内容，方便调试
       content: sentenceRaw.split(";")[1] ?? "", // 语句内容
-      args: [], // 参数列表
+      args: [{ key: "next", value: true }], // 参数列表
       sentenceAssets: [], // 语句携带的资源列表
       subScene: [] // 语句携带的子场景
     };

package/test/{test.ts → parser.test.ts}

@@ -1,12 +1,15 @@
-import { SceneParser } from "../index";
-import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG } from "../config/scriptConfig";
+import SceneParser from "../src/index";
+import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG } from "../src/config/scriptConfig";
+import { expect, test } from "vitest";
+import { commandType, ISentence } from "../src/interface/sceneInterface";
 
-const parser = new SceneParser((assetList) => {
-}, (fileName, assetType) => {
-  return fileName;
-}, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+test("label", async () => {
+  const parser = new SceneParser((assetList) => {
+  }, (fileName, assetType) => {
+    return fileName;
+  }, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
 
-const result = parser.parse(`
+  const result = parser.parse(`
 ; 初始场景，以及特效演示
 changeBg:c4.jpg -next;
 unlockCg:c4.jpg -name=街前;  解锁部分CG
@@ -113,5 +116,15 @@ label:end;
 changeFigure:none -next;
 WebGAL:基础演出的展示已经结束。;
 `, "test", "/test.txt");
-
-console.log(result);
+  const expectSentenceItem: ISentence = {
+    command: commandType.label,
+    commandRaw: "label",
+    content: "end",
+    args: [
+      { key: "next", value: true }
+    ],
+    sentenceAssets: [],
+    subScene: []
+  };
+  expect(result.sentenceList).toContainEqual(expectSentenceItem);
+});