11573902575

Committed 29 Oct 2024 12:31PM UTC coverage: 97.687% (+0.05%) from 97.64%

Build # 11573902575

Build Type

push

github

Committed by

pedromsantos

Commit Message

refactor: remove fret margins

Run Details

245 of 264 branches covered (92.8%)

Branch coverage included in aggregate %.

7 of 7 new or added lines in 1 file covered. (100.0%)

1 existing line in 1 file now uncovered.

1613 of 1638 relevant lines covered (98.47%)

537.44 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

97.81

/src/Domain/Interval.ts

import { IntervalPrimitives } from '../primitives/Interval';

export class IntervalQuality {
  private static readonly all: IntervalQuality[] = [];

  private constructor(private readonly name: string) {
    IntervalQuality.all.push(this);
  }

  get Name(): string {
    return this.name;
  }

  public static readonly Minor: IntervalQuality = new IntervalQuality('Minor');
  public static readonly Major: IntervalQuality = new IntervalQuality('Major');
  public static readonly Augmented: IntervalQuality = new IntervalQuality('Augmented');
  public static readonly Diminished: IntervalQuality = new IntervalQuality('Diminished');
  public static readonly Perfect: IntervalQuality = new IntervalQuality('Perfect');

  public static From(name: string) {
    switch (name) {
      case 'Minor':
        return IntervalQuality.Minor;
      case 'Major':
        return IntervalQuality.Major;
      case 'Augmented':
        return IntervalQuality.Augmented;
      case 'Diminished':
        return IntervalQuality.Diminished;
      case 'Perfect':
        return IntervalQuality.Perfect;
      default:
        throw new Error('Invalid interval quality');
    }
  }
}

export class Interval {
  private static readonly all: Interval[] = [];

  private constructor(
    private readonly name: string,
    private readonly abreviature: string,
    private readonly distance: number,
    private readonly quality: IntervalQuality,
    public invert: () => Interval,
    public raiseOctave: () => Interval
  ) {
    Interval.all.push(this);
  }

  get Name(): string {
    return this.name;
  }

  get To(): IntervalPrimitives {
    return {
      name: this.name,
      abreviature: this.abreviature,
      distance: this.distance,
      quality: this.quality.Name,
    };
  }

  public static From(primitive: IntervalPrimitives) {
    const interval = Interval.intervals.find(
      (i) =>
        i.name == primitive.name &&
        i.distance == primitive.distance &&
        i.abreviature == primitive.abreviature &&
        i.quality == IntervalQuality.From(primitive.quality)
    );

    if (!interval) {
      throw new Error('Invalid interval primitive');
    }

    return interval;
  }

  public static readonly Unison: Interval = new Interval(
    'Unison',
    'U',
    0,
    IntervalQuality.Perfect,
    () => Interval.PerfectOctave,
    () => Interval.PerfectOctave
  );

  public static readonly DiminishedUnison: Interval = new Interval(
    'Diminished Unison',
    'd1',
    -1,
    IntervalQuality.Diminished,
    () => Interval.AugmentedUnison,
    () => Interval.DiminishedUnison
  );

  public static readonly AugmentedUnison: Interval = new Interval(
    'Augmented Unison',
    'A1',
    1,
    IntervalQuality.Augmented,
    () => Interval.DiminishedUnison,
    () => Interval.AugmentedUnison
  );

  public static readonly MinorSecond: Interval = new Interval(
    'Minor Second',
    'm2',
    1,
    IntervalQuality.Minor,
    () => Interval.MajorSeventh,
    () => Interval.MinorNinth
  );

  public static readonly MajorSecond: Interval = new Interval(
    'Major Second',
    'M2',
    2,
    IntervalQuality.Major,
    () => Interval.MinorSeventh,
    () => Interval.MajorNinth
  );

  public static readonly AugmentedSecond: Interval = new Interval(
    'Augmented Second',
    'A2',
    3,
    IntervalQuality.Augmented,
    () => Interval.DiminishedSeventh,
    () => Interval.AugmentedNinth
  );

  public static readonly MinorThird: Interval = new Interval(
    'Minor Third',
    'm3',
    3,
    IntervalQuality.Minor,
    () => Interval.MajorSixth,
    () => Interval.MinorThird
  );

