adofai-lib 1.3.1 → 1.3.2

package/dist/__tests__/LocalFileTest.test.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import LevelDict from '../LevelDict.js';
-const SPECIFIED_LEVEL_PATH = "C:/ADOFAI charts/template.adofai";
+const SPECIFIED_LEVEL_PATH = "C:/Users/Acer_Nitro/Downloads/Team_Wild_Hunt Ice_-_Atohs (DLC Excluded)/level.adofai";
 describe('LevelDict specified file loader', () => {
     const runOrSkip = SPECIFIED_LEVEL_PATH ? it : it.skip;
     runOrSkip('loads and parses specified .adofai file into LevelDict', () => {
@@ -18,7 +18,7 @@ describe('LevelDict specified file loader', () => {
         //     }}))
         //     }}).slice(-40, -1))
         //console.log(JSON.stringify(levelSlice, null, 2))
-        console.log(JSON.stringify(level.getTiles(), null, 2));
+        //console.log(JSON.stringify(level.getTiles(), null, 2))
         expect(angles.length).toBeGreaterThan(0);
     });
 });

package/dist/__tests__/LocalFileTest.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocalFileTest.test.js","sourceRoot":"","sources":["../../src/__tests__/LocalFileTest.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAGxC,MAAM,oBAAoB,GAAG,kCAAkC,CAAC;AAEhE,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;IAEtD,SAAS,CAAC,wDAAwD,EAAE,GAAG,EAAE;QACvE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,oBAA8B,CAAC,CAAC;QAElE,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAEjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAExC,iGAAiG;QACjG,6MAA6M;QAC7M,uEAAuE;QACvE,wGAAwG;QACxG,WAAW;QACX,0BAA0B;QAC1B,kDAAkD;QAClD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QACtD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"LocalFileTest.test.js","sourceRoot":"","sources":["../../src/__tests__/LocalFileTest.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAGxC,MAAM,oBAAoB,GAAG,sFAAsF,CAAC;AAEpH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;IAEtD,SAAS,CAAC,wDAAwD,EAAE,GAAG,EAAE;QACvE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,oBAA8B,CAAC,CAAC;QAElE,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAEjC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAExC,iGAAiG;QACjG,6MAA6M;QAC7M,uEAAuE;QACvE,wGAAwG;QACxG,WAAW;QACX,0BAA0B;QAC1B,kDAAkD;QAClD,wDAAwD;QACxD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/levelUtils.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=levelUtils.test.d.ts.map

package/dist/__tests__/levelUtils.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"levelUtils.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/levelUtils.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/levelUtils.test.js

@@ -0,0 +1,33 @@
+import { escapeRawLineBreaksInDoubleQuotedStrings, safeParseJSON } from '../utils/levelUtils.js';
+describe('levelUtils', () => {
+    it('escapes raw newlines inside double-quoted strings (EditorComment)', () => {
+        const raw = `{
+  "pathData": "",
+  "settings": { "version": 2, "artist": "", "song": "", "author": "", "difficulty": "", "bpm": 100 },
+  "actions": [
+    { "floor": 0, "eventType": "EditorComment", "comment": "health
+100% - 3.7
+
+gauge
+100% - 1.4\\n\\nCLEAR = 20%\\n
+14 7 10\\n24 32 64"}
+  ],
+  "decorations": []
+}`;
+        const parsed = safeParseJSON(raw);
+        expect(parsed.actions[0].comment).toContain('health');
+        expect(parsed.actions[0].comment).toContain('100% - 3.7');
+        expect(parsed.actions[0].comment).toContain('gauge');
+    });
+    it('does not treat // inside strings as line comments', () => {
+        const raw = `{"pathData": "", "settings": {"bpm": 100}, "actions": [{"floor": 0, "eventType": "EditorComment", "comment": "see // not a comment
+next line"}], "decorations": []}`;
+        const parsed = safeParseJSON(raw);
+        expect(parsed.actions[0].comment).toBe('see // not a comment\nnext line');
+    });
+    it('escapeRawLineBreaksInDoubleQuotedStrings leaves structure outside strings unchanged', () => {
+        const s = '{\n  "a": 1\n}';
+        expect(escapeRawLineBreaksInDoubleQuotedStrings(s)).toBe(s);
+    });
+});
+//# sourceMappingURL=levelUtils.test.js.map

package/dist/__tests__/levelUtils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"levelUtils.test.js","sourceRoot":"","sources":["../../src/__tests__/levelUtils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wCAAwC,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEjG,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,GAAG,GAAG;;;;;;;;;;;;EAYd,CAAC;QAEC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAA6C,CAAC;QAC9E,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,GAAG,GAAG;iCACiB,CAAC;QAC9B,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAA6C,CAAC;QAC9E,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC7F,MAAM,CAAC,GAAG,gBAAgB,CAAC;QAC3B,MAAM,CAAC,wCAAwC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/utils/levelUtils.d.ts

@@ -1,3 +1,10 @@
 import { LevelJSON } from '../types/index.js';
+/**
+ * The ADOFAI editor can write real line breaks inside double-quoted strings (e.g.
+ * EditorComment "comment"). JSON/JSON5 require those to be escaped as \\n, so JSON5.parse
+ * fails otherwise. This pass only mutates characters inside "..." strings, and skips
+ * JSON5 // and /* *\/ comments so quotes inside comments do not toggle string state.
+ */
+export declare function escapeRawLineBreaksInDoubleQuotedStrings(str: string): string;
 export declare function safeParseJSON(str: string): LevelJSON;
 //# sourceMappingURL=levelUtils.d.ts.map

package/dist/utils/levelUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"levelUtils.d.ts","sourceRoot":"","sources":["../../src/utils/levelUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAapD"}
+{"version":3,"file":"levelUtils.d.ts","sourceRoot":"","sources":["../../src/utils/levelUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAI9C;;;;;GAKG;AACH,wBAAgB,wCAAwC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAyF5E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAapD"}

package/dist/utils/levelUtils.js

@@ -1,8 +1,98 @@
 import JSON5 from 'json5';
+/**
+ * The ADOFAI editor can write real line breaks inside double-quoted strings (e.g.
+ * EditorComment "comment"). JSON/JSON5 require those to be escaped as \\n, so JSON5.parse
+ * fails otherwise. This pass only mutates characters inside "..." strings, and skips
+ * JSON5 // and /* *\/ comments so quotes inside comments do not toggle string state.
+ */
+export function escapeRawLineBreaksInDoubleQuotedStrings(str) {
+    let out = '';
+    let state = 'normal';
+    let i = 0;
+    let stringEscaped = false;
+    while (i < str.length) {
+        const c = str[i];
+        const next = str[i + 1];
+        if (state === 'lineComment') {
+            if (c === '\n' || c === '\r') {
+                state = 'normal';
+                out += c;
+            }
+            i++;
+            continue;
+        }
+        if (state === 'blockComment') {
+            if (c === '*' && next === '/') {
+                out += '*/';
+                i += 2;
+                state = 'normal';
+                continue;
+            }
+            out += c;
+            i++;
+            continue;
+        }
+        if (state === 'string') {
+            if (stringEscaped) {
+                out += c;
+                stringEscaped = false;
+                i++;
+                continue;
+            }
+            if (c === '\\') {
+                out += c;
+                stringEscaped = true;
+                i++;
+                continue;
+            }
+            if (c === '"') {
+                out += c;
+                state = 'normal';
+                i++;
+                continue;
+            }
+            if (c === '\r') {
+                out += '\\n';
+                i += next === '\n' ? 2 : 1;
+                continue;
+            }
+            if (c === '\n') {
+                out += '\\n';
+                i++;
+                continue;
+            }
+            out += c;
+            i++;
+            continue;
+        }
+        // normal
+        if (c === '/' && next === '/') {
+            out += '//';
+            i += 2;
+            state = 'lineComment';
+            continue;
+        }
+        if (c === '/' && next === '*') {
+            out += '/*';
+            i += 2;
+            state = 'blockComment';
+            continue;
+        }
+        if (c === '"') {
+            out += c;
+            state = 'string';
+            i++;
+            continue;
+        }
+        out += c;
+        i++;
+    }
+    return out;
+}
 export function safeParseJSON(str) {
     try {
-        const cleaned = str
-            .replace(/\r/g, '') // Remove all carriage returns
+        const normalized = str.replace(/\r/g, '');
+        const cleaned = escapeRawLineBreaksInDoubleQuotedStrings(normalized)
             .replace(/,(\s*[}\]])/g, '$1') // Remove trailing commas before closing brackets
             .replace(/([}\]])[\s\n\t]*([}\]])/g, '$1,$2') // Ensure comma between closing brackets
             .replace(/([}\]])[\s\n\t]*([{"\[])/g, '$1,$2') // Add comma between any closing brace/bracket and opening brace/bracket

package/dist/utils/levelUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"levelUtils.js","sourceRoot":"","sources":["../../src/utils/levelUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,MAAM,UAAU,aAAa,CAAC,GAAW;IACrC,IAAI,CAAC;QACD,MAAM,OAAO,GAAG,GAAG;aACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,8BAA8B;aACjD,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,iDAAiD;aAC/E,OAAO,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC,wCAAwC;aACrF,OAAO,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC,wEAAwE;aACtH,OAAO,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC,+DAA+D;aAC/G,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAA,CAAC,uDAAuD;QAC1F,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC;AACL,CAAC"}
+{"version":3,"file":"levelUtils.js","sourceRoot":"","sources":["../../src/utils/levelUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B;;;;;GAKG;AACH,MAAM,UAAU,wCAAwC,CAAC,GAAW;IAClE,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,KAAK,GAAc,QAAQ,CAAC;IAChC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,aAAa,GAAG,KAAK,CAAC;IAE1B,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAExB,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC7B,KAAK,GAAG,QAAQ,CAAC;gBACjB,GAAG,IAAI,CAAC,CAAC;YACX,CAAC;YACD,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QAED,IAAI,KAAK,KAAK,cAAc,EAAE,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBAC9B,GAAG,IAAI,IAAI,CAAC;gBACZ,CAAC,IAAI,CAAC,CAAC;gBACP,KAAK,GAAG,QAAQ,CAAC;gBACjB,SAAS;YACX,CAAC;YACD,GAAG,IAAI,CAAC,CAAC;YACT,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QAED,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,IAAI,aAAa,EAAE,CAAC;gBAClB,GAAG,IAAI,CAAC,CAAC;gBACT,aAAa,GAAG,KAAK,CAAC;gBACtB,CAAC,EAAE,CAAC;gBACJ,SAAS;YACX,CAAC;YACD,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,GAAG,IAAI,CAAC,CAAC;gBACT,aAAa,GAAG,IAAI,CAAC;gBACrB,CAAC,EAAE,CAAC;gBACJ,SAAS;YACX,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;gBACd,GAAG,IAAI,CAAC,CAAC;gBACT,KAAK,GAAG,QAAQ,CAAC;gBACjB,CAAC,EAAE,CAAC;gBACJ,SAAS;YACX,CAAC;YACD,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,GAAG,IAAI,KAAK,CAAC;gBACb,CAAC,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3B,SAAS;YACX,CAAC;YACD,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACf,GAAG,IAAI,KAAK,CAAC;gBACb,CAAC,EAAE,CAAC;gBACJ,SAAS;YACX,CAAC;YACD,GAAG,IAAI,CAAC,CAAC;YACT,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QAED,SAAS;QACT,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAC9B,GAAG,IAAI,IAAI,CAAC;YACZ,CAAC,IAAI,CAAC,CAAC;YACP,KAAK,GAAG,aAAa,CAAC;YACtB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YAC9B,GAAG,IAAI,IAAI,CAAC;YACZ,CAAC,IAAI,CAAC,CAAC;YACP,KAAK,GAAG,cAAc,CAAC;YACvB,SAAS;QACX,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YACd,GAAG,IAAI,CAAC,CAAC;YACT,KAAK,GAAG,QAAQ,CAAC;YACjB,CAAC,EAAE,CAAC;YACJ,SAAS;QACX,CAAC;QACD,GAAG,IAAI,CAAC,CAAC;QACT,CAAC,EAAE,CAAC;IACN,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,wCAAwC,CAAC,UAAU,CAAC;aACjE,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,iDAAiD;aAC/E,OAAO,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC,wCAAwC;aACrF,OAAO,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC,wEAAwE;aACtH,OAAO,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC,+DAA+D;aAC/G,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,uDAAuD;QACzF,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adofai-lib",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "A TypeScript library for advanced manipulation and analysis of ADOFAI level files.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",