From 03576304bdc6817e2fca01dc14bb98645deaeda6 Mon Sep 17 00:00:00 2001
From: Lumi Pakkanen <lumi.pakkanen@gmail.com>
Date: Thu, 18 Apr 2024 16:47:22 +0300
Subject: [PATCH] Fix remaining scale.scale.baseMidiNote dependencies

Update sonic-weave dependency.
---
 package-lock.json                             | 22 ++++++++++++++-----
 package.json                                  |  4 ++--
 .../modification/ApproximateByRatios.vue      |  2 +-
 .../modals/modification/EqualizeScale.vue     |  2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a10c5b3..8aca8bb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "scale-workshop",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "scale-workshop",
-      "version": "3.0.0-beta.14",
+      "version": "3.0.0-beta.15",
       "dependencies": {
         "isomorphic-qwerty": "^0.0.2",
         "ji-lattice": "^0.0.3",
@@ -14,7 +14,7 @@
         "moment-of-symmetry": "^0.4.2",
         "pinia": "^2.1.7",
         "qs": "^6.12.0",
-        "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.20",
+        "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.21",
         "sw-synth": "^0.1.0",
         "temperaments": "^0.5.3",
         "vue": "^3.3.4",
@@ -5400,8 +5400,8 @@
       }
     },
     "node_modules/sonic-weave": {
-      "version": "0.0.20",
-      "resolved": "git+ssh://git@github.com/xenharmonic-devs/sonic-weave.git#7d5a97f82ce23a4316a0cf71ab831106f73a7eb5",
+      "version": "0.0.21",
+      "resolved": "git+ssh://git@github.com/xenharmonic-devs/sonic-weave.git#cc3ac1b25ad8d2289920df4b000f719b5c3439b1",
       "license": "MIT",
       "dependencies": {
         "moment-of-symmetry": "^0.4.2",
@@ -5416,6 +5416,18 @@
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/frostburn"
+      },
+      "optionalDependencies": {
+        "commander": "^12.0.0"
+      }
+    },
+    "node_modules/sonic-weave/node_modules/commander": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz",
+      "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==",
+      "optional": true,
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/source-map-js": {
diff --git a/package.json b/package.json
index fda1d654..7b0bc978 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scale-workshop",
-  "version": "3.0.0-beta.14",
+  "version": "3.0.0-beta.15",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
@@ -21,7 +21,7 @@
     "moment-of-symmetry": "^0.4.2",
     "pinia": "^2.1.7",
     "qs": "^6.12.0",
-    "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.20",
+    "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.21",
     "sw-synth": "^0.1.0",
     "temperaments": "^0.5.3",
     "vue": "^3.3.4",
diff --git a/src/components/modals/modification/ApproximateByRatios.vue b/src/components/modals/modification/ApproximateByRatios.vue
index c647a5a7..ff84e4d4 100644
--- a/src/components/modals/modification/ApproximateByRatios.vue
+++ b/src/components/modals/modification/ApproximateByRatios.vue
@@ -29,7 +29,7 @@ type Approximation = {
 }
 
 const approximationsWithErrorsAndLimits = computed<Approximation[]>(() => {
-  const selected = Math.abs(scale.scale.getRatio(scale.baseMidiNote + approx.degree))
+  const selected = Math.abs(scale.scale.getRatio(scale.scale.baseMidiNote + approx.degree))
   const selectedCents = valueToCents(selected)
   if (approx.method === 'convergents') {
     const approximations = getConvergents(
diff --git a/src/components/modals/modification/EqualizeScale.vue b/src/components/modals/modification/EqualizeScale.vue
index 535014f4..b5547c79 100644
--- a/src/components/modals/modification/EqualizeScale.vue
+++ b/src/components/modals/modification/EqualizeScale.vue
@@ -15,7 +15,7 @@ const scale = useScaleStore()
 
 const equalizedScaleData = computed(() => {
   const pitches = [...Array(scale.scale.size).keys()].map((i) =>
-    valueToCents(Math.abs(scale.scale.getRatio(i + scale.baseMidiNote)))
+    valueToCents(Math.abs(scale.scale.getRatio(i + scale.scale.baseMidiNote)))
   )
   const gridCents = valueToCents(scale.scale.equaveRatio) / modal.largeDivisions
   if (modal.errorModel === 'rooted') {