webgal-parser 4.3.11 → 4.3.13-1

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "webgal-parser",
-  "version": "4.3.11",
+  "version": "4.3.13-1",
   "description": "WebGAL script parser",
   "scripts": {
-    "test": "node test/test.js",
+    "test": "vitest",
+    "coverage": "vitest run --coverage",
     "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 +21,8 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-typescript": "^9.0.2",
     "@types/lodash": "^4.14.189",
+    "@types/node": "^18.14.0",
+    "@vitest/coverage-c8": "^0.28.5",
     "rollup": "^3.3.0",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-dts": "^5.0.0",
@@ -27,7 +30,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/{config → src/config}/scriptConfig.ts

@@ -29,6 +29,7 @@ export const SCRIPT_CONFIG = [
   { scriptString: 'callScene', scriptType: commandType.callScene },
   { scriptString: 'setTextbox', scriptType: commandType.setTextbox},
   { scriptString: 'setAnimation', scriptType: commandType.setAnimation },
+  { scriptString: 'playEffect', scriptType: commandType.playEffect },
 ];
 export const ADD_NEXT_ARG_LIST = [
   commandType.bgm,

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

@@ -1,6 +1,6 @@
 import { IAsset, IScene, ISentence } from "./interface/sceneInterface";
 import { scriptParser } from "./scriptParser/scriptParser";
-import * as __ from "lodash";
+import uniqWith from "lodash/uniqWith";
 import { fileType } from "./interface/assets";
 
 /**
@@ -16,13 +16,13 @@ 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:any, SCRIPT_CONFIG:any): IScene => {
+  , 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() !== "");
+  // .map((sentence) => sentence.split(";")[0])
+  // .filter((sentence) => sentence.trim() !== "");
   let assetsList: Array<IAsset> = []; // 场景资源列表
   let subSceneList: Array<string> = []; // 子场景列表
   const sentenceList: Array<ISentence> = rawSentenceListWithoutEmpty.map((sentence) => {
@@ -34,7 +34,7 @@ export const sceneParser = (rawScene: string, sceneName: string, sceneUrl: strin
   });
 
   // 开始资源的预加载
-  assetsList = __.uniqWith(assetsList); // 去重
+  assetsList = uniqWith(assetsList); // 去重
   assetsPrefetcher(assetsList);
 
   return {

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/parser.test.ts

@@ -0,0 +1,29 @@
+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";
+import * as fsp from 'fs/promises'
+
+test("label", async () => {
+
+  const sceneRaw = await fsp.readFile('test/test-resources/start.txt');
+  const sceneText = sceneRaw.toString();
+
+  const parser = new SceneParser((assetList) => {
+  }, (fileName, assetType) => {
+    return fileName;
+  }, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
+
+  const result = parser.parse(sceneText, "start", "/start.txt");
+  const expectSentenceItem: ISentence = {
+    command: commandType.label,
+    commandRaw: "label",
+    content: "end",
+    args: [
+      { key: "next", value: true }
+    ],
+    sentenceAssets: [],
+    subScene: []
+  };
+  expect(result.sentenceList).toContainEqual(expectSentenceItem);
+});

package/test/{test.ts → test-resources/start.txt}

@@ -1,12 +1,3 @@
-import { SceneParser } from "../index";
-import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG } from "../config/scriptConfig";
-
-const parser = new SceneParser((assetList) => {
-}, (fileName, assetType) => {
-  return fileName;
-}, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG);
-
-const result = parser.parse(`
 ; 初始场景，以及特效演示
 changeBg:c4.jpg -next;
 unlockCg:c4.jpg -name=街前;  解锁部分CG
@@ -112,6 +103,3 @@ jumpLabel:end;
 label:end;
 changeFigure:none -next;
 WebGAL:基础演出的展示已经结束。;
-`, "test", "/test.txt");
-
-console.log(result);