elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-27 13:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

better number support in tonal functions

Browse Source
This commit is contained in:
Felix Roos 2022-02-20 20:47:59 +01:00
parent f8df4b485d
commit 74040e52b4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
repl/src/tonal.ts
View File

@ -4,12 +4,12 @@ import { Pattern as _Pattern } from '../../strudel.mjs';
const Pattern = _Pattern as any; const Pattern = _Pattern as any;
export declare interface NoteEvent { export declare interface NoteEvent {
value: string; value: string | number;
scale?: string; scale?: string;
} }
function toNoteEvent(event: string | NoteEvent): NoteEvent { function toNoteEvent(event: string | NoteEvent): NoteEvent {
if (typeof event === 'string') { if (typeof event === 'string' || typeof event === 'number') {
return { value: event }; return { value: event };
} }
if (event.value) { if (event.value) {
@ -73,6 +73,10 @@ Pattern.prototype._transpose = function (intervalOrSemitones: string | number) {
const interval = !isNaN(Number(intervalOrSemitones)) const interval = !isNaN(Number(intervalOrSemitones))
? Interval.fromSemitones(intervalOrSemitones as number) ? Interval.fromSemitones(intervalOrSemitones as number)
: String(intervalOrSemitones); : String(intervalOrSemitones);
if (typeof value === 'number') {
const semitones = typeof interval === 'string' ? Interval.semitones(interval) || 0 : interval;
return { value: value + semitones };
}
return { value: Note.transpose(value, interval), scale }; return { value: Note.transpose(value, interval), scale };
}); });
}; };
@ -86,7 +90,10 @@ Pattern.prototype._transpose = function (intervalOrSemitones: string | number) {
Pattern.prototype._scaleTranspose = function (offset: number | string) { Pattern.prototype._scaleTranspose = function (offset: number | string) {
return this._mapNotes(({ value, scale }: NoteEvent) => { return this._mapNotes(({ value, scale }: NoteEvent) => {
if (!scale) { if (!scale) {
throw new Error('can only use scaleOffset after .scale'); throw new Error('can only use scaleTranspose after .scale');
}
if (typeof value !== 'string') {
throw new Error('can only use scaleTranspose with notes');
} }
return { value: scaleTranspose(scale, Number(offset), value), scale }; return { value: scaleTranspose(scale, Number(offset), value), scale };
}); });