chore: remove circular dependencies

Author: ricardomatias

docs/js/docma-web.js

@@ -15,7 +15,6 @@ import { Sharp, Sharps, Flats, Enharmonics, DiatonicNote, DiatonicNotes, NoteSym
 import { isDefined, isNumber, isUndefined } from '../utils/types-guards';
 import { PlayaError } from '../utils/error';
 import { Interval, Semitones } from '../constants';
-import { fromSemitones } from '../tools/interval';
 
 export type NoteLike = string | number | Note | NoteSymbol;
 
@@ -515,9 +514,15 @@ export class Note {
 		const base = findCMidiByOctave(octave);
 		const c = new Note('C', base);
 
-		const interval = fromSemitones(midi - base)?.[0] as Interval;
+		const semitones = midi - base;
+		let interval: Interval | undefined;
 
-		return Note.transposeUp(c, interval);
+		for (const [interv, semit] of Object.entries(Semitones)) {
+			if (semit === semitones) {
+				interval = interv as Interval;
+			}
+		}
+		return Note.transposeUp(c, interval!);
 	}
 
 	/**
@@ -536,6 +541,19 @@ export class Note {
 		return Array.from({ length: h.midi - l.midi }).map((_, i) => new Note(l.midi + i).ensureType(NoteType.Sharp));
 	}
 
+	static isNoteLike = (note: unknown): note is NoteLike => {
+		try {
+			new Note(<NoteLike>note);
+
+			return true;
+		} catch {
+			return false;
+		}
+	};
+
+	static isNoteSymbol = (note: NoteLike): note is NoteSymbol =>
+		!(note instanceof Note) && typeof note !== 'number' && !isPitch(note);
+
 	/**
 	 * Tries to find the enharmonic of the note
 	 * @private

lib/core/Note.ts

@@ -1,6 +1,5 @@
 import { Note, NoteLike } from '../core/Note';
 import { DiatonicNotes, DiatonicNote } from '../constants';
-import { isNoteSymbol } from '../utils/note';
 
 /**
  * Note distance functions
@@ -48,7 +47,7 @@ export const semitones = (a: NoteLike, b: NoteLike): number => {
 		posB = 12 + (posB % 12);
 	}
 
-	if (isNoteSymbol(a) && isNoteSymbol(b)) {
+	if (Note.isNoteSymbol(a) && Note.isNoteSymbol(b)) {
 		posA = Note.position(noteA);
 		posB = Note.position(noteB);
 	}

lib/tools/distance.ts

@@ -1,7 +1,6 @@
 import * as R from 'ramda';
 import { Interval, Semitones } from '../constants';
 import { Note, NoteLike } from '../core/Note';
-import { isNoteLike } from '../utils/note';
 import { isNotNull } from '../utils/types-guards';
 import { naturalPosition, semitones } from './distance';
 
@@ -214,7 +213,7 @@ export const between = (a: NoteLike, b: NoteLike): Interval | null => {
  * @return {string}
  */
 export const detect = (notes: string): Interval[] | null => {
-	const arr = notes.split(' ').filter((note) => isNoteLike(note)) as NoteLike[];
+	const arr = notes.split(' ').filter((note) => Note.isNoteLike(note)) as NoteLike[];
 
 	if (arr.some((note) => !note)) {
 		return [];

lib/tools/interval.ts

@@ -36,18 +36,6 @@ export const stripOctave = (note: string): NoteSymbol => <NoteSymbol>note.replac
 
 export const isPitch = (note: Exclude<NoteLike, Note | number>): boolean => new RegExp(OCTAVE_REGEXP).test(note);
 
-export const isNoteSymbol = (note: NoteLike): note is NoteSymbol =>
-	!(note instanceof Note) && typeof note !== 'number' && !isPitch(note);
-
-export const isNoteLike = (note: unknown): note is NoteLike => {
-	try {
-		new Note(<NoteLike>note);
-
-		return true;
-	} catch {
-		return false;
-	}
-};
 
 interface ParsedNote {
 	note: NoteSymbol;