refactor: reduce reliance on implicit global state in Logo subsystem

Introduce LogoDependencies for explicit dependency injection in Logo.
Remove meSpeak references following its removal from master.
Aligned with latest master and applied Prettier formatting.

Author: vanshika2720

js/LogoDependencies.js

@@ -13,8 +13,7 @@
  * @file LogoDependencies.js
  * @description Explicit dependency container for the Logo execution engine.
  *
- * This class makes Logo's dependencies explicit rather than accessing them
- * through the global Activity facade, improving testability and code clarity.
+ * This class manages Logo's explicit dependencies.
  */
 
 /**
@@ -62,7 +61,7 @@ class LogoDependencies {
      * @param {Function} deps.callbacks.onStopTurtle - Called when turtle stops
      * @param {Function} deps.callbacks.onRunTurtle - Called when turtle runs
      *
-     * @param {Object} [deps.meSpeak] - Optional speech synthesis object
+
      */
     constructor({
         blocks,
@@ -73,7 +72,15 @@ class LogoDependencies {
         storage,
         config,
         callbacks,
-        meSpeak = null
+
+        instruments = null,
+        instrumentsFilters = null,
+        instrumentsEffects = null,
+        widgetWindows = null,
+        utils = null,
+        Singer = null,
+        Tone = null,
+        classes = null
     }) {
         // Validate required dependencies
         if (!blocks) {
@@ -137,11 +144,38 @@ class LogoDependencies {
          */
         this.callbacks = callbacks || { onStopTurtle: null, onRunTurtle: null };
 
-        /**
-         * Speech synthesis (optional)
-         * @type {Object|null}
-         */
-        this.meSpeak = meSpeak;
+        // Audio and utility dependencies
+        this.instruments =
+            instruments || (typeof window !== "undefined" ? window.instruments : null);
+        this.instrumentsFilters =
+            instrumentsFilters ||
+            (typeof window !== "undefined" ? window.instrumentsFilters : null);
+        this.instrumentsEffects =
+            instrumentsEffects ||
+            (typeof window !== "undefined" ? window.instrumentsEffects : null);
+        this.widgetWindows =
+            widgetWindows || (typeof window !== "undefined" ? window.widgetWindows : null);
+        this.Singer = Singer || (typeof window !== "undefined" ? window.Singer : null);
+        this.Tone = Tone || (typeof window !== "undefined" ? window.Tone : null);
+        this.utils = utils || {
+            doUseCamera: typeof doUseCamera !== "undefined" ? doUseCamera : null,
+            doStopVideoCam: typeof doStopVideoCam !== "undefined" ? doStopVideoCam : null,
+            getIntervalDirection:
+                typeof getIntervalDirection !== "undefined" ? getIntervalDirection : null,
+            getIntervalNumber: typeof getIntervalNumber !== "undefined" ? getIntervalNumber : null,
+            mixedNumber: typeof mixedNumber !== "undefined" ? mixedNumber : null,
+            rationalToFraction:
+                typeof rationalToFraction !== "undefined" ? rationalToFraction : null,
+            getStatsFromNotation:
+                typeof getStatsFromNotation !== "undefined" ? getStatsFromNotation : null,
+            delayExecution: typeof delayExecution !== "undefined" ? delayExecution : null,
+            last: typeof last !== "undefined" ? last : null
+        };
+        this.classes = classes || {
+            Notation: typeof Notation !== "undefined" ? Notation : null,
+            Synth: typeof Synth !== "undefined" ? Synth : null,
+            StatusMatrix: typeof StatusMatrix !== "undefined" ? StatusMatrix : null
+        };
     }
 
     /**
@@ -179,7 +213,36 @@ class LogoDependencies {
                 onStopTurtle: activity.onStopTurtle,
                 onRunTurtle: activity.onRunTurtle
             },
-            meSpeak: activity.meSpeak
+
+            // Pass globals for backward compatibility during migration
+            instruments: typeof instruments !== "undefined" ? instruments : null,
+            instrumentsFilters:
+                typeof instrumentsFilters !== "undefined" ? instrumentsFilters : null,
+            instrumentsEffects:
+                typeof instrumentsEffects !== "undefined" ? instrumentsEffects : null,
+            widgetWindows: typeof window !== "undefined" ? window.widgetWindows : null,
+            Singer: typeof Singer !== "undefined" ? Singer : null,
+            Tone: typeof Tone !== "undefined" ? Tone : null,
+            utils: {
+                doUseCamera: typeof doUseCamera !== "undefined" ? doUseCamera : null,
+                doStopVideoCam: typeof doStopVideoCam !== "undefined" ? doStopVideoCam : null,
+                getIntervalDirection:
+                    typeof getIntervalDirection !== "undefined" ? getIntervalDirection : null,
+                getIntervalNumber:
+                    typeof getIntervalNumber !== "undefined" ? getIntervalNumber : null,
+                mixedNumber: typeof mixedNumber !== "undefined" ? mixedNumber : null,
+                rationalToFraction:
+                    typeof rationalToFraction !== "undefined" ? rationalToFraction : null,
+                getStatsFromNotation:
+                    typeof getStatsFromNotation !== "undefined" ? getStatsFromNotation : null,
+                delayExecution: typeof delayExecution !== "undefined" ? delayExecution : null,
+                last: typeof last !== "undefined" ? last : null
+            },
+            classes: {
+                Notation: typeof Notation !== "undefined" ? Notation : null,
+                Synth: typeof Synth !== "undefined" ? Synth : null,
+                StatusMatrix: typeof StatusMatrix !== "undefined" ? StatusMatrix : null
+            }
         });
     }
 

js/__tests__/logo-dependencies.test.js

@@ -101,7 +101,16 @@ describe("Logo with LogoDependencies", () => {
                 onStopTurtle: jest.fn(),
                 onRunTurtle: jest.fn()
             },
-            meSpeak: null
+
+            instruments: {},
+            Singer: { setSynthVolume: jest.fn() },
+            Tone: {},
+            utils: { last: jest.fn() },
+            classes: {
+                Notation: jest.fn(),
+                Synth: jest.fn(),
+                StatusMatrix: jest.fn()
+            }
         };
     });
 
@@ -121,8 +130,7 @@ describe("Logo with LogoDependencies", () => {
             saveLocally: jest.fn(),
             showBlocksAfterRun: false,
             onStopTurtle: jest.fn(),
-            onRunTurtle: jest.fn(),
-            meSpeak: null
+            onRunTurtle: jest.fn()
         };
 
         const logo = new Logo(mockActivity);
@@ -134,7 +142,7 @@ describe("Logo with LogoDependencies", () => {
         const deps = new LogoDependencies(mockDeps);
         const logo = new Logo(deps);
         logo.activity.errorMsg("Test error");
-        expect(mockDeps.errorHandler).toHaveBeenCalledWith("Test error");
+        expect(mockDeps.errorHandler).toHaveBeenCalledWith("Test error", undefined);
     });
 
     test("Config properties work with getters/setters", () => {
@@ -143,6 +151,12 @@ describe("Logo with LogoDependencies", () => {
         logo.activity.showBlocksAfterRun = true;
         expect(mockDeps.config.showBlocksAfterRun).toBe(true);
     });
+
+    test("Audio dependencies are correctly injected", () => {
+        const logo = new Logo(mockDeps);
+        expect(logo.deps.instruments).toBe(mockDeps.instruments);
+        expect(logo.deps.Singer).toBe(mockDeps.Singer);
+    });
 });
 
 describe("LogoDependencies.fromActivity", () => {
@@ -156,12 +170,13 @@ describe("LogoDependencies.fromActivity", () => {
             saveLocally: jest.fn(),
             showBlocksAfterRun: false,
             onStopTurtle: jest.fn(),
-            onRunTurtle: jest.fn(),
-            meSpeak: null
+            onRunTurtle: jest.fn()
         };
 
         const deps = LogoDependencies.fromActivity(mockActivity);
         expect(deps.blocks).toBe(mockActivity.blocks);
         expect(deps.turtles).toBe(mockActivity.turtles);
+        expect(deps.instruments).toBe(global.instruments);
+        expect(deps.Singer).toBe(global.Singer);
     });
 });

js/__tests__/logo.test.js

@@ -234,9 +234,7 @@ describe("Logo Class", () => {
             },
             onStopTurtle: jest.fn(),
             onRunTurtle: jest.fn(),
-            meSpeak: {
-                speak: jest.fn()
-            },
+
             errorMsg: jest.fn(),
             saveLocally: jest.fn(),
             hideMsgs: jest.fn(),
@@ -371,23 +369,6 @@ describe("Logo Class", () => {
         });
     });
 
-    describe("processSpeak", () => {
-        test("filters text to only valid characters", () => {
-            // The code uses this._meSpeak
-            logo._meSpeak = { speak: jest.fn() };
-            logo.processSpeak("Hello, World! 123");
-
-            expect(logo._meSpeak.speak).toHaveBeenCalledWith("Hello, World ");
-        });
-
-        test("handles empty string", () => {
-            logo._meSpeak = { speak: jest.fn() };
-            logo.processSpeak("");
-
-            expect(logo._meSpeak.speak).toHaveBeenCalledWith("");
-        });
-    });
-
     describe("setTurtleListener", () => {
         test("adds event listener to stage", () => {
             const listener = jest.fn();