refactor: reduce reliance on implicit global state in Logo subsystem

Author: vanshika2720

js/LogoDependencies.js

@@ -73,7 +73,15 @@ class LogoDependencies {
         storage,
         config,
         callbacks,
-        meSpeak = null
+        meSpeak = null,
+        instruments = null,
+        instrumentsFilters = null,
+        instrumentsEffects = null,
+        widgetWindows = null,
+        utils = null,
+        Singer = null,
+        Tone = null,
+        classes = null
     }) {
         // Validate required dependencies
         if (!blocks) {
@@ -142,6 +150,39 @@ class LogoDependencies {
          * @type {Object|null}
          */
         this.meSpeak = meSpeak;
+
+        // Audio and utility dependencies from Logo Subsystem refactor
+        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 +220,36 @@ class LogoDependencies {
                 onStopTurtle: activity.onStopTurtle,
                 onRunTurtle: activity.onRunTurtle
             },
-            meSpeak: activity.meSpeak
+            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,13 +101,22 @@ describe("Logo with LogoDependencies", () => {
                 onStopTurtle: jest.fn(),
                 onRunTurtle: jest.fn()
             },
-            meSpeak: null
+            meSpeak: null,
+            instruments: {},
+            Singer: { setSynthVolume: jest.fn() },
+            Tone: {},
+            utils: { last: jest.fn() },
+            classes: {
+                Notation: jest.fn(),
+                Synth: jest.fn(),
+                StatusMatrix: jest.fn()
+            }
         };
     });
 
     test("Logo accepts LogoDependencies object", () => {
         const logo = new Logo(mockDeps);
-        expect(logo.deps).toBe(mockDeps);
+        expect(logo._deps).toBe(mockDeps);
         expect(logo.activity.blocks).toBe(mockDeps.blocks);
     });
 
@@ -127,14 +136,14 @@ describe("Logo with LogoDependencies", () => {
 
         const logo = new Logo(mockActivity);
         expect(logo.activity).toBe(mockActivity);
-        expect(logo.deps.blocks).toBe(mockActivity.blocks);
+        expect(logo._deps.blocks).toBe(mockActivity.blocks);
     });
 
     test("Error handler is called correctly", () => {
         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 +152,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", () => {
@@ -163,5 +178,7 @@ describe("LogoDependencies.fromActivity", () => {
         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);
     });
 });