tja-parser 0.2.7 → 0.2.9

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 (20) hide show
  1. package/dist/class/Bar.d.ts.map +1 -1
  2. package/dist/class/Bar.js +1 -2
  3. package/dist/class/Bar.js.map +1 -1
  4. package/dist/class/Branch.d.ts +1 -10
  5. package/dist/class/Branch.d.ts.map +1 -1
  6. package/dist/class/Branch.js +1 -2
  7. package/dist/class/Branch.js.map +1 -1
  8. package/dist/class/Course.d.ts +2 -0
  9. package/dist/class/Course.d.ts.map +1 -1
  10. package/dist/class/Course.js +18 -1
  11. package/dist/class/Course.js.map +1 -1
  12. package/dist/class/NoteGroup.d.ts +2 -0
  13. package/dist/class/NoteGroup.d.ts.map +1 -1
  14. package/dist/class/NoteGroup.js +11 -0
  15. package/dist/class/NoteGroup.js.map +1 -1
  16. package/package.json +2 -2
  17. package/src/class/Bar.ts +1 -2
  18. package/src/class/Branch.ts +1 -2
  19. package/src/class/Course.ts +18 -1
  20. package/src/class/NoteGroup.ts +12 -0
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,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,UAAU;IAKV,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"}
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;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,UAAU;IAKV,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;CAShB"}
package/dist/class/Bar.js CHANGED
@@ -91,8 +91,7 @@ class Bar extends NoteGroup_js_1.NoteGroup {
91
91
  }