  public static readonly MajorThird: Interval = new Interval(
    'Major Third',
    'M3',
    4,
    IntervalQuality.Major,
    () => Interval.MinorSixth,
    () => Interval.MajorThird
  );

  public static readonly PerfectFourth: Interval = new Interval(
    'Perfect Fourth',
    'P4',
    5,
    IntervalQuality.Perfect,
    () => Interval.PerfectFifth,
    () => Interval.PerfectEleventh
  );

  public static readonly AugmentedFourth: Interval = new Interval(
    'Augmented Fourth',
    'A4',
    6,
    IntervalQuality.Augmented,
    () => Interval.DiminishedFifth,
    () => Interval.AugmentedEleventh
  );

  public static readonly DiminishedFifth: Interval = new Interval(
    'Diminished Fifth',
    'd5',
    6,
    IntervalQuality.Diminished,
    () => Interval.AugmentedFourth,
    () => Interval.DiminishedFifth
  );

  public static readonly Tritone: Interval = new Interval(
    'Diminished Fifth',
    'd5',
    6,
    IntervalQuality.Diminished,
    () => Interval.AugmentedFourth,
    () => Interval.Tritone
  );

  public static readonly PerfectFifth: Interval = new Interval(
    'Perfect Fifth',
    'P5',
    7,
    IntervalQuality.Perfect,
    () => Interval.PerfectFourth,
    () => Interval.PerfectFifth
  );

  public static readonly AugmentedFifth: Interval = new Interval(
    'Augmented Fifth',
    'A5',
    8,
    IntervalQuality.Augmented,
    () => Interval.AugmentedFourth,
    () => Interval.AugmentedFifth
  );

  public static readonly MinorSixth: Interval = new Interval(
    'Minor Sixth',
    'm6',
    8,
    IntervalQuality.Minor,
    () => Interval.MajorThird,
    () => Interval.MinorThirteenth
  );

  public static readonly MajorSixth: Interval = new Interval(
    'Major Sixth',
    'M6',
    9,
    IntervalQuality.Major,
    () => Interval.MinorThird,
    () => Interval.MajorThirteenth
  );

  public static readonly DiminishedSeventh: Interval = new Interval(
    'Diminished Seventh',
    'd7',
    9,
    IntervalQuality.Diminished,
    () => Interval.AugmentedSecond,
    () => Interval.DiminishedSeventh
  );

  public static readonly MinorSeventh: Interval = new Interval(
    'Minor Seventh',
    'm7',
    10,
    IntervalQuality.Minor,
    () => Interval.MajorSecond,
    () => Interval.MinorSeventh
  );

  public static readonly MajorSeventh: Interval = new Interval(
    'Major Seventh',
    'M7',
    11,
    IntervalQuality.Major,
    () => Interval.MinorSecond,
    () => Interval.MajorSeventh
  );

  public static readonly PerfectOctave: Interval = new Interval(
    'Perfect Octave',
    'PO',
    12,
    IntervalQuality.Perfect,
    () => Interval.Unison,
    () => Interval.PerfectOctave
  );

  public static readonly DiminishedNinth: Interval = new Interval(
    'Diminished Ninth',
    'd9',
    13,
    IntervalQuality.Minor,
    () => Interval.AugmentedUnison,
    () => Interval.DiminishedNinth
  );

  public static readonly MinorNinth: Interval = new Interval(
    'Minor Ninth',
    'm9',
    13,
    IntervalQuality.Minor,
    () => Interval.MajorSeventh,
    () => Interval.MinorNinth
  );

  public static readonly MajorNinth: Interval = new Interval(
    'Major Ninth',
    'M9',
    14,
    IntervalQuality.Major,
    () => Interval.MinorSeventh,
    () => Interval.MajorNinth
  );

  public static readonly AugmentedNinth: Interval = new Interval(
    'Augmented Ninth',
    'A9',
    15,
    IntervalQuality.Augmented,
    () => Interval.DiminishedUnison,
    () => Interval.AugmentedNinth
  );

  public static readonly PerfectEleventh: Interval = new Interval(
    'Perfect Eleventh',
    'P11',
    17,
    IntervalQuality.Perfect,
    () => Interval.PerfectFifth,
    () => Interval.PerfectEleventh
  );

