tja-parser 0.1.5 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (26) hide show
  1. package/dist/class/Bar.d.ts +2 -9
  2. package/dist/class/Bar.d.ts.map +1 -1
  3. package/dist/class/Bar.js +4 -55
  4. package/dist/class/Bar.js.map +1 -1
  5. package/dist/class/Branch.d.ts +4 -3
  6. package/dist/class/Branch.d.ts.map +1 -1
  7. package/dist/class/Branch.js +4 -5
  8. package/dist/class/Branch.js.map +1 -1
  9. package/dist/class/Course.d.ts +5 -5
  10. package/dist/class/Course.d.ts.map +1 -1
  11. package/dist/class/Course.js +17 -17
  12. package/dist/class/Course.js.map +1 -1
  13. package/dist/class/NoteGroup.d.ts +11 -0
  14. package/dist/class/NoteGroup.d.ts.map +1 -0
  15. package/dist/class/NoteGroup.js +59 -0
  16. package/dist/class/NoteGroup.js.map +1 -0
  17. package/dist/index.d.ts +1 -0
  18. package/dist/index.d.ts.map +1 -1
  19. package/dist/index.js +1 -0
  20. package/dist/index.js.map +1 -1
  21. package/package.json +1 -1
  22. package/src/class/Bar.ts +5 -23
  23. package/src/class/Branch.ts +5 -5
  24. package/src/class/Course.ts +22 -21
  25. package/src/class/NoteGroup.ts +24 -0
  26. package/src/index.ts +1 -0
package/dist/class/Bar.d.ts CHANGED
@@ -1,26 +1,19 @@
1
1
  import { Command } from "./Command.js";
2
2
  import { Item } from "./Item.js";
3
- import * as math from 'mathjs';
4
3
  import { Note } from "./Note.js";
