improve console.warn for probably invalid positions

Author: erikbjoern

app.vue

@@ -192,7 +192,7 @@ function expandChord(beatPosition: BeatPosition) {
  } else {
  const chordData = { chord: getChord(beatPosition), ...beatPosition }
  targetedChordId.value = `${chordData.measure}-${chordData.beat}`
- console.log(targetedChordId.value)
+
  expandedChords.value.push(chordData)
 
  let direction: 'previous' | 'next' = 'next'

assets/chords/index.ts

@@ -1,6 +1,7 @@
 import Chord from '@/models/chord'
 
 const chords: { [key: string]: Chord } = {
+ // [string, fret, finger]
  F: new Chord('F', [
  [1, 1, 1],
  [2, 3, 4],

models/chord.ts

@@ -14,12 +14,20 @@ export default class Chord {
  this.generateGrip()
  }
 
- private sameStringOrFingerIsUsedTwice = () => {
+ private warnIfSameStringOrFingerIsUsedTwice = () => {
  const strings = this.fingerPositions?.map(p => p[0])
- const fingers = this.fingerPositions?.map(p => p[2])
- const isUniqueSet = (arr = []) => new Set(arr).size == arr.length
 
- return (!isUniqueSet(strings) || !isUniqueSet(fingers))
+ if (new Set(strings).size !== strings.length) {
+ console.warn(`Same string is used twice in ${this.label}`)
+ }
+
+ if (this.fingerPositions.some((p1) => !!this.fingerPositions.find((p2) => {
+ const [fret, finger] = [1, 2]
+
+ return p1[finger] == p2[finger] && p1[fret] !== p2[fret]
+ }))) {
+ console.warn(`Same finger is used on different frets in ${this.label}`)
+ }
  }
 
  private generateFingerData = (string) => {
@@ -38,9 +46,7 @@ export default class Chord {
  }
 
  private generateGrip = () => {
- if (this.sameStringOrFingerIsUsedTwice()) {
- console.warn(`Same finger or string is used twice in ${this.label}`)
- }
+ this.warnIfSameStringOrFingerIsUsedTwice()
 
  this.grip = Object.assign({}, ...this.availableStrings.map(this.generateFingerData))
  }