  public static readonly AugmentedEleventh: Interval = new Interval(
    'Augmented Eleventh',
    'A11',
    18,
    IntervalQuality.Augmented,
    () => Interval.DiminishedFifth,
    () => Interval.AugmentedEleventh
  );

  public static readonly MinorThirteenth: Interval = new Interval(
    'Minor Thirteenth',
    'm13',
    20,
    IntervalQuality.Minor,
    () => Interval.MajorThird,
    () => Interval.MinorThirteenth
  );

  public static readonly MajorThirteenth: Interval = new Interval(
    'Major Thirteenth',
    'M13',
    21,
    IntervalQuality.Major,
    () => Interval.MinorThird,
    () => Interval.MajorThirteenth
  );

  isLargarThan(other: Interval): boolean {
    return this.distance > other.distance;
  }

  public static get intervals(): Interval[] {
    return Interval.all;
  }

  public static get unique(): Interval[] {
    return Interval.all.filter(
      (i) =>
        i.distance <= 12 &&
        (i.quality === IntervalQuality.Perfect ||
          i.quality === IntervalQuality.Minor ||
          i.quality === IntervalQuality.Major)
    );
  }
}

export const enum IntervalDirection {
  Ascending,
  Descending,
  Level,
}

1	import { IntervalPrimitives } from '../primitives/Interval';
2
3	export class IntervalQuality {	×
4	private static readonly all: IntervalQuality[] = [];	19✔
5
6	private constructor(private readonly name: string) {	95✔
7	IntervalQuality.all.push(this);	95✔
8	}
9
10	get Name(): string {
11	return this.name;	916✔
12	}
13
14	public static readonly Minor: IntervalQuality = new IntervalQuality('Minor');	19✔
15	public static readonly Major: IntervalQuality = new IntervalQuality('Major');	19✔
16	public static readonly Augmented: IntervalQuality = new IntervalQuality('Augmented');	19✔
17	public static readonly Diminished: IntervalQuality = new IntervalQuality('Diminished');	19✔
18	public static readonly Perfect: IntervalQuality = new IntervalQuality('Perfect');	19✔
19
20	public static From(name: string) {
21	switch (name) {	132✔
22	case 'Minor':
23	return IntervalQuality.Minor;	19✔
24	case 'Major':
25	return IntervalQuality.Major;	55✔
26	case 'Augmented':
27	return IntervalQuality.Augmented;	1✔
28	case 'Diminished':
29	return IntervalQuality.Diminished;	1✔
30	case 'Perfect':
31	return IntervalQuality.Perfect;	55✔
32	default:
33	throw new Error('Invalid interval quality');	1✔
34	}
35	}
36	}
37
38	export class Interval {	309,121✔
39	private static readonly all: Interval[] = [];	19✔
40
41	private constructor(
42	private readonly name: string,	532✔
43	private readonly abreviature: string,	532✔
44	private readonly distance: number,	532✔
45	private readonly quality: IntervalQuality,	532✔
46	public invert: () => Interval,	532✔
47	public raiseOctave: () => Interval	532✔
48	) {
49	Interval.all.push(this);	532✔
50	}
51
52	get Name(): string {
53	return this.name;	15✔
54	}
55
56	get To(): IntervalPrimitives {
57	return {	916✔
58	name: this.name,
59	abreviature: this.abreviature,
60	distance: this.distance,
61	quality: this.quality.Name,
62	};
63	}
64
65	public static From(primitive: IntervalPrimitives) {
66	const interval = Interval.intervals.find(	133✔
67	(i) =>
68	i.name == primitive.name &&	1,389✔
69	i.distance == primitive.distance &&
70	i.abreviature == primitive.abreviature &&
71	i.quality == IntervalQuality.From(primitive.quality)
72	);
73
74	if (!interval) {	132✔
75	throw new Error('Invalid interval primitive');	1✔
76	}
77
78	return interval;	131✔
79	}
80
81	public static readonly Unison: Interval = new Interval(	19✔
82	'Unison',
83	'U',
84	0,
85	IntervalQuality.Perfect,
86	() => Interval.PerfectOctave,	38✔
87	() => Interval.PerfectOctave	7✔
88	);
89
90	public static readonly DiminishedUnison: Interval = new Interval(	19✔
91	'Diminished Unison',
92	'd1',
93	-1,
94	IntervalQuality.Diminished,
95	() => Interval.AugmentedUnison,	3✔
UNCOV 96	() => Interval.DiminishedUnison	×
97	);
98
99	public static readonly AugmentedUnison: Interval = new Interval(	19✔
100	'Augmented Unison',
101	'A1',
102	1,
103	IntervalQuality.Augmented,
104	() => Interval.DiminishedUnison,	3✔
105	() => Interval.AugmentedUnison	5✔
106	);
107
108	public static readonly MinorSecond: Interval = new Interval(	19✔
109	'Minor Second',
110	'm2',
111	1,
112	IntervalQuality.Minor,
113	() => Interval.MajorSeventh,	32✔
114	() => Interval.MinorNinth	4✔
115	);
116
117	public static readonly MajorSecond: Interval = new Interval(	19✔
118	'Major Second',
119	'M2',
120	2,
121	IntervalQuality.Major,
122	() => Interval.MinorSeventh,	49✔
123	() => Interval.MajorNinth	1✔
124	);
125
126	public static readonly AugmentedSecond: Interval = new Interval(	19✔
127	'Augmented Second',
128	'A2',
129	3,
130	IntervalQuality.Augmented,
131	() => Interval.DiminishedSeventh,	5✔
132	() => Interval.AugmentedNinth	7✔
133	);
134
135	public static readonly MinorThird: Interval = new Interval(	19✔
136	'Minor Third',
137	'm3',
138	3,
139	IntervalQuality.Minor,
140	() => Interval.MajorSixth,	42✔
141	() => Interval.MinorThird	1✔
142	);
143
144	public static readonly MajorThird: Interval = new Interval(	19✔
145	'Major Third',
146	'M3',
147	4,
148	IntervalQuality.Major,
149	() => Interval.MinorSixth,	46✔
150	() => Interval.MajorThird	6✔
151	);
152
153	public static readonly PerfectFourth: Interval = new Interval(	19✔
154	'Perfect Fourth',
155	'P4',
156	5,
157	IntervalQuality.Perfect,
158	() => Interval.PerfectFifth,	49✔
159	() => Interval.PerfectEleventh	8✔
160	);
161
162	public static readonly AugmentedFourth: Interval = new Interval(	19✔
163	'Augmented Fourth',
164	'A4',
165	6,
166	IntervalQuality.Augmented,
167	() => Interval.DiminishedFifth,	1✔
168	() => Interval.AugmentedEleventh	5✔
169	);
170
171	public static readonly DiminishedFifth: Interval = new Interval(	19✔
172	'Diminished Fifth',
173	'd5',
174	6,
175	IntervalQuality.Diminished,
176	() => Interval.AugmentedFourth,	3✔
177	() => Interval.DiminishedFifth	2✔
178	);
179
180	public static readonly Tritone: Interval = new Interval(	19✔
181	'Diminished Fifth',
182	'd5',
183	6,
184	IntervalQuality.Diminished,
185	() => Interval.AugmentedFourth,	×
186	() => Interval.Tritone	2✔
187	);
188
189	public static readonly PerfectFifth: Interval = new Interval(	19✔
190	'Perfect Fifth',
191	'P5',
192	7,
193	IntervalQuality.Perfect,
194	() => Interval.PerfectFourth,	51✔
195	() => Interval.PerfectFifth	2✔
196	);
197
198	public static readonly AugmentedFifth: Interval = new Interval(	19✔
199	'Augmented Fifth',
200	'A5',
201	8,
202	IntervalQuality.Augmented,
203	() => Interval.AugmentedFourth,	1✔
204	() => Interval.AugmentedFifth	1✔
205	);
206
207	public static readonly MinorSixth: Interval = new Interval(	19✔
208	'Minor Sixth',
209	'm6',
210	8,
211	IntervalQuality.Minor,
212	() => Interval.MajorThird,	41✔
213	() => Interval.MinorThirteenth	3✔
214	);
215
216	public static readonly MajorSixth: Interval = new Interval(	19✔
217	'Major Sixth',
218	'M6',
219	9,
220	IntervalQuality.Major,
221	() => Interval.MinorThird,	38✔
222	() => Interval.MajorThirteenth	2✔
223	);
224
225	public static readonly DiminishedSeventh: Interval = new Interval(	19✔
226	'Diminished Seventh',
227	'd7',
228	9,
229	IntervalQuality.Diminished,
230	() => Interval.AugmentedSecond,	5✔
231	() => Interval.DiminishedSeventh	7✔
232	);
233
234	public static readonly MinorSeventh: Interval = new Interval(	19✔
235	'Minor Seventh',
236	'm7',
237	10,
238	IntervalQuality.Minor,
239	() => Interval.MajorSecond,	55✔
240	() => Interval.MinorSeventh	8✔
241	);
242
243	public static readonly MajorSeventh: Interval = new Interval(	19✔
244	'Major Seventh',
245	'M7',
246	11,
247	IntervalQuality.Major,
248	() => Interval.MinorSecond,	34✔
249	() => Interval.MajorSeventh	2✔
250	);
251
252	public static readonly PerfectOctave: Interval = new Interval(	19✔
253	'Perfect Octave',
254	'PO',
255	12,
256	IntervalQuality.Perfect,
257	() => Interval.Unison,	38✔
258	() => Interval.PerfectOctave	2✔
259	);
260
261	public static readonly DiminishedNinth: Interval = new Interval(	19✔
262	'Diminished Ninth',
263	'd9',
264	13,
265	IntervalQuality.Minor,
266	() => Interval.AugmentedUnison,	3✔
267	() => Interval.DiminishedNinth	2✔
268	);
269
270	public static readonly MinorNinth: Interval = new Interval(	19✔
271	'Minor Ninth',
272	'm9',
273	13,
274	IntervalQuality.Minor,
275	() => Interval.MajorSeventh,	3✔
276	() => Interval.MinorNinth	4✔
277	);
278
279	public static readonly MajorNinth: Interval = new Interval(	19✔
280	'Major Ninth',
281	'M9',
282	14,
283	IntervalQuality.Major,
284	() => Interval.MinorSeventh,	6✔
285	() => Interval.MajorNinth	2✔
286	);
287
288	public static readonly AugmentedNinth: Interval = new Interval(	19✔
289	'Augmented Ninth',
290	'A9',
291	15,
292	IntervalQuality.Augmented,
293	() => Interval.DiminishedUnison,	3✔
294	() => Interval.AugmentedNinth	5✔
295	);
296
297	public static readonly PerfectEleventh: Interval = new Interval(	19✔
298	'Perfect Eleventh',
299	'P11',
300	17,
301	IntervalQuality.Perfect,
302	() => Interval.PerfectFifth,	2✔
303	() => Interval.PerfectEleventh	8✔
304	);
305
306	public static readonly AugmentedEleventh: Interval = new Interval(	19✔
307	'Augmented Eleventh',
308	'A11',
309	18,
310	IntervalQuality.Augmented,
311	() => Interval.DiminishedFifth,	2✔
312	() => Interval.AugmentedEleventh	5✔
313	);
314
315	public static readonly MinorThirteenth: Interval = new Interval(	19✔
316	'Minor Thirteenth',
317	'm13',
318	20,
319	IntervalQuality.Minor,
320	() => Interval.MajorThird,	5✔
321	() => Interval.MinorThirteenth	3✔
322	);
323
324	public static readonly MajorThirteenth: Interval = new Interval(	19✔
325	'Major Thirteenth',
326	'M13',
327	21,
328	IntervalQuality.Major,
329	() => Interval.MinorThird,	4✔
330	() => Interval.MajorThirteenth	2✔
331	);
332
333	isLargarThan(other: Interval): boolean {
334	return this.distance > other.distance;	102✔
335	}
336
337	public static get intervals(): Interval[] {
338	return Interval.all;	137✔
339	}
340
341	public static get unique(): Interval[] {
342	return Interval.all.filter(	3✔
343	(i) =>
344	i.distance <= 12 &&	84✔
345	(i.quality === IntervalQuality.Perfect \|\|
346	i.quality === IntervalQuality.Minor \|\|
347	i.quality === IntervalQuality.Major)
348	);
349	}
350	}
351
352	export const enum IntervalDirection {	37✔
353	Ascending,
354	Descending,
355	Level,
356	}

pedromsantos / glenn / 11573902575

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous