adofai 2.10.0 → 2.11.0

package/README.md

@@ -1,112 +1,112 @@
-# ADOFAI
-
-A Javascript library for ADOFAI levels.
-
-## Usage
-Preview / Edit the `.adofai` file.
-
-Re_ADOJAS(A Level Player of ADOFAI) uses `adofai` to parse ADOFAI Level file.
-
-## Installation
-
-```bash
-npm install adofai
-# or
-yarn add adofai
-# or
-pnpm install adofai
-```
-
-if you want to display highlight of adofai file, you can use `Rhythm Game Syntax Highlighter` vscode extension.
-
-## Got Started
-
-### Import
-
-For Commonjs:
-```ts
-const adofai = require('adofai');
-```
-
-For ES6 Modules:
-```ts
-import * as adofai from 'adofai';
-```
-
-### Create a Level
-
-```ts
-const file = new adofai.Level(adofaiFileContent);
-
-//or
-
-const parser = new adofai.Parsers.StringParser();
-const file = new adofai.Level(adofaiFileContent,parser);
-
-//The advantage of the latter over the former is that it pre-initializes the Parser, avoiding multiple instantiations.
-```
-
-Format:
-```ts
-class Level {
-    constructor(opt: string | LevelOptions, provider?: ParseProvider)
- }
-
-```
-Available ParseProviders: 
-`StringParser` `ArrayBufferParser` `BufferParser`
-
-
-Usually,only `StringParser` is needed.
-but you can use `BufferParser` to parse ADOFAI files in Node environment.
-
-On browser, you can also use `ArrayBuffer` to parse ADOFAI files.
-(`BufferParser` is not available in browser,but you can use browserify `Buffer` to polyfill)
-
-### Load Level
-```ts
-file.on('load'() => {
-    //logic...
-})
-file.load()
-```
-
-or you can use `then()`
-```ts
-file.load().then(() => {
-
-})
-```
-
-### Export Level
-```ts
-type FileType = 'string'|'object'
-
-file.export(type: FileType = 'string',indent?:number,useAdofaiStyle:boolean = true)
-```
-
-method `export()` returns a Object or String.
-
-Object: return ADOFAI Object.
-String: return ADOFAI String.
-
-```ts
-import fs from 'fs'
-type FileType = 'string'|'object'
-
-const content = file.export('string',null,true);
-fs.writeFileSync('output.adofai',content)
-```
-
-
-## Data Operation
-
-See interfaces to see all data.
-
-```ts
-//Get AngleDatas:
-const angleDatas = file.angleData;
-
-
-
+# ADOFAI
+
+A Javascript library for ADOFAI levels.
+
+## Usage
+Preview / Edit the `.adofai` file.
+
+Re_ADOJAS(A Level Player of ADOFAI) uses `adofai` to parse ADOFAI Level file.
+
+## Installation
+
+```bash
+npm install adofai
+# or
+yarn add adofai
+# or
+pnpm install adofai
+```
+
+if you want to display highlight of adofai file, you can use `Rhythm Game Syntax Highlighter` vscode extension.
+
+## Got Started
+
+### Import
+
+For Commonjs:
+```ts
+const adofai = require('adofai');
+```
+
+For ES6 Modules:
+```ts
+import * as adofai from 'adofai';
+```
+
+### Create a Level
+
+```ts
+const file = new adofai.Level(adofaiFileContent);
+
+//or
+
+const parser = new adofai.Parsers.StringParser();
+const file = new adofai.Level(adofaiFileContent,parser);
+
+//The advantage of the latter over the former is that it pre-initializes the Parser, avoiding multiple instantiations.
+```
+
+Format:
+```ts
+class Level {
+    constructor(opt: string | LevelOptions, provider?: ParseProvider)
+ }
+
+```
+Available ParseProviders: 
+`StringParser` `ArrayBufferParser` `BufferParser`
+
+
+Usually,only `StringParser` is needed.
+but you can use `BufferParser` to parse ADOFAI files in Node environment.
+
+On browser, you can also use `ArrayBuffer` to parse ADOFAI files.
+(`BufferParser` is not available in browser,but you can use browserify `Buffer` to polyfill)
+
+### Load Level
+```ts
+file.on('load'() => {
+    //logic...
+})
+file.load()
+```
+
+or you can use `then()`
+```ts
+file.load().then(() => {
+
+})
+```
+
+### Export Level
+```ts
+type FileType = 'string'|'object'
+
+file.export(type: FileType = 'string',indent?:number,useAdofaiStyle:boolean = true)
+```
+
+method `export()` returns a Object or String.
+
+Object: return ADOFAI Object.
+String: return ADOFAI String.
+
+```ts
+import fs from 'fs'
+type FileType = 'string'|'object'
+
+const content = file.export('string',null,true);
+fs.writeFileSync('output.adofai',content)
+```
+
+
+## Data Operation
+
+See interfaces to see all data.
+
+```ts
+//Get AngleDatas:
+const angleDatas = file.angleData;
+
+
+
 ```

package/dist/src/structure/Level.d.ts

@@ -14,6 +14,10 @@ export declare class Level {
     private _twirlCount;
     constructor(opt: string | LevelOptions, provider?: ParseProvider);
     generateGUID(): string;
+    /**
+     * 触发进度事件
+     */
+    private _emitProgress;
     load(): Promise<boolean>;
     on(eventName: string, callback: Function): string;
     trigger(eventName: string, data: any): void;
@@ -37,6 +41,12 @@ export declare class Level {
         actions: AdofaiEvent[];
     };
     calculateTileCoordinates(): void;
+    /**
+     * 计算所有 Tile 的坐标位置
+     * 触发 parse:tilePosition 和 parse:progress 事件报告进度
+     *
+     * 性能优化：预先构建 PositionTrack 索引，避免循环内重复遍历
+     */
     calculateTilePosition(): number[][];
     floorOperation(info?: {
         type: 'append' | 'insert' | 'delete';

package/dist/src/structure/Level.js

@@ -35,10 +35,26 @@ export class Level {
     generateGUID() {
         return `event_${uuid()}`;
     }
+    /**
+     * 触发进度事件
+     */
+    _emitProgress(stage, current, total, data) {
+        const progressEvent = {
+            stage,
+            current,
+            total,
+            percent: total > 0 ? Math.round((current / total) * 100) : 0,
+            data
+        };
+        this.trigger('parse:progress', progressEvent);
+        this.trigger(`parse:${stage}`, progressEvent);
+    }
     load() {
         return new Promise((resolve, reject) => {
             let opt = this._options;
             let options;
+            // 阶段1: 解析输入
+            this._emitProgress('start', 0, 0);
             switch (typeof opt) {
                 case 'string':
                     try {
@@ -56,18 +72,31 @@ export class Level {
                     reject("Options must be String or Object");
                     return;
             }
-            if (options && typeof options === 'object' && options !== null && typeof options.pathData !== 'undefined') {
-                this.angleData = pathData.parseToangleData(options['pathData']);
+            // 阶段2: 处理 pathData 或 angleData
+            const hasPathData = options && typeof options === 'object' && options !== null && typeof options.pathData !== 'undefined';
+            const hasAngleData = options && typeof options === 'object' && options !== null && typeof options.angleData !== 'undefined';
+            if (hasPathData) {
+                const pathDataStr = options['pathData'];
+                // 开始转换 pathData
+                this._emitProgress('pathData', 0, pathDataStr.length, { source: pathDataStr });
+                this.angleData = pathData.parseToangleData(pathDataStr);
+                // 转换完成，返回结果
+                this._emitProgress('pathData', pathDataStr.length, pathDataStr.length, {
+                    source: pathDataStr,
+                    processed: this.angleData
+                });
+            }
+            else if (hasAngleData) {
+                this.angleData = options['angleData'];
+                this._emitProgress('angleData', this.angleData.length, this.angleData.length, {
+                    processed: this.angleData
+                });
             }
             else {
-                if (options && typeof options === 'object' && options !== null && typeof options.angleData !== 'undefined') {
-                    this.angleData = options['angleData'];
-                }
-                else {
-                    reject("There is not any angle datas.");
-                    return;
-                }
+                reject("There is not any angle datas.");
+                return;
             }
+            // 阶段3: 提取其他数据
             if (options && typeof options === 'object' && options !== null && typeof options.actions !== 'undefined') {
                 this.actions = options['actions'];
             }
@@ -90,9 +119,11 @@ export class Level {
             this.tiles = [];
             this._angleDir = -180;
             this._twirlCount = 0;
+            // 阶段4: 创建 Tile 数组（带进度回调）
             this._createArray(this.angleData.length, { angleData: this.angleData, actions: this.actions, decorations: this.__decorations })
                 .then(e => {
                 this.tiles = e;
+                this._emitProgress('complete', this.angleData.length, this.angleData.length);
                 this.trigger('load', this);
                 resolve(true);
             }).catch(e => {
@@ -131,16 +162,36 @@ export class Level {
     }
     _createArray(xLength, opt) {
         return __awaiter(this, void 0, void 0, function* () {
-            let m = Array.from({ length: xLength }, (_, i) => ({
-                direction: opt.angleData[i],
-                _lastdir: opt.angleData[i - 1] || 0,
-                actions: this._filterByFloor(opt.actions, i),
-                angle: this._parseAngle(opt.angleData, i, this._twirlCount % 2),
-                addDecorations: this._filterByFloorwithDeco(opt.decorations, i),
-                twirl: this._twirlCount,
-                extraProps: {}
-            }));
-            return m;
+            const tiles = [];
+            const batchSize = Math.max(1, Math.floor(xLength / 100)); // 每批处理的数量，至少1个
+            for (let i = 0; i < xLength; i++) {
+                // 计算相对角度（会更新 _twirlCount）
+                const angle = this._parseAngle(opt.angleData, i, this._twirlCount % 2);
+                const tile = {
+                    direction: opt.angleData[i],
+                    _lastdir: opt.angleData[i - 1] || 0,
+                    actions: this._filterByFloor(opt.actions, i),
+                    angle: angle,
+                    addDecorations: this._filterByFloorwithDeco(opt.decorations, i),
+                    twirl: this._twirlCount,
+                    extraProps: {}
+                };
+                tiles.push(tile);
+                // 每处理一批或最后一个时触发进度事件
+                if (i % batchSize === 0 || i === xLength - 1) {
+                    this._emitProgress('relativeAngle', i + 1, xLength, {
+                        tileIndex: i,
+                        tile: tile,
+                        angle: opt.angleData[i],
+                        relativeAngle: angle
+                    });
+                    // 让出事件循环，避免阻塞
+                    if (i % (batchSize * 10) === 0) {
+                        yield new Promise(r => setTimeout(r, 0));
+                    }
+                }
+            }
+            return tiles;
         });
     }
     _changeAngle() {
@@ -259,46 +310,72 @@ export class Level {
     calculateTileCoordinates() {
         console.warn("calculateTileCoordinates is deprecated. Use calculateTilePosition instead.");
     }
+    /**
+     * 计算所有 Tile 的坐标位置
+     * 触发 parse:tilePosition 和 parse:progress 事件报告进度
+     *
+     * 性能优化：预先构建 PositionTrack 索引，避免循环内重复遍历
+     */
     calculateTilePosition() {
-        let angles = this.angleData;
-        let floats = [];
-        let positions = [];
-        let startPos = [0, 0];
-        for (let i = 0; i < this.tiles.length; i++) {
-            let value = angles[i];
-            if (value === 999) {
-                value = angles[i - 1] + 180;
+        const angles = this.angleData;
+        const totalTiles = this.tiles.length;
+        const positions = [];
+        const startPos = [0, 0];
+        // 性能优化：预先构建 PositionTrack 索引 Map，O(n) 预处理
+        const positionTrackMap = new Map();
+        for (const action of this.actions) {
+            if (action.eventType === 'PositionTrack' && action.positionOffset) {
+                if (action.editorOnly !== true && action.editorOnly !== 'Enabled') {
+                    positionTrackMap.set(action.floor, action);
+                }
             }
-            floats.push(value);
         }
-        for (let i = 0; i <= floats.length; i++) {
-            let angle1 = Number((i === floats.length) ? floats[i - 1] : floats[i]) || 0;
-            let angle2 = Number((i === 0) ? 0 : floats[i - 1]) || 0;
-            let currentTile = this.tiles[i];
-            if (this.getActionsByIndex('PositionTrack', i).count > 0) {
-                let pevent = this.getActionsByIndex('PositionTrack', i).actions[0];
-                if (pevent.positionOffset) {
-                    if (pevent['editorOnly'] !== true && pevent['editorOnly'] !== 'Enabled') {
-                        startPos[0] += pevent['positionOffset'][0];
-                        startPos[1] += pevent['positionOffset'][1];
-                    }
-                }
+        // 触发开始事件
+        this._emitProgress('tilePosition', 0, totalTiles);
+        // 预处理 floats 数组
+        const floats = new Array(totalTiles);
+        for (let i = 0; i < totalTiles; i++) {
+            floats[i] = angles[i] === 999 ? angles[i - 1] + 180 : angles[i];
+        }
+        // 进度事件触发频率：每 1% 或最少每 100 个 tile 触发一次
+        const progressInterval = Math.max(100, Math.floor(totalTiles / 100));
+        for (let i = 0; i <= totalTiles; i++) {
+            const isLastTile = i === totalTiles;
+            const angle1 = isLastTile ? (floats[i - 1] || 0) : floats[i];
+            const angle2 = i === 0 ? 0 : (floats[i - 1] || 0);
+            const currentTile = this.tiles[i];
+            // 使用索引 Map 直接查询，O(1) 复杂度
+            const posTrack = positionTrackMap.get(i);
+            if (posTrack === null || posTrack === void 0 ? void 0 : posTrack.positionOffset) {
+                startPos[0] += posTrack.positionOffset[0];
+                startPos[1] += posTrack.positionOffset[1];
             }
-            let tempPos = [
-                Number(startPos[0]),
-                Number(startPos[1])
-            ];
+            const tempPos = [startPos[0], startPos[1]];
             positions.push(tempPos);
-            if (typeof currentTile !== 'undefined') {
+            if (currentTile) {
                 currentTile.position = tempPos;
-                ;
                 currentTile.extraProps.angle1 = angle1;
                 currentTile.extraProps.angle2 = angle2 - 180;
-                currentTile.extraProps.cangle = i === floats.length ? floats[i - 1] + 180 : floats[i];
+                currentTile.extraProps.cangle = isLastTile ? floats[i - 1] + 180 : floats[i];
+            }
+            // 更新位置
+            const rad = angle1 * Math.PI / 180;
+            startPos[0] += Math.cos(rad);
+            startPos[1] += Math.sin(rad);
+            // 触发进度事件（降低频率）
+            if (i % progressInterval === 0 || isLastTile) {
+                this._emitProgress('tilePosition', i, totalTiles, {
+                    tileIndex: i,
+                    tile: currentTile,
+                    position: tempPos,
+                    angle: angle1
+                });
             }
-            startPos[0] += Math.cos(angle1 * Math.PI / 180);
-            startPos[1] += Math.sin(angle1 * Math.PI / 180);
         }
+        // 触发完成事件
+        this._emitProgress('tilePosition', totalTiles, totalTiles, {
+            processed: positions.flat()
+        });
         return positions;
     }
     floorOperation(info = { type: 'append', direction: 0 }) {

package/dist/src/structure/interfaces.d.ts

@@ -31,3 +31,26 @@ export interface Tile {
 export interface ParseProvider {
     parse(t: string): LevelOptions;
 }
+export interface ParseProgressEvent {
+    stage: 'start' | 'pathData' | 'angleData' | 'relativeAngle' | 'tilePosition' | 'complete';
+    current: number;
+    total: number;
+    percent: number;
+    /** 当前阶段产生的数据 */
+    data?: {
+        /** pathData 阶段: 原始 pathData 字符串; angleData 阶段: 解析后的角度数组 */
+        source?: string | number[];
+        /** 已处理的部分数据 */
+        processed?: number[];
+        /** 当前处理的 tile 数据 */
+        tile?: Tile;
+        /** 当前处理的 tile 索引 */
+        tileIndex?: number;
+        /** angleData: 当前角度值 */
+        angle?: number;
+        /** relativeAngle: 计算出的相对角度 */
+        relativeAngle?: number;
+        /** tilePosition: 当前坐标 */
+        position?: number[];
+    };
+}