From 74040e52b44bb2753a07d407fb637fff6b5e9d9c Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Sun, 20 Feb 2022 20:47:59 +0100 Subject: [PATCH] better number support in tonal functions --- repl/src/tonal.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/repl/src/tonal.ts b/repl/src/tonal.ts index 918edc4a..4f864cd8 100644 --- a/repl/src/tonal.ts +++ b/repl/src/tonal.ts @@ -4,12 +4,12 @@ import { Pattern as _Pattern } from '../../strudel.mjs'; const Pattern = _Pattern as any; export declare interface NoteEvent { - value: string; + value: string | number; scale?: string; } function toNoteEvent(event: string | NoteEvent): NoteEvent { - if (typeof event === 'string') { + if (typeof event === 'string' || typeof event === 'number') { return { value: event }; } if (event.value) { @@ -73,6 +73,10 @@ Pattern.prototype._transpose = function (intervalOrSemitones: string | number) { const interval = !isNaN(Number(intervalOrSemitones)) ? Interval.fromSemitones(intervalOrSemitones as number) : 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 }; }); }; @@ -86,7 +90,10 @@ Pattern.prototype._transpose = function (intervalOrSemitones: string | number) { Pattern.prototype._scaleTranspose = function (offset: number | string) { return this._mapNotes(({ value, scale }: NoteEvent) => { 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 }; });