5
- export declare class Bar {
4
+ import { NoteGroup } from "./NoteGroup.js";
5
+ export declare class Bar extends NoteGroup {
6
6
  private items;
7
7
  private notes;
8
8
  private commands;
9
- private start;
10
- private end;
11
9
  private barLength;
12
10
  private barlineHidden;
13
11
  private bpm;
14
12
  private scroll;
15
- constructor(start: math.Fraction, end: math.Fraction);
16
13
  pushItem(...items: Item[]): void;
17
14
  getItems(): Item[];
18
15
  getNotes(): Note[];
19
16
  getCommands(): Command[];
20
- getStart(): math.Fraction;
21
- setStart(start: math.Fraction): void;
22
- getEnd(): math.Fraction;
23
- setEnd(end: math.Fraction): void;
24
17
  getBarLength(): number;
25
18
  setBarLength(barLength: number): void;
26
19
  getBarlineHidden(): boolean;
package/dist/class/Bar.d.ts.map CHANGED
@@ -1 +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,SAAS,CAAK;IACtB,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,QAAQ;IAGR,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ;IAG7B,MAAM;IAGN,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ;IAGzB,YAAY;IAGZ,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,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;CAWhB"}
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,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,qBAAa,GAAI,SAAQ,SAAS;IAC9B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,QAAQ,CAAiB;IACX,OAAO,CAAC,SAAS,CAAK;IAC5C,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,YAAY;IAGZ,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,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;CAWhB"}
package/dist/class/Bar.js CHANGED
@@ -1,56 +1,17 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || (function () {
19
- var ownKeys = function(o) {
20
- ownKeys = Object.getOwnPropertyNames || function (o) {
21
- var ar = [];
22
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
- return ar;
24
- };
25
- return ownKeys(o);
26
- };
27
- return function (mod) {
28
- if (mod && mod.__esModule) return mod;
29
- var result = {};
30
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
- __setModuleDefault(result, mod);
32
- return result;
33
- };
34
- })();
35
2
  Object.defineProperty(exports, "__esModule", { value: true });
36
3
  exports.Bar = void 0;
37
4
  const Command_js_1 = require("./Command.js");
38
- const math = __importStar(require("mathjs"));
39
5
  const Note_js_1 = require("./Note.js");
40
- class Bar {
6
+ const NoteGroup_js_1 = require("./NoteGroup.js");
7
+ class Bar extends NoteGroup_js_1.NoteGroup {
41
8
  items = [];
42
9
  notes = [];
43
10
  commands = [];
44
- start;
45
- end;
46
11
  barLength = 0;
47
12
  barlineHidden = false;
48
13
  bpm = 160;
49
14
  scroll = 1;
50
- constructor(start, end) {
51
- this.start = start;
52
- this.end = end;
53
- }
54
15
  pushItem(...items) {
55
16
  this.items.push(...items);
56
17
  this.notes.push(...items.filter((item) => item instanceof Note_js_1.Note));
@@ -65,18 +26,6 @@ class Bar {
65
26
  getCommands() {
66
27
  return Array.from(this.commands);
67
28
  }
68
- getStart() {
69
- return math.fraction(this.start);
70
- }
71
- setStart(start) {
72
- this.start = math.fraction(start);
73
- }
74
- getEnd() {
75
- return math.fraction(this.end);
76
- }
77
- setEnd(end) {
78
- this.end = math.fraction(end);
79
- }
80
29
  getBarLength() {
81
30
  return this.barLength;
82
31
  }
@@ -103,8 +52,8 @@ class Bar {
103
52
  }
104
53
  toJSON() {
105
54
  return {
106
- start: this.start.valueOf(),
107
- end: this.end.valueOf(),
55
+ start: this.getStart().valueOf(),
56
+ end: this.getEnd().valueOf(),
108
57
  items: this.items,
109
58
  notes: this.notes,
110
59
  commands: this.commands,
package/dist/class/Bar.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Bar.js","sourceRoot":"","sources":["../../src/class/Bar.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Bar.js","sourceRoot":"","sources":["../../src/class/Bar.ts"],"names":[],"mappings":";;;AAAA,6CAAuC;AAEvC,uCAAiC;AACjC,iDAA2C;AAE3C,MAAa,GAAI,SAAQ,wBAAS;IACtB,KAAK,GAAW,EAAE,CAAC;IACnB,KAAK,GAAW,EAAE,CAAC;IACnB,QAAQ,GAAc,EAAE,CAAC;IACH,SAAS,GAAG,CAAC,CAAC;IACpC,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,YAAY;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,YAAY,CAAC,SAAiB;QAC1B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,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,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,KAAK;SACd,CAAA;IACL,CAAC;CACJ;AA9DD,kBA8DC"}
package/dist/class/Branch.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import * as math from 'mathjs';
2
2
  import { Bar } from './Bar.js';
3
- export declare class Branch extends Bar {
3
+ import { NoteGroup } from './NoteGroup.js';
4
+ export declare class Branch extends NoteGroup {
4
5
  type: Branch.Type;
5
6
  criteria: [number, number];
6
7
  normal?: Bar[];
@@ -8,8 +9,8 @@ export declare class Branch extends Bar {
8
9
  master?: Bar[];
9
10
  constructor(type: Branch.Type, criteria1: [number, number], start: math.Fraction, end: math.Fraction);
10
11
  toJSON(): {
11
- start: any;
12
- end: any;
12
+ start: number;
13
+ end: number;
13
14
  normal: Bar[] | undefined;
14
15
  advanced: Bar[] | undefined;
15
16
  master: Bar[] | undefined;
package/dist/class/Branch.d.ts.map CHANGED
@@ -1 +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"}
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;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 CHANGED
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Branch = void 0;
4
- const Bar_js_1 = require("./Bar.js");
5
- class Branch extends Bar_js_1.Bar {
4
+ const NoteGroup_js_1 = require("./NoteGroup.js");
5
+ class Branch extends NoteGroup_js_1.NoteGroup {
6
6
  type;
7
7
  criteria;
8
8
  normal;
@@ -14,10 +14,9 @@ class Branch extends Bar_js_1.Bar {
14
14
  this.criteria = criteria1;
15
15
  }
16
16
  toJSON() {
17
- const superJSON = super.toJSON();
18
17
  return {
19
- start: superJSON.start,
20
- end: superJSON.end,
18
+ start: this.getStart().valueOf(),
19
+ end: this.getEnd().valueOf(),
21
20
  normal: this.normal,
22
21
  advanced: this.advanced,
23
22
  master: this.master,
package/dist/class/Branch.js.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,26 +1,26 @@
1
1
  import type { Difficulty } from "../types.js";
2
- import { Bar } from "./Bar.js";
3
2
  import { Branch } from "./Branch.js";
3
+ import { NoteGroup } from "./NoteGroup.js";
4
4
  import { Song } from "./Song.js";
5
5
  export declare class Course {
6
6
  static parse(courseTja: string | string[], song?: Song): Course;
7
7
  private static parseBar;
8
8
  private static groupLines;
9
- private static convertLineGroupToBar;
9
+ private static convertLineGroupToNoteGroup;
10
10
  difficulty: Difficulty;
11
11
  metadata: Course.Metadata;
12
- bars: Bar[];
12
+ noteGroups: NoteGroup[];
13
13
  song?: Song;
14
14
  constructor(difficulty: Difficulty, metadata: Course.Metadata, song?: Song);
15
15
  getBPM(): number;
16
16
  getLevel(): number;
17
- pushBar(...bars: Bar[]): void;
17
+ pushNoteGroups(...noteGroups: NoteGroup[]): void;
18
18
  getBalloon(): number[];
19
19
  getBalloonIterator(): () => number;
20
20
  toJSON(): {
21
21
  metadata: Course.Metadata;
22
22
  difficulty: Difficulty;
23
- bars: Bar[];
23
+ noteGroups: NoteGroup[];
24
24
  };
25
25
  }
26
26
  export declare namespace Course {
package/dist/class/Course.d.ts.map CHANGED
@@ -1 +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;IAiLpC,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"}
1
+ {"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;IAiL1C,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 CHANGED
@@ -79,12 +79,12 @@ class Course {
79
79
  throw new ParseException_js_1.UnknownCourseDifficultyException(courseTja[0]);
80
80
  }
81
81
  const course = new Course(difficulty, metadata, song);
82
- course.pushBar(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
82
+ course.pushNoteGroups(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
83
83
  return course;
84
84
  }
85
85
  static parseBar(lines, getNextBalloon, bpmInit) {
86
86
  const lineGroups = this.groupLines(lines);
87
- return this.convertLineGroupToBar(lineGroups, getNextBalloon, bpmInit).bars;
87
+ return this.convertLineGroupToNoteGroup(lineGroups, getNextBalloon, bpmInit).noteGroups;
88
88
  }
89
89
  static groupLines(lines) {
90
90
  const LineGroup = Course.LineGroup;
@@ -155,11 +155,11 @@ class Course {
155
155
  }
156
156
  return bars;
157
157
  }
158
- static convertLineGroupToBar(lineGroups, getNextBalloon, currentBPM, currentTiming = math.fraction(0), currentMeasure = math.fraction(1), currentScroll = 1, barlineHidden = false) {
158
+ static convertLineGroupToNoteGroup(lineGroups, getNextBalloon, currentBPM, currentTiming = math.fraction(0), currentMeasure = math.fraction(1), currentScroll = 1, barlineHidden = false) {
159
159
  function getBarLength() {
160
160
  return math.fraction(math.divide(math.multiply(1000, 240, currentMeasure), math.fraction(currentBPM)));
161
161
  }
162
- const bars = [];
162
+ const noteGroups = [];
163
163
  for (const lineGroup of lineGroups) {
164
164
  if (lineGroup instanceof Course.LineGroup) {
165
165
  if (lineGroup.lines.length === 0)
@@ -270,22 +270,22 @@ class Course {
270
270
  });
271
271
  bar.pushItem(...items);
272
272
  }
273
- bars.push(bar);
273
+ noteGroups.push(bar);
274
274
  }
275
275
  else {
276
276
  const branch = new Branch_js_1.Branch(lineGroup.type, lineGroup.criteria, math.fraction(currentTiming), math.fraction(currentTiming));
277
277
  let result;
278
278
  if (lineGroup.normal) {
279
- result = this.convertLineGroupToBar(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
280
- branch.normal = result.bars;
279
+ result = this.convertLineGroupToNoteGroup(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
280
+ branch.normal = result.noteGroups;
281
281
  }
282
282
  if (lineGroup.advanced) {
283
- result = this.convertLineGroupToBar(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
284
- branch.advanced = result.bars;
283
+ result = this.convertLineGroupToNoteGroup(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
284
+ branch.advanced = result.noteGroups;
285
285
  }
286
286
  if (lineGroup.master) {
287
- result = this.convertLineGroupToBar(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
288
- branch.master = result.bars;
287
+ result = this.convertLineGroupToNoteGroup(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
288
+ branch.master = result.noteGroups;
289
289
  }
290
290
  if (result) {
291
291
  currentBPM = result.currentBPM;
@@ -294,11 +294,11 @@ class Course {
294
294
  barlineHidden = result.barlineHidden;
295
295
  branch.setEnd(result.currentTiming);
296
296
  }
297
- bars.push(branch);
297
+ noteGroups.push(branch);
298
298
  }
299
299
  }
300
300
  return {
301
- bars,
301
+ noteGroups,
302
302
  getNextBalloon,
303
303
  currentBPM,
304
304
  currentTiming,
@@ -309,7 +309,7 @@ class Course {
309
309
  }
310
310
  difficulty;
311
311
  metadata;
312
- bars = [];
312
+ noteGroups = [];
313
313
  song;
314
314
  constructor(difficulty, metadata, song) {
315
315
  this.difficulty = difficulty;
@@ -322,8 +322,8 @@ class Course {
322
322
  getLevel() {
323
323
  return Number(this.metadata.level) || 1;
324
324
  }
325
- pushBar(...bars) {
326
- this.bars.push(...bars);
325
+ pushNoteGroups(...noteGroups) {
326
+ this.noteGroups.push(...noteGroups);
327
327
  }
328
328
  getBalloon() {
329
329
  return (this.metadata.balloon ?? '').split(',').map((e) => Number(e));
@@ -342,7 +342,7 @@ class Course {
342
342
  return {
343
343
  metadata: this.metadata,
344
344
  difficulty: this.difficulty,
345
- bars: this.bars
345
+ noteGroups: this.noteGroups
346
346
  };
347
347
  }
348
348
  }
package/dist/class/Course.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Course.js","sourceRoot":"","sources":["../../src/class/Course.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Course.js","sourceRoot":"","sources":["../../src/class/Course.ts"],"names":[],"mappings":"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"}
package/dist/class/NoteGroup.d.ts ADDED
@@ -0,0 +1,11 @@
1
+ import * as math from 'mathjs';
2
+ export declare abstract class NoteGroup {
3
+ private start;
4
+ private end;
5
+ constructor(start: math.Fraction, end: math.Fraction);
6
+ getStart(): math.Fraction;
7
+ setStart(start: math.Fraction): void;
8
+ getEnd(): math.Fraction;
9
+ setEnd(end: math.Fraction): void;
10
+ }
11
+ //# sourceMappingURL=NoteGroup.d.ts.map
package/dist/class/NoteGroup.d.ts.map ADDED
@@ -0,0 +1 @@
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 ADDED
@@ -0,0 +1,59 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.NoteGroup = void 0;
37
+ const math = __importStar(require("mathjs"));
38
+ class NoteGroup {
39
+ start;
40
+ end;
41
+ constructor(start, end) {
42
+ this.start = start;
43
+ this.end = end;
44
+ }
45
+ getStart() {
46
+ return math.fraction(this.start);
47
+ }
48
+ setStart(start) {
49
+ this.start = math.fraction(start);
50
+ }
51
+ getEnd() {
52
+ return math.fraction(this.end);
53
+ }
54
+ setEnd(end) {
55
+ this.end = math.fraction(end);
56
+ }
57
+ }
58
+ exports.NoteGroup = NoteGroup;
59
+ //# sourceMappingURL=NoteGroup.js.map
package/dist/class/NoteGroup.js.map ADDED
@@ -0,0 +1 @@
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 CHANGED
@@ -4,6 +4,7 @@ export * from './class/Command.js';
4
4
  export * from './class/Course.js';
5
5
  export * from './class/Item.js';
6
6
  export * from './class/Note.js';
7
+ export * from './class/NoteGroup.js';
7
8
  export * from './class/Song.js';
8
9
  export * from './exception/ParseException.js';
9
10
  export * from './exception/TjaException.js';
package/dist/index.d.ts.map CHANGED
@@ -1 +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"}
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,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAEhC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAE5C,mBAAmB,YAAY,CAAC"}
package/dist/index.js CHANGED
@@ -20,6 +20,7 @@ __exportStar(require("./class/Command.js"), exports);
20
20
  __exportStar(require("./class/Course.js"), exports);
21
21
  __exportStar(require("./class/Item.js"), exports);
22
22
  __exportStar(require("./class/Note.js"), exports);
23
+ __exportStar(require("./class/NoteGroup.js"), exports);
23
24
  __exportStar(require("./class/Song.js"), exports);
24
25
  __exportStar(require("./exception/ParseException.js"), exports);
25
26
  __exportStar(require("./exception/TjaException.js"), exports);
package/dist/index.js.map CHANGED
@@ -1 +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"}
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,uDAAqC;AACrC,kDAAgC;AAEhC,gEAA8C;AAC9C,8DAA4C"}
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "author": {
4
4
  "name": "hotsixman"
5
5
  },
6
- "version": "0.1.5",
6
+ "version": "0.2.0",
7
7
  "dependencies": {
8
8
  "mathjs": "^15.1.0"
9
9
  },
package/src/class/Bar.ts CHANGED
@@ -1,22 +1,16 @@
1
1
  import { Command } from "./Command.js";
2
2
  import { Item } from "./Item.js";
3
- import * as math from 'mathjs';
4
3
  import { Note } from "./Note.js";
4
+ import { NoteGroup } from "./NoteGroup.js";
5
5
 
6
- export class Bar {
6
+ export class Bar extends NoteGroup {
7
7
  private items: Item[] = [];
8
8
  private notes: Note[] = [];
9
9
  private commands: Command[] = [];
10
- private start: math.Fraction;
11
- private end: math.Fraction;
12
- private barLength = 0;
10
+ /** Count of notes */ private barLength = 0;
13
11
  private barlineHidden = false;
14
12
  private bpm: number = 160;
15
13
  private scroll: number = 1;
16
- constructor(start: math.Fraction, end: math.Fraction) {
17
- this.start = start;
18
- this.end = end;
19
- }
20
14
 
21
15
  pushItem(...items: Item[]) {
22
16
  this.items.push(...items);
@@ -33,18 +27,6 @@ export class Bar {
33
27
  return Array.from(this.commands);
34
28
  }
35
29
 
36
- getStart() {
37
- return math.fraction(this.start);
38
- }
39
- setStart(start: math.Fraction) {
40
- this.start = math.fraction(start);
41
- }
42
- getEnd() {
43
- return math.fraction(this.end);
44
- }
45
- setEnd(end: math.Fraction) {
46
- this.end = math.fraction(end);
47
- }
48
30
  getBarLength() {
49
31
  return this.barLength;
50
32
  }
@@ -74,8 +56,8 @@ export class Bar {
74
56
 
75
57
  toJSON(): any {
76
58
  return {
77
- start: this.start.valueOf(),
78
- end: this.end.valueOf(),
59
+ start: this.getStart().valueOf(),
60
+ end: this.getEnd().valueOf(),
79
61
  items: this.items,
80
62
  notes: this.notes,
81
63
  commands: this.commands,
package/src/class/Branch.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import * as math from 'mathjs';
2
2
  import { Bar } from './Bar.js';
3
+ import { NoteGroup } from './NoteGroup.js';
3
4
 
4
- export class Branch extends Bar {
5
+ export class Branch extends NoteGroup {
5
6
  type: Branch.Type;
6
7
  criteria: [number, number];
7
8
  normal?: Bar[];
@@ -14,11 +15,10 @@ export class Branch extends Bar {
14
15
  this.criteria = criteria1;
15
16
  }
16
17
 
17
- toJSON(){
18
- const superJSON = super.toJSON();
18
+ toJSON() {
19
19
  return {
20
- start: superJSON.start,
21
- end: superJSON.end,
20
+ start: this.getStart().valueOf(),
21
+ end: this.getEnd().valueOf(),
22
22
  normal: this.normal,
23
23
  advanced: this.advanced,
24
24
  master: this.master,
package/src/class/Course.ts CHANGED
@@ -1,10 +1,11 @@
1
- import { UnknownCourseDifficultyException, MetadataParseException } from "../exception/ParseException.js";
1
+ import { UnknownCourseDifficultyException } from "../exception/ParseException.js";
2
2
  import type { Difficulty } from "../types.js";
3
3
  import { Bar } from "./Bar.js";
4
4
  import { Branch } from "./Branch.js";
5
5
  import { BarlineCommand, BPMChangeCommand, Command, MeasureCommand, ScrollCommand } from "./Command.js";
6
6
  import type { Item } from "./Item.js";
7
7
  import { BalloonNote, EmptyNote, HitNote, Note, RollEndNote, RollNote } from "./Note.js";
8
+ import { NoteGroup } from "./NoteGroup.js";
8
9
  import { Song } from "./Song.js";
9
10
  import * as math from 'mathjs';
10
11
 
@@ -55,15 +56,15 @@ export class Course {
55
56
  }
56
57
 
57
58
  const course = new Course(difficulty, metadata, song);
58
- course.pushBar(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
59
+ course.pushNoteGroups(...this.parseBar(courseTja.slice(i), course.getBalloonIterator(), course.getBPM()));
59
60
 
60
61
  return course;
61
62
  }
62
63
 
63
- private static parseBar(lines: string[], getNextBalloon: () => number, bpmInit: number): Bar[] {
64
+ private static parseBar(lines: string[], getNextBalloon: () => number, bpmInit: number): NoteGroup[] {
64
65
  const lineGroups = this.groupLines(lines);
65
66
 
66
- return this.convertLineGroupToBar(lineGroups, getNextBalloon, bpmInit).bars;
67
+ return this.convertLineGroupToNoteGroup(lineGroups, getNextBalloon, bpmInit).noteGroups;
67
68
  }
68
69
 
69
70
  /**
@@ -144,9 +145,9 @@ export class Course {
144
145
  }
145
146
 
146
147
  /**
147
- * `LineGroup`을 `Bar`로 변환
148
+ * `LineGroup`을 `NoteGroup`으로 변환
148
149
  */
149
- private static convertLineGroupToBar(
150
+ private static convertLineGroupToNoteGroup(
150
151
  lineGroups: (Course.LineGroup | Course.BranchedLineGroup)[],
151
152
  getNextBalloon: () => number,
152
153
  currentBPM: number,
@@ -155,7 +156,7 @@ export class Course {
155
156
  currentScroll: number = 1,
156
157
  barlineHidden: boolean = false,
157
158
  ): {
158
- bars: Bar[],
159
+ noteGroups: NoteGroup[],
159
160
  getNextBalloon: () => number,
160
161
  currentBPM: number,
161
162
  currentTiming: math.Fraction,
@@ -170,7 +171,7 @@ export class Course {
170
171
  return math.fraction(math.divide(math.multiply(1000, 240, currentMeasure), math.fraction(currentBPM)) as math.Fraction);
171
172
  }
172
173
 
173
- const bars: Bar[] = [];
174
+ const noteGroups: (Bar | Branch)[] = [];
174
175
  for (const lineGroup of lineGroups) {
175
176
  if (lineGroup instanceof Course.LineGroup) {
176
177
  if (lineGroup.lines.length === 0) continue;
@@ -283,22 +284,22 @@ export class Course {
283
284
 
284
285
  bar.pushItem(...items);
285
286
  }
286
- bars.push(bar);
287
+ noteGroups.push(bar);
287
288
  }
288
289
  else {
289
290
  const branch = new Branch(lineGroup.type, lineGroup.criteria, math.fraction(currentTiming), math.fraction(currentTiming));
290
291
  let result;
291
292
  if (lineGroup.normal) {
292
- result = this.convertLineGroupToBar(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
293
- branch.normal = result.bars;
293
+ result = this.convertLineGroupToNoteGroup(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
294
+ branch.normal = result.noteGroups as Bar[];
294
295
  }
295
296
  if (lineGroup.advanced) {
296
- result = this.convertLineGroupToBar(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
297
- branch.advanced = result.bars;
297
+ result = this.convertLineGroupToNoteGroup(lineGroup.advanced, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
298
+ branch.advanced = result.noteGroups as Bar[];
298
299
  }
299
300
  if (lineGroup.master) {
300
- result = this.convertLineGroupToBar(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
301
- branch.master = result.bars;
301
+ result = this.convertLineGroupToNoteGroup(lineGroup.master, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
302
+ branch.master = result.noteGroups as Bar[];
302
303
  }
303
304
 
304
305
  if (result) {
@@ -308,12 +309,12 @@ export class Course {
308
309
  barlineHidden = result.barlineHidden;
309
310
  branch.setEnd(result.currentTiming);
310
311
  }
311
- bars.push(branch);
312
+ noteGroups.push(branch);
312
313
  }
313
314
  }
314
315
 
315
316
  return {
316
- bars,
317
+ noteGroups,
317
318
  getNextBalloon,
318
319
  currentBPM,
319
320
  currentTiming,
@@ -325,7 +326,7 @@ export class Course {
325
326
 
326
327
  difficulty: Difficulty;
327
328
  metadata: Course.Metadata;
328
- bars: Bar[] = [];
329
+ noteGroups: NoteGroup[] = [];
329
330
  song?: Song;
330
331
 
331
332
  constructor(difficulty: Difficulty, metadata: Course.Metadata, song?: Song) {
@@ -350,8 +351,8 @@ export class Course {
350
351
  return Number(this.metadata.level) || 1;
351
352
  }
352
353
 
353
- pushBar(...bars: Bar[]) {
354
- this.bars.push(...bars);
354
+ pushNoteGroups(...noteGroups: NoteGroup[]) {
355
+ this.noteGroups.push(...noteGroups);
355
356
  }
356
357
 
357
358
  getBalloon() {
@@ -373,7 +374,7 @@ export class Course {
373
374
  return {
374
375
  metadata: this.metadata,
375
376
  difficulty: this.difficulty,
376
- bars: this.bars
377
+ noteGroups: this.noteGroups
377
378
  }
378
379
  }
379
380
  }
package/src/class/NoteGroup.ts ADDED
@@ -0,0 +1,24 @@
1
+ import * as math from 'mathjs';
2
+
3
+ export abstract class NoteGroup {
4
+ private start: math.Fraction;
5
+ private end: math.Fraction;
6
+
7
+ constructor(start: math.Fraction, end: math.Fraction) {
8
+ this.start = start;
9
+ this.end = end;
10
+ }
11
+
12
+ getStart() {
13
+ return math.fraction(this.start);
14
+ }
15
+ setStart(start: math.Fraction) {
16
+ this.start = math.fraction(start);
17
+ }
18
+ getEnd() {
19
+ return math.fraction(this.end);
20
+ }
21
+ setEnd(end: math.Fraction) {
22
+ this.end = math.fraction(end);
23
+ }
24
+ }
package/src/index.ts CHANGED
@@ -4,6 +4,7 @@ export * from './class/Command.js';
4
4
  export * from './class/Course.js';
5
5
  export * from './class/Item.js';
6
6
  export * from './class/Note.js';
7
+ export * from './class/NoteGroup.js';
7
8
  export * from './class/Song.js';
8
9
 
9
10
  export * from './exception/ParseException.js';