tja-parser 0.2.0 → 0.2.1

package/package.json

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

package/src/class/Bar.ts

@@ -1,68 +1,86 @@
-import { Command } from "./Command.js";
-import { Item } from "./Item.js";
-import { Note } from "./Note.js";
-import { NoteGroup } from "./NoteGroup.js";
-
-export class Bar extends NoteGroup {
-    private items: Item[] = [];
-    private notes: Note[] = [];
-    private commands: Command[] = [];
-    /** Count of notes */ private barLength = 0;
-    private barlineHidden = false;
-    private bpm: number = 160;
-    private scroll: number = 1;
-
-    pushItem(...items: Item[]) {
-        this.items.push(...items);
-        this.notes.push(...items.filter((item) => item instanceof Note));
-        this.commands.push(...items.filter((item) => item instanceof Command));
-    }
-    getItems() {
-        return Array.from(this.items);
-    }
-    getNotes() {
-        return Array.from(this.notes);
-    }
-    getCommands() {
-        return Array.from(this.commands);
-    }
-
-    getBarLength() {
-        return this.barLength;
-    }
-    setBarLength(barLength: number) {
-        this.barLength = barLength;
-    }
-
-    getBarlineHidden() {
-        return this.barlineHidden;
-    }
-    setBarlineHidden(barlineHidden: boolean) {
-        this.barlineHidden = barlineHidden;
-    }
-
-    setBpm(bpm: number) {
-        this.bpm = bpm;
-    }
-    getBpm() {
-        return this.bpm;
-    }
-    setScroll(scroll: number) {
-        this.scroll = scroll;
-    }
-    getScroll() {
-        return this.scroll;
-    }
-
-    toJSON(): any {
-        return {
-            start: this.getStart().valueOf(),
-            end: this.getEnd().valueOf(),
-            items: this.items,
-            notes: this.notes,
-            commands: this.commands,
-            barLength: this.barLength,
-            type: 'bar'
-        }
-    }
+import { Command } from "./Command.js";
+import { Item } from "./Item.js";
+import * as math from 'mathjs';
+import { Note } from "./Note.js";
+
+export class Bar {
+    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);
+        this.notes.push(...items.filter((item) => item instanceof Note));
+        this.commands.push(...items.filter((item) => item instanceof Command));
+    }
+    getItems() {
+        return Array.from(this.items);
+    }
+    getNotes() {
+        return Array.from(this.notes);
+    }
+    getCommands() {
+        return Array.from(this.commands);
+    }
+
+    setMeasure(measure: math.Fraction) {
+        this.measure = measure;
+    }
+    getMeasure() {
+        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;
+    }
+    setBarlineHidden(barlineHidden: boolean) {
+        this.barlineHidden = barlineHidden;
+    }
+
+    setBpm(bpm: number) {
+        this.bpm = bpm;
+    }
+    getBpm() {
+        return this.bpm;
+    }
+    setScroll(scroll: number) {
+        this.scroll = scroll;
+    }
+    getScroll() {
+        return this.scroll;
+    }
+
+    toJSON(): any {
+        return {
+            start: this.start.valueOf(),
+            end: this.end.valueOf(),
+            items: this.items,
+            notes: this.notes,
+            commands: this.commands,
+            type: 'bar'
+        }
+    }
 }

package/src/class/Branch.ts

