adofai-lib 1.0.0 → 1.0.1

package/README.md

@@ -1,6 +1,7 @@
 # ADOFAI Library
 
 A TypeScript library for working with ADOFAI level files. This library provides a simple interface for reading, modifying, and writing ADOFAI level files.
+Ported from M1n3c4rt's `adofaipy` lib and expanded by V0W4N
 
 ## Installation
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adofai-lib",
-  "version": "1.0.0",
-  "description": "A TypeScript library for working with ADOFAI level files",
+  "version": "1.0.1",
+  "description": "A TypeScript library for working with ADOFAI level files. Original by M1n3c4rt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -15,7 +15,7 @@
     "adofai-lib-js",
     "adofai-lib-js-v0w4n"
   ],
-  "author": "V0W4N (original by M1n3c4rt)",
+  "author": "V0W4N",
   "license": "MIT",
   "devDependencies": {
     "@types/jest": "^29.5.12",

package/src/LevelDict.ts

@@ -1,7 +1,9 @@
 import * as fs from 'fs';
+import * as utils from './utils/levelUtils';
 import { Action, Decoration, Settings, Tile, InvalidLevelDictException } from './types';
+import { LevelJSON } from './types/level';
 
-export class LevelFile {
+export class LevelDict {
   private filename: string;
   private encoding: BufferEncoding;
   private tiles: Tile[];
@@ -15,7 +17,7 @@ export class LevelFile {
     this.nonFloorDecos = [];
     this.settings = {};
 
-    const leveldict = this.getFileDict();
+    const leveldict = this.getFileDict(filename);
     if (!leveldict.actions || !leveldict.settings || (!leveldict.angleData && !leveldict.pathData)) {
       throw new InvalidLevelDictException(`The provided .adofai file is invalid. (missing: ${!leveldict.actions ? 'actions' : ''} ${!leveldict.settings ? 'settings' : ''} ${!leveldict.angleData && !leveldict.pathData ? 'angleData or pathData' : ''})`);
     }
@@ -32,9 +34,6 @@ export class LevelFile {
       };
       angleData = Array.from(leveldict.pathData as string).map(char => pathchars[char]);
     }
-
-    angleData.push(angleData[angleData.length - 1] !== 999 ? angleData[angleData.length - 1] : (angleData[angleData.length - 2] + 180) % 360);
-    
     const actions = leveldict.actions;
     const decorations = leveldict.decorations || [];
     
@@ -47,7 +46,7 @@ export class LevelFile {
       actions: [],
       decorations: []
     }));
-
+    console.log('mapping tiles', angleData, this.tiles);
     // Add actions
     actions.forEach((action: Action) => {
       if (action.floor !== undefined && action.floor < this.tiles.length) {
@@ -67,13 +66,13 @@ export class LevelFile {
     });
   }
 
-  private getFileString(): string {
-    if (!this.filename) return '';
-    return fs.readFileSync(this.filename, { encoding: this.encoding });
+  private getFileString(filename: string): string {
+    if (!filename) return '';
+    return fs.readFileSync(filename, { encoding: this.encoding });
   }
 
-  private getFileDict(): any {
-    if (!this.filename) {
+  private getFileDict(filename: string): LevelJSON {
+    if (!filename) {
       return {
         angleData: [0],
         settings: {},
@@ -82,8 +81,8 @@ export class LevelFile {
       };
     }
 
-    const content = this.getFileString();
-    return JSON.parse(content);
+    const content = this.getFileString(filename);
+    return utils.safeParseJSON(content);
   }
 
   public getAngles(): number[] {
@@ -91,9 +90,9 @@ export class LevelFile {
   }
 
   public setAngles(angles: number[]): void {
-    if (angles.length > this.tiles.length) {
+    while (angles.length > this.tiles.length) {
       this.tiles.push({
-        angle: angles[angles.length - 1],
+        angle: angles[this.tiles.length],
         actions: [],
         decorations: []
       });
@@ -105,7 +104,7 @@ export class LevelFile {
   }
 
   public getAnglesRelative(ignoreTwirls: boolean = false, padMidspins: boolean = false): number[] {
-    const absangles = this.getAngles().slice(0, -1);
+    const absangles = this.getAngles();
 
     if (!ignoreTwirls) {
       const twirls = this.getActions(action => action.eventType === 'Twirl')
@@ -148,23 +147,18 @@ export class LevelFile {
   }
 
   public getDecorations(condition: (decoration: Decoration) => boolean = () => true): Decoration[] {
-    return [
-      ...this.tiles.flatMap(tile => tile.decorations.filter(condition)),
-      ...this.nonFloorDecos.filter(condition)
-    ];
+    return this.tiles.flatMap(tile => tile.decorations.filter(condition))
+    .concat(this.nonFloorDecos.filter(condition));
   }
 
   public writeToFile(filename?: string): void {
     const final = {
-      angleData: this.tiles.map(tile => tile.angle),
+      angleData: this.getAngles(),
       settings: { ...this.settings },
-      actions: this.tiles.flatMap(tile => tile.actions),
-      decorations: [
-        ...this.tiles.flatMap(tile => tile.decorations),
-        ...this.nonFloorDecos
-      ]
+      actions: this.getActions(),
+      decorations: this.getDecorations()
     };
-
+    console.log(final);
     const outputFile = filename || this.filename;
     fs.writeFileSync(outputFile, JSON.stringify(final, null, 4), { encoding: this.encoding });
   }

package/src/__tests__/LevelFile.test.ts

@@ -1,27 +1,26 @@
-import { LevelFile } from '../LevelDict';
+import { LevelDict } from '../LevelDict';
 import * as fs from 'fs';
-import * as path from 'path';
 
 // Mock fs module
 jest.mock('fs');
 
-describe('LevelFile', () => {
+describe('LevelDict', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('should create an empty level file when no filename is provided', () => {
-    const level = new LevelFile();
-    expect(level.getAngles()).toEqual([0,0]);
+    const level = new LevelDict();
+    expect(level.getAngles()).toEqual([0]);
     expect(level.getActions()).toEqual([]);
     expect(level.getDecorations()).toEqual([]);
   });
 
-  it('should throw InvalidLevelDictException for invalid file', () => {
+  it('should throw InvalidLevelException for invalid file', () => {
     (fs.readFileSync as jest.Mock).mockReturnValue('{}');
     
     expect(() => {
-      new LevelFile('invalid.adofai');
+      new LevelDict('invalid.adofai');
     }).toThrow('The provided .adofai file is invalid');
   });
 
@@ -35,12 +34,12 @@ describe('LevelFile', () => {
 
     (fs.readFileSync as jest.Mock).mockReturnValue(JSON.stringify(mockLevelData));
 
-    const level = new LevelFile('test.adofai');
-    expect(level.getAngles()).toEqual([0, 90, 180, 180]);
+    const level = new LevelDict('test.adofai');
+    expect(level.getAngles()).toEqual([0, 90, 180]);
   });
 
   it('should write level file correctly', () => {
-    const level = new LevelFile();
+    const level = new LevelDict();
     level.setAngles([0, 90, 180]);
     
     level.writeToFile('output.adofai');
@@ -62,8 +61,8 @@ describe('LevelFile', () => {
 
     (fs.readFileSync as jest.Mock).mockReturnValue(JSON.stringify(mockLevelData));
 
-    const level = new LevelFile('test.adofai');
-    expect(level.getAngles()).toEqual([0, 90, 180, 180]);
+    const level = new LevelDict('test.adofai');
+    expect(level.getAngles()).toEqual([0, 90, 180]);
   });
 
   it('should get relative angles correctly', () => {
@@ -76,8 +75,20 @@ describe('LevelFile', () => {
 
     (fs.readFileSync as jest.Mock).mockReturnValue(JSON.stringify(mockLevelData));
 
-    const level = new LevelFile('test.adofai');
+    const level = new LevelDict('test.adofai');
     const relativeAngles = level.getAnglesRelative();
     expect(relativeAngles).toEqual([180, 90, 90, 180]);
   });
+
+  it('should parse malformed parameter sequence', () => {
+    const mockBadLevelData = `{
+      "pathData": "RURU",
+      "settings": { "bpm": 120 },
+      "actions": []
+      "decorations": []
+    }`;
+    (fs.readFileSync as jest.Mock).mockReturnValue(mockBadLevelData);
+    const level = new LevelDict('test.adofai');
+    expect(level.getAngles()).toEqual([0, 90, 0, 90]);
+  });
 }); 

package/src/types/index.ts

@@ -11,7 +11,7 @@ export interface Decoration {
 }
 
 export interface Settings {
-  [key: string]: any;
+  [key: string]: any; 
 }
 
 export interface Tile {

package/src/types/level.ts

@@ -0,0 +1,19 @@
+import { Settings } from ".";
+
+export interface LevelJSON {
+    actions?: Array<Record<string, any>>;
+    decorations?: Array<Record<string, any>>;
+    settings?: Settings;
+    [key: string]: any;
+}
+
+export interface TransformOptions {
+    keepEventTypes?: Set<string>;
+    dropEventTypes?: Set<string>;
+    baseCameraZoom?: number;
+    extraProtectedEventTypes?: Set<string>;
+    additionalPatterns?: Set<RegExp>;
+    constantBackgroundColor?: string;
+    removeForegroundFlash?: boolean;
+    dropFilters?: Set<string>;
+} 

package/src/utils/levelUtils.ts

@@ -0,0 +1,18 @@
+import JSON5 from 'json5';
+import { LevelJSON } from '../types/level';
+
+/**
+ * Ensure bad comma handling
+ */
+export function safeParseJSON(str: string): LevelJSON {
+        try {
+            const cleaned = str
+                .replace(/,(\s*[}\]])/g, '$1') // Remove trailing commas before closing brackets
+                .replace(/([}\]])[\s\n]*([}\]])/g, '$1,$2') // Ensure comma between closing brackets
+                .replace(/([}\]])[\s\n]*("decorations"|"actions"|"settings")/g, '$1,$2'); // Ensure comma before main sections
+            
+            return JSON5.parse(cleaned);
+        } catch (e) {
+            throw new Error('Failed to parse level JSON');
+        }
+    }

package/tsconfig.json

@@ -4,12 +4,14 @@
     "module": "commonjs",
     "declaration": true,
     "outDir": "./dist",
+    "rootDir": "./src",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "moduleResolution": "node",
-    "lib": ["es2019", "dom"]
+    "lib": ["es2019", "dom"],
+    "composite": false
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "**/*.test.ts"]