Merge pull request #1 from reflektone-games/feat/serializer

feat: serializer
reflektone-games · Nov 12, 2023 · a1da69d · a1da69d
2 parents ef7da18 + ab6b07d
commit a1da69d
Show file tree

Hide file tree

Showing 15 changed files with 300 additions and 26 deletions.
diff --git a/src/internal/syntacticAnalysis/deserializer.ts b/src/internal/syntacticAnalysis/deserializer.ts
@@ -21,23 +21,30 @@ export class Deserializer {
      */
     public readonly enumerator: Enumerator<Token>;
 
+    /**
+     * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
+     */
+    public readonly timingChanges: TimingChange[] = [];
     private _maxFinishTime: number = 0;
-    private _currentTime: number = 0;
     /**
      * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
      */
-    public currentNoteCollection: NoteCollection | undefined;
+    public currentTime: number;
     /**
      * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
      */
-    public currentTiming: TimingChange = new TimingChange(0, 0);
+    public currentNoteCollection: NoteCollection | undefined;
     /**
      * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
      */
-    public endOfFile: boolean = false;
+    public endOfFile: boolean;
 
     constructor(sequence: Iterable<Token>) {
         this.enumerator = new Enumerator<Token>(sequence);
+        this.timingChanges.push(new TimingChange());
+        this.currentNoteCollection = undefined;
+        this.currentTime = 0;
+        this.endOfFile = false;
     }
 
     public getChart(): MaiChart {
@@ -61,7 +68,7 @@ export class Deserializer {
                     break;
                 }
                 case TokenType.Location: {
-                    this.currentNoteCollection ??= new NoteCollection(this._currentTime);
+                    this.currentNoteCollection ??= new NoteCollection(this.currentTime);
 
                     if (token.lexeme[0] === "0") {
                         if (this.currentNoteCollection.eachStyle !== EachStyle.ForceBroken)
@@ -86,7 +93,7 @@ export class Deserializer {
                             this.currentNoteCollection = undefined;
                         }
 
-                        this._currentTime += this.currentTiming.secondsPerBeat;
+                        this.currentTime += this.timingChanges[this.timingChanges.length - 1].secondsPerBeat;
                     }
                     break;
                 case TokenType.EachDivider:
@@ -111,7 +118,7 @@ export class Deserializer {
                 case TokenType.SlideJoiner:
                     throw new ScopeMismatchException(token.line, token.character, ScopeType.Slide);
                 case TokenType.EndOfFile:
-                    this._chart.finishTiming = this._currentTime;
+                    this._chart.finishTiming = this.currentTime;
                     break;
                 case TokenType.None:
                     break;
@@ -128,6 +135,7 @@ export class Deserializer {
         }
 
         this._chart.noteCollections = noteCollections;
+        this._chart.timingChanges = this.timingChanges;
 
         return this._chart;
     }

diff --git a/src/internal/syntacticAnalysis/serializer.ts b/src/internal/syntacticAnalysis/serializer.ts
@@ -0,0 +1,79 @@
+import { EachStyle } from "../../structures/eachStyle";
+import { MaiChart } from "../../structures/maiChart";
+import { NoteCollection } from "../../structures/noteCollection";
+
+/**
+ * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
+ */
+export class Serializer {
+    private _currentTimingChange: number = 0;
+    private _currentNoteCollection: number = 0;
+    private _currentTime: number = 0;
+
+    // there's no such thing as StringWriter in TypeScript
+    public serialize(chart: MaiChart): string {
+        let writer = "";
+
+        writer += `(${chart.timingChanges[this._currentTimingChange].tempo})`;
+        writer += `{${chart.timingChanges[this._currentTimingChange].subdivisions}}`;
+
+        while (this._currentTime <= (chart.finishTiming ? chart.finishTiming : 0)) {
+            if (
+                this._currentTimingChange < chart.timingChanges.length - 1 &&
+                Math.abs(chart.timingChanges[this._currentTimingChange + 1].time - this._currentTime) < 1.401298E-45
+            ) {
+                this._currentTimingChange++;
+
+                if (
+                    Math.abs(
+                        chart.timingChanges[this._currentTimingChange].tempo -
+                            chart.timingChanges[this._currentTimingChange - 1].tempo
+                    ) > 1.401298E-45
+                ) {
+                    writer += `(${chart.timingChanges[this._currentTimingChange].tempo})`;
+                }
+
+                if (
+                    Math.abs(
+                        chart.timingChanges[this._currentTimingChange].subdivisions -
+                            chart.timingChanges[this._currentTimingChange - 1].subdivisions
+                    ) > 1.401298E-45
+                ) {
+                    writer += `{${chart.timingChanges[this._currentTimingChange].subdivisions}}`;
+                }
+            }
+
+            if (
+                this._currentNoteCollection < chart.noteCollections.length &&
+                Math.abs(chart.noteCollections[this._currentNoteCollection].time - this._currentTime) <= 1.401298E-45
+            ) {
+                writer += Serializer.serializeNoteCollection(chart.noteCollections[this._currentNoteCollection]);
+
+                this._currentNoteCollection++;
+            }
+
+            const timingChange = chart.timingChanges[this._currentTimingChange];
+            this._currentTime += timingChange.secondsPerBeat;
+            writer += ",";
+        }
+        writer += "E";
+
+        return writer;
+    }
+
+    private static serializeNoteCollection(notes: NoteCollection): string {
+        let writer = "";
+
+        const seperator = notes.eachStyle === EachStyle.ForceBroken ? "`" : "/";
+
+        if (notes.eachStyle === EachStyle.ForceEach) writer += "0/";
+
+        for (let i = 0; i < notes.length; i++) {
+            writer += notes[i].write();
+
+            if (i != notes.length - 1) writer += seperator;
+        }
+
+        return writer;
+    }
+}
diff --git a/src/internal/syntacticAnalysis/states/noteReader.ts b/src/internal/syntacticAnalysis/states/noteReader.ts
@@ -26,7 +26,8 @@ export class NoteReader {
         const currentNote = new Note(parent.currentNoteCollection!);
         currentNote.location = noteLocation;
 
-        const overrideTiming = new TimingChange(parent.currentNoteCollection!.time);
+        const overrideTiming = new TimingChange();
+        overrideTiming.tempo = parent.timingChanges[parent.timingChanges.length - 1].tempo;
 
         if (noteLocation.group !== NoteGroup.Tap) currentNote.type = NoteType.Touch;
 
@@ -59,7 +60,7 @@ export class NoteReader {
                 }
 
                 case TokenType.Duration: {
-                    NoteReader.readDuration(token, parent.currentTiming, currentNote);
+                    NoteReader.readDuration(parent.timingChanges[parent.timingChanges.length - 1], token, currentNote);
                     break;
                 }
 
@@ -101,9 +102,8 @@ export class NoteReader {
                 note.styles |= NoteStyles.Mine;
                 return;
             case "h":
-                if (note.type === NoteType.Break || note.type === NoteType.ForceInvalidate) break;
+                if (note.type !== NoteType.Break && note.type !== NoteType.ForceInvalidate) note.type = NoteType.Hold;
 
-                note.type = NoteType.Hold;
                 note.length ??= 0;
                 return;
             case "?":
@@ -126,7 +126,7 @@ export class NoteReader {
         }
     }
 
-    private static readDuration(token: Token, timing: TimingChange, note: Note) {
+    private static readDuration(timing: TimingChange, token: Token, note: Note) {
         if (note.type !== NoteType.Break) note.type = NoteType.Hold;
 
         if (token.lexeme[0] === "#") {

diff --git a/src/internal/syntacticAnalysis/states/slideReader.ts b/src/internal/syntacticAnalysis/states/slideReader.ts
@@ -53,7 +53,7 @@ export class SlideReader {
                 }
 
                 case TokenType.Duration: {
-                    SlideReader.readDuration(token, parent.currentTiming, path);
+                    SlideReader.readDuration(parent.timingChanges[parent.timingChanges.length - 1], token, path);
                     break;
                 }
 
@@ -151,7 +151,7 @@ export class SlideReader {
         } while (parent.enumerator.current.type === TokenType.Location);
     }
 
-    private static readDuration(token: Token, timing: TimingChange, path: SlidePath) {
+    private static readDuration(timing: TimingChange, token: Token, path: SlidePath) {
         const startOfDurationDeclaration = 0;
         const overrideTiming = timing;
 

diff --git a/src/internal/syntacticAnalysis/states/subdivisionReader.ts b/src/internal/syntacticAnalysis/states/subdivisionReader.ts
@@ -1,6 +1,7 @@
 import { UnexpectedCharacterException } from "../../errors/unexpectedCharacterException";
 import { Token } from "../../lexicalAnalysis/token";
 import { Deserializer } from "../deserializer";
+import { TimingChange } from "../timingChange";
 
 /**
  * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
@@ -13,14 +14,45 @@ export class SubdivisionReader {
             if (isNaN(explicitTempo))
                 throw new UnexpectedCharacterException(token.line, token.character + 1, '0~9, or "."');
 
-            parent.currentTiming.explicitOverride(explicitTempo);
+            let newTimingChange;
+            {
+                const oldTimingChange = parent.timingChanges[parent.timingChanges.length - 1];
+                newTimingChange = new TimingChange();
+                newTimingChange.tempo = oldTimingChange.tempo;
+                newTimingChange.subdivisions = oldTimingChange.subdivisions;
+            }
+
+            newTimingChange.setSeconds(explicitTempo);
+            newTimingChange.time = parent.currentTime;
+
+            if (
+                Math.abs(parent.timingChanges[parent.timingChanges.length - 1].time - parent.currentTime) <=
+                1.401298e-45
+            )
+                parent.timingChanges.pop();
+
+            parent.timingChanges.push(newTimingChange);
             return;
         }
 
         const subdivision = parseFloat(token.lexeme);
 
         if (isNaN(subdivision)) throw new UnexpectedCharacterException(token.line, token.character, '0~9, or "."');
 
-        parent.currentTiming.subdivisions = subdivision;
+        let newTimingChange;
+        {
+            const oldTimingChange = parent.timingChanges[parent.timingChanges.length - 1];
+            newTimingChange = new TimingChange();
+            newTimingChange.tempo = oldTimingChange.tempo;
+            newTimingChange.subdivisions = oldTimingChange.subdivisions;
+        }
+
+        newTimingChange.subdivisions = subdivision;
+        newTimingChange.time = parent.currentTime;
+
+        if (Math.abs(parent.timingChanges[parent.timingChanges.length - 1].time - parent.currentTime) <= 1.401298e-45)
+            parent.timingChanges.pop();
+
+        parent.timingChanges.push(newTimingChange);
     }
 }
diff --git a/src/internal/syntacticAnalysis/states/tempoReader.ts b/src/internal/syntacticAnalysis/states/tempoReader.ts
@@ -1,6 +1,7 @@
 import { UnexpectedCharacterException } from "../../errors/unexpectedCharacterException";
 import { Token } from "../../lexicalAnalysis/token";
 import { Deserializer } from "../deserializer";
+import { TimingChange } from "../timingChange";
 
 /**
  * INTERNAL USAGE ONLY! DO NOT USE THIS PROPERTY DIRECTLY!
@@ -11,6 +12,20 @@ export class TempoReader {
 
         if (isNaN(tempo)) throw new UnexpectedCharacterException(token.line, token.character, '0~9, or "."');
 
-        parent.currentTiming.tempo = tempo;
+        let newTimingChange;
+        {
+            const oldTimingChange = parent.timingChanges[parent.timingChanges.length - 1];
+            newTimingChange = new TimingChange();
+            newTimingChange.tempo = oldTimingChange.tempo;
+            newTimingChange.subdivisions = oldTimingChange.subdivisions;
+        }
+
+        newTimingChange.tempo = tempo;
+        newTimingChange.time = parent.currentTime;
+
+        if (Math.abs(parent.timingChanges[parent.timingChanges.length - 1].time - parent.currentTime) <= 1.401298e-45)
+            parent.timingChanges.pop();
+
+        parent.timingChanges.push(newTimingChange);
     }
 }
diff --git a/src/internal/syntacticAnalysis/timingChange.ts b/src/internal/syntacticAnalysis/timingChange.ts
@@ -1,6 +1,7 @@
 export class TimingChange {
-    public tempo: number;
-    public subdivisions: number;
+    public time: number = 0;
+    public tempo: number = 0;
+    public subdivisions: number = 0;
 
     get secondsPerBar(): number {
         // could use || here since number is falsy if 0
@@ -12,12 +13,7 @@ export class TimingChange {
         return this.secondsPerBar / ((this.subdivisions === 0 ? 4 : this.subdivisions) / 4);
     }
 
-    constructor(tempo: number, subdivisions: number = 4) {
-        this.tempo = tempo;
-        this.subdivisions = subdivisions;
-    }
-
-    explicitOverride(value: number) {
+    public setSeconds(value: number) {
         this.tempo = 60 / value;
         this.subdivisions = 4;
     }

diff --git a/src/internal/utility.ts b/src/internal/utility.ts
@@ -1,6 +1,13 @@
 export type FileEncoding = "utf7" | "utf8" | "utf16le" | "utf16be" | "utf32le" | "utf32be" | "unicode" | "unicodebe";
 
 export class Utility {
+    /**
+     * Format a number to `0.0000000` format.
+     */
+    static formatNumber(number: number): string {
+        return number.toFixed(7);
+    }
+
     static removeLineEndings(str: string): string {
         return str.replace(/(\r\n|\n|\r)/gm, "");
     }

diff --git a/src/simaiConvert.ts b/src/simaiConvert.ts
@@ -1,6 +1,7 @@
 import { Deserializer } from "./internal/syntacticAnalysis/deserializer";
 import { Tokenizer } from "./internal/lexicalAnalysis/tokenizer";
 import { MaiChart } from "./structures/maiChart";
+import { Serializer } from "./internal/syntacticAnalysis/serializer";
 
 export class SimaiConvert {
     public static deserialize(data: string): MaiChart {
@@ -9,4 +10,9 @@ export class SimaiConvert {
 
         return chart;
     }
+
+    public static serialize(chart: MaiChart): string {
+        const serializer = new Serializer();
+        return serializer.serialize(chart);
+    }
 }
diff --git a/src/structures/location.ts b/src/structures/location.ts
@@ -18,6 +18,32 @@ export class Location {
     }
 
     public toString(): string {
-        return `index: ${this.index}, group: ${this.group.toString()}`;
+        switch (this.group) {
+            case NoteGroup.Tap:
+                return (this.index + 1).toString();
+            case NoteGroup.CSensor:
+                return "C";
+            default:
+                let groupChar = "";
+
+                switch (this.group) {
+                    case NoteGroup.ASensor:
+                        groupChar = "A";
+                        break;
+                    case NoteGroup.BSensor:
+                        groupChar = "B";
+                        break;
+                    case NoteGroup.DSensor:
+                        groupChar = "D";
+                        break;
+                    case NoteGroup.ESensor:
+                        groupChar = "E";
+                        break;
+                    // default:
+                    //  throw new ArgumentOutOfRangeException();
+                }
+
+                return groupChar + (this.index + 1).toString();
+        }
     }
 }
diff --git a/src/structures/maiChart.ts b/src/structures/maiChart.ts
@@ -1,6 +1,8 @@
+import { TimingChange } from "../internal/syntacticAnalysis/timingChange";
 import { NoteCollection } from "./noteCollection";
 
 export class MaiChart {
     public finishTiming: number | undefined;
     public noteCollections: NoteCollection[] = [];
+    public timingChanges: TimingChange[] = [];
 }