Merge upstream/master and resolve modify/delete conflict in tuner.test.js

Author: Vanshika

.github/workflows/node.js.yml

@@ -4,34 +4,38 @@
 name: Smoke Test
 
 on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+    push:
+        branches: [master]
+    pull_request:
+        branches: [master]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.x, 20.x]
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - run: npm ci
-    - run: npm run build --if-present
-
-    # Post-run cleanup to remove the build directory after the job finishes
-    - name: Post-run cleanup
-      if: always()
-      run: rm -rf ./build
+    build:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version: [18.x, 20.x]
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+                  cache: "npm"
+
+            - name: Install dependencies
+              run: npm ci
+
+            - name: Build project
+              run: npm run build --if-present
+
+            # Post-run cleanup to remove the build directory after the job finishes
+            - name: Post-run cleanup
+              if: always()
+              run: rm -rf ./build

css/activities.css

@@ -1051,12 +1051,12 @@ table {
 }
 
 #right-arrow {
-  left: 385px;
+  right: 25px;
   background: url("../header-icons/right-arrow.png");
 }
 
 #left-arrow {
-  left: 5px;
+  left: 10px;
   background: url("../header-icons/left-arrow.png");
 }
 
@@ -1177,12 +1177,14 @@ table {
 
 #helpBodyDiv {
   position: relative;
-  left: 45px;
+  margin: 0 auto !important;
+  left: 0 !important;
   border: 0 !important;
   overflow-x: hidden;
   overflow-y: auto;
-  width: 350px;
-  padding: 1rem 1rem 0 0;
+  width: calc(100% - 130px) !important;
+  max-width: 350px;
+  padding: 1rem 1rem 0 1rem;
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -2107,7 +2109,7 @@ table {
 
 #right-arrow {
     left: auto !important;  /* Unset the old fixed pixel value */
-    right: 10px !important; /* Stick to the right edge */
+    right: 25px !important; /* Stick to the right edge */
 }
 
 /* --- Desktop View (Screens wider than 900px) --- */
@@ -2138,7 +2140,8 @@ table {
 
     /* Fix the inner text box width so it doesn't overflow */
     #helpBodyDiv {
-        width: 100% !important;
+        width: calc(100% - 110px) !important;
+        margin: 0 auto !important;
         left: 0 !important;
         padding: 0 10px;
         box-sizing: border-box; 

js/activity.js

@@ -37,7 +37,8 @@
    SPECIALINPUTS, STANDARDBLOCKHEIGHT, StatsWindow, STROKECOLORS,
    TENOR, TITLESTRING, Toolbar, Trashcan, TREBLE, Turtles, TURTLESVG,
    updatePluginObj, ZERODIVIDEERRORMSG, GRAND_G, GRAND_F,
-   SHARP, FLAT, buildScale, TREBLE_F, TREBLE_G, GIFAnimator
+   SHARP, FLAT, buildScale, TREBLE_F, TREBLE_G, GIFAnimator,
+   MUSICALMODES
  */
 
 /*
@@ -6994,8 +6995,13 @@ class Activity {
             // Load custom mode saved in local storage.
             const custommodeData = this.storage.custommode;
             if (custommodeData !== undefined) {
-                // FIX ME: customMode is loaded but not yet used
-                JSON.parse(custommodeData);
+                // Parse and update the custom musical mode with saved data.
+                try {
+                    const customModeDataObj = JSON.parse(custommodeData);
+                    Object.assign(MUSICALMODES["custom"], customModeDataObj);
+                } catch (e) {
+                    console.error("Error parsing custommode data:", e);
+                }
             }
 
             this.fileChooser.addEventListener("click", () => {
@@ -7216,21 +7222,6 @@ class Activity {
                     });
                 };
 
-                // Music Block Parser from abc to MB
-                abcReader.onload = event => {
-                    //get the abc data and replace the / so that the block does not break
-                    let abcData = event.target.result;
-                    abcData = abcData.replace(/\\/g, "");
-
-                    const tunebook = new ABCJS.parseOnly(abcData);
-                    // eslint-disable-next-line no-console
-                    console.log(tunebook);
-                    tunebook.forEach(tune => {
-                        //call parseABC to parse abcdata to MB json
-                        this.parseABC(tune);
-                    });
-                };
-
                 // Work-around in case the handler is called by the
                 // widget drag & drop code.
                 if (files[0] !== undefined) {
@@ -7248,7 +7239,6 @@ class Activity {
                         return;
                     }
                     reader.readAsText(files[0]);
-                    reader.readAsText(files[0]);
                     window.scroll(0, 0);
                 }
             };

js/blocks/ProgramBlocks.js

@@ -1292,31 +1292,37 @@ function setupProgramBlocks(activity) {
                         i < activity.blocks.protoBlockDict[protoblk].dockTypes.length;
                         i++
                     ) {
-                        // FIXME: type check args
+                        // Type check and handle args
                         if (i < blockArgs.length) {
-                            if (typeof blockArgs[i] === "number") {
-                                if (
-                                    !["anyin", "numberin"].includes(
-                                        activity.blocks.protoBlockDict[protoblk].dockTypes[i]
-                                    )
-                                ) {
+                            const arg = blockArgs[i];
+                            const dockType = activity.blocks.protoBlockDict[protoblk].dockTypes[i];
+
+                            if (typeof arg === "number") {
+                                if (!["anyin", "numberin"].includes(dockType)) {
+                                    activity.errorMsg(_("Warning: block argument type mismatch"));
+                                }
+                                newBlock.push([i, ["number", { value: arg }], 0, 0, [0]]);
+                                newBlock[0][4].push(i);
+                            } else if (typeof arg === "string") {
+                                if (!["anyin", "textin"].includes(dockType)) {
                                     activity.errorMsg(_("Warning: block argument type mismatch"));
                                 }
-                                newBlock.push([i, ["number", { value: blockArgs[i] }], 0, 0, [0]]);
-                            } else if (typeof blockArgs[i] === "string") {
-                                if (
-                                    !["anyin", "textin"].includes(
-                                        activity.blocks.protoBlockDict[protoblk].dockTypes[i]
-                                    )
-                                ) {
+                                newBlock.push([i, ["string", { value: arg }], 0, 0, [0]]);
+                                newBlock[0][4].push(i);
+                            } else if (typeof arg === "boolean") {
+                                if (!["anyin", "booleanin"].includes(dockType)) {
                                     activity.errorMsg(_("Warning: block argument type mismatch"));
                                 }
-                                newBlock.push([i, ["string", { value: blockArgs[i] }], 0, 0, [0]]);
+                                newBlock.push([i, ["boolean", { value: arg }], 0, 0, [0]]);
+                                newBlock[0][4].push(i);
                             } else {
+                                activity.errorMsg(
+                                    _("Warning: block argument type unhandled: ") + typeof arg
+                                );
+                                // eslint-disable-next-line no-console
+                                console.warn("Unhandled argument type", arg);
                                 newBlock[0][4].push(null);
                             }
-
-                            newBlock[0][4].push(i);
                         } else {
                             newBlock[0][4].push(null);
                         }

js/utils/musicutils.js

@@ -842,6 +842,19 @@ const DEGREES = _("1st 2nd 3rd 4th 5th 6th 7th 8th 9th 10th 11th 12th");
  */
 const SEMITONES = 12;
 
+/**
+ * Number of cents per semitone in 12-TET tuning.
+ * @constant {number}
+ */
+const CENTS_PER_SEMITONE = 100;
+
+/**
+ * Number of cents in an octave.
+ * Derived from SEMITONES for future temperament support.
+ * @constant {number}
+ */
+const CENTS_PER_OCTAVE = SEMITONES * CENTS_PER_SEMITONE;
+
 /**
  * Array representing powers of 2.
  * @constant {number[]}
@@ -2883,18 +2896,20 @@ const frequencyToPitch = hz => {
 
     // Calculate cents to keep track of drift
     let cents = 0;
-    for (let i = 0; i < 10 * 1200; i++) {
+    // Standard tuning uses CENTS_PER_OCTAVE cents per octave.
+
+    for (let i = 0; i < 10 * CENTS_PER_OCTAVE; i++) {
         const f = A0 * Math.pow(TWELVEHUNDRETHROOT2, i);
         if (hz < f * 1.0003 && hz > f * 0.9997) {
-            cents = i % 100;
-            let j = Math.floor(i / 100);
+            cents = i % CENTS_PER_SEMITONE;
+            let j = Math.floor(i / CENTS_PER_SEMITONE);
             if (cents > 50) {
-                cents -= 100;
+                cents -= CENTS_PER_SEMITONE;
                 j += 1;
             }
             return [
-                PITCHES[(j + PITCHES.indexOf("A")) % 12],
-                Math.floor((j + PITCHES.indexOf("A")) / 12),
+                PITCHES[(j + PITCHES.indexOf("A")) % SEMITONES],
+                Math.floor((j + PITCHES.indexOf("A")) / SEMITONES),
                 cents
             ];
         }

js/utils/utils.js

@@ -562,13 +562,20 @@ let fileBasename = file => {
  * @param {string} str - The input string.
  * @returns {string} The string with the first character in uppercase.
  */
-let toTitleCase = str => {
+function toTitleCase (str) {
     if (typeof str !== "string") return;
     let tempStr = "";
     if (str.length > 1) tempStr = str.substring(1);
     return str.toUpperCase()[0] + tempStr;
 };
 
+if (typeof module !== "undefined" && module.exports) {
+    module.exports.toTitleCase = toTitleCase;
+}
+if (typeof window !== "undefined") {
+    window.toTitleCase = toTitleCase;
+}
+
 /**
  * Processes plugin data and updates the activity based on the provided JSON-encoded dictionary.
  * @param {object} activity - The activity object to update.