@@ -1,34 +1,34 @@
-import * as math from 'mathjs';
-import { Bar } from './Bar.js';
-import { NoteGroup } from './NoteGroup.js';
-
-export class Branch extends NoteGroup {
-    type: Branch.Type;
-    criteria: [number, number];
-    normal?: Bar[];
-    advanced?: Bar[];
-    master?: Bar[];
-
-    constructor(type: Branch.Type, criteria1: [number, number], start: math.Fraction, end: math.Fraction) {
-        super(start, end);
-        this.type = type;
-        this.criteria = criteria1;
-    }
-
-    toJSON() {
-        return {
-            start: this.getStart().valueOf(),
-            end: this.getEnd().valueOf(),
-            normal: this.normal,
-            advanced: this.advanced,
-            master: this.master,
-            criteria: this.criteria,
-            type: 'branch',
-            branchType: this.type === Branch.Type.ROLL ? 'roll' : 'acc'
-        }
-    }
-}
-
-export namespace Branch {
-    export enum Type { ROLL, ACCURACY }
+import * as math from 'mathjs';
+import { Bar } from './Bar.js';
+
+export class Branch extends Bar {
+    type: Branch.Type;
+    criteria: [number, number];
+    normal?: Bar[];
+    advanced?: Bar[];
+    master?: Bar[];
+
+    constructor(type: Branch.Type, criteria1: [number, number], start: math.Fraction, end: math.Fraction) {
+        super(start, end);
+        this.type = type;
+        this.criteria = criteria1;
+    }
+
+    toJSON(){
+        const superJSON = super.toJSON();
+        return {
+            start: superJSON.start,
+            end: superJSON.end,
+            normal: this.normal,
+            advanced: this.advanced,
+            master: this.master,
+            criteria: this.criteria,
+            type: 'branch',
+            branchType: this.type === Branch.Type.ROLL ? 'roll' : 'acc'
+        }
+    }
+}
+
+export namespace Branch {
+    export enum Type { ROLL, ACCURACY }
 }

package/src/class/Command.ts

@@ -1,139 +1,139 @@
-import { Item } from "./Item.js";
-import * as math from 'mathjs';
-
-export class Command extends Item {
-    static parse(line: string): Command | null {
-        if (line === '#BARLINEON') {
-            return new BarlineCommand(false, math.fraction(0));
-        }
-        else if (line === "#BARLINEOFF") {
-            return new BarlineCommand(true, math.fraction(0));
-        }
-        else if (line === "#GOGOSTART") {
-            return new GOGOCommand(GOGOCommand.Type.START, math.fraction(0));
-        }
-        else if (line === "#GOGOEND") {
-            return new GOGOCommand(GOGOCommand.Type.END, math.fraction(0));
-        }
-        else if (line === "#SECTION") {
-            return new SectionCommand(math.fraction(0));
-        }
-        else if (line.startsWith('#BPMCHANGE')) {
-            const value = Number(line.replace('#BPMCHANGE', ''));
-            if (Number.isNaN(value)) return null;
-            return new BPMChangeCommand(value, math.fraction(0));
-        }
-        else if (line.startsWith('#MEASURE')) {
-            return new MeasureCommand(math.fraction(line.replace('#MEASURE', '').trim()), math.fraction(0));
-        }
-        else if (line.startsWith('#SCROLL')) {
-            const value = Number(line.replace('#SCROLL', ''));
-            if (Number.isNaN(value)) return null;
-            return new ScrollCommand(value, math.fraction(0));
-        }
-        return null;
-    }
-
-    constructor(timing: math.Fraction) {
-        super(timing);
-    }
-}
-
-export class BarlineCommand extends Command {
-    private hide: boolean;
-    constructor(hide: boolean, timing: math.Fraction) {
-        super(timing);
-        this.hide = hide;
-    }
-
-    getHide(){
-        return this.hide;
-    }
-    
-    toJSON(){
-        return {
-            ...super.toJSON(),
-            type: 'command-barline',
-            hide: this.hide
-        }
-    }
-}
-
-export class BPMChangeCommand extends Command {
-    value: number;
-    constructor(value: number, timing: math.Fraction) {
-        super(timing);
-        this.value = value;
-    }
-
-    toJSON(){
-        return {
-            ...super.toJSON(),
-            type: 'command-bpmchange',
-            value: this.value
-        }
-    }
-}
-
-export class MeasureCommand extends Command {
-    value: math.Fraction;
-    constructor(value: math.Fraction, timing: math.Fraction) {
-        super(timing);
-        this.value = value;
-    }
-
-    toJSON(){
-        return {
-            ...super.toJSON(),
-            type: 'command-measure',
-            value: this.value.toString()
-        }
-    }
-}
-
-export class ScrollCommand extends Command {
-    value: number;
-    constructor(value: number, timing: math.Fraction) {
-        super(timing);
-        this.value = value;
-    }
-
-    toJSON(){
-        return {
-            ...super.toJSON(),
-            type: 'command-scroll',
-            value: this.value
-        }
-    }
-}
-
-export class SectionCommand extends Command {
-    toJSON() {
-        return {
-            ...super.toJSON(),
-            type: 'command-section'
-        }
-    }
-}
-
-export class GOGOCommand extends Command {
-    type: GOGOCommand.Type;
-    constructor(type: GOGOCommand.Type, timing: math.Fraction) {
-        super(timing);
-        this.type = type;
-    }
-
-    toJSON(){
-        return {
-            ...super.toJSON(),
-            type: 'command-gogo',
-            start: this.type === GOGOCommand.Type.START
-        }
-    }
-}
-export namespace GOGOCommand {
-    export enum Type {
-        START,
-        END
-    }
+import { Item } from "./Item.js";
+import * as math from 'mathjs';
+
+export class Command extends Item {
+    static parse(line: string): Command | null {
+        if (line === '#BARLINEON') {
+            return new BarlineCommand(false, math.fraction(0));
+        }
+        else if (line === "#BARLINEOFF") {
+            return new BarlineCommand(true, math.fraction(0));
+        }
+        else if (line === "#GOGOSTART") {
+            return new GOGOCommand(GOGOCommand.Type.START, math.fraction(0));
+        }
+        else if (line === "#GOGOEND") {
+            return new GOGOCommand(GOGOCommand.Type.END, math.fraction(0));
+        }
+        else if (line === "#SECTION") {
+            return new SectionCommand(math.fraction(0));
+        }
+        else if (line.startsWith('#BPMCHANGE')) {
+            const value = Number(line.replace('#BPMCHANGE', ''));
+            if (Number.isNaN(value)) return null;
+            return new BPMChangeCommand(value, math.fraction(0));
+        }
+        else if (line.startsWith('#MEASURE')) {
+            return new MeasureCommand(math.fraction(line.replace('#MEASURE', '').trim()), math.fraction(0));
+        }
+        else if (line.startsWith('#SCROLL')) {
+            const value = Number(line.replace('#SCROLL', ''));
+            if (Number.isNaN(value)) return null;
+            return new ScrollCommand(value, math.fraction(0));
+        }
+        return null;
+    }
+
+    constructor(timing: math.Fraction) {
+        super(timing);
+    }
+}
+
+export class BarlineCommand extends Command {
+    private hide: boolean;
+    constructor(hide: boolean, timing: math.Fraction) {
+        super(timing);
+        this.hide = hide;
+    }
+
+    getHide(){
+        return this.hide;
+    }
+    
+    toJSON(){
+        return {
+            ...super.toJSON(),
+            type: 'command-barline',
+            hide: this.hide
+        }
+    }
+}
+
+export class BPMChangeCommand extends Command {
+    value: number;
+    constructor(value: number, timing: math.Fraction) {
+        super(timing);
+        this.value = value;
+    }
+
+    toJSON(){
+        return {
+            ...super.toJSON(),
+            type: 'command-bpmchange',
+            value: this.value
+        }
+    }
+}
+
+export class MeasureCommand extends Command {
+    value: math.Fraction;
+    constructor(value: math.Fraction, timing: math.Fraction) {
+        super(timing);
+        this.value = value;
+    }
+
+    toJSON(){
+        return {
+            ...super.toJSON(),
+            type: 'command-measure',
+            value: this.value.toString()
+        }
+    }
+}
+
+export class ScrollCommand extends Command {
+    value: number;
+    constructor(value: number, timing: math.Fraction) {
+        super(timing);
+        this.value = value;
+    }
+
+    toJSON(){
+        return {
+            ...super.toJSON(),
+            type: 'command-scroll',
+            value: this.value
+        }
+    }
+}
+
+export class SectionCommand extends Command {
+    toJSON() {
+        return {
+            ...super.toJSON(),
+            type: 'command-section'
+        }
+    }
+}
+
+export class GOGOCommand extends Command {
+    type: GOGOCommand.Type;
+    constructor(type: GOGOCommand.Type, timing: math.Fraction) {
+        super(timing);
+        this.type = type;
+    }
+
+    toJSON(){
+        return {
+            ...super.toJSON(),
+            type: 'command-gogo',
+            start: this.type === GOGOCommand.Type.START
+        }
+    }
+}
+export namespace GOGOCommand {
+    export enum Type {
+        START,
+        END
+    }
 }