92
92
  toJSON() {
93
93
  return {
94
- start: this.getStart().valueOf(),
95
- end: this.getEnd().valueOf(),
94
+ ...super.toJSON(),
96
95
  items: this.items,
97
96
  notes: this.notes,
98
97
  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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,UAAU;QACN,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACvB,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;AAlED,kBAkEC"}
1
+ {"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,UAAU;QACN,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACvB,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,GAAG,KAAK,CAAC,MAAM,EAAE;YACjB,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;AAjED,kBAiEC"}
package/dist/class/Branch.d.ts CHANGED
@@ -8,16 +8,7 @@ export declare class Branch extends NoteGroup {
8
8
  advanced?: Bar[];
9
9
  master?: Bar[];
10
10
  constructor(type: Branch.Type, criteria1: [number, number], start: math.Fraction, end: math.Fraction);
11
- toJSON(): {
12
- start: number;
13
- end: number;
14
- normal: Bar[] | undefined;
15
- advanced: Bar[] | undefined;
16
- master: Bar[] | undefined;
17
- criteria: [number, number];
18
- type: string;
19
- branchType: string;
20
- };
11
+ toJSON(): any;
21
12
  }
22
13
  export declare namespace Branch {
23
14
  enum Type {
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;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"}
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;CAWT;AAED,yBAAiB,MAAM,CAAC;IACpB,KAAY,IAAI;QAAG,IAAI,IAAA;QAAE,QAAQ,IAAA;KAAE;CACtC"}
package/dist/class/Branch.js CHANGED
@@ -15,8 +15,7 @@ class Branch extends NoteGroup_js_1.NoteGroup {
15
15
  }
16
16
  toJSON() {
17
17
  return {
18
- start: this.getStart().valueOf(),
19
- end: this.getEnd().valueOf(),
18
+ ...super.toJSON(),
20
19
  normal: this.normal,
21
20
  advanced: this.advanced,
22
21
  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":";;;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"}
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,GAAG,KAAK,CAAC,MAAM,EAAE;YACjB,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;AAxBD,wBAwBC;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
@@ -31,6 +31,7 @@ export declare namespace Course {
31
31
  }
32
32
  class LineGroup {
33
33
  lines: string[];
34
+ sectionCommand: boolean;
34
35
  add(line: string): void;
35
36
  }
36
37
  class BranchedLineGroup {
@@ -39,6 +40,7 @@ export declare namespace Course {
39
40
  normal?: LineGroup[];
40
41
  advanced?: LineGroup[];
41
42
  master?: LineGroup[];
43
+ sectionCommand: boolean;
42
44
  constructor(type: Branch.Type, criteria: [number, number]);
43
45
  addNormal(lineGroup: LineGroup): void;
44
46
  addAdvanced(lineGroup: LineGroup): void;
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;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;IAqCvB,OAAO,CAAC,MAAM,CAAC,UAAU;IA6EzB,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAyM1C,OAAO,CAAC,MAAM,CAAC,UAAU;IA0BzB,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"}
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;IAqCvB,OAAO,CAAC,MAAM,CAAC,UAAU;IAyFzB,OAAO,CAAC,MAAM,CAAC,2BAA2B;IA4M1C,OAAO,CAAC,MAAM,CAAC,UAAU;IA0BzB,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,cAAc,EAAE,OAAO,CAAS;QAChC,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;QACrB,cAAc,EAAE,OAAO,CAAS;oBAEpB,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
@@ -120,6 +120,7 @@ class Course {
120
120
  let currentBar = null;
121
121
  let currentBranchedLineGroup = null;
122
122
  let currentCourse = null;
123
+ let sectionCommand = false;
123
124
  for (const line of lines) {
124
125
  if (line === "#START")
125
126
  continue;
@@ -127,10 +128,14 @@ class Course {
127
128
  break;
128
129
  if (line.startsWith("#BRANCHSTART")) {
129
130
  const branchRawDatas = line.replaceAll('#BRANCHSTART', '').split(',').map(e => e.trim());
130
- const type = branchRawDatas[0] === "r" ? Branch_js_1.Branch.Type.ROLL : Branch_js_1.Branch.Type.ACCURACY;
131
+ const type = branchRawDatas[0] === "p" ? Branch_js_1.Branch.Type.ROLL : Branch_js_1.Branch.Type.ACCURACY;
131
132
  const criteria = [Number(branchRawDatas[1]) || 0, Number(branchRawDatas[2]) || 0];
132
133
  currentCourse = null;
133
134
  currentBranchedLineGroup = new BranchedLineGroup(type, criteria);
135
+ if (sectionCommand) {
136
+ currentBranchedLineGroup.sectionCommand = sectionCommand;
137
+ sectionCommand = false;
138
+ }
134
139
  currentBar = new LineGroup();
135
140
  bars.push(currentBranchedLineGroup);
136
141
  }
@@ -154,11 +159,18 @@ class Course {
154
159
  currentBar = new LineGroup();
155
160
  currentBranchedLineGroup?.addMaster(currentBar);
156
161
  }
162
+ else if (line === "#SECTION") {
163
+ sectionCommand = true;
164
+ }
157
165
  else {
158
166
  if (!currentBar) {
159
167
  currentBar = new LineGroup();
160
168
  bars.push(currentBar);
161
169
  }
170
+ if (sectionCommand) {
171
+ currentBar.sectionCommand = true;
172
+ sectionCommand = false;
173
+ }
162
174
  currentBar.add(line);
163
175
  if (line.endsWith(',')) {
164
176
  if (!currentCourse) {
@@ -192,6 +204,7 @@ class Course {
192
204
  if (lineGroup.lines.length === 0)
193
205
  continue;
194
206
  const bar = new Bar_js_1.Bar(math.fraction(currentTiming), math.fraction(currentTiming));
207
+ bar.sectionCommand = lineGroup.sectionCommand;
195
208
  let noteCount = 0;
196
209
  let items = [];
197
210
  for (const line of lineGroup.lines) {
@@ -322,6 +335,7 @@ class Course {
322
335
  }
323
336
  else {
324
337
  const branch = new Branch_js_1.Branch(lineGroup.type, lineGroup.criteria, math.fraction(currentTiming), math.fraction(currentTiming));
338
+ branch.sectionCommand = lineGroup.sectionCommand;
325
339
  let result;
326
340
  if (lineGroup.normal) {
327
341
  result = this.convertLineGroupToNoteGroup(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
@@ -339,6 +353,7 @@ class Course {
339
353
  currentBPM = result.currentBPM;
340
354
  currentTiming = result.currentTiming;
341
355
  currentMeasure = result.currentMeasure;
356
+ currentScroll = result.currentScroll;
342
357
  barlineHidden = result.barlineHidden;
343
358
  branch.setEnd(result.currentTiming);
344
359
  }
@@ -425,6 +440,7 @@ exports.Course = Course;
425
440
  Course.Metadata = Metadata;
426
441
  class LineGroup {
427
442
  lines = [];
443
+ sectionCommand = false;
428
444
  add(line) {
429
445
  this.lines.push(line);
430
446
  }
@@ -436,6 +452,7 @@ exports.Course = Course;
436
452
  normal;
437
453
  advanced;
438
454
  master;
455
+ sectionCommand = false;
439
456
  constructor(type, criteria) {
440
457
  this.type = type;
441
458
  this.criteria = criteria;
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 CHANGED
@@ -2,10 +2,12 @@ import * as math from 'mathjs';
2
2
  export declare abstract class NoteGroup {
3
3
  private start;
4
4
  private end;
5
+ sectionCommand: boolean;
5
6
  constructor(start: math.Fraction, end: math.Fraction);
6
7
  getStart(): math.Fraction;
7
8
  setStart(start: math.Fraction): void;
8
9
  getEnd(): math.Fraction;
9
10
  setEnd(end: math.Fraction): void;
11
+ toJSON(): any;
10
12
  }
11
13
  //# sourceMappingURL=NoteGroup.d.ts.map
package/dist/class/NoteGroup.d.ts.map CHANGED
@@ -1 +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"}
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;IAC3B,cAAc,EAAE,OAAO,CAAS;gBAEpB,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;IAIzB,MAAM;CAUT"}
package/dist/class/NoteGroup.js CHANGED
@@ -38,6 +38,7 @@ const math = __importStar(require("mathjs"));
38
38
  class NoteGroup {
39
39
  start;
40
40
  end;
41
+ sectionCommand = false;
41
42
  constructor(start, end) {
42
43
  this.start = start;
43
44
  this.end = end;
@@ -54,6 +55,16 @@ class NoteGroup {
54
55
  setEnd(end) {
55
56
  this.end = math.fraction(end);
56
57
  }
58
+ toJSON() {
59
+ const ob = {
60
+ start: this.getStart().valueOf(),
61
+ end: this.getEnd().valueOf(),
62
+ };
63
+ if (this.sectionCommand) {
64
+ ob.sectionCommand = true;
65
+ }
66
+ return ob;
67
+ }
57
68
  }
58
69
  exports.NoteGroup = NoteGroup;
59
70
  //# sourceMappingURL=NoteGroup.js.map
package/dist/class/NoteGroup.js.map CHANGED
@@ -1 +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"}
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;IAC3B,cAAc,GAAY,KAAK,CAAC;IAEhC,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;IAED,MAAM;QACF,MAAM,EAAE,GAAQ;YACZ,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE;YAChC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;SAC/B,CAAA;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,EAAE,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAjCD,8BAiCC"}
package/package.json CHANGED
@@ -3,13 +3,13 @@
3
3
  "author": {
4
4
  "name": "hotsixman"
5
5
  },
6
- "version": "0.2.7",
6
+ "version": "0.2.9",
7
7
  "dependencies": {
8
8
  "mathjs": "^15.1.0"
9
9
  },
10
10
  "main": "./dist/index.js",
11
11
  "devDependencies": {
12
- "@types/bun": "^1.3.4",
12
+ "@types/bun": "^1.3.10",
13
13
  "@types/node": "^25.0.0"
14
14
  }
15
15
  }
package/src/class/Bar.ts CHANGED
@@ -62,8 +62,7 @@ export class Bar extends NoteGroup {
62
62
 
63
63
  toJSON(): any {
64
64
  return {
65
- start: this.getStart().valueOf(),
66
- end: this.getEnd().valueOf(),
65
+ ...super.toJSON(),
67
66
  items: this.items,
68
67
  notes: this.notes,
69
68
  commands: this.commands,
package/src/class/Branch.ts CHANGED
@@ -17,8 +17,7 @@ export class Branch extends NoteGroup {
17
17
 
18
18
  toJSON() {
19
19
  return {
20
- start: this.getStart().valueOf(),
21
- end: this.getEnd().valueOf(),
20
+ ...super.toJSON(),
22
21
  normal: this.normal,
23
22
  advanced: this.advanced,
24
23
  master: this.master,
package/src/class/Course.ts CHANGED
@@ -108,17 +108,22 @@ export class Course {
108
108
  let currentBar: LineGroup | null = null;
109
109
  let currentBranchedLineGroup: BranchedLineGroup | null = null;
110
110
  let currentCourse: 'normal' | 'advanced' | 'master' | null = null;
111
+ let sectionCommand = false;
111
112
  for (const line of lines) {
112
113
  if (line === "#START") continue;
113
114
  if (line === "#END") break;
114
115
 
115
116
  if (line.startsWith("#BRANCHSTART")) {
116
117
  const branchRawDatas = line.replaceAll('#BRANCHSTART', '').split(',').map(e => e.trim()) as [string, string, string];
117
- const type = branchRawDatas[0] === "r" ? Branch.Type.ROLL : Branch.Type.ACCURACY;
118
+ const type = branchRawDatas[0] === "p" ? Branch.Type.ROLL : Branch.Type.ACCURACY;
118
119
  const criteria: [number, number] = [Number(branchRawDatas[1]) || 0, Number(branchRawDatas[2]) || 0];
119
120
 
120
121
  currentCourse = null;
121
122
  currentBranchedLineGroup = new BranchedLineGroup(type, criteria);
123
+ if(sectionCommand){
124
+ currentBranchedLineGroup.sectionCommand = sectionCommand;
125
+ sectionCommand = false;
126
+ }
122
127
  currentBar = new LineGroup();
123
128
  bars.push(currentBranchedLineGroup);
124
129
  }
@@ -142,11 +147,18 @@ export class Course {
142
147
  currentBar = new LineGroup();
143
148
  currentBranchedLineGroup?.addMaster(currentBar);
144
149
  }
150
+ else if (line === "#SECTION"){
151
+ sectionCommand = true;
152
+ }
145
153
  else {
146
154
  if (!currentBar) {
147
155
  currentBar = new LineGroup();
148
156
  bars.push(currentBar);
149
157
  }
158
+ if(sectionCommand){
159
+ currentBar.sectionCommand = true;
160
+ sectionCommand = false;
161
+ }
150
162
  currentBar.add(line);
151
163
  if (line.endsWith(',')) {
152
164
  if (!currentCourse) {
@@ -205,6 +217,7 @@ export class Course {
205
217
  if (lineGroup.lines.length === 0) continue;
206
218
 
207
219
  const bar = new Bar(math.fraction(currentTiming), math.fraction(currentTiming));
220
+ bar.sectionCommand = lineGroup.sectionCommand;
208
221
  let noteCount = 0;
209
222
  let items: Item[] = [];
210
223
  for (const line of lineGroup.lines) {
@@ -337,6 +350,7 @@ export class Course {
337
350
  }
338
351
  else {
339
352
  const branch = new Branch(lineGroup.type, lineGroup.criteria, math.fraction(currentTiming), math.fraction(currentTiming));
353
+ branch.sectionCommand = lineGroup.sectionCommand;
340
354
  let result;
341
355
  if (lineGroup.normal) {
342
356
  result = this.convertLineGroupToNoteGroup(lineGroup.normal, getNextBalloon, currentBPM, currentTiming, currentMeasure, currentScroll, barlineHidden);
@@ -355,6 +369,7 @@ export class Course {
355
369
  currentBPM = result.currentBPM;
356
370
  currentTiming = result.currentTiming;
357
371
  currentMeasure = result.currentMeasure;
372
+ currentScroll = result.currentScroll;
358
373
  barlineHidden = result.barlineHidden;
359
374
  branch.setEnd(result.currentTiming);
360
375
  }
@@ -465,6 +480,7 @@ export namespace Course {
465
480
 
466
481
  export class LineGroup {
467
482
  lines: string[] = [];
483
+ sectionCommand: boolean = false;
468
484
  add(line: string) {
469
485
  this.lines.push(line);
470
486
  }
@@ -475,6 +491,7 @@ export namespace Course {
475
491
  normal?: LineGroup[];
476
492
  advanced?: LineGroup[];
477
493
  master?: LineGroup[];
494
+ sectionCommand: boolean = false;
478
495
 
479
496
  constructor(type: Branch.Type, criteria: [number, number]) {
480
497
  this.type = type;
package/src/class/NoteGroup.ts CHANGED
@@ -3,6 +3,7 @@ import * as math from 'mathjs';
3
3
  export abstract class NoteGroup {
4
4
  private start: math.Fraction;
5
5
  private end: math.Fraction;
6
+ sectionCommand: boolean = false;
6
7
 
7
8
  constructor(start: math.Fraction, end: math.Fraction) {
8
9
  this.start = start;
@@ -21,4 +22,15 @@ export abstract class NoteGroup {
21
22
  setEnd(end: math.Fraction) {
22
23
  this.end = math.fraction(end);
23
24
  }
25
+
26
+ toJSON() {
27
+ const ob: any = {
28
+ start: this.getStart().valueOf(),
29
+ end: this.getEnd().valueOf(),
30
+ }
31
+ if (this.sectionCommand) {
32
+ ob.sectionCommand = true;
33
+ }
34
+ return ob;
35
+ }
24
36
  }