tja-parser 0.2.1 → 0.2.3

package/dist/class/Bar.d.ts

@@ -1,28 +1,22 @@
 import { Command } from "./Command.js";
 import { Item } from "./Item.js";
-import * as math from 'mathjs';
 import { Note } from "./Note.js";
-export declare class Bar {
+import { NoteGroup } from "./NoteGroup.js";
+import * as math from 'mathjs';
+export declare class Bar extends NoteGroup {
     private items;
     private notes;
     private commands;
-    private start;
-    private end;
     private measure;
     private barlineHidden;
     private bpm;
     private scroll;
-    constructor(start: math.Fraction, end: math.Fraction);
     pushItem(...items: Item[]): void;
     getItems(): Item[];
     getNotes(): Note[];
     getCommands(): Command[];
     setMeasure(measure: math.Fraction): void;
     getMeasure(): math.Fraction;
-    getStart(): math.Fraction;
-    setStart(start: math.Fraction): void;
-    getEnd(): math.Fraction;
-    setEnd(end: math.Fraction): void;
     getBarlineHidden(): boolean;
     setBarlineHidden(barlineHidden: boolean): void;
     setBpm(bpm: number): void;

package/dist/class/Bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Bar.d.ts","sourceRoot":"","sources":["../../src/class/Bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,qBAAa,GAAG;IACZ,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,GAAG,CAAgB;IAC3B,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,GAAG,CAAe;IAC1B,OAAO,CAAC,MAAM,CAAa;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ;IAKpD,QAAQ,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE;IAKzB,QAAQ;IAGR,QAAQ;IAGR,WAAW;IAIX,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ;IAGjC,UAAU;IAIV,QAAQ;IAGR,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ;IAG7B,MAAM;IAGN,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ;IAIzB,gBAAgB;IAGhB,gBAAgB,CAAC,aAAa,EAAE,OAAO;IAIvC,MAAM,CAAC,GAAG,EAAE,MAAM;IAGlB,MAAM;IAGN,SAAS,CAAC,MAAM,EAAE,MAAM;IAGxB,SAAS;IAIT,MAAM,IAAI,GAAG;CAUhB"}
+{"version":3,"file":"Bar.d.ts","sourceRoot":"","sources":["../../src/class/Bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B,qBAAa,GAAI,SAAQ,SAAS;IAC9B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,GAAG,CAAe;IAC1B,OAAO,CAAC,MAAM,CAAa;IAE3B,QAAQ,CAAC,GAAG,KAAK,EAAE,IAAI,EAAE;IAKzB,QAAQ;IAGR,QAAQ;IAGR,WAAW;IAIX,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ;IAGjC,UAAU;IAIV,gBAAgB;IAGhB,gBAAgB,CAAC,aAAa,EAAE,OAAO;IAIvC,MAAM,CAAC,GAAG,EAAE,MAAM;IAGlB,MAAM;IAGN,SAAS,CAAC,MAAM,EAAE,MAAM;IAGxB,SAAS;IAIT,MAAM,IAAI,GAAG;CAUhB"}

package/dist/class/Bar.js

@@ -35,22 +35,17 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bar = void 0;
 const Command_js_1 = require("./Command.js");
-const math = __importStar(require("mathjs"));
 const Note_js_1 = require("./Note.js");
-class Bar {
+const NoteGroup_js_1 = require("./NoteGroup.js");
+const math = __importStar(require("mathjs"));
+class Bar extends NoteGroup_js_1.NoteGroup {
     items = [];
     notes = [];
     commands = [];
-    start;
-    end;
     measure = math.fraction(1);
     barlineHidden = false;
     bpm = 160;
     scroll = 1;
-    constructor(start, end) {
-        this.start = start;
-        this.end = end;
-    }
     pushItem(...items) {
         this.items.push(...items);
         this.notes.push(...items.filter((item) => item instanceof Note_js_1.Note));
@@ -71,18 +66,6 @@ class Bar {
     getMeasure() {
         return this.measure;
     }
-    getStart() {
-        return math.fraction(this.start);
-    }
-    setStart(start) {
-        this.start = math.fraction(start);
-    }
-    getEnd() {
-        return math.fraction(this.end);
-    }
-    setEnd(end) {
-        this.end = math.fraction(end);
-    }
     getBarlineHidden() {
         return this.barlineHidden;
     }
@@ -103,8 +86,8 @@ class Bar {
     }
     toJSON() {
         return {
-            start: this.start.valueOf(),
-            end: this.end.valueOf(),
+            start: this.getStart().valueOf(),
+            end: this.getEnd().valueOf(),
             items: this.items,
             notes: this.notes,
             commands: this.commands,

package/dist/class/Bar.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bar.js","sourceRoot":"","sources":["../../src/class/Bar.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Bar.js","sourceRoot":"","sources":["../../src/class/Bar.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAuC;AAEvC,uCAAiC;AACjC,iDAA2C;AAC3C,6CAA+B;AAE/B,MAAa,GAAI,SAAQ,wBAAS;IACtB,KAAK,GAAW,EAAE,CAAC;IACnB,KAAK,GAAW,EAAE,CAAC;IACnB,QAAQ,GAAc,EAAE,CAAC;IACzB,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3B,aAAa,GAAG,KAAK,CAAC;IACtB,GAAG,GAAW,GAAG,CAAC;IAClB,MAAM,GAAW,CAAC,CAAC;IAE3B,QAAQ,CAAC,GAAG,KAAa;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,cAAI,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,oBAAO,CAAC,CAAC,CAAC;IAC3E,CAAC;IACD,QAAQ;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,QAAQ;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,WAAW;QACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,UAAU,CAAC,OAAsB;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACD,UAAU;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IACD,gBAAgB,CAAC,aAAsB;QACnC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,GAAW;QACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IACD,MAAM;QACF,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,SAAS,CAAC,MAAc;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IACD,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,MAAM;QACF,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;YAChC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;YAC5B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,KAAK;SACd,CAAA;IACL,CAAC;CACJ;AA7DD,kBA6DC"}

package/dist/class/Branch.d.ts

@@ -1,6 +1,7 @@
 import * as math from 'mathjs';
 import { Bar } from './Bar.js';
-export declare class Branch extends Bar {
+import { NoteGroup } from './NoteGroup.js';
+export declare class Branch extends NoteGroup {
     type: Branch.Type;
     criteria: [number, number];
     normal?: Bar[];
@@ -8,8 +9,8 @@ export declare class Branch extends Bar {
     master?: Bar[];
     constructor(type: Branch.Type, criteria1: [number, number], start: math.Fraction, end: math.Fraction);
     toJSON(): {
-        start: any;
-        end: any;
+        start: number;
+        end: number;
         normal: Bar[] | undefined;
         advanced: Bar[] | undefined;
         master: Bar[] | undefined;

package/dist/class/Branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Branch.d.ts","sourceRoot":"","sources":["../../src/class/Branch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAE/B,qBAAa,MAAO,SAAQ,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;IAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;gBAEH,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ;IAMpG,MAAM;;;;;;;;;;CAaT;AAED,yBAAiB,MAAM,CAAC;IACpB,KAAY,IAAI;QAAG,IAAI,IAAA;QAAE,QAAQ,IAAA;KAAE;CACtC"}
+{"version":3,"file":"Branch.d.ts","sourceRoot":"","sources":["../../src/class/Branch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,MAAO,SAAQ,SAAS;IACjC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;IAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;gBAEH,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ;IAMpG,MAAM;;;;;;;;;;CAYT;AAED,yBAAiB,MAAM,CAAC;IACpB,KAAY,IAAI;QAAG,IAAI,IAAA;QAAE,QAAQ,IAAA;KAAE;CACtC"}

package/dist/class/Branch.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Branch = void 0;
-const Bar_js_1 = require("./Bar.js");
-class Branch extends Bar_js_1.Bar {
+const NoteGroup_js_1 = require("./NoteGroup.js");
+class Branch extends NoteGroup_js_1.NoteGroup {
     type;
     criteria;
     normal;
@@ -14,10 +14,9 @@ class Branch extends Bar_js_1.Bar {
         this.criteria = criteria1;
     }
     toJSON() {
-        const superJSON = super.toJSON();
         return {
-            start: superJSON.start,
-            end: superJSON.end,
+            start: this.getStart().valueOf(),
+            end: this.getEnd().valueOf(),
             normal: this.normal,
             advanced: this.advanced,
             master: this.master,

package/dist/class/Branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"Branch.js","sourceRoot":"","sources":["../../src/class/Branch.ts"],"names":[],"mappings":";;;AACA,qCAA+B;AAE/B,MAAa,MAAO,SAAQ,YAAG;IAC3B,IAAI,CAAc;IAClB,QAAQ,CAAmB;IAC3B,MAAM,CAAS;IACf,QAAQ,CAAS;IACjB,MAAM,CAAS;IAEf,YAAY,IAAiB,EAAE,SAA2B,EAAE,KAAoB,EAAE,GAAkB;QAChG,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,MAAM;QACF,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO;YACH,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,GAAG,EAAE,SAAS,CAAC,GAAG;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;SAC9D,CAAA;IACL,CAAC;CACJ;AA1BD,wBA0BC;AAED,WAAiB,MAAM;IACnB,IAAY,IAAuB;IAAnC,WAAY,IAAI;QAAG,+BAAI,CAAA;QAAE,uCAAQ,CAAA;IAAC,CAAC,EAAvB,IAAI,GAAJ,WAAI,KAAJ,WAAI,QAAmB;AACvC,CAAC,EAFgB,MAAM,sBAAN,MAAM,QAEtB"}
+{"version":3,"file":"Branch.js","sourceRoot":"","sources":["../../src/class/Branch.ts"],"names":[],"mappings":";;;AAEA,iDAA2C;AAE3C,MAAa,MAAO,SAAQ,wBAAS;IACjC,IAAI,CAAc;IAClB,QAAQ,CAAmB;IAC3B,MAAM,CAAS;IACf,QAAQ,CAAS;IACjB,MAAM,CAAS;IAEf,YAAY,IAAiB,EAAE,SAA2B,EAAE,KAAoB,EAAE,GAAkB;QAChG,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,MAAM;QACF,OAAO;YACH,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;YAChC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;YAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;SAC9D,CAAA;IACL,CAAC;CACJ;AAzBD,wBAyBC;AAED,WAAiB,MAAM;IACnB,IAAY,IAAuB;IAAnC,WAAY,IAAI;QAAG,+BAAI,CAAA;QAAE,uCAAQ,CAAA;IAAC,CAAC,EAAvB,IAAI,GAAJ,WAAI,KAAJ,WAAI,QAAmB;AACvC,CAAC,EAFgB,MAAM,sBAAN,MAAM,QAEtB"}

package/dist/class/Course.d.ts

@@ -1,26 +1,26 @@
 import type { Difficulty } from "../types.js";
-import { Bar } from "./Bar.js";
 import { Branch } from "./Branch.js";
+import { NoteGroup } from "./NoteGroup.js";
 import { Song } from "./Song.js";
 export declare class Course {
     static parse(courseTja: string | string[], song?: Song): Course;
     private static parseBar;
     private static groupLines;
-    private static convertLineGroupToBar;
+    private static convertLineGroupToNoteGroup;
     difficulty: Difficulty;
     metadata: Course.Metadata;
-    bars: Bar[];
+    noteGroups: NoteGroup[];
     song?: Song;
     constructor(difficulty: Difficulty, metadata: Course.Metadata, song?: Song);
     getBPM(): number;
     getLevel(): number;
-    pushBar(...bars: Bar[]): void;
+    pushNoteGroups(...noteGroups: NoteGroup[]): void;
     getBalloon(): number[];
     getBalloonIterator(): () => number;
     toJSON(): {
         metadata: Course.Metadata;
         difficulty: Difficulty;
-        bars: Bar[];
+        noteGroups: NoteGroup[];
     };
 }
 export declare namespace Course {

package/dist/class/Course.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Course.d.ts","sourceRoot":"","sources":["../../src/class/Course.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,qBAAa,MAAM;IAMf,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM;IA8C/D,OAAO,CAAC,MAAM,CAAC,QAAQ;IASvB,OAAO,CAAC,MAAM,CAAC,UAAU;IA6EzB,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAoMpC,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAM;IACjB,IAAI,CAAC,EAAE,IAAI,CAAC;gBAEA,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI;IAU1E,MAAM;IAQN,QAAQ;IAIR,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAItB,UAAU;IAIV,kBAAkB;IAWlB,MAAM;;;;;CAOT;AAED,yBAAiB,MAAM,CAAC;IACpB,MAAa,QAAQ;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KAC9C;IAED,MAAa,SAAS;QAClB,KAAK,EAAE,MAAM,EAAE,CAAM;QACrB,GAAG,CAAC,IAAI,EAAE,MAAM;KAGnB;IACD,MAAa,iBAAiB;QAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;QACrB,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;QACvB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;oBAET,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QAKzD,SAAS,CAAC,SAAS,EAAE,SAAS;QAI9B,WAAW,CAAC,SAAS,EAAE,SAAS;QAIhC,SAAS,CAAC,SAAS,EAAE,SAAS;KAIjC;CACJ"}
+{"version":3,"file":"Course.d.ts","sourceRoot":"","sources":["../../src/class/Course.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,qBAAa,MAAM;IAMf,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM;IA8C/D,OAAO,CAAC,MAAM,CAAC,QAAQ;IASvB,OAAO,CAAC,MAAM,CAAC,UAAU;IA6EzB,OAAO,CAAC,MAAM,CAAC,2BAA2B;IA0M1C,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,UAAU,EAAE,SAAS,EAAE,CAAM;IAC7B,IAAI,CAAC,EAAE,IAAI,CAAC;gBAEA,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI;IAU1E,MAAM;IAQN,QAAQ;IAIR,cAAc,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE;IAIzC,UAAU;IAIV,kBAAkB;IAWlB,MAAM;;;;;CAOT;AAED,yBAAiB,MAAM,CAAC;IACpB,MAAa,QAAQ;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KAC9C;IAED,MAAa,SAAS;QAClB,KAAK,EAAE,MAAM,EAAE,CAAM;QACrB,GAAG,CAAC,IAAI,EAAE,MAAM;KAGnB;IACD,MAAa,iBAAiB;QAC1B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;QAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;QACrB,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;QACvB,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;oBAET,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QAKzD,SAAS,CAAC,SAAS,EAAE,SAAS;QAI9B,WAAW,CAAC,SAAS,EAAE,SAAS;QAIhC,SAAS,CAAC,SAAS,EAAE,SAAS;KAIjC;CACJ"}

package/dist/class/Course.js

@@ -79,12 +79,12 @@ class Course {
             throw new ParseException_js_1.UnknownCourseDifficultyException(courseTja[0]);
         }
         const course = new Course(difficulty, metadata, song);
-        course.pushBar(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
+        course.pushNoteGroups(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
         return course;
     }
     static parseBar(lines, getNextBalloon, bpmInit) {
         const lineGroups = this.groupLines(lines);
-        return this.convertLineGroupToBar(lineGroups, getNextBalloon, bpmInit).bars;
+        return this.convertLineGroupToNoteGroup(lineGroups, getNextBalloon, bpmInit).noteGroups;
     }
     static groupLines(lines) {
         const LineGroup = Course.LineGroup;
@@ -155,11 +155,11 @@ class Course {
         }
         return bars;
     }
-    static convertLineGroupToBar(lineGroups, getNextBalloon, currentBPM, currentTiming = math.fraction(0), currentMeasure = math.fraction(1), currentScroll = 1, barlineHidden = false) {
+    static convertLineGroupToNoteGroup(lineGroups, getNextBalloon, currentBPM, currentTiming = math.fraction(0), currentMeasure = math.fraction(1), currentScroll = 1, barlineHidden = false) {
         function getBarLength() {
             return math.fraction(math.divide(math.multiply(1000, 240, currentMeasure), math.fraction(currentBPM)));
         }
-        const bars = [];
+        const noteGroups = [];
         for (const lineGroup of lineGroups) {
             if (lineGroup instanceof Course.LineGroup) {
                 if (lineGroup.lines.length === 0)
@@ -207,6 +207,9 @@ class Course {
                             else if (item instanceof Command_js_1.MeasureCommand) {
                                 currentMeasure = item.value;
                             }
+                            else if (item instanceof Command_js_1.BarlineCommand) {
+                                barlineHidden = item.getHide();
+                            }
                         }
                     });
                     bar.setBarlineHidden(barlineHidden);
@@ -249,6 +252,9 @@ class Course {
                             else if (item instanceof Command_js_1.MeasureCommand) {
                                 currentMeasure = item.value;
                             }
+                            else if (item instanceof Command_js_1.BarlineCommand) {
+                                barlineHidden = item.getHide();
+                            }
                         }
                     });
                     bar.setEnd(currentTiming);
@@ -289,22 +295,22 @@ class Course {
                     });
                     bar.pushItem(...items);
                 }
-                bars.push(bar);
+                noteGroups.push(bar);
             }
             else {
                 const branch = new Branch_js_1.Branch(lineGroup.type, lineGroup.criteria, math.fraction(currentTiming), math.fraction(currentTiming));
                 let result;
                 if (lineGroup.normal) {
-                    result = this.convertLineGroupToBar(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
-                    branch.normal = result.bars;
+                    result = this.convertLineGroupToNoteGroup(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
+                    branch.normal = result.noteGroups;
                 }
                 if (lineGroup.advanced) {
-                    result = this.convertLineGroupToBar(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
-                    branch.advanced = result.bars;
+                    result = this.convertLineGroupToNoteGroup(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
+                    branch.advanced = result.noteGroups;
                 }
                 if (lineGroup.master) {
-                    result = this.convertLineGroupToBar(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
-                    branch.master = result.bars;
+                    result = this.convertLineGroupToNoteGroup(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
+                    branch.master = result.noteGroups;
                 }
                 if (result) {
                     currentBPM = result.currentBPM;
@@ -313,11 +319,11 @@ class Course {
                     barlineHidden = result.barlineHidden;
                     branch.setEnd(result.currentTiming);
                 }
-                bars.push(branch);
+                noteGroups.push(branch);
             }
         }
         return {
-            bars,
+            noteGroups,
             getNextBalloon,
             currentBPM,
             currentTiming,
@@ -328,7 +334,7 @@ class Course {
     }
     difficulty;
     metadata;
-    bars = [];
+    noteGroups = [];
     song;
     constructor(difficulty, metadata, song) {
         this.difficulty = difficulty;
@@ -341,8 +347,8 @@ class Course {
     getLevel() {
         return Number(this.metadata.level) || 1;
     }
-    pushBar(...bars) {
-        this.bars.push(...bars);
+    pushNoteGroups(...noteGroups) {
+        this.noteGroups.push(...noteGroups);
     }
     getBalloon() {
         return (this.metadata.balloon ?? '').split(',').map((e) => Number(e));
@@ -361,7 +367,7 @@ class Course {
         return {
             metadata: this.metadata,
             difficulty: this.difficulty,
-            bars: this.bars
+            noteGroups: this.noteGroups
         };
     }
 }

package/dist/class/Course.js.map

@@ -1 +1 @@
-{"version":3,"file":"Course.js","sourceRoot":"","sources":["../../src/class/Course.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Course.js","sourceRoot":"","sources":["../../src/class/Course.ts"],"names":[],"mappings":"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"}

package/dist/class/NoteGroup.d.ts

@@ -0,0 +1,11 @@
+import * as math from 'mathjs';
+export declare abstract class NoteGroup {
+    private start;
+    private end;
+    constructor(start: math.Fraction, end: math.Fraction);
+    getStart(): math.Fraction;
+    setStart(start: math.Fraction): void;
+    getEnd(): math.Fraction;
+    setEnd(end: math.Fraction): void;
+}
+//# sourceMappingURL=NoteGroup.d.ts.map

package/dist/class/NoteGroup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoteGroup.d.ts","sourceRoot":"","sources":["../../src/class/NoteGroup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B,8BAAsB,SAAS;IAC3B,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,GAAG,CAAgB;gBAEf,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ;IAKpD,QAAQ;IAGR,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ;IAG7B,MAAM;IAGN,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ;CAG5B"}

package/dist/class/NoteGroup.js

@@ -0,0 +1,59 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NoteGroup = void 0;
+const math = __importStar(require("mathjs"));
+class NoteGroup {
+    start;
+    end;
+    constructor(start, end) {
+        this.start = start;
+        this.end = end;
+    }
+    getStart() {
+        return math.fraction(this.start);
+    }
+    setStart(start) {
+        this.start = math.fraction(start);
+    }
+    getEnd() {
+        return math.fraction(this.end);
+    }
+    setEnd(end) {
+        this.end = math.fraction(end);
+    }
+}
+exports.NoteGroup = NoteGroup;
+//# sourceMappingURL=NoteGroup.js.map

package/dist/class/NoteGroup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NoteGroup.js","sourceRoot":"","sources":["../../src/class/NoteGroup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,MAAsB,SAAS;IACnB,KAAK,CAAgB;IACrB,GAAG,CAAgB;IAE3B,YAAY,KAAoB,EAAE,GAAkB;QAChD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IACD,QAAQ,CAAC,KAAoB;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IACD,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,GAAkB;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;CACJ;AArBD,8BAqBC"}

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export * from './class/Command.js';
 export * from './class/Course.js';
 export * from './class/Item.js';
 export * from './class/Note.js';
+export * from './class/NoteGroup.js';
 export * from './class/Song.js';
 export * from './exception/ParseException.js';
 export * from './exception/TjaException.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAEhC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAE5C,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAEhC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAE5C,mBAAmB,YAAY,CAAC"}

package/dist/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./class/Command.js"), exports);
 __exportStar(require("./class/Course.js"), exports);
 __exportStar(require("./class/Item.js"), exports);
 __exportStar(require("./class/Note.js"), exports);
+__exportStar(require("./class/NoteGroup.js"), exports);
 __exportStar(require("./class/Song.js"), exports);
 __exportStar(require("./exception/ParseException.js"), exports);
 __exportStar(require("./exception/TjaException.js"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC;AAEhC,gEAA8C;AAC9C,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,oDAAkC;AAClC,qDAAmC;AACnC,oDAAkC;AAClC,kDAAgC;AAChC,kDAAgC;AAChC,uDAAqC;AACrC,kDAAgC;AAEhC,gEAA8C;AAC9C,8DAA4C"}

package/package.json

@@ -3,7 +3,7 @@
   "author": {
     "name": "hotsixman"
   },
-  "version": "0.2.1",
+  "version": "0.2.3",
   "dependencies": {
     "mathjs": "^15.1.0"
   },

package/src/class/Bar.ts

@@ -1,22 +1,17 @@
 import { Command } from "./Command.js";
 import { Item } from "./Item.js";
-import * as math from 'mathjs';
 import { Note } from "./Note.js";
+import { NoteGroup } from "./NoteGroup.js";
+import * as math from 'mathjs';
 
-export class Bar {
+export class Bar extends NoteGroup {
     private items: Item[] = [];
     private notes: Note[] = [];
     private commands: Command[] = [];
-    private start: math.Fraction;
-    private end: math.Fraction;
     private measure = math.fraction(1);
     private barlineHidden = false;
     private bpm: number = 160;
     private scroll: number = 1;
-    constructor(start: math.Fraction, end: math.Fraction) {
-        this.start = start;
-        this.end = end;
-    }
 
     pushItem(...items: Item[]) {
         this.items.push(...items);
@@ -40,19 +35,6 @@ export class Bar {
         return this.measure;
     }
 
-    getStart() {
-        return math.fraction(this.start);
-    }
-    setStart(start: math.Fraction) {
-        this.start = math.fraction(start);
-    }
-    getEnd() {
-        return math.fraction(this.end);
-    }
-    setEnd(end: math.Fraction) {
-        this.end = math.fraction(end);
-    }
-
     getBarlineHidden() {
         return this.barlineHidden;
     }
@@ -75,8 +57,8 @@ export class Bar {
 
     toJSON(): any {
         return {
-            start: this.start.valueOf(),
-            end: this.end.valueOf(),
+            start: this.getStart().valueOf(),
+            end: this.getEnd().valueOf(),
             items: this.items,
             notes: this.notes,
             commands: this.commands,

package/src/class/Branch.ts

@@ -1,7 +1,8 @@
 import * as math from 'mathjs';
 import { Bar } from './Bar.js';
+import { NoteGroup } from './NoteGroup.js';
 
-export class Branch extends Bar {
+export class Branch extends NoteGroup {
     type: Branch.Type;
     criteria: [number, number];
     normal?: Bar[];
@@ -14,11 +15,10 @@ export class Branch extends Bar {
         this.criteria = criteria1;
     }
 
-    toJSON(){
-        const superJSON = super.toJSON();
+    toJSON() {
         return {
-            start: superJSON.start,
-            end: superJSON.end,
+            start: this.getStart().valueOf(),
+            end: this.getEnd().valueOf(),
             normal: this.normal,
             advanced: this.advanced,
             master: this.master,

package/src/class/Course.ts

@@ -1,10 +1,11 @@
-import { UnknownCourseDifficultyException, MetadataParseException } from "../exception/ParseException.js";
+import { UnknownCourseDifficultyException } from "../exception/ParseException.js";
 import type { Difficulty } from "../types.js";
 import { Bar } from "./Bar.js";
 import { Branch } from "./Branch.js";
 import { BarlineCommand, BPMChangeCommand, Command, MeasureCommand, ScrollCommand } from "./Command.js";
 import type { Item } from "./Item.js";
 import { BalloonNote, EmptyNote, HitNote, Note, RollEndNote, RollNote } from "./Note.js";
+import { NoteGroup } from "./NoteGroup.js";
 import { Song } from "./Song.js";
 import * as math from 'mathjs';
 
@@ -55,15 +56,15 @@ export class Course {
         }
 
         const course = new Course(difficulty, metadata, song);
-        course.pushBar(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
+        course.pushNoteGroups(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
 
         return course;
     }
 
-    private static parseBar(lines: string[], getNextBalloon: () => number, bpmInit: number): Bar[] {
+    private static parseBar(lines: string[], getNextBalloon: () => number, bpmInit: number): NoteGroup[] {
         const lineGroups = this.groupLines(lines);
 
-        return this.convertLineGroupToBar(lineGroups, getNextBalloon, bpmInit).bars;
+        return this.convertLineGroupToNoteGroup(lineGroups, getNextBalloon, bpmInit).noteGroups;
     }
 
     /**
@@ -144,9 +145,9 @@ export class Course {
     }
 
     /**
-     * `LineGroup`을 `Bar`로 변환
+     * `LineGroup`을 `NoteGroup`으로 변환
      */
-    private static convertLineGroupToBar(
+    private static convertLineGroupToNoteGroup(
         lineGroups: (Course.LineGroup | Course.BranchedLineGroup)[],
         getNextBalloon: () => number,
         currentBPM: number,
@@ -155,7 +156,7 @@ export class Course {
         currentScroll: number = 1,
         barlineHidden: boolean = false,
     ): {
-        bars: Bar[],
+        noteGroups: NoteGroup[],
         getNextBalloon: () => number,
         currentBPM: number,
         currentTiming: math.Fraction,
@@ -170,7 +171,7 @@ export class Course {
             return math.fraction(math.divide(math.multiply(1000, 240, currentMeasure), math.fraction(currentBPM)) as math.Fraction);
         }
 
-        const bars: Bar[] = [];
+        const noteGroups: (Bar | Branch)[] = [];
         for (const lineGroup of lineGroups) {
             if (lineGroup instanceof Course.LineGroup) {
                 if (lineGroup.lines.length === 0) continue;
@@ -215,6 +216,9 @@ export class Course {
                             else if (item instanceof MeasureCommand) {
                                 currentMeasure = item.value;
                             }
+                            else if (item instanceof BarlineCommand) {
+                                barlineHidden = item.getHide();
+                            }
                         }
                     });
                     bar.setBarlineHidden(barlineHidden);
@@ -258,6 +262,9 @@ export class Course {
                             else if (item instanceof MeasureCommand) {
                                 currentMeasure = item.value;
                             }
+                            else if (item instanceof BarlineCommand) {
+                                barlineHidden = item.getHide();
+                            }
                         }
                     });
                     bar.setEnd(currentTiming);
@@ -302,22 +309,22 @@ export class Course {
 
                     bar.pushItem(...items);
                 }
-                bars.push(bar);
+                noteGroups.push(bar);
             }
             else {
                 const branch = new Branch(lineGroup.type, lineGroup.criteria, math.fraction(currentTiming), math.fraction(currentTiming));
                 let result;
                 if (lineGroup.normal) {
-                    result = this.convertLineGroupToBar(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
-                    branch.normal = result.bars;
+                    result = this.convertLineGroupToNoteGroup(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
+                    branch.normal = result.noteGroups as Bar[];
                 }
                 if (lineGroup.advanced) {
-                    result = this.convertLineGroupToBar(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
-                    branch.advanced = result.bars;
+                    result = this.convertLineGroupToNoteGroup(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
+                    branch.advanced = result.noteGroups as Bar[];
                 }
                 if (lineGroup.master) {
-                    result = this.convertLineGroupToBar(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
-                    branch.master = result.bars;
+                    result = this.convertLineGroupToNoteGroup(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
+                    branch.master = result.noteGroups as Bar[];
                 }
 
                 if (result) {
@@ -327,12 +334,12 @@ export class Course {
                     barlineHidden = result.barlineHidden;
                     branch.setEnd(result.currentTiming);
                 }
-                bars.push(branch);
+                noteGroups.push(branch);
             }
         }
 
         return {
-            bars,
+            noteGroups,
             getNextBalloon,
             currentBPM,
             currentTiming,
@@ -344,7 +351,7 @@ export class Course {
 
     difficulty: Difficulty;
     metadata: Course.Metadata;
-    bars: Bar[] = [];
+    noteGroups: NoteGroup[] = [];
     song?: Song;
 
     constructor(difficulty: Difficulty, metadata: Course.Metadata, song?: Song) {
@@ -369,8 +376,8 @@ export class Course {
         return Number(this.metadata.level) || 1;
     }
 
-    pushBar(...bars: Bar[]) {
-        this.bars.push(...bars);
+    pushNoteGroups(...noteGroups: NoteGroup[]) {
+        this.noteGroups.push(...noteGroups);
     }
 
     getBalloon() {
@@ -392,7 +399,7 @@ export class Course {
         return {
             metadata: this.metadata,
             difficulty: this.difficulty,
-            bars: this.bars
+            noteGroups: this.noteGroups
         }
     }
 }

package/src/class/NoteGroup.ts

@@ -0,0 +1,24 @@
+import * as math from 'mathjs';
+
+export abstract class NoteGroup {
+    private start: math.Fraction;
+    private end: math.Fraction;
+
+    constructor(start: math.Fraction, end: math.Fraction) {
+        this.start = start;
+        this.end = end;
+    }
+
+    getStart() {
+        return math.fraction(this.start);
+    }
+    setStart(start: math.Fraction) {
+        this.start = math.fraction(start);
+    }
+    getEnd() {
+        return math.fraction(this.end);
+    }
+    setEnd(end: math.Fraction) {
+        this.end = math.fraction(end);
+    }
+}

package/src/index.ts

@@ -4,6 +4,7 @@ export * from './class/Command.js';
 export * from './class/Course.js';
 export * from './class/Item.js';
 export * from './class/Note.js';
+export * from './class/NoteGroup.js';
 export * from './class/Song.js';
 
 export * from './exception/ParseException.js';