tblswvs 0.21.0 → 0.21.2
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.
- package/lib/es5/key.js +4 -4
- package/lib/es5/key.js.map +1 -1
- package/lib/es5/mode.js +1 -1
- package/lib/es5/mode.js.map +1 -1
- package/lib/es6/key.js +4 -4
- package/lib/es6/key.js.map +1 -1
- package/lib/es6/mode.js +1 -1
- package/lib/es6/mode.js.map +1 -1
- package/package.json +1 -1
package/lib/es5/key.js
CHANGED
|
@@ -67,7 +67,7 @@ class Key {
|
|
|
67
67
|
*/
|
|
68
68
|
let midiTransposition = (octaveTransposition == undefined ? 0 : octaveTransposition * 12) + this.midiTonic + (this.octave * 12) + 24;
|
|
69
69
|
if (degree < 0)
|
|
70
|
-
midiTransposition += (Math.
|
|
70
|
+
midiTransposition += (Math.floor(degree / this.mode.scaleOffsets.length) * 12);
|
|
71
71
|
else
|
|
72
72
|
midiTransposition += (Math.floor((degree - 1) / this.mode.scaleOffsets.length) * 12);
|
|
73
73
|
let midi = noteData.chordTypes[quality].intervals.reduce((midiNotes, intv) => {
|
|
@@ -85,7 +85,7 @@ class Key {
|
|
|
85
85
|
};
|
|
86
86
|
}
|
|
87
87
|
midi2note(midiNoteNumber) {
|
|
88
|
-
const normalizedNumber = midiNoteNumber % 12;
|
|
88
|
+
const normalizedNumber = midiNoteNumber % 12 - this.midiTonic;
|
|
89
89
|
const normalizedIndex = this.mode.scaleOffsets.indexOf(normalizedNumber);
|
|
90
90
|
if (normalizedIndex != -1) {
|
|
91
91
|
return this.scaleNotes[normalizedIndex] + noteData.noteData[midiNoteNumber].octave;
|
|
@@ -130,8 +130,8 @@ _Key_instances = new WeakSet(), _Key_negativeDegree = function _Key_negativeDegr
|
|
|
130
130
|
return degree;
|
|
131
131
|
}, _Key_calculateChordRoot = function _Key_calculateChordRoot(chordMidi, chordQuality) {
|
|
132
132
|
let inversion = chordQuality.split("/")[1];
|
|
133
|
-
if (inversion
|
|
134
|
-
return this.midi2note(chordMidi[0]).replace(/[0-9]/g, "");
|
|
133
|
+
if (inversion === undefined) {
|
|
134
|
+
return this.midi2note(chordMidi[0]).replace(/[0-9\-]/g, "");
|
|
135
135
|
}
|
|
136
136
|
else if (inversion == "2" || inversion == "3" || inversion == "4") {
|
|
137
137
|
return this.midi2note(chordMidi[2]).replace(/[0-9]/g, "");
|
package/lib/es5/key.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/key.ts"],"names":[],"mappings":";;;;;;;;;AAAA,iCAAqC;AACrC,wCAAwC;AACxC,qCAAqC;AACrC,mDAA+C;AAG/C,MAAa,GAAG;IAcZ,YAAY,KAAwB,EAAE,KAAY;;QAC9C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAI,IAAI,WAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,OAAO,KAAK,IAAI,QAAQ,EAAE;YAC1B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACnB;aAAM;YACH,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,SAAS,GAAG,KAAK,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;SACjD;QACD,IAAI,CAAC,SAAS,GAAG,YAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,CAAA;QAC7C,IAAI,CAAC,UAAU,GAAG,uBAAA,IAAI,gDAAqB,MAAzB,IAAI,CAAuB,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,uBAAA,IAAI,gDAAqB,MAAzB,IAAI,CAAuB,CAAC;QAC9C,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAGD,MAAM,CAAC,CAAS,EAAE,eAAwB;QACtC,IAAI,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,4BAAY,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAE/D,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,uBAAA,IAAI,2CAAgB,MAApB,IAAI,EAAiB,CAAC,EAAE,eAAe,CAAC,CAAC;QAE3D,uGAAuG;QACvG,IAAI,YAAY,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC9E,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,YAAY,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;QACvH,IAAI,MAAM,qBAAQ,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAE,CAAC;QACjD,oHAAoH;QACpH,kCAAkC;QAClC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChE,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC;QACvB,IAAI,eAAe,IAAI,SAAS,EAAE;YAC9B,MAAM,CAAC,MAAM,IAAI,eAAe,CAAC;YACjC,MAAM,CAAC,IAAI,IAAM,CAAC,eAAe,GAAG,EAAE,CAAC,CAAC;SAC3C;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IA4BD,KAAK,CAAC,MAAc,EAAE,IAAY,EAAE,mBAA4B;QAC5D,IAAI,MAAM,IAAI,CAAC;YAAE,MAAM,IAAI,4BAAY,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAEpE,IAAI,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YACd,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/H,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAEhH;;;;;WAKG;QACH,IAAI,iBAAiB,GAAG,CAAC,mBAAmB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;QACrI,IAAI,MAAM,GAAG,CAAC;YACV,iBAAiB,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/key.ts"],"names":[],"mappings":"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"}
|
package/lib/es5/mode.js
CHANGED
|
@@ -73,7 +73,7 @@ _Mode_instances = new WeakSet(), _Mode_offsetsScaleDegreeMapping = function _Mod
|
|
|
73
73
|
}
|
|
74
74
|
else if (scale == Scale.Diminished) {
|
|
75
75
|
stepOffsets = Mode.DIMINISHED_OFFSETS;
|
|
76
|
-
scaleDegreeMapping = [1, 2, 3, 4, 5, 6, 7
|
|
76
|
+
scaleDegreeMapping = [1, 2, 3, 4, 5, 5.5, 6, 7];
|
|
77
77
|
}
|
|
78
78
|
else if (scale == Scale.Chromatic) {
|
|
79
79
|
stepOffsets = Mode.CHROMATIC_OFFSETS;
|
package/lib/es5/mode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../../src/mode.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../../src/mode.ts"],"names":[],"mappings":"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"}
|
package/lib/es6/key.js
CHANGED
|
@@ -64,7 +64,7 @@ export class Key {
|
|
|
64
64
|
*/
|
|
65
65
|
let midiTransposition = (octaveTransposition == undefined ? 0 : octaveTransposition * 12) + this.midiTonic + (this.octave * 12) + 24;
|
|
66
66
|
if (degree < 0)
|
|
67
|
-
midiTransposition += (Math.
|
|
67
|
+
midiTransposition += (Math.floor(degree / this.mode.scaleOffsets.length) * 12);
|
|
68
68
|
else
|
|
69
69
|
midiTransposition += (Math.floor((degree - 1) / this.mode.scaleOffsets.length) * 12);
|
|
70
70
|
let midi = noteData.chordTypes[quality].intervals.reduce((midiNotes, intv) => {
|
|
@@ -82,7 +82,7 @@ export class Key {
|
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
84
|
midi2note(midiNoteNumber) {
|
|
85
|
-
const normalizedNumber = midiNoteNumber % 12;
|
|
85
|
+
const normalizedNumber = midiNoteNumber % 12 - this.midiTonic;
|
|
86
86
|
const normalizedIndex = this.mode.scaleOffsets.indexOf(normalizedNumber);
|
|
87
87
|
if (normalizedIndex != -1) {
|
|
88
88
|
return this.scaleNotes[normalizedIndex] + noteData.noteData[midiNoteNumber].octave;
|
|
@@ -126,8 +126,8 @@ _Key_instances = new WeakSet(), _Key_negativeDegree = function _Key_negativeDegr
|
|
|
126
126
|
return degree;
|
|
127
127
|
}, _Key_calculateChordRoot = function _Key_calculateChordRoot(chordMidi, chordQuality) {
|
|
128
128
|
let inversion = chordQuality.split("/")[1];
|
|
129
|
-
if (inversion
|
|
130
|
-
return this.midi2note(chordMidi[0]).replace(/[0-9]/g, "");
|
|
129
|
+
if (inversion === undefined) {
|
|
130
|
+
return this.midi2note(chordMidi[0]).replace(/[0-9\-]/g, "");
|
|
131
131
|
}
|
|
132
132
|
else if (inversion == "2" || inversion == "3" || inversion == "4") {
|
|
133
133
|
return this.midi2note(chordMidi[2]).replace(/[0-9]/g, "");
|
package/lib/es6/key.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/key.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/key.ts"],"names":[],"mappings":"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"}
|
package/lib/es6/mode.js
CHANGED
|
@@ -69,7 +69,7 @@ _Mode_instances = new WeakSet(), _Mode_offsetsScaleDegreeMapping = function _Mod
|
|
|
69
69
|
}
|
|
70
70
|
else if (scale == Scale.Diminished) {
|
|
71
71
|
stepOffsets = Mode.DIMINISHED_OFFSETS;
|
|
72
|
-
scaleDegreeMapping = [1, 2, 3, 4, 5, 6, 7
|
|
72
|
+
scaleDegreeMapping = [1, 2, 3, 4, 5, 5.5, 6, 7];
|
|
73
73
|
}
|
|
74
74
|
else if (scale == Scale.Chromatic) {
|
|
75
75
|
stepOffsets = Mode.CHROMATIC_OFFSETS;
|
package/lib/es6/mode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../../src/mode.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AAGrC,MAAM,CAAN,IAAY,KAgBX;AAhBD,WAAY,KAAK;IACb,qCAAM,CAAA;IACN,qCAAM,CAAA;IACN,yCAAQ,CAAA;IACR,qCAAM,CAAA;IACN,6CAAU,CAAA;IACV,uCAAO,CAAA;IACP,uCAAO,CAAA;IACP,mCAAK,CAAA;IACL,mCAAK,CAAA;IACL,mDAAa,CAAA;IACb,oDAAa,CAAA;IACb,4CAAS,CAAA;IACT,8CAAU,CAAA;IACV,4CAAS,CAAA;IACT,8BAAE,CAAA;AACN,CAAC,EAhBW,KAAK,KAAL,KAAK,QAgBhB;AAGD,MAAM,OAAO,IAAI;IA4Bb,YAAY,KAAY;;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAEzB,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,uBAAA,IAAI,wDAA2B,MAA/B,IAAI,EAA4B,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9D,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAmCS,MAAM,CAAC,kBAAkB,CAAC,WAAqB;QACrD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,kBAA4B,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;YAClE,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/E,OAAO,kBAAkB,CAAC;QAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAGS,MAAM,CAAC,cAAc,CAAC,WAAqB;QAEjD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,UAAoB,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;YAC1D,MAAM,OAAO,GAAU,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,aAAa,GAAI,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YACtE,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YAEtE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACpF,OAAO,UAAU,CAAC;QACtB,CAAC,EAAE,EAAE,CAAC,CAAA;IACV,CAAC;;4GAlD0B,KAAY;IACnC,IAAI,MAAM,EAAE,WAAW,EAAE,kBAAkB,GAAa,IAAI,KAAK,EAAE,CAAC;IAEpE,MAAM,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IACvF,MAAM,GAAG,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;IAExF,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC/D,IAAI,KAAK,IAAI,KAAK,CAAC,aAAa,EAAE;QAC9B,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7B,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KACxC;SAAM,IAAI,KAAK,IAAI,KAAK,CAAC,aAAa,EAAE;QACrC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7B,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KACxC;SAAM,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,EAAE;QACjC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACtC,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KAC3C;SAAM,IAAI,KAAK,IAAI,KAAK,CAAC,UAAU,EAAE;QAClC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACtC,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"mode.js","sourceRoot":"","sources":["../../../src/mode.ts"],"names":[],"mappings":"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"}
|