Merge branch 'master' into test/musicutils-next-2-functions

Author: parthdagia05

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 ## <a name="CONTRIBUTING"></a>Contributing
 
 We welcome contributions of all kinds — whether it’s code,
-documentation, music, lesson plans, artwork, or ideas.  Music Blocks
+documentation, music, lesson plans, artwork, or ideas. Music Blocks
 is a community-driven project, and every meaningful contribution helps
 improve the platform for learners and educators around the world.
 
@@ -11,7 +11,6 @@ open issues or discussions to find a place to contribute.
 
 - [How to set up a local server](README.md#how-to-set-up-a-local-server)
 
-
 ### Special Notes
 
 Music Blocks is being built from the ground-up, to address several
@@ -53,7 +52,6 @@ following resources:
 Programmers, please follow these general [guidelines for
 contributions](https://github.com/sugarlabs/sugar-docs/blob/master/src/contributing.md).
 
-
 ### Before You Push
 
 Run these commands locally before submitting a PR:
@@ -64,8 +62,20 @@ npx prettier --check .    # Formatting
 npm test                  # Jest
 ```
 
+NOTE: Only run ```prettier``` on the files you have modified.
+
 If formatting fails, run `npx prettier --write .` to fix it.
 
+### After your PR is merged
+
+Please note that production deployments of Music Blocks are **manual**.
+
+This means that even after your pull request is merged, your changes may not immediately appear. Your update will become visible after the next official release is deployed.
+
+If your changes are not visible right away, it does **not** indicate a problem with your PR or implementation.
+
+This note is included to prevent contributors from spending time debugging caching or deployment issues unnecessarily.
+
 ### License Header
 
 Music Blocks is licensed under the [AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html).
@@ -129,60 +139,60 @@ Feel free. But, please don't spam :p.
 ### Keep in Mind
 
 1. Your contributions need not necessarily have to address any
-discovered issue. If you encounter any, feel free to add a fix through
-a PR, or create a new issue ticket.
+   discovered issue. If you encounter any, feel free to add a fix through
+   a PR, or create a new issue ticket.
 
 2. Use [labels](https://github.com/sugarlabs/musicblocks/labels) on
-your issues and PRs.
+   your issues and PRs.
 
 3. Please do not spam with many PRs consisting of little changes.
 
 4. If you are addressing a bulk change, divide your commits across
-multiple PRs, and send them one at a time. The fewer the number of
-files addressed per PR, the better.
+   multiple PRs, and send them one at a time. The fewer the number of
+   files addressed per PR, the better.
 
 5. Communicate effectively. Go straight to the point. You don't need
-to address anyone using '_sir_'. Don't write unnecessary comments;
-don't be over-apologetic. There is no superiority hierarchy. Every
-single contribution is welcome, as long as it doesn't spam or distract
-the flow.
+   to address anyone using '_sir_'. Don't write unnecessary comments;
+   don't be over-apologetic. There is no superiority hierarchy. Every
+   single contribution is welcome, as long as it doesn't spam or distract
+   the flow.
 
 6. Write useful, brief commit messages. Add commit descriptions if
-necessary. PR name should speak about what it is addressing and not
-the issue. In case a PR fixes an issue, use `fixes #ticketno` or
-`closes #ticketno` in the PR's comment. Briefly explain what your PR
-is doing.
+   necessary. PR name should speak about what it is addressing and not
+   the issue. In case a PR fixes an issue, use `fixes #ticketno` or
+   `closes #ticketno` in the PR's comment. Briefly explain what your PR
+   is doing.
 
 7. Always test your changes extensively before creating a PR. There's
-no sense in merging broken code. If a PR is a _work in progress
-(WIP)_, convert it to draft. It'll let the maintainers know it isn't
-ready for merging.
+   no sense in merging broken code. If a PR is a _work in progress
+   (WIP)_, convert it to draft. It'll let the maintainers know it isn't
+   ready for merging.
 
 8. Read and revise the concepts about programming constructs you're
-dealing with. You must be clear about the behavior of the language or
-compiler/transpiler. See [JavaScript
-docs](https://developer.mozilla.org/en-US/docs/Web/JavaScript).
+   dealing with. You must be clear about the behavior of the language or
+   compiler/transpiler. See [JavaScript
+   docs](https://developer.mozilla.org/en-US/docs/Web/JavaScript).
 
 9. If you have a question, do a _web search_ first. If you don't find
-any satisfactory answer, then ask it in a comment. If it is a general
-question about Music Blocks, please use the new
-[discussions](https://github.com/sugarlabs/musicblocks/discussions)
-tab on top the the repository, or the _Sugar-dev Devel
-<[sugar-devel@lists.sugarlabs.org](mailto:sugar-devel@lists.sugarlabs.org)>_
-mailing list. Don't ask silly questions (unless you don't know it is
-silly ;p) before searching it on the web.
+   any satisfactory answer, then ask it in a comment. If it is a general
+   question about Music Blocks, please use the new
+   [discussions](https://github.com/sugarlabs/musicblocks/discussions)
+   tab on top the the repository, or the _Sugar-dev Devel
+   <[sugar-devel@lists.sugarlabs.org](mailto:sugar-devel@lists.sugarlabs.org)>_
+   mailing list. Don't ask silly questions (unless you don't know it is
+   silly ;p) before searching it on the web.
 
 10. Work on things that matter. Follow three milestones: `Port Ready`,
-`Migration`, and `Future`.  Those tagged `Port Ready` are
-priority. Those tagged with `Migration` will be taken care of during
-or after the foundation rebuild. Feel free to participate in the
-conversation, adding valuable comments. Those tagged with `Future`
-need not be addressed presently.
+    `Migration`, and `Future`. Those tagged `Port Ready` are
+    priority. Those tagged with `Migration` will be taken care of during
+    or after the foundation rebuild. Feel free to participate in the
+    conversation, adding valuable comments. Those tagged with `Future`
+    need not be addressed presently.
 
 _Please note there is no need to ask permission to work on an
 issue. You should check for pull requests linked to an issue you are
 addressing; if there are none, then assume nobody has done
 anything. Begin to fix the problem, test, make your commits, push your
 commits, then make a pull request. Mention an issue number in the pull
 request, but not the commit message. These practices allow the
-competition of ideas (Sugar Labs is a meritocracy)._
+competition of ideas (Sugar Labs is a meritocracy)._

loading-animation-ja.svg images/loading-animation-ja.svgloading-animation-ja.svg renamed to images/loading-animation-ja.svg

@@ -28,8 +28,6 @@
     <link rel="preload" href="css/darkmode.css" as="style" onload="this.onload=null;this.rel='stylesheet'">
     <link rel="prefetch" as="video" href="loading-animation.webm" type="video/webm">
     <link rel="prefetch" as="video" href="loading-animation.mp4" type="video/mp4">
-    <link rel="prefetch" as="image" href="loading-animation-ja.svg">
-
 
     <!-- <script src="js/utils/detectIE.js"></script> -->
 
@@ -645,7 +643,7 @@
 
                 const container = document.getElementById("loading-media");
                 const content = lang.startsWith("ja")
-                    ? `<img src="loading-animation-ja.svg" loading="eager" fetchpriority="high" style="width: 70%; height: 90%; object-fit: contain;" alt="Loading animation">`
+                    ? `<img src="loading-animation-ja.png" loading="eager" fetchpriority="high" style="width: 70%; height: 90%; object-fit: contain;" alt="Loading animation">`
                     : `<video loop autoplay muted playsinline fetchpriority="high" style="width: 90%; height: 100%; object-fit: contain;">
                         <source src="loading-animation.webm" type="video/webm">
                         <source src="loading-animation.mp4" type="video/mp4">

index.html

@@ -84,7 +84,7 @@ describe("loader.js coverage", () => {
 
         require("../loader.js");
 
-        await new Promise(resolve => setTimeout(resolve, 50)); // More time
+        await new Promise(resolve => setTimeout(resolve, 200)); // More time
     }; // Allow async main() to proceed
 
     test("Configures requirejs correctly", async () => {

js/__tests__/loader.test.js

@@ -373,18 +373,18 @@ describe("Logo Class", () => {
 
     describe("processSpeak", () => {
         test("filters text to only valid characters", () => {
-            // The code uses this.meSpeak (not this._meSpeak)
-            logo.meSpeak = { speak: jest.fn() };
+            // The code uses this._meSpeak
+            logo._meSpeak = { speak: jest.fn() };
             logo.processSpeak("Hello, World! 123");
 
-            expect(logo.meSpeak.speak).toHaveBeenCalledWith("Hello, World ");
+            expect(logo._meSpeak.speak).toHaveBeenCalledWith("Hello, World ");
         });
 
         test("handles empty string", () => {
-            logo.meSpeak = { speak: jest.fn() };
+            logo._meSpeak = { speak: jest.fn() };
             logo.processSpeak("");
 
-            expect(logo.meSpeak.speak).toHaveBeenCalledWith("");
+            expect(logo._meSpeak.speak).toHaveBeenCalledWith("");
         });
     });
 

js/__tests__/logo.test.js

@@ -0,0 +1,101 @@
+/**
+ * @license
+ * MusicBlocks v3.4.1
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ */
+
+let factory;
+const mockP5 = { version: "1.0" };
+
+beforeAll(() => {
+    global.define = jest.fn((deps, fn) => {
+        factory = fn;
+    });
+    require("../p5-adapter");
+});
+
+afterAll(() => {
+    delete global.define;
+});
+
+describe("p5-adapter", () => {
+    beforeEach(() => {
+        delete window.p5;
+        delete window.OriginalTone;
+        delete window.Tone;
+        delete window.OriginalAudioContext;
+        delete window.AudioContext;
+        delete window.OriginalWebkitAudioContext;
+        delete window.webkitAudioContext;
+        delete window.AudioNode;
+        delete window.OriginalAudioNodeConnect;
+        jest.spyOn(console, "log").mockImplementation(() => {});
+        jest.spyOn(console, "warn").mockImplementation(() => {});
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    test("define registers factory with p5.min dependency", () => {
+        expect(typeof factory).toBe("function");
+    });
+
+    test("assigns p5 to window when window.p5 is absent", () => {
+        factory(mockP5);
+        expect(window.p5).toBe(mockP5);
+    });
+
+    test("does not overwrite existing window.p5", () => {
+        const existing = { version: "0.9" };
+        window.p5 = existing;
+        factory(mockP5);
+        expect(window.p5).toBe(existing);
+    });
+
+    test("saves window.Tone as OriginalTone when present", () => {
+        const tone = { name: "Tone" };
+        window.Tone = tone;
+        factory(mockP5);
+        expect(window.OriginalTone).toBe(tone);
+    });
+
+    test("warns when window.Tone is missing", () => {
+        factory(mockP5);
+        expect(console.warn).toHaveBeenCalledWith("p5-adapter: window.Tone not found!");
+    });
+
+    test("saves AudioContext when present", () => {
+        const ac = jest.fn();
+        window.AudioContext = ac;
+        factory(mockP5);
+        expect(window.OriginalAudioContext).toBe(ac);
+    });
+
+    test("saves webkitAudioContext when present", () => {
+        const wac = jest.fn();
+        window.webkitAudioContext = wac;
+        factory(mockP5);
+        expect(window.OriginalWebkitAudioContext).toBe(wac);
+    });
+
+    test("saves AudioNode.prototype.connect when present", () => {
+        const connect = jest.fn();
+        window.AudioNode = { prototype: { connect } };
+        factory(mockP5);
+        expect(window.OriginalAudioNodeConnect).toBe(connect);
+    });
+
+    test("skips AudioNode save when AudioNode is absent", () => {
+        factory(mockP5);
+        expect(window.OriginalAudioNodeConnect).toBeUndefined();
+    });
+
+    test("returns p5 from factory", () => {
+        expect(factory(mockP5)).toBe(mockP5);
+    });
+});