webgal-parser 4.4.14 → 4.5.2

package/build/cjs/index.cjs

@@ -36,6 +36,7 @@ var commandType;
     commandType[commandType["setTransform"] = 29] = "setTransform";
     commandType[commandType["setTransition"] = 30] = "setTransition";
     commandType[commandType["getUserInput"] = 31] = "getUserInput";
+    commandType[commandType["applyStyle"] = 32] = "applyStyle";
 })(commandType || (commandType = {}));
 
 const SCRIPT_CONFIG = [
@@ -68,6 +69,7 @@ const SCRIPT_CONFIG = [
     { scriptString: 'setTextbox', scriptType: commandType.setTextbox },
     { scriptString: 'setAnimation', scriptType: commandType.setAnimation },
     { scriptString: 'playEffect', scriptType: commandType.playEffect },
+    { scriptString: 'applyStyle', scriptType: commandType.applyStyle },
 ];
 const ADD_NEXT_ARG_LIST = [
     commandType.bgm,
@@ -434,8 +436,9 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
     let parsedCommand; // 解析后的命令
     let commandRaw;
     // 正式开始解析
-    // 去分号，前面已做，这里不再需要
-    let newSentenceRaw = sentenceRaw.split(';')[0];
+    // 去分号
+    let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+    newSentenceRaw = newSentenceRaw.replaceAll('\\;', ';');
     if (newSentenceRaw === '') {
         // 注释提前返回
         return {
@@ -485,12 +488,12 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
             args.push(e);
         }
     }
-    content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+    content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
     sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
     subScene = subSceneScanner(command, content); // 扫描语句携带子场景
     return {
         command: command,
-        commandRaw: commandRaw,
+        commandRaw: commandRaw.trim(),
         content: content,
         args: args,
         sentenceAssets: sentenceAssets,
@@ -1800,15 +1803,14 @@ function parseCSS(css) {
     const result = {};
     let specialRules = '';
     let matches;
-    // 匹配类选择器和其内容，包括一层嵌套
-    const classRegex = /\.([^{\s]+)\s*{([^}]*?(?:\{[^}]*?\}[^}]*?)?)}/g;
-    // 更新特殊规则正则表达式以正确处理一层嵌套，并确保大括号成对出现
+    // 使用非贪婪匹配，尝试正确处理任意层次的嵌套
+    const classRegex = /\.([^{\s]+)\s*{((?:[^{}]*|{[^}]*})*)}/g;
     const specialRegex = /(@[^{]+{\s*(?:[^{}]*{[^}]*}[^{}]*)+\s*})/g;
-    // 提取类和样式
     while ((matches = classRegex.exec(css)) !== null) {
-        result[matches[1]] = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+        const key = matches[1];
+        const value = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+        result[key] = value;
     }
-    // 提取特殊规则，并确保包含所有的大括号
     while ((matches = specialRegex.exec(css)) !== null) {
         specialRules += matches[1].trim() + '\n';
     }

package/build/cjs/index.d.ts

@@ -2,7 +2,7 @@ import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG, ConfigMap, ConfigItem } from './confi
 import { WebgalConfig } from './configParser/configParser';
 import { fileType } from './interface/assets';
 import { IAsset } from './interface/sceneInterface';
-import { IWebGALStyleObj } from "@/styleParser";
+import { IWebGALStyleObj } from "./styleParser";
 export default class SceneParser {
     private readonly assetsPrefetcher;
     private readonly assetSetter;

package/build/cjs/interface/sceneInterface.d.ts

@@ -35,7 +35,8 @@ export declare enum commandType {
     comment = 28,
     setTransform = 29,
     setTransition = 30,
-    getUserInput = 31
+    getUserInput = 31,
+    applyStyle = 32
 }
 /**
  * 单个参数接口

package/build/es/index.d.ts

@@ -2,7 +2,7 @@ import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG, ConfigMap, ConfigItem } from './confi
 import { WebgalConfig } from './configParser/configParser';
 import { fileType } from './interface/assets';
 import { IAsset } from './interface/sceneInterface';
-import { IWebGALStyleObj } from "@/styleParser";
+import { IWebGALStyleObj } from "./styleParser";
 export default class SceneParser {
     private readonly assetsPrefetcher;
     private readonly assetSetter;

package/build/es/index.js

@@ -32,6 +32,7 @@ var commandType;
     commandType[commandType["setTransform"] = 29] = "setTransform";
     commandType[commandType["setTransition"] = 30] = "setTransition";
     commandType[commandType["getUserInput"] = 31] = "getUserInput";
+    commandType[commandType["applyStyle"] = 32] = "applyStyle";
 })(commandType || (commandType = {}));
 
 const SCRIPT_CONFIG = [
@@ -64,6 +65,7 @@ const SCRIPT_CONFIG = [
     { scriptString: 'setTextbox', scriptType: commandType.setTextbox },
     { scriptString: 'setAnimation', scriptType: commandType.setAnimation },
     { scriptString: 'playEffect', scriptType: commandType.playEffect },
+    { scriptString: 'applyStyle', scriptType: commandType.applyStyle },
 ];
 const ADD_NEXT_ARG_LIST = [
     commandType.bgm,
@@ -430,8 +432,9 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
     let parsedCommand; // 解析后的命令
     let commandRaw;
     // 正式开始解析
-    // 去分号，前面已做，这里不再需要
-    let newSentenceRaw = sentenceRaw.split(';')[0];
+    // 去分号
+    let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+    newSentenceRaw = newSentenceRaw.replaceAll('\\;', ';');
     if (newSentenceRaw === '') {
         // 注释提前返回
         return {
@@ -481,12 +484,12 @@ const scriptParser = (sentenceRaw, assetSetter, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG
             args.push(e);
         }
     }
-    content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+    content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
     sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
     subScene = subSceneScanner(command, content); // 扫描语句携带子场景
     return {
         command: command,
-        commandRaw: commandRaw,
+        commandRaw: commandRaw.trim(),
         content: content,
         args: args,
         sentenceAssets: sentenceAssets,
@@ -1796,15 +1799,14 @@ function parseCSS(css) {
     const result = {};
     let specialRules = '';
     let matches;
-    // 匹配类选择器和其内容，包括一层嵌套
-    const classRegex = /\.([^{\s]+)\s*{([^}]*?(?:\{[^}]*?\}[^}]*?)?)}/g;
-    // 更新特殊规则正则表达式以正确处理一层嵌套，并确保大括号成对出现
+    // 使用非贪婪匹配，尝试正确处理任意层次的嵌套
+    const classRegex = /\.([^{\s]+)\s*{((?:[^{}]*|{[^}]*})*)}/g;
     const specialRegex = /(@[^{]+{\s*(?:[^{}]*{[^}]*}[^{}]*)+\s*})/g;
-    // 提取类和样式
     while ((matches = classRegex.exec(css)) !== null) {
-        result[matches[1]] = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+        const key = matches[1];
+        const value = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+        result[key] = value;
     }
-    // 提取特殊规则，并确保包含所有的大括号
     while ((matches = specialRegex.exec(css)) !== null) {
         specialRules += matches[1].trim() + '\n';
     }

package/build/es/interface/sceneInterface.d.ts

@@ -35,7 +35,8 @@ export declare enum commandType {
     comment = 28,
     setTransform = 29,
     setTransition = 30,
-    getUserInput = 31
+    getUserInput = 31,
+    applyStyle = 32
 }
 /**
  * 单个参数接口

package/build/types/index.d.ts

@@ -2,7 +2,7 @@ import { ADD_NEXT_ARG_LIST, SCRIPT_CONFIG, ConfigMap, ConfigItem } from './confi
 import { WebgalConfig } from './configParser/configParser';
 import { fileType } from './interface/assets';
 import { IAsset } from './interface/sceneInterface';
-import { IWebGALStyleObj } from "@/styleParser";
+import { IWebGALStyleObj } from "./styleParser";
 export default class SceneParser {
     private readonly assetsPrefetcher;
     private readonly assetSetter;

package/build/types/interface/sceneInterface.d.ts

@@ -35,7 +35,8 @@ export declare enum commandType {
     comment = 28,
     setTransform = 29,
     setTransition = 30,
-    getUserInput = 31
+    getUserInput = 31,
+    applyStyle = 32
 }
 /**
  * 单个参数接口

package/build/umd/index.global.js

@@ -35,6 +35,7 @@ var webgalParser = (function (exports) {
       commandType[commandType["setTransform"] = 29] = "setTransform";
       commandType[commandType["setTransition"] = 30] = "setTransition";
       commandType[commandType["getUserInput"] = 31] = "getUserInput";
+      commandType[commandType["applyStyle"] = 32] = "applyStyle";
   })(commandType || (commandType = {}));
 
   const SCRIPT_CONFIG = [
@@ -67,6 +68,7 @@ var webgalParser = (function (exports) {
       { scriptString: 'setTextbox', scriptType: commandType.setTextbox },
       { scriptString: 'setAnimation', scriptType: commandType.setAnimation },
       { scriptString: 'playEffect', scriptType: commandType.playEffect },
+      { scriptString: 'applyStyle', scriptType: commandType.applyStyle },
   ];
   const ADD_NEXT_ARG_LIST = [
       commandType.bgm,
@@ -433,8 +435,9 @@ var webgalParser = (function (exports) {
       let parsedCommand; // 解析后的命令
       let commandRaw;
       // 正式开始解析
-      // 去分号，前面已做，这里不再需要
-      let newSentenceRaw = sentenceRaw.split(';')[0];
+      // 去分号
+      let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+      newSentenceRaw = newSentenceRaw.replaceAll('\\;', ';');
       if (newSentenceRaw === '') {
           // 注释提前返回
           return {
@@ -484,12 +487,12 @@ var webgalParser = (function (exports) {
               args.push(e);
           }
       }
-      content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+      content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
       sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
       subScene = subSceneScanner(command, content); // 扫描语句携带子场景
       return {
           command: command,
-          commandRaw: commandRaw,
+          commandRaw: commandRaw.trim(),
           content: content,
           args: args,
           sentenceAssets: sentenceAssets,
@@ -1799,15 +1802,14 @@ var webgalParser = (function (exports) {
       const result = {};
       let specialRules = '';
       let matches;
-      // 匹配类选择器和其内容，包括一层嵌套
-      const classRegex = /\.([^{\s]+)\s*{([^}]*?(?:\{[^}]*?\}[^}]*?)?)}/g;
-      // 更新特殊规则正则表达式以正确处理一层嵌套，并确保大括号成对出现
+      // 使用非贪婪匹配，尝试正确处理任意层次的嵌套
+      const classRegex = /\.([^{\s]+)\s*{((?:[^{}]*|{[^}]*})*)}/g;
       const specialRegex = /(@[^{]+{\s*(?:[^{}]*{[^}]*}[^{}]*)+\s*})/g;
-      // 提取类和样式
       while ((matches = classRegex.exec(css)) !== null) {
-          result[matches[1]] = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+          const key = matches[1];
+          const value = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+          result[key] = value;
       }
-      // 提取特殊规则，并确保包含所有的大括号
       while ((matches = specialRegex.exec(css)) !== null) {
           specialRules += matches[1].trim() + '\n';
       }

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "webgal-parser",
-  "version": "4.4.14",
+  "version": "4.5.2",
   "description": "WebGAL script parser",
   "scripts": {
     "test": "vitest",
     "coverage": "vitest run --coverage",
     "build": "rimraf -rf ./build && rollup --config",
     "build-ci": "rollup --config",
-    "debug": "tsx test/debug.ts"
+    "debug": "tsx test/debug.ts",
+    "debug-scss-parser": "tsx test/debugCssParser.ts"
   },
   "types": "./build/types/index.d.ts",
   "module": "./build/es/index.js",

package/src/config/scriptConfig.ts

@@ -1,4 +1,4 @@
-import { commandType } from '../interface/sceneInterface';
+import {commandType} from '../interface/sceneInterface';
 
 export const SCRIPT_CONFIG = [
   { scriptString: 'intro', scriptType: commandType.intro },
@@ -30,6 +30,7 @@ export const SCRIPT_CONFIG = [
   { scriptString: 'setTextbox', scriptType: commandType.setTextbox },
   { scriptString: 'setAnimation', scriptType: commandType.setAnimation },
   { scriptString: 'playEffect', scriptType: commandType.playEffect },
+  { scriptString: 'applyStyle', scriptType: commandType.applyStyle },
 ];
 export const ADD_NEXT_ARG_LIST = [
   commandType.bgm,

package/src/index.ts

@@ -8,7 +8,7 @@ import { configParser, WebgalConfig } from './configParser/configParser';
 import { fileType } from './interface/assets';
 import { IAsset } from './interface/sceneInterface';
 import { sceneParser } from './sceneParser';
-import {IWebGALStyleObj, scss2cssinjsParser} from "@/styleParser";
+import {IWebGALStyleObj, scss2cssinjsParser} from "./styleParser";
 
 export default class SceneParser {
   private readonly SCRIPT_CONFIG_MAP: ConfigMap;

package/src/interface/sceneInterface.ts

@@ -37,6 +37,7 @@ export enum commandType {
   setTransform,
   setTransition,
   getUserInput,
+  applyStyle
 }
 
 /**

package/src/scriptParser/scriptParser.ts

@@ -35,8 +35,9 @@ export const scriptParser = (
 
   // 正式开始解析
 
-  // 去分号，前面已做，这里不再需要
-  let newSentenceRaw = sentenceRaw.split(';')[0];
+  // 去分号
+  let newSentenceRaw = sentenceRaw.split(/(?<!\\);/)[0];
+  newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
   if (newSentenceRaw === '') {
     // 注释提前返回
     return {
@@ -56,7 +57,11 @@ export const scriptParser = (
   // 没有command，说明这是一条连续对话或单条语句
   if (getCommandResult === null) {
     commandRaw = newSentenceRaw;
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+    parsedCommand = commandParser(
+      commandRaw,
+      ADD_NEXT_ARG_LIST,
+      SCRIPT_CONFIG_MAP,
+    );
     command = parsedCommand.type;
     for (const e of parsedCommand.additionalArgs) {
       // 由于是连续对话，所以我们去除 speaker 参数。
@@ -72,7 +77,11 @@ export const scriptParser = (
       getCommandResult.index + 1,
       newSentenceRaw.length,
     );
-    parsedCommand = commandParser(commandRaw, ADD_NEXT_ARG_LIST, SCRIPT_CONFIG_MAP);
+    parsedCommand = commandParser(
+      commandRaw,
+      ADD_NEXT_ARG_LIST,
+      SCRIPT_CONFIG_MAP,
+    );
     command = parsedCommand.type;
     for (const e of parsedCommand.additionalArgs) {
       args.push(e);
@@ -91,12 +100,12 @@ export const scriptParser = (
       args.push(e);
     }
   }
-  content = contentParser(newSentenceRaw, command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
+  content = contentParser(newSentenceRaw.trim(), command, assetSetter); // 将语句内容里的文件名转为相对或绝对路径
   sentenceAssets = assetsScanner(command, content, args); // 扫描语句携带资源
   subScene = subSceneScanner(command, content); // 扫描语句携带子场景
   return {
     command: command, // 语句类型
-    commandRaw: commandRaw, // 命令原始内容，方便调试
+    commandRaw: commandRaw.trim(), // 命令原始内容，方便调试
     content: content, // 语句内容
     args: args, // 参数列表
     sentenceAssets: sentenceAssets, // 语句携带的资源列表

package/src/styleParser/index.ts

@@ -20,17 +20,17 @@ function parseCSS(css: string): [Record<string, string>, string] {
   const result: Record<string, string> = {};
   let specialRules = '';
   let matches;
-  // 匹配类选择器和其内容，包括一层嵌套
-  const classRegex = /\.([^{\s]+)\s*{([^}]*?(?:\{[^}]*?\}[^}]*?)?)}/g;
-  // 更新特殊规则正则表达式以正确处理一层嵌套，并确保大括号成对出现
+
+  // 使用非贪婪匹配，尝试正确处理任意层次的嵌套
+  const classRegex = /\.([^{\s]+)\s*{((?:[^{}]*|{[^}]*})*)}/g;
   const specialRegex = /(@[^{]+{\s*(?:[^{}]*{[^}]*}[^{}]*)+\s*})/g;
 
-  // 提取类和样式
   while ((matches = classRegex.exec(css)) !== null) {
-    result[matches[1]] = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+    const key = matches[1];
+    const value = matches[2].trim().replace(/\s*;\s*/g, ';\n');
+    result[key] = value;
   }
 
-  // 提取特殊规则，并确保包含所有的大括号
   while ((matches = specialRegex.exec(css)) !== null) {
     specialRules += matches[1].trim() + '\n';
   }